This commit was manufactured by cvs2svn to create tagEVOLUTION_2_4_2

'EVOLUTION_2_4_2'.

svn path=/tags/EVOLUTION_2_4_2/; revision=30708

99 files changed, 22417 insertions, 32584 deletions

diff --git a/ChangeLog b/ChangeLog
index a9d6200b2d..f83a6cac58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,80 +1,29 @@
-2005-11-28  P S Chakravarthi <pchakravarthi@novell.com>
+2005-11-29  Harish Krishnaswamy  <kharish@novell.com>
 
-	* configure.in: Added libnotify for use in new
-	alarm notification UI.
+	* configure.in, NEWS : Release updates.
+	*** Release 2.4.2 ***
 
-2005-11-26  Tor Lillqvist  <tml@novell.com>
+2005-10-03  Harish Krishnaswamy <kharish@novell.com>
 
-	* configure.in: Drop the IPv6 and getaddrinfo checks, unused here
-	in Evolution. (It's used in e-d-s, though.)
-
-2005-11-23  Srinivasa Ragavan <sragavan@novell.com>
-
-	* configure.in: Made hal dependency optional.
-
-2005-11-16  Parthasarathi Susarla <sparthasarathi@novell.com>
+	* configure.in, NEWS: Release updates.
+	*** Release 2.4.1 ***
 	
-	* README, removed gal requirement.
-
-2005-11-14  Harish Krishnaswamy  <kharish@novell.com>
-
-	* NEWS, configure.in: Release updates, version bump.
-	***** Release 2.5.2 *****
-
-2005-10-27  Erdal Ronahi  <erdal.ronahi@gmail.com>
-
-	* configure.in: Added ku (Kurdish) to ALL_LINGUAS
-
-2005-10-26  Tor Lillqvist  <tml@novell.com>
-
-	* configure.in: Don't require hal on Win32.
-
-2005-10-25  Harish Krishnaswamy  <kharish@novell.com>
-
-	* Makefile.am: Distclean should remove the header,
-	not iconv-detect.c
-
-2005-10-25  Harish Krishnaswamy  <kharish@novell.com>
-
-	* configure.in: Turn development warning on.
-	Bump version to 2.5.1.
-
-2005-10-19  Harish Krishnaswamy <kharish@novell.com>
-
-	Committing for Nathan Owens <pianocomp81@yahoo.com>
-
-	* configure.in: Add views/memos/Makefile,
-	calendar/conduits/memo/Makefile to Makefile list
-
-2005-10-18  Srinivasa Ragavan <sragavan@novell.com>
-
-	* configure.in: Added iPod sync e-plugin to experimental plugins.
-
-2005-10-17  Runa Bhattacharjee <runa@bengalinux.org>
-
-	* configure.in : Added Bengali (bn) to ALL_LINGUAS.
-
-2005-10-3  Harish Krishnaswamy <kharish@novell.com>
+2005-10-03  Harish Krishnaswamy <kharish@novell.com>
 
 	* marshal.mk : do not add the srcdir prefix as
 	$< already returns the full path.
 	Fixes #271308.
 
-2005-09-28  Tor Lillqvist  <tml@novell.com>
+2005-09-05  Mengjie Yu  <meng-jie.yu@sun.com>
 
-	* configure.in: Drop unused SOCKET_LIBS leftover. Don't check for
-	OpenLDAP on Win32. Instead, set related variables unconditionally,
-	as LDAP support is always present (in <winldap.h> and -lwldap32).
-	(CAMEL_EXCHANGE): Add more stuff to CAMEL_EXCHANGE_CFLAGS and
-	_LIBS. These are used only in
-	plugins/exchange-operations/Makefile.am, and now it's enough to
-	use only that CAMEL_EXCHANGE_CFLAGS and _LIBS there.
+	* configure.in:grep on Solaris doesn't support -q, use > /dev/null instead.
 
-	* win32/dummy.la: libdir is prefix/lib, not bin.
+2005-09-05  Runa Bhattacharjee <runa@bengalinux.org>
+	* configure.in: Added Bengali (bn) to ALL_LINGUAS.
 
-2005-09-05  Mengjie Yu  <meng-jie.yu@sun.com>
+2005-09-02 Jessica Prabhakar <pjessica@novell.com>
 
-	* configure.in:grep on Solaris doesn't support -q, use > /dev/null instead.
+	* help/C/evolution.xml: minor spelling and grammar edits
 
 2005-08-28  Harish Krishnaswamy <kharish@novell.com>
 
diff --git a/NEWS b/NEWS
index a926f715e3..ee2f6fbcc2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,74 +1,114 @@
-Evolution 2.5.2 2005-10-25
---------------------------
-
-New Features:
-	- New Event / Meeting Editor dialog (Srinivasa Ragavan &
-	  Chenthill)
-	-  Hula Account setup plugin (Harish)
+Evolution 2.4.2 2005-11-29
+---------------------------
 
 Bugzilla bugs fixed (see http://bugzilla.gnome.org/show_bug.cgi):
 
-	#302974 - Added accelerators for Next and Previous message
-		  (Sankar)
-	#314638 - Fixes a memory build-up, while creating a new meeting
-		  with new category (Chakravarthi)
-	#313538 - Fix to show Free/Busy information for organiser
-		  (Chenthil)	  
-	#321088 - Fix to reduce the size of time window in free/busy to
-		  avoid the scroll of widget in the wrong direction.
-		  It Shows only 35 days in the canvas. (Chenthill)
-	#273322 - Fixed a crash in evolution, when calendar is removed,
-		  remove it from publishing. (Dinesh)
-	#316710 - Fixed a alarm issue to popup for exchange, by
-		  obtaining correct key for a authenticated calendar (Chakravarthi)
-	#319217 - Show only alarms starting from today for missed alarms
-		  (Chakravarthi)
-	#316280 - Fix to addressbook print to use specified page size
-		  (Evan Yan)
-	#229972 - In contact editor, move focus automatically to next
-		  field, after setting phone from the menus (Devashish)
-	#301081 - Fix to rememberpublishing recipents in converting mail
-		  to task plugin (Mubeen)
-	#308752 - Renamed 'Meetings and Tasks' to 'Calendar and Tasks'
-		  in Preferences (Dinesh)
-	
-Other Fixes:
 
-	- Category syncing in todo-conduits (Nathen Owens)
-	- Adjust the Date/Time widgets to take actual size in
-	  meeting/event page (Chenthill)
-	- Automatic file extention filling in saving a calendar (Dinesh)
-	- Code Cleanup (Harish) 
-	
-Update Translations:
+#316297 - Evolution help contents fails with error cannot load section (Harish)
+#314638 - Memory builds up to 1GB when a meeting is created (Chakravarthi) 
+#317322 - crash when delete a imported recurrent event (Chenthill)
+#314639 - Evolution crashed on right click and select new appointment (Chenthill)
+#312533 - modifying a repeated calendar entry in day view corrupts entry (Dinesh)
+#273322 - Evolution crashes after some apparent corruption in the local (Dinesh)
+#310495 - sorting tasks based on summary first sorts based on upper-case (Mubeen)
+#272920 - Month calendar in "day view" should scroll with scroll wheel (Viren)
+#316280 - evolution contact print use fixed page size, print to A5 (Evan Yan)
+#301081 - Converting mail to task forgets recipients (Mubeen)
+#312467 - gw - Logout from proxy and then immedeitly login 'evolution' (Sankar)
+#317906 - gw - Shared folder properties of one folder are reflected in all (Vivek)
+#322311 - New defined viewname with non-ASCII characters is not displayed (Simon Zheng) 	
+#322616 -  End time in list view is displayed in UTC timezone (Chenthill)
 
-	- bg (Alexander Shopov)
-	- ca (Adam Weinberger)
+Updated Translations:
+
+	- bg (Rostislav Raykov)
+	- da (Martin Willemoes Hansen)
+	- es (QA team)
 	- es (Francisco Javier F. Serrador)
-	- et (Priit Laes)
+	- et (Ivar Smolin)
+	- eu (Inaki Larranaga)
 	- fi (Ilkka Tuohela)
+	- fr (Stephane Raimbault)
 	- gl (Ignacio Casal Quinteiro)
-	- ku (Erdal Ronahi)
-	- lt (Žygimantas Beručka)
 
-Evolution 2.5.1 2005-10-25
+Evolution 2.4.1 2005-10-03
 --------------------------
-New !!  Evolution Memos component (Nathan Owens)
-and plenty of bug fixes as usual.
 
-Evolution 2.4.0 2005-09-05
---------------------------
-What is new ?
-
-- A new menu layout (More HIG compliant)
-- Inline PGP Signature/Encryption support.
-- Performance enhancements on Camel/GroupWise Backends.
-- Auto-fit Image Attachments
-- Support for GroupWise proxy accounts
-- Extended EPlugin support, importers as an EPlugin.
-- Thunderbird-compatible storage of labels on IMAP.
-- Support for delegation of meetings (Calendar)
-- Marcus Baines Line (calendar) 
+Bugzilla bugs fixed (see http://bugzilla.gnome.org/show_bug.cgi):
+
+General/GAL/Plugins :
+
+	#271308 - evolution-2.1.3.2 does not build outside of srcdir (Harish)
+	#316351 - Evolution crashes when performing 'checkrow' action using LDTP (Harry Lu)
+	#317792 - junk plugin not honouring the flags (Vivek)
+	#312886 - Folder size always shows 0 kb... (Arunprakash)
+	#316274 - Exchange Plugin cannot be enabled on a machine w/o KRB5 (Irene Huang)
+
+Addressbook:
+
+	#248624 - Contact list prints poorly with Evolution 1.4.+ (Devashish) 
+	#274285 - All contacts are printed even if 'selection' is chosen (Devashish)
+	#209354 - printing of a contact gives ugly result (Devashish)
+	#202201 - Context menu for printing should apply to multiple contacts (Devashish)
+	#315034 - Duplicate contact - Adding new contact with first and last name (Devashish)
+	#316373 - Support inetOrgPerson schema in LDIF import (Sushma)
+	#269655 - GW - PROXY - - Preview Pane For Contacts Should Clear After Search (Devashish)
+	#235038 - contact-list-editor box should support multiple selection (Sushma)
+	#240762 - Cannot edit the '_Address Cards' View (Li Yuan)
+
+Calendar:
+
+	#315095 - Free/busy publish does not publish on GW/Exchange (Chenthill)
+	#271480 - Receive 2 reminders for every meeting on my GW calendar (Chenthill)
+	#264449 - Task list flickering, selections/changes lost (Mubeen Jukaku)
+	#257649 - Keyboard date traversal in Calendar views (Viren)
+	#244981 - Calendar does not print end times in week view (Chenthill) 
+	#316954 - Unable to "Schedule Meeting" from existing appointment (Chenthill) 
+	#301391 - Copy-Paste of repetitive appointment changes end date (Chenthill)
+	#269685 - Changing a calendar item does not change the alarm text (Chakravarthi)
+	#303702 - Segfault trying to sync calendar with an multi-day all-day event (Varadhan)
+	#258786 - 'Mark Selected Tasks as Complete' active even after tasks are complete (Viren)
+	#314599 - Recurrence Tab Should Not Default To Forever (Viren)
+	#273781 - evolution-alarm-notify - appointment should have a windowmanager (Chenthill)
+	#274188 - all-day Appointments in List View start one day too early (Chakravarthi)
+	#273847 - Attached file appears inline in meeting request mail  (Chenthill)
+	#246480 - copy/paste of appointments loses time (Chenthill) 
+	#317014 - 'Add/ Remove/ contacts' tab is disabled in Assignment tab (Viren)
+	#261625 - Extending old event causes new alarm to fire (Chakravarthi)
+	#314922 - Can't add meeting invitees on creating the Meeting request while in Mailer (Dinesh)
+	#311694 - In mail view 'New ->Appointment' opens appointment popup with no summary (Dinesh)
+	#314918 - GW - Evolution crashed on adding attendees to Meeting request (Dinesh)
+	#315752 - "Convert to Task" causes crash (Chenthill)
+	#315345 - Evolution crashes on  displaying messages from "Calendar" folder of an IMAP account (Chenthill)
+	#270036 - Free/Busy settings tab (Dinesh)
+
+Mailer:
+	
+	#316983 - Read-receipt is sent to myself (Carsten Guenther)
+	#315506 - Unable to set default Sent folder (Sankar) 
+	#257321 - Sent folder should have a unique icon (Sankar)
+	#313078 - Enter wrong IP address while configuring mail id evolution keeps sending loginrequest (Vivek)
+	#314337 - Copy/paste a webpage to mail composer,Print Preview makes evolution crash (Shreyas)
+	#317400 - GW Error message "Proxy access cannot be given to user"" (Sankar)
+
+Updated Translations:
+
+	- bn (Runa Bhattacharjee)
+	- cy (Rhys Jones)
+	- et (Ivar Smolin)
+	- eu (Inaki Larranaga)
+	- fa (Elnaz Sarbar, Meelad Zakaria)
+	- fi (Ilkka Tuohela)
+	- fr (Vincent Untz, Stéphane Raimbault)
+	- hu (Gabor Kelemen)
+	- it (Alessio Frusciante)
+	- lt (Žygimantas Beručka) 
+	- ro (Mugurel Tudor)
+	- ru (Nickolay V. Shmyrev)
+	- sv (Christian Rose)
+	- th (Theppitak Karoonboonyanan)
+	- tr (Baris Cicek)
+	- vi (Clytie Siddall)
 
 Evolution 2.3.8 2005-08-23
 ---------------------------
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 58f7a0b3b5..bedddfdb2f 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,160 +1,52 @@
-2005-11-26  Tor Lillqvist  <tml@novell.com>
-
-	* gui/contact-editor/e-contact-editor.c
-	* gui/contact-editor/e-contact-editor-address.c
-	* gui/contact-editor/e-contact-editor-fullname.c
-	* gui/contact-editor/e-contact-editor-im.c
-	* gui/contact-list-editor/e-contact-list-editor.c
-	* gui/merging/eab-contact-merging.c
-	* gui/widgets/e-addressbook-view.c
-	* printing/e-contact-print.c
-	* printing/e-contact-print-style-editor.c: Include
-	e-util-private.h to get redefinition of compile-time pathnames as
-	calls to functions on Windows. Construct the pathnames of files
-	and directories under the installation prefix at run-time to
-	enable install-anywhere on Windows. No effect on functionality on
-	Unix.
-
-2005-11-25  Tor Lillqvist  <tml@novell.com>
-
-	* gui/component/openldap-extract.h: New file. Contains various
-	things lifted from OpenLDAP for use on Windows where we use
-	Microsoft's LDAP implementation. The same file is also in
-	e-d-s/backends/ldap.
-
-	* gui/component/Makefile.am: Distribute openldap-extract.h.
-
-	* gui/component/addressbook-config.c: Include openldap-extract.h on
-	Windows. Include e-util-private.h to get redefinition of
-	EVOLUTION_GLADEDIR (as a call to a function) on Windows.
-	(query_for_supported_bases, eabc_general_name, eabc_general_host,
-	eabc_general_auth, eabc_details_search, eabc_details_limit,
-	addressbook_config_edit_source): Construct the path of the glade
-	file at run-time to enable install-anywhere on Windows.
-
-	* gui/component/addressbook-view.c (control_activate): Include
-	e-util-private,h to get redefinition of EVOLUTION_UIDIR (as a call
-	to a function) on Windows. Construct the path of the xml file at
-	run-time to enable install-anywhere on Windows.
-
-	* importers/evolution-ldif-importer.c (ldif_import)
-	* gui/widgets/eab-gui-util.c (eab_load_error_dialog): Use
-	g_filename_from_uri() instead of just stripping off the "file://"
-	prefix for Win32 portability.
-
-	* importers/evolution-ldif-importer.c (ldif_import): Use gstdio
-	wrappers for better non-ASCII filename support on Windows.
-	
-	* gui/component/addressbook-component.c (ensure_sources): Use
-	g_filename_to_uri() instead of just prefixing "file://" for Win32
-	portability.
-
-2005-11-24  Sushma Rai  <rsushma@novell.com>
-
-	* addressbook.error.xml: Added new error id "gw-book-list-init" and 
-	corresponding warning message.
-
-2005-10-04  Srinivasa Ragavan <sragavan@novell.com>
-
-	* gui/component/addressbook-view.c (abv_source_popups): 
-	* gui/widgets/e-addressbook-view.c (eabv_popup_items):
-	Added 	keyboard accelerators for contacts.
-	
 2005-11-11 Evan Yan <evan.yan@sun.com>
 
 	* pinting/e-contact-print.c (e_contact_build_style):
 	Add a config argument to get the actual page size and set it to style.
 	(e_contact_print_response): modify the call to e_contact_build_style
 	accordingly.
-	e_contact_print_preview): modify the call to e_contact_build_style
+	(e_contact_print_preview): modify the call to e_contact_build_style
 	accordingly.
 	Fixes # 316280
 
-2005-10-26   Devashish Sharma <sdevashish@novell.com>
-
-	* gui/contact-editor/e-contact-editor.c: Sets the focus to the 
-	corresponding ntry field after changing dropdown menus for phone, im
-	and e-mail fields in contact editor. Fixes #229972.
-
-2005-10-22  Sushma Rai  <rsushma@novell.com>
-
-	* gui/widgets/eab-gui-util.c (eab_send_contact_list_as_attachment): 
-	Marked subject line for translation. Fixes #317753
-
-2005-10-22  Sushma Rai  <rsushma@novell.com>
-
-	* gui/component/addressbook-config.c: Storing the search filter entered
-	at configuration dialog.
-	(addressbook_ldap_init)(source_to_uri_parts): Handling search filter.
-	(eabc_details_search): Storing the serch filter value and added 
-	callback to handle search filter changes.
-	(search_filter_changed_cb)(url_changed): Store search filter in LDAP 
-	url.
-	(from_ldap_search_filter): If search filter entered is missing 
-	parenthesis, adds them. 
-	
-	* gui/component/ldap-config.glade: Added an entry for entering the 
-	search filter.
-	Fixes #311884   	
-
-2005-10-04   Devashish Sharma <sdevashish@novell.com>
-
-	* gui/widgets/e-addressbook-view.etspec: Changed the compare type for
-	"Organization" to stringcase. This new type has been defined for
-	performing case insensitive locale sensitive UTF8 string compares.
-	Fixes #207110. 
-
-2005-10-04   Devashish Sharma <sdevashish@novell.com>
-
-	* gui/widgets/e-addresbook-view.etspec: Changed the compare type for
-	"File As" to "collate", so that proper lexicographical sorting (based
-	on users locale)is employed. Fixes #271594, #273870. 
-
-2005-10-04   Devashish Sharma <sdevashish@novell.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.etspec: Set the
-	sorting column so that the contacts are alphabetically sorted in 
-	contact list editor.  Fixes #265353.
-
 2005-10-03   Devashish Sharma <sdevashish@novell.com>
 
-	*  gui/widgets/e-addressbook-view.c (eab_view_print): Get selected 
-	contacts list and forward it. Earlier list was not being sent so no 
+	* gui/widgets/e-addressbook-view.c (eab_view_print): Get selected
+	contacts list and forward it. Earlier list was not being sent so no
 	chance of printing the selected contacts.
 	(eab_view_print_preview): Same as for print above.
 
 	* printing/e-contact-print.c (e_contact_print_dialog_new): uses_book was
 	being set in every case. removed that and set contact list which is now
 	being passed to it from eab_view_print.
-	(e_contact_print_preview): It was generating preview for the whole 
+	(e_contact_print_preview): It was generating preview for the whole
 	book in all cases. Now if there is a list of selected contacts it
 	generates preview for only those contacts and if the list is NULL (no
 	selected contacts), it generates preview for the whole book.
 	(e_contact_print_response): Checks the current range selected (All or
-	selection) and prints the contacts based on that. If All is selected 
+	selection) and prints the contacts based on that. If All is selected
 	all contacts are printed and if Selection is selected only the selected
 	contacts are printed.
 
-	* printing/e-contact-print.h: Changed the function prototype for 
-	e_contact_print_dialog_new and e_contact_print_preview, both of them 
-	now accept a list of selected contacts. 
+	* printing/e-contact-print.h: Changed the function prototype for
+	e_contact_print_dialog_new and e_contact_print_preview, both of them
+	now accept a list of selected contacts.
 	Fixes #248624, #274285, #209354, #202201
-	
+
 2005-09-30   Devashish Sharma <sdevashish@novell.com>
 
-	* gui/merging/eab-contact-compare.c
+        * gui/merging/eab-contact-compare.c
 	(name_fragment_match_with_synonyms): Changed name compare logic where
 	it matches names with starting part same. (it matches rob and robert).
 	Fixes #315034.
 
-2005-09-30  Sarfraaz Ahmed <asarfraaz@novell.com>
+2005-08-30  Sarfraaz Ahmed <asarfraaz@novell.com>
 
 	* gui/component/addressbook.c (remove_parameters_from_uri) : This now
 	takes care to escape any auth mechanism in the uri.
 
 2005-09-30  Sushma Rai  <rsushma@novell.com>
 
-	* importers/evolution-ldif-importer.c: Added some missing attrbutes and
+	* importers/evolution-ldif-importer.c: Added some missing attrbutes an
 	mozilla specific attributes.
 	(populate_contact_address): Forms the address and also formats it.
 	(parseLine): Handling the work address, home address, wants to receieve
@@ -162,36 +54,28 @@
 	(getNextLDIFEntry): Handling work and home addresses.
 	Fixes #316373.
 
-2005-09-28  Devashish Sharma  <sdevashish@novell.com>
+2005-09-28  Devashish Sharma <sdevashish@novell.com>
 
 	* gui/contact-list-editor/e-contact-list-editor.c
 	(table_drag_data_received_cb): Added a check that the contact received
 	through drag contains an email-id. There is no point in adding a
-	contact to the contact-list if the contact has no email-id. This was 
-	causing a crash also.
+	contact to the contact-list if the contact has no email-id. This
+	was causing a crash also.
 
 	* gui/widgets/eab-contact-display.c
 	(eab_contact_display_render_compact): Added a check for catching null
-	email-ids, in case of contact-lists, so that null ids are not passed
+	email-ids, in case of contact-lists, so that null ids are not passed for
 	for rendering, which was causing a crash.
-	
-2005-09-28  Devashish Sharma  <sdevashish@novell.com>
-
-	* gui/component/addressbook-view.c (addressbook_view_init): Added a
-	callback, source_selector_key_press_event_callback() so that the
-	contact folder can be removed with Del/Delete Key.
-	Fixes #233424.
 
-2005-09-28  Tor Lillqvist  <tml@novell.com>
+2005-09-26  Devashish Sharma <sdevashish@novell.com>
 
-	* gui/component/addressbook.c (get_remember_password): Use
-	g_ascii_strcasecmp() instead of strcasecmp(). We are comparing to
-	the literal "true", just casefolding ASCII is enough. Also better
-	for portability.
+	* gui/widgets/e-addressbook-view.c (search_activated): Clears the
+	preview pane for contacts after search.
+	Fixes #269655.
 
 2005-09-14  Sushma Rai  <rsushma@novell.com>
 
-	* gui/contact-list-editor/e-contact-list-editor.etspec: Set selection 
+	* gui/contact-list-editor/e-contact-list-editor.etspec: Set selection
 	mode to multiple. Related to the patch submitted already to fix #235038.
 
 2005-08-26  Devashish Sharma <sdevashish@novell.com>
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index 289a783da4..fb828764ba 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -140,7 +140,7 @@ get_remember_password (ESource *source)
 	const gchar *value;
 
 	value = e_source_get_property (source, "remember_password");
-	if (value && !g_ascii_strcasecmp (value, "true"))
+	if (value && !strcasecmp (value, "true"))
 		return TRUE;
 
 	return FALSE;
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 87a3946314..f141f005d9 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -22,7 +22,6 @@
 
 #include "e-contact-list-editor.h"
 #include <e-util/e-icon-factory.h>
-#include <e-util/e-util-private.h>
 
 #include <string.h>
 
@@ -192,7 +191,6 @@ e_contact_list_editor_init (EContactListEditor *editor)
 {
 	GladeXML *gui;
 	GList *icon_list;
-	char *gladefile;
 
 	editor->contact = NULL;
 	editor->changed = FALSE;
@@ -205,12 +203,7 @@ e_contact_list_editor_init (EContactListEditor *editor)
 	editor->load_source_id = 0;
 	editor->load_book = NULL;
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
-				      "contact-list-editor.glade",
-				      NULL);
-	gui = glade_xml_new (gladefile, NULL, NULL);
-	g_free (gladefile);
-
+	gui = glade_xml_new (EVOLUTION_GLADEDIR "/contact-list-editor.glade", NULL, NULL);
 	editor->gui = gui;
 
 	editor->app = glade_xml_get_widget (gui, "contact list editor");
@@ -649,18 +642,13 @@ e_contact_list_editor_create_table(gchar *name,
 	
 	ETableModel *model;
 	GtkWidget *table;
-	char *etspecfile;
 
 	model = e_contact_list_model_new ();
 
-	etspecfile = g_build_filename (EVOLUTION_ETSPECDIR,
-				       "e-contact-list-editor.etspec",
-				       NULL);
 	table = e_table_scrolled_new_from_spec_file (model,
 				      NULL,
-				      etspecfile,
+				      EVOLUTION_ETSPECDIR "/e-contact-list-editor.etspec",
 				      NULL);
-	g_free (etspecfile);
 
 	g_object_set_data(G_OBJECT(table), "model", model);
 
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.etspec b/addressbook/gui/contact-list-editor/e-contact-list-editor.etspec
index b621e670ea..4820079562 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.etspec
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.etspec
@@ -1,7 +1,9 @@
 <ETableSpecification no-headers="true" cursor-mode="line" selection-mode="multiple">
-<ETableColumn model_col= "0" _title="Contact" expansion="1.0" minimum_width="20" resizable="true" cell="string" compare="string" />
+<ETableColumn model_col= "0" _title="Contact" expansion="1.0" minimum_width="20" resizable="true" cell="string" compare="collate" />
 	<ETableState>
 		<column source="0"/>
-	        <grouping> </grouping>
+	        <grouping> 
+		  <leaf column="0" ascending="true"/>
+		</grouping>
 	</ETableState>
 </ETableSpecification>
diff --git a/addressbook/gui/merging/eab-contact-compare.c b/addressbook/gui/merging/eab-contact-compare.c
index 60a95c59f3..fa343b6350 100644
--- a/addressbook/gui/merging/eab-contact-compare.c
+++ b/addressbook/gui/merging/eab-contact-compare.c
@@ -115,7 +115,7 @@ name_fragment_match_with_synonyms (const gchar *a, const gchar *b, gboolean stri
 	if (!(a && b && *a && *b))
 		return FALSE;
 
-	if(!e_utf8_casefold_collate (a, b))	
+	if(! e_utf8_casefold_collate(a, b))	
 		return TRUE;
 
 	/* Check for nicknames.  Yes, the linear search blows. */
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 2274d27d54..5c81855f69 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -71,7 +71,6 @@
 #include "eab-contact-merging.h"
 
 #include "e-util/e-error.h"
-#include "e-util/e-util-private.h"
 
 #include "e-contact-editor.h"
 #include <gdk/gdkkeysyms.h>
@@ -423,7 +422,6 @@ eab_view_new (void)
 	GtkWidget *widget = GTK_WIDGET (g_object_new (E_TYPE_AB_VIEW, NULL));
 	EABView *eav = EAB_VIEW (widget);
 	FilterPart *part;
-	char *xmlfile;
 
 	/* create our model */
 	eav->model = eab_model_new ();
@@ -466,9 +464,7 @@ eab_view_new (void)
 	eav->search_context = rule_context_new ();
 	rule_context_add_part_set (eav->search_context, "partset", filter_part_get_type (),
 				   rule_context_add_part, rule_context_next_part);
-	xmlfile = g_build_filename (SEARCH_RULE_DIR, "addresstypes.xml", NULL);
-	rule_context_load (eav->search_context, xmlfile, "");
-	g_free (xmlfile);
+	rule_context_load (eav->search_context, SEARCH_RULE_DIR "/addresstypes.xml", "");
 
 	eav->search_rule = filter_rule_new ();
 	part = rule_context_next_part (eav->search_context, NULL);
@@ -541,8 +537,6 @@ init_collection (void)
 	GalViewFactory *factory;
 	ETableSpecification *spec;
 	char *galview;
-	char *addressbookdir;
-	char *etspecfile;
 
 	if (collection == NULL) {
 		collection = gal_view_collection_new();
@@ -550,22 +544,14 @@ init_collection (void)
 		gal_view_collection_set_title (collection, _("Address Book"));
 
 		galview = gnome_util_prepend_user_home("/.evolution/addressbook/views");
-		addressbookdir = g_build_filename (EVOLUTION_GALVIEWSDIR,
-						   "addressbook",
-						   NULL);
 		gal_view_collection_set_storage_directories
 			(collection,
-			 addressbookdir,
+			 EVOLUTION_GALVIEWSDIR "/addressbook/",
 			 galview);
-		g_free(addressbookdir);
 		g_free(galview);
 
 		spec = e_table_specification_new();
-		etspecfile = g_build_filename (EVOLUTION_ETSPECDIR,
-					       "e-addressbook-view.etspec",
-					       NULL);
-		e_table_specification_load_from_file (spec, etspecfile);
-		g_free (etspecfile);
+		e_table_specification_load_from_file (spec, EVOLUTION_ETSPECDIR "/e-addressbook-view.etspec");
 
 		factory = gal_view_factory_etable_new (spec);
 		g_object_unref (spec);
@@ -943,27 +929,27 @@ new_list (EPopup *ep, EPopupItem *pitem, void *data)
 static EPopupItem eabv_popup_items[] = {
 	{ E_POPUP_ITEM, "05.open", N_("_Open"), open_contact, NULL, NULL, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE },
 	{ E_POPUP_BAR, "10.bar" },
-	{ E_POPUP_ITEM, "10.new",  N_("_New Contact..."), new_card, NULL, "stock_contact", 0, EAB_POPUP_SELECT_EDITABLE},
-	{ E_POPUP_ITEM, "15.newlist", N_("New Contact _List..."), new_list, NULL, "stock_contact-list", 0, EAB_POPUP_SELECT_EDITABLE },
+	{ E_POPUP_ITEM, "10.new",  N_("New Contact..."), new_card, NULL, "stock_contact", 0, EAB_POPUP_SELECT_EDITABLE},
+	{ E_POPUP_ITEM, "15.newlist", N_("New Contact List..."), new_list, NULL, "stock_contact-list", 0, EAB_POPUP_SELECT_EDITABLE },
 
 	{ E_POPUP_BAR, "20.bar" },
-	{ E_POPUP_ITEM, "30.saveas", N_("_Save as VCard..."), save_as, NULL, "stock_save-as", 0, EAB_POPUP_SELECT_ANY },
-	{ E_POPUP_ITEM, "40.forward", N_("_Forward Contact"), send_as, NULL, "stock_mail-forward", EAB_POPUP_SELECT_ONE },
-	{ E_POPUP_ITEM, "40.forward", N_("_Forward Contacts"), send_as, NULL, "stock_mail-forward", EAB_POPUP_SELECT_MANY },
-	{ E_POPUP_ITEM, "50.mailto", N_("Send _Message to Contact"), send_to, NULL, "stock_mail-send", EAB_POPUP_SELECT_ONE|EAB_POPUP_SELECT_EMAIL|EAB_POPUP_CONTACT },
-	{ E_POPUP_ITEM, "50.mailto", N_("Send _Message to List"), send_to, NULL, "stock_mail-send", EAB_POPUP_SELECT_ONE|EAB_POPUP_SELECT_EMAIL|EAB_POPUP_LIST },
-	{ E_POPUP_ITEM, "50.mailto", N_("Send _Message to Contacts"), send_to, NULL, "stock_mail-send", EAB_POPUP_SELECT_MANY|EAB_POPUP_SELECT_EMAIL },
-	{ E_POPUP_ITEM, "60.print", N_("_Print"), print, NULL, "stock_print", 0, EAB_POPUP_SELECT_ANY },
+	{ E_POPUP_ITEM, "30.saveas", N_("Save as VCard..."), save_as, NULL, "stock_save-as", 0, EAB_POPUP_SELECT_ANY },
+	{ E_POPUP_ITEM, "40.forward", N_("Forward Contact"), send_as, NULL, "stock_mail-forward", EAB_POPUP_SELECT_ONE },
+	{ E_POPUP_ITEM, "40.forward", N_("Forward Contacts"), send_as, NULL, "stock_mail-forward", EAB_POPUP_SELECT_MANY },
+	{ E_POPUP_ITEM, "50.mailto", N_("Send Message to Contact"), send_to, NULL, "stock_mail-send", EAB_POPUP_SELECT_ONE|EAB_POPUP_SELECT_EMAIL|EAB_POPUP_CONTACT },
+	{ E_POPUP_ITEM, "50.mailto", N_("Send Message to List"), send_to, NULL, "stock_mail-send", EAB_POPUP_SELECT_ONE|EAB_POPUP_SELECT_EMAIL|EAB_POPUP_LIST },
+	{ E_POPUP_ITEM, "50.mailto", N_("Send Message to Contacts"), send_to, NULL, "stock_mail-send", EAB_POPUP_SELECT_MANY|EAB_POPUP_SELECT_EMAIL },
+	{ E_POPUP_ITEM, "60.print", N_("Print"), print, NULL, "stock_print", 0, EAB_POPUP_SELECT_ANY },
 
 	{ E_POPUP_BAR, "70.bar" },
-	{ E_POPUP_ITEM, "80.copyto", N_("Cop_y to Address Book..."), copy_to_folder, NULL, NULL, 0, EAB_POPUP_SELECT_ANY },
-	{ E_POPUP_ITEM, "90.moveto", N_("Mo_ve to Address Book..."), move_to_folder, NULL, NULL, 0, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE },
+	{ E_POPUP_ITEM, "80.copyto", N_("Copy to Address Book..."), copy_to_folder, NULL, NULL, 0, EAB_POPUP_SELECT_ANY },
+	{ E_POPUP_ITEM, "90.moveto", N_("Move to Address Book..."), move_to_folder, NULL, NULL, 0, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE },
 
 	{ E_POPUP_BAR, "a0.bar" },
-	{ E_POPUP_ITEM, "b0.cut", N_("Cu_t"), cut, NULL, "stock_cut", 0, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE },
-	{ E_POPUP_ITEM, "c0.copy", N_("_Copy"), copy, NULL, "stock_copy", 0, EAB_POPUP_SELECT_ANY },
-	{ E_POPUP_ITEM, "d0.paste", N_("P_aste"), paste, NULL, "stock_paste", 0, EAB_POPUP_SELECT_EDITABLE },
-	{ E_POPUP_ITEM, "e0.delete", N_("_Delete"), delete, NULL, "stock_delete", 0, EAB_POPUP_SELECT_EDITABLE|EAB_POPUP_SELECT_ANY },
+	{ E_POPUP_ITEM, "b0.cut", N_("Cut"), cut, NULL, "stock_cut", 0, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE },
+	{ E_POPUP_ITEM, "c0.copy", N_("Copy"), copy, NULL, "stock_copy", 0, EAB_POPUP_SELECT_ANY },
+	{ E_POPUP_ITEM, "d0.paste", N_("Paste"), paste, NULL, "stock_paste", 0, EAB_POPUP_SELECT_EDITABLE },
+	{ E_POPUP_ITEM, "e0.delete", N_("Delete"), delete, NULL, "stock_delete", 0, EAB_POPUP_SELECT_EDITABLE|EAB_POPUP_SELECT_ANY },
 };
 
 static void
@@ -1294,18 +1280,13 @@ create_table_view (EABView *view)
 {
 	ETableModel *adapter;
 	GtkWidget *table;
-	char *etspecfile;
 	
 	adapter = eab_table_adapter_new(view->model);
 
 	/* Here we create the table.  We give it the three pieces of
 	   the table we've created, the header, the model, and the
 	   initial layout.  It does the rest.  */
-	etspecfile = g_build_filename (EVOLUTION_ETSPECDIR,
-				       "e-addressbook-view.etspec",
-				       NULL);
-	table = e_table_scrolled_new_from_spec_file (adapter, NULL, etspecfile, NULL);
-	g_free (etspecfile);
+	table = e_table_scrolled_new_from_spec_file (adapter, NULL, EVOLUTION_ETSPECDIR "/e-addressbook-view.etspec", NULL);
 
 	view->object = G_OBJECT(adapter);
 	view->widget = table;
@@ -1772,9 +1753,9 @@ eab_view_print(EABView *view)
 			      NULL);
 		GList *list = get_selected_contacts (view); 
 		print = e_contact_print_dialog_new (book, query, list);
-		g_free(query);
-		e_free_object_list(list);
-		gtk_widget_show(print);
+		g_free (query);
+		e_free_object_list (list);
+		gtk_widget_show (print);
 	}
 	else if (view->view_type == EAB_VIEW_TABLE) {
 		GtkWidget *dialog;
@@ -1782,7 +1763,6 @@ eab_view_print(EABView *view)
 		ETable *etable;
 		EContactPrintDialogWeakData *weak_data;
 
-		/* FIXME: Allow range selection in table views, as in minicard view */
 		dialog = e_print_get_dialog (_("Print cards"), GNOME_PRINT_DIALOG_COPIES);
 
 		g_object_get(view->widget, "table", &etable, NULL);
@@ -1900,7 +1880,6 @@ eab_view_delete_selection(EABView *view, gboolean is_delete)
 	    !eab_editor_confirm_delete(GTK_WINDOW(gtk_widget_get_toplevel(view->widget)),
 				       plural, is_list, name)) {
 		g_free (name);
-		e_free_object_list(list);
 		return;
 	}
 
diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c
index dfec5dfc51..e37d579726 100644
--- a/addressbook/importers/evolution-ldif-importer.c
+++ b/addressbook/importers/evolution-ldif-importer.c
@@ -23,7 +23,6 @@
 #include <string.h>
 
 #include <glib/gi18n.h>
-#include <glib/gstdio.h>
 
 #include <gtk/gtkvbox.h>
 
@@ -691,9 +690,8 @@ ldif_import(EImport *ei, EImportTarget *target, EImportImporter *im)
 {
 	LDIFImporter *gci;
 	EBook *book;
-	FILE *file = NULL;
+	FILE *file;
 	EImportTargetURI *s = (EImportTargetURI *)target;
-	gchar *filename;
 
 	book = e_book_new(g_datalist_get_data(&target->data, "ldif-source"), NULL);
 	if (book == NULL) {
@@ -702,11 +700,7 @@ ldif_import(EImport *ei, EImportTarget *target, EImportImporter *im)
 		return;
 	}
 
-	filename = g_filename_from_uri(s->uri_src, NULL, NULL);
-	if (filename != NULL) {
-		file = g_fopen(filename, "r");
-		g_free (filename);
-	}
+	file = fopen(s->uri_src+7, "r");
 	if (file == NULL) {
 		g_message(G_STRLOC ":Can't open .ldif file");
 		e_import_complete(ei, target);
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
index a662185838..34ba7d83bb 100644
--- a/addressbook/printing/e-contact-print.c
+++ b/addressbook/printing/e-contact-print.c
@@ -43,7 +43,6 @@
 #include <libebook/e-book.h>
 #include <libebook/e-contact.h>
 #include <e-util/e-util.h>
-#include <e-util/e-util-private.h>
 #include <e-util/e-print.h>
 
 #define SCALE 5
@@ -876,7 +875,7 @@ e_contact_print_response(GtkWidget *dialog, gint response_id, gpointer data)
 	GnomePrintContext *pc;
 	gboolean uses_book = FALSE, uses_list = FALSE, uses_range = FALSE;
 
-	uses_range = GPOINTER_TO_INT (g_object_get_data(G_OBJECT (dialog), "uses_range"));
+	uses_range = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), "uses_range"));
 	if (uses_range) {
 		if (gnome_print_dialog_get_range (GNOME_PRINT_DIALOG (dialog)) & GNOME_PRINT_RANGE_ALL)
 			uses_book = TRUE;
@@ -1063,9 +1062,8 @@ e_contact_print_preview(EBook *book, char *query, GList *list)
 	pc = gnome_print_job_get_context (master);
 	e_contact_build_style (style, config);
 
-	if (list == NULL) {
+	if (list == NULL) 
 		uses_book = TRUE;
-	}
 	else {
 		uses_list = TRUE;
 		copied_list = g_list_copy (list);
@@ -1103,9 +1101,9 @@ e_contact_print_preview(EBook *book, char *query, GList *list)
 		g_object_ref (book);
 		e_contact_do_print (book, ctxt->query, ctxt);
 	}
-	else if(uses_list) {
+	else if (uses_list) {
 		ctxt->contacts = g_list_copy (copied_list);
-		g_list_foreach (ctxt->contacts, (GFunc)g_object_ref, NULL);
+		g_list_foreach (ctxt->contacts, (GFunc) g_object_ref, NULL);
 		complete_sequence (NULL, E_BOOK_VIEW_STATUS_OK, ctxt);
 	}
 }
diff --git a/addressbook/printing/e-contact-print.h b/addressbook/printing/e-contact-print.h
index 68c14aef9a..d3ca95d699 100644
--- a/addressbook/printing/e-contact-print.h
+++ b/addressbook/printing/e-contact-print.h
@@ -31,6 +31,6 @@
 GtkWidget *e_contact_print_dialog_new (EBook *book, char *query, GList *list);
 void e_contact_print_preview (EBook *book, char *query, GList *list);
 GtkWidget *e_contact_print_contact_dialog_new (EContact *card);
-GtkWidget *e_contact_print_contact_list_dialog_new(GList *list);
+GtkWidget *e_contact_print_contact_list_dialog_new (GList *list);
 
 #endif /* E_CONTACT_PRINT_H */
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index e30cd9f62c..eed913479b 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -13,7 +13,7 @@
 	instance is removed from master component, send a modify
 	request setting the exception for that instance. Cleaned
 	up the code.
-	
+
 2005-11-28  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	Fixes #314639
@@ -30,340 +30,25 @@
 	(e_cal_view_objects_added_cb): 
 	(e_cal_view_objects_removed_cb): Check if the comp_data is removed
 	from the array before freeing the data.
+2005-11-09  Dinesh Layek  <LDinesh@novell.com>
 
-2005-11-26  Tor Lillqvist  <tml@novell.com>
-
-	* gui/calendar-commands.c
-	* gui/e-cal-list-view.c
-	* gui/e-calendar-table.c
-	* gui/e-memo-table.c
-	* gui/e-memos.c
-	* gui/e-tasks.c
-	* gui/gnome-cal.c
-	* gui/goto.c
-	* gui/memos-control.c
-	* gui/tasks-control.c
-	* gui/alarm-notify/alarm-notify-dialog.c
-	* gui/alarm-notify/notify-main.c
-	* gui/dialogs/alarm-dialog.c
-	* gui/dialogs/alarm-list-dialog.c
-	* gui/dialogs/cal-attachment.c
-	* gui/dialogs/cal-prefs-dialog.c
-	* gui/dialogs/comp-editor.c
-	* gui/dialogs/e-delegate-dialog.c
-	* gui/dialogs/event-editor.c
-	* gui/dialogs/event-page.c
-	* gui/dialogs/meeting-page.c
-	* gui/dialogs/memo-page.c
-	* gui/dialogs/recurrence-page.c
-	* gui/dialogs/schedule-page.c
-	* gui/dialogs/task-details-page.c
-	* gui/dialogs/task-page.c
-	* gui/dialogs/url-editor-dialog.c: Include e-util-private.h to get
-	redefinition of compile-time pathnames as calls to functions on
-	Windows. Construct the pathnames of files and directories under
-	the installation prefix at run-time to enable install-anywhere on
-	Windows. No effect on functionality on Unix.
-
-2005-11-25  Tor Lillqvist  <tml@novell.com>
-
-	* gui/calendar-component.c (ensure_sources)
-	* gui/tasks-component.c (ensure_sources): Use g_filename_to_uri()
-	instead of just prefixing "file://" for Win32 portability.
-
-	* gui/e-itip-control.c
-	* gui/itip-utils.c: Use g_ascii_strcasecmp() instead of
-	strcasecmp() for portability.
-
-2005-11-24  Srinivasa Ragavan and P.S.Chakravarthi <sragavan@novell.com>, <pchakravarthi@novell.com>
-
-	(simultaneously a patch for configure.in in evolution source dir is
-	 applied to include libnotify, if present)
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_get_selected_calendars):
-	added a field in _AlarmNotifyPrivate called selected_calendars and relevant
-	code elsewhere for use in disabling and enabling alarms for particular calendars.
-	* gui/alarm-notify/alarm-queue.c (free_tray_icon_data):added
-	(notify_dialog_cb): modified to free the non snoozed alarms on close.
-	(open_alarm_dialog): code added to set up tooltip on the panel icon if there
-	are alarms present.
-	(alarm_quit): added. Call back when "Quit" option is chosen on right click of the
-	panel icon.
-	(alarms_configure): added. The call back function for generating the "Configure Alarms"
-	dialog on right click on the panel icon.
-	(menu_item_toggle_cb): added. Call back when a particular calendar is selected
-	or deselected in the "Configure Alarms" dialog.
-	(populate): added. Function to populate the view in the dialog that appears when
-	"Configure Alarms" option is chosen on right click of the panel icon.
-	(alarm_preference_response):added. Called when the "Configure Alarms" dialog is
-	closed.
-	(tray_icon_clicked_cb): modified to get tooltip, giving alarm summary on mouse over
-	the panel icon, to have the panel icon blink in case of active alarms.
-	(display_notification): modified the code to change the strings shown in the alarm
-	dialog.
-	(popup_notification): added. Compiles if there is libnotify. If present, gives
-	a small notification bubble on alarm trigger giving necesary information on the
-	appointment.
-	(alarm_queue_init): modified to add the panel icon that is being used in above
-	functions.
-	* gui/alarm-notify/config-data.[ch](config_data_get_calendars):added. Gets calendar
-	information for notification from a gconf key.
-	(config_data_replace_string_list): added. To replace an old gconf key with a new one.
-	* gui/alarm-notify/util.[ch] (calculate_time):added. An utility function which
-	gives a time difference between two time_t instances in hours, minutes and seconds.
-
-
-2005-11-24  Tor Lillqvist  <tml@novell.com>
-
-	* gui/e-alarm-list.c
-	* gui/e-cal-component-memo-preview.c
-	* gui/e-cal-component-preview.c
-	* gui/e-cal-model.c
-	* gui/e-cell-date-edit-text.c
-	* gui/e-date-time-list.c
-	* gui/e-itip-control.c
-	* gui/e-memos.c
-	* gui/e-tasks.c
-	* gui/itip-utils.c
-	* gui/print.c
-	* gui/alarm-notify/alarm-notify-dialog.c
-	* gui/alarm-notify/util.c
-	* gui/e-calendar-view.c
-	* gui/dialogs/alarm-dialog.c
-	* gui/dialogs/alarm-list-dialog.c
-	* gui/dialogs/comp-editor-util.c
-	* gui/dialogs/recurrence-page.c: Include e-time-utils.h from
-	libedataserver instead of using evolution's copy which is going
-	away.
-
-2005-11-23  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* gui/e-calendar-view.c (tooltip_grab), (get_label),
-	(e_calendar_view_get_tooltips): Added a function to get tooltip
-	tooltip widget
-	* gui/e-calendar-view.h:
-	* gui/e-day-view.c (e_day_view_add_event),
-	(e_day_view_reshape_long_event), (e_day_view_reshape_day_event),
-	(e_day_view_on_text_item_event): Added tooltip for day/work week
-	view.
-	* gui/e-week-view.c (e_week_view_add_event), (tooltip_event_cb),
-	(e_week_view_reshape_event_span), (e_week_view_on_text_item_event):
-	Added tooltip for week/month view.
-	* gui/e-week-view.h:
-	* gui/misc.c (get_position_in_array), (calculate_time): Added a 
-	function for converting time to string.
-	* gui/misc.h:
-
-2005-11-22  Boby Wang <boby.wang@sun.com>
-	Fixes #321237
-	* gui/dialogs/event-page.glade: Add the categories' name
-	The name of categories in new appointment dialog was missed.
-
-2005-11-17  P. S. Chakravarthi <pchakravarthi@novell.com>
-
-	Fixes #314550
-	* gui/alarm-notify/alarm-notify.glade: modified the
-	description widget to a scrolled window.
-	* gui/alarm-notify/alarm-notify-dialog.c (fill_in_labels):
-	modified the way in which description needs to be filled
-	to reflect the change of the description from a GtkLabel
-	to a GtkScrolledWindow.
-
-2005-11-16  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/dialogs/task-editor.c: (menu_option_status_cmd):
-	Modified the body of the function to show the details page.
-
-2005-11-16  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Reviewed/Edited the patch from Srinivasa Ragavan <sragavan@novell.com>
-	
-	* gui/apps_evolution_calendar.schemas.in.in:
-	* gui/calendar-config.c:
-	* gui/calendar-config.h: Removed the view_attendee function and its
-	gconf keys.
-	* gui/dialogs/event-editor.c: (menu_action_recurrence_cb),
-	(menu_action_recurrence_cmd), (event_editor_init),
-	(event_editor_construct): 
-	* gui/dialogs/event-page.c: (sensitize_widgets): Do not sensitize
-	labels.
-	(set_classification_menu), (event_page_set_classification), 
-	(event_page_fill_widgets), (event_page_fill_component),
-	(init_widgets):
-	* gui/dialogs/event-page.h:Corrected the spelling of recurrence and
-	removed the printf's.
-	* gui/dialogs/task-editor.c: (menu_view_role_cb),
-	(menu_view_status_cb), (menu_view_type_cb), (menu_view_rsvp_cb),
-	(menu_show_time_zone_cb), (menu_show_categories_cb),
-	(menu_class_public_cb), (menu_class_private_cb),
-	(menu_class_confidential_cb), (menu_option_status_cb),
-	(menu_insert_send_options_cmd), (menu_show_time_zone_cmd),
-	(menu_option_status_cmd), (task_editor_init),
-	(task_editor_construct), (task_editor_edit_comp),
-	(task_editor_send_comp), (task_editor_finalize), (show_assignment),
-	(task_editor_show_assignment):
-	* gui/dialogs/task-page.c: (task_page_init), (cleanup_attendees),
-	(task_page_finalize), (set_classification_menu), (clear_widgets),
-	(task_page_set_view_role), (task_page_set_view_status),
-	(task_page_set_view_type), (task_page_set_view_rsvp),
-	(task_page_set_classification), (sensitize_widgets),
-	(task_page_hide_options), (task_page_show_options),
-	(task_page_set_assignment), (get_current_account),
-	(task_page_fill_widgets), (set_attendees),
-	(task_page_fill_component), (add_clicked_cb), (existing_attendee),
-	(remove_attendee), (remove_clicked_cb), (invite_cb),
-	(attendee_added_cb), (popup_add_cb), (popup_delete_cb),
-	(context_popup_free), (button_press_event), (list_view_event),
-	(list_key_press), (task_page_set_show_timezone),
-	(task_page_set_show_categories), (task_page_fill_timezones),
-	(get_widgets), (date_changed_cb), (timezone_changed_cb),
-	(task_page_sendoptions_clicked_cb), (init_widgets),
-	(task_page_construct), (task_page_new),
-	(task_page_get_cancel_comp):
-	* gui/dialogs/task-page.glade:
-	* gui/dialogs/task-page.h: UI changes for task editor.
-
-2005-11-16 Irene Huang <Irene.Huang@sun.com>
-
-	* gui/e-cal-model-memos.c: struct _ECalModelMemosPrivate
-	should not be zero sized.
-
-2005-11-16  Irene Huang <Irene.Huang@sun.com>
-
-	* gui/dialogs/cal-prefs-dialog.c:
-	(cal_prefs_dialog_url_add_clicked): Use strcmp instead of !=.
-	(cal_prefs_dialog_url_remove_clicked):
-	When new a dialog of confirm, set parent to
-	PREFS_WINDOW (dialog_data->page)
-	instead of using PREFS_WINDOW (dialog_data).
-
-2005-11-14  Srinivasa Ragavan <sragavan@novell.com>
- 
-	reviewed by: Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/apps_evolution_calendar.schemas.in.in:
-	* gui/calendar-config-keys.h:
-	* gui/calendar-config.h:
-	* gui/calendar-config.c: (calendar_config_get_show_attendee),
-	(calendar_config_set_show_attendee),
-	(calendar_config_get_show_rsvp), (calendar_config_set_show_rsvp),
-	(calendar_config_get_show_role), (calendar_config_set_show_role),
-	(calendar_config_get_show_type), (calendar_config_set_show_type),
-	(calendar_config_get_show_status),
-	(calendar_config_set_show_status),
-	(calendar_config_get_show_timezone),
-	(calendar_config_set_show_timezone),
-	(calendar_config_get_show_categories),
-	(calendar_config_set_show_categories): Gconf keys to store the last
-	modified state.
-	* gui/dialogs/Makefile.am: Added the evolution UI directory.
-	* gui/dialogs/comp-editor.h:
-	* gui/dialogs/comp-editor.c: (menu_file_save_cb),
-	(menu_file_close_cb), (menu_edit_copy_cb), (menu_edit_paste_cb),
-	(menu_edit_cut_cb), (menu_insert_attachment_cb), (menu_help_cb),
-	(setup_widgets), (comp_editor_init), (comp_editor_set_changed),
-	(comp_editor_append_page), (comp_editor_notify_client_changed):
-	Add only the event page into the notebook.
-	* gui/dialogs/event-editor.c: (menu_view_attendee_cb),
-	(menu_view_role_cb), (menu_view_status_cb), (menu_view_type_cb),
-	(menu_view_rsvp_cb), (menu_action_alarm_cb),
-	(menu_show_time_busy_cb), (menu_all_day_event_cb),
-	(menu_show_time_zone_cb), (menu_show_categories_cb),
-	(menu_class_public_cb), (menu_class_private_cb),
-	(menu_class_confidential_cb), (menu_action_recurrance_cb),
-	(menu_action_freebusy_cb), (menu_action_alarm_cmd),
-	(menu_all_day_event_cmd), (menu_show_time_zone_cmd),
-	(menu_action_recurrance_cmd), (menu_action_freebusy_cmd),
-	(menu_insert_send_options_cmd), (event_editor_init),
-	(event_editor_construct), (event_editor_edit_comp),
-	(event_editor_send_comp), (event_editor_finalize), (show_meeting),
-	(event_editor_show_meeting): Added the menu and tool bar. Schedule
-       	page and recurrence page are shown as dialogs.	
-	* gui/dialogs/event-page.h:
-	* gui/dialogs/event-page.c: (event_page_init), (cleanup_attendees),
-	(event_page_finalize), (set_classification_menu),
-	(set_busy_time_menu), (enable_busy_time_menu),
-	(set_all_day_event_menu), (set_all_day), (update_time),
-	(clear_widgets), (event_page_set_view_attendee),
-	(event_page_set_view_role), (event_page_set_view_status),
-	(event_page_set_view_type), (event_page_set_view_rsvp),
-	(event_page_set_classification), (sensitize_widgets),
-	(event_page_hide_options), (event_page_show_options),
-	(event_page_set_meeting), (event_page_set_delegate),
-	(get_current_account), (event_page_fill_widgets),
-	(event_page_fill_component), (time_sel_changed), (add_clicked_cb),
-	(existing_attendee), (remove_attendee), (remove_clicked_cb),
-	(invite_cb), (attendee_added_cb), (popup_add_cb),
-	(popup_delete_cb), (context_popup_free), (button_press_event),
-	(list_view_event), (list_key_press),
-	(event_page_set_all_day_event), (event_page_set_show_time_busy),
-	(event_page_show_alarm), (event_page_set_show_timezone),
-	(event_page_set_show_categories), (get_widgets),
-	(summary_changed_cb), (notify_dates_changed), (times_updated),
-	(start_timezone_changed_cb), (event_page_sendoptions_clicked_cb),
-	(init_widgets), (event_page_construct), (event_page_new),
-	(event_page_create_source_option_menu), (set_attendees),
-	(event_page_get_cancel_comp):
-	* gui/dialogs/event-page.glade: UI Changes to have the event 
-	page alone.
-	* gui/dialogs/task-editor.c: (task_editor_construct),
-	(task_editor_edit_comp), (show_assignment):
-	* gui/dialogs/memo-editor.c: (memo_editor_construct): Make changes
-	for append page function.
-	* gui/dialogs/schedule-page.c: (schedule_page_construct): Set the 
-	size of the meeting time selector.
-
-2005-11-09  Chenthill Palanisamy  <pchenthill@novell.com>
+	Fixes #312533
+	*gui/e-day-view.c (e_day_view_finish_resize): set the start and end date properly
 
-	Fixes #313538
-	* gui/dialogs/event-editor.c: 
-	(event_editor_edit_comp): Do not remove the attendees. Removed
-	the obsolete code as scheduling and meeting pages will be created
-	only for meetings now.
-
-2005-11-10  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #321088
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct):
-	(e_meeting_time_selector_style_set),
-	(e_meeting_time_selector_ensure_meeting_time_shown): Set the 
-	scroll_increment to days width. Show only 35 days in the canvas
-	since we query freebusy only for those. Set the canvas view to 
-	meetings day start instead of time.
-
-2005-11-09  Veerapuram Varadhan <vvaradhan@novell.com>
-
-	Committing for Nathan Owens <pianocomp81@yahoo.com>	
-	
-	* calendar/conduit/todo/todo-conduit.c (local_record_from_comp)
-	(comp_from_remote_record) (post_sync) (add_category_if_possible):
-	Category syncing in todo-conduits.
-	
-2005-11-09  Dinesh Layek <LDinesh@novell.com>
+2005-11-09  Dinesh Layek  <LDinesh@novell.com>
 
 	Fixes #273322
-	* gui/e-pub-utils.c
-	(e_pub_publish): removed the source from uri->calendars when the 
-	calendar backend no longer exists.
+	*gui/e-pub-utils.c (e_pub_publish): removed the source from uri->calendars
+	when the calendar backend no longer exists.
 	
 2005-11-08  P. S. Chakravarthi <pchakravarthi@novell.com>
 
-	Fixes #316710
-	* gui/alarm-notify/alarm-notify.c 
+	Fixes 316710
+	* gui/alarm-notify/alarm-notify.c
 	(alarm_notify_add_calendars): modified the code to
 	generate the correct key for obtaining the password
 	for an authenticated calendar.
-
-2005-11-08  P. S. Chakravarthi <pchakravarthi@novell.com>
-
-	Fixes 319217
-	* gui/alarm-notify/alarm-queue.c (load_alarms_for_today):
-	changed the code to load alarms from current day beginning if
-	last notification time is beyond current day's begin time and
-	* gui/alarm-notify/alarm.c (setup_timeout):
-	removed the check which sees if the alarm's trigger time has
-	got past current time so that alarms missed in current day are
-	always shown.
-
+	
 2005-10-21  Mubeen Jukaku  <jmubeen@novell.com>
 
 	Sankar Committting for Mubeen
@@ -382,161 +67,6 @@
 	Connect signal to catch the scroll-event on the widget of date navigator 
 	and handle the GDK_SCROLL_UP,GDK_SCROLL_DOWN in the callback.
 
-		
-2005-10-19  Harish Krishnaswamy <kharish@novell.com>
-
-	Committing for Nathan Owens <pianocomp81@yahoo.com>
-	
-	* calendar.error.xml: Added strings for memos
-	* calendar/conduits/Makefile.am: added 'memo' to SUBDIRS
-	* calendar/conduits/memo/*: initial memo conduit
-	* calendar/gui/calendar-config.[ch]: (calendar_config_get_memos_selected)
-	(calendar_config_set_memos_selected) (calendar_config_add_notification_memos_selected): 
-	gconf get/set for memos lists
-	* calendar/gui/calendar-config-keys.h: added gconf keys for Memos component
-	* calendar/gui/comp-util.[ch] (cal_comp_memo_new_with_defaults): added function
-	to create memo component with defaults
-	* calendar/gui/e-cal-component-memo-preview.[ch]: initial file for preview of a memo
-	* calendar/gui/e-cal-model-memos.[ch]: initial model for the memos component.
-	* calendar/gui/e-memos.[ch]: initial memos base
-	* calendar/gui/e-memo-table.[ch]: initial view for memos component
-	* calendar/gui/e-memo-table.etspec: etspec for memos e-table
-	* calendar/gui/e-memo-table-config.[ch]: initial configuration for memos e-table view
-	* calendar/gui/GNOME_Evolution_Calendar.server.in.in: added Memos component
-	* calendar/gui/main.c: added initialization code for Memos component
-	* calendar/gui/Makefile.am: added entries for new files for Memos component
-	* calendar/gui/memos-component.[ch]: Memos component base code
-	* calendar/gui/memos-control.[ch]: initial user control code. Used for printing,
-	copying, etc.
-	* calendar/gui/migration.c: added migration for memos component - also takes care
-	of initialization for the first time the Memos component is run.
-	* calendar/gui/dialogs/calendar-setup.[ch]: added code to create a new Memo List
-	* calendar/gui/dialogs/Makefile.am: added files for build
-	* calendar/gui/dialogs/memo-editor.[ch]: initial memo editor
-	* calendar/gui/dialogs/memo-page.[ch]: page in editor for editing a memo
-	* calendar/gui/dialogs/memo-page.glade: glade file for memo-editor-page
-	* calendar/gui/dialogs/send-comp.c: added E_CAL_COMPONENT_JOURNAL support for Memo
-	component
-	
-2005-10-18  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #308802
-	* gui/calendar-component.c: (setup_create_ecal):
-	* gui/dialogs/event-page.c: (source_changed_cb):
-	* gui/dialogs/task-page.c: (source_changed_cb):
-	* gui/e-itip-control.c: (cal_opened_cb), (start_calendar_server),
-	(find_cal_opened_cb):
-	* gui/e-tasks.c: (set_timezone), (client_cal_opened_cb),
-	(default_client_cal_opened_cb), (open_ecal):
-	* gui/gnome-cal.c: (client_cal_opened_cb),
-	(default_client_cal_opened_cb), (open_ecal),
-	(gnome_calendar_set_default_source):
-	* gui/tasks-component.c: (setup_create_ecal): Set the default
-	timezone in the ecal once its created and before opening ecal.
-
-2005-10-18  Srinivasa Ragavan <sragavan@novell.com>
-
-	* gui/dialogs/comp-editor.c: (open_attachment)
-	(attachment_bar_icon_clicked_cb), (cab_open), (cab_popup),
-	(button_press_event): Handles the popup menu on the attachment
-	bar.
-	* gui/e-cal-popup.c: (temp_save_part), (ecalp_part_popup_saveas),
-	(ecalp_part_popup_save_selected),
-	(ecalp_part_popup_set_background), (ecalp_apps_open_in),
-	(ecalp_apps_popup_free), (ecalp_standard_items_free),
-	(ecalp_standard_menu_factory), (ecalp_class_init),
-	(e_cal_popup_target_new_attachments): Provides the background
-	image setting, open with application for each attachment.
-	* gui/e-cal-popup.h:
-	* gui/e-calendar-table.c: (e_calendar_table_on_save_as)
-	* gui/e-calendar-view.c: (on_save_as): Change the parameters to
-	e_file_dialog_save.
-
-2005-10-17 Irene Huang <Irene.Huang@sun.com> 
-
-	* gui/e-tasks.c: (e_tasks_show_preview): Should not return a value, so, 
-	change all the g_return_val_if_fail to g_return_if_fail.
-
-2005-10-10  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #266144, 317575, 313725.
-	* gui/alarm-notify/alarm-queue.c: (remove_queued_alarm),
-	(add_component_alarms), (lookup_comp_queued_alarms), (remove_comp),
-	(query_objects_changed_cb), (compare_ids),
-	(alarm_queue_add_client), (add_id_cb), (remove_client_alarms),
-	(update_cqa): 
-	* gui/e-cal-model.c (search_by_id_and_client):Use ECalComponentId.
-	(e_cal_view_objects_added_cb), (e_cal_view_objects_modified_cb),
-	(e_cal_view_objects_removed_cb),
-	(e_cal_model_get_component_for_uid),
-	(e_cal_model_set_instance_times): set the proper timezone.
-	* gui/e-cal-model.h:
-	* gui/e-calendar-view.c: (delete_event): Do not remove the 
-	recurrence id.
-	* gui/e-calendar-table.c (hide_completed_rows),
-	(show_completed_rows): Use ECalComponentId to get a component
-	for model.
-	* gui/gnome-cal.c: (dn_e_cal_view_objects_removed_cb):
-
-2005-10-06  Srinivasa Ragavan <sragavan@novell.com>
-
-	* calendar.error.xml: Added accels to the Disard new event/
-	task dialog.
-
-	* gui/apps_evolution_calendar.schemas.in.in: Added new key
-	for storing the presence of preview.
-
-	* gui/calendar-config-keys.h: Added key for preview status
-
-	* gui/calendar-config.[ch] (calendar_config_set_vpane_pos): Added
-	functions to get preview status.
-
-	* gui/e-meeting-list-view.c (build_table): makes the invites
-	tab list view tabs resizable and reorderable.
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct): Made
-	the recursive not show status and type.
-
-	* gui/e-tasks.[ch] (setup_widgets) (e_tasks_new_task): made a provsion
-	to show/hide the preview.
-
-	* gui/tasks-control.c (tasks_control_activate)
-	(tasks_control_forward_cmd): Added bonobo interface to show/hide
-	preview pane.
-
-	* gui/dialogs/comp-editor.c (attachment_bar_changed_cb) (setup_widgets) 
-	(comp_editor_append_page) (set_attachment_list): Added expander
-	for attachment bar.
-
-	* gui/dialogs/event-editor.c (event_editor_construct) (event_editor_edit_comp)
-	(show_meeting): Added accelerators for the comp editor dialogs for
-	tasks, event, meeting etc.
-
-	* gui/dialogs/event-page.glade: key accelerator for 'busy'
-
-	* gui/dialogs/meeting-page.c (remove_clicked_cb) (client_changed_cb) 
-	(popup_delete_cb) (button_press_event) (meeting_page_construct) 
-	
-	* gui/dialogs/meeting-page.glade: key accelerators for dialog.
-	
-	* gui/dialogs/task-details-page.glade: key accelerators for dialog.
-
-	* gui/dialogs/task-editor.c (task_editor_construct) (task_editor_edit_comp)
-	(show_assignment): Key accelerators for task tab 
-
-	* gui/dialogs/task-page.glade: key accelerators for task dialog
-
-
-2005-10-02  Srinivasa Ragavan <sragavan@novell.com>
-	
-	Provides across calendars keyboard accelerators for popup menus
-
-	* gui/calendar-component.c (ecc_source_popups):
-	* gui/e-calendar-view.c (ecv_main_items) (ecv_main_items):
-	* gui/gnome-cal.c (gc_popups):
-	* gui/tasks-component.c (etc_source_popups):
-	Added Keybinding for popup menu.
-	
 2005-09-30  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	Fixes #315095
@@ -643,7 +173,7 @@
 	* gui/dialogs/recurrence-page.c (clear_widgets):
 	Changed parameter ENDING_FOREVER to ENDING_FOR while invoking 
 	e_dialog_option_menu_set, invoked make_ending_count_special ().
-
+	  
 2005-09-30  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	Fixes #273781
@@ -680,15 +210,15 @@
 	the list selection changes.
 
 	Reworked the patch from Dinesh Layek <ldinesh@novell.com>
-
+	 
 2005-08-29  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	* gui/e-calendar-table.c (e_calendar_table_open_task): Set the 
 	USER_ORG flag while converting a personal task to assigned one.
 
-2005-09-28  Viren.L  <lviren@novell.com>
-
+2005-09-29  Viren.L  <lviren@novell.com>
 	Fixes #317014
+	
 	* gui/e-calendar-table.c (e_calendar_table_open_task):
 	Set the flags in e_calendar_table_open_task.
 	* gui/gnome-cal.c (gnome_calendar_new_task):set the NEW_ITEM flag.
@@ -701,15 +231,6 @@
 	* gui/dialogs/task-editor.[ch]: Changed parameters for task_editor_new and
 	  task_editor_construct.
 
-2005-09-28  Tor Lillqvist  <tml@novell.com>
-
-	* gui/e-cal-model-calendar.c (set_transparency)
-	* gui/e-cal-model.c (set_classification)
-	* gui/itip-bonobo-control.c (pstream_load, pstream_save): Use
-	g_ascii_strcasecmp() instead of strcasecmp(). We are comparing to
-	literal ASCII strings, just casefolding ASCII is enough. Also
-	better for portability.
-
 2005-09-08  P. S. Chakravarthi <pchakravarthi@novell.com>
 
 	Fix #261625
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index 4aa356af3e..667ba997b0 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -32,19 +32,17 @@
 #include <gtk/gtksignal.h>
 #include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtkwindow.h>
-#include <gtk/gtk.h>
 #include <libgnome/gnome-i18n.h>
 #if 0 
 #  include <libgnomeui/gnome-winhints.h>
 #endif
 #include <glade/glade.h>
-#include <libedataserver/e-time-utils.h>
+#include <e-util/e-time-utils.h>
 #include <libecal/e-cal-time-util.h>
 #include "alarm-notify-dialog.h"
 #include "config-data.h"
 #include "util.h"
 #include <e-util/e-icon-factory.h>
-#include <e-util/e-util-private.h>
 
 
 	
@@ -219,14 +217,8 @@ notified_alarms_dialog_new (void)
 			G_TYPE_POINTER, /* End */
 		
 			G_TYPE_POINTER /* FuncInfo*/));
-	char *gladefile;
 	 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
-				      "alarm-notify.glade",
-				      NULL);
-	an->xml = glade_xml_new (gladefile, NULL, NULL);
-	g_free (gladefile);
-
+	an->xml = glade_xml_new (EVOLUTION_GLADEDIR "/alarm-notify.glade", NULL, NULL);
 	if (!an->xml) {
 		g_message ("alarm_notify_dialog(): Could not load the Glade XML file!");
 		g_free (an);
@@ -303,6 +295,7 @@ notified_alarms_dialog_new (void)
 	return na;
 }
  
+ 
 /**
  * add_alarm_to_notified_alarms_dialog:
  * @na: Pointer to the dialog-info
@@ -400,11 +393,6 @@ static void
 fill_in_labels (AlarmNotify *an, const gchar *summary, const gchar *description, 
 		const gchar *location, time_t occur_start, time_t occur_end)
 {
-	GtkTextTagTable *table = gtk_text_tag_table_new ();
-	GtkTextBuffer *buffer =  gtk_text_buffer_new (table);
-	gtk_text_buffer_set_text (buffer, description, -1);
-	gtk_text_view_set_buffer (GTK_TEXT_VIEW (an->description), buffer);
-	gtk_label_set_text (GTK_LABEL (an->location), location);
-	g_object_unref (table);
-	g_object_unref (buffer);
+	gtk_label_set_text (GTK_LABEL (an->description), description);
+	gtk_label_set_text (GTK_LABEL (an->location), location);		  
 }
diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c
index edef6d34bb..a74908bb2c 100644
--- a/calendar/gui/alarm-notify/alarm-notify.c
+++ b/calendar/gui/alarm-notify/alarm-notify.c
@@ -33,6 +33,7 @@
 #include "config-data.h"
 #include "common/authentication.h"
 
+
 /* Private part of the AlarmNotify structure */
 struct _AlarmNotifyPrivate {
 	/* Mapping from EUri's to LoadedClient structures */
@@ -40,7 +41,6 @@ struct _AlarmNotifyPrivate {
 	   just need to hash based on source */
 	GHashTable *uri_client_hash [E_CAL_SOURCE_TYPE_LAST];
         ESourceList *source_lists [E_CAL_SOURCE_TYPE_LAST];	
-	ESourceList *selected_calendars;
         GMutex *mutex;
 };
 
@@ -54,6 +54,7 @@ static void alarm_notify_finalize (GObject *object);
 static BonoboObjectClass *parent_class;
 
 
+
 BONOBO_TYPE_FUNC_FULL(AlarmNotify, GNOME_Evolution_Calendar_AlarmNotify, BONOBO_TYPE_OBJECT, alarm_notify)
 
 /* Class initialization function for the alarm notify service */
@@ -139,10 +140,6 @@ list_changed_cb (ESourceList *source_list, gpointer data)
 		for (q = sources; q != NULL; q = q->next) {
 			ESource *source = E_SOURCE (q->data);
 			char *uri;
-			const char *uid = e_source_peek_uid (source);
-
-			if (!e_source_list_peek_source_by_uid (priv->selected_calendars, uid)) 
-				continue;
 			
 			uri = e_source_get_uri (source);
 			if (!g_hash_table_lookup (priv->uri_client_hash[source_type], uri)) {
@@ -166,11 +163,6 @@ list_changed_cb (ESourceList *source_list, gpointer data)
 	g_list_free (prd.removals);
 }
 
-ESourceList *
-alarm_notify_get_selected_calendars (AlarmNotify *an)
-{
-	return an->priv->selected_calendars;
-}
 static void
 load_calendars (AlarmNotify *an, ECalSourceType source_type)
 {
@@ -195,10 +187,6 @@ load_calendars (AlarmNotify *an, ECalSourceType source_type)
 		for (q = sources; q != NULL; q = q->next) {
 			ESource *source = E_SOURCE (q->data);
 			char *uri;
-			const char *uid = e_source_peek_uid (source);
-
-			if (!e_source_list_peek_source_by_uid (priv->selected_calendars, uid)) 
-				continue;
 			
 			uri = e_source_get_uri (source);
 			g_message ("Loading %s", uri);
@@ -236,13 +224,11 @@ alarm_notify_init (AlarmNotify *an, AlarmNotifyClass *klass)
 	priv = g_new0 (AlarmNotifyPrivate, 1);
 	an->priv = priv;
 	priv->mutex = g_mutex_new ();
-	priv->selected_calendars = config_data_get_calendars ("/apps/evolution/calendar/notify/calendars");
-
 
 	for (i = 0; i < E_CAL_SOURCE_TYPE_LAST; i++)
 		priv->uri_client_hash[i] = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
 
-	alarm_queue_init (an);
+	alarm_queue_init ();
 
 	for (i = 0; i < E_CAL_SOURCE_TYPE_LAST; i++)
 		load_calendars (an, i);
@@ -358,7 +344,6 @@ alarm_notify_add_calendar (AlarmNotify *an, ECalSourceType source_type,  ESource
 	if (g_hash_table_lookup (priv->uri_client_hash[source_type], str_uri)) {
 		g_mutex_unlock (an->priv->mutex);
 		g_free (str_uri);
-		g_free (pass_key);
 		return;
 	}
 	/* if loading of this requires password and password is not currently availble in e-password
@@ -371,7 +356,6 @@ alarm_notify_add_calendar (AlarmNotify *an, ECalSourceType source_type,  ESource
 		g_free (pass_key);
 		return;
 	}
-	
 	client = auth_new_cal_from_source (source, source_type);
 
 	if (client) {
@@ -379,8 +363,8 @@ alarm_notify_add_calendar (AlarmNotify *an, ECalSourceType source_type,  ESource
 		g_signal_connect (G_OBJECT (client), "cal_opened", G_CALLBACK (cal_opened_cb), an);
 		e_cal_open_async (client, FALSE);
 	}
-	g_free (str_uri);
 	g_free (pass_key);
+	g_free (str_uri);
 	g_mutex_unlock (an->priv->mutex);
 }
 
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 83372f886f..e9f7b76c5a 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -27,19 +27,14 @@
 #include <bonobo-activation/bonobo-activation.h>
 #include <bonobo/bonobo-object.h>
 #include <bonobo/bonobo-exception.h>
-#include <bonobo/bonobo-main.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtkbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
 #include <gtk/gtkdialog.h>
 #include <gtk/gtkeventbox.h>
 #include <gtk/gtkimage.h>
-#include <gtk/gtkframe.h>
 #include <gtk/gtkimagemenuitem.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkcheckmenuitem.h>
 #include <gtk/gtkstock.h>
 #include <gtk/gtktooltips.h>
 #include <libgnome/gnome-i18n.h>
@@ -50,18 +45,10 @@
 #include <e-util/eggtrayicon.h>
 #include <e-util/e-icon-factory.h>
 #include <libecal/e-cal-time-util.h>
-#include <libecal/e-cal-component.h>
-
-
-#ifdef HAVE_LIBNOTIFY
-#include <libnotify/notify.h>
-#endif
-
 #include "evolution-calendar.h"
 #include "alarm.h"
 #include "alarm-notify-dialog.h"
 #include "alarm-queue.h"
-#include "alarm-notify.h"
 #include "config-data.h"
 #include "util.h"
 #include "e-util/e-popup.h"
@@ -86,13 +73,6 @@ static GHashTable *client_alarms_hash = NULL;
 /* List of tray icons being displayed */
 static GList *tray_icons_list = NULL;
 
-/* Top Tray Image */
-static GtkWidget *tray_image = NULL;
-static GtkWidget *tray_event_box = NULL;
-static int tray_blink_id = -1;
-static int tray_blink_state = FALSE;
-static AlarmNotify *an;
-
 /* Structure that stores a client we are monitoring */
 typedef struct {
 	/* Monitored client */
@@ -118,7 +98,7 @@ typedef struct {
 	ClientAlarms *parent_client;
 
 	/* The component's UID */
-	ECalComponentId *id;
+	char *uid;
 
 	/* The actual component and its alarm instances */
 	ECalComponentAlarms *alarms;
@@ -156,10 +136,7 @@ static void display_notification (time_t trigger, CompQueuedAlarms *cqa,
 static void audio_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id);
 static void mail_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id);
 static void procedure_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id);
-#ifdef HAVE_LIBNOTIFY
-static void popup_notification (time_t trigger, CompQueuedAlarms *cqa,
-				  gpointer alarm_id, gboolean use_description);
-#endif
+
 static void query_objects_changed_cb (ECal *client, GList *objects, gpointer data);
 static void query_objects_removed_cb (ECal *client, GList *objects, gpointer data);
 
@@ -291,9 +268,9 @@ remove_queued_alarm (CompQueuedAlarms *cqa, gpointer alarm_id,
 		return;
 
 	if (free_object) {
-		g_hash_table_remove (cqa->parent_client->uid_alarms_hash, cqa->id);
-		e_cal_component_free_id (cqa->id);
-		cqa->id = NULL;
+		g_hash_table_remove (cqa->parent_client->uid_alarms_hash, cqa->uid);
+		g_free (cqa->uid);
+		cqa->uid = NULL;
 		cqa->parent_client = NULL;
 		e_cal_component_alarms_free (cqa->alarms);
 		g_free (cqa);
@@ -332,9 +309,6 @@ alarm_trigger_cb (gpointer alarm_id, time_t trigger, gpointer data)
 	alarm = e_cal_component_get_alarm (comp, qa->instance->auid);
 	g_assert (alarm != NULL);
 
-	/* Show it independent of what the notification is?*/
-	display_notification (trigger, cqa, alarm_id, TRUE);
-
 	e_cal_component_alarm_get_action (alarm, &action);
 	e_cal_component_alarm_free (alarm);
 
@@ -344,9 +318,7 @@ alarm_trigger_cb (gpointer alarm_id, time_t trigger, gpointer data)
 		break;
 
 	case E_CAL_COMPONENT_ALARM_DISPLAY:
-#ifdef HAVE_LIBNOTIFY
-		popup_notification (trigger, cqa, alarm_id, TRUE);
-#endif
+		display_notification (trigger, cqa, alarm_id, TRUE);
 		break;
 
 	case E_CAL_COMPONENT_ALARM_EMAIL:
@@ -369,7 +341,7 @@ alarm_trigger_cb (gpointer alarm_id, time_t trigger, gpointer data)
 static void
 add_component_alarms (ClientAlarms *ca, ECalComponentAlarms *alarms)
 {
-	ECalComponentId *id;
+	const char *uid;
 	CompQueuedAlarms *cqa;
 	GSList *l;
 
@@ -412,10 +384,13 @@ add_component_alarms (ClientAlarms *ca, ECalComponentAlarms *alarms)
 		cqa->queued_alarms = g_slist_prepend (cqa->queued_alarms, qa);
 	}
 
-	id = e_cal_component_get_id (alarms->comp);
+	e_cal_component_get_uid (alarms->comp, &uid);
 
 	/* If we failed to add all the alarms, then we should get rid of the cqa */
 	if (cqa->queued_alarms == NULL) {
+		g_message ("add_component_alarms(): Could not add any of the alarms "
+			   "for the component `%s'; discarding it...", uid);
+
 		e_cal_component_alarms_free (cqa->alarms);
 		cqa->alarms = NULL;
 
@@ -424,8 +399,8 @@ add_component_alarms (ClientAlarms *ca, ECalComponentAlarms *alarms)
 	}
 
 	cqa->queued_alarms = g_slist_reverse (cqa->queued_alarms);
-	cqa->id = id;
-	g_hash_table_insert (ca->uid_alarms_hash, cqa->id, cqa);
+	cqa->uid = g_strdup (uid);
+	g_hash_table_insert (ca->uid_alarms_hash, cqa->uid, cqa);
 }
 
 /* Loads the alarms of a client for a given range of time */
@@ -477,19 +452,18 @@ load_alarms (ClientAlarms *ca, time_t start, time_t end)
 static void
 load_alarms_for_today (ClientAlarms *ca)
 {
-	time_t now, from, day_end, day_start;
+	time_t now, from, day_end;
 	icaltimezone *zone;
 
 	now = time (NULL);
-	zone = config_data_get_timezone ();
-	day_start = time_day_begin_with_zone (now, zone);
 
 	/* Make sure we don't miss some events from the last notification.
 	 * We add 1 to the saved_notification_time to make the time ranges
 	 * half-open; we do not want to display the "last" displayed alarm
 	 * twice, once when it occurs and once when the alarm daemon restarts.
 	 */
-	from = MAX (config_data_get_last_notification_time () + 1, day_start);
+	from = MIN (config_data_get_last_notification_time () + 1, now);
+	zone = config_data_get_timezone ();
 
 	g_message ("Loading alarms for today");
 	day_end = time_day_end_with_zone (now, zone);
@@ -512,9 +486,9 @@ cal_opened_cb (ECal *client, ECalendarStatus status, gpointer data)
 
 /* Looks up a component's queued alarm structure in a client alarms structure */
 static CompQueuedAlarms *
-lookup_comp_queued_alarms (ClientAlarms *ca, const ECalComponentId *id)
+lookup_comp_queued_alarms (ClientAlarms *ca, const char *uid)
 {
-	return g_hash_table_lookup (ca->uid_alarms_hash, id);
+	return g_hash_table_lookup (ca->uid_alarms_hash, uid);
 }
 
 static void
@@ -541,11 +515,11 @@ remove_alarms (CompQueuedAlarms *cqa, gboolean free_object)
 
 /* Removes a component an its alarms */
 static void
-remove_comp (ClientAlarms *ca, const ECalComponentId *id)
+remove_comp (ClientAlarms *ca, const char *uid)
 {
 	CompQueuedAlarms *cqa;
 
-	cqa = lookup_comp_queued_alarms (ca, id);
+	cqa = lookup_comp_queued_alarms (ca, uid);
 	if (!cqa)
 		return;
 
@@ -559,7 +533,7 @@ remove_comp (ClientAlarms *ca, const ECalComponentId *id)
 	/* The list should be empty now, and thus the queued component alarms
 	 * structure should have been freed and removed from the hash table.
 	 */
-	g_assert (lookup_comp_queued_alarms (ca, id) == NULL);
+	g_assert (lookup_comp_queued_alarms (ca, uid) == NULL);
 }
 
 /* Called when a calendar component changes; we must reload its corresponding
@@ -589,30 +563,22 @@ query_objects_changed_cb (ECal *client, GList *objects, gpointer data)
 	day_end = time_day_end_with_zone (time (NULL), zone);
 	g_message ("Query response for alarms");
 	for (l = objects; l != NULL; l = l->next) {
-		ECalComponentId *id;
+		const char *uid;
 		GSList *sl;
-		ECalComponent *comp = e_cal_component_new ();
 
-		e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (l->data));
-
-		id = e_cal_component_get_id (comp);
-		found = e_cal_get_alarms_for_object (ca->client, id, from, day_end, &alarms);
+		uid = icalcomponent_get_uid (l->data);
+		found = e_cal_get_alarms_for_object (ca->client, uid, from, day_end, &alarms);
 
 		if (!found) {
 			g_message ("No alarms found on object");
-			remove_comp (ca, id);
-			e_cal_component_free_id (id);
-			g_object_unref (comp);
-			comp = NULL;
+			remove_comp (ca, uid);
 			continue;
 		}
 
-		cqa = lookup_comp_queued_alarms (ca, id);
+		cqa = lookup_comp_queued_alarms (ca, uid);
 		if (!cqa) {
 			g_message ("No currently queue alarms");
 			add_component_alarms (ca, alarms);
-			g_object_unref (comp);
-			comp = NULL;
 			continue;
 		}
 
@@ -622,7 +588,11 @@ query_objects_changed_cb (ECal *client, GList *objects, gpointer data)
 		if (alarms == NULL || alarms->alarms == NULL) {
 		
 			/* update the cqa and its queued alarms for changes in summary and alarm_uid  */
-			update_cqa (cqa, comp);
+			ECalComponent *newcomp = e_cal_component_new ();
+			if (!e_cal_component_set_icalcomponent (newcomp, icalcomponent_new_clone (l->data)))
+				g_warning ("couldn't update calendar component with modified data from backend\n");
+
+			update_cqa (cqa, newcomp);
 
 			if (alarms)
 				e_cal_component_alarms_free (alarms);
@@ -658,8 +628,6 @@ query_objects_changed_cb (ECal *client, GList *objects, gpointer data)
 		}
 		
 		cqa->queued_alarms = g_slist_reverse (cqa->queued_alarms);
-		g_object_unref (comp);
-		comp = NULL;
 	}
 }
 
@@ -763,7 +731,6 @@ typedef struct {
 	char *description;
 	char *location;
 	gboolean blink_state;
-	gboolean snooze_set;
 	gint blink_id;
 	time_t trigger;
 	CompQueuedAlarms *cqa;
@@ -777,43 +744,6 @@ typedef struct {
 } TrayIconData;
 
 static void
-free_tray_icon_data (TrayIconData *tray_data)
-{
-	g_return_if_fail (tray_data != NULL);
-
-	if (tray_data->summary){
-		g_free (tray_data->summary);
-		tray_data->summary = NULL;
-	}
-
-	if (tray_data->description){
-		g_free (tray_data->description);
-		tray_data->description = NULL;
-	}
-
-	if (tray_data->location){
-		g_free (tray_data->description);
-		tray_data->location = NULL;
-	}
-
-	g_object_unref (tray_data->client);
-	tray_data->client = NULL;
-
-	g_object_unref (tray_data->query);
-	tray_data->query = NULL;
-
-	g_object_unref (tray_data->comp);
-	tray_data->comp = NULL;
-	
-	tray_data->cqa = NULL;
-	tray_data->alarm_id = NULL;
-	tray_data->tray_icon = NULL;
-	tray_data->image = NULL;
-
-	g_free (tray_data);
-}
-
-static void
 on_dialog_objs_removed_cb (ECal *client, GList *objects, gpointer data)
 {
 	const char *our_uid;
@@ -832,8 +762,8 @@ on_dialog_objs_removed_cb (ECal *client, GList *objects, gpointer data)
 		if (!strcmp (uid, our_uid)) {
 			tray_data->cqa = NULL;
 			tray_data->alarm_id = NULL;
-			tray_icons_list = g_list_remove (tray_icons_list, tray_data);
-			tray_data = NULL;
+
+			gtk_widget_destroy (tray_data->tray_icon);
 		}
 	}
 }
@@ -850,7 +780,8 @@ notify_dialog_cb (AlarmNotifyResult result, int snooze_mins, gpointer data)
 	switch (result) {
 	case ALARM_NOTIFY_SNOOZE:
 		create_snooze (tray_data->cqa, tray_data->alarm_id, snooze_mins);
-		tray_data->snooze_set = TRUE;
+		tray_data->cqa = NULL;
+	
 		if (alarm_notifications_dialog) {
 			GtkTreeSelection *selection = 
 				gtk_tree_view_get_selection (
@@ -858,7 +789,7 @@ notify_dialog_cb (AlarmNotifyResult result, int snooze_mins, gpointer data)
 			GtkTreeIter iter;
 			GtkTreeModel *model = NULL;
 			
-			/* We can` also use tray_data->iter */
+			/* We can also use tray_data->iter */
 			if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
 				gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
 				if (!gtk_tree_model_get_iter_first (model, &iter)) {
@@ -879,12 +810,18 @@ notify_dialog_cb (AlarmNotifyResult result, int snooze_mins, gpointer data)
 	case ALARM_NOTIFY_EDIT:
 		edit_component (tray_data->client, tray_data->comp);
 
+		gtk_widget_destroy (alarm_notifications_dialog->dialog);
+		g_free (alarm_notifications_dialog);
+		alarm_notifications_dialog = NULL;
+
+		gtk_widget_destroy (tray_data->tray_icon);
+		
 		break;
 
 	case ALARM_NOTIFY_CLOSE:
 
+		
 		if (alarm_notifications_dialog) {
-			GList *list;
 			GtkTreeIter iter;
 			GtkTreeModel *model = 
 				gtk_tree_view_get_model (
@@ -900,37 +837,56 @@ notify_dialog_cb (AlarmNotifyResult result, int snooze_mins, gpointer data)
 			gtk_widget_destroy (alarm_notifications_dialog->dialog);
 			g_free (alarm_notifications_dialog);
 			alarm_notifications_dialog = NULL;
+		}
+		
+		gtk_widget_destroy (tray_data->tray_icon);	
 		
-			/* FIXME tray_icons_list is a global data structure - make this thread safe */
+		break;
 
-			list = tray_icons_list;
-			while (list != NULL) {
+	default:
+		g_assert_not_reached ();
+	}
 
-				tray_data = list->data;
+	return;
+}
+
+static gint
+tray_icon_destroyed_cb (GtkWidget *tray, gpointer user_data)
+{
+	TrayIconData *tray_data = user_data;
 	
-				if (!tray_data->snooze_set){
-					GList *temp = list->next;
-					tray_icons_list = g_list_remove_link (tray_icons_list, list);
+	g_signal_handlers_disconnect_matched (tray_data->query, G_SIGNAL_MATCH_FUNC,
+					      0, 0, NULL, on_dialog_objs_removed_cb, NULL);
+
+	if (tray_data->cqa != NULL)
 		remove_queued_alarm (tray_data->cqa, tray_data->alarm_id, TRUE, TRUE);
-					free_tray_icon_data (tray_data);
-					tray_data = NULL;
-					g_list_free_1 (list);
-					if (tray_icons_list != list)	/* List head is modified */
-						list = tray_icons_list;
-					else 
-						list = temp;
-				} else
-					list = list->next;
-	}
+
+	if (tray_data->summary != NULL) {
+		g_free (tray_data->summary);
+		tray_data->summary = NULL;
 	}
 
-		break;
+	if (tray_data->description != NULL) {
+		g_free (tray_data->description);
+		tray_data->description = NULL;
+	}
 
-	default:
-		g_assert_not_reached ();
+	if (tray_data->location != NULL) {
+		g_free (tray_data->location);
+		tray_data->location = NULL;
 	}
 
-	return;
+	if (tray_data->blink_id)
+		g_source_remove (tray_data->blink_id);
+
+	g_object_unref (tray_data->comp);
+	g_object_unref (tray_data->client);
+	g_object_unref (tray_data->query);
+
+	tray_icons_list = g_list_remove (tray_icons_list, tray_data);
+	g_free (tray_data);
+
+	return TRUE;
 }
 
 /* Callbacks.  */
@@ -941,19 +897,8 @@ open_alarm_dialog (TrayIconData *tray_data)
 	
 	qa = lookup_queued_alarm (tray_data->cqa, tray_data->alarm_id);
 	if (qa) {
-		GdkPixbuf *pixbuf;
-		GtkTooltips *tooltips = gtk_tooltips_new ();
-		
-		pixbuf = e_icon_factory_get_icon ("stock_appointment-reminder", E_ICON_SIZE_LARGE_TOOLBAR);
-
-		gtk_image_set_from_pixbuf (GTK_IMAGE (tray_image), pixbuf);
-		g_object_unref (pixbuf);	
-
-		if (tray_blink_id > -1)
-			g_source_remove (tray_blink_id);
-		tray_blink_id = -1;
 		
-		gtk_tooltips_set_tip (tooltips, tray_event_box, NULL, NULL);
+		gtk_widget_hide (tray_data->tray_icon);
 	
 		if (!alarm_notifications_dialog)
 			alarm_notifications_dialog = notified_alarms_dialog_new ();
@@ -989,193 +934,37 @@ open_alarm_dialog (TrayIconData *tray_data)
 }
 
 static void
-alarm_quit (EPopup *ep, EPopupItem *pitem, void *data)
+popup_dismiss_cb (EPopup *ep, EPopupItem *pitem, void *data)
 {
-	bonobo_main_quit ();
-}
-
-static void
-menu_item_toggle_callback (GtkToggleButton *item, void *data)
-{
-	gboolean state = gtk_toggle_button_get_active (item);
-	ESource *source = e_source_copy ((ESource *) data);
-	GSList *groups, *p;
-
-	if (e_source_get_uri ((ESource *)data)) {
-		g_free (e_source_get_uri (source));
-		e_source_set_absolute_uri (source, g_strdup (e_source_get_uri ((ESource *)data)));
-	}
-
-	if (state) {
-		const char *uid = e_source_peek_uid (source);
-		ESourceList *selected_cal = alarm_notify_get_selected_calendars (an);
-		ESourceList *all_cal;
-		ESourceGroup *sel_group = NULL;
-		const char *grp_name=NULL;
-		ESourceGroup *group;
-		ESource *del_source;		
-
-		e_cal_get_sources (&all_cal, E_CAL_SOURCE_TYPE_EVENT, NULL);
-
-		alarm_notify_add_calendar (an, E_CAL_SOURCE_TYPE_EVENT, source, FALSE);
-		
-		/* Browse the list of calendars for the newly added calendar*/
-		groups = e_source_list_peek_groups (all_cal);
-		for (p = groups; p != NULL; p = p->next) {
-			ESourceGroup *group = E_SOURCE_GROUP (p->data);
-			ESource *sel_source = e_source_group_peek_source_by_uid (group, uid);
-
-			if (sel_source) {
-				sel_group = group;
-				grp_name = e_source_group_peek_name (sel_group);
-				/* You have got the group name*/
-				break;
-	}
-}
-
-		/* Add the source the the group name in the alarms calendar list*/
-		group = e_source_list_peek_group_by_name (selected_cal, grp_name);	
-		del_source = e_source_group_peek_source_by_uid (group, uid);
-		
-		if (!del_source) {
-			char *xml, *old_xml;
-
-			old_xml = e_source_group_to_xml (group);
-			e_source_group_add_source (group, source, -1);
-			xml = e_source_group_to_xml (group);
-			config_data_replace_string_list ("/apps/evolution/calendar/notify/calendars", old_xml, xml);
-
-			g_free (xml);
-			g_free (old_xml);
-		}
-
-		g_object_unref (all_cal);
-
-	} else {
-		const char *uid = e_source_peek_uid (source);
-		ESourceList *selected_cal = alarm_notify_get_selected_calendars (an);
-		alarm_notify_remove_calendar (an, E_CAL_SOURCE_TYPE_EVENT, e_source_get_uri (source));
-		
-		/* Browse the calendar for alarms and remove the source */
-		groups = e_source_list_peek_groups (selected_cal);
-		for (p = groups; p != NULL; p = p->next) {
-			ESourceGroup *group = E_SOURCE_GROUP (p->data);
-			ESource *del_source;
-		
-			del_source = e_source_group_peek_source_by_uid (group, uid);
-			if (del_source) {
-				char *xml, *old_xml;
-
-				old_xml = e_source_group_to_xml (group);
-
-				e_source_group_remove_source_by_uid (group, uid);
-				
-				xml = e_source_group_to_xml (group);
-
-				config_data_replace_string_list ("/apps/evolution/calendar/notify/calendars", old_xml, xml);
+	TrayIconData *tray_data = data;
 
-				g_free (xml);
-				g_free (old_xml);
-				break;
-			}
-		}
-	}
-		
+	gtk_widget_destroy (tray_data->tray_icon);
 }
 
-static GtkWidget *
-populate ()
+static void
+popup_dismiss_all_cb (EPopup *ep, EPopupItem *pitem, void *data)
 {
-	GtkWidget *frame = gtk_frame_new (NULL);
-	GtkWidget *label1 = gtk_label_new (NULL);
-	GtkWidget *box = gtk_vbox_new(FALSE, 0);
-	ESourceList *selected_cal = alarm_notify_get_selected_calendars (an);	
-	GSList *groups;
-	GSList *p;
-	ESourceList *source_list;
-	
-	gtk_label_set_markup (GTK_LABEL(label1), _("<b>Calendars</b>"));
-	gtk_frame_set_label_widget (GTK_FRAME(frame), label1);
-	
-	if (!e_cal_get_sources (&source_list, E_CAL_SOURCE_TYPE_EVENT, NULL)) {
-		g_message (G_STRLOC ": Could not get the list of sources to load");
-
-		return NULL;
-	}
-		
-	groups = e_source_list_peek_groups (source_list);
-
-	for (p = groups; p != NULL; p = p->next) {
-		ESourceGroup *group = E_SOURCE_GROUP (p->data);
-		char *txt = g_strdup_printf ("<b>%s</b>", e_source_group_peek_name (group));
-		GtkWidget *item = gtk_label_new (NULL);
-		GSList *q;
-		GtkWidget *hbox, *image;
-
-		hbox = gtk_hbox_new (FALSE, 0);
-		image = e_icon_factory_get_image  ("stock_appointment-reminder", E_ICON_SIZE_SMALL_TOOLBAR);
-
-		gtk_box_pack_start ((GtkBox *)hbox, image, FALSE, FALSE, 2);
-		gtk_box_pack_start ((GtkBox *)hbox, item, FALSE, FALSE, 2);
-		
-		gtk_label_set_markup (GTK_LABEL(item), txt);
-		gtk_label_set_justify (GTK_LABEL(item), GTK_JUSTIFY_LEFT);
-		g_free (txt);
-
-		gtk_box_pack_start (GTK_BOX(box), hbox, TRUE, TRUE, 4);
-		gtk_widget_show_all (hbox);
-
-		for (q = e_source_group_peek_sources (group); q != NULL; q = q->next) {
-			ESource *source = E_SOURCE (q->data);
-			GtkWidget *hbox = gtk_hbox_new (FALSE, 0);
-			GtkWidget *item = gtk_check_button_new_with_label (e_source_peek_name (source));
+	while (tray_icons_list != NULL) {
+		TrayIconData *tray_data = tray_icons_list->data;
 
-			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(item), e_source_list_peek_source_by_uid (selected_cal, e_source_peek_uid (source)) ? TRUE:FALSE);
-			
-			gtk_box_pack_start ((GtkBox *)hbox, item, FALSE, FALSE, 24);
-			gtk_object_set_data_full (GTK_OBJECT (item), "ESourceMenu", source,
-						  (GtkDestroyNotify) g_object_unref);
-
-			g_signal_connect (item, "toggled", G_CALLBACK (menu_item_toggle_callback), source);
+		gtk_widget_destroy (tray_data->tray_icon);
 
-			gtk_box_pack_start (GTK_BOX(box), hbox, FALSE, FALSE, 2);
-			gtk_widget_show_all (hbox);
-		}
+		tray_icons_list = g_list_remove (tray_icons_list, tray_icons_list);
 	}
-
-	gtk_container_add (GTK_CONTAINER(frame), box);
-	gtk_container_set_border_width (GTK_CONTAINER(frame), 6);
-	return frame;
-}
-
-static void
-alarm_pref_response (GtkWidget *widget, int response, gpointer dummy)
-{
-	gtk_widget_destroy (widget);	
 }
 
 static void
-alarms_configure (EPopup *ep, EPopupItem *pitem, void *data)
+popup_open_cb (EPopup *ep, EPopupItem *pitem, void *data)
 {
-	GtkWidget *box = populate ();
-	GtkWidget *dialog;
-
-	dialog = gtk_dialog_new_with_buttons (_("Preferences"), 
-						NULL,0,
-						GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT,
-						GTK_STOCK_HELP, GTK_RESPONSE_HELP,
-						NULL);
+	TrayIconData *tray_data = data;
 
-	gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), box);
-	gtk_dialog_set_has_separator (GTK_DIALOG(dialog), FALSE);
-	g_signal_connect (dialog, "response", G_CALLBACK (alarm_pref_response), NULL);
-	gtk_widget_show_all (dialog);
+	open_alarm_dialog (tray_data);
 }
 
 static EPopupItem tray_items[] = {
-	{ E_POPUP_ITEM, "00.configure", N_("_Configure Alarms"), alarms_configure, NULL, GTK_STOCK_PREFERENCES },
-	{ E_POPUP_BAR , "10.bar" },
-	{ E_POPUP_ITEM, "10.quit", N_("_Quit"), alarm_quit, NULL, GTK_STOCK_QUIT },
+	{ E_POPUP_ITEM, "00.open", N_("Open"), popup_open_cb, NULL, GTK_STOCK_OPEN },
+	{ E_POPUP_ITEM, "10.dismiss", N_("Dismiss"), popup_dismiss_cb, NULL, NULL },
+	{ E_POPUP_ITEM, "20.dismissall", N_("Dismiss All"), popup_dismiss_all_cb, NULL, NULL },
 };
 
 static void
@@ -1190,35 +979,13 @@ tray_icon_clicked_cb (GtkWidget *widget, GdkEventButton *event, gpointer user_da
 	TrayIconData *tray_data = user_data;
 
 	if (event->type == GDK_BUTTON_PRESS) {
-		if (event->button == 1 && g_list_length (tray_icons_list) > 0) {
-			GList *tmp;
-			for (tmp = tray_icons_list; tmp; tmp = tmp->next) {
-				open_alarm_dialog (tmp->data);
-			}
-			
-			return TRUE;
+		if (event->button == 1) {
+			return open_alarm_dialog (tray_data);
 		} else if (event->button == 3) {
 			GtkMenu *menu;
 			GSList *menus = NULL;
 			EPopup *ep;
 			int i;
-			GdkPixbuf *pixbuf;
-			GtkTooltips *tooltips = gtk_tooltips_new ();
-			
-			tray_blink_state = FALSE;
-			pixbuf = e_icon_factory_get_icon  (tray_blink_state == TRUE ?
-							   "stock_appointment-reminder-excl" :
-							   "stock_appointment-reminder",
-							   E_ICON_SIZE_LARGE_TOOLBAR);
-	
-			gtk_image_set_from_pixbuf (GTK_IMAGE (tray_image), pixbuf);
-			g_object_unref (pixbuf);	
-
-			if (tray_blink_id > -1)
-				g_source_remove (tray_blink_id);
-			tray_blink_id = -1;
-
-			gtk_tooltips_set_tip (tooltips, tray_event_box, NULL, NULL);
 
 			ep = e_popup_new("org.gnome.evolution.alarmNotify.popup");
 			for (i=0;i<sizeof(tray_items)/sizeof(tray_items[0]);i++)
@@ -1237,16 +1004,16 @@ tray_icon_clicked_cb (GtkWidget *widget, GdkEventButton *event, gpointer user_da
 static gboolean
 tray_icon_blink_cb (gpointer data)
 {
+	TrayIconData *tray_data = data;
 	GdkPixbuf *pixbuf;
 
-	tray_blink_state = tray_blink_state == TRUE ? FALSE: TRUE;
-	
-	pixbuf = e_icon_factory_get_icon  (tray_blink_state == TRUE?
+	tray_data->blink_state = tray_data->blink_state == TRUE ? FALSE : TRUE;
+	pixbuf = e_icon_factory_get_icon  (tray_data->blink_state == TRUE ?
 					   "stock_appointment-reminder-excl" :
 					   "stock_appointment-reminder",
 					   E_ICON_SIZE_LARGE_TOOLBAR);
 
-	gtk_image_set_from_pixbuf (GTK_IMAGE (tray_image), pixbuf);
+	gtk_image_set_from_pixbuf (GTK_IMAGE (tray_data->image), pixbuf);
 	g_object_unref (pixbuf);
 
 	return TRUE;
@@ -1260,14 +1027,13 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa,
 	QueuedAlarm *qa;
 	ECalComponent *comp;
 	const char *summary, *description, *location;
-	GtkWidget *tray_icon=NULL, *image=NULL;
+	GtkWidget *tray_icon, *image, *ebox;
 	GtkTooltips *tooltips;
 	TrayIconData *tray_data;
 	ECalComponentText text;
 	GSList *text_list;
-	char *str, *start_str, *end_str, *alarm_str, *time_str;
+	char *str, *start_str, *end_str, *alarm_str;
 	icaltimezone *current_zone;
-	ECalComponentOrganizer organiser;
 
 	comp = cqa->alarms->comp;
 	qa = lookup_queued_alarm (cqa, alarm_id);
@@ -1276,7 +1042,6 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa,
 	
 	/* get a sensible description for the event */
 	e_cal_component_get_summary (comp, &text);
-	e_cal_component_get_organizer (comp, &organiser); 
 
 	if (text.value)
 		summary = text.value;
@@ -1305,14 +1070,30 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa,
 	/* create the tray icon */
 	tooltips = gtk_tooltips_new ();
 
+	tray_icon = GTK_WIDGET (egg_tray_icon_new (qa->instance->auid));
+	image = e_icon_factory_get_image  ("stock_appointment-reminder", E_ICON_SIZE_LARGE_TOOLBAR);
+	ebox = gtk_event_box_new ();
+
+	gtk_widget_show (image);
+	gtk_widget_show (ebox);
+
 	current_zone = config_data_get_timezone ();
 	alarm_str = timet_to_str_with_zone (trigger, current_zone);
 	start_str = timet_to_str_with_zone (qa->instance->occur_start, current_zone);
 	end_str = timet_to_str_with_zone (qa->instance->occur_end, current_zone);
-	time_str = calculate_time (qa->instance->occur_start, qa->instance->occur_end);
+	str = g_strdup_printf (_("Alarm on %s\n%s\nStarting at %s\nEnding at %s"),
+			       alarm_str, summary, start_str, end_str);
+	gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltips), ebox, str, str);
+	g_free (start_str);
+	g_free (end_str);
+	g_free (alarm_str);
+	g_free (str);
+	
+	g_object_set_data (G_OBJECT (tray_icon), "image", image);
+	g_object_set_data (G_OBJECT (tray_icon), "available", GINT_TO_POINTER (1));
 
-	str = g_strdup_printf ("%s\n%s %s",
-			       summary, start_str, time_str);
+	gtk_container_add (GTK_CONTAINER (ebox), image);
+	gtk_container_add (GTK_CONTAINER (tray_icon), ebox);
 
 	/* create the private structure */
 	tray_data = g_new0 (TrayIconData, 1);
@@ -1322,132 +1103,32 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa,
 	tray_data->trigger = trigger;
 	tray_data->cqa = cqa;
 	tray_data->alarm_id = alarm_id;
-	tray_data->comp = g_object_ref (e_cal_component_clone (comp));
+	tray_data->comp = e_cal_component_clone (comp);
 	tray_data->client = cqa->parent_client->client;
 	tray_data->query = g_object_ref (cqa->parent_client->query);
 	tray_data->image = image;
 	tray_data->blink_state = FALSE;
-	tray_data->snooze_set = FALSE;
 	g_object_ref (tray_data->client);
 	tray_data->tray_icon = tray_icon;
 
 	tray_icons_list = g_list_prepend (tray_icons_list, tray_data);
 
-	if (g_list_length (tray_icons_list) > 1) {
-		char *tip;
-
-		tip =  g_strdup_printf (_("You have %d alarms"), g_list_length (tray_icons_list));
-		gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltips), tray_event_box, tip, NULL);
-		g_free (tip);
-	}
-	else 
-		gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltips), tray_event_box, str, NULL);
-
-	g_free (start_str);
-	g_free (end_str);
-	g_free (alarm_str);
-	g_free (time_str);
-	g_free (str);
-
+	g_signal_connect (G_OBJECT (tray_icon), "destroy",
+			  G_CALLBACK (tray_icon_destroyed_cb), tray_data);
+	g_signal_connect (G_OBJECT (ebox), "button_press_event",
+			  G_CALLBACK (tray_icon_clicked_cb), tray_data);
 	g_signal_connect (G_OBJECT (tray_data->query), "objects_removed",
 			  G_CALLBACK (on_dialog_objs_removed_cb), tray_data);
 
-	// FIXME: We should remove this check
 	if (!config_data_get_notify_with_tray ()) {
-		tray_blink_id = -1;
+		tray_data->blink_id = -1;
 		open_alarm_dialog (tray_data);
 		gtk_window_stick (GTK_WINDOW (alarm_notifications_dialog->dialog));
 	} else {
-		if (tray_blink_id == -1)
-			tray_blink_id = g_timeout_add (500, tray_icon_blink_cb, tray_data);
-	}
-	}
-
-#ifdef HAVE_LIBNOTIFY
-static void
-popup_notification (time_t trigger, CompQueuedAlarms *cqa,
-	            gpointer alarm_id, gboolean use_description)
-{
-	QueuedAlarm *qa;
-	ECalComponent *comp;
-	const char *summary, *location;
-	GtkTooltips *tooltips;
-	ECalComponentText text;
-	char *str, *start_str, *end_str, *alarm_str, *time_str;
-	icaltimezone *current_zone;
-	ECalComponentOrganizer organiser;
-	NotifyIcon *icon;
-	char *filename;
-	char *body;
-	
-	comp = cqa->alarms->comp;
-	qa = lookup_queued_alarm (cqa, alarm_id);
-	if (!qa)
-		return;
-	if (!notify_is_initted ())
-		notify_init("Evolution Alarm Notify");
-	filename = e_icon_factory_get_icon_filename ("stock_appointment-reminder", E_ICON_SIZE_DIALOG);
-	icon = notify_icon_new_from_uri (filename);
-	g_free (filename);
-	
-	/* get a sensible description for the event */
-	e_cal_component_get_summary (comp, &text);
-	e_cal_component_get_organizer (comp, &organiser); 
-
-
-	if (text.value)
-		summary = text.value;
-	else
-	        summary = _("No summary available.");
-
-	e_cal_component_get_location (comp, &location);
-
-	/* create the tray icon */
-	tooltips = gtk_tooltips_new ();
-
-	current_zone = config_data_get_timezone ();
-	alarm_str = timet_to_str_with_zone (trigger, current_zone);
-	start_str = timet_to_str_with_zone (qa->instance->occur_start, current_zone);
-	end_str = timet_to_str_with_zone (qa->instance->occur_end, current_zone);
-	time_str = calculate_time (qa->instance->occur_start, qa->instance->occur_end);
-
-	str = g_strdup_printf ("%s %s",
-			       start_str, time_str);
-
-	if (organiser.cn) {
-		if (location)
-			body = g_strdup_printf ("<b>%s</b>\n%s %s\n%s %s", organiser.cn, _("Location:"), location, start_str, time_str);
-		else
-			body = g_strdup_printf ("<b>%s</b>\n%s %s", organiser.cn, start_str, time_str);
+		tray_data->blink_id = g_timeout_add (500, tray_icon_blink_cb, tray_data);
+		gtk_widget_show (tray_icon);
 	}
-	else {
-		if (location)
-			body = g_strdup_printf ("%s %s\n%s %s", _("Location:"), location, start_str, time_str);
-		else
-			body = g_strdup_printf ("%s %s", start_str, time_str);			
-}
-
-	if (!notify_send_notification (
-					NULL, "device", NOTIFY_URGENCY_NORMAL,
-					summary,
-					body, 	/* body text */
-					icon,			/* icon */
-					TRUE, 0,		/* expiry, server default */
-					NULL,			/* hints */
-					NULL,			/* no user_data */
-					0))			/* no actions */
-					g_warning ("Could not send notification to daemon\n");	
-
-	/* create the private structure */
-	g_free (start_str);
-	g_free (end_str);
-	g_free (alarm_str);
-	g_free (time_str);
-	g_free (str);
-
-
 }
-#endif
 
 /* Performs notification of an audio alarm */
 static void
@@ -1488,6 +1169,8 @@ audio_notification (time_t trigger, CompQueuedAlarms *cqa,
 	if (attach)
 		icalattach_unref (attach);
 
+	/* We present a notification message in addition to playing the sound */
+	display_notification (trigger, cqa, alarm_id, FALSE);
 }
 
 /* Performs notification of a mail alarm */
@@ -1499,6 +1182,8 @@ mail_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id)
 
 	/* FIXME */
 
+	display_notification (trigger, cqa, alarm_id, FALSE);
+
 	dialog = gtk_dialog_new_with_buttons (_("Warning"),
 					      NULL, 0,
 					      GTK_STOCK_OK, GTK_RESPONSE_CANCEL,
@@ -1612,6 +1297,7 @@ procedure_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id
 	if (result < 0)
 		goto fallback;
 
+	remove_queued_alarm (cqa, alarm_id, TRUE, TRUE);
 	return;
 
  fallback:
@@ -1647,10 +1333,8 @@ check_midnight_refresh (gpointer user_data)
  * beginning of the program.
  **/
 void
-alarm_queue_init (gpointer data)
+alarm_queue_init (void)
 {
-	GtkWidget *tray_icon;
-	an = data;
 	g_return_if_fail (alarm_queue_inited == FALSE);
 
 	client_alarms_hash = g_hash_table_new (g_direct_hash, g_direct_equal);
@@ -1665,19 +1349,6 @@ alarm_queue_init (gpointer data)
 	/* install timeout handler (every 30 mins) for not missing the midnight refresh */
 	g_timeout_add (1800000, (GSourceFunc) check_midnight_refresh, NULL);
 
-	tray_icon = GTK_WIDGET (egg_tray_icon_new ("Evolution Alarm"));
-	tray_image = e_icon_factory_get_image  ("stock_appointment-reminder", E_ICON_SIZE_LARGE_TOOLBAR);
-	tray_event_box = gtk_event_box_new ();
-	gtk_container_add (GTK_CONTAINER (tray_event_box), tray_image);
-	gtk_container_add (GTK_CONTAINER (tray_icon), tray_event_box);
-	g_signal_connect (G_OBJECT (tray_event_box), "button_press_event",
-			  G_CALLBACK (tray_icon_clicked_cb), NULL);
-	gtk_widget_show_all (tray_icon);
-
-#ifdef HAVE_LIBNOTIFY
-	notify_init("Evolution Alarms");
-#endif
-
 	alarm_queue_inited = TRUE;
 }
 
@@ -1736,23 +1407,6 @@ alarm_queue_done (void)
 	alarm_queue_inited = FALSE;
 }
 
-static gboolean 
-compare_ids (gpointer a, gpointer b)
-{
-	ECalComponentId *id, *id1;
-
-	id = a;
-	id1 = b;
-	
-	if (g_str_equal (id->uid, id1->uid)) {
-		if (id->rid && id1->rid)
-			return g_str_equal (id->rid, id1->rid);
-		else if (!(id->rid && id1->rid))
-			return TRUE;
-	} 
-	return FALSE;
-}
-
 /**
  * alarm_queue_add_client:
  * @client: A calendar client.
@@ -1789,7 +1443,7 @@ alarm_queue_add_client (ECal *client)
 
 	g_hash_table_insert (client_alarms_hash, client, ca);
 
-	ca->uid_alarms_hash = g_hash_table_new (g_str_hash, (GEqualFunc) compare_ids);
+	ca->uid_alarms_hash = g_hash_table_new (g_str_hash, g_str_equal);
 
 	if (e_cal_get_load_state (client) == E_CAL_LOAD_LOADED) {
 		load_alarms_for_today (ca);
@@ -1802,38 +1456,38 @@ alarm_queue_add_client (ECal *client)
 
 /* Called from g_hash_table_foreach(); adds a component UID to a list */
 static void
-add_id_cb (gpointer key, gpointer value, gpointer data)
+add_uid_cb (gpointer key, gpointer value, gpointer data)
 {
-	GSList **ids = (GSList **) data;
-	ECalComponentId *id = g_new0 (ECalComponentId, 1);
-	ECalComponentId *temp = (ECalComponentId *)key;
+	GSList **uids;
+	const char *uid;
 
-	id->uid = g_strdup (temp->uid);
-	id->rid = g_strdup (temp->rid);
+	uids = data;
+	uid = key;
 
-	*ids = g_slist_prepend (*ids, (ECalComponentId *) id);
+	*uids = g_slist_prepend (*uids, (char *) uid);
 }
 
 /* Removes all the alarms queued for a particular calendar client */
 static void
 remove_client_alarms (ClientAlarms *ca)
 {
-	GSList *ids = NULL;
+	GSList *uids;
 	GSList *l;
 
 	/* First we build a list of UIDs so that we can remove them one by one */
 
-	g_hash_table_foreach (ca->uid_alarms_hash, add_id_cb, &ids);
+	uids = NULL;
+	g_hash_table_foreach (ca->uid_alarms_hash, add_uid_cb, &uids);
 
-	for (l = ids; l; l = l->next) {
-		const ECalComponentId *id;
+	for (l = uids; l; l = l->next) {
+		const char *uid;
 
-		id = l->data;
+		uid = l->data;
 
-		remove_comp (ca, id);
+		remove_comp (ca, uid);
 	}
 
-	g_slist_free (ids);
+	g_slist_free (uids);
 
 	/* The hash table should be empty now */
 
@@ -1894,9 +1548,11 @@ update_cqa (CompQueuedAlarms *cqa, ECalComponent *newcomp)
 	GSList *qa_list;	/* List of current QueuedAlarms corresponding to cqa */
 	time_t from, to;
 	icaltimezone *zone;
+	char *uid;
 	ECalComponentAlarmAction omit[] = {-1};
 
 	oldcomp = cqa->alarms->comp;
+	e_cal_component_get_uid (newcomp, (const char **)&uid); 
 
 	zone = config_data_get_timezone ();
 	from = time_day_begin_with_zone (time (NULL), zone);
diff --git a/calendar/gui/alarm-notify/alarm.c b/calendar/gui/alarm-notify/alarm.c
index d29ad3133a..3d371d9f9b 100644
--- a/calendar/gui/alarm-notify/alarm.c
+++ b/calendar/gui/alarm-notify/alarm.c
@@ -167,14 +167,16 @@ queue_alarm (AlarmRecord *ar)
 
 	/* Insert the new alarm in order if the alarm's trigger time is 
 	   after the current time */
-	alarms = g_list_insert_sorted (alarms, ar, compare_alarm_by_time);
+	if (ar->trigger > time (NULL)) { 
+		alarms = g_list_insert_sorted (alarms, ar, compare_alarm_by_time);
 
-	/* If there first item on the list didn't change, the time out is fine */
-	if (old_head == alarms)
-		return;
+		/* If there first item on the list didn't change, the time out is fine */
+		if (old_head == alarms)
+			return;
 
-	/* Set the timer for removal upon activation */
-	setup_timeout ();
+		/* Set the timer for removal upon activation */
+		setup_timeout ();
+	}
 }
 
 
diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c
index 348b94a42e..4dca946d76 100644
--- a/calendar/gui/alarm-notify/notify-main.c
+++ b/calendar/gui/alarm-notify/notify-main.c
@@ -40,7 +40,6 @@
 #include <libedataserver/e-source.h>
 #include <libedataserverui/e-passwords.h>
 #include "e-util/e-icon-factory.h"
-#include "e-util/e-util-private.h"
 #include "alarm.h"
 #include "alarm-queue.h"
 #include "alarm-notify.h"
@@ -71,17 +70,10 @@ save_session_cb (GnomeClient *client, GnomeSaveStyle save_style, gint shutdown,
 {
 	char *args[2];
 
-	args[0] = g_build_filename (EVOLUTION_LIBEXECDIR,
-				    "evolution-alarm-notify"
-#ifdef G_OS_WIN32
-				    ".exe"
-#endif
-				    ,
-				    NULL);
+	args[0] = EVOLUTION_LIBEXECDIR "/evolution-alarm-notify";
 	args[1] = NULL;
 	gnome_client_set_restart_command (client, 1, args);
-	g_free (args[0]);
-	
+
 	return TRUE;
 }
 
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 38c6e978af..02a8afaea7 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -152,10 +152,10 @@ ensure_sources (CalendarComponent *component)
 	}
 
 	base_uri = g_build_filename (calendar_component_peek_base_directory (component),
-				     "calendar", "local",
+				     "/calendar/local/",
 				     NULL);
 
-	base_uri_proto = g_filename_to_uri (base_uri, NULL, NULL);
+	base_uri_proto = g_strconcat ("file://", base_uri, NULL);
 
 	groups = e_source_list_peek_groups (source_list);
 	if (groups) {
@@ -532,10 +532,10 @@ 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, "15.copy", N_("_Copy"), copy_calendar_cb, NULL, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
-	{ E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_calendar_cb, NULL, "stock_delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY },
-	{ E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_calendar_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_ITEM, "10.new", N_("New Calendar"), new_calendar_cb, NULL, "stock_calendar", 0, 0 },
+	{ E_POPUP_ITEM, "15.copy", N_("Copy"), copy_calendar_cb, NULL, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_ITEM, "20.delete", N_("Delete"), delete_calendar_cb, NULL, "stock_delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_ITEM, "30.properties", N_("Properties..."), edit_calendar_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
 };
 
 static void
@@ -1145,9 +1145,6 @@ setup_create_ecal (CalendarComponent *calendar_component, CalendarComponentView
 		
 	if (priv->create_ecal) {
 		icaltimezone *zone;
-		
-		zone = calendar_config_get_icaltimezone ();
-		e_cal_set_default_timezone (priv->create_ecal, zone, NULL);
 
 		if (!e_cal_open (priv->create_ecal, FALSE, NULL)) {
 			GtkWidget *dialog;
@@ -1155,13 +1152,16 @@ setup_create_ecal (CalendarComponent *calendar_component, CalendarComponentView
 			dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
 							 GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
 							 _("Unable to open the calendar '%s' for creating events and meetings"), 
-							 e_source_peek_name (source));
+							   e_source_peek_name (source));
 			gtk_dialog_run (GTK_DIALOG (dialog));
 			gtk_widget_destroy (dialog);
 
 			return NULL;
 		}
 
+		zone = calendar_config_get_icaltimezone ();
+		e_cal_set_default_timezone (priv->create_ecal, zone, NULL);
+
 	} else {
 		GtkWidget *dialog;
 			
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index 5fcde9d5b9..db57821c56 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -268,107 +268,6 @@ calendar_config_add_notification_24_hour_format (GConfClientNotifyFunc func, gpo
 	return id;
 }
 
-/* Show RSVP*/
-gboolean
-calendar_config_get_show_rsvp	(void)
-{
-	calendar_config_init ();
-
-	return gconf_client_get_bool (config, CALENDAR_CONFIG_SHOW_RSVP, NULL);
-}
-
-void
-calendar_config_set_show_rsvp	(gboolean state)
-{
-	calendar_config_init ();
-
-	gconf_client_set_bool (config, CALENDAR_CONFIG_SHOW_RSVP, state, NULL);
-}
-
-/* Show Role*/
-gboolean
-calendar_config_get_show_role	(void)
-{
-	calendar_config_init ();
-
-	return gconf_client_get_bool (config, CALENDAR_CONFIG_SHOW_ROLE, NULL);
-}
-
-void
-calendar_config_set_show_role	(gboolean state)
-{
-	calendar_config_init ();
-
-	gconf_client_set_bool (config, CALENDAR_CONFIG_SHOW_ROLE, state, NULL);
-}
-
-/* Show Type*/
-gboolean
-calendar_config_get_show_type	(void)
-{
-	calendar_config_init ();
-
-	return gconf_client_get_bool (config, CALENDAR_CONFIG_SHOW_TYPE, NULL);
-}
-
-void
-calendar_config_set_show_type	(gboolean state)
-{
-	calendar_config_init ();
-
-	gconf_client_set_bool (config, CALENDAR_CONFIG_SHOW_TYPE, state, NULL);
-}
-
-/* Show status */
-gboolean
-calendar_config_get_show_status	(void)
-{
-	calendar_config_init ();
-
-	return gconf_client_get_bool (config, CALENDAR_CONFIG_SHOW_STATUS, NULL);
-}
-
-void
-calendar_config_set_show_status	(gboolean state)
-{
-	calendar_config_init ();
-
-	gconf_client_set_bool (config, CALENDAR_CONFIG_SHOW_STATUS, state, NULL);
-}
-
-/* Show timezone */
-gboolean  
-calendar_config_get_show_timezone (void)
-{
-	calendar_config_init ();
-
-	return gconf_client_get_bool (config, CALENDAR_CONFIG_SHOW_TIMEZONE, NULL);
-}
-
-void	  
-calendar_config_set_show_timezone (gboolean	status)
-{
-	calendar_config_init ();
-
-	gconf_client_set_bool (config, CALENDAR_CONFIG_SHOW_TIMEZONE, status, NULL);	
-}
-
-gboolean  
-calendar_config_get_show_categories (void)
-{
-	calendar_config_init ();
-
-	return gconf_client_get_bool (config, CALENDAR_CONFIG_SHOW_CATEGORIES, NULL);
-}
-void	  
-calendar_config_set_show_categories (gboolean	status)
-{
-	calendar_config_init ();
-
-	gconf_client_set_bool (config, CALENDAR_CONFIG_SHOW_CATEGORIES, status, NULL);
-}
-
-
 /* The start day of the week (0 = Sun to 6 = Mon). */
 gint
 calendar_config_get_week_start_day	(void)
@@ -640,22 +539,6 @@ calendar_config_set_vpane_pos		(gint	      vpane_pos)
 	gconf_client_set_int (config, CALENDAR_CONFIG_VPANE_POS, vpane_pos, NULL);
 }
 
-gboolean
-calendar_config_get_preview_state		(void)
-{
-	calendar_config_init ();
-
-	return gconf_client_get_bool (config, CALENDAR_CONFIG_TASK_PREVIEW, NULL);
-}
-
-
-void
-calendar_config_set_preview_state		(gboolean state)
-{
-	calendar_config_init ();
-
-	gconf_client_set_bool (config, CALENDAR_CONFIG_TASK_PREVIEW, state, NULL);
-}
 
 gint
 calendar_config_get_month_hpane_pos	(void)
@@ -750,55 +633,6 @@ calendar_config_set_task_vpane_pos	(gint	      vpane_pos)
 	gconf_client_set_int (config, CALENDAR_CONFIG_TASK_VPANE_POS, vpane_pos, NULL);
 }
 
-/***************************************/
-
-/* The current list of memo lists selected */
-GSList   *
-calendar_config_get_memos_selected (void)
-{
-	return gconf_client_get_list (config, CALENDAR_CONFIG_MEMOS_SELECTED_MEMOS, GCONF_VALUE_STRING, NULL);
-}
-
-void
-calendar_config_set_memos_selected (GSList *selected)
-{
-	gconf_client_set_list (config, CALENDAR_CONFIG_MEMOS_SELECTED_MEMOS, GCONF_VALUE_STRING, selected, NULL);
-}
-
-guint
-calendar_config_add_notification_memos_selected (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_MEMOS_SELECTED_MEMOS, func, data, NULL, NULL);
-	
-	return id;
-}
-
-/* The primary memo list */
-char *
-calendar_config_get_primary_memos (void)
-{
-	return gconf_client_get_string (config, CALENDAR_CONFIG_PRIMARY_MEMOS, NULL);
-}
-
-void
-calendar_config_set_primary_memos (const char *primary_uid)
-{
-	gconf_client_set_string (config, CALENDAR_CONFIG_PRIMARY_MEMOS, primary_uid, NULL);
-}
-
-
-guint
-calendar_config_add_notification_primary_memos (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_PRIMARY_MEMOS, func, data, NULL, NULL);
-	
-	return id;
-}
-/***************************************/
 
 /* Whether we compress the weekend in the week/month views. */
 gboolean
diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h
index b111dbe04c..6135f08933 100644
--- a/calendar/gui/calendar-config.h
+++ b/calendar/gui/calendar-config.h
@@ -112,25 +112,6 @@ gboolean  calendar_config_get_24_hour_format	(void);
 void	  calendar_config_set_24_hour_format	(gboolean     use_24_hour);
 guint calendar_config_add_notification_24_hour_format (GConfClientNotifyFunc func, gpointer data);
 
-gboolean  calendar_config_get_show_status (void);
-void	  calendar_config_set_show_status (gboolean	status);
-
-gboolean  calendar_config_get_show_type (void);
-void	  calendar_config_set_show_type (gboolean	status);
-
-gboolean  calendar_config_get_show_rsvp (void);
-void	  calendar_config_set_show_rsvp (gboolean	status);
-
-gboolean  calendar_config_get_show_timezone (void);
-void	  calendar_config_set_show_timezone (gboolean	status);
-
-gboolean  calendar_config_get_show_categories (void);
-void	  calendar_config_set_show_categories (gboolean	status);
-
-gboolean calendar_config_get_show_role	(void);
-void calendar_config_set_show_role	(gboolean state);
-
-
 /* The time divisions in the Day/Work-Week view in minutes (5/10/15/30/60). */
 gint	  calendar_config_get_time_divisions	(void);
 void	  calendar_config_set_time_divisions	(gint	      divisions);
@@ -162,9 +143,6 @@ void	  calendar_config_set_hpane_pos		(gint	      hpane_pos);
 gint      calendar_config_get_vpane_pos		(void);
 void	  calendar_config_set_vpane_pos		(gint	      vpane_pos);
 
-gboolean  calendar_config_get_preview_state	(void);
-void	  calendar_config_set_preview_state	(gboolean     state);
-
 gint      calendar_config_get_month_hpane_pos	(void);
 void	  calendar_config_set_month_hpane_pos	(gint	      hpane_pos);
 
@@ -185,17 +163,6 @@ guint	  calendar_config_add_notification_primary_tasks (GConfClientNotifyFunc fu
 gint      calendar_config_get_task_vpane_pos    (void);
 void      calendar_config_set_task_vpane_pos    (gint         vpane_pos);
 
-
-/* The current list of memo lists selected */
-GSList   *calendar_config_get_memos_selected (void);
-void	  calendar_config_set_memos_selected (GSList *selected);
-guint	  calendar_config_add_notification_memos_selected (GConfClientNotifyFunc func, gpointer data);
-
-/* The primary calendar */
-char     *calendar_config_get_primary_memos (void);
-void	  calendar_config_set_primary_memos (const char *primary_uid);
-guint	  calendar_config_add_notification_primary_memos (GConfClientNotifyFunc func, gpointer data);
-
 /* Colors for the task list */
 const char *calendar_config_get_tasks_due_today_color	(void);
 void	    calendar_config_set_tasks_due_today_color	(const char *color);
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index 7a2222a9bd..94eae52a37 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -47,7 +47,6 @@
 #include <libgnomeui/gnome-color-picker.h>
 #include <glade/glade.h>
 #include <e-util/e-dialog-widgets.h>
-#include <e-util/e-util-private.h>
 #include <misc/e-dateedit.h>
 
 
@@ -105,18 +104,12 @@ cal_prefs_dialog_new (void)
 {
 	DialogData *dialog_data;
 	EvolutionConfigControl *config_control;
-	char *gladefile;
 
 	dialog_data = g_new0 (DialogData, 1);
 
 	/* Load the content widgets */
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
-				      "cal-prefs-dialog.glade",
-				      NULL);
-	dialog_data->xml = glade_xml_new (gladefile, NULL, NULL);
-	g_free (gladefile);
-
+	dialog_data->xml = glade_xml_new (EVOLUTION_GLADEDIR "/cal-prefs-dialog.glade", NULL, NULL);
 	if (!dialog_data->xml) {
 		g_message ("cal_prefs_dialog_construct(): Could not load the Glade XML file!");
 		return NULL;
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 86c8116bdb..6e4f15b315 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -30,8 +30,6 @@
 #include <glib.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkstock.h>
-#include <bonobo/bonobo-ui-util.h>
-#include <bonobo/bonobo-widget.h>
 #include <libgnome/libgnome.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomevfs/gnome-vfs-mime.h>
@@ -42,7 +40,6 @@
 #include <libgnomeui/gnome-messagebox.h>
 #include <e-util/e-dialog-utils.h>
 #include <e-util/e-icon-factory.h>
-#include <e-util/e-util-private.h>
 #include <evolution-shell-component-utils.h>
 
 #include <camel/camel-url.h>
@@ -144,9 +141,8 @@ static void page_dates_changed_cb (GtkObject *obj, CompEditorPageDates *dates, g
 
 static void obj_modified_cb (ECal *client, GList *objs, gpointer data);
 static void obj_removed_cb (ECal *client, GList *uids, gpointer data);
-static gboolean open_attachment (EAttachmentBar *bar, CompEditor *editor);
 
-G_DEFINE_TYPE (CompEditor, comp_editor, BONOBO_TYPE_WINDOW);
+G_DEFINE_TYPE (CompEditor, comp_editor, GTK_TYPE_DIALOG);
 
 enum {
 	DND_TYPE_MESSAGE_RFC822,
@@ -885,6 +881,73 @@ prompt_to_save_changes (CompEditor *editor, gboolean send)
 	}
 }
 
+static void
+response_cb (GtkWidget *widget, int response, gpointer data)
+{
+	CompEditor *editor = COMP_EDITOR (data);
+	CompEditorPrivate *priv;
+	ECalComponentText text;
+	gboolean delegated;
+	ECalComponent *comp;
+
+	priv = editor->priv;
+	delegated = (priv->flags & COMP_EDITOR_DELEGATE);
+
+	switch (response) {
+	case GTK_RESPONSE_OK:
+		/* Check whether the downloads are completed */
+		if (e_attachment_bar_get_download_count (E_ATTACHMENT_BAR (editor->priv->attachment_bar)) ){
+			gboolean response = 1;
+#warning "FIXME: Cannot use mail functions from calendar!!!!"
+#if 0	
+			ECalComponentVType vtype = e_cal_component_get_vtype(editor->priv->comp);
+
+			if (vtype == E_CAL_COMPONENT_EVENT)
+				response = em_utils_prompt_user((GtkWindow *)widget, 
+								 NULL, 
+								 "calendar:ask-send-event-pending-download", 
+								  NULL);
+			else
+				response = em_utils_prompt_user((GtkWindow *)widget, 
+								 NULL, 
+								 "calendar:ask-send-task-pending-download", 
+								  NULL);
+#endif
+		if (!response) 
+			return;
+		}	
+		commit_all_fields (editor);
+		if (e_cal_component_is_instance (priv->comp))
+			if (!recur_component_dialog (priv->client, priv->comp, &priv->mod, GTK_WINDOW (editor), delegated))
+				return;
+
+		comp = comp_editor_get_current_comp (editor);
+		e_cal_component_get_summary (comp, &text);
+		g_object_unref (comp);
+
+		if (!text.value) 
+			if (!send_component_prompt_subject ((GtkWindow *) editor, priv->client, priv->comp))
+				return;
+		if (save_comp_with_send (editor)) 
+			close_dialog (editor);
+		break;
+
+	case GTK_RESPONSE_HELP:
+		comp_editor_show_help (editor);
+
+		break;
+	case GTK_RESPONSE_CANCEL:
+		commit_all_fields (editor);
+		
+		if (prompt_to_save_changes (editor, TRUE))
+			close_dialog (editor);
+		break;
+	default:
+		/* We handle delete event below */
+		break;
+	}
+}
+
 static int
 delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
 {
@@ -931,24 +994,8 @@ attachment_bar_changed_cb (EAttachmentBar *bar,
 
 }
 
-static void 	 
-attachment_expander_activate_cb (EExpander *expander, 	 
-				 void *data) 	 
-{ 	 
-	CompEditor *editor = COMP_EDITOR (data); 	 
-	gboolean show = e_expander_get_expanded (expander); 	 
-  	 
-	/* Update the expander label */ 	 
-	if (show) 	 
-		gtk_label_set_text_with_mnemonic (GTK_LABEL (editor->priv->attachment_expander_label), 	 
-					          _("Hide Attachment _Bar")); 	 
-	else 	 
-		gtk_label_set_text_with_mnemonic (GTK_LABEL (editor->priv->attachment_expander_label), 	 
-						  _("Show Attachment _Bar")); 	 
-}
-
-static gboolean 
-open_attachment (EAttachmentBar *bar, CompEditor *editor)
+static	gboolean 
+attachment_bar_icon_clicked_cb (EAttachmentBar *bar, GdkEvent *event, CompEditor *editor)
 {
 	GnomeIconList *icon_list;
 	GList *p;
@@ -956,7 +1003,7 @@ open_attachment (EAttachmentBar *bar, CompEditor *editor)
 	char *attach_file_url;
 	GError *error = NULL;
 	
-	if (E_IS_ATTACHMENT_BAR (bar)) {
+	if (E_IS_ATTACHMENT_BAR (bar) && event->type == GDK_2BUTTON_PRESS) {
 		icon_list = GNOME_ICON_LIST (bar);
 		p = gnome_icon_list_get_selection (icon_list);
 		if (p) {
@@ -992,28 +1039,9 @@ open_attachment (EAttachmentBar *bar, CompEditor *editor)
 		return FALSE;
 }
 
-static	gboolean 
-attachment_bar_icon_clicked_cb (EAttachmentBar *bar, GdkEvent *event, CompEditor *editor)
-{
-	if (E_IS_ATTACHMENT_BAR (bar) && event->type == GDK_2BUTTON_PRESS) 
-		if (open_attachment (bar, editor))
-				return TRUE;
-	return FALSE;
-}
-
 /* Callbacks.  */
 
 static void
-cab_open(EPopup *ep, EPopupItem *item, void *data)
-{
-	EAttachmentBar *bar = data;
-	CompEditor *editor = COMP_EDITOR (gtk_widget_get_toplevel (GTK_WIDGET (bar)));
-	
-	if (!open_attachment (bar, editor))
-		g_message ("\n Open failed");
-}
-
-static void
 cab_add(EPopup *ep, EPopupItem *item, void *data)
 {
 	EAttachmentBar *bar = data;
@@ -1052,11 +1080,10 @@ cab_remove(EPopup *ep, EPopupItem *item, void *data)
 
 /* Popup menu handling.  */
 static EPopupItem cab_popups[] = {
-	{ E_POPUP_ITEM, "10.attach", N_("_Open"), cab_open, NULL, GTK_STOCK_OPEN, E_CAL_POPUP_ATTACHMENTS_ONE},
-	{ E_POPUP_ITEM, "20.attach", N_("_Remove"), cab_remove, NULL, GTK_STOCK_REMOVE, E_CAL_POPUP_ATTACHMENTS_MANY | E_CAL_POPUP_ATTACHMENTS_MODIFY },
-	{ E_POPUP_ITEM, "30.attach", N_("_Properties"), cab_properties, NULL, GTK_STOCK_PROPERTIES, E_CAL_POPUP_ATTACHMENTS_ONE },
-	{ E_POPUP_BAR, "40.attach.00", NULL, NULL, NULL, NULL, E_CAL_POPUP_ATTACHMENTS_MANY|E_CAL_POPUP_ATTACHMENTS_ONE },
-	{ E_POPUP_ITEM, "40.attach.01", N_("_Add attachment..."), cab_add, NULL, GTK_STOCK_ADD, E_CAL_POPUP_ATTACHMENTS_MODIFY},
+	{ E_POPUP_ITEM, "10.attach", N_("_Remove"), cab_remove, NULL, GTK_STOCK_REMOVE, E_CAL_POPUP_ATTACHMENTS_MANY | E_CAL_POPUP_ATTACHMENTS_MODIFY },
+	{ E_POPUP_ITEM, "20.attach", N_("_Properties"), cab_properties, NULL, GTK_STOCK_PROPERTIES, E_CAL_POPUP_ATTACHMENTS_ONE },
+	{ E_POPUP_BAR, "30.attach.00", NULL, NULL, NULL, NULL, E_CAL_POPUP_ATTACHMENTS_MANY|E_CAL_POPUP_ATTACHMENTS_ONE },
+	{ E_POPUP_ITEM, "30.attach.01", N_("_Add attachment..."), cab_add, NULL, GTK_STOCK_ADD, E_CAL_POPUP_ATTACHMENTS_MODIFY },
 };
 
 static void
@@ -1097,7 +1124,7 @@ cab_popup(EAttachmentBar *bar, GdkEventButton *event, int id)
 	ECalPopup *ecp;
 	ECalPopupTargetAttachments *t;
 	GtkMenu *menu;
-	CompEditor *editor = COMP_EDITOR (gtk_widget_get_toplevel (GTK_WIDGET (bar)));
+       CompEditor *editor = COMP_EDITOR (gtk_widget_get_toplevel (GTK_WIDGET (bar)));
 
         attachments = e_attachment_bar_get_attachment(bar, id);
 
@@ -1138,17 +1165,14 @@ button_press_event (GtkWidget *widget, GdkEventButton *event)
 {
 	EAttachmentBar *bar = (EAttachmentBar *)widget;
 	GnomeIconList *icon_list = GNOME_ICON_LIST(widget);
-	int icon_number = -1;
-	
+	int icon_number;
 	if (event->button != 3)
 		return FALSE;
 	
-	if (!gnome_icon_list_get_selection (icon_list)) {
-		icon_number = gnome_icon_list_get_icon_at (icon_list, event->x, event->y);
-		if (icon_number >= 0) {
-			gnome_icon_list_unselect_all(icon_list);
-			gnome_icon_list_select_icon (icon_list, icon_number);
-		}
+	icon_number = gnome_icon_list_get_icon_at (icon_list, event->x, event->y);
+	if (icon_number >= 0) {
+		gnome_icon_list_unselect_all(icon_list);
+		gnome_icon_list_select_icon (icon_list, icon_number);
 	}
 
 	cab_popup(bar, event, icon_number);
@@ -1169,152 +1193,6 @@ key_press_event(GtkWidget *widget, GdkEventKey *event)
         return FALSE;
 }
 
-/* Menu callbacks */
-static void
-menu_file_save_cb (BonoboUIComponent *uic,
-		   void *data,
-		   const char *path)
-{
-	CompEditor *editor = (CompEditor *) data;
-	CompEditorPrivate *priv = editor->priv;
-	ECalComponentText text;
-	gboolean delegated;
-	ECalComponent *comp;
-
-	if (e_attachment_bar_get_download_count (E_ATTACHMENT_BAR (editor->priv->attachment_bar)) ){
-		gboolean response = 1;
-	/*FIXME: Cannot use mail functions from calendar!!!! */
-#if 0	
-		ECalComponentVType vtype = e_cal_component_get_vtype(editor->priv->comp);
-
-		if (vtype == E_CAL_COMPONENT_EVENT)
-			response = em_utils_prompt_user((GtkWindow *)widget, 
-							 NULL, 
-							 "calendar:ask-send-event-pending-download", 
-							  NULL);
-		else
-			response = em_utils_prompt_user((GtkWindow *)widget, 
-							 NULL, 
-							 "calendar:ask-send-task-pending-download", 
-							  NULL);
-#endif
-	if (!response) 
-		return;
-	}	
-	commit_all_fields (editor);
-	if (e_cal_component_is_instance (priv->comp))
-		if (!recur_component_dialog (priv->client, priv->comp, &priv->mod, GTK_WINDOW (editor), delegated))
-			return;
-
-	comp = comp_editor_get_current_comp (editor);
-	e_cal_component_get_summary (comp, &text);
-	g_object_unref (comp);
-
-	if (!text.value) 
-		if (!send_component_prompt_subject ((GtkWindow *) editor, priv->client, priv->comp))
-			return;
-	if (save_comp_with_send (editor)) 
-		close_dialog (editor);
-
-}
-
-static void
-menu_file_close_cb (BonoboUIComponent *uic,
-		   void *data,
-		   const char *path)
-{
-	CompEditor *editor = (CompEditor *) data;
-	commit_all_fields (editor);
-		
-	if (prompt_to_save_changes (editor, TRUE))
-		close_dialog (editor);
-}
-
-static void
-menu_edit_copy_cb (BonoboUIComponent *uic,
-		   void *data,
-		   const char *path)
-{
-	/*TODO Implement the function 
-	CompEditor *editor = (CompEditor *) data; */
-
-}
-
-static void
-menu_edit_paste_cb (BonoboUIComponent *uic,
-		    void *data,
-		    const char *path)
-{
-	/*TODO Implement the function 
-	CompEditor *editor = (CompEditor *) data; */
-
-}
-
-static void
-menu_edit_cut_cb (BonoboUIComponent *uic,
-		  void *data,
-		  const char *path)
-{
-	/*TODO Implement the function 
-	CompEditor *editor = (CompEditor *) data; */
-
-}
-
-static void
-menu_insert_attachment_cb (BonoboUIComponent *uic,
-		   	   void *data,
-		   	   const char *path)
-{
-	CompEditor *editor = (CompEditor *) data;
-	EAttachmentBar *bar = (EAttachmentBar *)editor->priv->attachment_bar;
-	GPtrArray *file_list;
-	gboolean is_inline = FALSE;
-	int i;
-
-	file_list = comp_editor_select_file_attachments (editor, &is_inline);
-	/*TODO add a good implementation here */
-	if (!file_list)
-		return;
-	for (i = 0; i < file_list->len; i++) {
-		e_attachment_bar_attach (bar, file_list->pdata[i], is_inline ? "inline" : "attachment");
-		g_free (file_list->pdata[i]);
-	}
-	
-	g_ptr_array_free (file_list, TRUE);		
-}
-
-static void
-menu_help_cb (BonoboUIComponent *uic,
-	      void *data,
-	      const char *path)
-{
-	CompEditor *editor = (CompEditor *) data;
-	
-	comp_editor_show_help (editor);
-}
-
-static BonoboUIVerb verbs [] = {
-
-	BONOBO_UI_VERB ("FileSave", menu_file_save_cb),
-	BONOBO_UI_VERB ("FileClose", menu_file_close_cb),
-
-	BONOBO_UI_VERB ("EditCopy", menu_edit_copy_cb),
-	BONOBO_UI_VERB ("EditPaste", menu_edit_paste_cb),
-	BONOBO_UI_VERB ("EditCut", menu_edit_cut_cb),
-	
-	BONOBO_UI_VERB ("InsertAttachments", menu_insert_attachment_cb),
-	
-	BONOBO_UI_VERB ("Help", menu_help_cb),
-	
-	BONOBO_UI_VERB_END
-};
-
-static EPixmap pixmaps[] = {
-	E_PIXMAP ("/Toolbar/InsertAttachments", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR),
-
-	E_PIXMAP_END
-};
-
 /* Creates the basic in the editor */
 static void
 setup_widgets (CompEditor *editor)
@@ -1326,8 +1204,9 @@ setup_widgets (CompEditor *editor)
 	priv = editor->priv;
 
 	/* Useful vbox */
-	vbox = gtk_vbox_new (FALSE, 0);
-	bonobo_window_set_contents (BONOBO_WINDOW (editor), vbox);
+	vbox = gtk_vbox_new (FALSE, 12);
+	gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
+	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (editor)->vbox), vbox, TRUE, TRUE, 0);
 	gtk_widget_show (vbox);
 
 	/* Notebook */
@@ -1335,8 +1214,14 @@ setup_widgets (CompEditor *editor)
 	gtk_widget_show (GTK_WIDGET (priv->notebook));
 	gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (priv->notebook),
 			    TRUE, TRUE, 0);
-	gtk_notebook_set_show_tabs (priv->notebook, FALSE);
 
+	/* Buttons */
+	gtk_dialog_add_button  (GTK_DIALOG (editor), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+	gtk_dialog_add_button  (GTK_DIALOG (editor), GTK_STOCK_OK, GTK_RESPONSE_OK);
+	gtk_dialog_add_button  (GTK_DIALOG (editor), GTK_STOCK_HELP, GTK_RESPONSE_HELP);
+	gtk_dialog_set_response_sensitive (GTK_DIALOG (editor), GTK_RESPONSE_OK, FALSE);
+
+	g_signal_connect (editor, "response", G_CALLBACK (response_cb), editor);
 	g_signal_connect (editor, "delete_event", G_CALLBACK (delete_event_cb), editor);
 
 	/*Attachments */
@@ -1361,7 +1246,7 @@ setup_widgets (CompEditor *editor)
 	g_signal_connect (GNOME_ICON_LIST (priv->attachment_bar), "event",
 			  G_CALLBACK (attachment_bar_icon_clicked_cb), editor);			
 	priv->attachment_expander_label =
-		gtk_label_new_with_mnemonic (_("Show Attachment _Bar"));
+		gtk_label_new_with_mnemonic (_("_Attachment Bar (drop attachments here)"));
 	priv->attachment_expander_num = gtk_label_new ("");
 	gtk_label_set_use_markup (GTK_LABEL (priv->attachment_expander_num), TRUE);
 	gtk_misc_set_alignment (GTK_MISC (priv->attachment_expander_label), 0.0, 0.5);
@@ -1379,20 +1264,18 @@ setup_widgets (CompEditor *editor)
 	gtk_box_pack_start (GTK_BOX (expander_hbox), priv->attachment_expander_icon,
 			    TRUE, TRUE, 0);
 	gtk_box_pack_start (GTK_BOX (expander_hbox), priv->attachment_expander_num,
-			    TRUE, TRUE, 0);
+			    FALSE, TRUE, 0);
 	gtk_widget_show_all (expander_hbox);
 	gtk_widget_hide (priv->attachment_expander_icon);
 
-	priv->attachment_expander = e_expander_new ("");
-	e_expander_set_label_widget (E_EXPANDER (priv->attachment_expander), expander_hbox);
-	atk_object_set_name (gtk_widget_get_accessible (priv->attachment_expander), _("Attachment Button: Press space key to toggle attachment bar"));
-	gtk_container_add (GTK_CONTAINER (priv->attachment_expander), priv->attachment_scrolled_window);
+	gtk_box_pack_start (GTK_BOX (vbox), expander_hbox,
+			    FALSE, FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (vbox), priv->attachment_scrolled_window, FALSE, FALSE, GNOME_PAD_SMALL);
+
+	gtk_widget_show (priv->attachment_scrolled_window);
+	gtk_widget_show (expander_hbox);
 
-	gtk_box_pack_start (GTK_BOX (vbox), priv->attachment_expander, FALSE, FALSE, GNOME_PAD_SMALL);
-	gtk_widget_show (priv->attachment_expander);
-	e_expander_set_expanded (E_EXPANDER (priv->attachment_expander), FALSE); 	 
-	g_signal_connect_after (priv->attachment_expander, "activate", 	 
-				G_CALLBACK (attachment_expander_activate_cb), editor);
+	
 }
 
 /* Object initialization function for the calendar component editor */
@@ -1400,8 +1283,6 @@ static void
 comp_editor_init (CompEditor *editor)
 {
 	CompEditorPrivate *priv;
-	BonoboUIContainer *container;
-	char *xmlfile;
 
 	priv = g_new0 (CompEditorPrivate, 1);
 	editor->priv = priv;
@@ -1418,34 +1299,17 @@ comp_editor_init (CompEditor *editor)
 	priv->is_group_item = FALSE;
 	priv->help_section = g_strdup ("usage-calendar");
 
-	container = bonobo_window_get_ui_container (BONOBO_WINDOW (editor));
-	editor->uic = bonobo_ui_component_new_default ();
-	/* FIXME: handle bonobo exceptions */
-	bonobo_ui_component_set_container (editor->uic, bonobo_object_corba_objref (BONOBO_OBJECT (container)), NULL);
-	
-	bonobo_ui_component_add_verb_list_with_data (editor->uic, verbs, editor);
-
-	bonobo_ui_component_freeze (editor->uic, NULL);
-
-	xmlfile = g_build_filename (EVOLUTION_UIDIR,
-				    "evolution-editor.xml",
-				    NULL);
-	bonobo_ui_util_set_ui (editor->uic, PREFIX,
-			       xmlfile,
-			       "evolution-editor", NULL);
-	g_free (xmlfile);
-
-	e_pixmaps_update (editor->uic, pixmaps);
-	bonobo_ui_component_thaw (editor->uic, NULL);
-
-	bonobo_ui_component_set_prop (editor->uic, "/commands/FileSave", "sensitive", "0", NULL);
-
 	/* DND support */
 	gtk_drag_dest_set (GTK_WIDGET (editor), GTK_DEST_DEFAULT_ALL,  drop_types, num_drop_types, GDK_ACTION_COPY|GDK_ACTION_ASK|GDK_ACTION_MOVE);
 	g_signal_connect(editor, "drag_data_received", G_CALLBACK (drag_data_received), NULL);
 	g_signal_connect(editor, "drag-motion", G_CALLBACK(drag_motion), editor);
 
 	gtk_window_set_type_hint (GTK_WINDOW (editor), GDK_WINDOW_TYPE_HINT_NORMAL);
+	gtk_dialog_set_has_separator (GTK_DIALOG (editor), FALSE);
+
+	gtk_widget_ensure_style (GTK_WIDGET (editor));
+	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (editor)->vbox), 0);
+	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (editor)->action_area), 12);
 }
 
 
@@ -1666,8 +1530,8 @@ comp_editor_set_changed (CompEditor *editor, gboolean changed)
 
 	priv->changed = changed;
 
-	bonobo_ui_component_set_prop (editor->uic, "/commands/FileSave", "sensitive", changed ? "1" : "0"
-			, NULL);
+	gtk_dialog_set_response_sensitive (GTK_DIALOG (editor), GTK_RESPONSE_OK, changed);
+	gtk_dialog_set_default_response (GTK_DIALOG (editor), GTK_RESPONSE_OK);
 }
 
 /**
@@ -1788,17 +1652,14 @@ static void page_unmapped_cb (GtkWidget *page_widget,
  * comp_editor_append_page:
  * @editor: A component editor
  * @page: A component editor page
- * @label: Label of the page. Should be NULL if add is FALSE. 
- * @add: Add's the page into the notebook if TRUE
+ * @label: Label of the page
  *
- * Appends a page to the notebook if add is TRUE else
- * just adds it to the list of pages. 
+ * Appends a page to the editor notebook with the given label
  **/
 void
 comp_editor_append_page (CompEditor *editor,
 			 CompEditorPage *page,
-			 const char *label,
-			 gboolean add)
+			 const char *label)
 {
 	CompEditorPrivate *priv;
 	GtkWidget *page_widget;
@@ -1809,6 +1670,7 @@ comp_editor_append_page (CompEditor *editor,
 	g_return_if_fail (IS_COMP_EDITOR (editor));
 	g_return_if_fail (page != NULL);
 	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
+	g_return_if_fail (label != NULL);
 
 	priv = editor->priv;
 
@@ -1829,15 +1691,12 @@ comp_editor_append_page (CompEditor *editor,
 	page_widget = comp_editor_page_get_widget (page);
 	g_assert (page_widget != NULL);
 
-	if (label)
-		label_widget = gtk_label_new_with_mnemonic (label);
+	label_widget = gtk_label_new (label);
 
 	is_first_page = (priv->pages == NULL);
 
 	priv->pages = g_list_append (priv->pages, page);
-	
-	if (add)
-		gtk_notebook_append_page (priv->notebook, page_widget, label_widget);
+	gtk_notebook_append_page (priv->notebook, page_widget, label_widget);
 
 	/* Listen for things happening on the page */
 	g_signal_connect(page, "changed",
@@ -2230,7 +2089,6 @@ set_attachment_list (CompEditor *editor, GSList *attach_list)
 		}
 
 		e_attachment_bar_attach_mime_part ((EAttachmentBar *) editor->priv->attachment_bar, part);
-		e_expander_set_expanded (E_EXPANDER (editor->priv->attachment_expander), TRUE);
 
 		camel_object_unref (part);
 	}	
@@ -2656,8 +2514,7 @@ comp_editor_notify_client_changed (CompEditor *editor, ECal *client)
 
 	if (!e_cal_is_read_only (client, &read_only, NULL))
 		read_only = TRUE;
-
-	/* FIXME: SRINI: Disable widgets */
+	gtk_dialog_set_response_sensitive (GTK_DIALOG (editor), GTK_RESPONSE_OK, !read_only);
 }
 
 static void
diff --git a/calendar/gui/dialogs/comp-editor.h b/calendar/gui/dialogs/comp-editor.h
index 3affcb22b6..31f977e3ff 100644
--- a/calendar/gui/dialogs/comp-editor.h
+++ b/calendar/gui/dialogs/comp-editor.h
@@ -22,9 +22,6 @@
 #define COMP_EDITOR_H
 
 #include <gtk/gtk.h>
-#include <bonobo/bonobo-window.h>
-#include <bonobo/bonobo-ui-util.h>
-#include <bonobo/bonobo-widget.h>
 #include <libecal/e-cal.h>
 #include "../itip-utils.h"
 #include "comp-editor-page.h"
@@ -42,15 +39,14 @@ G_BEGIN_DECLS
 typedef struct _CompEditorPrivate CompEditorPrivate;
 
 typedef struct {
-	BonoboWindow object;
+	GtkDialog object;
 
 	/* Private data */
 	CompEditorPrivate *priv;
-	BonoboUIComponent *uic;
 } CompEditor;
 
 typedef struct {
-	BonoboWindowClass parent_class;
+	GtkDialogClass parent_class;
 
 	/* Virtual functions */
 	void (* set_e_cal) (CompEditor *page, ECal *client);
@@ -84,8 +80,7 @@ void          comp_editor_set_group_item     (CompEditor             *editor,
 gboolean      comp_editor_get_group_item     (CompEditor             *editor);
 void          comp_editor_append_page      (CompEditor             *editor,
 					    CompEditorPage         *page,
-					    const char             *label,
-					    gboolean add);
+					    const char             *label);
 void          comp_editor_remove_page      (CompEditor             *editor,
 					    CompEditorPage         *page);
 void          comp_editor_show_page        (CompEditor             *editor,
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index b4aaa77930..414aa5ecca 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -30,27 +30,17 @@
 #include <gtk/gtktextview.h>
 #include <gtk/gtktogglebutton.h>
 #include <gtk/gtkmessagedialog.h>
-#include <gdk/gdkkeysyms.h>
 #include <libgnome/gnome-i18n.h>
 #include <glade/glade.h>
 #include <libedataserverui/e-source-option-menu.h>
 #include "common/authentication.h"
 #include "e-util/e-categories-config.h"
 #include "e-util/e-dialog-widgets.h"
-#include "e-util/e-popup.h"
 #include "misc/e-dateedit.h"
 #include "misc/e-send-options.h"
 #include <libecal/e-cal-time-util.h>
 #include "../calendar-config.h"
 #include "../e-timezone-entry.h"
-#include <e-util/e-dialog-utils.h>
-#include <e-util/e-dialog-widgets.h>
-#include <e-util/e-util-private.h>
-
-#include "../e-meeting-attendee.h"
-#include "../e-meeting-store.h"
-#include "../e-meeting-list-view.h"
-#include "../e-cal-popup.h"
 #include "comp-editor.h"
 #include "comp-editor-util.h"
 #include "../e-alarm-list.h"
@@ -68,44 +58,24 @@ struct _EventPagePrivate {
 	/* Widgets from the Glade file */
 
 	GtkWidget *main;
-	BonoboUIComponent *uic;
 
 	GtkWidget *summary;
 	GtkWidget *summary_label;
 	GtkWidget *location;
 	GtkWidget *location_label;
 
-	EAccountList *accounts;
-	EMeetingAttendee *ia;	
-	char *default_address;
-	char *user_add;
-	ECalComponent *comp;
-
-	/* For meeting/event */
-	GtkWidget *calendar_label;
-	GtkWidget *org_cal_label;
-	GtkWidget *attendee_box;
-
-	/* Lists of attendees */
-	GPtrArray *deleted_attendees;
-	
 	GtkWidget *start_time;
 	GtkWidget *end_time;
-	GtkWidget *end_time_selector;
-	GtkWidget *time_hour;
-	GtkWidget *hour_selector;
 	GtkWidget *start_timezone;
 	GtkWidget *end_timezone;
-	GtkWidget *timezone_label;
-	gboolean   all_day_event;
+	GtkWidget *all_day_event;
 
 	GtkWidget *description;
 
-	ECalComponentClassification classification;
+	GtkWidget *classification;
 	
-	gboolean  show_time_as_busy;
+	GtkWidget *show_time_as_busy;
 
-	GtkWidget *alarm_dialog;
 	GtkWidget *alarm;
 	GtkWidget *alarm_time;
 	GtkWidget *alarm_warning;
@@ -116,29 +86,12 @@ struct _EventPagePrivate {
 
 	GtkWidget *source_selector;
 	
-	/* Meeting related items */
-	GtkWidget *list_box;
-	GtkWidget *organizer_table;
-	GtkWidget *organizer;
-	GtkWidget *add;
-	GtkWidget *remove;
-	GtkWidget *edit;
-	GtkWidget *invite;
-	GtkWidget *attendees_label;
-
-	/* ListView stuff */
-	EMeetingStore *model;
-	ECal	  *client;
-	EMeetingListView *list_view;
-	gint row;
-
-	/* For handling who the organizer is */
-	gboolean user_org;
-	gboolean existing;
-        gboolean updating;
+	GtkWidget *sendoptions_frame;
+	GtkWidget *sendoptions_button;
 
 	EAlarmList *alarm_list_store;
 	
+	gboolean updating;
 	gboolean sendoptions_shown;
 
 	ESendOptionsDialog *sod;
@@ -164,10 +117,7 @@ static gboolean event_page_fill_component (CompEditorPage *page, ECalComponent *
 static gboolean event_page_fill_timezones (CompEditorPage *page, GHashTable *timezones);
 static void event_page_set_summary (CompEditorPage *page, const char *summary);
 static void event_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates);
-static void notify_dates_changed (EventPage *epage, struct icaltimetype *start_tt, struct icaltimetype *end_tt);
-static gboolean check_start_before_end (struct icaltimetype *start_tt, icaltimezone *start_zone, 
-					struct icaltimetype *end_tt, icaltimezone *end_zone, gboolean adjust_end_time);
-static void set_attendees (ECalComponent *comp, const GPtrArray *attendees);
+
 G_DEFINE_TYPE (EventPage, event_page, TYPE_COMP_EDITOR_PAGE);
 
 /* Class initialization function for the event page */
@@ -201,7 +151,6 @@ event_page_init (EventPage *epage)
 	epage->priv = priv;
 
 	priv->xml = NULL;
-	priv->uic = NULL;
 
 	priv->main = NULL;
 	priv->summary = NULL;
@@ -212,49 +161,26 @@ event_page_init (EventPage *epage)
 	priv->end_time = NULL;
 	priv->start_timezone = NULL;
 	priv->end_timezone = NULL;
-	priv->timezone_label = NULL;
-	priv->all_day_event = FALSE;
+	priv->all_day_event = NULL;
 	priv->description = NULL;
-	priv->classification = E_CAL_COMPONENT_CLASS_NONE;
-	priv->show_time_as_busy = FALSE;
-	priv->alarm_dialog = NULL;
+	priv->classification = NULL;
+	priv->show_time_as_busy = NULL;
 	priv->alarm = NULL;
 	priv->alarm_time = NULL;
 	priv->alarm_custom = NULL;
 	priv->categories_btn = NULL;
 	priv->categories = NULL;
+	priv->sendoptions_frame = NULL;
+	priv->sendoptions_button = NULL;
 	priv->sod = NULL;
 
-	priv->deleted_attendees = g_ptr_array_new ();
-
-	priv->comp = NULL;
-
-	priv->accounts = NULL;
-	priv->ia = NULL;
-	priv->default_address = NULL;
-	priv->invite = NULL;
-	
-	priv->model = NULL;
-	priv->list_view = NULL;
-	
-	priv->updating = FALSE;
-	
 	priv->alarm_interval =  -1;
 	
+	priv->updating = FALSE;
 	priv->sendoptions_shown = FALSE;
 	priv->is_meeting = FALSE;
 	priv->sync_timezones = FALSE;
 
-	priv->default_address = NULL;
-}
-
-static void
-cleanup_attendees (GPtrArray *attendees)
-{
-	int i;
-	
-	for (i = 0; i < attendees->len; i++)
-		g_object_unref (g_ptr_array_index (attendees, i));
 }
 
 /* Destroy handler for the event page */
@@ -269,13 +195,7 @@ event_page_finalize (GObject *object)
 
 	epage = EVENT_PAGE (object);
 	priv = epage->priv;
-	
-	if (priv->comp != NULL)
-		g_object_unref (priv->comp);
 
-	cleanup_attendees (priv->deleted_attendees);
-	g_ptr_array_free (priv->deleted_attendees, TRUE);
-	
 	if (priv->main)
 		gtk_widget_unref (priv->main);
 
@@ -326,54 +246,6 @@ static const int alarm_map[] = {
 	-1
 };
 
-static void
-set_classification_menu (EventPage *epage, gint class)
-{
-	bonobo_ui_component_freeze (epage->priv->uic, NULL);
-	switch (class) {
-		case E_CAL_COMPONENT_CLASS_PUBLIC:
-			bonobo_ui_component_set_prop (
-				epage->priv->uic, "/commands/ActionClassPublic",
-				"state", "1", NULL);
-			break;
-		case E_CAL_COMPONENT_CLASS_CONFIDENTIAL:
-			bonobo_ui_component_set_prop (
-				epage->priv->uic, "/commands/ActionClassConfidential",
-				"state", "1", NULL);
-			break;
-		case E_CAL_COMPONENT_CLASS_PRIVATE:
-			bonobo_ui_component_set_prop (
-				epage->priv->uic, "/commands/ActionClassPrivate",
-				"state", "1", NULL);
-			break;
-	}
-	bonobo_ui_component_thaw (epage->priv->uic, NULL);
-}
-
-static void
-set_busy_time_menu (EventPage *epage, gboolean status)
-{
-	bonobo_ui_component_set_prop (
-		epage->priv->uic, "/commands/ActionShowTimeBusy",
-		"state", status ? "1" : "0", NULL);
-}
-
-static void
-enable_busy_time_menu (EventPage *epage, gboolean state)
-{
-	bonobo_ui_component_set_prop (
-		epage->priv->uic, "/commands/ActionShowTimeBusy",
-		"sensitive", state ? "1" : "0", NULL);
-}
-
-static void
-set_all_day_event_menu (EventPage *epage, gboolean status)
-{
-	bonobo_ui_component_set_prop (
-		epage->priv->uic, "/commands/ActionAllDayEvent",
-		"state", status ? "1" : "0", NULL);
-}
-
 /* get_widget handler for the event page */
 static GtkWidget *
 event_page_get_widget (CompEditorPage *page)
@@ -409,16 +281,23 @@ set_all_day (EventPage *epage, gboolean all_day)
 
 	priv = epage->priv;
 
-	set_all_day_event_menu (epage, all_day);
-	
-	if (all_day)
-		gtk_option_menu_set_history ((GtkOptionMenu *) priv->end_time_selector, 1);
-	/* TODO implement for in end time selector */
-	gtk_widget_set_sensitive (priv->end_time_selector, FALSE);
+	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->all_day_event),
+					  epage);
+	e_dialog_toggle_set (priv->all_day_event, all_day);
+	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->all_day_event),
+					    epage);
 
 	e_date_edit_set_show_time (E_DATE_EDIT (priv->start_time), !all_day);
 	e_date_edit_set_show_time (E_DATE_EDIT (priv->end_time), !all_day);
 
+	/* DATE values do not have timezones, so we hide the fields. */
+	if (all_day) {
+		gtk_widget_hide (priv->start_timezone);
+		gtk_widget_hide (priv->end_timezone);
+	} else {
+		gtk_widget_show (priv->start_timezone);
+		gtk_widget_show (priv->end_timezone);
+	}
 }
 
 static void
@@ -426,7 +305,7 @@ update_time (EventPage *epage, ECalComponentDateTime *start_date, ECalComponentD
 {
 	EventPagePrivate *priv;
 	struct icaltimetype *start_tt, *end_tt, implied_tt;
-	icaltimezone *start_zone = NULL;
+	icaltimezone *start_zone = NULL, *end_zone = NULL;
 	gboolean all_day_event;
 
 	priv = epage->priv;
@@ -444,6 +323,16 @@ update_time (EventPage *epage, ECalComponentDateTime *start_date, ECalComponentD
 		}
 	}
 
+	end_zone = icaltimezone_get_builtin_timezone_from_tzid (end_date->tzid);
+	if (!end_zone) {
+		if (!e_cal_get_timezone (COMP_EDITOR_PAGE (epage)->client,
+					      end_date->tzid, &end_zone, NULL)) {
+			/* FIXME: Handle error better. */
+			g_warning ("Couldn't get timezone from server: %s",
+				   end_date->tzid ? end_date->tzid : "");
+		}
+	}
+
 	/* If both times are DATE values, we set the 'All Day Event' checkbox.
 	   Also, if DTEND is after DTSTART, we subtract 1 day from it. */
 	all_day_event = FALSE;
@@ -462,14 +351,13 @@ update_time (EventPage *epage, ECalComponentDateTime *start_date, ECalComponentD
 		}
 	}
 
-	epage->priv->all_day_event = all_day_event;
 	set_all_day (epage, all_day_event);
 
 	/* If it is an all day event, we set both timezones to the current
 	   timezone, so that if the user toggles the 'All Day Event' checkbox
 	   the event uses the current timezone rather than none at all. */
 	if (all_day_event)
-		start_zone = calendar_config_get_icaltimezone ();
+		start_zone = end_zone = calendar_config_get_icaltimezone ();
 
 	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->start_time),
 					  epage);
@@ -498,12 +386,16 @@ update_time (EventPage *epage, ECalComponentDateTime *start_date, ECalComponentD
 	
 	e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (priv->start_timezone),
 				       start_zone);
-	event_page_set_show_timezone (epage, calendar_config_get_show_timezone() & !all_day_event);
+	e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (priv->end_timezone),
+				       end_zone);
 
 	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->start_timezone),
 					    epage);
+	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->end_timezone),
+					    epage);
+
+	priv->sync_timezones = (start_zone == end_zone) ? TRUE : FALSE;
 
-	priv->sync_timezones = TRUE; 
 }
 
 /* Fills the widgets with default values */
@@ -532,16 +424,13 @@ clear_widgets (EventPage *epage)
 	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->end_time),
 					    epage);
 
-	epage->priv->all_day_event = FALSE;
 	set_all_day (epage, FALSE);
 
 	/* Classification */
-	priv->classification = E_CAL_COMPONENT_CLASS_PRIVATE;
-	set_classification_menu (epage, priv->classification);
+	e_dialog_option_menu_set (priv->classification, E_CAL_COMPONENT_CLASS_PRIVATE, classification_map);
 
 	/* Show Time As (Transparency) */
-	priv->show_time_as_busy = TRUE;
-	set_busy_time_menu (epage, TRUE);
+	e_dialog_toggle_set (priv->show_time_as_busy, TRUE);
 
 	/* Alarm */
 	e_dialog_toggle_set (priv->alarm, FALSE);
@@ -549,9 +438,6 @@ clear_widgets (EventPage *epage)
 	
 	/* Categories */
 	e_dialog_editable_set (priv->categories, NULL);
-
-	gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (priv->organizer)->entry), priv->default_address);
-	
 }
 
 static gboolean
@@ -714,50 +600,11 @@ is_custom_alarm_store (EAlarmList *alarm_list_store, char *old_summary,  CalUnit
 	return FALSE;
 }
 
-void
-event_page_set_view_role (EventPage *epage, gboolean state)
-{
-	EventPagePrivate *priv = epage->priv;
-
-	e_meeting_list_view_column_set_visible (priv->list_view, "Role", state);
-}
-
-void
-event_page_set_view_status (EventPage *epage, gboolean state)
-{
-	EventPagePrivate *priv = epage->priv;
-
-	e_meeting_list_view_column_set_visible (priv->list_view, "Status", state);
-}
-
-void
-event_page_set_view_type (EventPage *epage, gboolean state)
-{
-	EventPagePrivate *priv = epage->priv;
-
-	e_meeting_list_view_column_set_visible (priv->list_view, "Type", state);
-}
-
-void
-event_page_set_view_rsvp (EventPage *epage, gboolean state)
-{
-	EventPagePrivate *priv = epage->priv;
-
-	e_meeting_list_view_column_set_visible (priv->list_view, "RSVP", state);
-}
-
-void 
-event_page_set_classification (EventPage *epage, ECalComponentClassification class)
-{
-	epage->priv->classification = class;
-}
-
 static void
 sensitize_widgets (EventPage *epage)
 {
 	gboolean read_only, custom, alarm, sens = TRUE, sensitize;
 	EventPagePrivate *priv;
-	gboolean delegate;	
 	
 	priv = epage->priv;
 	if (COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_MEETING)
@@ -766,75 +613,38 @@ sensitize_widgets (EventPage *epage)
 	if (!e_cal_is_read_only (COMP_EDITOR_PAGE (epage)->client, &read_only, NULL))
 		read_only = TRUE;
 	
-	delegate = COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_DELEGATE;
-	
 	sensitize = !read_only && sens;
 
 	custom = is_custom_alarm_store (priv->alarm_list_store, priv->old_summary, priv->alarm_units, priv->alarm_interval, NULL);
 	alarm = e_dialog_toggle_get (priv->alarm);
 	
+	gtk_widget_set_sensitive (priv->summary_label, sensitize);
 	gtk_entry_set_editable (GTK_ENTRY (priv->summary), sensitize);
+	gtk_widget_set_sensitive (priv->location_label, sensitize);
 	gtk_entry_set_editable (GTK_ENTRY (priv->location), sensitize);
 	gtk_widget_set_sensitive (priv->start_time, sensitize);
 	gtk_widget_set_sensitive (priv->start_timezone, sensitize);
 	gtk_widget_set_sensitive (priv->end_time, sensitize);
 	gtk_widget_set_sensitive (priv->end_timezone, sensitize);
+	gtk_widget_set_sensitive (priv->all_day_event, sensitize);
 	gtk_widget_set_sensitive (priv->description, sensitize);
+	gtk_widget_set_sensitive (priv->classification, sensitize);
+	gtk_widget_set_sensitive (priv->show_time_as_busy, sensitize);
 	gtk_widget_set_sensitive (priv->alarm, !read_only);
 	gtk_widget_set_sensitive (priv->alarm_time, !read_only && !custom && alarm);
 	gtk_widget_set_sensitive (priv->alarm_custom, alarm);
+	if (custom)
+		gtk_widget_show (priv->alarm_warning);
+	else
+		gtk_widget_hide (priv->alarm_warning);
 	gtk_widget_set_sensitive (priv->categories_btn, sensitize);
-	/*TODO implement the for portion of the end time selector */
-	gtk_widget_set_sensitive (priv->end_time_selector, FALSE);
+	gtk_widget_set_sensitive (priv->sendoptions_button, sensitize);
 	gtk_entry_set_editable (GTK_ENTRY (priv->categories), sensitize);
 
-	if (delegate) {
+	if (COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_DELEGATE) {
+		gtk_widget_set_sensitive (priv->sendoptions_button, TRUE);
 		gtk_widget_set_sensitive (priv->source_selector, FALSE);
 	}
-
-	gtk_widget_set_sensitive (priv->organizer, !read_only);
-	gtk_widget_set_sensitive (priv->add, (!read_only &&  sens) || delegate);
-	gtk_widget_set_sensitive (priv->remove, (!read_only &&  sens) || delegate);
-	gtk_widget_set_sensitive (priv->invite, (!read_only &&  sens) || delegate);
-	gtk_widget_set_sensitive (GTK_WIDGET (priv->list_view), !read_only);	
-
-	bonobo_ui_component_set_prop (priv->uic, "/commands/InsertAttachments", "sensitive", sensitize ? "1" : "0"
-			, NULL);
-	bonobo_ui_component_set_prop (priv->uic, "/commands/ViewTimeZone", "sensitive", sensitize ? "1" : "0"
-			, NULL);
-	bonobo_ui_component_set_prop (priv->uic, "/commands/ActionAllDayEvent", "sensitive", sensitize ? "1" : "0"
-			, NULL);
-	bonobo_ui_component_set_prop (priv->uic, "/commands/ActionRecurrence", "sensitive", sensitize ? "1" : "0"
-			, NULL);
-	bonobo_ui_component_set_prop (priv->uic, "/commands/ActionShowTimeBusy", "sensitive", !read_only ? "1" : "0"
-			, NULL);
-	bonobo_ui_component_set_prop (priv->uic, "/commands/ActionAlarm", "sensitive", !read_only ? "1" : "0"
-			, NULL);
-	bonobo_ui_component_set_prop (priv->uic, "/commands/ActionClassPublic", "sensitive", sensitize ? "1" : "0"
-			, NULL);
-	bonobo_ui_component_set_prop (priv->uic, "/commands/ActionClassPrivate", "sensitive", sensitize ? "1" : "0"
-			, NULL);
-	bonobo_ui_component_set_prop (priv->uic, "/commands/ActionClassConfidential", "sensitive",
-		       	sensitize ? "1" : "0", NULL);
-	bonobo_ui_component_set_prop (priv->uic, "/commands/ViewCategories", "sensitive", sensitize ? "1" : "0"
-			, NULL);
-	bonobo_ui_component_set_prop (priv->uic, "/commands/InsertSendOptions", "sensitive", sensitize ? "1" : "0"
-			, NULL);
-
-	if (!priv->is_meeting) {
-		gtk_widget_hide (priv->calendar_label);
-		gtk_widget_hide (priv->list_box);
-		gtk_widget_hide (priv->attendee_box);
-		gtk_widget_hide (priv->organizer);
-		gtk_label_set_text_with_mnemonic ((GtkLabel *) priv->org_cal_label, _("Cale_ndar"));
-	} else {
-		gtk_widget_show (priv->calendar_label);
-		gtk_widget_show (priv->list_box);
-		gtk_widget_show (priv->attendee_box);
-		gtk_widget_show (priv->organizer);
-		gtk_label_set_text_with_mnemonic ((GtkLabel *) priv->org_cal_label, _("Or_ganizer"));		
-	}
-	
 }
 
 void
@@ -842,7 +652,8 @@ event_page_hide_options (EventPage *page)
 {
 	g_return_if_fail (IS_EVENT_PAGE (page));
 
-	bonobo_ui_component_set_prop (page->priv->uic, "/commands/InsertSendOptions", "hidden", "1", NULL);
+	gtk_widget_hide (page->priv->sendoptions_frame);
+
 	page->priv->sendoptions_shown = FALSE;
 }
 
@@ -851,7 +662,7 @@ event_page_show_options (EventPage *page)
 {
 	g_return_if_fail (IS_EVENT_PAGE (page));
 
-	bonobo_ui_component_set_prop (page->priv->uic, "/commands/InsertSendOptions", "hidden", "0", NULL);
+	gtk_widget_show (page->priv->sendoptions_frame);
 	page->priv->sendoptions_shown = TRUE;
 }
 
@@ -861,49 +672,6 @@ event_page_set_meeting (EventPage *page, gboolean set)
 	g_return_if_fail (IS_EVENT_PAGE (page));
 
 	page->priv->is_meeting = set;
-        sensitize_widgets (page);
-}
-
-void 
-event_page_set_delegate (EventPage *page, gboolean set)
-{
-	g_return_if_fail (IS_EVENT_PAGE (page));
-
-	if (set)
-		gtk_label_set_text_with_mnemonic ((GtkLabel *)page->priv->attendees_label, _("_Delegatees"));
-	else
-		gtk_label_set_text_with_mnemonic ((GtkLabel *)page->priv->attendees_label, _("Atte_ndees"));
-}
-
-static EAccount *
-get_current_account (EventPage *epage)
-{	
-	EventPagePrivate *priv;
-	EIterator *it;
-	const char *str;
-	
-	priv = epage->priv;
-
-	str = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (priv->organizer)->entry));
-	if (!str)
-		return NULL;
-	
-	for (it = e_list_get_iterator((EList *)priv->accounts); e_iterator_is_valid(it); e_iterator_next(it)) {
-		EAccount *a = (EAccount *)e_iterator_get(it);
-		char *full = g_strdup_printf("%s <%s>", a->id->name, a->id->address);
-
-		if (!strcmp (full, str)) {
-			g_free (full);
-			g_object_unref (it);
-
-			return a;
-		}
-	
-		g_free (full);
-	}
-	g_object_unref (it);
-	
-	return NULL;	
 }
 
 /* fill_widgets handler for the event page */
@@ -929,29 +697,15 @@ event_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
 
 	if (!e_cal_component_has_organizer (comp)) 
 		page->flags |= COMP_EDITOR_PAGE_USER_ORG;
-
+		
 	/* Don't send off changes during this time */
 	priv->updating = TRUE;
-	
-	/* Clean out old data */
-	if (priv->comp != NULL)
-		g_object_unref (priv->comp);
-	priv->comp = NULL;
-	
-	cleanup_attendees (priv->deleted_attendees);
-	g_ptr_array_set_size (priv->deleted_attendees, 0);
-	
-	/* Component for cancellation */
-	priv->comp = e_cal_component_clone (comp);
 
 	/* Clean the page */
 	clear_widgets (epage);
 
 	/* Summary, location, description(s) */
 
-	/* Component for cancellation */
-	priv->comp = e_cal_component_clone (comp);
-	
 	e_cal_component_get_summary (comp, &text);
 	e_dialog_editable_set (priv->summary, text.value);
 	priv->old_summary = g_strdup (text.value);
@@ -969,65 +723,8 @@ event_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
 	}
 	e_cal_component_free_text_list (l);
 
-	if (priv->is_meeting) {
-		ECalComponentOrganizer organizer;	
-		
-		priv->user_add = itip_get_comp_attendee (comp, COMP_EDITOR_PAGE (epage)->client);	
-
-		/* If there is an existing organizer show it properly */
-		if (e_cal_component_has_organizer (comp)) {
-			e_cal_component_get_organizer (comp, &organizer);
-			if (organizer.value != NULL) {
-				const gchar *strip = itip_strip_mailto (organizer.value);
-				gchar *string;
-				//			gtk_widget_hide (priv->organizer_table);
-				//			gtk_widget_show (priv->existing_organizer_table);
-				if (itip_organizer_is_user (comp, page->client)) {
-					if (e_cal_get_static_capability (
-								page->client,
-								CAL_STATIC_CAPABILITY_ORGANIZER_NOT_EMAIL_ADDRESS))
-						//					gtk_widget_hide (priv->existing_organizer_btn);
-						priv->user_org = TRUE;
-				} else {
-					if (e_cal_get_static_capability (
-								page->client,
-								CAL_STATIC_CAPABILITY_ORGANIZER_NOT_EMAIL_ADDRESS))
-					gtk_widget_set_sensitive (priv->invite, FALSE);
-					gtk_widget_set_sensitive (priv->add, FALSE);
-					gtk_widget_set_sensitive (priv->remove, FALSE);
-					priv->user_org = FALSE;
-				}
-
-				if (e_cal_get_static_capability (COMP_EDITOR_PAGE (epage)->client, CAL_STATIC_CAPABILITY_NO_ORGANIZER) && (COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_DELEGATE))
-					string = g_strdup (priv->user_add);
-				else if ( organizer.cn != NULL)
-					string = g_strdup_printf ("%s <%s>", organizer.cn, strip);
-				else
-					string = g_strdup (strip);
-
-				g_free (string);
-				priv->existing = TRUE;
-			}
-		} else {
-			EAccount *a;
-
-			a = get_current_account (epage);
-			if (a != NULL) {
-				CompEditorPage *page = (CompEditorPage *) epage;
-				priv->ia = e_meeting_store_add_attendee_with_defaults (priv->model);
-				g_object_ref (priv->ia);
-
-				e_meeting_attendee_set_address (priv->ia, g_strdup_printf ("MAILTO:%s", a->id->address));
-				e_meeting_attendee_set_cn (priv->ia, g_strdup (a->id->name));
-				if (page->client && e_cal_get_organizer_must_accept (page->client))
-					e_meeting_attendee_set_status (priv->ia, ICAL_PARTSTAT_NEEDSACTION);
-				else
-					e_meeting_attendee_set_status (priv->ia, ICAL_PARTSTAT_ACCEPTED);
-			}
-		}
-	}
-
 	/* Start and end times */
+
 	e_cal_component_get_dtstart (comp, &start_date);
 	e_cal_component_get_dtend (comp, &end_date);
 	if (!start_date.value) {
@@ -1044,6 +741,7 @@ event_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
 
 	/* Classification */
 	e_cal_component_get_classification (comp, &cl);
+
 	switch (cl) {
 	case E_CAL_COMPONENT_CLASS_PUBLIC:
 	case E_CAL_COMPONENT_CLASS_PRIVATE:
@@ -1053,24 +751,23 @@ event_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
 		cl = E_CAL_COMPONENT_CLASS_PUBLIC;
 		break;
 	}
-	set_classification_menu (epage, cl);
+	e_dialog_option_menu_set (priv->classification, cl, classification_map);
 
 	/* Show Time As (Transparency) */
 	e_cal_component_get_transparency (comp, &transparency);
 	switch (transparency) {
 	case E_CAL_COMPONENT_TRANSP_TRANSPARENT:
-		set_busy_time_menu (epage, FALSE);
+		e_dialog_toggle_set (priv->show_time_as_busy, FALSE);
 		break;
 
 	default:
-		set_busy_time_menu (epage, TRUE);
+		e_dialog_toggle_set (priv->show_time_as_busy, TRUE);
 		break;
 	}
-
 	if (e_cal_get_static_capability (page->client, CAL_STATIC_CAPABILITY_NO_TRANSPARENCY))
-		enable_busy_time_menu (epage, FALSE);
+		gtk_widget_hide (priv->show_time_as_busy);
 	else
-		enable_busy_time_menu (epage, TRUE);
+		gtk_widget_show (priv->show_time_as_busy);
 
 	/* Alarms */
 	g_signal_handlers_block_matched (priv->alarm, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, epage);
@@ -1098,11 +795,11 @@ event_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
 		e_dialog_option_menu_set (priv->alarm_time, priv->alarm_interval == -1 ? ALARM_15_MINUTES : ALARM_USER_TIME, alarm_map);
 	}
 	g_signal_handlers_unblock_matched (priv->alarm, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, epage);
-
+	
 	/* Categories */
 	e_cal_component_get_categories (comp, &categories);
 	e_dialog_editable_set (priv->categories, categories);
-	
+
 	/* Source */
 	source = e_cal_get_source (page->client);
 	e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector), source);
@@ -1130,6 +827,7 @@ event_page_fill_component (CompEditorPage *page, ECalComponent *comp)
 	struct icaltimetype start_tt, end_tt;
 	gboolean all_day_event, start_date_set, end_date_set, busy;
 	char *cat, *str;
+	ECalComponentClassification classif;
 	GtkTextBuffer *text_buffer;
 	GtkTextIter text_iter_start, text_iter_end;
 
@@ -1220,7 +918,7 @@ event_page_fill_component (CompEditorPage *page, ECalComponent *comp)
 
 	/* If the all_day toggle is set, we use DATE values for DTSTART and
 	   DTEND. If not, we fetch the hour & minute from the widgets. */
-	all_day_event = priv->all_day_event;
+	all_day_event = e_dialog_toggle_get (priv->all_day_event);
 
 	if (all_day_event) {
 		start_tt.is_date = TRUE;
@@ -1229,7 +927,7 @@ event_page_fill_component (CompEditorPage *page, ECalComponent *comp)
 		/* We have to add 1 day to DTEND, as it is not inclusive. */
 		icaltime_adjust (&end_tt, 1, 0, 0, 0);
 	} else {
-		icaltimezone *start_zone;
+		icaltimezone *start_zone, *end_zone;
 
 		if (!e_date_edit_time_is_valid (E_DATE_EDIT (priv->start_time))) {
 			comp_editor_page_display_validation_error (page, _("Start time is wrong"), priv->start_time);
@@ -1247,7 +945,8 @@ event_page_fill_component (CompEditorPage *page, ECalComponent *comp)
 					     &end_tt.minute);
 		start_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
 		start_date.tzid = icaltimezone_get_tzid (start_zone);
-		end_date.tzid = icaltimezone_get_tzid (start_zone);
+		end_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->end_timezone));
+		end_date.tzid = icaltimezone_get_tzid (end_zone);
 	}
 
 	e_cal_component_set_dtstart (comp, &start_date);
@@ -1267,10 +966,11 @@ event_page_fill_component (CompEditorPage *page, ECalComponent *comp)
 		g_free (str);
 
 	/* Classification */
-	e_cal_component_set_classification (comp, priv->classification);
+	classif = e_dialog_option_menu_get (priv->classification, classification_map);
+	e_cal_component_set_classification (comp, classif);
 
 	/* Show Time As (Transparency) */
-	busy = priv->show_time_as_busy;
+	busy = e_dialog_toggle_get (priv->show_time_as_busy);
 	e_cal_component_set_transparency (comp, busy ? E_CAL_COMPONENT_TRANSP_OPAQUE : E_CAL_COMPONENT_TRANSP_TRANSPARENT);
 
 	/* send options */
@@ -1381,79 +1081,6 @@ event_page_fill_component (CompEditorPage *page, ECalComponent *comp)
 		}
 	}
 	
-	if (priv->is_meeting) {
-		ECalComponentOrganizer organizer = {NULL, NULL, NULL, NULL};
-
-		if (!priv->existing) {
-			EAccount *a;
-			gchar *addr = NULL;
-
-			/* Find the identity for the organizer or sentby field */
-			a = get_current_account (epage);
-
-			/* Sanity Check */
-			if (a == NULL) {
-				e_notice (page, GTK_MESSAGE_ERROR,
-						_("The organizer selected no longer has an account."));
-				return FALSE;			
-			}
-
-			if (a->id->address == NULL || strlen (a->id->address) == 0) {
-				e_notice (page, GTK_MESSAGE_ERROR,
-						_("An organizer is required."));
-				return FALSE;
-			} 
-
-			addr = g_strdup_printf ("MAILTO:%s", a->id->address);
-
-			organizer.value = addr;
-			organizer.cn = a->id->name;
-			e_cal_component_set_organizer (comp, &organizer);
-
-			g_free (addr);
-		}
-
-		if (e_meeting_store_count_actual_attendees (priv->model) < 1) {
-			e_notice (page, GTK_MESSAGE_ERROR,
-					_("At least one attendee is required."));
-			return FALSE;
-		}
-
-
-		if (COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_DELEGATE ) {
-			GSList *attendee_list, *l;
-			int i;
-			const GPtrArray *attendees = e_meeting_store_get_attendees (priv->model);
-
-			e_cal_component_get_attendee_list (priv->comp, &attendee_list);
-
-			for (i = 0; i < attendees->len; i++) {
-				EMeetingAttendee *ia = g_ptr_array_index (attendees, i);
-				ECalComponentAttendee *ca;
-
-				/* Remove the duplicate user from the component if present */
-				if (e_meeting_attendee_is_set_delto (ia)) {
-					for (l = attendee_list; l; l = l->next) {
-						ECalComponentAttendee *a = l->data;
-
-						if (g_str_equal (a->value, e_meeting_attendee_get_address (ia))) {
-							attendee_list = g_slist_remove (attendee_list, l->data);
-							break;
-						}
-					}
-				}
-
-				ca = e_meeting_attendee_as_e_cal_component_attendee (ia);
-
-				attendee_list = g_slist_append (attendee_list, ca);
-			}
-			e_cal_component_set_attendee_list (comp, attendee_list);
-			e_cal_component_free_attendee_list (attendee_list);
-		} else 
-			set_attendees (comp, e_meeting_store_get_attendees (priv->model));
-	}
-
-	
 	return TRUE;
 }
 
@@ -1500,499 +1127,6 @@ event_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates)
 
 
 
-static void
-time_sel_changed (GtkOptionMenu *widget, EventPagePrivate *priv)
-{
-	int selection = gtk_option_menu_get_history (widget);
-
-	if (selection == 1) {
-		gtk_widget_hide (priv->time_hour);
-		gtk_widget_show (priv->end_time);
-	} else if (!selection){
-		gtk_widget_show (priv->time_hour);
-		gtk_widget_hide (priv->end_time);
-	}
-		
-}
-
-static void
-add_clicked_cb (GtkButton *btn, EventPage *epage)
-{
-	EMeetingAttendee *attendee;
-
-	attendee = e_meeting_store_add_attendee_with_defaults (epage->priv->model);
-
-	if (COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_DELEGATE) {
-		e_meeting_attendee_set_delfrom (attendee, g_strdup_printf ("MAILTO:%s", epage->priv->user_add));
-	}
-
-	e_meeting_list_view_edit (epage->priv->list_view, attendee);
-}
-
-static gboolean
-existing_attendee (EMeetingAttendee *ia, ECalComponent *comp) 
-{
-	GSList *attendees, *l;
-	const gchar *ia_address;
-	
-	ia_address = itip_strip_mailto (e_meeting_attendee_get_address (ia));
-	if (!ia_address)
-		return FALSE;
-	
-	e_cal_component_get_attendee_list (comp, &attendees);
-
-	for (l = attendees; l; l = l->next) {
-		ECalComponentAttendee *attendee = l->data;
-		const char *address;
-		
-		address = itip_strip_mailto (attendee->value);
-		if (address && !g_strcasecmp (ia_address, address)) {
-			e_cal_component_free_attendee_list (attendees);
-			return TRUE;
-		}
-	}
-	
-	e_cal_component_free_attendee_list (attendees);
-	
-	return FALSE;
-}
-
-static void
-remove_attendee (EventPage *epage, EMeetingAttendee *ia) 
-{
-	EventPagePrivate *priv;
-	int pos = 0;
-	gboolean delegate = (COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_DELEGATE);
-	
-	priv = epage->priv;
-
-	/* If the user deletes the organizer attendee explicitly,
-	   assume they no longer want the organizer showing up */
-	if (ia == priv->ia) {
-		g_object_unref (priv->ia);
-		priv->ia = NULL;
-	}	
-		
-	/* If this was a delegatee, no longer delegate */
-	if (e_meeting_attendee_is_set_delfrom (ia)) {
-		EMeetingAttendee *ib;
-		
-		ib = e_meeting_store_find_attendee (priv->model, e_meeting_attendee_get_delfrom (ia), &pos);
-		if (ib != NULL) {
-			e_meeting_attendee_set_delto (ib, NULL);
-			
-			if (!delegate) 
-				e_meeting_attendee_set_edit_level (ib,  E_MEETING_ATTENDEE_EDIT_FULL);
-		}		
-	}
-	
-	/* Handle deleting all attendees in the delegation chain */	
-	while (ia != NULL) {
-		EMeetingAttendee *ib = NULL;
-
-		if (existing_attendee (ia, priv->comp)) {
-			g_object_ref (ia);
-			g_ptr_array_add (priv->deleted_attendees, ia);
-		}
-		
-		if (e_meeting_attendee_get_delto (ia) != NULL)
-			ib = e_meeting_store_find_attendee (priv->model, e_meeting_attendee_get_delto (ia), NULL);
-		e_meeting_store_remove_attendee (priv->model, ia);
-
-		ia = ib;
-	}
-	
-	sensitize_widgets (epage);
-}
-
-static void
-remove_clicked_cb (GtkButton *btn, EventPage *epage)
-{
-	EventPagePrivate *priv;
-	EMeetingAttendee *ia;
-	GtkTreeSelection *selection;
-	GList *paths = NULL, *tmp;
-	GtkTreeIter iter;
-	GtkTreePath *path = NULL;
-	gboolean valid_iter;
-	char *address;
-	
-	priv = epage->priv;
-
-	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->list_view));
-	if (!(paths = gtk_tree_selection_get_selected_rows (selection, (GtkTreeModel **) &(priv->model)))) {
-		g_warning ("Could not get a selection to delete.");
-		return;
-	}
-	paths = g_list_reverse (paths);
-	
-	for (tmp = paths; tmp; tmp=tmp->next) {
-		path = tmp->data;
-		
-		gtk_tree_model_get_iter (GTK_TREE_MODEL(priv->model), &iter, path);
-
-		gtk_tree_model_get (GTK_TREE_MODEL (priv->model), &iter, E_MEETING_STORE_ADDRESS_COL, &address, -1);
-		ia = e_meeting_store_find_attendee (priv->model, address, NULL);
-		g_free (address);
-		if (!ia) {
-			g_warning ("Cannot delete attendee\n");
-			continue;
-		} else if (e_meeting_attendee_get_edit_level (ia) != E_MEETING_ATTENDEE_EDIT_FULL) {
-			g_warning("Not enough rights to delete attendee: %s\n", e_meeting_attendee_get_address(ia));	
-			continue;
-		}
-		
-		remove_attendee (epage, ia);
-	}
-	
-	/* Select closest item after removal */
-	valid_iter = gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->model), &iter, path);
-	if (!valid_iter) {
-		gtk_tree_path_prev (path);
-		valid_iter = gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->model), &iter, path);
-	}
-	
-	if (valid_iter) {
-		gtk_tree_selection_unselect_all (selection);
-		gtk_tree_selection_select_iter (selection, &iter);
-	}
-	
-	g_list_foreach (paths, (GFunc) gtk_tree_path_free, NULL);
-	g_list_free (paths);
-}
-
-static void
-invite_cb (GtkWidget *widget, gpointer data) 
-{
-	EventPage *page;
-	EventPagePrivate *priv;
-	
-	page = EVENT_PAGE (data);
-	priv = page->priv;
-
-	e_meeting_list_view_invite_others_dialog (priv->list_view);
-}
-
-static void
-attendee_added_cb (EMeetingListView *emlv, EMeetingAttendee *ia, gpointer user_data)
-{
-   EventPage *epage = EVENT_PAGE (user_data);	
-   EventPagePrivate *priv;
-   gboolean delegate = (COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_DELEGATE);
-
-   priv = epage->priv;
-
-   if (delegate) {
-	   if (existing_attendee (ia, priv->comp))
-		   e_meeting_store_remove_attendee (priv->model, ia);
-	   else {
-		   if (!e_cal_get_static_capability (COMP_EDITOR_PAGE(epage)->client, 
-					   CAL_STATIC_CAPABILITY_DELEGATE_TO_MANY)) {
-			   const char *delegator_id = e_meeting_attendee_get_delfrom (ia);
-			   EMeetingAttendee *delegator;
-
-			   delegator = e_meeting_store_find_attendee (priv->model, delegator_id, NULL);
-			   e_meeting_attendee_set_delto (delegator, 
-					   g_strdup (e_meeting_attendee_get_address (ia)));
-
-			   gtk_widget_set_sensitive (priv->invite, FALSE);
-			   gtk_widget_set_sensitive (priv->add, FALSE);
-		   }
-	   }
-   }
-
-}
-
-/* Callbacks for list view*/
-static void
-popup_add_cb (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	EventPage *epage = data;
-
-	add_clicked_cb (NULL, epage);
-}
-
-static void
-popup_delete_cb (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	EventPage *epage = data;
-	EventPagePrivate *priv;
-	
-	priv = epage->priv;
-
-	remove_clicked_cb (NULL, epage);
-}
-
-enum {
-	ATTENDEE_CAN_DELEGATE = 1<<1,
-	ATTENDEE_CAN_DELETE = 1<<2,
-	ATTENDEE_CAN_ADD = 1<<3,
-	ATTENDEE_LAST = 1<<4,
-};
-
-static EPopupItem context_menu_items[] = {
-	{ E_POPUP_ITEM, "10.delete", N_("_Remove"), popup_delete_cb, NULL, GTK_STOCK_REMOVE, ATTENDEE_CAN_DELETE },
-	{ E_POPUP_ITEM, "15.add", N_("_Add "), popup_add_cb, NULL, GTK_STOCK_ADD },	
-};
-
-static void
-context_popup_free(EPopup *ep, GSList *items, void *data)
-{
-	g_slist_free(items);
-}
-
-static gint
-button_press_event (GtkWidget *widget, GdkEventButton *event, EventPage *epage)
-{
-	EventPagePrivate *priv;
-	GtkMenu *menu;
-	EMeetingAttendee *ia;
-	GtkTreePath *path;
-	GtkTreeIter iter;
-	char *address;
-	guint32 disable_mask = ~0;
-	GSList *menus = NULL;
-	ECalPopup *ep;
-	int i;
-
-	priv = epage->priv;
-
-	/* only process right-clicks */
-	if (event->button != 3 || event->type != GDK_BUTTON_PRESS)
-		return FALSE;
-
-	/* only if we right-click on an attendee */
-	if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (priv->list_view), event->x, event->y, &path, NULL, NULL, NULL)) {
-		GtkTreeSelection *selection;
-
-		if (gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->model), &iter, path)) {
-		
-			gtk_tree_model_get (GTK_TREE_MODEL (priv->model), &iter, E_MEETING_STORE_ADDRESS_COL, &address, -1);
-			ia = e_meeting_store_find_attendee (priv->model, address, &priv->row);
-			g_free (address);
-
-			if (ia) {
-				selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->list_view));
-				gtk_tree_selection_unselect_all (selection);
-				gtk_tree_selection_select_path (selection, path);
-		
- 				if (e_meeting_attendee_get_edit_level (ia) == E_MEETING_ATTENDEE_EDIT_FULL)
- 					disable_mask &= ~ATTENDEE_CAN_DELETE;
-			}
-		}
-	}
-
-	if (GTK_WIDGET_IS_SENSITIVE(priv->add))
-		disable_mask &= ~ATTENDEE_CAN_ADD;
-	else if (COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_USER_ORG)
-		disable_mask &= ~ATTENDEE_CAN_ADD;
-
-	ep = e_cal_popup_new("org.gnome.evolution.calendar.meeting.popup");
-
-	for (i=0;i<sizeof(context_menu_items)/sizeof(context_menu_items[0]);i++)
-		menus = g_slist_prepend(menus, &context_menu_items[i]);
-	
-	e_popup_add_items((EPopup *)ep, menus, NULL, context_popup_free, epage);
-	menu = e_popup_create_menu_once((EPopup *)ep, NULL, disable_mask);
-	gtk_menu_popup (menu, NULL, NULL, NULL, NULL, event->button, event->time);
-
-	return TRUE;
-}
-
-static gboolean
-list_view_event (EMeetingListView *list_view, GdkEvent *event, EventPage *epage) {
-	
-	EventPagePrivate *priv= epage->priv;
-	
-	if (event->type == GDK_2BUTTON_PRESS && COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_USER_ORG) {
-		EMeetingAttendee *attendee;
-
-		attendee = e_meeting_store_add_attendee_with_defaults (priv->model);
-
-		if (COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_DELEGATE) {
-			e_meeting_attendee_set_delfrom (attendee, g_strdup_printf ("MAILTO:%s", epage->priv->user_add));
-		}
-
-		e_meeting_list_view_edit (epage->priv->list_view, attendee);
-		return TRUE;
-	}
-
-	return FALSE;	
-}
-
-
-static gboolean
-list_key_press (EMeetingListView *list_view, GdkEventKey *event, EventPage *epage)
-{
-	if (event->keyval == GDK_Delete) {
-		EventPagePrivate *priv;
-	
-		priv = epage->priv;
-		remove_clicked_cb (NULL, epage);
-
-		return TRUE;
-	} else if (event->keyval == GDK_Insert) {
-		add_clicked_cb (NULL, epage);
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-void
-event_page_set_all_day_event (EventPage *epage, gboolean all_day)
-{
-	EventPagePrivate *priv = epage->priv;
-	struct icaltimetype start_tt = icaltime_null_time();
-	struct icaltimetype end_tt = icaltime_null_time();
-	gboolean date_set;
-
-	epage->priv->all_day_event = all_day;
-	e_date_edit_set_show_time (E_DATE_EDIT (priv->start_time), !all_day);
-	e_date_edit_set_show_time (E_DATE_EDIT (priv->end_time), !all_day);
-
-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv->start_time),
-					 &start_tt.year,
-					 &start_tt.month,
-					 &start_tt.day);
-	e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_time),
-				     &start_tt.hour,
-				     &start_tt.minute);
-	g_assert (date_set);
-
-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv->end_time),
-					 &end_tt.year,
-					 &end_tt.month,
-					 &end_tt.day);
-	e_date_edit_get_time_of_day (E_DATE_EDIT (priv->end_time),
-				     &end_tt.hour,
-				     &end_tt.minute);
-	g_assert (date_set);
-
-	if (all_day) {
-		/* FIXME the history set here is wrong */
-		gtk_option_menu_set_history ((GtkOptionMenu *) priv->end_time_selector, 1);
-	}
-	/* TODO implement the for portion in end time selector */
-	gtk_widget_set_sensitive (priv->end_time_selector, FALSE);
-	
-	if (all_day) {
-		bonobo_ui_component_set_prop (epage->priv->uic, "/commands/ViewTimeZone", "sensitive", "0", NULL);
-		
-		/* Round down to the start of the day. */
-		start_tt.hour = 0;
-		start_tt.minute  = 0;
-		start_tt.second  = 0;
-		start_tt.is_date = TRUE;
-
-		/* Round down to the start of the day, or the start of the
-		   previous day if it is midnight. */
-		icaltime_adjust (&end_tt, 0, 0, 0, -1);
-		end_tt.hour = 0;
-		end_tt.minute  = 0;
-		end_tt.second  = 0;
-		end_tt.is_date = TRUE;
-	} else {
-		icaltimezone *start_zone;
-
-		bonobo_ui_component_set_prop (epage->priv->uic, "/commands/ViewTimeZone", "sensitive", "1", NULL);
-		
-		if (end_tt.year == start_tt.year
-		    && end_tt.month == start_tt.month
-		    && end_tt.day == start_tt.day) {
-			/* The event is within one day, so we set the event
-			   start to the start of the working day, and the end
-			   to one hour later. */
-			start_tt.hour = calendar_config_get_day_start_hour ();
-			start_tt.minute  = calendar_config_get_day_start_minute ();
-			start_tt.second  = 0;
-
-			end_tt = start_tt;
-			icaltime_adjust (&end_tt, 0, 1, 0, 0);
-		} else {
-			/* The event is longer than 1 day, so we keep exactly
-			   the same times, just using DATE-TIME rather than
-			   DATE. */
-			icaltime_adjust (&end_tt, 1, 0, 0, 0);
-		}
-
-		/* Make sure that end > start using the timezones. */
-		start_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
-		check_start_before_end (&start_tt, start_zone,
-					&end_tt, start_zone,
-					TRUE);
-	}
-	
-	event_page_set_show_timezone (epage, calendar_config_get_show_timezone() & !all_day);
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->start_time),
-					  epage);
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->end_time),
-					  epage);
-
-	e_date_edit_set_date (E_DATE_EDIT (priv->start_time), start_tt.year,
-			      start_tt.month, start_tt.day);
-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv->start_time),
-				     start_tt.hour, start_tt.minute);
-
-	e_date_edit_set_date (E_DATE_EDIT (priv->end_time), end_tt.year,
-			      end_tt.month, end_tt.day);
-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv->end_time),
-				     end_tt.hour, end_tt.minute);
-
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->start_time),
-					    epage);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->end_time),
-					    epage);
-
-	/* Notify upstream */
-	notify_dates_changed (epage, &start_tt, &end_tt);
-
-        if (!priv->updating)
-		comp_editor_page_notify_changed (COMP_EDITOR_PAGE (epage));
-
-}
-
-void
-event_page_set_show_time_busy (EventPage *epage, gboolean state)
-{
-	epage->priv->show_time_as_busy = state;
-	if (!epage->priv->updating)
-		comp_editor_page_notify_changed (COMP_EDITOR_PAGE (epage));
-
-}
-
-void
-event_page_show_alarm (EventPage *epage)
-{
-	gtk_widget_show (epage->priv->alarm_dialog);
-}
-
-void 
-event_page_set_show_timezone (EventPage *epage, gboolean state)
-{
-	if (state) {
-		gtk_widget_show_all (epage->priv->start_timezone);
-		gtk_widget_show (epage->priv->timezone_label);	
-	} else {
-		gtk_widget_hide (epage->priv->start_timezone);
-		gtk_widget_hide (epage->priv->timezone_label);
-	}
-		
-}
-
-void
-event_page_set_show_categories (EventPage *epage, gboolean state)
-{
-	if (state) {
-		gtk_widget_show (epage->priv->categories_btn);
-		gtk_widget_show (epage->priv->categories);	
-	} else {
-		gtk_widget_hide (epage->priv->categories_btn);
-		gtk_widget_hide (epage->priv->categories);
-	}
-}
-
 /* Gets the widgets from the XML file and returns if they are all available. */
 static gboolean
 get_widgets (EventPage *epage)
@@ -2001,7 +1135,6 @@ get_widgets (EventPage *epage)
 	EventPagePrivate *priv;
 	GSList *accel_groups;
 	GtkWidget *toplevel;
-	GtkWidget *sw;
 
 	priv = epage->priv;
 
@@ -2019,77 +1152,64 @@ get_widgets (EventPage *epage)
 		page->accel_group = accel_groups->data;
 		gtk_accel_group_ref (page->accel_group);
 	}
-	priv->alarm_dialog = GW ("alarm-dialog");
-	priv->alarm = GW ("alarm");
-	priv->alarm_time = GW ("alarm-time");
-	priv->alarm_custom = GW ("alarm-custom");
-
-	priv->timezone_label = GW ("timezone-label");
-	priv->start_timezone = GW ("start-timezone");
-	priv->end_timezone = priv->start_timezone;
-
-	if (!calendar_config_get_show_timezone()) {
-		gtk_widget_hide (priv->timezone_label);
-		gtk_widget_hide (priv->start_timezone);
-	} else {
-		gtk_widget_show (priv->timezone_label);
-		gtk_widget_show_all (priv->start_timezone);
-	}
-	priv->attendees_label = GW ("attendees-label");
 
 	gtk_widget_ref (priv->main);
 	gtk_container_remove (GTK_CONTAINER (priv->main->parent), priv->main);
 
-	priv->categories = GW ("categories");	
-	priv->categories_btn = GW ("categories-button");
-	priv->organizer = GW ("organizer");
 	priv->summary = GW ("summary");
 	priv->summary_label = GW ("summary-label");
 	priv->location = GW ("location");
 	priv->location_label = GW ("location-label");
 
-	priv->invite = GW ("invite");
-	priv->add = GW ("add-attendee");
-	priv->remove = GW ("remove-attendee");
-	priv->list_box = GW ("list-box");
-	
-	priv->calendar_label = GW ("calendar-label");
-	priv->attendee_box = GW ("attendee-box");
-	priv->org_cal_label = GW ("org-cal-label");
-
-	priv->list_view = e_meeting_list_view_new (priv->model);
-	
-	sw = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_IN);
-	gtk_widget_show (sw);
-	gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (priv->list_view));
-	gtk_box_pack_start (GTK_BOX (priv->list_box), sw, TRUE, TRUE, 0);
-	
-
 	/* Glade's visibility flag doesn't seem to work for custom widgets */
 	priv->start_time = GW ("start-time");
 	gtk_widget_show (priv->start_time);
-	
-	priv->time_hour = GW ("time-hour");
-	priv->hour_selector = GW ("hour_selector");
-	priv->end_time_selector = GW ("end-time-selector");
-	
 	priv->end_time = GW ("end-time");
-	gtk_widget_show_all (priv->time_hour);
-	gtk_widget_hide (priv->end_time);
+	gtk_widget_show (priv->end_time);
+
+	priv->start_timezone = GW ("start-timezone");
+	priv->end_timezone = GW ("end-timezone");
+	priv->all_day_event = GW ("all-day-event");
 
 	priv->description = GW ("description");
 
+	priv->classification = GW ("classification");
+
+	priv->show_time_as_busy = GW ("show-time-as-busy");
+
+	priv->alarm = GW ("alarm");
+	priv->alarm_time = GW ("alarm-time");
+	priv->alarm_warning = GW ("alarm-warning");
+	priv->alarm_custom = GW ("alarm-custom");
+
+	priv->categories_btn = GW ("categories-button");
+	priv->categories = GW ("categories");
+
 	priv->source_selector = GW ("source");
 
+	priv->sendoptions_frame = GW ("send-options-frame");
+	priv->sendoptions_button = GW ("send-options-button");
+
 #undef GW
 
 	return (priv->summary
 		&& priv->location
 		&& priv->start_time
 		&& priv->end_time
-		&& priv->description );
+		&& priv->start_timezone
+		&& priv->end_timezone
+		&& priv->all_day_event
+		&& priv->description
+		&& priv->classification
+		&& priv->show_time_as_busy
+		&& priv->alarm
+		&& priv->alarm_time
+		&& priv->alarm_warning
+		&& priv->alarm_custom
+		&& priv->categories_btn
+		&& priv->categories
+		&& priv->sendoptions_frame
+		&& priv->sendoptions_button);
 }
 
 /* Callback used when the summary changes; we emit the notification signal. */
@@ -2124,10 +1244,11 @@ notify_dates_changed (EventPage *epage, struct icaltimetype *start_tt,
 	CompEditorPageDates dates;
 	ECalComponentDateTime start_dt, end_dt;
 	gboolean all_day_event;
-	icaltimezone *start_zone = NULL;
+	icaltimezone *start_zone = NULL, *end_zone = NULL;
+
 	priv = epage->priv;
 	
-	all_day_event = priv->all_day_event;
+	all_day_event = e_dialog_toggle_get (priv->all_day_event);
 
 	start_dt.value = start_tt;
 	end_dt.value = end_tt;
@@ -2138,10 +1259,11 @@ notify_dates_changed (EventPage *epage, struct icaltimetype *start_tt,
 		icaltime_adjust (end_tt, 1, 0, 0, 0);
 	} else {
 		start_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
+		end_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->end_timezone));
 	}
 
 	start_dt.tzid = start_zone ? icaltimezone_get_tzid (start_zone) : NULL;
-	end_dt.tzid = start_zone ? icaltimezone_get_tzid (start_zone) : NULL;
+	end_dt.tzid = end_zone ? icaltimezone_get_tzid (end_zone) : NULL;
 
 	dates.start = &start_dt;
 	dates.end = &end_dt;
@@ -2209,7 +1331,7 @@ times_updated (EventPage *epage, gboolean adjust_end_time)
 	struct icaltimetype end_tt = icaltime_null_time();
 	gboolean date_set, all_day_event;
 	gboolean set_start_date = FALSE, set_end_date = FALSE;
-	icaltimezone *start_zone;
+	icaltimezone *start_zone, *end_zone;
 	
 	priv = epage->priv;
 
@@ -2217,7 +1339,7 @@ times_updated (EventPage *epage, gboolean adjust_end_time)
 		return;
 
 	/* Fetch the start and end times and timezones from the widgets. */
-	all_day_event = priv->all_day_event;
+	all_day_event = e_dialog_toggle_get (priv->all_day_event);
 
 	date_set = e_date_edit_get_date (E_DATE_EDIT (priv->start_time),
 					 &start_tt.year,
@@ -2258,9 +1380,10 @@ times_updated (EventPage *epage, gboolean adjust_end_time)
 					     &end_tt.minute);
 
 		start_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
+		end_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->end_timezone));
 
 		if (check_start_before_end (&start_tt, start_zone,
-					    &end_tt, start_zone,
+					    &end_tt, end_zone,
 					    adjust_end_time)) {
 			if (adjust_end_time)
 				set_end_date = TRUE;
@@ -2325,13 +1448,159 @@ start_timezone_changed_cb (GtkWidget *widget, gpointer data)
 		zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
 		priv->updating = TRUE;
 		e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (priv->end_timezone), zone);
-		gtk_widget_show_all (priv->end_timezone);
 		priv->updating = FALSE;
 	}
 
 	times_updated (epage, TRUE);
 }
 
+
+/* Callback used when the end timezone is changed. It checks if the end
+ * timezone is the same as the start timezone and sets sync_timezones if so.
+ */
+static void
+end_timezone_changed_cb (GtkWidget *widget, gpointer data)
+{
+	EventPage *epage;
+	EventPagePrivate *priv;
+	icaltimezone *start_zone, *end_zone;
+	
+	epage = EVENT_PAGE (data);
+	priv = epage->priv;
+
+	start_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
+	end_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->end_timezone));
+
+	priv->sync_timezones = (start_zone == end_zone) ? TRUE : FALSE;
+
+	times_updated (epage, TRUE);
+}
+
+/* Callback: all day event button toggled.
+ * Note that this should only be called when the user explicitly toggles the
+ * button. Be sure to block this handler when the toggle button's state is set
+ * within the code.
+ */
+static void
+all_day_event_toggled_cb (GtkWidget *toggle, gpointer data)
+{
+	EventPage *epage;
+	EventPagePrivate *priv;
+	gboolean all_day;
+	struct icaltimetype start_tt = icaltime_null_time();
+	struct icaltimetype end_tt = icaltime_null_time();
+	gboolean date_set;
+
+	epage = EVENT_PAGE (data);
+	priv = epage->priv;
+
+	/* When the all_day toggle is turned on, the start date is
+	 * rounded down to the start of the day, and end date is
+	 * rounded down to the start of the day on which the event
+	 * ends. The event is then taken to be inclusive of the days
+	 * between the start and end days.  Note that if the event end
+	 * is at midnight, we round it down to the previous day, so the
+	 * event times stay the same.
+	 *
+	 * When the all_day_toggle is turned off, then if the event is within
+	 * one day, we set the event start to the start of the working day,
+	 * and set the event end to one hour after it. If the event is longer
+	 * than one day, we set the event end to the end of the day it is on,
+	 * so that the actual event times remain the same.
+	 *
+	 * This may need tweaking to work well with different timezones used
+	 * in the event start & end.
+	 */
+	all_day = GTK_TOGGLE_BUTTON (toggle)->active;
+
+	set_all_day (epage, all_day);
+
+	date_set = e_date_edit_get_date (E_DATE_EDIT (priv->start_time),
+					 &start_tt.year,
+					 &start_tt.month,
+					 &start_tt.day);
+	e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_time),
+				     &start_tt.hour,
+				     &start_tt.minute);
+	g_assert (date_set);
+
+	date_set = e_date_edit_get_date (E_DATE_EDIT (priv->end_time),
+					 &end_tt.year,
+					 &end_tt.month,
+					 &end_tt.day);
+	e_date_edit_get_time_of_day (E_DATE_EDIT (priv->end_time),
+				     &end_tt.hour,
+				     &end_tt.minute);
+	g_assert (date_set);
+
+	if (all_day) {
+		/* Round down to the start of the day. */
+		start_tt.hour = 0;
+		start_tt.minute  = 0;
+		start_tt.second  = 0;
+		start_tt.is_date = TRUE;
+
+		/* Round down to the start of the day, or the start of the
+		   previous day if it is midnight. */
+		icaltime_adjust (&end_tt, 0, 0, 0, -1);
+		end_tt.hour = 0;
+		end_tt.minute  = 0;
+		end_tt.second  = 0;
+		end_tt.is_date = TRUE;
+	} else {
+		icaltimezone *start_zone, *end_zone;
+
+		if (end_tt.year == start_tt.year
+		    && end_tt.month == start_tt.month
+		    && end_tt.day == start_tt.day) {
+			/* The event is within one day, so we set the event
+			   start to the start of the working day, and the end
+			   to one hour later. */
+			start_tt.hour = calendar_config_get_day_start_hour ();
+			start_tt.minute  = calendar_config_get_day_start_minute ();
+			start_tt.second  = 0;
+
+			end_tt = start_tt;
+			icaltime_adjust (&end_tt, 0, 1, 0, 0);
+		} else {
+			/* The event is longer than 1 day, so we keep exactly
+			   the same times, just using DATE-TIME rather than
+			   DATE. */
+			icaltime_adjust (&end_tt, 1, 0, 0, 0);
+		}
+
+		/* Make sure that end > start using the timezones. */
+		start_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
+		end_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->end_timezone));
+		check_start_before_end (&start_tt, start_zone,
+					&end_tt, end_zone,
+					TRUE);
+	}
+
+	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->start_time),
+					  epage);
+	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->end_time),
+					  epage);
+
+	e_date_edit_set_date (E_DATE_EDIT (priv->start_time), start_tt.year,
+			      start_tt.month, start_tt.day);
+	e_date_edit_set_time_of_day (E_DATE_EDIT (priv->start_time),
+				     start_tt.hour, start_tt.minute);
+
+	e_date_edit_set_date (E_DATE_EDIT (priv->end_time), end_tt.year,
+			      end_tt.month, end_tt.day);
+	e_date_edit_set_time_of_day (E_DATE_EDIT (priv->end_time),
+				     end_tt.hour, end_tt.minute);
+
+	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->start_time),
+					    epage);
+	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->end_time),
+					    epage);
+
+	/* Notify upstream */
+	notify_dates_changed (epage, &start_tt, &end_tt);
+}
+
 /* Callback used when the categories button is clicked; we must bring up the
  * category list dialog.
  */
@@ -2349,13 +1618,15 @@ categories_clicked_cb (GtkWidget *button, gpointer data)
 	e_categories_config_open_dialog_for_entry (GTK_ENTRY (entry));
 }
 
-void
-event_page_sendoptions_clicked_cb (EventPage *epage)
+static void
+e_sendoptions_clicked_cb (GtkWidget *button, gpointer data)
 {
+	EventPage *epage;
 	EventPagePrivate *priv;
 	GtkWidget *toplevel;
 	ESource *source;
 
+	epage = EVENT_PAGE (data);
 	priv = epage->priv;
 
 	if (!priv->sod) {
@@ -2401,13 +1672,6 @@ source_changed_cb (GtkWidget *widget, ESource *source, gpointer data)
 		ECal *client;
 
 		client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_EVENT);
-		if (client) {
-			icaltimezone *zone;
-			
-			zone = calendar_config_get_icaltimezone ();
-			e_cal_set_default_timezone (client, zone, NULL);
-		}
-
 		if (!client || !e_cal_open (client, FALSE, NULL)) {
 			GtkWidget *dialog;
 
@@ -2424,6 +1688,11 @@ source_changed_cb (GtkWidget *widget, ESource *source, gpointer data)
 			gtk_dialog_run (GTK_DIALOG (dialog));
 			gtk_widget_destroy (dialog);
 		} else {
+			icaltimezone *zone;
+			
+			zone = calendar_config_get_icaltimezone ();
+			e_cal_set_default_timezone (client, zone, NULL);
+
 			comp_editor_notify_client_changed (
 				COMP_EDITOR (gtk_widget_get_toplevel (priv->main)),
 				client);
@@ -2563,7 +1832,6 @@ init_widgets (EventPage *epage)
 	GtkTextBuffer *text_buffer;
 	icaltimezone *zone;
 	char *menu_label = NULL;
-	GtkTreeSelection *selection;	
 	
 	priv = epage->priv;
 
@@ -2591,66 +1859,28 @@ init_widgets (EventPage *epage)
 	g_signal_connect((priv->end_time), "changed",
 			    G_CALLBACK (date_changed_cb), epage);
 
-	/* Categories */
-	g_signal_connect((priv->categories_btn), "clicked",
-			    G_CALLBACK (categories_clicked_cb), epage);
-	
-	/* Source selector */
-	g_signal_connect((priv->source_selector), "source_selected",
-			    G_CALLBACK (source_changed_cb), epage);
-	/* Alarms */
-	priv->alarm_list_store = e_alarm_list_new ();
-
-	/* Timezone changed */
 	g_signal_connect((priv->start_timezone), "changed",
 			    G_CALLBACK (start_timezone_changed_cb), epage);
+	g_signal_connect((priv->end_timezone), "changed",
+			    G_CALLBACK (end_timezone_changed_cb), epage);
 
-	e_meeting_list_view_column_set_visible (priv->list_view, "Attendee                          ", 
-			TRUE);
-	e_meeting_list_view_column_set_visible (priv->list_view, "Role", calendar_config_get_show_role());
-	e_meeting_list_view_column_set_visible (priv->list_view, "RSVP", calendar_config_get_show_rsvp());
-	e_meeting_list_view_column_set_visible (priv->list_view, "Status", calendar_config_get_show_status());
-	e_meeting_list_view_column_set_visible (priv->list_view, "Type", calendar_config_get_show_type());
-	
-	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->list_view));
-	gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
-
-	g_signal_connect (G_OBJECT (priv->list_view), "button_press_event", G_CALLBACK (button_press_event), epage);
-	g_signal_connect (G_OBJECT (priv->list_view), "event", G_CALLBACK (list_view_event), epage);
-	g_signal_connect (priv->list_view, "key_press_event", G_CALLBACK (list_key_press), epage);	
-
-	/* Add attendee button */
-	g_signal_connect (priv->add, "clicked", G_CALLBACK (add_clicked_cb), epage);
-
-	/* Remove attendee button */
-	g_signal_connect (priv->remove, "clicked", G_CALLBACK (remove_clicked_cb), epage);
+	g_signal_connect((priv->all_day_event), "toggled",
+			    G_CALLBACK (all_day_event_toggled_cb), epage);
 
-	/* Contacts button */
-	g_signal_connect(priv->invite, "clicked", G_CALLBACK (invite_cb), epage);	
-
-	/* Alarm dialog */
-	g_signal_connect (GTK_DIALOG (priv->alarm_dialog), "response", G_CALLBACK (gtk_widget_hide), priv->alarm_dialog);
-	gtk_widget_hide (priv->alarm_dialog);
-
-	/* Meeting List View */
-	g_signal_connect (priv->list_view, "attendee_added", G_CALLBACK (attendee_added_cb), epage);	
+	/* Categories button */
+	g_signal_connect((priv->categories_btn), "clicked",
+			    G_CALLBACK (categories_clicked_cb), epage);
 
-	gtk_widget_show (GTK_WIDGET (priv->list_view));
+	/* send options button */
+	g_signal_connect((priv->sendoptions_button), "clicked", 
+			    G_CALLBACK (e_sendoptions_clicked_cb), epage);
 
-	/* categories */
-	if (!calendar_config_get_show_categories()) {
-		gtk_widget_hide (priv->categories_btn);
-		gtk_widget_hide (priv->categories);
-	} else {
-		gtk_widget_show (priv->categories_btn);
-		gtk_widget_show (priv->categories);
-	}	
+	/* Source selector */
+	g_signal_connect((priv->source_selector), "source_selected",
+			    G_CALLBACK (source_changed_cb), epage);
 
-	/* End time selector */
-	gtk_option_menu_set_history ((GtkOptionMenu *) priv->end_time_selector, 1);
-	gtk_widget_hide (priv->time_hour);
-	gtk_widget_show (priv->end_time);
-	g_signal_connect (priv->end_time_selector, "changed", G_CALLBACK (time_sel_changed), priv);
+	/* Alarms */
+	priv->alarm_list_store = e_alarm_list_new ();
 
 	/* Add the user defined time if necessary */
 	priv->alarm_units = calendar_config_get_default_reminder_units ();
@@ -2697,6 +1927,10 @@ init_widgets (EventPage *epage)
 	g_signal_connect (priv->alarm_custom, "clicked",
 			  G_CALLBACK (alarm_custom_clicked_cb), epage);
 
+	/* Connect the default signal handler to use to make sure we notify
+	 * upstream of changes to the widget values.
+	 */
+
 	/* Belongs to priv->description */
 	g_signal_connect((text_buffer), "changed",
 			    G_CALLBACK (field_changed_cb), epage);
@@ -2709,22 +1943,32 @@ init_widgets (EventPage *epage)
 			    G_CALLBACK (field_changed_cb), epage);
 	g_signal_connect((priv->end_time), "changed",
 			    G_CALLBACK (field_changed_cb), epage);
+	g_signal_connect((priv->start_timezone), "changed",
+			    G_CALLBACK (field_changed_cb), epage);
+	g_signal_connect((priv->end_timezone), "changed",
+			    G_CALLBACK (field_changed_cb), epage);
+	g_signal_connect((priv->all_day_event), "toggled",
+			    G_CALLBACK (field_changed_cb), epage);
+	g_signal_connect((priv->classification),
+			    "changed", G_CALLBACK (field_changed_cb),
+			    epage);
+	g_signal_connect((priv->show_time_as_busy),
+			    "toggled", G_CALLBACK (field_changed_cb),
+			    epage);
+	g_signal_connect((priv->alarm),
+			    "toggled", G_CALLBACK (field_changed_cb),
+			    epage);
+	g_signal_connect((priv->alarm_time),
+			    "changed", G_CALLBACK (field_changed_cb),
+			    epage);
 	g_signal_connect((priv->categories), "changed",
 			    G_CALLBACK (field_changed_cb), epage);
 
-	g_signal_connect (priv->alarm,
-			  "toggled", G_CALLBACK (alarm_changed_cb),
-			  epage);
-	g_signal_connect (priv->alarm_custom, "clicked",
-			  G_CALLBACK (alarm_custom_clicked_cb), epage);
-
 	/* Set the default timezone, so the timezone entry may be hidden. */
 	zone = calendar_config_get_icaltimezone ();
 	e_timezone_entry_set_default_timezone (E_TIMEZONE_ENTRY (priv->start_timezone), zone);
 	e_timezone_entry_set_default_timezone (E_TIMEZONE_ENTRY (priv->end_timezone), zone);
 
-	event_page_set_show_timezone (epage, calendar_config_get_show_timezone());
-
 	return TRUE;
 }
 
@@ -2740,27 +1984,14 @@ init_widgets (EventPage *epage)
  * created.
  **/
 EventPage *
-event_page_construct (EventPage *epage, EMeetingStore *model, ECal *client)
+event_page_construct (EventPage *epage)
 {
 	EventPagePrivate *priv;
-	char *backend_address = NULL;
-	EIterator *it;
-	EAccount *def_account;
-	GList *address_strings = NULL, *l;
-	EAccount *a;
-	char *gladefile;
 
 	priv = epage->priv;
-	g_object_ref (model);
-	priv->model = model;
-	priv->client = client;
-
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
-				      "event-page.glade",
-				      NULL);
-	priv->xml = glade_xml_new (gladefile, NULL, NULL);
-	g_free (gladefile);
 
+	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/event-page.glade", 
+				   NULL, NULL);
 	if (!priv->xml) {
 		g_message ("event_page_construct(): " 
 			   "Could not load the Glade XML file!");
@@ -2773,50 +2004,6 @@ event_page_construct (EventPage *epage, EMeetingStore *model, ECal *client)
 		return NULL;
 	}
 
-	/* Address information */
-	if (!e_cal_get_cal_address (client, &backend_address, NULL))
-		return NULL;
-
-	priv->accounts = itip_addresses_get ();
-	def_account = itip_addresses_get_default();
-	for (it = e_list_get_iterator((EList *)priv->accounts);
-	     e_iterator_is_valid(it);
-	     e_iterator_next(it)) {
-		a = (EAccount *)e_iterator_get(it);
-		char *full;
-		
-		full = g_strdup_printf("%s <%s>", a->id->name, a->id->address);
-
-		address_strings = g_list_append(address_strings, full);
-
-		/* Note that the address specified by the backend gets
-		 * precedence over the default mail address.
-		 */
-		if (backend_address && !strcmp (backend_address, a->id->address)) {
-			if (priv->default_address)
-				g_free (priv->default_address);
-			
-			priv->default_address = g_strdup (full);
-		} else if (a == def_account && !priv->default_address) {
-			priv->default_address = g_strdup (full);
-		}
-	}
-	
-	if (backend_address)
-		g_free (backend_address);
-
-	g_object_unref(it);
-
-	if (address_strings)
-		gtk_combo_set_popdown_strings (GTK_COMBO (priv->organizer), address_strings);
-	else
-		g_warning ("No potential organizers!");
-
-	for (l = address_strings; l != NULL; l = l->next)
-		g_free (l->data);
-	g_list_free (address_strings);
-	
-
 	if (!init_widgets (epage)) {
 		g_message ("event_page_construct(): " 
 			   "Could not initialize the widgets!");
@@ -2835,18 +2022,16 @@ event_page_construct (EventPage *epage, EMeetingStore *model, ECal *client)
  * not be created.
  **/
 EventPage *
-event_page_new (EMeetingStore *model, ECal *client, BonoboUIComponent *uic)
+event_page_new (void)
 {
 	EventPage *epage;
 
 	epage = g_object_new (TYPE_EVENT_PAGE, NULL);
-	if (!event_page_construct (epage, model, client)) {
+	if (!event_page_construct (epage)) {
 		g_object_unref (epage);
 		return NULL;
 	}
 
-	epage->priv->uic = uic;
-
 	return epage;
 }
 
@@ -2888,45 +2073,3 @@ event_page_create_source_option_menu (void)
 	gtk_widget_show (menu);
 	return menu;
 }
-
-static void
-set_attendees (ECalComponent *comp, const GPtrArray *attendees)
-{
-	GSList *comp_attendees = NULL, *l;
-	int i;
-	
-	for (i = 0; i < attendees->len; i++) {
-		EMeetingAttendee *ia = g_ptr_array_index (attendees, i);
-		ECalComponentAttendee *ca;
-		
-		ca = e_meeting_attendee_as_e_cal_component_attendee (ia);
-		
-		comp_attendees = g_slist_prepend (comp_attendees, ca);
-		
-	}
-	comp_attendees = g_slist_reverse (comp_attendees);
-	
-	e_cal_component_set_attendee_list (comp, comp_attendees);
-	
-	for (l = comp_attendees; l != NULL; l = l->next)
-		g_free (l->data);	
-	g_slist_free (comp_attendees);
-}
-
-ECalComponent *
-event_page_get_cancel_comp (EventPage *page)
-{
-	EventPagePrivate *priv;
-
-	g_return_val_if_fail (page != NULL, NULL);
-	g_return_val_if_fail (IS_EVENT_PAGE (page), NULL);
-
-	priv = page->priv;
-
-	if (priv->deleted_attendees->len == 0)
-		return NULL;
-	
-	set_attendees (priv->comp, priv->deleted_attendees);
-	
-	return e_cal_component_clone (priv->comp);
-}
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index 2ec7145dcf..a4da4e450c 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -41,9 +41,8 @@
 #include <gtk/gtkstock.h>
 #include <libgnome/gnome-i18n.h>
 #include <glade/glade.h>
-#include <libedataserver/e-time-utils.h>
 #include <e-util/e-dialog-widgets.h>
-#include <e-util/e-util-private.h>
+#include <e-util/e-time-utils.h>
 #include <misc/e-dateedit.h>
 #include <libecal/e-cal-recur.h>
 #include <libecal/e-cal-time-util.h>
@@ -2356,16 +2355,11 @@ RecurrencePage *
 recurrence_page_construct (RecurrencePage *rpage)
 {
 	RecurrencePagePrivate *priv;
-	char *gladefile;
 
 	priv = rpage->priv;
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
-				      "recurrence-page.glade",
-				      NULL);
-	priv->xml = glade_xml_new (gladefile, NULL, NULL);
-	g_free (gladefile);
-
+	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR 
+				   "/recurrence-page.glade", NULL, NULL);
 	if (!priv->xml) {
 		g_message ("recurrence_page_construct(): "
 			   "Could not load the Glade XML file!");
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 27bda2c6f1..85ddbabbc4 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -31,21 +31,17 @@
 #include <glade/glade.h>
 #include <libgnome/gnome-i18n.h>
 
-#include <e-util/e-icon-factory.h>
-#include <evolution-shell-component-utils.h>
-
 #include "task-page.h"
 #include "task-details-page.h"
 #include "meeting-page.h"
 #include "cancel-comp.h"
-#include "../calendar-config.h"
 #include "task-editor.h"
 
 struct _TaskEditorPrivate {
 	TaskPage *task_page;
 	TaskDetailsPage *task_details_page;
-	
-	GtkWidget *task_details_window;
+	MeetingPage *meet_page;
+
 	EMeetingStore *model;
 	
 	gboolean assignment_shown;
@@ -60,6 +56,11 @@ static void task_editor_edit_comp (CompEditor *editor, ECalComponent *comp);
 static gboolean task_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method);
 static void task_editor_finalize (GObject *object);
 
+static void assign_task_cmd (GtkWidget *widget, gpointer data);
+static void refresh_task_cmd (GtkWidget *widget, gpointer data);
+static void cancel_task_cmd (GtkWidget *widget, gpointer data);
+static void forward_cmd (GtkWidget *widget, gpointer data);
+
 static void model_row_change_insert_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data);
 static void model_row_delete_cb (GtkTreeModel *model, GtkTreePath *path, gpointer data);
 
@@ -103,211 +104,11 @@ client_changed_cb (CompEditorPage *page, ECal *client, gpointer user_data)
 //	set_menu_sens (TASK_EDITOR (user_data));
 }
 
-static void
-menu_view_role_cb (BonoboUIComponent           *component,
-		      const char                  *path,
-		      Bonobo_UIComponent_EventType type,
-		      const char                  *state,
-		      gpointer                     user_data)
-{
-	TaskEditor *te = (TaskEditor *) user_data;
-	
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	task_page_set_view_role (te->priv->task_page, atoi(state));	
-	calendar_config_set_show_role (atoi(state));	
-}
-
-static void
-menu_view_status_cb (BonoboUIComponent           *component,
-		      const char                  *path,
-		      Bonobo_UIComponent_EventType type,
-		      const char                  *state,
-		      gpointer                     user_data)
-{
-	TaskEditor *te = (TaskEditor *) user_data;
-	
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	task_page_set_view_status (te->priv->task_page, atoi(state));
-	calendar_config_set_show_status (atoi(state));	
-}
-
-static void
-menu_view_type_cb (BonoboUIComponent           *component,
-		      const char                  *path,
-		      Bonobo_UIComponent_EventType type,
-		      const char                  *state,
-		      gpointer                     user_data)
-{
-	TaskEditor *te = (TaskEditor *) user_data;
-	
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	task_page_set_view_type (te->priv->task_page, atoi(state));	
-	calendar_config_set_show_type (atoi(state));	
-}
-
-static void
-menu_view_rsvp_cb (BonoboUIComponent           *component,
-		      const char                  *path,
-		      Bonobo_UIComponent_EventType type,
-		      const char                  *state,
-		      gpointer                     user_data)
-{
-	TaskEditor *te = (TaskEditor *) user_data;
-	
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	task_page_set_view_rsvp (te->priv->task_page, atoi(state));	
-	calendar_config_set_show_rsvp (atoi(state));	
-}
-
-static void
-menu_show_time_zone_cb (BonoboUIComponent           *component,
-		       const char                  *path,
-		       Bonobo_UIComponent_EventType type,
-		       const char                  *state,
-		       gpointer                     user_data)
-{
-	TaskEditor *te = (TaskEditor *) user_data;
-	
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	task_page_set_show_timezone (te->priv->task_page, atoi(state));	
-	calendar_config_set_show_timezone (atoi(state));
-}
-
-static void
-menu_show_categories_cb (BonoboUIComponent           *component,
-		       const char                  *path,
-		       Bonobo_UIComponent_EventType type,
-		       const char                  *state,
-		       gpointer                     user_data)
-{
-	TaskEditor *te = (TaskEditor *) user_data;
-	
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-
-	task_page_set_show_categories (te->priv->task_page, atoi(state));	
-	calendar_config_set_show_categories (atoi(state));
-}
-
-static void
-menu_class_public_cb (BonoboUIComponent           *ui_component,
-		     const char                  *path,
-		     Bonobo_UIComponent_EventType type,
-		     const char                  *state,
-		     gpointer			  user_data)
-{
-	TaskEditor *te = (TaskEditor *) user_data;
-
-	if (state[0] == '0')
-		return;
-	printf("Setting to public\n");
-	task_page_set_classification (te->priv->task_page, E_CAL_COMPONENT_CLASS_PUBLIC);
-}
-
-static void
-menu_class_private_cb (BonoboUIComponent           *ui_component,
-		      const char                  *path,
-		      Bonobo_UIComponent_EventType type,
-		      const char                  *state,
-		      gpointer			  user_data)
-{
-	TaskEditor *te = (TaskEditor *) user_data;
-	if (state[0] == '0')
-		return;
-	
-	printf("Setting to private\n");
-	task_page_set_classification (te->priv->task_page, E_CAL_COMPONENT_CLASS_PRIVATE);
-}
-
-static void
-menu_class_confidential_cb (BonoboUIComponent           *ui_component,
-		     	   const char                  *path,
-		     	   Bonobo_UIComponent_EventType type,
-		     	   const char                  *state,
-		     	   gpointer			user_data)
-{
-	TaskEditor *te = (TaskEditor *) user_data;
-	if (state[0] == '0')
-		return;
-	
-	printf("Setting to confidential\n");
-	task_page_set_classification (te->priv->task_page, E_CAL_COMPONENT_CLASS_CONFIDENTIAL);
-}
-
-
-static void
-menu_option_status_cb (BonoboUIComponent           *ui_component,
-		       const char                  *path,
-		       Bonobo_UIComponent_EventType type,
-		       const char                  *state,
-		       gpointer			user_data)
-{
-	TaskEditor *te = (TaskEditor *) user_data;
-	
-	gtk_widget_show (te->priv->task_details_window);
-}
-
-static void
-menu_insert_send_options_cmd (BonoboUIComponent *uic,
-		   	 void *data,
-		   	 const char *path)
-{
-	TaskEditor *te = (TaskEditor *) data;
-	
-	task_page_sendoptions_clicked_cb (te->priv->task_page);
-}
-
-static void
-menu_show_time_zone_cmd (BonoboUIComponent *uic,
-		   	 void *data,
-		   	 const char *path)
-{	/* TODO implement it
-	TaskEditor *te = (TaskEditor *) data;
-	
-	task_page_set_show_timezone (te->priv->task_page, atoi(state));	
-	calendar_config_set_show_timezone (atoi(state)); */
-}
-
-static void
-menu_option_status_cmd (BonoboUIComponent *uic,
-		     void *data,
-		     const char *path)
-{
-	TaskEditor *te = (TaskEditor *) data;
-	
-	gtk_widget_show (te->priv->task_details_window);
-}
-
-static BonoboUIVerb verbs [] = {
-
-	BONOBO_UI_VERB ("ViewTimeZone", menu_show_time_zone_cmd),	
-	BONOBO_UI_VERB ("OptionStatus", menu_option_status_cmd),
-	BONOBO_UI_VERB ("InsertSendOptions", menu_insert_send_options_cmd),
-	BONOBO_UI_VERB_END
-};
-
-static EPixmap pixmaps[] = {
-	E_PIXMAP ("/Toolbar/ViewTimeZone", "stock_timezone", E_ICON_SIZE_LARGE_TOOLBAR),	
-	E_PIXMAP ("/Toolbar/OptionStatus", "stock_view-details", E_ICON_SIZE_LARGE_TOOLBAR),	
-	E_PIXMAP ("/commands/OptionStatus", "stock_view-details", E_ICON_SIZE_LARGE_TOOLBAR),	
-	
-	E_PIXMAP_END
-};
-
-
 /* Object initialization function for the task editor */
 static void
 task_editor_init (TaskEditor *te)
 {
 	TaskEditorPrivate *priv;
-	CompEditor *editor = COMP_EDITOR(te);
-	gboolean status;
 	
 	priv = g_new0 (TaskEditorPrivate, 1);
 	te->priv = priv;
@@ -317,88 +118,6 @@ task_editor_init (TaskEditor *te)
 	priv->updating = FALSE;	
 	priv->is_assigned = FALSE;
 
-	bonobo_ui_component_freeze (editor->uic, NULL);
-
-	bonobo_ui_component_add_verb_list_with_data (editor->uic, verbs, te);
-
-	bonobo_ui_util_set_ui (editor->uic, PREFIX,
-			       EVOLUTION_UIDIR "/evolution-task-editor.xml",
-			       "evolution-task-editor", NULL);
-
-	/* Show hide the status fields */
-	status = calendar_config_get_show_status ();
-	bonobo_ui_component_set_prop (
-		editor->uic, "/commands/ViewStatus",
-		"state", status ? "1" : "0", NULL);
-	bonobo_ui_component_add_listener (
-		editor->uic, "ViewStatus",
-		menu_view_status_cb, editor);
-	
-	/* Show hide the type fields */
-	status = calendar_config_get_show_type ();
-	bonobo_ui_component_set_prop (
-		editor->uic, "/commands/ViewType",
-		"state", status ? "1" : "0", NULL);
-	bonobo_ui_component_add_listener (
-		editor->uic, "ViewType",
-		menu_view_type_cb, editor);
-
-	/* Show hide the role fields */
-	status = calendar_config_get_show_role ();
-	bonobo_ui_component_set_prop (
-		editor->uic, "/commands/ViewRole",
-		"state", status ? "1" : "0", NULL);
-	bonobo_ui_component_add_listener (
-		editor->uic, "ViewRole",
-		menu_view_role_cb, editor);
-
-	/* Show hide the rsvp fields */
-	status = calendar_config_get_show_rsvp ();
-	bonobo_ui_component_set_prop (
-		editor->uic, "/commands/ViewRSVP",
-		"state", status ? "1" : "0", NULL);
-	bonobo_ui_component_add_listener (
-		editor->uic, "ViewRSVP",
-		menu_view_rsvp_cb, editor);
-
-	status = calendar_config_get_show_timezone ();
-	bonobo_ui_component_set_prop (
-		editor->uic, "/commands/ViewTimeZone",
-		"state", status ? "1" : "0", NULL);
-	bonobo_ui_component_add_listener (
-		editor->uic, "ViewTimeZone",
-		menu_show_time_zone_cb, editor);
-
-	status = calendar_config_get_show_categories ();
-	bonobo_ui_component_set_prop (
-		editor->uic, "/commands/ViewCategories",
-		"state", status ? "1" : "0", NULL);
-	bonobo_ui_component_add_listener (
-		editor->uic, "ViewCategories",
-		menu_show_categories_cb, editor);
-
-	bonobo_ui_component_set_prop (
-		editor->uic, "/commands/ActionClassPublic",
-		"state", "1", NULL);
-	bonobo_ui_component_add_listener (
-		editor->uic, "ActionClassPublic",
-		menu_class_public_cb, editor);
-	bonobo_ui_component_add_listener (
-		editor->uic, "ActionClassPrivate",
-		menu_class_private_cb, editor);
-	bonobo_ui_component_add_listener (
-		editor->uic, "ActionClassConfidential",
-		menu_class_confidential_cb, editor);
-
-	bonobo_ui_component_add_listener (
-		editor->uic, "OptionStatus", 
-		menu_option_status_cb, editor);
-	
-	e_pixmaps_update (editor->uic, pixmaps);
-
-	bonobo_ui_component_thaw (editor->uic, NULL);	
-
-	
 	comp_editor_set_help_section (COMP_EDITOR (te), "usage-calendar-todo");
 }
 
@@ -407,33 +126,24 @@ task_editor_construct (TaskEditor *te, ECal *client)
 {
 	TaskEditorPrivate *priv;
 	gboolean read_only = FALSE;
-	CompEditor *editor = COMP_EDITOR (te);
 	
 	priv = te->priv;
 
-	priv->task_page = task_page_new (priv->model, client, editor->uic);
+	priv->task_page = task_page_new ();
 	g_object_ref (priv->task_page);
 	gtk_object_sink (GTK_OBJECT (priv->task_page));
 	comp_editor_append_page (COMP_EDITOR (te), 
 				 COMP_EDITOR_PAGE (priv->task_page),
-				 _("_Task"), TRUE);
+				 _("Task"));
 	g_signal_connect (G_OBJECT (priv->task_page), "client_changed",
 			  G_CALLBACK (client_changed_cb), te);
 
-	priv->task_details_window = gtk_dialog_new_with_buttons (_("Task Details"),
-								(GtkWindow *) te, GTK_DIALOG_MODAL,
-							  	"gtk-close", GTK_RESPONSE_CLOSE,
-							  	NULL);
-	g_signal_connect (priv->task_details_window, "response", G_CALLBACK(gtk_widget_hide), NULL);
-	
 	priv->task_details_page = task_details_page_new ();
 	g_object_ref (priv->task_details_page);
 	gtk_object_sink (GTK_OBJECT (priv->task_details_page));
-	gtk_container_add ((GtkContainer *) GTK_DIALOG(priv->task_details_window)->vbox, 
-		           comp_editor_page_get_widget ((CompEditorPage *)priv->task_details_page));
-	gtk_widget_show_all (priv->task_details_window);
-	gtk_widget_hide (priv->task_details_window);
-	comp_editor_append_page (editor, COMP_EDITOR_PAGE (priv->task_details_page), NULL, FALSE);
+	comp_editor_append_page (COMP_EDITOR (te),
+				 COMP_EDITOR_PAGE (priv->task_details_page),
+				 _("Status"));
 	
 	if (!e_cal_is_read_only (client, &read_only, NULL))
 			read_only = TRUE;
@@ -441,17 +151,14 @@ task_editor_construct (TaskEditor *te, ECal *client)
 	if (priv->is_assigned) {
 		if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS))
 			task_page_show_options (priv->task_page);
-	
-		task_page_set_assignment (priv->task_page, TRUE);
+
 		comp_editor_set_group_item (COMP_EDITOR (te), TRUE);
-	} else {
-		task_page_set_assignment (priv->task_page, FALSE);
-	
-		bonobo_ui_component_set_prop (editor->uic, "/commands/InsertSendOptions", "hidden", "1", NULL);
-		bonobo_ui_component_set_prop (editor->uic, "/commands/ViewRole", "hidden", "1", NULL);
-		bonobo_ui_component_set_prop (editor->uic, "/commands/ViewRSVP", "hidden", "1", NULL);
-		bonobo_ui_component_set_prop (editor->uic, "/commands/ViewType", "hidden", "1", NULL);
-		bonobo_ui_component_set_prop (editor->uic, "/commands/ViewStatus", "hidden", "1", NULL);
+		priv->meet_page = meeting_page_new (priv->model, client);
+		g_object_ref (priv->meet_page);
+		gtk_object_sink (GTK_OBJECT (priv->meet_page));
+		comp_editor_append_page (COMP_EDITOR (te),
+					 COMP_EDITOR_PAGE (priv->meet_page),
+					 _("Assignment"));
 	}
 
 	comp_editor_set_e_cal (COMP_EDITOR (te), client);
@@ -499,12 +206,21 @@ task_editor_edit_comp (CompEditor *editor, ECalComponent *comp)
 	e_cal_component_get_organizer (comp, &organizer);
 	e_cal_component_get_attendee_list (comp, &attendees);
 	
-	if (attendees != NULL) {
+	/* Clear things up */
+	e_meeting_store_remove_all_attendees (priv->model);
+
+	if (attendees == NULL) {
+		comp_editor_remove_page (editor, COMP_EDITOR_PAGE (priv->meet_page));
+		priv->assignment_shown = FALSE;
+	} else {
 		GSList *l;
 		int row;
 		
-		task_page_hide_options (priv->task_page);	
-		task_page_set_assignment (priv->task_page, TRUE);
+		task_page_hide_options (priv->task_page);		
+		if (!priv->assignment_shown)
+			comp_editor_append_page (COMP_EDITOR (te),
+						 COMP_EDITOR_PAGE (priv->meet_page),
+						 _("Assignment"));
 
 		for (l = attendees; l != NULL; l = l->next) {
 			ECalComponentAttendee *ca = l->data;
@@ -569,7 +285,7 @@ task_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method)
 	    method == E_CAL_COMPONENT_METHOD_CANCEL)
 		goto parent;
 	
-	comp = task_page_get_cancel_comp (priv->task_page);
+	comp = meeting_page_get_cancel_comp (priv->meet_page);
 	if (comp != NULL) {
 		ECal *client;
 		gboolean result;
@@ -613,6 +329,11 @@ task_editor_finalize (GObject *object)
 		priv->task_details_page = NULL;
 	}
 	
+	if (priv->meet_page) {	
+		g_object_unref (priv->meet_page);
+		priv->meet_page = NULL;
+	}
+	
 	if (priv->model) {
 		g_object_unref (priv->model);
 		priv->model = NULL;
@@ -654,6 +375,9 @@ show_assignment (TaskEditor *te)
 
 	task_page_set_assignment (priv->task_page, TRUE);
 	if (!priv->assignment_shown) {
+		comp_editor_append_page (COMP_EDITOR (te),
+					 COMP_EDITOR_PAGE (priv->meet_page),
+					 _("Assignment"));
 		priv->assignment_shown = TRUE;
 
 		comp_editor_set_needs_send (COMP_EDITOR (te), priv->assignment_shown);
@@ -672,6 +396,45 @@ task_editor_show_assignment (TaskEditor *te)
 }
 
 static void
+assign_task_cmd (GtkWidget *widget, gpointer data)
+{
+	TaskEditor *te = TASK_EDITOR (data);
+
+	show_assignment (te);
+}
+
+static void
+refresh_task_cmd (GtkWidget *widget, gpointer data)
+{
+	TaskEditor *te = TASK_EDITOR (data);
+
+	comp_editor_send_comp (COMP_EDITOR (te), E_CAL_COMPONENT_METHOD_REFRESH);
+}
+
+static void
+cancel_task_cmd (GtkWidget *widget, gpointer data)
+{
+	TaskEditor *te = TASK_EDITOR (data);
+	ECalComponent *comp;
+	
+	comp = comp_editor_get_current_comp (COMP_EDITOR (te));
+	if (cancel_component_dialog ((GtkWindow *) te,
+				     comp_editor_get_e_cal (COMP_EDITOR (te)), comp, FALSE)) {
+		comp_editor_send_comp (COMP_EDITOR (te), E_CAL_COMPONENT_METHOD_CANCEL);
+		comp_editor_delete_comp (COMP_EDITOR (te));
+	}
+}
+
+static void
+forward_cmd (GtkWidget *widget, gpointer data)
+{
+	TaskEditor *te = TASK_EDITOR (data);
+	
+	if (comp_editor_save_comp (COMP_EDITOR (te), TRUE))
+		comp_editor_send_comp (COMP_EDITOR (te), E_CAL_COMPONENT_METHOD_PUBLISH);
+}
+
+static void
 model_changed (TaskEditor *te)
 {
 	if (!te->priv->updating) {
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 155d391de9..8b72bb589f 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -26,7 +26,6 @@
 #endif
 
 #include <string.h>
-#include <gdk/gdkkeysyms.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtktextview.h>
 #include <gtk/gtktogglebutton.h>
@@ -37,12 +36,9 @@
 #include <glade/glade.h>
 #include <libedataserverui/e-source-option-menu.h>
 #include <misc/e-dateedit.h>
-#include <e-util/e-dialog-utils.h>
 #include "common/authentication.h"
-#include "e-util/e-popup.h"
 #include "e-util/e-dialog-widgets.h"
 #include "e-util/e-categories-config.h"
-#include "e-util/e-util-private.h"
 #include "../e-timezone-entry.h"
 #include "../calendar-config.h"
 #include "comp-editor.h"
@@ -50,10 +46,6 @@
 #include "e-send-options-utils.h"
 #include "task-page.h"
 
-#include "../e-meeting-attendee.h"
-#include "../e-meeting-store.h"
-#include "../e-meeting-list-view.h"
-#include "../e-cal-popup.h"
 
 
 /* Private part of the TaskPage structure */
@@ -61,37 +53,20 @@ struct _TaskPagePrivate {
 	/* Glade XML data */
 	GladeXML *xml;
 
-	/* Bonobo Controller for the menu/toolbar */
-	BonoboUIComponent *uic;
-	
 	/* Widgets from the Glade file */
 	GtkWidget *main;
 
-	EAccountList *accounts;
-	EMeetingAttendee *ia;	
-	char *default_address;
-	char *user_add;
-	ECalComponent *comp;
-
-	/* For meeting/event */
-	GtkWidget *calendar_label;
-	GtkWidget *org_cal_label;
-	GtkWidget *attendee_box;
-
-	/* Lists of attendees */
-	GPtrArray *deleted_attendees;
-	
 	GtkWidget *summary;
 	GtkWidget *summary_label;
 
 	GtkWidget *due_date;
 	GtkWidget *start_date;
-	GtkWidget *timezone;
-	GtkWidget *timezone_label;
-	
+	GtkWidget *due_timezone;
+	GtkWidget *start_timezone;
+
 	GtkWidget *description;
 
-	ECalComponentClassification classification;
+	GtkWidget *classification;
 
 	GtkWidget *categories_btn;
 	GtkWidget *categories;
@@ -100,26 +75,6 @@ struct _TaskPagePrivate {
 	GtkWidget *sendoptions_frame;
 	GtkWidget *sendoptions_button;
 
-	/* Meeting related items */
-	GtkWidget *list_box;
-	GtkWidget *organizer_table;
-	GtkWidget *organizer;
-	GtkWidget *add;
-	GtkWidget *remove;
-	GtkWidget *edit;
-	GtkWidget *invite;
-	GtkWidget *attendees_label;
-
-	/* ListView stuff */
-	EMeetingStore *model;
-	ECal	  *client;
-	EMeetingListView *list_view;
-	gint row;
-
-	/* For handling who the organizer is */
-	gboolean user_org;
-	gboolean existing;
-	
 	gboolean updating;
 	gboolean sendoptions_shown;
 	gboolean is_assignment;
@@ -179,16 +134,16 @@ task_page_init (TaskPage *tpage)
 	tpage->priv = priv;
 
 	priv->xml = NULL;
-	priv->uic = NULL;
 
 	priv->main = NULL;
 	priv->summary = NULL;
 	priv->summary_label = NULL;
 	priv->due_date = NULL;
 	priv->start_date = NULL;
-	priv->timezone = NULL;
+	priv->due_timezone = NULL;
+	priv->start_timezone = NULL;
 	priv->description = NULL;
-	priv->classification = E_CAL_COMPONENT_CLASS_NONE;
+	priv->classification = NULL;
 	priv->categories_btn = NULL;
 	priv->categories = NULL;
 	priv->sendoptions_frame = NULL;
@@ -199,28 +154,6 @@ task_page_init (TaskPage *tpage)
 	priv->updating = FALSE;
 	priv->sendoptions_shown = FALSE;
 	priv->is_assignment = FALSE;
-	
-	priv->deleted_attendees = g_ptr_array_new ();
-
-	priv->comp = NULL;
-
-	priv->accounts = NULL;
-	priv->ia = NULL;
-	priv->default_address = NULL;
-	priv->invite = NULL;
-	
-	priv->model = NULL;
-	priv->list_view = NULL;	
-	priv->default_address = NULL;
-}
-
-static void
-cleanup_attendees (GPtrArray *attendees)
-{
-	int i;
-	
-	for (i = 0; i < attendees->len; i++)
-		g_object_unref (g_ptr_array_index (attendees, i));
 }
 
 /* Destroy handler for the task page */
@@ -248,13 +181,7 @@ task_page_finalize (GObject *object)
 		g_object_unref (priv->sod);
 		priv->sod = NULL;
 	}
-
-	if (priv->comp != NULL)
-		g_object_unref (priv->comp);
- 
-	cleanup_attendees (priv->deleted_attendees);
-	g_ptr_array_free (priv->deleted_attendees, TRUE);
-
+	
 	g_free (priv);
 	tpage->priv = NULL;
 
@@ -262,30 +189,6 @@ task_page_finalize (GObject *object)
 		(* G_OBJECT_CLASS (task_page_parent_class)->finalize) (object);
 }
 
-static void
-set_classification_menu (TaskPage *page, gint class)
-{
-	bonobo_ui_component_freeze (page->priv->uic, NULL);
-	switch (class) {
-		case E_CAL_COMPONENT_CLASS_PUBLIC:
-			bonobo_ui_component_set_prop (
-				page->priv->uic, "/commands/ActionClassPublic",
-				"state", "1", NULL);
-			break;
-		case E_CAL_COMPONENT_CLASS_CONFIDENTIAL:
-			bonobo_ui_component_set_prop (
-				page->priv->uic, "/commands/ActionClassConfidential",
-				"state", "1", NULL);
-			break;
-		case E_CAL_COMPONENT_CLASS_PRIVATE:
-			bonobo_ui_component_set_prop (
-				page->priv->uic, "/commands/ActionClassPrivate",
-				"state", "1", NULL);
-			break;
-	}
-	bonobo_ui_component_thaw (page->priv->uic, NULL);
-}
-
 
 
 /* get_widget handler for the task page */
@@ -331,58 +234,23 @@ clear_widgets (TaskPage *tpage)
 	e_date_edit_set_time (E_DATE_EDIT (priv->due_date), 0);
 
 	/* Classification */
-	priv->classification = E_CAL_COMPONENT_CLASS_PRIVATE;
-	set_classification_menu (tpage, priv->classification);
+	e_dialog_option_menu_set (priv->classification, E_CAL_COMPONENT_CLASS_PRIVATE, classification_map);
 
 	/* Categories */
 	e_dialog_editable_set (priv->categories, NULL);
-	
-	gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (priv->organizer)->entry), priv->default_address);
-	
-}
-
-void
-task_page_set_view_role (TaskPage *page, gboolean state)
-{
-	TaskPagePrivate *priv = page->priv;
-
-	e_meeting_list_view_column_set_visible (priv->list_view, "Role", state);
 }
 
-void
-task_page_set_view_status (TaskPage *page, gboolean state)
-{
-	TaskPagePrivate *priv = page->priv;
-
-	e_meeting_list_view_column_set_visible (priv->list_view, "Status", state);
-}
-
-void
-task_page_set_view_type (TaskPage *page, gboolean state)
+/* Decode the radio button group for classifications */
+static ECalComponentClassification
+classification_get (GtkWidget *widget)
 {
-	TaskPagePrivate *priv = page->priv;
-
-	e_meeting_list_view_column_set_visible (priv->list_view, "Type", state);
-}
-
-void
-task_page_set_view_rsvp (TaskPage *page, gboolean state)
-{
-	TaskPagePrivate *priv = page->priv;
-
-	e_meeting_list_view_column_set_visible (priv->list_view, "RSVP", state);
-}
-
-void 
-task_page_set_classification (TaskPage *page, ECalComponentClassification class)
-{
-	page->priv->classification = class;
+	return e_dialog_option_menu_get (widget, classification_map);
 }
 
 static void
 sensitize_widgets (TaskPage *tpage)
 {
-	gboolean read_only, sens, sensitize;
+	gboolean read_only;
 	TaskPagePrivate *priv;
 	
 	priv = tpage->priv;
@@ -390,67 +258,25 @@ sensitize_widgets (TaskPage *tpage)
 	if (!e_cal_is_read_only (COMP_EDITOR_PAGE (tpage)->client, &read_only, NULL))
 		read_only = TRUE;
 	
-	if (COMP_EDITOR_PAGE (tpage)->flags & COMP_EDITOR_IS_ASSIGNED)
-	 	sens = COMP_EDITOR_PAGE (tpage)->flags & COMP_EDITOR_PAGE_USER_ORG;
-
-	sensitize = (!read_only && sens);
-
+	gtk_widget_set_sensitive (priv->summary_label, !read_only);
 	gtk_entry_set_editable (GTK_ENTRY (priv->summary), !read_only);
 	gtk_widget_set_sensitive (priv->due_date, !read_only);
 	gtk_widget_set_sensitive (priv->start_date, !read_only);
-	gtk_widget_set_sensitive (priv->timezone, !read_only);
+	gtk_widget_set_sensitive (priv->due_timezone, !read_only);
+	gtk_widget_set_sensitive (priv->start_timezone, !read_only);
 	gtk_widget_set_sensitive (priv->description, !read_only);
+	gtk_widget_set_sensitive (priv->classification, !read_only);
 	gtk_widget_set_sensitive (priv->categories_btn, !read_only);
 	gtk_widget_set_sensitive (priv->sendoptions_button, !read_only);
 	gtk_entry_set_editable (GTK_ENTRY (priv->categories), !read_only);
-
-	gtk_widget_set_sensitive (priv->organizer, !read_only);
-	gtk_widget_set_sensitive (priv->add, (!read_only &&  sens));
-	gtk_widget_set_sensitive (priv->remove, (!read_only &&  sens));
-	gtk_widget_set_sensitive (priv->invite, (!read_only &&  sens));
-	gtk_widget_set_sensitive (GTK_WIDGET (priv->list_view), !read_only);	
-
-	bonobo_ui_component_set_prop (priv->uic, "/commands/InsertAttachments", "sensitive", sensitize ? "1" : "0"
-			, NULL);
-	bonobo_ui_component_set_prop (priv->uic, "/commands/ViewTimeZone", "sensitive", sensitize ? "1" : "0"
-			, NULL);
-	bonobo_ui_component_set_prop (priv->uic, "/commands/ActionClassPublic", "sensitive", sensitize ? "1" : "0"
-			, NULL);
-	bonobo_ui_component_set_prop (priv->uic, "/commands/ActionClassPrivate", "sensitive", sensitize ? "1" : "0"
-			, NULL);
-	bonobo_ui_component_set_prop (priv->uic, "/commands/ActionClassConfidential", "sensitive",
-		       	sensitize ? "1" : "0", NULL);
-	bonobo_ui_component_set_prop (priv->uic, "/commands/ViewCategories", "sensitive", sensitize ? "1" : "0"
-			, NULL);
-	bonobo_ui_component_set_prop (priv->uic, "/commands/InsertSendOptions", "sensitive", sensitize ? "1" : "0"
-			, NULL);
-	bonobo_ui_component_set_prop (priv->uic, "/commands/OptionStatus", "sensitive", sensitize ? "1" : "0"
-			, NULL);
-
-	
-	if (!priv->is_assignment) {
-		gtk_widget_hide (priv->calendar_label);
-		gtk_widget_hide (priv->list_box);
-		gtk_widget_hide (priv->attendee_box);
-		gtk_widget_hide (priv->organizer);
-		gtk_widget_hide (priv->invite);
-		gtk_label_set_text_with_mnemonic ((GtkLabel *) priv->org_cal_label, _("_Group"));
-	} else {
-		gtk_widget_show (priv->invite);	
-		gtk_widget_show (priv->calendar_label);
-		gtk_widget_show (priv->list_box);
-		gtk_widget_show (priv->attendee_box);
-		gtk_widget_show (priv->organizer);
-		gtk_label_set_text_with_mnemonic ((GtkLabel *) priv->org_cal_label, _("Or_ganizer"));		
-	}
 }
 void
 task_page_hide_options (TaskPage *page)
 {
 	g_return_if_fail (IS_TASK_PAGE (page));
 
+	gtk_widget_hide (page->priv->sendoptions_frame);
 
-	bonobo_ui_component_set_prop (page->priv->uic, "/commands/InsertSendOptions", "hidden", "1", NULL);
 	page->priv->sendoptions_shown = FALSE;
 	
 }
@@ -459,7 +285,7 @@ task_page_show_options (TaskPage *page)
 {
 	g_return_if_fail (IS_TASK_PAGE (page));
 	
-	bonobo_ui_component_set_prop (page->priv->uic, "/commands/InsertSendOptions", "hidden", "0", NULL);
+	gtk_widget_show (page->priv->sendoptions_frame);
 	page->priv->sendoptions_shown = TRUE;
 }
 
@@ -469,38 +295,6 @@ task_page_set_assignment (TaskPage *page, gboolean set)
 	g_return_if_fail (IS_TASK_PAGE (page));
 
 	page->priv->is_assignment = set;
-	sensitize_widgets (page);
-}
-
-static EAccount *
-get_current_account (TaskPage *page)
-{	
-	TaskPagePrivate *priv;
-	EIterator *it;
-	const char *str;
-	
-	priv = page->priv;
-
-	str = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (priv->organizer)->entry));
-	if (!str)
-		return NULL;
-	
-	for (it = e_list_get_iterator((EList *)priv->accounts); e_iterator_is_valid(it); e_iterator_next(it)) {
-		EAccount *a = (EAccount *)e_iterator_get(it);
-		char *full = g_strdup_printf("%s <%s>", a->id->name, a->id->address);
-
-		if (!strcmp (full, str)) {
-			g_free (full);
-			g_object_unref (it);
-
-			return a;
-		}
-	
-		g_free (full);
-	}
-	g_object_unref (it);
-	
-	return NULL;	
 }
 
 /* fill_widgets handler for the task page */
@@ -522,23 +316,10 @@ task_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
 	priv = tpage->priv;
 
 	priv->updating = TRUE;
-
-	/* Clean out old data */
-	if (priv->comp != NULL)
-		g_object_unref (priv->comp);
-	priv->comp = NULL;
-	
-	cleanup_attendees (priv->deleted_attendees);
-	g_ptr_array_set_size (priv->deleted_attendees, 0);
 	
-	/* Component for cancellation */
-	priv->comp = e_cal_component_clone (comp);
-
 	/* Clean the screen */
 	clear_widgets (tpage);
 
-	priv->user_add = itip_get_comp_attendee (comp, page->client);
-	
         /* Summary, description(s) */
 	e_cal_component_get_summary (comp, &text);
 	e_dialog_editable_set (priv->summary, text.value);
@@ -569,6 +350,7 @@ task_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
 		if (due_tt->is_date) {
 			e_date_edit_set_time_of_day (E_DATE_EDIT (priv->due_date),
 						     -1, -1);
+			zone = default_zone;
 		} else {
 			e_date_edit_set_time_of_day (E_DATE_EDIT (priv->due_date),
 						     due_tt->hour,
@@ -580,31 +362,26 @@ task_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
 		/* If no time is set, we use the default timezone, so the
 		   user usually doesn't have to set this when they set the
 		   date. */
-		zone = NULL;
+		zone = default_zone;
 	}
 
 	/* Note that if we are creating a new task, the timezones may not be
 	   on the server, so we try to get the builtin timezone with the TZID
 	   first. */
-	if (!zone && d.tzid) {
+	if (!zone)
+		zone = icaltimezone_get_builtin_timezone_from_tzid (d.tzid);
+	if (!zone) {
 		if (!e_cal_get_timezone (page->client, d.tzid, &zone, NULL))
 			/* FIXME: Handle error better. */
 			g_warning ("Couldn't get timezone from server: %s",
 				   d.tzid ? d.tzid : "");
 	}
-	
-	e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (priv->timezone),
-				       zone ? zone : default_zone);
-	gtk_widget_show_all (priv->timezone);
-
-	if (!(COMP_EDITOR_PAGE (tpage)->flags & COMP_EDITOR_PAGE_NEW_ITEM) && !zone) {
-			task_page_set_show_timezone (tpage, FALSE);
-			bonobo_ui_component_set_prop (priv->uic, "/commands/ViewTimeZone", 
-					"state", "0", NULL);
-	}
+	e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (priv->due_timezone),
+				       zone);
 
 	e_cal_component_free_datetime (&d);
 
+
 	/* Start Date. */
 	e_cal_component_get_dtstart (comp, &d);
 	zone = NULL;
@@ -631,6 +408,17 @@ task_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
 		zone = default_zone;
 	}
 
+	if (!zone)
+		zone = icaltimezone_get_builtin_timezone_from_tzid (d.tzid);
+	if (!zone) {
+		if (!e_cal_get_timezone (page->client, d.tzid, &zone, NULL))
+			/* FIXME: Handle error better. */
+			g_warning ("Couldn't get timezone from server: %s",
+				   d.tzid ? d.tzid : "");
+	}
+	e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (priv->start_timezone),
+				       zone);
+
 	e_cal_component_free_datetime (&d);
 
 	/* Classification. */
@@ -646,7 +434,7 @@ task_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
 		cl = E_CAL_COMPONENT_CLASS_PUBLIC;
                 break;
 	}
-	set_classification_menu (tpage, cl);
+	e_dialog_option_menu_set (priv->classification, cl, classification_map);
 
 	e_cal_component_get_uid (comp, &uid);
 	if (e_cal_get_object (COMP_EDITOR_PAGE (tpage)->client, uid, NULL, &icalcomp, NULL)) {
@@ -662,62 +450,6 @@ task_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
 	source = e_cal_get_source (page->client);
 	e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector), source);
 
-	if (priv->is_assignment) {
-		ECalComponentOrganizer organizer;	
-		
-		priv->user_add = itip_get_comp_attendee (comp, COMP_EDITOR_PAGE (tpage)->client);	
-
-		/* If there is an existing organizer show it properly */
-		if (e_cal_component_has_organizer (comp)) {
-			e_cal_component_get_organizer (comp, &organizer);
-			if (organizer.value != NULL) {
-				const gchar *strip = itip_strip_mailto (organizer.value);
-				gchar *string;
-				if (itip_organizer_is_user (comp, page->client)) {
-					if (e_cal_get_static_capability (
-								page->client,
-								CAL_STATIC_CAPABILITY_ORGANIZER_NOT_EMAIL_ADDRESS))
-						priv->user_org = TRUE;
-				} else {
-					if (e_cal_get_static_capability (
-								page->client,
-								CAL_STATIC_CAPABILITY_ORGANIZER_NOT_EMAIL_ADDRESS))
-						gtk_widget_set_sensitive (priv->invite, FALSE);
-					gtk_widget_set_sensitive (priv->add, FALSE);
-					gtk_widget_set_sensitive (priv->remove, FALSE);
-					priv->user_org = FALSE;
-				}
-
-				if (e_cal_get_static_capability (COMP_EDITOR_PAGE (tpage)->client, CAL_STATIC_CAPABILITY_NO_ORGANIZER) && (COMP_EDITOR_PAGE (tpage)->flags & COMP_EDITOR_PAGE_DELEGATE))
-					string = g_strdup (priv->user_add);
-				else if ( organizer.cn != NULL)
-					string = g_strdup_printf ("%s <%s>", organizer.cn, strip);
-				else
-					string = g_strdup (strip);
-
-				g_free (string);
-				priv->existing = TRUE;
-			}
-		} else {
-			EAccount *a;
-
-			a = get_current_account (tpage);
-			if (a != NULL) {
-				CompEditorPage *page = (CompEditorPage *) tpage;
-				priv->ia = e_meeting_store_add_attendee_with_defaults (priv->model);
-				g_object_ref (priv->ia);
-
-				e_meeting_attendee_set_address (priv->ia, g_strdup_printf ("MAILTO:%s", a->id->address));
-				e_meeting_attendee_set_cn (priv->ia, g_strdup (a->id->name));
-				if (page->client && e_cal_get_organizer_must_accept (page->client))
-					e_meeting_attendee_set_status (priv->ia, ICAL_PARTSTAT_NEEDSACTION);
-				else
-					e_meeting_attendee_set_status (priv->ia, ICAL_PARTSTAT_ACCEPTED);
-			}
-		}
-	}
-
-
 	priv->updating = FALSE;
 
 	sensitize_widgets (tpage);
@@ -725,30 +457,6 @@ task_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
 	return TRUE;
 }
 
-static void
-set_attendees (ECalComponent *comp, const GPtrArray *attendees)
-{
-	GSList *comp_attendees = NULL, *l;
-	int i;
-	
-	for (i = 0; i < attendees->len; i++) {
-		EMeetingAttendee *ia = g_ptr_array_index (attendees, i);
-		ECalComponentAttendee *ca;
-		
-		ca = e_meeting_attendee_as_e_cal_component_attendee (ia);
-		
-		comp_attendees = g_slist_prepend (comp_attendees, ca);
-		
-	}
-	comp_attendees = g_slist_reverse (comp_attendees);
-	
-	e_cal_component_set_attendee_list (comp, comp_attendees);
-	
-	for (l = comp_attendees; l != NULL; l = l->next)
-		g_free (l->data);	
-	g_slist_free (comp_attendees);
-}
-
 /* fill_component handler for the task page */
 static gboolean
 task_page_fill_component (CompEditorPage *page, ECalComponent *comp)
@@ -831,7 +539,7 @@ task_page_fill_component (CompEditorPage *page, ECalComponent *comp)
 						&due_tt.minute);
 	if (due_date_set) {
 		if (time_set) {
-			due_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->timezone));
+			due_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->due_timezone));
 			date.tzid = icaltimezone_get_tzid (due_zone);
 		} else {
 			due_tt.is_date = TRUE;
@@ -860,7 +568,7 @@ task_page_fill_component (CompEditorPage *page, ECalComponent *comp)
 						&start_tt.minute);
 	if (start_date_set) {
 		if (time_set) {
-			start_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->timezone));
+			start_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
 			date.tzid = icaltimezone_get_tzid (start_zone);
 		} else {
 			start_tt.is_date = TRUE;
@@ -872,7 +580,7 @@ task_page_fill_component (CompEditorPage *page, ECalComponent *comp)
 	}
 	
 	/* Classification. */
-	e_cal_component_set_classification (comp, priv->classification);
+	e_cal_component_set_classification (comp, classification_get (priv->classification));
 	
 	/* send options */
 	if (priv->sendoptions_shown && priv->sod) 
@@ -889,431 +597,9 @@ task_page_fill_component (CompEditorPage *page, ECalComponent *comp)
 	if (str)
 		g_free (str);
 
-	if (priv->is_assignment) {
-		ECalComponentOrganizer organizer = {NULL, NULL, NULL, NULL};
-
-		if (!priv->existing) {
-			EAccount *a;
-			gchar *addr = NULL;
-
-			/* Find the identity for the organizer or sentby field */
-			a = get_current_account (tpage);
-
-			/* Sanity Check */
-			if (a == NULL) {
-				e_notice (page, GTK_MESSAGE_ERROR,
-						_("The organizer selected no longer has an account."));
-				return FALSE;			
-			}
-
-			if (a->id->address == NULL || strlen (a->id->address) == 0) {
-				e_notice (page, GTK_MESSAGE_ERROR,
-						_("An organizer is required."));
-				return FALSE;
-			} 
-
-			addr = g_strdup_printf ("MAILTO:%s", a->id->address);
-
-			organizer.value = addr;
-			organizer.cn = a->id->name;
-			e_cal_component_set_organizer (comp, &organizer);
-
-			g_free (addr);
-		}
-
-		if (e_meeting_store_count_actual_attendees (priv->model) < 1) {
-			e_notice (page, GTK_MESSAGE_ERROR,
-					_("At least one attendee is required."));
-			return FALSE;
-		}
-
-
-		if (COMP_EDITOR_PAGE (tpage)->flags & COMP_EDITOR_PAGE_DELEGATE ) {
-			GSList *attendee_list, *l;
-			int i;
-			const GPtrArray *attendees = e_meeting_store_get_attendees (priv->model);
-
-			e_cal_component_get_attendee_list (priv->comp, &attendee_list);
-
-			for (i = 0; i < attendees->len; i++) {
-				EMeetingAttendee *ia = g_ptr_array_index (attendees, i);
-				ECalComponentAttendee *ca;
-
-				/* Remove the duplicate user from the component if present */
-				if (e_meeting_attendee_is_set_delto (ia)) {
-					for (l = attendee_list; l; l = l->next) {
-						ECalComponentAttendee *a = l->data;
-
-						if (g_str_equal (a->value, e_meeting_attendee_get_address (ia))) {
-							attendee_list = g_slist_remove (attendee_list, l->data);
-							break;
-						}
-					}
-				}
-
-				ca = e_meeting_attendee_as_e_cal_component_attendee (ia);
-
-				attendee_list = g_slist_append (attendee_list, ca);
-			}
-			e_cal_component_set_attendee_list (comp, attendee_list);
-			e_cal_component_free_attendee_list (attendee_list);
-		} else 
-			set_attendees (comp, e_meeting_store_get_attendees (priv->model));
-	}
-
 	return TRUE;
 }
 
-static void
-add_clicked_cb (GtkButton *btn, TaskPage *page)
-{
-	EMeetingAttendee *attendee;
-
-	attendee = e_meeting_store_add_attendee_with_defaults (page->priv->model);
-
-	if (COMP_EDITOR_PAGE (page)->flags & COMP_EDITOR_PAGE_DELEGATE) {
-		e_meeting_attendee_set_delfrom (attendee, g_strdup_printf ("MAILTO:%s", page->priv->user_add));
-	}
-
-	e_meeting_list_view_edit (page->priv->list_view, attendee);
-}
-
-static gboolean
-existing_attendee (EMeetingAttendee *ia, ECalComponent *comp) 
-{
-	GSList *attendees, *l;
-	const gchar *ia_address;
-	
-	ia_address = itip_strip_mailto (e_meeting_attendee_get_address (ia));
-	if (!ia_address)
-		return FALSE;
-	
-	e_cal_component_get_attendee_list (comp, &attendees);
-
-	for (l = attendees; l; l = l->next) {
-		ECalComponentAttendee *attendee = l->data;
-		const char *address;
-		
-		address = itip_strip_mailto (attendee->value);
-		if (address && !g_strcasecmp (ia_address, address)) {
-			e_cal_component_free_attendee_list (attendees);
-			return TRUE;
-		}
-	}
-	
-	e_cal_component_free_attendee_list (attendees);
-	
-	return FALSE;
-}
-
-static void
-remove_attendee (TaskPage *page, EMeetingAttendee *ia) 
-{
-	TaskPagePrivate *priv;
-	int pos = 0;
-	gboolean delegate = (COMP_EDITOR_PAGE (page)->flags & COMP_EDITOR_PAGE_DELEGATE);
-	
-	priv = page->priv;
-
-	/* If the user deletes the organizer attendee explicitly,
-	   assume they no longer want the organizer showing up */
-	if (ia == priv->ia) {
-		g_object_unref (priv->ia);
-		priv->ia = NULL;
-	}	
-		
-	/* If this was a delegatee, no longer delegate */
-	if (e_meeting_attendee_is_set_delfrom (ia)) {
-		EMeetingAttendee *ib;
-		
-		ib = e_meeting_store_find_attendee (priv->model, e_meeting_attendee_get_delfrom (ia), &pos);
-		if (ib != NULL) {
-			e_meeting_attendee_set_delto (ib, NULL);
-			
-			if (!delegate) 
-				e_meeting_attendee_set_edit_level (ib,  E_MEETING_ATTENDEE_EDIT_FULL);
-		}		
-	}
-	
-	/* Handle deleting all attendees in the delegation chain */	
-	while (ia != NULL) {
-		EMeetingAttendee *ib = NULL;
-
-		if (existing_attendee (ia, priv->comp)) {
-			g_object_ref (ia);
-			g_ptr_array_add (priv->deleted_attendees, ia);
-		}
-		
-		if (e_meeting_attendee_get_delto (ia) != NULL)
-			ib = e_meeting_store_find_attendee (priv->model, e_meeting_attendee_get_delto (ia), NULL);
-		e_meeting_store_remove_attendee (priv->model, ia);
-
-		ia = ib;
-	}
-	
-	sensitize_widgets (page);
-}
-
-static void
-remove_clicked_cb (GtkButton *btn, TaskPage *page)
-{
-	TaskPagePrivate *priv;
-	EMeetingAttendee *ia;
-	GtkTreeSelection *selection;
-	GList *paths = NULL, *tmp;
-	GtkTreeIter iter;
-	GtkTreePath *path = NULL;
-	gboolean valid_iter;
-	char *address;
-	
-	priv = page->priv;
-
-	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->list_view));
-	if (!(paths = gtk_tree_selection_get_selected_rows (selection, (GtkTreeModel **) &(priv->model)))) {
-		g_warning ("Could not get a selection to delete.");
-		return;
-	}
-	paths = g_list_reverse (paths);
-	
-	for (tmp = paths; tmp; tmp=tmp->next) {
-		path = tmp->data;
-		
-		gtk_tree_model_get_iter (GTK_TREE_MODEL(priv->model), &iter, path);
-
-		gtk_tree_model_get (GTK_TREE_MODEL (priv->model), &iter, E_MEETING_STORE_ADDRESS_COL, &address, -1);
-		ia = e_meeting_store_find_attendee (priv->model, address, NULL);
-		g_free (address);
-		if (!ia) {
-			g_warning ("Cannot delete attendee\n");
-			continue;
-		} else if (e_meeting_attendee_get_edit_level (ia) != E_MEETING_ATTENDEE_EDIT_FULL) {
-			g_warning("Not enough rights to delete attendee: %s\n", e_meeting_attendee_get_address(ia));	
-			continue;
-		}
-		
-		remove_attendee (page, ia);
-	}
-	
-	/* Select closest item after removal */
-	valid_iter = gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->model), &iter, path);
-	if (!valid_iter) {
-		gtk_tree_path_prev (path);
-		valid_iter = gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->model), &iter, path);
-	}
-	
-	if (valid_iter) {
-		gtk_tree_selection_unselect_all (selection);
-		gtk_tree_selection_select_iter (selection, &iter);
-	}
-	
-	g_list_foreach (paths, (GFunc) gtk_tree_path_free, NULL);
-	g_list_free (paths);
-}
-
-static void
-invite_cb (GtkWidget *widget, gpointer data) 
-{
-	TaskPage *page;
-	TaskPagePrivate *priv;
-	
-	page = TASK_PAGE (data);
-	priv = page->priv;
-
-	e_meeting_list_view_invite_others_dialog (priv->list_view);
-}
-
-static void
-attendee_added_cb (EMeetingListView *emlv, EMeetingAttendee *ia, gpointer user_data)
-{
-   TaskPage *page = TASK_PAGE (user_data);	
-   TaskPagePrivate *priv;
-   gboolean delegate = (COMP_EDITOR_PAGE (page)->flags & COMP_EDITOR_PAGE_DELEGATE);
-
-   priv = page->priv;
-
-   if (delegate) {
-	   if (existing_attendee (ia, priv->comp))
-		   e_meeting_store_remove_attendee (priv->model, ia);
-	   else {
-		   if (!e_cal_get_static_capability (COMP_EDITOR_PAGE(page)->client, 
-					   CAL_STATIC_CAPABILITY_DELEGATE_TO_MANY)) {
-			   const char *delegator_id = e_meeting_attendee_get_delfrom (ia);
-			   EMeetingAttendee *delegator;
-
-			   delegator = e_meeting_store_find_attendee (priv->model, delegator_id, NULL);
-			   e_meeting_attendee_set_delto (delegator, 
-					   g_strdup (e_meeting_attendee_get_address (ia)));
-
-			   gtk_widget_set_sensitive (priv->invite, FALSE);
-			   gtk_widget_set_sensitive (priv->add, FALSE);
-		   }
-	   }
-   }
-
-}
-
-/* Callbacks for list view*/
-static void
-popup_add_cb (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	TaskPage *page = data;
-
-	add_clicked_cb (NULL, page);
-}
-
-static void
-popup_delete_cb (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	TaskPage *page = data;
-	TaskPagePrivate *priv;
-	
-	priv = page->priv;
-
-	remove_clicked_cb (NULL, page);
-}
-
-enum {
-	ATTENDEE_CAN_DELEGATE = 1<<1,
-	ATTENDEE_CAN_DELETE = 1<<2,
-	ATTENDEE_CAN_ADD = 1<<3,
-	ATTENDEE_LAST = 1<<4,
-};
-
-static EPopupItem context_menu_items[] = {
-	{ E_POPUP_ITEM, "10.delete", N_("_Remove"), popup_delete_cb, NULL, GTK_STOCK_REMOVE, ATTENDEE_CAN_DELETE },
-	{ E_POPUP_ITEM, "15.add", N_("_Add "), popup_add_cb, NULL, GTK_STOCK_ADD },	
-};
-
-static void
-context_popup_free(EPopup *ep, GSList *items, void *data)
-{
-	g_slist_free(items);
-}
-
-static gint
-button_press_event (GtkWidget *widget, GdkEventButton *event, TaskPage *page)
-{
-	TaskPagePrivate *priv;
-	GtkMenu *menu;
-	EMeetingAttendee *ia;
-	GtkTreePath *path;
-	GtkTreeIter iter;
-	char *address;
-	guint32 disable_mask = ~0;
-	GSList *menus = NULL;
-	ECalPopup *ep;
-	int i;
-
-	priv = page->priv;
-
-	/* only process right-clicks */
-	if (event->button != 3 || event->type != GDK_BUTTON_PRESS)
-		return FALSE;
-
-	/* only if we right-click on an attendee */
-	if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (priv->list_view), event->x, event->y, &path, NULL, NULL, NULL)) {
-		GtkTreeSelection *selection;
-
-		if (gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->model), &iter, path)) {
-		
-			gtk_tree_model_get (GTK_TREE_MODEL (priv->model), &iter, E_MEETING_STORE_ADDRESS_COL, &address, -1);
-			ia = e_meeting_store_find_attendee (priv->model, address, &priv->row);
-			g_free (address);
-
-			if (ia) {
-				selection = gtk_tree_view_get_selection ((GtkTreeView *) priv->list_view);
-				gtk_tree_selection_unselect_all (selection);
-				gtk_tree_selection_select_path (selection, path);
-		
- 				if (e_meeting_attendee_get_edit_level (ia) == E_MEETING_ATTENDEE_EDIT_FULL)
- 					disable_mask &= ~ATTENDEE_CAN_DELETE;
-			}
-		}
-	}
-
-	if (GTK_WIDGET_IS_SENSITIVE(priv->add))
-		disable_mask &= ~ATTENDEE_CAN_ADD;
-	else if (COMP_EDITOR_PAGE (page)->flags & COMP_EDITOR_PAGE_USER_ORG)
-		disable_mask &= ~ATTENDEE_CAN_ADD;
-
-	ep = e_cal_popup_new("org.gnome.evolution.calendar.task.popup");
-
-	for (i=0;i<sizeof(context_menu_items)/sizeof(context_menu_items[0]);i++)
-		menus = g_slist_prepend(menus, &context_menu_items[i]);
-	
-	e_popup_add_items((EPopup *)ep, menus, NULL, context_popup_free, page);
-	menu = e_popup_create_menu_once((EPopup *)ep, NULL, disable_mask);
-	gtk_menu_popup (menu, NULL, NULL, NULL, NULL, event->button, event->time);
-
-	return TRUE;
-}
-
-static gboolean
-list_view_event (EMeetingListView *list_view, GdkEvent *event, TaskPage *page) {
-	
-	TaskPagePrivate *priv= page->priv;
-	
-	if (event->type == GDK_2BUTTON_PRESS && COMP_EDITOR_PAGE (page)->flags & COMP_EDITOR_PAGE_USER_ORG) {
-		EMeetingAttendee *attendee;
-
-		attendee = e_meeting_store_add_attendee_with_defaults (priv->model);
-
-		if (COMP_EDITOR_PAGE (page)->flags & COMP_EDITOR_PAGE_DELEGATE) {
-			e_meeting_attendee_set_delfrom (attendee, g_strdup_printf ("MAILTO:%s", page->priv->user_add));
-		}
-
-		e_meeting_list_view_edit (page->priv->list_view, attendee);
-		return TRUE;
-	}
-
-	return FALSE;	
-}
-
-
-static gboolean
-list_key_press (EMeetingListView *list_view, GdkEventKey *event, TaskPage *page)
-{
-	if (event->keyval == GDK_Delete) {
-		TaskPagePrivate *priv;
-	
-		priv = page->priv;
-		remove_clicked_cb (NULL, page);
-
-		return TRUE;
-	} else if (event->keyval == GDK_Insert) {
-		add_clicked_cb (NULL, page);
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-void 
-task_page_set_show_timezone (TaskPage *page, gboolean state)
-{
-	if (state) {
-		gtk_widget_show_all (page->priv->timezone);
-		gtk_widget_show (page->priv->timezone_label);	
-	} else {
-		gtk_widget_hide (page->priv->timezone);
-		gtk_widget_hide (page->priv->timezone_label);
-	}
-		
-}
-
-void
-task_page_set_show_categories (TaskPage *page, gboolean state)
-{
-	if (state) {
-		gtk_widget_show (page->priv->categories_btn);
-		gtk_widget_show (page->priv->categories);	
-	} else {
-		gtk_widget_hide (page->priv->categories_btn);
-		gtk_widget_hide (page->priv->categories);
-	}
-}
-
 /* fill_timezones handler for the event page */
 static gboolean
 task_page_fill_timezones (CompEditorPage *page, GHashTable *timezones)
@@ -1325,8 +611,15 @@ task_page_fill_timezones (CompEditorPage *page, GHashTable *timezones)
 	tpage = TASK_PAGE (page);
 	priv = tpage->priv;
 
+	/* add due date timezone */
+	zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->due_timezone));
+	if (zone) {
+		if (!g_hash_table_lookup (timezones, icaltimezone_get_tzid (zone)))
+			g_hash_table_insert (timezones, icaltimezone_get_tzid (zone), zone);
+	}
+
 	/* add start date timezone */
-	zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->timezone));
+	zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
 	if (zone) {
 		if (!g_hash_table_lookup (timezones, icaltimezone_get_tzid (zone)))
 			g_hash_table_insert (timezones, icaltimezone_get_tzid (zone), zone);
@@ -1369,8 +662,6 @@ get_widgets (TaskPage *tpage)
 	TaskPagePrivate *priv;
 	GSList *accel_groups;
 	GtkWidget *toplevel;
-	GtkWidget *sw;
-	GtkTreeSelection *selection;
 
 	priv = tpage->priv;
 
@@ -1401,47 +692,35 @@ get_widgets (TaskPage *tpage)
 	priv->start_date = GW ("start-date");
 	gtk_widget_show (priv->start_date);
 
-	priv->timezone = GW ("timezone");
-	priv->timezone_label = GW ("timezone-label");
-	priv->attendees_label = GW ("attendees-label");
+	priv->due_timezone = GW ("due-timezone");
+	priv->start_timezone = GW ("start-timezone");
+
 	priv->description = GW ("description");
+
+	priv->classification = GW ("classification");
+
 	priv->categories_btn = GW ("categories-button");
 	priv->categories = GW ("categories");
-	priv->organizer = GW ("organizer");
-	priv->invite = GW ("invite");
-	priv->add = GW ("add-attendee");
-	priv->remove = GW ("remove-attendee");
-	priv->list_box = GW ("list-box");
-	priv->calendar_label = GW ("group-label");
-	priv->attendee_box = GW ("attendee-box");
-	priv->org_cal_label = GW ("org-task-label");
-
-	priv->list_view = e_meeting_list_view_new (priv->model);
-	
-	selection = gtk_tree_view_get_selection ((GtkTreeView *) priv->list_view);
-	gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
-	gtk_widget_show (GTK_WIDGET (priv->list_view));
-
-	sw = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_IN);
-	gtk_widget_show (sw);
-	gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (priv->list_view));
-	gtk_box_pack_start (GTK_BOX (priv->list_box), sw, TRUE, TRUE, 0);
 
 	priv->source_selector = GW ("source");
 	
+	priv->sendoptions_frame = GW ("send-options-frame");
+	priv->sendoptions_button = GW ("send-options-button");
+
 #undef GW
 
 	return (priv->summary
 		&& priv->summary_label
 		&& priv->due_date
 		&& priv->start_date
-		&& priv->timezone
+		&& priv->due_timezone
+		&& priv->start_timezone
+		&& priv->classification
 		&& priv->description
 		&& priv->categories_btn
 		&& priv->categories
-		);
+		&& priv->sendoptions_frame
+		&& priv->sendoptions_button);
 }
 
 /* Callback used when the summary changes; we emit the notification signal. */
@@ -1493,7 +772,7 @@ date_changed_cb (EDateEdit *dedit, gpointer data)
 						&start_tt.minute);
 	if (date_set) {
 		if (time_set) {
-			icaltimezone *zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->timezone));
+			icaltimezone *zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
 			start_dt.tzid = icaltimezone_get_tzid (zone);
 		} else {
 			start_tt.is_date = TRUE;
@@ -1513,7 +792,7 @@ date_changed_cb (EDateEdit *dedit, gpointer data)
 						&due_tt.minute);
 	if (date_set) {
 		if (time_set) {
-			icaltimezone *zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->timezone));
+			icaltimezone *zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->due_timezone));
 			due_dt.tzid = icaltimezone_get_tzid (zone);
 		} else {
 			due_tt.is_date = TRUE;
@@ -1536,19 +815,6 @@ date_changed_cb (EDateEdit *dedit, gpointer data)
 					       &dates);
 }
 
-static void
-timezone_changed_cb (EDateEdit *dedit, gpointer data)
-{
-	TaskPage *tpage;
-	TaskPagePrivate *priv;
-	
-	tpage = TASK_PAGE (data);
-	priv = tpage->priv;
-
-	date_changed_cb ((EDateEdit *) priv->start_date, tpage);
-	date_changed_cb ((EDateEdit *) priv->due_date, tpage);
-}
-
 /* Callback used when the categories button is clicked; we must bring up the
  * category list dialog.
  */
@@ -1593,13 +859,6 @@ source_changed_cb (GtkWidget *widget, ESource *source, gpointer data)
 		ECal *client;
 
 		client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_TODO);
-		if (client) {
-			icaltimezone *zone;
-			
-			zone = calendar_config_get_icaltimezone ();
-			e_cal_set_default_timezone (client, zone, NULL);
-		}
-		
 		if (!client || !e_cal_open (client, FALSE, NULL)) {
 			GtkWidget *dialog;
 
@@ -1630,13 +889,15 @@ source_changed_cb (GtkWidget *widget, ESource *source, gpointer data)
 	}
 }
 
-void
-task_page_sendoptions_clicked_cb (TaskPage *tpage)
+static void
+e_sendoptions_clicked_cb (GtkWidget *button, gpointer data)
 {
+	TaskPage *tpage;
 	TaskPagePrivate *priv;
 	GtkWidget *toplevel;
 	ESource *source;
 
+	tpage = TASK_PAGE (data);
 	priv = tpage->priv;
 	
 	if (!priv->sod) {
@@ -1689,13 +950,14 @@ init_widgets (TaskPage *tpage)
 	g_signal_connect((priv->due_date), "changed",
 			    G_CALLBACK (date_changed_cb), tpage);
 
-	/* time zone changed */
-	g_signal_connect (priv->timezone, "changed", G_CALLBACK(timezone_changed_cb), tpage);
-
 	/* Categories button */
 	g_signal_connect((priv->categories_btn), "clicked",
 			    G_CALLBACK (categories_clicked_cb), tpage);
 	
+	/* send options button */
+	g_signal_connect((priv->sendoptions_button), "clicked", 
+			    G_CALLBACK (e_sendoptions_clicked_cb), tpage);
+
 	/* Source selector */
 	g_signal_connect((priv->source_selector), "source_selected",
 			 G_CALLBACK (source_changed_cb), tpage);
@@ -1713,54 +975,19 @@ init_widgets (TaskPage *tpage)
 			  G_CALLBACK (field_changed_cb), tpage);
 	g_signal_connect (priv->due_date, "changed",
 			  G_CALLBACK (field_changed_cb), tpage);
-	g_signal_connect((priv->timezone), "changed",
+	g_signal_connect((priv->due_timezone), "changed",
+			    G_CALLBACK (field_changed_cb), tpage);
+	g_signal_connect((priv->start_timezone), "changed",
+			    G_CALLBACK (field_changed_cb), tpage);
+	g_signal_connect((priv->classification), "changed",
 			    G_CALLBACK (field_changed_cb), tpage);
 	g_signal_connect((priv->categories), "changed",
 			    G_CALLBACK (field_changed_cb), tpage);
-	g_signal_connect (G_OBJECT (priv->list_view), "button_press_event", G_CALLBACK (button_press_event), tpage);
-	g_signal_connect (G_OBJECT (priv->list_view), "event", G_CALLBACK (list_view_event), tpage);
-	g_signal_connect (priv->list_view, "key_press_event", G_CALLBACK (list_key_press), tpage);	
-	
-	/* Add attendee button */
-	g_signal_connect (priv->add, "clicked", G_CALLBACK (add_clicked_cb), tpage);
-
-	/* Remove attendee button */
-	g_signal_connect (priv->remove, "clicked", G_CALLBACK (remove_clicked_cb), tpage);
 
-	/* Contacts button */
-	g_signal_connect(priv->invite, "clicked", G_CALLBACK (invite_cb), tpage);	
-
-	/* Meeting List View */
-	g_signal_connect (priv->list_view, "attendee_added", G_CALLBACK (attendee_added_cb), tpage);	
-	
 	/* Set the default timezone, so the timezone entry may be hidden. */
 	zone = calendar_config_get_icaltimezone ();
-	e_timezone_entry_set_default_timezone (E_TIMEZONE_ENTRY (priv->timezone), zone);
-	
-	task_page_set_show_timezone (tpage, calendar_config_get_show_timezone());
-
-	e_meeting_list_view_column_set_visible (priv->list_view, "Attendee                          ", 
-			TRUE);
-	e_meeting_list_view_column_set_visible (priv->list_view, "Role", calendar_config_get_show_role());
-	e_meeting_list_view_column_set_visible (priv->list_view, "RSVP", calendar_config_get_show_rsvp());
-	e_meeting_list_view_column_set_visible (priv->list_view, "Status", calendar_config_get_show_status());
-	e_meeting_list_view_column_set_visible (priv->list_view, "Type", calendar_config_get_show_type());
-	
-	if (!calendar_config_get_show_timezone()) {
-		gtk_widget_hide (priv->timezone_label);
-		gtk_widget_hide (priv->timezone);
-	} else {
-		gtk_widget_show (priv->timezone_label);
-		gtk_widget_show_all (priv->timezone);
-	}
-
-	if (!calendar_config_get_show_categories()) {
-		gtk_widget_hide (priv->categories_btn);
-		gtk_widget_hide (priv->categories);
-	} else {
-		gtk_widget_show (priv->categories_btn);
-		gtk_widget_show (priv->categories);
-	}	
+	e_timezone_entry_set_default_timezone (E_TIMEZONE_ENTRY (priv->start_timezone), zone);
+	e_timezone_entry_set_default_timezone (E_TIMEZONE_ENTRY (priv->due_timezone), zone);
 
 	return TRUE;
 }
@@ -1777,27 +1004,14 @@ init_widgets (TaskPage *tpage)
  * created.
  **/
 TaskPage *
-task_page_construct (TaskPage *tpage, EMeetingStore *model, ECal *client)
+task_page_construct (TaskPage *tpage)
 {
 	TaskPagePrivate *priv;
-	char *backend_address = NULL;
-	EIterator *it;
-	EAccount *def_account;
-	GList *address_strings = NULL, *l;
-	EAccount *a;
-	char *gladefile;
-	
-	priv = tpage->priv;
-	g_object_ref (model);
-	priv->model = model;
-	priv->client = client;
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
-				      "task-page.glade",
-				      NULL);
-	priv->xml = glade_xml_new (gladefile, NULL, NULL);
-	g_free (gladefile);
+	priv = tpage->priv;
 
+	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/task-page.glade",
+				   NULL, NULL);
 	if (!priv->xml) {
 		g_message ("task_page_construct(): "
 			   "Could not load the Glade XML file!");
@@ -1809,49 +1023,6 @@ task_page_construct (TaskPage *tpage, EMeetingStore *model, ECal *client)
 			   "Could not find all widgets in the XML file!");
 		return NULL;
 	}
-	/* Address information */
-	if (!e_cal_get_cal_address (client, &backend_address, NULL))
-		return NULL;
-
-	priv->accounts = itip_addresses_get ();
-	def_account = itip_addresses_get_default();
-	for (it = e_list_get_iterator((EList *)priv->accounts);
-	     e_iterator_is_valid(it);
-	     e_iterator_next(it)) {
-		a = (EAccount *)e_iterator_get(it);
-		char *full;
-		
-		full = g_strdup_printf("%s <%s>", a->id->name, a->id->address);
-
-		address_strings = g_list_append(address_strings, full);
-
-		/* Note that the address specified by the backend gets
-		 * precedence over the default mail address.
-		 */
-		if (backend_address && !strcmp (backend_address, a->id->address)) {
-			if (priv->default_address)
-				g_free (priv->default_address);
-			
-			priv->default_address = g_strdup (full);
-		} else if (a == def_account && !priv->default_address) {
-			priv->default_address = g_strdup (full);
-		}
-	}
-	
-	if (backend_address)
-		g_free (backend_address);
-
-	g_object_unref(it);
-
-	if (address_strings)
-		gtk_combo_set_popdown_strings (GTK_COMBO (priv->organizer), address_strings);
-	else
-		g_warning ("No potential organizers!");
-
-	for (l = address_strings; l != NULL; l = l->next)
-		g_free (l->data);
-	g_list_free (address_strings);
-	
 
 	if (!init_widgets (tpage)) {
 		g_message ("task_page_construct(): " 
@@ -1871,39 +1042,19 @@ task_page_construct (TaskPage *tpage, EMeetingStore *model, ECal *client)
  * not be created.
  **/
 TaskPage *
-task_page_new (EMeetingStore *model, ECal *client, BonoboUIComponent *uic)
+task_page_new (void)
 {
 	TaskPage *tpage;
 
 	tpage = gtk_type_new (TYPE_TASK_PAGE);
-	if (!task_page_construct (tpage, model, client)) {
+	if (!task_page_construct (tpage)) {
 		g_object_unref (tpage);
 		return NULL;
 	}
-	
-	tpage->priv->uic = uic;
 
 	return tpage;
 }
 
-ECalComponent *
-task_page_get_cancel_comp (TaskPage *page)
-{
-	TaskPagePrivate *priv;
-
-	g_return_val_if_fail (page != NULL, NULL);
-	g_return_val_if_fail (IS_TASK_PAGE (page), NULL);
-
-	priv = page->priv;
-
-	if (priv->deleted_attendees->len == 0)
-		return NULL;
-	
-	set_attendees (priv->comp, priv->deleted_attendees);
-	
-	return e_cal_component_clone (priv->comp);
-}
-
 GtkWidget *task_page_create_date_edit (void);
 
 GtkWidget *
diff --git a/calendar/gui/e-cal-model-calendar.c b/calendar/gui/e-cal-model-calendar.c
index d79a5eecde..9fedccec07 100644
--- a/calendar/gui/e-cal-model-calendar.c
+++ b/calendar/gui/e-cal-model-calendar.c
@@ -311,9 +311,9 @@ set_transparency (ECalModelComponent *comp_data, const void *value)
 	} else {
 		icalproperty_transp transp;
 
-		if (!g_ascii_strcasecmp (value, "FREE"))
+		if (!strcasecmp (value, "FREE"))
 			transp = ICAL_TRANSP_TRANSPARENT;
-		else if (!g_ascii_strcasecmp (value, "OPAQUE"))
+		else if (!strcasecmp (value, "OPAQUE"))
 			transp = ICAL_TRANSP_OPAQUE;
 		else {
 			if (prop) {
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 8c0149cff6..ee5561bfbe 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <glib/garray.h>
 #include <libgnome/gnome-i18n.h>
-#include <libedataserver/e-time-utils.h>
+#include <e-util/e-time-utils.h>
 #include <libecal/e-cal-time-util.h>
 #include "comp-util.h"
 #include "e-cal-model.h"
@@ -544,11 +544,11 @@ set_classification (ECalModelComponent *comp_data, const char *value)
 	} else {
 	  icalproperty_class ical_class;
 
-	  if (!g_ascii_strcasecmp (value, "PUBLIC"))
+	  if (!strcasecmp (value, "PUBLIC"))
 	    ical_class = ICAL_CLASS_PUBLIC;
-	  else if (!g_ascii_strcasecmp (value, "PRIVATE"))
+	  else if (!strcasecmp (value, "PRIVATE"))
 	    ical_class = ICAL_CLASS_PRIVATE;
-	  else if (!g_ascii_strcasecmp (value, "CONFIDENTIAL"))
+	  else if (!strcasecmp (value, "CONFIDENTIAL"))
 	    ical_class = ICAL_CLASS_CONFIDENTIAL;
 	  else
 	    ical_class = ICAL_CLASS_NONE;
@@ -1244,9 +1244,10 @@ find_client_data (ECalModel *model, ECal *client)
 	return NULL;
 }
 
+/* Pass NULL for the client if we just want to find based on uid */
 /* FIXME how do we prevent the same UID is different calendars? */
 static ECalModelComponent *
-search_by_id_and_client (ECalModelPrivate *priv, ECal *client, const ECalComponentId *id)
+search_by_uid_and_client (ECalModelPrivate *priv, ECal *client, const char *uid)
 {
 	gint i;
 
@@ -1254,27 +1255,19 @@ search_by_id_and_client (ECalModelPrivate *priv, ECal *client, const ECalCompone
 		ECalModelComponent *comp_data = g_ptr_array_index (priv->objects, i);
 
 		if (comp_data) {
-			const char *uid, *rid;
-			gboolean has_rid = (id->rid && *id->rid);
+			const char *tmp_uid;
 
-			uid = icalcomponent_get_uid (comp_data->icalcomp);
-			rid = icaltime_as_ical_string (icalcomponent_get_recurrenceid (comp_data->icalcomp));
-
-			if (uid && *uid) {
-				if ((!client || comp_data->client == client) && !strcmp (id->uid, uid)) {
-					if (has_rid) {
-						if (!(rid && *rid && !strcmp (rid, id->rid)))	
-							continue;
-					}
+			tmp_uid = icalcomponent_get_uid (comp_data->icalcomp);
+			if (tmp_uid && *tmp_uid) {
+				if ((!client || comp_data->client == client) && !strcmp (uid, tmp_uid)) 
 					return comp_data;
-				}
 			}
 		}
 	}
 
 	return NULL;
 }
-	
+
 typedef struct {
 	ECal *client;
 	ECalView *query;
@@ -1363,15 +1356,10 @@ e_cal_view_objects_added_cb (ECalView *query, GList *objects, gpointer user_data
 
 	for (l = objects; l; l = l->next) {
 		ECalModelComponent *comp_data;
-		ECalComponentId *id;
-		ECalComponent *comp = e_cal_component_new ();
-
-		e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (l->data));
-		id = e_cal_component_get_id (comp);
 
 		/* remove the components if they are already present and re-add them */
-		while ((comp_data = search_by_id_and_client (priv, NULL,
-							      id))) {
+		while ((comp_data = search_by_uid_and_client (priv, e_cal_view_get_client (query),
+							      icalcomponent_get_uid (l->data)))) {
 			int pos;
 
 			pos = get_position_in_array (priv->objects, comp_data);
@@ -1381,11 +1369,9 @@ e_cal_view_objects_added_cb (ECalView *query, GList *objects, gpointer user_data
 	 			e_cal_model_free_component_data (comp_data);
  		}
 
-		e_cal_component_free_id (id);
-		g_object_unref (comp);
 		ensure_dates_are_in_default_zone (l->data);
 
-		if (e_cal_util_component_has_recurrences (l->data) && (priv->flags & E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES)) {
+		if ((priv->flags & E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES)) {
 			RecurrenceExpansionData rdata;
 
 			rdata.client = e_cal_view_get_client (query);
@@ -1421,28 +1407,43 @@ e_cal_view_objects_modified_cb (ECalView *query, GList *objects, gpointer user_d
 	
 	priv = model->priv;
 
+	for (l = objects; l; l = l->next) {
+		ECalModelComponent *comp_data;
+
+		/* remove all recurrences and re-add them after generating them */
+		while ((comp_data = search_by_uid_and_client (priv, e_cal_view_get_client (query),
+							      icalcomponent_get_uid (l->data)))) {
+			int pos;
+
+			pos = get_position_in_array (priv->objects, comp_data);
+			e_table_model_row_deleted (E_TABLE_MODEL (model), pos);
+
+			if (g_ptr_array_remove (priv->objects, comp_data))
+				e_cal_model_free_component_data (comp_data);
+		}
+	}
+
 	/* now re-add all objects */
 	e_cal_view_objects_added_cb (query, objects, model);
 }
 
 static void
-e_cal_view_objects_removed_cb (ECalView *query, GList *ids, gpointer user_data)
+e_cal_view_objects_removed_cb (ECalView *query, GList *uids, gpointer user_data)
 {
 	ECalModelPrivate *priv;
 	ECalModel *model = (ECalModel *) user_data;
 	GList *l;
 	
 	priv = model->priv;
-	
-	for (l = ids; l; l = l->next) {
-		ECalModelComponent *comp_data = NULL;
-		ECalComponentId *id = l->data;
+
+	for (l = uids; l; l = l->next) {
+		ECalModelComponent *comp_data;
 		int pos;
 
 		e_table_model_pre_change (E_TABLE_MODEL (model));
 		
 		/* make sure we remove all objects with this UID */
-		while ((comp_data = search_by_id_and_client (priv, e_cal_view_get_client (query), id))) {
+		while ((comp_data = search_by_uid_and_client (priv, e_cal_view_get_client (query), l->data))) {
 			pos = get_position_in_array (priv->objects, comp_data);
 			e_table_model_row_deleted (E_TABLE_MODEL (model), pos);
 
@@ -1931,7 +1932,7 @@ e_cal_model_get_component_at (ECalModel *model, gint row)
 }
 
 ECalModelComponent *
-e_cal_model_get_component_for_uid  (ECalModel *model, const ECalComponentId *id)
+e_cal_model_get_component_for_uid  (ECalModel *model, const char *uid)
 {
 	ECalModelPrivate *priv;
 
@@ -1939,8 +1940,8 @@ e_cal_model_get_component_for_uid  (ECalModel *model, const ECalComponentId *id)
 
 	priv = model->priv;
 
-	return search_by_id_and_client (priv, NULL, id);
-} 
+	return search_by_uid_and_client (priv, NULL, uid);
+}
 
 /**
  * e_cal_model_date_value_to_string
@@ -2108,8 +2109,8 @@ e_cal_model_set_instance_times (ECalModelComponent *comp_data, icaltimezone *zon
 	start_time = icalcomponent_get_dtstart (comp_data->icalcomp);
 	end_time = icalcomponent_get_dtend (comp_data->icalcomp);
 
-	comp_data->instance_start = icaltime_as_timet_with_zone (start_time, zone);
+	comp_data->instance_start = icaltime_as_timet (start_time);
 
 	comp_data->instance_end = comp_data->instance_start +
-		(icaltime_as_timet_with_zone (end_time, zone) - icaltime_as_timet_with_zone (start_time, zone));
+		(icaltime_as_timet (end_time) - icaltime_as_timet (start_time));
 }
diff --git a/calendar/gui/e-cal-model.h b/calendar/gui/e-cal-model.h
index d98d81bbfc..cc8ea4d648 100644
--- a/calendar/gui/e-cal-model.h
+++ b/calendar/gui/e-cal-model.h
@@ -142,7 +142,7 @@ gboolean            e_cal_model_get_rgb_color_for_component    (ECalModel
 ECalModelComponent *e_cal_model_get_component_at               (ECalModel           *model,
 								gint                 row);
 ECalModelComponent *e_cal_model_get_component_for_uid          (ECalModel           *model,
-								const ECalComponentId *id);
+								const char          *uid);
 gchar              *e_cal_model_date_value_to_string           (ECalModel           *model,
 								const void          *value);
 ECalModelComponent *e_cal_model_copy_component_data            (ECalModelComponent  *comp_data);
diff --git a/calendar/gui/e-cal-popup.c b/calendar/gui/e-cal-popup.c
index eb542459a7..2ceeeb63ad 100644
--- a/calendar/gui/e-cal-popup.c
+++ b/calendar/gui/e-cal-popup.c
@@ -24,28 +24,16 @@
 #endif
 
 #include <string.h>
-#include <fcntl.h>
 #include <stdlib.h>
 
 #include <glib.h>
 
-#include <libgnomevfs/gnome-vfs-mime-handlers.h>
-#include <libgnomevfs/gnome-vfs-mime.h>
-
 #include "e-cal-popup.h"
 #include <libedataserverui/e-source-selector.h>
 
-#include <camel/camel-mime-part.h>
-#include <camel/camel-stream-fs.h>
-#include "e-util/e-util.h"
-#include "e-util/e-i18n.h"
-#include "e-util/e-mktemp.h"
-#include "e-util/e-dialog-utils.h"
-
 #include "gui/e-calendar-view.h"
 #include "gui/e-cal-model.h"
 #include "itip-utils.h"
-#include "e-attachment.h"
 
 static GObjectClass *ecalp_parent;
 
@@ -84,344 +72,11 @@ ecalp_target_free(EPopup *ep, EPopupTarget *t)
 	((EPopupClass *)ecalp_parent)->target_free(ep, t);
 }
 
-/* Standard menu code */
-
-static char *
-temp_save_part(CamelMimePart *part, char *path, gboolean file)
-{
-	const char *filename;
-	char *tmpdir, *mfilename = NULL;
-	CamelStream *stream;
-	CamelDataWrapper *wrapper;
-
-	if (!path) {
-		tmpdir = e_mkdtemp("evolution-tmp-XXXXXX");
-		if (tmpdir == NULL) {
-			return NULL;
-		}
-
-		filename = camel_mime_part_get_filename (part);
-		if (filename == NULL) {
-			/* This is the default filename used for temporary file creation */
-			filename = _("Unknown");
-		} else {
-			mfilename = g_strdup(filename);
-			e_filename_make_safe(mfilename);
-			filename = mfilename;
-		}
-
-		path = g_build_filename(tmpdir, filename, NULL);
-		g_free(tmpdir);
-		g_free(mfilename);
-	} else if (!file) {
-		tmpdir = path;
-		filename = camel_mime_part_get_filename (part);
-		if (filename == NULL) {
-			/* This is the default filename used for temporary file creation */
-			filename = _("Unknown");
-		} else {
-			mfilename = g_strdup(filename);
-			e_filename_make_safe(mfilename);
-			filename = mfilename;
-		}
-		
-		path = g_build_filename(tmpdir, filename, NULL);
-		g_free(mfilename);
-	}
-
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	stream = camel_stream_fs_new_with_name (path, O_RDWR|O_CREAT|O_TRUNC, 0600);
-
-	if (!stream) {
-		/* TODO handle error conditions */
-		g_message ("DEBUG: could not open the file to write\n");
-		return NULL;
-	}
-
-	if (camel_data_wrapper_decode_to_stream (wrapper, (CamelStream *) stream) == -1) {
-		camel_stream_close (stream);
-		camel_object_unref (stream);
-		g_message ("DEBUG: could not write to file\n");
-		return NULL;
-	}
-
-	camel_stream_close(stream);
-	camel_object_unref(stream);
-
-	return path;
-}
-
-static void
-ecalp_part_popup_saveas(EPopup *ep, EPopupItem *item, void *data)
-{
-	EPopupTarget *t = ep->target;
-	CamelMimePart *part = NULL;
-	char *file, *filename, *mfilename = NULL;
-
-	part = ((EAttachment *) ((ECalPopupTargetAttachments *) t)->attachments->data)->body;
-	filename = camel_mime_part_get_filename (part);
-	if (filename == NULL) {
-		/* This is the default filename used for temporary file creation */
-		filename = _("Unknown");
-	} else {
-		mfilename = g_strdup(filename);
-		e_filename_make_safe(mfilename);
-		filename = mfilename;
-	}	
-	file = e_file_dialog_save (_("Save As..."), filename);
-	
-	if (file)
-		temp_save_part (part, file, TRUE);
-		
-	g_free (file);
-	g_free (mfilename);
-}
-
-static void
-ecalp_part_popup_save_selected(EPopup *ep, EPopupItem *item, void *data)
-{
-	GSList *parts;
-	EPopupTarget *t = ep->target;
-	char *dir, *path;
-	
-	dir = e_file_dialog_save_folder (_("Select folder to save selected attachments..."));
-	parts = ((ECalPopupTargetAttachments *) t)->attachments;
-	
-	for (;parts; parts=parts->next) {
-		path = temp_save_part (((EAttachment *)parts->data)->body, dir, FALSE);
-		/* Probably we 'll do some reporting in next release, like listing the saved files and locations */
-		g_free (path);
-	}
-}
-
-static void
-ecalp_part_popup_set_background(EPopup *ep, EPopupItem *item, void *data)
-{
-	EPopupTarget *t = ep->target;
-	GConfClient *gconf;
-	char *str, *filename, *path, *extension;
-	unsigned int i=1;
-	CamelMimePart *part = NULL;
-
-	part = ((EAttachment *) ((ECalPopupTargetAttachments *) t)->attachments->data)->body;
-	
-	filename = g_strdup(camel_mime_part_get_filename(part));
-	   
-	/* if filename is blank, create a default filename based on MIME type */
-	if (!filename || !filename[0]) {
-		CamelContentType *ct;
-
-		ct = camel_mime_part_get_content_type(part);
-		g_free (filename);
-		filename = g_strdup_printf (_("untitled_image.%s"), ct->subtype);
-	}
-
-	e_filename_make_safe(filename);
-	
-	path = g_build_filename(g_get_home_dir(), ".gnome2", "wallpapers", filename, NULL);
-	
-	extension = strrchr(filename, '.');
-	if (extension)
-		*extension++ = 0;
-	
-	/* if file exists, stick a (number) on the end */
-	while (g_file_test(path, G_FILE_TEST_EXISTS)) {
-		char *name;
-		name = g_strdup_printf(extension?"%s (%d).%s":"%s (%d)", filename, i++, extension);
-		g_free(path);
-		path = g_build_filename(g_get_home_dir(), ".gnome2", "wallpapers", name, NULL);
-		g_free(name);
-	}
-	
-	g_free(filename);
-	
-	if (temp_save_part(part, path, TRUE)) {
-		gconf = gconf_client_get_default();
-		
-		/* if the filename hasn't changed, blank the filename before 
-		*  setting it so that gconf detects a change and updates it */
-		if ((str = gconf_client_get_string(gconf, "/desktop/gnome/background/picture_filename", NULL)) != NULL 
-		     && strcmp (str, path) == 0) {
-			gconf_client_set_string(gconf, "/desktop/gnome/background/picture_filename", "", NULL);
-		}
-		
-		g_free (str);
-		gconf_client_set_string(gconf, "/desktop/gnome/background/picture_filename", path, NULL);
-		
-		/* if GNOME currently doesn't display a picture, set to "wallpaper"
-		 * display mode, otherwise leave it alone */
-		if ((str = gconf_client_get_string(gconf, "/desktop/gnome/background/picture_options", NULL)) == NULL 
-		     || strcmp(str, "none") == 0) {
-			gconf_client_set_string(gconf, "/desktop/gnome/background/picture_options", "wallpaper", NULL);
-		}
-		
-		gconf_client_suggest_sync(gconf, NULL);
-		
-		g_free(str);
-		g_object_unref(gconf);
-	}
-	
-	g_free(path);
-}
-
-static const EPopupItem ecalp_standard_part_apps_bar = { E_POPUP_BAR, "99.object" };
-
-static ECalPopupItem ecalp_attachment_object_popups[] = {
-	{ E_POPUP_ITEM, "00.attach.00", N_("_Save As..."), ecalp_part_popup_saveas, NULL, "stock_save-as", E_CAL_POPUP_ATTACHMENTS_ONE },
-	{ E_POPUP_ITEM, "00.attach.10", N_("Set as _Background"), ecalp_part_popup_set_background, NULL, NULL, E_CAL_POPUP_ATTACHMENTS_IMAGE },
-	{ E_POPUP_ITEM, "00.attach.20", N_("_Save Selected"), ecalp_part_popup_save_selected, NULL, "stock_save-as", E_CAL_POPUP_ATTACHMENTS_MULTIPLE },
-	{ E_POPUP_BAR, "05.attach", },
-};
-
-static void
-ecalp_apps_open_in(EPopup *ep, EPopupItem *item, void *data)
-{
-	char *path;
-	EPopupTarget *target = ep->target;
-	CamelMimePart *part;
-
-	part = ((EAttachment *) ((ECalPopupTargetAttachments *) target)->attachments->data)->body;
-
-	path = temp_save_part(part, NULL, FALSE);
-	if (path) {
-		GnomeVFSMimeApplication *app = item->user_data;
-		char *uri;
-		GList *uris = NULL;
-		
-		uri = gnome_vfs_get_uri_from_local_path(path);
-		uris = g_list_append(uris, uri);
-
-		gnome_vfs_mime_application_launch(app, uris);
-
-		g_free(uri);
-		g_list_free(uris);
-		g_free(path);
-	}
-}
-
-static void
-ecalp_apps_popup_free(EPopup *ep, GSList *free_list, void *data)
-{
-	while (free_list) {
-		GSList *n = free_list->next;
-		EPopupItem *item = free_list->data;
-
-		g_free(item->path);
-		g_free(item->label);
-		g_free(item);
-		g_slist_free_1(free_list);
-
-		free_list = n;
-	}
-}
-
-static void
-ecalp_standard_items_free(EPopup *ep, GSList *items, void *data)
-{
-	g_slist_free(items);
-}
-
-static void 
-ecalp_standard_menu_factory (EPopup *ecalp, void *data)
-{
-	int i, len;
-	EPopupItem *items;
-	GSList *menus = NULL;
-	GList *apps = NULL;
-	char *mime_type = NULL;
-	const char *filename = NULL;
-
-	switch (ecalp->target->type) {
-	case E_CAL_POPUP_TARGET_ATTACHMENTS: {
-		ECalPopupTargetAttachments *t = (ECalPopupTargetAttachments *)ecalp->target;
-		GSList *list = t->attachments;
-		EAttachment *attachment;
-
-		items = ecalp_attachment_object_popups;
-		len = G_N_ELEMENTS(ecalp_attachment_object_popups);
-
-		if (g_slist_length(list) != 1 || !((EAttachment *)list->data)->is_available_local) {
-			break;
-		}
-
-		/* Only one attachment selected */
-		attachment = list->data;
-		mime_type = camel_data_wrapper_get_mime_type((CamelDataWrapper *)attachment->body);
-		filename = camel_mime_part_get_filename(attachment->body);
-
-
-		break; }		
-	default:
-		items = NULL;
-		len = 0;	
-	}
-
-	if (mime_type) {
-		apps = gnome_vfs_mime_get_all_applications(mime_type);
-		
-		if (apps == NULL && strcmp(mime_type, "application/octet-stream") == 0) {
-			const char *name_type;
-			
-			if (filename) {
-				/* GNOME-VFS will misidentify TNEF attachments as MPEG */
-				if (!strcmp (filename, "winmail.dat"))
-					name_type = "application/vnd.ms-tnef";
-				else
-					name_type = gnome_vfs_mime_type_from_name(filename);
-				if (name_type)
-					apps = gnome_vfs_mime_get_all_applications(name_type);
-			}
-		}
-		g_free (mime_type);
-
-		if (apps) {
-			GString *label = g_string_new("");
-			GSList *open_menus = NULL;
-			GList *l;
-
-			menus = g_slist_prepend(menus, (void *)&ecalp_standard_part_apps_bar);
-
-			for (l = apps, i = 0; l; l = l->next, i++) {
-				GnomeVFSMimeApplication *app = l->data;
-				EPopupItem *item;
-
-				if (app->requires_terminal)
-					continue;
-
-				item = g_malloc0(sizeof(*item));
-				item->type = E_POPUP_ITEM;
-				item->path = g_strdup_printf("99.object.%02d", i);
-				item->label = g_strdup_printf(_("Open in %s..."), app->name);
-				item->activate = ecalp_apps_open_in;
-				item->user_data = app;
-
-				open_menus = g_slist_prepend(open_menus, item);
-			}
-
-			if (open_menus)
-				e_popup_add_items(ecalp, open_menus, NULL, ecalp_apps_popup_free, NULL);
-
-			g_string_free(label, TRUE);
-			g_list_free(apps);
-		}
-	}
-
-	for (i=0;i<len;i++) {
-		if ((items[i].visible & ecalp->target->mask) == 0)
-			menus = g_slist_prepend(menus, &items[i]);
-	}
-
-	if (menus)
-		e_popup_add_items(ecalp, menus, NULL, ecalp_standard_items_free, NULL);
-}
-
 static void
 ecalp_class_init(GObjectClass *klass)
 {
 	klass->finalize = ecalp_finalise;
 	((EPopupClass *)klass)->target_free = ecalp_target_free;
-
-	e_popup_class_add_factory((EPopupClass *)klass, NULL, ecalp_standard_menu_factory, NULL);
 }
 
 GType
@@ -718,16 +373,8 @@ e_cal_popup_target_new_attachments(ECalPopup *ecp, CompEditor *editor, GSList *a
 	t->attachments = attachments;
 	if (len > 0)
 		mask &= ~ E_CAL_POPUP_ATTACHMENTS_MANY;
-
-	if (len == 1 && ((EAttachment *)attachments->data)->is_available_local) {
-		if (camel_content_type_is(((CamelDataWrapper *) ((EAttachment *) attachments->data)->body)->mime_type, "image", "*"))
-			mask &= ~ E_CAL_POPUP_ATTACHMENTS_IMAGE;
+	if (len == 1)
 		mask &= ~ E_CAL_POPUP_ATTACHMENTS_ONE;
-	}
-
-	if (len > 1)
-		mask &= ~ E_CAL_POPUP_ATTACHMENTS_MULTIPLE;
-	
 	t->target.mask = mask;
 
 	return t;
@@ -795,8 +442,6 @@ static const EPopupHookTargetMask ecalph_attachments_masks[] = {
 	{ "one", E_CAL_POPUP_ATTACHMENTS_ONE },
 	{ "many", E_CAL_POPUP_ATTACHMENTS_MANY },
 	{ "modify", E_CAL_POPUP_ATTACHMENTS_MODIFY },
-	{ "multiple", E_CAL_POPUP_ATTACHMENTS_MULTIPLE },
-	{ "image", E_CAL_POPUP_ATTACHMENTS_IMAGE },
 	{ 0 }
 };
 
diff --git a/calendar/gui/e-cal-popup.h b/calendar/gui/e-cal-popup.h
index 9f57e6766e..5dac5ea77e 100644
--- a/calendar/gui/e-cal-popup.h
+++ b/calendar/gui/e-cal-popup.h
@@ -113,9 +113,7 @@ enum _e_cal_popup_target_source_t {
 enum _e_cal_popup_target_attachments_t {
 	E_CAL_POPUP_ATTACHMENTS_ONE = 1<<0, /* only 1 selected */
 	E_CAL_POPUP_ATTACHMENTS_MANY = 1<<1, /* one or more selected */
-	E_CAL_POPUP_ATTACHMENTS_MODIFY = 1<<2, /* check for modify operation */
-	E_CAL_POPUP_ATTACHMENTS_MULTIPLE = 1<<3,
-	E_CAL_POPUP_ATTACHMENTS_IMAGE = 1<<4,
+	E_CAL_POPUP_ATTACHMENTS_MODIFY =1<<2, /* check for modify operation */
 };
 
 typedef struct _ECalPopupTargetSelect ECalPopupTargetSelect;
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index e970c035cd..d339ccaf8b 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -40,7 +40,6 @@
 #include <table/e-cell-text.h>
 #include <table/e-cell-combo.h>
 #include <e-util/e-dialog-utils.h>
-#include <e-util/e-util-private.h>
 #include <misc/e-cell-date-edit.h>
 #include <misc/e-cell-percent.h>
 
@@ -298,7 +297,6 @@ e_calendar_table_init (ECalendarTable *cal_table)
 	GdkPixbuf *pixbuf;
 	GList *strings;
 	AtkObject *a11y;
-	char *etspecfile;
 
 	/* Create the model */
 
@@ -495,15 +493,10 @@ e_calendar_table_init (ECalendarTable *cal_table)
 
 	/* Create the table */
 
-	etspecfile = g_build_filename (EVOLUTION_ETSPECDIR,
-				       "e-calendar-table.etspec",
-				       NULL);
 	table = e_table_scrolled_new_from_spec_file (E_TABLE_MODEL (cal_table->model),
 						     extras,
-						     etspecfile,
+						     EVOLUTION_ETSPECDIR "/e-calendar-table.etspec",
 						     NULL);
-	g_free (etspecfile);
-
 	/* FIXME: this causes a message from GLib about 'extras' having only a floating
 	   reference */
 	/* g_object_unref (extras); */
@@ -1029,7 +1022,7 @@ e_calendar_table_on_save_as (EPopup *ep, EPopupItem *pitem, void *data)
 	if (comp_data == NULL)
 		return;
 	
-	filename = e_file_dialog_save (_("Save as..."), NULL);
+	filename = e_file_dialog_save (_("Save as..."));
 	if (filename == NULL)
 		return;
 	
@@ -1303,21 +1296,14 @@ hide_completed_rows (ECalModel *model, GList *clients_list, char *hide_sexp, GPt
 
 		for (m = objects; m; m = m->next) {
 			ECalModelComponent *comp_data;
-			ECalComponentId *id;
-			ECalComponent *comp = e_cal_component_new ();
-
-			e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (m->data));
-			id = e_cal_component_get_id (comp);
 
-			if ((comp_data =  e_cal_model_get_component_for_uid (model, id))) {
+			if ((comp_data =  e_cal_model_get_component_for_uid (model, icalcomponent_get_uid (m->data)))) {
 				e_table_model_pre_change (E_TABLE_MODEL (model));
 				pos = get_position_in_array (comp_objects, comp_data);
 				e_table_model_row_deleted (E_TABLE_MODEL (model), pos);
 
 				g_ptr_array_remove (comp_objects, comp_data);
 			}
-			e_cal_component_free_id (id);
-			g_object_unref (comp);
 		}
 
 		g_list_foreach (objects, (GFunc) icalcomponent_free, NULL);
@@ -1342,13 +1328,8 @@ show_completed_rows (ECalModel *model, GList *clients_list, char *show_sexp, GPt
 
 		for (m = objects; m; m = m->next) {
 			ECalModelComponent *comp_data;
-			ECalComponentId *id;
-			ECalComponent *comp = e_cal_component_new ();
-
-			e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (m->data));
-			id = e_cal_component_get_id (comp);
 
-			if (!(e_cal_model_get_component_for_uid (model, id))) {
+			if (!(e_cal_model_get_component_for_uid (model, icalcomponent_get_uid (m->data)))) {
 				e_table_model_pre_change (E_TABLE_MODEL (model));
 				comp_data = g_new0 (ECalModelComponent, 1);
 				comp_data->client = client;
@@ -1361,8 +1342,6 @@ show_completed_rows (ECalModel *model, GList *clients_list, char *show_sexp, GPt
 				g_ptr_array_add (comp_objects, comp_data);
 				e_table_model_row_inserted (E_TABLE_MODEL (model), comp_objects->len - 1);
 			} 
-			e_cal_component_free_id (id);
-			g_object_unref (comp);
 		}
 	}
 }
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index e137fd079c..9ce770b2ce 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -31,12 +31,7 @@
 #include <gtk/gtkstock.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkbindings.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtkwindow.h>
 #include <libgnome/gnome-i18n.h>
-#include <libedataserver/e-time-utils.h>
 #include <e-util/e-dialog-utils.h>
 #include <e-util/e-icon-factory.h>
 #include "e-calendar-marshal.h"
@@ -64,7 +59,6 @@
 #include "goto.h"
 #include "ea-calendar.h"
 #include "e-cal-popup.h"
-#include "misc.h"
 
 /* Used for the status bar messages */
 #define EVOLUTION_CALENDAR_PROGRESS_IMAGE "stock_calendar"
@@ -869,10 +863,7 @@ delete_event (ECalendarView *cal_view, ECalendarViewEvent *event)
 	comp = e_cal_component_new ();
 	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
 	vtype = e_cal_component_get_vtype (comp);
-	
-	/*FIXME remove it once the we dont set the recurrence id for all the generated instances */	
-	if (!e_cal_get_static_capability (event->comp_data->client, CAL_STATIC_CAPABILITY_RECURRENCES_NO_MASTER))
-		e_cal_component_set_recurid (comp, NULL);
+	e_cal_component_set_recurid (comp, NULL);
 
 	if (delete_component_dialog (comp, FALSE, 1, vtype, GTK_WIDGET (cal_view))) {
 		const char *uid;
@@ -891,9 +882,8 @@ delete_event (ECalendarView *cal_view, ECalendarViewEvent *event)
 			return;
 		}
 
-		if (e_cal_util_component_is_instance (event->comp_data->icalcomp) || e_cal_util_component_has_recurrences (event->comp_data->icalcomp))
-			e_cal_remove_object_with_mod (event->comp_data->client, uid, 
-				e_cal_component_get_recurid_as_string (comp), CALOBJ_MOD_ALL, &error);
+		if (e_cal_util_component_is_instance (event->comp_data->icalcomp) || e_cal_util_component_is_instance (event->comp_data->icalcomp))
+			e_cal_remove_object_with_mod (event->comp_data->client, uid, NULL, CALOBJ_MOD_ALL, &error);
 		else
 			e_cal_remove_object (event->comp_data->client, uid, &error);
 		
@@ -1137,7 +1127,7 @@ on_save_as (EPopup *ep, EPopupItem *pitem, void *data)
 	if (!selected)
 		return;
 
-	filename = e_file_dialog_save (_("Save as..."), NULL);
+	filename = e_file_dialog_save (_("Save as..."));
 	if (filename == NULL)
 		return;
 	
@@ -1537,8 +1527,8 @@ on_paste (EPopup *ep, EPopupItem *pitem, void *data)
 static EPopupItem ecv_main_items [] = {
 	{ E_POPUP_ITEM, "00.new", N_("New _Appointment..."), on_new_appointment, NULL, "stock_new-appointment", 0, 0 },
 	{ E_POPUP_ITEM, "10.newallday", N_("New All Day _Event"), on_new_event, NULL, "stock_new-24h-appointment", 0, 0},
-	{ E_POPUP_ITEM, "20.meeting", N_("New _Meeting"), on_new_meeting, NULL, "stock_new-meeting", 0, 0},
-	{ E_POPUP_ITEM, "30.task", N_("New _Task"), on_new_task, NULL, "stock_task", 0, 0},
+	{ E_POPUP_ITEM, "20.meeting", N_("New Meeting"), on_new_meeting, NULL, "stock_new-meeting", 0, 0},
+	{ E_POPUP_ITEM, "30.task", N_("New Task"), on_new_task, NULL, "stock_task", 0, 0},
 
 	{ E_POPUP_BAR, "40."},
 	{ E_POPUP_ITEM, "40.print", N_("_Print..."), on_print, NULL, GTK_STOCK_PRINT, 0, 0 },
@@ -1548,9 +1538,9 @@ static EPopupItem ecv_main_items [] = {
 
 	{ E_POPUP_BAR, "60." },
 	/* FIXME: hook in this somehow */
-	{ E_POPUP_SUBMENU, "60.view", N_("_Current View") },
+	{ E_POPUP_SUBMENU, "60.view", N_("Current View") },
 	
-	{ E_POPUP_ITEM, "61.today", N_("Select T_oday"), on_goto_today, NULL, GTK_STOCK_HOME },
+	{ E_POPUP_ITEM, "61.today", N_("Select _Today"), on_goto_today, NULL, GTK_STOCK_HOME },
 	{ E_POPUP_ITEM, "62.todate", N_("_Select Date..."), on_goto_date, NULL, GTK_STOCK_JUMP_TO },
 
 	{ E_POPUP_BAR, "70." },
@@ -1873,165 +1863,3 @@ e_calendar_view_modify_and_send (ECalComponent *comp,
 		g_message (G_STRLOC ": Could not update the object!");
 	}
 }
-
-static gboolean
-tooltip_grab (GtkWidget *tooltip, GdkEventKey *event, ECalendarViewEvent *pevent)
-{
-	gdk_keyboard_ungrab(GDK_CURRENT_TIME);
-
-	gtk_widget_destroy (pevent->tooltip);
-	pevent->tooltip = NULL;
-	pevent->timeout = -1;
-
-	return FALSE;
-}
-
-static char *
-get_label (struct icaltimetype *tt)
-{
-        char buffer[1000];
-        struct tm tmp_tm;
-
-	tmp_tm = icaltimetype_to_tm (tt);
-        e_time_format_date_and_time (&tmp_tm,
-                                     calendar_config_get_24_hour_format (),
-                                     FALSE, FALSE,
-                                     buffer, 1000);
-
-        return g_strdup (buffer);
-}
-
-
-gboolean
-e_calendar_view_get_tooltips (ECalendarViewEvent *pevent)
-{
-	GtkWidget *label, *box, *hbox, *ebox, *frame;
-	const char *str;
-	char *tmp, *tmp1, *tmp2;
-	ECalComponentOrganizer organiser;	
-	ECalComponentDateTime dtstart, dtend;
-	icalcomponent *clone_comp;
-	time_t t_start, t_end;
-	
-	ECalComponent *newcomp = e_cal_component_new ();
-	icaltimezone *zone;
-	GdkColor color, outer_color;
-
-     	gdk_color_parse ("PeachPuff2", &color);		
-	gdk_color_parse ("antique white", &outer_color);
-
-	clone_comp = icalcomponent_new_clone (pevent->comp_data->icalcomp);
-	if (!e_cal_component_set_icalcomponent (newcomp, clone_comp))
-		g_warning ("couldn't update calendar component with modified data from backend\n");
-
-	box = gtk_vbox_new (FALSE, 0);
-
-	str = icalcomponent_get_summary (pevent->comp_data->icalcomp);
-	tmp = g_strdup_printf ("<b>%s</b>", str);
-	label = gtk_label_new (NULL);
-	gtk_label_set_line_wrap ((GtkLabel *)label, TRUE);
-	gtk_label_set_markup ((GtkLabel *)label, tmp);
-	
-	hbox = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start ((GtkBox *)hbox, label, FALSE, FALSE, 0);
-	ebox = gtk_event_box_new ();
-	gtk_container_add ((GtkContainer *)ebox, hbox);
-	gtk_widget_modify_bg (ebox, GTK_STATE_NORMAL, &color);
-	gtk_widget_modify_bg (ebox, GTK_STATE_ACTIVE, &color);
-	gtk_widget_modify_bg (ebox, GTK_STATE_SELECTED, &color);
-	gtk_widget_modify_bg (ebox, GTK_STATE_PRELIGHT, &color);
-	
-	gtk_box_pack_start ((GtkBox *)box, ebox, FALSE, FALSE, 0);
-	g_free (tmp);
-	
-	e_cal_component_get_organizer (newcomp, &organiser);
-	if (organiser.cn) {
-		char *ptr ; 
-		GtkWidget *hbox = gtk_hbox_new (FALSE, 0);
-		ptr = strchr(organiser.value, ':');
-		ptr++;
-		tmp = g_strdup_printf ("Organiser: %s <%s>", organiser.cn, ptr);
-		label = gtk_label_new (tmp);
-		gtk_box_pack_start ((GtkBox *)hbox, label, FALSE, FALSE, 0);
-		ebox = gtk_event_box_new ();
-		gtk_container_add ((GtkContainer *)ebox, hbox);
-		gtk_widget_modify_bg (ebox, GTK_STATE_NORMAL, &outer_color);
-		gtk_widget_modify_bg (ebox, GTK_STATE_ACTIVE, &outer_color);
-		gtk_widget_modify_bg (ebox, GTK_STATE_SELECTED, &outer_color);
-		gtk_widget_modify_bg (ebox, GTK_STATE_PRELIGHT, &outer_color);		
-		gtk_box_pack_start ((GtkBox *)box, ebox, FALSE, FALSE, 0);
-
-		g_free (tmp);
-	}
-	
-	e_cal_component_get_location (newcomp, &str);
-
-	if (str) {
-		tmp = g_strdup_printf ("Location: %s", str);
-		label = gtk_label_new (NULL);
-		gtk_label_set_markup ((GtkLabel *)label, tmp);
-		hbox = gtk_hbox_new (FALSE, 0);
-		gtk_box_pack_start ((GtkBox *)hbox, label, FALSE, FALSE, 0);
-		ebox = gtk_event_box_new ();
-		gtk_container_add ((GtkContainer *)ebox, hbox);
-		gtk_widget_modify_bg (ebox, GTK_STATE_NORMAL, &outer_color);
-		gtk_widget_modify_bg (ebox, GTK_STATE_ACTIVE, &outer_color);
-		gtk_widget_modify_bg (ebox, GTK_STATE_SELECTED, &outer_color);
-		gtk_widget_modify_bg (ebox, GTK_STATE_PRELIGHT, &outer_color);		
-		gtk_box_pack_start ((GtkBox *)box, ebox, FALSE, FALSE, 0);
-		g_free (tmp);
-	}
-	e_cal_component_get_dtstart (newcomp, &dtstart);
-	e_cal_component_get_dtend (newcomp, &dtend);
-			
-	if (dtstart.tzid) {
-		zone = icalcomponent_get_timezone (e_cal_component_get_icalcomponent (newcomp), dtstart.tzid);
-	} else {
-		zone = NULL;
-	}
-	t_start = icaltime_as_timet_with_zone (*dtstart.value, zone);
-		
-	if (dtend.tzid) {
-		zone = icalcomponent_get_timezone (e_cal_component_get_icalcomponent (newcomp), dtend.tzid);
-	} else {
-		zone = NULL;
-	}
-	t_end = icaltime_as_timet_with_zone (*dtend.value, zone);
-		
-	tmp1 = get_label(dtstart.value);
-	tmp = calculate_time (t_start, t_end);
-
-	tmp2 = g_strdup_printf("Time: %s %s", tmp1, tmp);
-	hbox = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start ((GtkBox *)hbox, gtk_label_new_with_mnemonic (tmp2), FALSE, FALSE, 0);
-	ebox = gtk_event_box_new ();
-	gtk_container_add ((GtkContainer *)ebox, hbox);
-	gtk_widget_modify_bg (ebox, GTK_STATE_NORMAL, &outer_color);
-	gtk_widget_modify_bg (ebox, GTK_STATE_ACTIVE, &outer_color);
-	gtk_widget_modify_bg (ebox, GTK_STATE_SELECTED, &outer_color);
-	gtk_widget_modify_bg (ebox, GTK_STATE_PRELIGHT, &outer_color);		
-	gtk_box_pack_start ((GtkBox *)box, ebox, FALSE, FALSE, 0);
-	
-	g_free (tmp);
-	g_free (tmp2);
-	g_free (tmp1);
-
-	pevent->tooltip = gtk_window_new (GTK_WINDOW_POPUP);
-	frame = gtk_frame_new (NULL);
-	gtk_frame_set_shadow_type ((GtkFrame *)frame, GTK_SHADOW_IN);
-	
-	gtk_window_move ((GtkWindow *)pevent->tooltip, pevent->x +16, pevent->y+16);
-	gtk_container_add ((GtkContainer *)frame, box);
-	gtk_container_add ((GtkContainer *)pevent->tooltip, frame);
-			
-	gtk_widget_show_all (pevent->tooltip);	
-	gdk_keyboard_grab (pevent->tooltip->window, FALSE, GDK_CURRENT_TIME);
-	g_signal_connect (pevent->tooltip, "key-press-event", G_CALLBACK (tooltip_grab), pevent);
-	pevent->timeout = -1;
-
-	g_object_unref (newcomp);
-	
-	return FALSE;
-}
-	
-
diff --git a/calendar/gui/e-calendar-view.h b/calendar/gui/e-calendar-view.h
index 8e2d67c477..17778e3a2b 100644
--- a/calendar/gui/e-calendar-view.h
+++ b/calendar/gui/e-calendar-view.h
@@ -66,11 +66,7 @@ typedef enum {
         time_t end; \
         guint16 start_minute; \
         guint16 end_minute; \
-        guint different_timezone : 1; \
-	GtkWidget *tooltip; \
-	gint	timeout; \
-	GdkColor *color; \
-	gint x,y; 
+        guint different_timezone : 1;
 
 typedef struct {
 	E_CALENDAR_VIEW_EVENT_FIELDS
@@ -158,7 +154,7 @@ void           e_calendar_view_modify_and_send (ECalComponent *comp,
 					       GtkWindow *toplevel,
 					       gboolean new);
 
-gboolean	e_calendar_view_get_tooltips (ECalendarViewEvent *pevent);
+
 G_END_DECLS
 
 #endif
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 1c655ad7f2..26637f333c 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -4005,7 +4005,7 @@ e_day_view_finish_resize (EDayView *day_view)
 	EDayViewEvent *event;
 	gint day, event_num;
 	ECalComponent *comp;
-	ECalComponentDateTime date;
+	ECalComponentDateTime prev_date, date;
 	struct icaltimetype itt;
 	time_t dt;
 	ECal *client;
@@ -4040,11 +4040,19 @@ e_day_view_finish_resize (EDayView *day_view)
 		dt = e_day_view_convert_grid_position_to_time (day_view, day, day_view->resize_start_row);
 		*date.value = icaltime_from_timet_with_zone (dt, FALSE,
 							     e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
+		e_cal_component_get_dtstart (comp, &prev_date);
+		date.value->year = prev_date.value->year;
+		date.value->month = prev_date.value->month;
+		date.value->day = prev_date.value->day;
 		e_cal_component_set_dtstart (comp, &date);
 	} else {
 		dt = e_day_view_convert_grid_position_to_time (day_view, day, day_view->resize_end_row + 1);
 		*date.value = icaltime_from_timet_with_zone (dt, FALSE,
 							     e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
+		e_cal_component_get_dtstart (comp, &prev_date);
+		date.value->year = prev_date.value->year;
+		date.value->month = prev_date.value->month;
+		date.value->day = prev_date.value->day;
 		e_cal_component_set_dtend (comp, &date);
 	}
 
@@ -4224,9 +4232,6 @@ e_day_view_add_event (ECalComponent *comp,
 	}
 
 	event.start = start;
-	event.tooltip = NULL;
-	event.color = NULL;
-	event.timeout = -1;
 	event.end = end;
 	event.canvas_item = NULL;
 	event.comp_data->instance_start = start;
@@ -4468,7 +4473,6 @@ e_day_view_reshape_long_event (EDayView *day_view,
 					       NULL);
 		g_signal_connect (event->canvas_item, "event",
 				  G_CALLBACK (e_day_view_on_text_item_event), day_view);
-		g_object_set_data ((GObject *)event->canvas_item, "event", (gpointer)event);
 		g_signal_emit_by_name (G_OBJECT(day_view),
 				       "event_added", event);
 
@@ -4650,7 +4654,6 @@ e_day_view_reshape_day_event (EDayView *day_view,
 						       NULL);
 			g_signal_connect (event->canvas_item, "event",
 					  G_CALLBACK (e_day_view_on_text_item_event), day_view);
-			g_object_set_data ((GObject *)event->canvas_item, "event", (gpointer)event);
 			g_signal_emit_by_name (G_OBJECT(day_view),
 					       "event_added", event);
 
@@ -5770,6 +5773,7 @@ cancel_editing (EDayView *day_view)
 	e_day_view_stop_editing_event (day_view);
 }
 
+
 static gboolean
 e_day_view_on_text_item_event (GnomeCanvasItem *item,
 			       GdkEvent *event,
@@ -5829,50 +5833,10 @@ e_day_view_on_text_item_event (GnomeCanvasItem *item,
 			e_day_view_on_editing_stopped (day_view, item);
 
 		return FALSE;
-	case GDK_ENTER_NOTIFY:
-		{
-			EDayViewEvent *pevent = (EDayViewEvent *)g_object_get_data ((GObject *)item, "event");
-			
-			pevent->x = ((GdkEventCrossing *)event)->x_root;
-			pevent->y = ((GdkEventCrossing *)event)->y_root;
-			pevent->tooltip = NULL;			
-			pevent->timeout = g_timeout_add (500, (GSourceFunc)e_calendar_view_get_tooltips, pevent);
-			
-		return TRUE;
-		}
-	case GDK_LEAVE_NOTIFY:
-		{
-			EDayViewEvent *pevent = (EDayViewEvent *)g_object_get_data ((GObject *)item, "event");
-			
-			if (pevent && pevent->tooltip) {
-				gtk_widget_destroy (pevent->tooltip);
-				pevent->tooltip = NULL;
-			}
-
-			if (pevent && pevent->timeout != -1) {
-				g_source_remove (pevent->timeout);
-				pevent->timeout = -1;
-			}
-			
-		return TRUE;
-		}
-	case GDK_MOTION_NOTIFY:
-		{
-			EDayViewEvent *pevent = (EDayViewEvent *)g_object_get_data ((GObject *)item, "event");
-			
-			pevent->x = ((GdkEventMotion *)event)->x_root;
-			pevent->y = ((GdkEventMotion *)event)->y_root;
-
-			if (pevent->tooltip) {
-				gtk_window_move ((GtkWindow *)pevent->tooltip, ((int)((GdkEventMotion *)event)->x_root)+16, ((int)((GdkEventMotion *)event)->y_root) +16);
-			}
-
-			return TRUE;
-		}
 	default:
 		break;
 	}
-	
+
 	return FALSE;
 }
 
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 99c42a25cb..f2415aaf33 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -48,7 +48,7 @@
 #include <libecal/e-cal-component.h>
 #include <libecal/e-cal-time-util.h>
 #include <libecal/e-cal.h>
-#include <libedataserver/e-time-utils.h>
+#include <e-util/e-time-utils.h>
 #include <e-util/e-dialog-widgets.h>
 #include <e-util/e-html-utils.h>
 #include "dialogs/delete-error.h"
@@ -149,6 +149,7 @@ cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 	EItipControlPrivate *priv;
 	ESource *source;
 	ECalSourceType source_type;
+	icaltimezone *zone;
 
 	priv = itip->priv;
 
@@ -163,6 +164,9 @@ cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 		return;
 	}
 
+	zone = calendar_config_get_icaltimezone ();
+	e_cal_set_default_timezone (ecal, zone, NULL);
+
 	priv->current_ecal = ecal;
 	set_ok_sens (itip);
 }
@@ -174,7 +178,6 @@ start_calendar_server (EItipControl *itip, ESource *source, ECalSourceType type,
 {
 	EItipControlPrivate *priv;
 	ECal *ecal;
-	icaltimezone *zone;
 
 	priv = itip->priv;
 	
@@ -186,10 +189,6 @@ start_calendar_server (EItipControl *itip, ESource *source, ECalSourceType type,
 	}
 	
 	ecal = auth_new_cal_from_source (source, type);
-	
-	zone = calendar_config_get_icaltimezone ();
-	e_cal_set_default_timezone (ecal, zone, NULL);
-	
 	g_signal_connect (G_OBJECT (ecal), "cal_opened", G_CALLBACK (func), data);
 
 	g_hash_table_insert (priv->ecals[type], g_strdup (e_source_peek_uid (source)), ecal);
@@ -247,6 +246,7 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 	ESource *source;
 	ECalSourceType source_type;
 	icalcomponent *icalcomp;
+	icaltimezone *zone;
 
 	source_type = e_cal_get_source_type (ecal);
 	source = e_cal_get_source (ecal);
@@ -270,6 +270,9 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 		set_ok_sens (fd->itip);
 	}
 
+	zone = calendar_config_get_icaltimezone ();
+	e_cal_set_default_timezone (ecal, zone, NULL);
+
  cleanup:
 	if (fd->count == 0) {
 		if (fd->show_selector && !priv->current_ecal && priv->vbox) {
@@ -639,7 +642,7 @@ find_attendee (icalcomponent *ical_comp, const char *address)
 
 		text = g_strdup (itip_strip_mailto (attendee));
 		text = g_strstrip (text);
-		if (!g_ascii_strcasecmp (address, text)) {
+		if (!g_strcasecmp (address, text)) {
 			g_free (text);
 			break;
 		}
@@ -2499,7 +2502,7 @@ ok_clicked_cb (GtkWidget *widget, gpointer data)
 			
 			text = g_strdup (itip_strip_mailto (attendee));
 			text = g_strstrip (text);
-			if (g_ascii_strcasecmp (priv->my_address, text))
+			if (g_strcasecmp (priv->my_address, text))
 				list = g_slist_prepend (list, prop);
 			g_free (text);
 		}
diff --git a/calendar/gui/e-pub-utils.c b/calendar/gui/e-pub-utils.c
index ab39e13d81..c72500c7ed 100644
--- a/calendar/gui/e-pub-utils.c
+++ b/calendar/gui/e-pub-utils.c
@@ -248,7 +248,6 @@ e_pub_publish (gboolean publish) {
 	
 				source_uid = g_strdup (p->data);
 				source =  e_source_list_peek_source_by_uid (source_list, source_uid);
-
 				if (source)
 					client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_EVENT);
 
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
index 864b607a0e..bf281e83d3 100644
--- a/calendar/gui/e-tasks.c
+++ b/calendar/gui/e-tasks.c
@@ -28,7 +28,6 @@
 
 #include <gnome.h>
 #include <libgnomevfs/gnome-vfs-ops.h>
-#include <libedataserver/e-time-utils.h>
 #include <table/e-table-scrolled.h>
 #include <widgets/menus/gal-view-instance.h>
 #include <widgets/menus/gal-view-factory-etable.h>
@@ -37,7 +36,7 @@
 #include "e-util/e-error.h"
 #include "e-util/e-categories-config.h"
 #include "e-util/e-config-listener.h"
-#include "e-util/e-util-private.h"
+#include "e-util/e-time-utils.h"
 #include "shell/e-user-creatable-items-handler.h"
 #include <libedataserver/e-url.h>
 #include <libedataserver/e-categories.h>
@@ -259,11 +258,13 @@ set_timezone (ETasks *tasks)
 	zone = calendar_config_get_icaltimezone ();
 	for (l = priv->clients_list; l != NULL; l = l->next) {
 		ECal *client = l->data;
-		/* FIXME Error checking */
-		e_cal_set_default_timezone (client, zone, NULL);
+
+		if (e_cal_get_load_state (client) == E_CAL_LOAD_LOADED)
+			/* FIXME Error checking */
+			e_cal_set_default_timezone (client, zone, NULL);
 	}
 
-	if (priv->default_client) 
+	if (priv->default_client && e_cal_get_load_state (priv->default_client) == E_CAL_LOAD_LOADED)
 		/* FIXME Error checking */
 		e_cal_set_default_timezone (priv->default_client, zone, NULL);
 
@@ -517,7 +518,6 @@ setup_widgets (ETasks *tasks)
 	ETasksPrivate *priv;
 	ETable *etable;
 	ECalModel *model;
-	gboolean state;
 
 	priv = tasks->priv;
 
@@ -586,10 +586,7 @@ setup_widgets (ETasks *tasks)
 	priv->preview = e_cal_component_preview_new ();
 	e_cal_component_preview_set_default_timezone (E_CAL_COMPONENT_PREVIEW (priv->preview), calendar_config_get_icaltimezone ());	
 	gtk_paned_add2 (GTK_PANED (priv->paned), priv->preview);
-	state = calendar_config_get_preview_state ();
-
-	if (state)
-		gtk_widget_show (priv->preview);
+	gtk_widget_show (priv->preview);
 
 	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->tasks_view));
 	g_signal_connect (G_OBJECT (model), "model_row_changed",
@@ -872,6 +869,7 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, ETasks *tasks)
 		model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->tasks_view));
 		e_cal_model_add_client (model, ecal);
 
+		set_timezone (tasks);
 		set_status_message (tasks, NULL);
 		break;
 	case E_CALENDAR_STATUS_BUSY :
@@ -914,6 +912,7 @@ default_client_cal_opened_cb (ECal *ecal, ECalendarStatus status, ETasks *tasks)
 		g_signal_handlers_disconnect_matched (ecal, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, default_client_cal_opened_cb, NULL);
 		model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->tasks_view));
 		
+		set_timezone (tasks);
 		e_cal_model_set_default_client (model, ecal);
 		set_status_message (tasks, NULL);
 		break;
@@ -947,14 +946,9 @@ static gboolean
 open_ecal (ETasks *tasks, ECal *cal, gboolean only_if_exists, open_func of)
 {
 	ETasksPrivate *priv;
-	icaltimezone *zone;
 
 	priv = tasks->priv;
 	
-	zone = calendar_config_get_icaltimezone ();
-	e_cal_set_default_timezone (priv->default_client, zone, NULL);
-
-	
 	set_status_message (tasks, _("Opening tasks at %s"), e_cal_get_uri (cal));
 
 	g_signal_connect (G_OBJECT (cal), "cal_opened", G_CALLBACK (of), tasks);
@@ -1005,52 +999,6 @@ e_tasks_new_task			(ETasks		*tasks)
 	comp_editor_focus (COMP_EDITOR (tedit));
 }
 
-void
-e_tasks_show_preview (ETasks *tasks, gboolean state)
-{
-	ETasksPrivate *priv;
-
-	g_return_if_fail (tasks != NULL);
-	g_return_if_fail (E_IS_TASKS (tasks));
-	priv = tasks->priv;
-
-	if (state) {
-		ECalModel *model;
-		ECalModelComponent *comp_data;
-		ECalComponent *comp;
-		ETable *etable;
-		const char *uid;
-		int n_selected;
-		
-		etable = e_table_scrolled_get_table (E_TABLE_SCROLLED (E_CALENDAR_TABLE (priv->tasks_view)->etable));
-		n_selected = e_table_selected_count (etable);
-		
-		if (n_selected != 1) {
-			e_cal_component_preview_clear (E_CAL_COMPONENT_PREVIEW (priv->preview));
-		} else {
-			model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->tasks_view));
-			
-			comp_data = e_cal_model_get_component_at (model, e_table_get_cursor_row (etable));
-			comp = e_cal_component_new ();
-			e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (comp_data->icalcomp));
-		
-			e_cal_component_preview_display (E_CAL_COMPONENT_PREVIEW (priv->preview), comp_data->client, comp);
-			
-			e_cal_component_get_uid (comp, &uid);
-			if (priv->current_uid)
-				g_free (priv->current_uid);
-			priv->current_uid = g_strdup (uid);
-			
-			g_object_unref (comp);
-		}
-		gtk_widget_show (priv->preview);
-
-	} else	{
-		e_cal_component_preview_clear (E_CAL_COMPONENT_PREVIEW (priv->preview));		
-		gtk_widget_hide (priv->preview);
-	}
-}
-
 gboolean
 e_tasks_add_todo_source (ETasks *tasks, ESource *source)
 {
@@ -1311,7 +1259,7 @@ e_tasks_setup_view_menus (ETasks *tasks, BonoboUIComponent *uic)
 	ETasksPrivate *priv;
 	GalViewFactory *factory;
 	ETableSpecification *spec;
-	char *dir0, *dir1, *filename;
+	char *dir;
 	static GalViewCollection *collection = NULL;
 
 	g_return_if_fail (tasks != NULL);
@@ -1333,25 +1281,18 @@ e_tasks_setup_view_menus (ETasks *tasks, BonoboUIComponent *uic)
 
 		gal_view_collection_set_title (collection, _("Tasks"));
 
-		dir0 = g_build_filename (EVOLUTION_GALVIEWSDIR,
-					 "tasks",
-					 NULL);
-		dir1 = g_build_filename (tasks_component_peek_base_directory (tasks_component_peek ()), 
-					 "tasks", "views", NULL);
+		dir = g_build_filename (tasks_component_peek_base_directory (tasks_component_peek ()), 
+					"tasks", "views", NULL);		
 		gal_view_collection_set_storage_directories (collection,
-							     dir0,
-							     dir1);
-		g_free (dir1);
-		g_free (dir0);
+							     EVOLUTION_GALVIEWSDIR "/tasks/",
+							     dir);
+		g_free (dir);
 
 		/* Create the views */
 
 		spec = e_table_specification_new ();
-		filename = g_build_filename (EVOLUTION_ETSPECDIR,
-					     "e-calendar-table.etspec",
-					     NULL);
-		e_table_specification_load_from_file (spec, filename);
-		g_free (filename);
+		e_table_specification_load_from_file (spec, 
+						      EVOLUTION_ETSPECDIR "/e-calendar-table.etspec");
 
 		factory = gal_view_factory_etable_new (spec);
 		g_object_unref (spec);
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index d6a0aba123..a3cd52bba3 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -2391,9 +2391,6 @@ e_week_view_add_event (ECalComponent *comp,
 	}
 	event.start = start;
 	event.end = end;
-	event.tooltip = NULL;
-	event.timeout = -1;
-	event.color = NULL;
 	event.spans_index = 0;
 	event.num_spans = 0;
 	event.comp_data->instance_start = start;
@@ -2550,50 +2547,6 @@ e_week_view_reshape_events (EWeekView *week_view)
 }
 
 
-static gboolean
-tooltip_event_cb (GnomeCanvasItem *item,
-   	          GdkEvent *event,
-		  EWeekView *view)
-{
-	EWeekViewEvent *pevent = g_object_get_data ((GObject *)item, "event");
-	
-	switch (event->type) {
-		case GDK_ENTER_NOTIFY:
-			
-			pevent->x = ((GdkEventCrossing *)event)->x_root;
-			pevent->y = ((GdkEventCrossing *)event)->y_root;
-			pevent->tooltip = NULL;			
-			pevent->timeout = g_timeout_add (500, (GSourceFunc)e_calendar_view_get_tooltips, pevent);
-			
-			return TRUE;
-		
-		case GDK_LEAVE_NOTIFY:
-			if (pevent && pevent->tooltip) {
-				gtk_widget_destroy (pevent->tooltip);
-				pevent->tooltip = NULL;
-			}
-
-			if (pevent && pevent->timeout != -1) {
-				g_source_remove (pevent->timeout);
-				pevent->timeout = -1;
-			}
-			return TRUE;
-		case GDK_MOTION_NOTIFY:
-			pevent->x = ((GdkEventMotion *)event)->x_root;
-			pevent->y = ((GdkEventMotion *)event)->y_root;
-
-			if (pevent->tooltip) {
-				gtk_window_move ((GtkWindow *)pevent->tooltip, ((int)((GdkEventMotion *)event)->x_root)+16, ((int)((GdkEventMotion *)event)->y_root) +16);
-			}
-
-			return TRUE;
-		default:
-			return FALSE;
-	}
-
-	return FALSE;
-}
-
 static void
 e_week_view_reshape_event_span (EWeekView *week_view,
 				gint event_num,
@@ -2687,12 +2640,7 @@ e_week_view_reshape_event_span (EWeekView *week_view,
 					       e_week_view_event_item_get_type (),
 					       NULL);
 	}
-	
-	g_object_set_data ((GObject *)span->background_item, "event", event);
-	g_signal_connect (span->background_item, "event",
-			  G_CALLBACK (tooltip_event_cb),
-			  week_view);
-	
+
 	gnome_canvas_item_set (span->background_item,
 			       "event_num", event_num,
 			       "span_num", span_num,
@@ -2723,7 +2671,7 @@ e_week_view_reshape_event_span (EWeekView *week_view,
 				&& e_cal_util_component_has_attendee (event->comp_data->icalcomp)) {
 			set_text_as_bold (event, span);
 		} */
-		g_object_set_data ((GObject *)span->text_item, "event", event);		
+
 		g_signal_connect (span->text_item, "event",
 				  G_CALLBACK (e_week_view_on_text_item_event),
 				  week_view);
@@ -2992,12 +2940,11 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item,
 {
 	EWeekViewEvent *event;
 	gint event_num, span_num;
-	EWeekViewEvent *pevent = g_object_get_data ((GObject *)item, "event");
-	
+
 #if 0
 	g_print ("In e_week_view_on_text_item_event\n");
 #endif
-	
+
 	switch (gdkevent->type) {
 	case GDK_KEY_PRESS:
 		if (gdkevent && gdkevent->key.keyval == GDK_Return) {
@@ -3108,35 +3055,6 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item,
 		}
 		week_view->pressed_event_num = -1;
 		break;
-		case GDK_ENTER_NOTIFY:
-			
-			pevent->x = ((GdkEventCrossing *)gdkevent)->x_root;
-			pevent->y = ((GdkEventCrossing *)gdkevent)->y_root;
-			pevent->tooltip = NULL;
-			pevent->timeout = g_timeout_add (500, (GSourceFunc)e_calendar_view_get_tooltips, pevent);
-			
-			return TRUE;
-		
-		case GDK_LEAVE_NOTIFY:
-			if (pevent && pevent->tooltip) {
-				gtk_widget_destroy (pevent->tooltip);
-				pevent->tooltip = NULL;
-			}
-
-			if (pevent && pevent->timeout != -1) {
-				g_source_remove (pevent->timeout);
-				pevent->timeout = -1;
-			}
-			return TRUE;
-		case GDK_MOTION_NOTIFY:
-			pevent->x = ((GdkEventMotion *)gdkevent)->x_root;
-			pevent->y = ((GdkEventMotion *)gdkevent)->y_root;
-
-			if (pevent->tooltip) {
-				gtk_window_move ((GtkWindow *)pevent->tooltip, ((int)((GdkEventMotion *)gdkevent)->x_root)+16, ((int)((GdkEventMotion *)gdkevent)->y_root) +16);
-			}
-
-			return TRUE;		
 	case GDK_FOCUS_CHANGE:
 		if (gdkevent->focus_change.in) {
 			e_week_view_on_editing_started (week_view, item);
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index d3b2ac5014..c8f51ee9d6 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -51,7 +51,6 @@
 #include <widgets/menus/gal-define-views-dialog.h>
 #include "widgets/menus/gal-view-menus.h"
 #include "e-util/e-error.h"
-#include "e-util/e-util-private.h"
 #include "e-comp-editor-registry.h"
 #include "dialogs/delete-error.h"
 #include "dialogs/event-editor.h"
@@ -518,7 +517,7 @@ dn_e_cal_view_objects_modified_cb (ECalView *query, GList *objects, gpointer dat
 
 /* Callback used when the calendar query reports of a removed object */
 static void
-dn_e_cal_view_objects_removed_cb (ECalView *query, GList *ids, gpointer data)
+dn_e_cal_view_objects_removed_cb (ECalView *query, GList *uids, gpointer data)
 {
 	GnomeCalendar *gcal;
 
@@ -2093,7 +2092,7 @@ void
 gnome_calendar_setup_view_menus (GnomeCalendar *gcal, BonoboUIComponent *uic)
 {
 	GnomeCalendarPrivate *priv;
-	char *path0, *path1, *etspecfile;
+	char *path;
 	CalendarViewFactory *factory;
 	GalViewFactory *gal_factory;
 	static GalViewCollection *collection = NULL;
@@ -2116,16 +2115,12 @@ gnome_calendar_setup_view_menus (GnomeCalendar *gcal, BonoboUIComponent *uic)
 
 		gal_view_collection_set_title (collection, _("Calendar"));
 
-		path0 = g_build_filename (EVOLUTION_GALVIEWSDIR,
-					  "calendar",
-					  NULL);
-		path1 = g_build_filename (calendar_component_peek_base_directory (calendar_component_peek ()), 
+		path = g_build_filename (calendar_component_peek_base_directory (calendar_component_peek ()), 
 					 "calendar", "views", NULL);
 		gal_view_collection_set_storage_directories (collection,
-							     path0,
-							     path1);
-		g_free (path1);
-		g_free (path0);
+							     EVOLUTION_GALVIEWSDIR "/calendar/",
+							     path);
+		g_free (path);
 
 		/* Create the views */
 
@@ -2146,11 +2141,7 @@ gnome_calendar_setup_view_menus (GnomeCalendar *gcal, BonoboUIComponent *uic)
 		g_object_unref (factory);
 
 		spec = e_table_specification_new ();
-		etspecfile = g_build_filename (EVOLUTION_ETSPECDIR,
-					       "e-cal-list-view.etspec",
-					       NULL);
-		e_table_specification_load_from_file (spec, etspecfile);
-		g_free (etspecfile);
+		e_table_specification_load_from_file (spec, EVOLUTION_ETSPECDIR "/e-cal-list-view.etspec");
 		gal_factory = gal_view_factory_etable_new (spec);
 		g_object_unref (spec);
 		gal_view_collection_add_factory (collection, GAL_VIEW_FACTORY (gal_factory));
@@ -2237,13 +2228,13 @@ gc_define_views(EPopup *ep, EPopupItem *pitem, void *data)
 static EPopupItem gc_popups[] = {
 	/* Code generates the path to fit */
 	{ E_POPUP_BAR, NULL },
-	{ E_POPUP_RADIO|E_POPUP_ACTIVE, NULL, N_("_Custom View"), },
-	{ E_POPUP_ITEM, NULL, N_("_Save Custom View"), gc_save_custom_view },
+	{ E_POPUP_RADIO|E_POPUP_ACTIVE, NULL, N_("Custom View"), },
+	{ E_POPUP_ITEM, NULL, N_("Save Custom View"), gc_save_custom_view },
 
 	/* index == 3, when we have non-custom view */
 
 	{ E_POPUP_BAR, NULL },
-	{ E_POPUP_ITEM, NULL, N_("_Define Views..."), gc_define_views },
+	{ E_POPUP_ITEM, NULL, N_("Define Views..."), gc_define_views },
 };
 
 static void
@@ -2402,6 +2393,7 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
 
 	g_signal_handlers_disconnect_matched (ecal, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, client_cal_opened_cb, NULL);
 
+	e_cal_set_default_timezone (ecal, priv->zone, NULL);
 
 	switch (source_type) {
 	case E_CAL_SOURCE_TYPE_EVENT :
@@ -2495,6 +2487,7 @@ default_client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar
 
 	g_signal_handlers_disconnect_matched (ecal, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, default_client_cal_opened_cb, NULL);
 
+	e_cal_set_default_timezone (ecal, priv->zone, NULL);
 	
 	switch (source_type) {
 	case E_CAL_SOURCE_TYPE_EVENT:
@@ -2521,13 +2514,9 @@ open_ecal (GnomeCalendar *gcal, ECal *cal, gboolean only_if_exists, open_func of
 {
 	GnomeCalendarPrivate *priv;
 	char *msg;
-	icaltimezone *zone;
 
 	priv = gcal->priv;
 
-	zone = calendar_config_get_icaltimezone ();
-	e_cal_set_default_timezone (cal, zone, NULL);
-	
 	msg = g_strdup_printf (_("Opening %s"), e_cal_get_uri (cal));
 	switch (e_cal_get_source_type (cal)) {
 	case E_CAL_SOURCE_TYPE_EVENT :
@@ -2896,7 +2885,6 @@ gnome_calendar_set_default_source (GnomeCalendar *gcal, ECalSourceType source_ty
 		if (!priv->default_client[source_type])
 			return FALSE;
 	}
-	
 
 	open_ecal (gcal, priv->default_client[source_type], FALSE, default_client_cal_opened_cb);
 
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index a3c32e4878..b38f0abe12 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -28,12 +28,12 @@
 #include <bonobo/bonobo-object.h>
 #include <bonobo/bonobo-moniker-util.h>
 #include <libgnome/gnome-i18n.h>
-#include <libedataserver/e-time-utils.h>
 #include <gtk/gtkmessagedialog.h>
 #include <gtk/gtkwidget.h>
 #include <libical/ical.h>
 #include <Evolution-Composer.h>
 #include <e-util/e-dialog-utils.h>
+#include <e-util/e-time-utils.h>
 #include <libecal/e-cal-time-util.h>
 #include <libecal/e-cal-util.h>
 #include <libsoup/soup-session-async.h>
@@ -104,7 +104,7 @@ itip_organizer_is_user (ECalComponent *comp, ECal *client)
  		if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_ORGANIZER_NOT_EMAIL_ADDRESS)) { 
  			char *email = NULL;
  			
-  			if (e_cal_get_cal_address (client, &email, NULL) && !g_ascii_strcasecmp (email, strip)) {
+  			if (e_cal_get_cal_address (client, &email, NULL) && !g_strcasecmp (email, strip)) {
 				g_free (email);
 				
  				return TRUE;
@@ -205,8 +205,10 @@ itip_get_comp_attendee (ECalComponent *comp, ECal *client)
 	/* We could not find the attendee in the component, so just give the default
 	account address if the email address is not set in the backend */
 	/* FIXME do we have a better way ? */
-	a = itip_addresses_get_default ();
-	address = g_strdup (a->id->address);
+	if (!(address && *address)) {
+		a = itip_addresses_get_default ();
+		address = g_strdup (a->id->address);
+	}
 	
 	e_cal_component_free_attendee_list (attendees);
 	return address;
@@ -218,7 +220,7 @@ itip_strip_mailto (const gchar *address)
 	if (address == NULL)
 		return NULL;
 	
-	if (!g_ascii_strncasecmp (address, "mailto:", 7))
+	if (!g_strncasecmp (address, "mailto:", 7))
 		address += 7;
 
 	return address;
@@ -315,7 +317,7 @@ users_has_attendee (GList *users, const char *address)
 	GList *l;
 
 	for (l = users; l != NULL; l = l->next) {
-		if (!g_ascii_strcasecmp (address, l->data))
+		if (!g_strcasecmp (address, l->data))
 			return TRUE;
 	}
 
@@ -407,9 +409,9 @@ comp_to_list (ECalComponentItipMethod method, ECalComponent *comp, GList *users)
 
 			if (users_has_attendee (users, att->value))
 				continue;
-			else if (!g_ascii_strcasecmp (att->value, organizer.value))
+			else if (!g_strcasecmp (att->value, organizer.value))
 				continue;
-			else if (!g_ascii_strcasecmp (itip_strip_mailto (att->value), sender))
+			else if (!g_strcasecmp (itip_strip_mailto (att->value), sender))
 				continue;
 			else if (att->status == ICAL_PARTSTAT_DELEGATED && (att->delto && *att->delto)
 					&& !(att->rsvp) && method == E_CAL_COMPONENT_METHOD_REQUEST)
@@ -463,7 +465,7 @@ comp_to_list (ECalComponentItipMethod method, ECalComponent *comp, GList *users)
 		for (l = attendees; l != NULL; l = l->next) {
 			ECalComponentAttendee *att = l->data;
 
-			if (!g_ascii_strcasecmp (itip_strip_mailto (att->value), sender)){
+			if (!g_strcasecmp (itip_strip_mailto (att->value), sender)){
 
 				if (!(att->delfrom && *att->delfrom))
 					break;
diff --git a/calendar/gui/misc.c b/calendar/gui/misc.c
index 5ab2739525..026cd8417e 100644
--- a/calendar/gui/misc.c
+++ b/calendar/gui/misc.c
@@ -24,10 +24,7 @@
 #endif
 
 #include <ctype.h>
-#include <time.h>
 #include <libedataserver/e-url.h>
-#include "e-util/e-i18n.h"
-
 #include "misc.h"
 
 
@@ -94,52 +91,3 @@ get_position_in_array (GPtrArray *objects, gpointer item)
 
 	return -1;
 }
-
-char *
-calculate_time (time_t start, time_t end)
-{
-	time_t difference = end - start;
-	char *str;
-	
-	if (difference < 60) {/* Can't be zero */ 
-		str = g_strdup_printf (_("(%d seconds)"), difference);
-	} else if (difference > 60 && difference < 3600) { /* It will be x minutes y seconds*/
-		int minutes, seconds;
-		minutes = difference / 60;
-		seconds = difference % 60;
-		if (seconds)
-			str = g_strdup_printf (_("(%d %s %d %s)"), minutes, ngettext(_("minute"), _("minutes"), minutes), seconds, ngettext(_("second"), _("seconds"), seconds));
-		else 
-			str = g_strdup_printf (_("(%d %s)"), minutes, ngettext(_("minute"), _("minutes"), minutes));
-	} else {
-		guint hours, minutes, seconds;
-		char *s_hours = NULL, *s_minutes = NULL, *s_seconds = NULL;
-		
-		hours = difference / 3600;
-		minutes = (difference % 3600)/60;
-		seconds = difference % 60;
-
-
-		if (seconds)
-			s_seconds = g_strdup_printf (ngettext(_(" %u second"), _(" %u seconds"), seconds), seconds);	
-		if (minutes)
-			s_minutes = g_strdup_printf (ngettext(_(" %u minute"), _(" %u minutes"), minutes), minutes);
-		if (hours)
-			s_hours = g_strdup_printf (ngettext(_("%u hour"),_("%u hours"), hours), hours);
-
-		if (s_minutes && s_seconds)
-			str = g_strconcat ("(", s_hours, s_minutes, s_seconds, ")", NULL);
-		else if (s_minutes)
-			str = g_strconcat ("(", s_hours, s_minutes, ")", NULL);
-		else if (s_seconds)
-			str = g_strconcat ("(", s_hours, s_seconds, ")", NULL);
-		else 
-			str = g_strconcat ("(", s_hours, ")", NULL);
-
-		g_free (s_hours);
-		g_free (s_minutes);
-		g_free (s_seconds);
-	}
-
-	return g_strchug(str);
-}
diff --git a/calendar/gui/misc.h b/calendar/gui/misc.h
index c48dbaffa1..7f89788f2c 100644
--- a/calendar/gui/misc.h
+++ b/calendar/gui/misc.h
@@ -23,10 +23,9 @@
 #define MISC_H
 
 #include <glib.h>
-#include <time.h>
 
 gboolean string_is_empty (const char *value);
 char    *get_uri_without_password (const char *uri);
 gint get_position_in_array (GPtrArray *objects, gpointer item);
-char * calculate_time (time_t start, time_t end);
+
 #endif
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index 91f7480a6d..717c9d2110 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -44,9 +44,9 @@
 #include <libgnomeprintui/gnome-print-paper-selector.h>
 #include <libgnomeprintui/gnome-print-preview.h>
 #include <libgnomeprintui/gnome-print-dialog.h>
-#include <libedataserver/e-time-utils.h>
 #include <e-util/e-util.h>
 #include <e-util/e-dialog-widgets.h>
+#include <e-util/e-time-utils.h>
 #include <e-util/e-print.h>
 #include <libecal/e-cal-time-util.h>
 #include "calendar-commands.h"
@@ -2302,13 +2302,11 @@ print_comp_item (GnomePrintContext *pc, ECalComponent *comp, ECal *client,
 
 	vtype = e_cal_component_get_vtype (comp);
 
-	/* We should only be asked to print VEVENTs, VTODOs, or VJOURNALs. */
+	/* We should only be asked to print VEVENTs or VTODOs. */
 	if (vtype == E_CAL_COMPONENT_EVENT)
 		title = _("Appointment");
 	else if (vtype == E_CAL_COMPONENT_TODO)
 		title = _("Task");
-	else if (vtype == E_CAL_COMPONENT_JOURNAL)
-		title = _("Memo");
 	else
 		return;
 
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index 83e3daea93..cecab0726d 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -139,7 +139,7 @@ ensure_sources (TasksComponent *component)
 				     "tasks", "local",
 				     NULL);
 
-	base_uri_proto = g_filename_to_uri (base_uri, NULL, NULL);
+	base_uri_proto = g_strconcat ("file://", base_uri, NULL);
 
 	groups = e_source_list_peek_groups (source_list);
 	if (groups) {
@@ -436,10 +436,10 @@ edit_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static EPopupItem etc_source_popups[] = {
-	{ E_POPUP_ITEM, "10.new", N_("_New Task List"), new_task_list_cb, NULL, "stock_todo", 0, 0 },
-	{ E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_task_list_cb, NULL, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
-	{ E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_task_list_cb, NULL, "stock_delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY },
-	{ E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_task_list_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_ITEM, "10.new", N_("New Task List"), new_task_list_cb, NULL, "stock_todo", 0, 0 },
+	{ E_POPUP_ITEM, "15.copy", N_("Copy"), copy_task_list_cb, NULL, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_ITEM, "20.delete", N_("Delete"), delete_task_list_cb, NULL, "stock_delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_ITEM, "30.properties", N_("Properties..."), edit_task_list_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
 };
 
 static void
@@ -863,9 +863,6 @@ setup_create_ecal (TasksComponent *component, TasksComponentView *component_view
 		
 	if (priv->create_ecal) {
 		icaltimezone *zone;
-		
-		zone = calendar_config_get_icaltimezone ();
-		e_cal_set_default_timezone (priv->create_ecal, zone, NULL);
 
 		if (!e_cal_open (priv->create_ecal, FALSE, NULL)) {
 			GtkWidget *dialog;
@@ -873,13 +870,15 @@ setup_create_ecal (TasksComponent *component, TasksComponentView *component_view
 			dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
 							 GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
 							 _("Unable to open the task list '%s' for creating events and meetings"), 
-							 e_source_peek_name (source));
+							   e_source_peek_name (source));
 			gtk_dialog_run (GTK_DIALOG (dialog));
 			gtk_widget_destroy (dialog);
 
 			return NULL;
 		}
 
+		zone = calendar_config_get_icaltimezone ();
+		e_cal_set_default_timezone (priv->create_ecal, zone, NULL);
 	} else {
 		GtkWidget *dialog;
 			
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index bca8070eb7..ccf09a87f2 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -45,7 +45,6 @@
 #include <bonobo/bonobo-ui-util.h>
 #include <e-util/e-dialog-utils.h>
 #include <e-util/e-print.h>
-#include <e-util/e-util-private.h>
 #include "dialogs/cal-prefs-dialog.h"
 #include "calendar-config.h"
 #include "calendar-commands.h"
@@ -103,11 +102,6 @@ static void tasks_control_forward_cmd          (BonoboUIComponent      *uic,
                                                 gpointer               data,
                                                 const char             *path);
 
-static void tasks_control_view_preview	       (BonoboUIComponent *uic, 
-						const char *path, 
-						Bonobo_UIComponent_EventType type, 
-						const char *state, 
-						void *data);
 	  
 BonoboControl *
 tasks_control_new (void)
@@ -251,7 +245,7 @@ static BonoboUIVerb verbs [] = {
 	BONOBO_UI_VERB ("TasksPrintPreview", tasks_control_print_preview_cmd),
 	BONOBO_UI_VERB ("TasksAssign", tasks_control_assign_cmd),
         BONOBO_UI_VERB ("TasksForward", tasks_control_forward_cmd),
-     	BONOBO_UI_VERB ("ViewPreview", tasks_control_view_preview),
+     
 	BONOBO_UI_VERB_END
 };
 
@@ -263,8 +257,6 @@ tasks_control_activate (BonoboControl *control, ETasks *tasks)
 	int n_selected;
 	ECalendarTable *cal_table;
 	ETable *etable;
-	gboolean state;
-	char *xmlfile;
 
 	uic = bonobo_control_get_ui_component (control);
 	g_assert (uic != NULL);
@@ -279,14 +271,10 @@ tasks_control_activate (BonoboControl *control, ETasks *tasks)
 
 	bonobo_ui_component_freeze (uic, NULL);
 
-	xmlfile = g_build_filename (EVOLUTION_UIDIR,
-				    "evolution-tasks.xml",
-				    NULL);
 	bonobo_ui_util_set_ui (uic, PREFIX,
-			       xmlfile,
+			       EVOLUTION_UIDIR "/evolution-tasks.xml",
 			       "evolution-tasks",
 			       NULL);
-	g_free (xmlfile);
 
 	e_tasks_setup_view_menus (tasks, uic);
 
@@ -301,12 +289,8 @@ tasks_control_activate (BonoboControl *control, ETasks *tasks)
 
 	tasks_control_sensitize_commands (control, tasks, n_selected);
 
-	state = calendar_config_get_preview_state();
-
 	bonobo_ui_component_thaw (uic, NULL);
-	
-	bonobo_ui_component_add_listener(uic, "ViewPreview", tasks_control_view_preview, tasks);
-	bonobo_ui_component_set_prop(uic, "/commands/ViewPreview", "state", state?"1":"0", NULL);
+
 	/* Show the dialog for setting the timezone if the user hasn't chosen
 	   a default timezone already. This is done in the startup wizard now,
 	   so we don't do it here. */
@@ -532,18 +516,4 @@ tasks_control_forward_cmd (BonoboUIComponent *uic,
                        itip_send_comp (E_CAL_COMPONENT_METHOD_PUBLISH, comp, comp_data->client, NULL, NULL);
                        g_object_unref (comp);
 	       }
-}
-
-static void
-tasks_control_view_preview (BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_EventType type, const char *state, void *data)
-{
-        ETasks *tasks;
-
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	tasks = E_TASKS (data);
-
-	calendar_config_set_preview_state (state[0] != '0');
-	e_tasks_show_preview (tasks, state[0] != '0');
-}
+}	       
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 146fe4cbbb..ecf2de9513 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,53 +1,3 @@
-2005-11-26  Tor Lillqvist  <tml@novell.com>
-
-	* e-msg-composer-attachment.c: Include e-util-private.h to get
-	redefinition of compile-time pathnames as calls to functions on
-	Windows. Construct the pathnames of files and directories under
-	the installation prefix at run-time to enable install-anywhere on
-	Windows. No effect on functionality on Unix.
-
-2005-10-22  Parthasarathi Susarla <sparthasarathi@novell.com>
-	
-	* e-msg-composer.c: (get_file_content):
-	use composer->priv->charset instead of p->charset. This fixes 
-	a crash
-
-2005-10-21 Vivek Jain <jvivek@novell.com>
-	
-	Comitted NotZed's patch given on #314701
-	
-	** See bug #314701.
-	* e-msg-composer-hdrs.c (get_account_store_url): don't dereference
-	a null url or create an empty one.
-
-2005-10-19  Philip Van Hoof <pvanhoof@gnome.org>
-
-	* composer/e-msg-composer-select-file.c,
-	* composer/e-msg-composer.c, composer/e-msg-composer.h,
-	* composer/evolution-composer.c, composer/listener.c,
-	* mail/em-composer-utils.c,
-	* plugins/mailing-list-actions/mailing-list-actions.c:
-	data hiding
-	
-2005-10-05  Parthasarathi Susarla <sparthasarathi@novell.com>
-	
-	Reverting the last commit
-
-2005-10-05  Parthasarathi Susarla <sparthasarathi@novell.com>
-	
-	** See bug #315987
-
-	* e-msg-composer-hdrs.c: (create_from_optionmenu):
-	Load the account info in the From header only if the
-	account is enabled
-
-2005-10-04  Srinivasa Ragavan <sragavan@novell.com>
-
-	** fixes bug #316937
-	
-	* e-msg-composer.c (handle_mailto): Shows the attachments
-	when added via a mailto: url.
-	
 2005-09-29  Parthasarathi Susarla <sparthasarathi@novell.com>
 
 	** See bug 317337
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 52ef59a2da..6eebba6e6e 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -135,101 +135,14 @@
 
 #define d(x)
 
-typedef struct _EMsgComposerPrivate EMsgComposerPrivate;
+#define _PRIVATE(o) (g_type_instance_get_private ((GTypeInstance *)o, e_msg_composer_get_type()))
 
-struct _EMsgComposer {
-	BonoboWindow parent;
-	
-	EMsgComposerPrivate *priv;
-};
-
-struct _EMsgComposerClass {
-	BonoboWindowClass parent_class;
-	
-	void (* send) (EMsgComposer *composer);
-	void (* save_draft) (EMsgComposer *composer, int quit);
-};
-
-
-struct _EMsgComposerPrivate {
-
-
-/* Main UIComponent */
-	BonoboUIComponent *uic;
-
-	/* UIComponent for the non-control GtkEntries */
-	BonoboUIComponent *entry_uic;
-	
-	GtkWidget *hdrs;
-	GPtrArray *extra_hdr_names, *extra_hdr_values;
-	
-	GtkWidget *focused_entry;
-	
-	GtkWidget *eeditor;
-	
-	GtkWidget *attachment_bar;
-	GtkWidget *attachment_scrolled_window;
-	GtkWidget *attachment_expander;
-	GtkWidget *attachment_expander_label;
-	GtkWidget *attachment_expander_icon;
-	GtkWidget *attachment_expander_num;
-	
-	GtkWidget *address_dialog;
-	
-	Bonobo_PersistFile       persist_file_interface;
-	Bonobo_PersistStream     persist_stream_interface;
-	GNOME_GtkHTML_Editor_Engine  eeditor_engine;
-	BonoboObject            *eeditor_listener;
-	GHashTable              *inline_images, *inline_images_by_url;
-	GList                   *current_images;
-	
-	char *mime_type, *mime_body, *charset;
-	
-	char *autosave_file;
-        int   autosave_fd;
-	guint32 enable_autosave        : 1;
-	
-	guint32 attachment_bar_visible : 1;
-	guint32 send_html              : 1;
-	guint32 is_alternative         : 1;
-	guint32 pgp_sign               : 1;
-	guint32 pgp_encrypt            : 1;
-	guint32 smime_sign             : 1;
-	guint32 smime_encrypt          : 1;
-	guint32 view_from              : 1;
-	guint32 view_replyto           : 1;
-	guint32 view_to                : 1;
-	guint32 view_postto            : 1;
-	guint32 view_bcc               : 1;
-	guint32 view_cc                : 1;
-	guint32 view_subject           : 1;
-	guint32 request_receipt        : 1;
-	guint32 has_changed            : 1;
-	guint32 autosaved              : 1;
-	
-	guint32 mode_post              : 1;
-	
-	guint32 in_signature_insert    : 1;
-	
-	struct _ESignature *signature;
-	struct _GtkOptionMenu *sig_menu;
-	guint sig_added_id;
-	guint sig_removed_id;
-	guint sig_changed_id;
-	
-	CamelMimeMessage *redirect;
-	
-	guint notify_id;
-	
+typedef struct _EMsgComposerPrivate {
 	EMMenu *menu;
 
 	GtkWidget *saveas;	/* saveas async file requester */
 	GtkWidget *load;	/* same for load - not used */
-	
-	
-	
-	
-};
+} EMsgComposerPrivate;
 
 enum {
 	SEND,
@@ -376,7 +289,7 @@ best_encoding (GByteArray *buf, const char *charset)
 	if (cd == (iconv_t) -1)
 		return -1;
 	
-	in = (char*)buf->data;
+	in = buf->data;
 	inlen = buf->len;
 	do {
 		out = outbuf;
@@ -471,9 +384,8 @@ clear_inline_images (gpointer key, gpointer value, gpointer user_data)
 static void
 clear_current_images (EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = composer->priv;
-	g_list_free (p->current_images);
-	p->current_images = NULL;
+	g_list_free (composer->current_images);
+	composer->current_images = NULL;
 }
 
 static gboolean
@@ -487,18 +399,14 @@ clear_url (gpointer key, gpointer value, gpointer user_data)
 void
 e_msg_composer_clear_inlined_table (EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = composer->priv;
-
-	g_hash_table_foreach_remove (p->inline_images, clear_inline_images, NULL);
-	g_hash_table_foreach_remove (p->inline_images_by_url, clear_url, NULL);
+	g_hash_table_foreach_remove (composer->inline_images, clear_inline_images, NULL);
+	g_hash_table_foreach_remove (composer->inline_images_by_url, clear_url, NULL);
 }
 
 static void
 add_inlined_images (EMsgComposer *composer, CamelMultipart *multipart)
 {
-	EMsgComposerPrivate *p = composer->priv;
-
-	GList *d = p->current_images;
+	GList *d = composer->current_images;
 	GHashTable *added;
 
 	added = g_hash_table_new (g_direct_hash, g_direct_equal);
@@ -520,11 +428,9 @@ add_inlined_images (EMsgComposer *composer, CamelMultipart *multipart)
 static CamelMimeMessage *
 build_message (EMsgComposer *composer, gboolean save_html_object_data)
 {
-	EMsgComposerPrivate *p = composer->priv;
-
 	EAttachmentBar *attachment_bar =
-		E_ATTACHMENT_BAR (p->attachment_bar);
-	EMsgComposerHdrs *hdrs = E_MSG_COMPOSER_HDRS (p->hdrs);
+		E_ATTACHMENT_BAR (composer->attachment_bar);
+	EMsgComposerHdrs *hdrs = E_MSG_COMPOSER_HDRS (composer->hdrs);
 	CamelDataWrapper *plain, *html, *current;
 	CamelTransferEncoding plain_encoding;
 	const char *iconv_charset = NULL;
@@ -539,26 +445,26 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data)
 	char *charset;
 	int i;
 	
-	if (p->persist_stream_interface == CORBA_OBJECT_NIL)
+	if (composer->persist_stream_interface == CORBA_OBJECT_NIL)
 		return NULL;
 	
 	/* evil kludgy hack for Redirect */
-	if (p->redirect) {
-		e_msg_composer_hdrs_to_redirect (hdrs, p->redirect);
-		camel_object_ref (p->redirect);
-		return p->redirect;
+	if (composer->redirect) {
+		e_msg_composer_hdrs_to_redirect (hdrs, composer->redirect);
+		camel_object_ref (composer->redirect);
+		return composer->redirect;
 	}
 	
 	new = camel_mime_message_new ();
 	e_msg_composer_hdrs_to_message (hdrs, new);
-	for (i = 0; i < p->extra_hdr_names->len; i++) {
+	for (i = 0; i < composer->extra_hdr_names->len; i++) {
 		camel_medium_add_header (CAMEL_MEDIUM (new),
-					 p->extra_hdr_names->pdata[i],
-					 p->extra_hdr_values->pdata[i]);
+					 composer->extra_hdr_names->pdata[i],
+					 composer->extra_hdr_values->pdata[i]);
 	}
 
 	/* Message Disposition Notification */
-	if (p->request_receipt) {
+	if (composer->request_receipt) {
 		char *mdn_address = hdrs->account->id->reply_to;
 		if (!mdn_address || !*mdn_address)
 			mdn_address = hdrs->account->id->address;
@@ -566,19 +472,19 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data)
 		camel_medium_add_header (CAMEL_MEDIUM (new), "Disposition-Notification-To", mdn_address);
 	}
 	
-	if (p->mime_body) {
+	if (composer->mime_body) {
 		plain_encoding = CAMEL_TRANSFER_ENCODING_7BIT;
-		for (i = 0; p->mime_body[i]; i++) {
-			if ((unsigned char) p->mime_body[i] > 127) {
+		for (i = 0; composer->mime_body[i]; i++) {
+			if ((unsigned char) composer->mime_body[i] > 127) {
 				plain_encoding = CAMEL_TRANSFER_ENCODING_QUOTEDPRINTABLE;
 				break;
 			}
 		}
 		data = g_byte_array_new ();
-		g_byte_array_append (data, p->mime_body, strlen (p->mime_body));
-		type = camel_content_type_decode (p->mime_type);
+		g_byte_array_append (data, composer->mime_body, strlen (composer->mime_body));
+		type = camel_content_type_decode (composer->mime_type);
 	} else {
-		data = get_text (p->persist_stream_interface, "text/plain");
+		data = get_text (composer->persist_stream_interface, "text/plain");
 		if (!data) {
 			/* The component has probably died */
 			camel_object_unref (CAMEL_OBJECT (new));
@@ -588,7 +494,7 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data)
 		/* FIXME: we may want to do better than this... */
 
 		type = camel_content_type_new ("text", "plain");
-		if ((charset = best_charset (data, p->charset, &plain_encoding))) {
+		if ((charset = best_charset (data, composer->charset, &plain_encoding))) {
 			camel_content_type_set_param (type, "charset", charset);
 			iconv_charset = e_iconv_charset_name (charset);
 			g_free (charset);
@@ -619,17 +525,17 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data)
 	camel_data_wrapper_set_mime_type_field (plain, type);
 	camel_content_type_unref (type);
 	
-	if (p->send_html) {
+	if (composer->send_html) {
 		CORBA_Environment ev;
 		clear_current_images (composer);
 		
 		if (save_html_object_data) {
 			CORBA_exception_init (&ev);
-			GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "save-data-on", &ev);
+			GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "save-data-on", &ev);
 		}
-		data = get_text (p->persist_stream_interface, "text/html");
+		data = get_text (composer->persist_stream_interface, "text/html");
 		if (save_html_object_data) {
-			GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "save-data-off", &ev);
+			GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "save-data-off", &ev);
 			CORBA_exception_free (&ev);
 		}
 		
@@ -670,7 +576,7 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data)
 		 * multipart/related containing the
 		 * multipart/alternative and the images.
 		 */
-		if (p->current_images) {
+		if (composer->current_images) {
 			CamelMultipart *html_with_images;
 			
 			html_with_images = camel_multipart_new ();
@@ -697,7 +603,7 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data)
 	if (e_attachment_bar_get_num_attachments (attachment_bar)) {
 		CamelMultipart *multipart = camel_multipart_new ();
 		
-		if (p->is_alternative) {
+		if (composer->is_alternative) {
 			camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (multipart),
 							  "multipart/alternative");
 		}
@@ -713,9 +619,9 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data)
 		camel_multipart_add_part (multipart, part);
 		camel_object_unref (part);
 		
-		e_attachment_bar_to_multipart (attachment_bar, multipart, p->charset);
+		e_attachment_bar_to_multipart (attachment_bar, multipart, composer->charset);
 		
-		if (p->is_alternative) {
+		if (composer->is_alternative) {
 			int i;
 			
 			for (i = camel_multipart_get_number (multipart); i > 1; i--) {
@@ -730,9 +636,9 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data)
 	camel_exception_init (&ex);
 
 	/* Setup working recipient list if we're encrypting */
-	if (p->pgp_encrypt
+	if (composer->pgp_encrypt
 #if defined (HAVE_NSS) && defined (SMIME_SUPPORTED)
-	    || p->smime_encrypt
+	    || composer->smime_encrypt
 #endif
 		) {
 		int i, j;
@@ -750,7 +656,7 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data)
 		}
 	}
 	
-	if (p->pgp_sign || p->pgp_encrypt) {
+	if (composer->pgp_sign || composer->pgp_encrypt) {
 		const char *pgp_userid;
 		CamelInternetAddress *from = NULL;
 		CamelCipherContext *cipher;
@@ -768,7 +674,7 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data)
 			camel_internet_address_get(from, 0, NULL, &pgp_userid);
 		}
 		
-		if (p->pgp_sign) {
+		if (composer->pgp_sign) {
 			CamelMimePart *npart = camel_mime_part_new();
 
 			cipher = mail_crypto_get_pgp_cipher_context(hdrs->account);
@@ -784,7 +690,7 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data)
 			part = npart;
 		}
 		
-		if (p->pgp_encrypt) {
+		if (composer->pgp_encrypt) {
 			CamelMimePart *npart = camel_mime_part_new();
 
 			/* check to see if we should encrypt to self, NB gets removed immediately after use */
@@ -816,7 +722,7 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data)
 	}
 	
 #if defined (HAVE_NSS) && defined (SMIME_SUPPORTED)
-	if (p->smime_sign || p->smime_encrypt) {
+	if (composer->smime_sign || composer->smime_encrypt) {
 		CamelInternetAddress *from = NULL;
 		CamelCipherContext *cipher;
 
@@ -826,27 +732,27 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data)
 			camel_mime_part_set_encoding(part, plain_encoding);
 		camel_object_unref(current);
 
-		if (p->smime_sign
+		if (composer->smime_sign
 		    && (hdrs->account == NULL || hdrs->account->smime_sign_key == NULL || hdrs->account->smime_sign_key[0] == 0)) {
 			camel_exception_set (&ex, CAMEL_EXCEPTION_SYSTEM,
 					     _("Cannot sign outgoing message: No signing certificate set for this account"));
 			goto exception;
 		}
 		
-		if (p->smime_encrypt
+		if (composer->smime_encrypt
 		    && (hdrs->account == NULL || hdrs->account->smime_sign_key == NULL || hdrs->account->smime_sign_key[0] == 0)) {
 			camel_exception_set (&ex, CAMEL_EXCEPTION_SYSTEM,
 					     _("Cannot encrypt outgoing message: No encryption certificate set for this account"));
 			goto exception;
 		}
 
-		if (p->smime_sign) {
+		if (composer->smime_sign) {
 			CamelMimePart *npart = camel_mime_part_new();
 
 			cipher = camel_smime_context_new(session);
 
 			/* if we're also encrypting, envelope-sign rather than clear-sign */
-			if (p->smime_encrypt) {
+			if (composer->smime_encrypt) {
 				camel_smime_context_set_sign_mode((CamelSMIMEContext *)cipher, CAMEL_SMIME_SIGN_ENVELOPED);
 				camel_smime_context_set_encrypt_key((CamelSMIMEContext *)cipher, TRUE, hdrs->account->smime_encrypt_key);
 			} else if (hdrs->account && hdrs->account->smime_encrypt_key && *hdrs->account->smime_encrypt_key) {
@@ -865,7 +771,7 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data)
 			part = npart;
 		}
 	
-		if (p->smime_encrypt) {
+		if (composer->smime_encrypt) {
 			/* check to see if we should encrypt to self, NB removed after use */
 			if (hdrs->account->smime_encrypt_to_self)
 				g_ptr_array_add(recipients, g_strdup (hdrs->account->smime_encrypt_key));
@@ -887,7 +793,7 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data)
 			camel_object_unref(from);
 
 		/* we replaced the message directly, we don't want to do reparenting foo */
-		if (p->smime_encrypt) {
+		if (composer->smime_encrypt) {
 			camel_object_unref(part);
 			goto skip_content;
 		} else {
@@ -914,7 +820,7 @@ skip_content:
 
 	/* Attach whether this message was written in HTML */
 	camel_medium_set_header (CAMEL_MEDIUM (new), "X-Evolution-Format",
-				 p->send_html ? "text/html" : "text/plain");
+				 composer->send_html ? "text/html" : "text/plain");
 	
 	return new;
 	
@@ -995,7 +901,7 @@ get_file_content (EMsgComposer *composer, const char *file_name, gboolean want_h
 		filtered_stream = camel_stream_filter_new_with_stream (stream);
 		camel_object_unref (stream);
 		
-		charset = composer && composer->priv->charset ? composer->priv->charset : NULL;
+		charset = composer && composer->charset ? composer->charset : NULL;
 		charset = charset ? g_strdup (charset) : composer_get_default_charset_setting ();
 		if ((charenc = (CamelMimeFilter *) camel_mime_filter_charset_new_convert (charset, "UTF-8"))) {
 			camel_stream_filter_add (filtered_stream, charenc);
@@ -1014,7 +920,7 @@ get_file_content (EMsgComposer *composer, const char *file_name, gboolean want_h
 	camel_object_unref (memstream);
 	
 	g_byte_array_append (buffer, "", 1);
-	content = (char*)buffer->data;
+	content = buffer->data;
 	g_byte_array_free (buffer, FALSE);
 	
 	return content;
@@ -1039,42 +945,41 @@ static void
 prepare_engine (EMsgComposer *composer)
 {
 	CORBA_Environment ev;
-	EMsgComposerPrivate *p = composer->priv;
 	
 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 	
 	/* printf ("prepare_engine\n"); */
 	
 	CORBA_exception_init (&ev);
-	p->eeditor_engine = (GNOME_GtkHTML_Editor_Engine) Bonobo_Unknown_queryInterface
-		(bonobo_widget_get_objref (BONOBO_WIDGET (p->eeditor)), "IDL:GNOME/GtkHTML/Editor/Engine:1.0", &ev);
-	if ((p->eeditor_engine != CORBA_OBJECT_NIL) && (ev._major == CORBA_NO_EXCEPTION)) {
+	composer->editor_engine = (GNOME_GtkHTML_Editor_Engine) Bonobo_Unknown_queryInterface
+		(bonobo_widget_get_objref (BONOBO_WIDGET (composer->editor)), "IDL:GNOME/GtkHTML/Editor/Engine:1.0", &ev);
+	if ((composer->editor_engine != CORBA_OBJECT_NIL) && (ev._major == CORBA_NO_EXCEPTION)) {
 		
 		/* printf ("trying set listener\n"); */
-		p->eeditor_listener = BONOBO_OBJECT (listener_new (composer));
-		if (p->eeditor_listener != NULL)
-			GNOME_GtkHTML_Editor_Engine__set_listener (p->eeditor_engine,
+		composer->editor_listener = BONOBO_OBJECT (listener_new (composer));
+		if (composer->editor_listener != NULL)
+			GNOME_GtkHTML_Editor_Engine__set_listener (composer->editor_engine,
 								   (GNOME_GtkHTML_Editor_Listener)
 								   bonobo_object_dup_ref
-								   (bonobo_object_corba_objref (p->eeditor_listener),
+								   (bonobo_object_corba_objref (composer->editor_listener),
 								    &ev),
 								   &ev);
 		
-		if ((ev._major != CORBA_NO_EXCEPTION) || (p->eeditor_listener == NULL)) {
+		if ((ev._major != CORBA_NO_EXCEPTION) || (composer->editor_listener == NULL)) {
 			CORBA_Environment err_ev;
 
 			CORBA_exception_init (&err_ev);
 			
-			Bonobo_Unknown_unref (p->eeditor_engine, &err_ev);
-			CORBA_Object_release (p->eeditor_engine, &err_ev);
+			Bonobo_Unknown_unref (composer->editor_engine, &err_ev);
+			CORBA_Object_release (composer->editor_engine, &err_ev);
 
 			CORBA_exception_free (&err_ev);
 
-			p->eeditor_engine = CORBA_OBJECT_NIL;
+			composer->editor_engine = CORBA_OBJECT_NIL;
 			g_warning ("Can't establish Editor Listener\n");
 		}
 	} else {
-		p->eeditor_engine = CORBA_OBJECT_NIL;
+		composer->editor_engine = CORBA_OBJECT_NIL;
 		g_warning ("Can't get Editor Engine\n");
 	}
 
@@ -1176,23 +1081,22 @@ decode_signature_name (const char *name)
 static char *
 get_signature_html (EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	char *text = NULL, *html = NULL;
 	gboolean format_html;
 	
-	if (!p->signature)
+	if (!composer->signature)
 		return NULL;
 	
-	if (!p->signature->autogen) {
-		if (!p->signature->filename)
+	if (!composer->signature->autogen) {
+		if (!composer->signature->filename)
 			return NULL;
 		
-		format_html = p->signature->html;
+		format_html = composer->signature->html;
 		
-		if (p->signature->script) {
-			text = mail_config_signature_run_script (p->signature->filename);
+		if (composer->signature->script) {
+			text = mail_config_signature_run_script (composer->signature->filename);
 		} else {
-			text = e_msg_composer_get_sig_file_content (p->signature->filename, format_html);
+			text = e_msg_composer_get_sig_file_content (composer->signature->filename, format_html);
 		}
 	} else {
 		EAccountIdentity *id;
@@ -1200,7 +1104,7 @@ get_signature_html (EMsgComposer *composer)
 		char *address;
 		char *name;
 		
-		id = E_MSG_COMPOSER_HDRS (p->hdrs)->account->id;
+		id = E_MSG_COMPOSER_HDRS (composer->hdrs)->account->id;
 		address = id->address ? camel_text_to_html (id->address, CONVERT_SPACES, 0) : NULL;
 		name = id->name ? camel_text_to_html (id->name, CONVERT_SPACES, 0) : NULL;
 		organization = id->organization ? camel_text_to_html (id->organization, CONVERT_SPACES, 0) : NULL;
@@ -1224,8 +1128,8 @@ get_signature_html (EMsgComposer *composer)
 	if (text) {
 		char *encoded_uid = NULL;
 		
-		if (p->signature)
-			encoded_uid = encode_signature_name (p->signature->uid);
+		if (composer->signature)
+			encoded_uid = encode_signature_name (composer->signature->uid);
 		
 		/* The signature dash convention ("-- \n") is specified in the
 		 * "Son of RFC 1036": http://www.chemie.fu-berlin.de/outerspace/netnews/son-of-1036.html,
@@ -1252,18 +1156,17 @@ get_signature_html (EMsgComposer *composer)
 static void
 set_editor_text(EMsgComposer *composer, const char *text, ssize_t len, int set_signature, int pad_signature)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	Bonobo_PersistStream persist;
 	BonoboStream *stream;
 	BonoboWidget *editor;
 	CORBA_Environment ev;
 	Bonobo_Unknown object;
 
-	g_return_if_fail (p->persist_stream_interface != CORBA_OBJECT_NIL);
+	g_return_if_fail (composer->persist_stream_interface != CORBA_OBJECT_NIL);
 	
-	persist = p->persist_stream_interface;
+	persist = composer->persist_stream_interface;
 	
-	editor = BONOBO_WIDGET (p->eeditor);
+	editor = BONOBO_WIDGET (composer->editor);
 	
 	CORBA_exception_init (&ev);
 
@@ -1283,7 +1186,7 @@ set_editor_text(EMsgComposer *composer, const char *text, ssize_t len, int set_s
 	CORBA_exception_free (&ev);
 	
 	bonobo_object_unref (BONOBO_OBJECT (stream));
-	
+
 	if (set_signature)
 		e_msg_composer_show_sig_file (composer);
 }
@@ -1293,7 +1196,6 @@ set_editor_text(EMsgComposer *composer, const char *text, ssize_t len, int set_s
 static void
 save (EMsgComposer *composer, const char *filename)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	CORBA_Environment ev;
 	int fd;
 	
@@ -1315,13 +1217,13 @@ save (EMsgComposer *composer, const char *filename)
 	
 	CORBA_exception_init (&ev);
 	
-	Bonobo_PersistFile_save (p->persist_file_interface, filename, &ev);
+	Bonobo_PersistFile_save (composer->persist_file_interface, filename, &ev);
 	
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		e_error_run((GtkWindow *)composer, E_ERROR_NO_SAVE_FILE,
 			    filename, _("Unknown reason"));
 	} else {
-		GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "saved", &ev);
+		GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "saved", &ev);
 		e_msg_composer_unset_autosaved (composer);
 	}
 	CORBA_exception_free (&ev);
@@ -1336,7 +1238,7 @@ saveas_response(EMsgComposer *composer, const char *name)
 static void
 saveas(EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = composer->priv;
+	EMsgComposerPrivate *p = _PRIVATE(composer);
 
 	e_msg_composer_select_file (composer, &p->saveas, saveas_response, _("Save as..."), TRUE);
 }
@@ -1344,12 +1246,11 @@ saveas(EMsgComposer *composer)
 static void
 load (EMsgComposer *composer, const char *file_name)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	CORBA_Environment ev;
 	
 	CORBA_exception_init (&ev);
 	
-	Bonobo_PersistFile_load (p->persist_file_interface, file_name, &ev);
+	Bonobo_PersistFile_load (composer->persist_file_interface, file_name, &ev);
 	
 	if (ev._major != CORBA_NO_EXCEPTION)
 		e_error_run((GtkWindow *)composer, E_ERROR_NO_LOAD_FILE,
@@ -1375,7 +1276,6 @@ static void autosave_manager_stop (AutosaveManager *am);
 static gboolean
 autosave_save_draft (EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	CamelMimeMessage *message;
 	CamelStream *stream;
 	char *file;
@@ -1385,8 +1285,8 @@ autosave_save_draft (EMsgComposer *composer)
 	if (!e_msg_composer_is_dirty (composer))
 		return TRUE;
 
-	fd = p->autosave_fd;
-	file = p->autosave_file;
+	fd = composer->autosave_fd;
+	file = composer->autosave_file;
 	
 	if (fd == -1) {
 		/* This code is odd, the fd is opened elsewhere but a failure is ignored */
@@ -1422,7 +1322,7 @@ autosave_save_draft (EMsgComposer *composer)
 	} else {
 		CORBA_Environment ev;
 		CORBA_exception_init (&ev);
-		GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "saved", &ev);
+		GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "saved", &ev);
 		CORBA_exception_free (&ev);
 		e_msg_composer_unset_changed (composer);
 		e_msg_composer_set_autosaved (composer);
@@ -1536,9 +1436,8 @@ static void
 autosave_run_foreach_cb (gpointer key, gpointer value, gpointer data)
 {
 	EMsgComposer *composer = E_MSG_COMPOSER (value);
-	EMsgComposerPrivate *p = composer->priv;
 	
-	if (p->enable_autosave)
+	if (composer->enable_autosave)
 		autosave_save_draft (composer);
 }
 
@@ -1558,10 +1457,9 @@ autosave_run (gpointer data)
 static gboolean
 autosave_init_file (EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = composer->priv;
-	if (p->autosave_file == NULL) {
-		p->autosave_file = g_strdup_printf ("%s/%s", g_get_home_dir(), AUTOSAVE_SEED);
-		p->autosave_fd = mkstemp (p->autosave_file);
+	if (composer->autosave_file == NULL) {
+		composer->autosave_file = g_strdup_printf ("%s/%s", g_get_home_dir(), AUTOSAVE_SEED);
+		composer->autosave_fd = mkstemp (composer->autosave_file);
 		return TRUE;
 	}
 	return FALSE;
@@ -1600,12 +1498,11 @@ static void
 autosave_manager_register (AutosaveManager *am, EMsgComposer *composer) 
 {
 	char *key;
-	EMsgComposerPrivate *p = composer->priv;
 	
 	g_return_if_fail (composer != NULL);
 	
 	if (autosave_init_file (composer)) {
-		key = g_path_get_basename (p->autosave_file);
+		key = g_path_get_basename (composer->autosave_file);
 		g_hash_table_insert (am->table, key, composer);
 		if (am->ask) {
 			/* keep recursion out of our bedrooms. */
@@ -1622,12 +1519,11 @@ autosave_manager_unregister (AutosaveManager *am, EMsgComposer *composer)
 {
 	char *key, *oldkey;
 	void *olddata;
-	EMsgComposerPrivate *p = composer->priv;
 
-	if (!p->autosave_file)
+	if (!composer->autosave_file)
 		return;
 
-	key = g_path_get_basename(p->autosave_file);
+	key = g_path_get_basename(composer->autosave_file);
 	if (g_hash_table_lookup_extended(am->table, key, (void **)&oldkey, &olddata)) {
 		g_hash_table_remove(am->table, oldkey);
 		g_free(oldkey);
@@ -1637,11 +1533,11 @@ autosave_manager_unregister (AutosaveManager *am, EMsgComposer *composer)
 	/* only remove the file if we can successfully save it */
 	/* FIXME this test could probably be more efficient */
 	if (autosave_save_draft (composer))
-		unlink (p->autosave_file);
+		unlink (composer->autosave_file);
 	
-	close (p->autosave_fd);
-	g_free (p->autosave_file);
-	p->autosave_file = NULL;
+	close (composer->autosave_fd);
+	g_free (composer->autosave_file);
+	composer->autosave_file = NULL;
 	
 	if (g_hash_table_size (am->table) == 0)
 		autosave_manager_stop (am);
@@ -1662,7 +1558,6 @@ do_exit (EMsgComposer *composer)
 {
 	const char *subject;
 	int button;
-	EMsgComposerPrivate *p = composer->priv;
 	
 	if (!e_msg_composer_is_dirty (composer) && !e_msg_composer_is_autosaved (composer)) {
 		gtk_widget_destroy (GTK_WIDGET (composer));
@@ -1671,7 +1566,7 @@ do_exit (EMsgComposer *composer)
 	
 	gdk_window_raise (GTK_WIDGET (composer)->window);
 	
-	subject = e_msg_composer_hdrs_get_subject (E_MSG_COMPOSER_HDRS (p->hdrs));
+	subject = e_msg_composer_hdrs_get_subject (E_MSG_COMPOSER_HDRS (composer->hdrs));
 
 	button = e_error_run((GtkWindow *)composer, "mail-composer:exit-unsaved",
 			     subject && subject[0] ? subject : _("Untitled Message"), NULL);
@@ -1704,12 +1599,11 @@ menu_file_open_cb (BonoboUIComponent *uic,
 		   void *data,
 		   const char *path)
 {
-	EMsgComposer *composer = E_MSG_COMPOSER(data);
-	EMsgComposerPrivate *p = composer->priv;
+	EMsgComposerPrivate *p = _PRIVATE(data);
 
 	/* NB: This function is never used anymore */
 
-	e_msg_composer_select_file(composer, &p->load, file_open_response, _("Open File"), FALSE);
+	e_msg_composer_select_file(E_MSG_COMPOSER (data), &p->load, file_open_response, _("Open File"), FALSE);
 }
 
 static void
@@ -1722,11 +1616,10 @@ menu_file_save_cb (BonoboUIComponent *uic,
 	CORBA_Environment ev;
 	
 	composer = E_MSG_COMPOSER (data);
-	EMsgComposerPrivate *p = composer->priv;
 	
 	CORBA_exception_init (&ev);
 	
-	file_name = Bonobo_PersistFile_getCurrentFile (p->persist_file_interface, &ev);
+	file_name = Bonobo_PersistFile_getCurrentFile (composer->persist_file_interface, &ev);
 	
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		saveas (composer);
@@ -1767,10 +1660,8 @@ menu_file_close_cb (BonoboUIComponent *uic,
 static void
 add_to_bar (EMsgComposer *composer, GSList *names, int is_inline)
 {
-	EMsgComposerPrivate *p = composer->priv;
-
 	while (names) {
-		e_attachment_bar_attach((EAttachmentBar *)p->attachment_bar, names->data, is_inline ? "inline" : "attachment");
+		e_attachment_bar_attach((EAttachmentBar *)((EMsgComposer *)composer)->attachment_bar, names->data, is_inline ? "inline" : "attachment");
 		names = g_slist_next(names);
 	}
 }
@@ -1781,9 +1672,8 @@ menu_file_add_attachment_cb (BonoboUIComponent *uic,
 			     const char *path)
 {
 	EMsgComposer *composer = E_MSG_COMPOSER (data);
-	EMsgComposerPrivate *p = composer->priv;
-	EMsgComposer *toplevel = E_MSG_COMPOSER (gtk_widget_get_toplevel (GTK_WIDGET (p->attachment_bar)));
-	GtkWidget **attachment_selector = e_attachment_bar_get_selector(E_ATTACHMENT_BAR(p->attachment_bar));
+	EMsgComposer *toplevel = E_MSG_COMPOSER (gtk_widget_get_toplevel (GTK_WIDGET (composer->attachment_bar)));
+	GtkWidget **attachment_selector = e_attachment_bar_get_selector(E_ATTACHMENT_BAR(composer->attachment_bar));
 
 	e_msg_composer_select_file_attachments (toplevel, attachment_selector, add_to_bar);
 }
@@ -1792,12 +1682,11 @@ static void
 menu_edit_cut_cb (BonoboUIComponent *uic, void *data, const char *path)
 {
 	EMsgComposer *composer = data;
-	EMsgComposerPrivate *p = composer->priv;
 	
-	g_return_if_fail (p->focused_entry != NULL);
+	g_return_if_fail (composer->focused_entry != NULL);
 	
-	if (GTK_IS_ENTRY (p->focused_entry)) {
-		gtk_editable_cut_clipboard (GTK_EDITABLE (p->focused_entry));
+	if (GTK_IS_ENTRY (composer->focused_entry)) {
+		gtk_editable_cut_clipboard (GTK_EDITABLE (composer->focused_entry));
 	} else {
 		/* happy happy joy joy, an EEntry. */
 		g_assert_not_reached ();
@@ -1808,12 +1697,11 @@ static void
 menu_edit_copy_cb (BonoboUIComponent *uic, void *data, const char *path)
 {
 	EMsgComposer *composer = data;
-	EMsgComposerPrivate *p = composer->priv;
-
-	g_return_if_fail (p->focused_entry != NULL);
 	
-	if (GTK_IS_ENTRY (p->focused_entry)) {
-		gtk_editable_copy_clipboard (GTK_EDITABLE (p->focused_entry));
+	g_return_if_fail (composer->focused_entry != NULL);
+	
+	if (GTK_IS_ENTRY (composer->focused_entry)) {
+		gtk_editable_copy_clipboard (GTK_EDITABLE (composer->focused_entry));
 	} else {
 		/* happy happy joy joy, an EEntry. */
 		g_assert_not_reached ();
@@ -1824,12 +1712,11 @@ static void
 menu_edit_paste_cb (BonoboUIComponent *uic, void *data, const char *path)
 {
 	EMsgComposer *composer = data;
-	EMsgComposerPrivate *p = composer->priv;
 	
-	g_return_if_fail (p->focused_entry != NULL);
+	g_return_if_fail (composer->focused_entry != NULL);
 	
-	if (GTK_IS_ENTRY (p->focused_entry)) {
-		gtk_editable_paste_clipboard (GTK_EDITABLE (p->focused_entry));
+	if (GTK_IS_ENTRY (composer->focused_entry)) {
+		gtk_editable_paste_clipboard (GTK_EDITABLE (composer->focused_entry));
 	} else {
 		/* happy happy joy joy, an EEntry. */
 		g_assert_not_reached ();
@@ -1840,13 +1727,12 @@ static void
 menu_edit_select_all_cb (BonoboUIComponent *uic, void *data, const char *path)
 {
 	EMsgComposer *composer = data;
-	EMsgComposerPrivate *p = composer->priv;
 	
-	g_return_if_fail (p->focused_entry != NULL);
+	g_return_if_fail (composer->focused_entry != NULL);
 	
-	if (GTK_IS_ENTRY (p->focused_entry)) {
-		gtk_editable_set_position (GTK_EDITABLE (p->focused_entry), -1);
-		gtk_editable_select_region (GTK_EDITABLE (p->focused_entry), 0, -1);
+	if (GTK_IS_ENTRY (composer->focused_entry)) {
+		gtk_editable_set_position (GTK_EDITABLE (composer->focused_entry), -1);
+		gtk_editable_select_region (GTK_EDITABLE (composer->focused_entry), 0, -1);
 	} else {
 		/* happy happy joy joy, an EEntry. */
 		g_assert_not_reached ();
@@ -1858,28 +1744,26 @@ menu_edit_delete_all_cb (BonoboUIComponent *uic, void *data, const char *path)
 {
 	CORBA_Environment ev;
 	EMsgComposer *composer;
-
+	
 	composer = E_MSG_COMPOSER (data);
-	EMsgComposerPrivate *p = composer->priv;
-
 	CORBA_exception_init (&ev);
 	
-	GNOME_GtkHTML_Editor_Engine_undoBegin (p->eeditor_engine, "Delete all but signature", "Undelete all", &ev);
-	GNOME_GtkHTML_Editor_Engine_freeze (p->eeditor_engine, &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "disable-selection", &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "text-default-color", &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "bold-off", &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "italic-off", &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "underline-off", &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "strikeout-off", &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "select-all", &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "delete", &ev);
-	GNOME_GtkHTML_Editor_Engine_setParagraphData (p->eeditor_engine, "signature", "0", &ev);
-	GNOME_GtkHTML_Editor_Engine_setParagraphData (p->eeditor_engine, "orig", "0", &ev);
+	GNOME_GtkHTML_Editor_Engine_undoBegin (composer->editor_engine, "Delete all but signature", "Undelete all", &ev);
+	GNOME_GtkHTML_Editor_Engine_freeze (composer->editor_engine, &ev);
+	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "disable-selection", &ev);
+	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "text-default-color", &ev);
+	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "bold-off", &ev);
+	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "italic-off", &ev);
+	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "underline-off", &ev);
+	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "strikeout-off", &ev);
+	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "select-all", &ev);
+	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "delete", &ev);
+	GNOME_GtkHTML_Editor_Engine_setParagraphData (composer->editor_engine, "signature", "0", &ev);
+	GNOME_GtkHTML_Editor_Engine_setParagraphData (composer->editor_engine, "orig", "0", &ev);
 	e_msg_composer_show_sig_file (composer);
-	GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "style-normal", &ev);
-	GNOME_GtkHTML_Editor_Engine_thaw (p->eeditor_engine, &ev);
-	GNOME_GtkHTML_Editor_Engine_undoEnd (p->eeditor_engine, &ev);
+	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "style-normal", &ev);
+	GNOME_GtkHTML_Editor_Engine_thaw (composer->editor_engine, &ev);
+	GNOME_GtkHTML_Editor_Engine_undoEnd (composer->editor_engine, &ev);
 	
 	CORBA_exception_free (&ev);
 	/* printf ("delete all\n"); */
@@ -2058,11 +1942,9 @@ menu_changed_charset_cb (BonoboUIComponent           *component,
 		return;
 	
 	if (atoi (state)) {
-		EMsgComposer *composer = E_MSG_COMPOSER (user_data);
-		EMsgComposerPrivate *p = composer->priv;
 		/* Charset menu names are "Charset-%s" where %s is the charset name */
-		g_free (p->charset);
-		p->charset = g_strdup (path + strlen ("Charset-"));
+		g_free (E_MSG_COMPOSER (user_data)->charset);
+		E_MSG_COMPOSER (user_data)->charset = g_strdup (path + strlen ("Charset-"));
 	}
 }
 
@@ -2103,13 +1985,12 @@ signature_activate_cb (GtkWidget *menu, EMsgComposer *composer)
 {
 	GtkWidget *active;
 	ESignature *sig;
-	EMsgComposerPrivate *p = composer->priv;
 	
 	active = gtk_menu_get_active (GTK_MENU (menu));
 	sig = g_object_get_data ((GObject *) active, "sig");
 	
-	if (p->signature != sig) {
-		p->signature = sig;
+	if (composer->signature != sig) {
+		composer->signature = sig;
 		e_msg_composer_show_sig_file (composer);
 	}
 }
@@ -2118,9 +1999,8 @@ static void
 signature_added (ESignatureList *signatures, ESignature *sig, EMsgComposer *composer)
 {
 	GtkWidget *menu, *item;
-	EMsgComposerPrivate *p = composer->priv;
 	
-	menu = gtk_option_menu_get_menu (p->sig_menu);
+	menu = gtk_option_menu_get_menu (composer->sig_menu);
 	
 	if (sig->autogen)
 		item = gtk_menu_item_new_with_label (_("Autogenerated"));
@@ -2138,14 +2018,13 @@ signature_removed (ESignatureList *signatures, ESignature *sig, EMsgComposer *co
 	GtkWidget *menu;
 	ESignature *cur;
 	GList *items;
-	EMsgComposerPrivate *p = composer->priv;
 	
-	if (p->signature == sig) {
-		p->signature = NULL;
+	if (composer->signature == sig) {
+		composer->signature = NULL;
 		e_msg_composer_show_sig_file (composer);
 	}
 	
-	menu = gtk_option_menu_get_menu (p->sig_menu);
+	menu = gtk_option_menu_get_menu (composer->sig_menu);
 	items = GTK_MENU_SHELL (menu)->children;
 	while (items != NULL) {
 		cur = g_object_get_data (items->data, "sig");
@@ -2173,9 +2052,8 @@ signature_changed (ESignatureList *signatures, ESignature *sig, EMsgComposer *co
 	GtkWidget *menu;
 	ESignature *cur;
 	GList *items;
-	EMsgComposerPrivate *p = composer->priv;
 	
-	menu = gtk_option_menu_get_menu (p->sig_menu);
+	menu = gtk_option_menu_get_menu (composer->sig_menu);
 	items = GTK_MENU_SHELL (menu)->children;
 	while (items != NULL) {
 		cur = g_object_get_data (items->data, "sig");
@@ -2194,19 +2072,18 @@ sig_select_item (EMsgComposer *composer)
 	GtkWidget *menu;
 	GList *items;
 	int i = 0;
-	EMsgComposerPrivate *p = composer->priv;
 	
-	if (!p->signature) {
-		gtk_option_menu_set_history (p->sig_menu, 0);
+	if (!composer->signature) {
+		gtk_option_menu_set_history (composer->sig_menu, 0);
 		return;
 	}
 	
-	menu = gtk_option_menu_get_menu (p->sig_menu);
+	menu = gtk_option_menu_get_menu (composer->sig_menu);
 	items = GTK_MENU_SHELL (menu)->children;
 	while (items != NULL) {
 		cur = g_object_get_data ((GObject *) items->data, "sig");
-		if (cur == p->signature) {
-			gtk_option_menu_set_history (p->sig_menu, i);
+		if (cur == composer->signature) {
+			gtk_option_menu_set_history (composer->sig_menu, i);
 			return;
 		}
 		items = items->next;
@@ -2222,18 +2099,17 @@ setup_signatures_menu (EMsgComposer *composer)
 	GtkWidget *menu, *item;
 	ESignature *sig;
 	EIterator *it;
-	EMsgComposerPrivate *p = composer->priv;
 	
-	hbox = e_msg_composer_hdrs_get_from_hbox (E_MSG_COMPOSER_HDRS (p->hdrs));
+	hbox = e_msg_composer_hdrs_get_from_hbox (E_MSG_COMPOSER_HDRS (composer->hdrs));
 
 	label = gtk_label_new_with_mnemonic (_("Si_gnature:"));
 	gtk_widget_show (label);
 
-	p->sig_menu = (GtkOptionMenu *) gtk_option_menu_new ();
+	composer->sig_menu = (GtkOptionMenu *) gtk_option_menu_new ();
 
-	gtk_label_set_mnemonic_widget ((GtkLabel *) label, (GtkWidget *)p->sig_menu);
+	gtk_label_set_mnemonic_widget ((GtkLabel *) label, (GtkWidget *)composer->sig_menu);
 
-	gtk_box_pack_end_defaults (GTK_BOX (hbox), (GtkWidget *) p->sig_menu);
+	gtk_box_pack_end_defaults (GTK_BOX (hbox), (GtkWidget *) composer->sig_menu);
 	gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, TRUE, 0);
 	hspace = gtk_hbox_new (FALSE, 0);
 	gtk_widget_show (hspace);
@@ -2241,7 +2117,7 @@ setup_signatures_menu (EMsgComposer *composer)
 	
 	menu = gtk_menu_new ();
 	gtk_widget_show (menu);
-	gtk_option_menu_set_menu (p->sig_menu, menu);
+	gtk_option_menu_set_menu (composer->sig_menu, menu);
 	
 	item = gtk_menu_item_new_with_label (_("None"));
 	gtk_widget_show (item);
@@ -2261,42 +2137,42 @@ setup_signatures_menu (EMsgComposer *composer)
 	
 	g_signal_connect (menu, "selection-done", G_CALLBACK (signature_activate_cb), composer);
 
-	gtk_widget_show ((GtkWidget *) p->sig_menu);
+	gtk_widget_show ((GtkWidget *) composer->sig_menu);
 	
-	p->sig_added_id = g_signal_connect (signatures, "signature-added", G_CALLBACK (signature_added), composer);
-	p->sig_removed_id = g_signal_connect (signatures, "signature-removed", G_CALLBACK (signature_removed), composer);
-	p->sig_changed_id = g_signal_connect (signatures, "signature-changed", G_CALLBACK (signature_changed), composer);
+	composer->sig_added_id = g_signal_connect (signatures, "signature-added", G_CALLBACK (signature_added), composer);
+	composer->sig_removed_id = g_signal_connect (signatures, "signature-removed", G_CALLBACK (signature_removed), composer);
+	composer->sig_changed_id = g_signal_connect (signatures, "signature-changed", G_CALLBACK (signature_changed), composer);
 }
 
 static void
 setup_ui (EMsgComposer *composer)
 {
 	EMMenuTargetWidget *target;
-	EMsgComposerPrivate *p = composer->priv;
+	EMsgComposerPrivate *p = _PRIVATE(composer);
 	BonoboUIContainer *container;
 	gboolean hide_smime;
 	char *charset;
 	
 	container = bonobo_window_get_ui_container (BONOBO_WINDOW (composer));
 	
-	p->uic = bonobo_ui_component_new_default ();
+	composer->uic = bonobo_ui_component_new_default ();
 	/* FIXME: handle bonobo exceptions */
-	bonobo_ui_component_set_container (p->uic, bonobo_object_corba_objref (BONOBO_OBJECT (container)), NULL);
+	bonobo_ui_component_set_container (composer->uic, bonobo_object_corba_objref (BONOBO_OBJECT (container)), NULL);
 	
-	bonobo_ui_component_add_verb_list_with_data (p->uic, verbs, composer);
+	bonobo_ui_component_add_verb_list_with_data (composer->uic, verbs, composer);
 	
-	bonobo_ui_component_freeze (p->uic, NULL);
+	bonobo_ui_component_freeze (composer->uic, NULL);
 	
-	bonobo_ui_util_set_ui (p->uic, PREFIX,
+	bonobo_ui_util_set_ui (composer->uic, PREFIX,
 			       EVOLUTION_UIDIR "/evolution-message-composer.xml",
 			       "evolution-message-composer", NULL);
 	
-	e_pixmaps_update (p->uic, pixcache);
+	e_pixmaps_update (composer->uic, pixcache);
 	
 	/* Populate the Charset Encoding menu and default it to whatever the user
 	   chose as his default charset in the mailer */
 	charset = composer_get_default_charset_setting ();
-	e_charset_picker_bonobo_ui_populate (p->uic, "/menu/Edit/EncodingPlaceholder",
+	e_charset_picker_bonobo_ui_populate (composer->uic, "/menu/Edit/EncodingPlaceholder",
 					     charset,
 					     menu_changed_charset_cb,
 					     composer);
@@ -2304,84 +2180,84 @@ setup_ui (EMsgComposer *composer)
 	
 	/* Format -> HTML */
 	bonobo_ui_component_set_prop (
-		p->uic, "/commands/FormatHtml",
-		"state", p->send_html ? "1" : "0", NULL);
+		composer->uic, "/commands/FormatHtml",
+		"state", composer->send_html ? "1" : "0", NULL);
 	bonobo_ui_component_add_listener (
-		p->uic, "FormatHtml",
+		composer->uic, "FormatHtml",
 		menu_format_html_cb, composer);
-
+	
 	/* View/From */
 	bonobo_ui_component_set_prop (
-		p->uic, "/commands/ViewFrom",
-		"state", p->view_from ? "1" : "0", NULL);
+		composer->uic, "/commands/ViewFrom",
+		"state", composer->view_from ? "1" : "0", NULL);
 	bonobo_ui_component_add_listener (
-		p->uic, "ViewFrom",
+		composer->uic, "ViewFrom",
 		menu_view_from_cb, composer);
 	
 	/* View/ReplyTo */
 	bonobo_ui_component_set_prop (
-		p->uic, "/commands/ViewReplyTo",
-		"state", p->view_replyto ? "1" : "0", NULL);
+		composer->uic, "/commands/ViewReplyTo",
+		"state", composer->view_replyto ? "1" : "0", NULL);
 	bonobo_ui_component_add_listener (
-		p->uic, "ViewReplyTo",
+		composer->uic, "ViewReplyTo",
 		menu_view_replyto_cb, composer);
 	
 	/* View/To */
 	bonobo_ui_component_set_prop (
-		p->uic, "/commands/ViewTo",
-		"state", p->view_to ? "1" : "0", NULL);
+		composer->uic, "/commands/ViewTo",
+		"state", composer->view_to ? "1" : "0", NULL);
 	bonobo_ui_component_add_listener (
-		p->uic, "ViewTo",
+		composer->uic, "ViewTo",
 		menu_view_to_cb, composer);
 	
 	/* View/PostTo */
 	bonobo_ui_component_set_prop (
-		p->uic, "/commands/ViewPostTo",
-		"state", p->view_postto ? "1" : "0", NULL);
+		composer->uic, "/commands/ViewPostTo",
+		"state", composer->view_postto ? "1" : "0", NULL);
 	bonobo_ui_component_add_listener (
-		p->uic, "ViewPostTo",
+		composer->uic, "ViewPostTo",
 		menu_view_postto_cb, composer);
 	
 	/* View/CC */
 	bonobo_ui_component_set_prop (
-		p->uic, "/commands/ViewCC",
-		"state", p->view_cc ? "1" : "0", NULL);
+		composer->uic, "/commands/ViewCC",
+		"state", composer->view_cc ? "1" : "0", NULL);
 	bonobo_ui_component_add_listener (
-		p->uic, "ViewCC",
+		composer->uic, "ViewCC",
 		menu_view_cc_cb, composer);
 	
 	/* View/BCC */
 	bonobo_ui_component_set_prop (
-		p->uic, "/commands/ViewBCC",
-		"state", p->view_bcc ? "1" : "0", NULL);
+		composer->uic, "/commands/ViewBCC",
+		"state", composer->view_bcc ? "1" : "0", NULL);
 	bonobo_ui_component_add_listener (
-		p->uic, "ViewBCC",
+		composer->uic, "ViewBCC",
 		menu_view_bcc_cb, composer);
 
 	/* Insert/Request Receipt */
 	bonobo_ui_component_set_prop (
-		p->uic, "/commands/RequestReceipt",
-		"state", p->request_receipt ? "1" : "0", NULL);
+		composer->uic, "/commands/RequestReceipt",
+		"state", composer->request_receipt ? "1" : "0", NULL);
 	bonobo_ui_component_add_listener (
-		p->uic, "RequestReceipt",
+		composer->uic, "RequestReceipt",
 		menu_insert_receipt_cb, composer);
 	
 	/* Security -> PGP Sign */
 	bonobo_ui_component_set_prop (
-		p->uic, "/commands/SecurityPGPSign",
-		"state", p->pgp_sign ? "1" : "0", NULL);
+		composer->uic, "/commands/SecurityPGPSign",
+		"state", composer->pgp_sign ? "1" : "0", NULL);
 	
 	bonobo_ui_component_add_listener (
-		p->uic, "SecurityPGPSign",
+		composer->uic, "SecurityPGPSign",
 		menu_security_pgp_sign_cb, composer);
 	
 	/* Security -> PGP Encrypt */
 	bonobo_ui_component_set_prop (
-		p->uic, "/commands/SecurityPGPEncrypt",
-		"state", p->pgp_encrypt ? "1" : "0", NULL);
+		composer->uic, "/commands/SecurityPGPEncrypt",
+		"state", composer->pgp_encrypt ? "1" : "0", NULL);
 	
 	bonobo_ui_component_add_listener (
-		p->uic, "SecurityPGPEncrypt",
+		composer->uic, "SecurityPGPEncrypt",
 		menu_security_pgp_encrypt_cb, composer);
 	
 #if defined(HAVE_NSS) && defined(SMIME_SUPPORTED)
@@ -2392,38 +2268,38 @@ setup_ui (EMsgComposer *composer)
 	
 	/* Security -> S/MIME Sign */
 	bonobo_ui_component_set_prop (
-		p->uic, "/commands/SecuritySMimeSign",
-		"state", p->smime_sign ? "1" : "0", NULL);
+		composer->uic, "/commands/SecuritySMimeSign",
+		"state", composer->smime_sign ? "1" : "0", NULL);
 	bonobo_ui_component_set_prop (
-		p->uic, "/commands/SecuritySMimeSign",
+		composer->uic, "/commands/SecuritySMimeSign",
 		"hidden", hide_smime ? "1" : "0", NULL);
 	
 	bonobo_ui_component_add_listener (
-		p->uic, "SecuritySMimeSign",
+		composer->uic, "SecuritySMimeSign",
 		menu_security_smime_sign_cb, composer);
 	
 	/* Security -> S/MIME Encrypt */
 	bonobo_ui_component_set_prop (
-		p->uic, "/commands/SecuritySMimeEncrypt",
-		"state", p->smime_encrypt ? "1" : "0", NULL);
+		composer->uic, "/commands/SecuritySMimeEncrypt",
+		"state", composer->smime_encrypt ? "1" : "0", NULL);
 	bonobo_ui_component_set_prop (
-		p->uic, "/commands/SecuritySMimeEncrypt",
+		composer->uic, "/commands/SecuritySMimeEncrypt",
 		"hidden", hide_smime ? "1" : "0", NULL);
 	
 	bonobo_ui_component_add_listener (
-		p->uic, "SecuritySMimeEncrypt",
+		composer->uic, "SecuritySMimeEncrypt",
 		menu_security_smime_encrypt_cb, composer);
 	
-	bonobo_ui_component_thaw (p->uic, NULL);
+	bonobo_ui_component_thaw (composer->uic, NULL);
 
 	/* Create the UIComponent for the non-control entries */
 
-	p->entry_uic = bonobo_ui_component_new_default ();
+	composer->entry_uic = bonobo_ui_component_new_default ();
 
 	/* Setup main menu plugin mechanism */
 	target = em_menu_target_new_widget(p->menu, (GtkWidget *)composer);
 	e_menu_update_target((EMenu *)p->menu, target);
-	e_menu_activate((EMenu *)p->menu, p->uic, TRUE);
+	e_menu_activate((EMenu *)p->menu, composer->uic, TRUE);
 }
 
 
@@ -2434,24 +2310,23 @@ attachment_bar_changed_cb (EAttachmentBar *bar,
 			   void *data)
 {
 	EMsgComposer *composer = E_MSG_COMPOSER (data);
-	EMsgComposerPrivate *p = composer->priv;
 
 	guint attachment_num = e_attachment_bar_get_num_attachments (
-		E_ATTACHMENT_BAR (p->attachment_bar));
+		E_ATTACHMENT_BAR (composer->attachment_bar));
 	if (attachment_num) {
 		gchar *num_text = g_strdup_printf (
 			ngettext ("<b>%d</b> Attachment", "<b>%d</b> Attachments", attachment_num),
 			attachment_num);
-		gtk_label_set_markup (GTK_LABEL (p->attachment_expander_num),
+		gtk_label_set_markup (GTK_LABEL (composer->attachment_expander_num),
 				      num_text);
 		g_free (num_text);
 
-		gtk_widget_show (p->attachment_expander_icon);
+		gtk_widget_show (composer->attachment_expander_icon);
 		
 	} else {
-		gtk_label_set_text (GTK_LABEL (p->attachment_expander_num), "");
-		gtk_widget_hide (p->attachment_expander);
-		gtk_widget_hide (p->attachment_scrolled_window);
+		gtk_label_set_text (GTK_LABEL (composer->attachment_expander_num), "");
+		gtk_widget_hide (composer->attachment_expander);
+		gtk_widget_hide (composer->attachment_scrolled_window);
 	}
 	
 	
@@ -2594,15 +2469,14 @@ from_changed_cb (EMsgComposerHdrs *hdrs, void *data)
 	EMsgComposer *composer;
 	
 	composer = E_MSG_COMPOSER (data);
-	EMsgComposerPrivate *p = composer->priv;
 	
 	if (hdrs->account) {
 		EAccount *account = hdrs->account;
 		
 		e_msg_composer_set_pgp_sign (composer,
 					     account->pgp_always_sign &&
-					     (!account->pgp_no_imip_sign || !p->mime_type ||
-					      g_ascii_strncasecmp (p->mime_type, "text/calendar", 13) != 0));
+					     (!account->pgp_no_imip_sign || !composer->mime_type ||
+					      g_ascii_strncasecmp (composer->mime_type, "text/calendar", 13) != 0));
 		e_msg_composer_set_smime_sign (composer, account->smime_sign_default);
 		e_msg_composer_set_smime_encrypt (composer, account->smime_encrypt_default);
 		update_auto_recipients (hdrs, UPDATE_AUTO_CC, account->always_cc ? account->cc_addrs : NULL);
@@ -2625,35 +2499,28 @@ composer_finalise (GObject *object)
 	EMsgComposer *composer;
 
 	composer = E_MSG_COMPOSER (object);
-	EMsgComposerPrivate *p = composer->priv;
 	
-	if (p->extra_hdr_names) {
+	if (composer->extra_hdr_names) {
 		int i;
 		
-		for (i = 0; i < p->extra_hdr_names->len; i++) {
-			g_free (p->extra_hdr_names->pdata[i]);
-			g_free (p->extra_hdr_values->pdata[i]);
+		for (i = 0; i < composer->extra_hdr_names->len; i++) {
+			g_free (composer->extra_hdr_names->pdata[i]);
+			g_free (composer->extra_hdr_values->pdata[i]);
 		}
-		g_ptr_array_free (p->extra_hdr_names, TRUE);
-		g_ptr_array_free (p->extra_hdr_values, TRUE);
+		g_ptr_array_free (composer->extra_hdr_names, TRUE);
+		g_ptr_array_free (composer->extra_hdr_values, TRUE);
 	}
 	
 	e_msg_composer_clear_inlined_table (composer);
-	g_hash_table_destroy (p->inline_images);
-	g_hash_table_destroy (p->inline_images_by_url);
+	g_hash_table_destroy (composer->inline_images);
+	g_hash_table_destroy (composer->inline_images_by_url);
 	
-	g_free (p->charset);
-	g_free (p->mime_type);
-	g_free (p->mime_body);
+	g_free (composer->charset);
+	g_free (composer->mime_type);
+	g_free (composer->mime_body);
 	
-	if (p->redirect)
-		camel_object_unref (p->redirect);
-	
-	
-	g_free (p);
-
-	p = NULL;
-	composer->priv = NULL;
+	if (composer->redirect)
+		camel_object_unref (composer->redirect);
 	
 	if (G_OBJECT_CLASS (parent_class)->finalize != NULL)
 		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
@@ -2667,7 +2534,6 @@ composer_dispose(GObject *object)
 	 * been destroyed, so we have to do this here.
 	 */
 	autosave_manager_unregister (am, E_MSG_COMPOSER (object));
-	
 	if (G_OBJECT_CLASS (parent_class)->dispose != NULL)
 		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
 }
@@ -2677,10 +2543,10 @@ static void
 destroy (GtkObject *object)
 {
 	EMsgComposer *composer = (EMsgComposer *)object;
-	EMsgComposerPrivate *p = composer->priv;
 	CORBA_Environment ev;
 	ESignatureList *signatures;
-	
+	EMsgComposerPrivate *p = _PRIVATE(composer);
+
 	CORBA_exception_init (&ev);
 
 	if (p->menu) {
@@ -2689,7 +2555,6 @@ destroy (GtkObject *object)
 		p->menu = NULL;
 	}
 
-	
 	if (p->load) {
 		gtk_widget_destroy(p->load);
 		p->load = NULL;
@@ -2700,74 +2565,74 @@ destroy (GtkObject *object)
 		p->saveas = NULL;
 	}
 
-	if (p->uic) {
-		bonobo_object_unref (BONOBO_OBJECT (p->uic));
-		p->uic = NULL;
+	if (composer->uic) {
+		bonobo_object_unref (BONOBO_OBJECT (composer->uic));
+		composer->uic = NULL;
 	}
 
-	if (p->entry_uic) {
-		bonobo_object_unref (BONOBO_OBJECT (p->entry_uic));
-		p->entry_uic = NULL;
+	if (composer->entry_uic) {
+		bonobo_object_unref (BONOBO_OBJECT (composer->entry_uic));
+		composer->entry_uic = NULL;
 	}
 	
 	/* FIXME?  I assume the Bonobo widget will get destroyed
            normally?  */
-	if (p->address_dialog != NULL) {
-		gtk_widget_destroy (p->address_dialog);
-		p->address_dialog = NULL;
+	if (composer->address_dialog != NULL) {
+		gtk_widget_destroy (composer->address_dialog);
+		composer->address_dialog = NULL;
 	}
-	if (p->hdrs != NULL) {
-		gtk_widget_destroy (p->hdrs);
-		p->hdrs = NULL;
+	if (composer->hdrs != NULL) {
+		gtk_widget_destroy (composer->hdrs);
+		composer->hdrs = NULL;
 	}
 	
-	if (p->notify_id) {
+	if (composer->notify_id) {
 		GConfClient *gconf = gconf_client_get_default ();
-		gconf_client_notify_remove (gconf, p->notify_id);
-		p->notify_id = 0;
+		gconf_client_notify_remove (gconf, composer->notify_id);
+		composer->notify_id = 0;
 		g_object_unref (gconf);
 	}		
 
-	if (p->persist_stream_interface != CORBA_OBJECT_NIL) {
-		Bonobo_Unknown_unref (p->persist_stream_interface, &ev);
-		CORBA_Object_release (p->persist_stream_interface, &ev);
-		p->persist_stream_interface = CORBA_OBJECT_NIL;
+	if (composer->persist_stream_interface != CORBA_OBJECT_NIL) {
+		Bonobo_Unknown_unref (composer->persist_stream_interface, &ev);
+		CORBA_Object_release (composer->persist_stream_interface, &ev);
+		composer->persist_stream_interface = CORBA_OBJECT_NIL;
 	}
 	
-	if (p->persist_file_interface != CORBA_OBJECT_NIL) {
-		Bonobo_Unknown_unref (p->persist_file_interface, &ev);
-		CORBA_Object_release (p->persist_file_interface, &ev);
-		p->persist_file_interface = CORBA_OBJECT_NIL;
+	if (composer->persist_file_interface != CORBA_OBJECT_NIL) {
+		Bonobo_Unknown_unref (composer->persist_file_interface, &ev);
+		CORBA_Object_release (composer->persist_file_interface, &ev);
+		composer->persist_file_interface = CORBA_OBJECT_NIL;
 	}
 	
-	if (p->eeditor_engine != CORBA_OBJECT_NIL) {
-		Bonobo_Unknown_unref (p->eeditor_engine, &ev);
-		CORBA_Object_release (p->eeditor_engine, &ev);
-		p->eeditor_engine = CORBA_OBJECT_NIL;
+	if (composer->editor_engine != CORBA_OBJECT_NIL) {
+		Bonobo_Unknown_unref (composer->editor_engine, &ev);
+		CORBA_Object_release (composer->editor_engine, &ev);
+		composer->editor_engine = CORBA_OBJECT_NIL;
 	}
 	
 	CORBA_exception_free (&ev);
 	
-	if (p->eeditor_listener) {
-		bonobo_object_unref (p->eeditor_listener);
-		p->eeditor_listener = NULL;
+	if (composer->editor_listener) {
+		bonobo_object_unref (composer->editor_listener);
+		composer->editor_listener = NULL;
 	}
 	
 	signatures = mail_config_get_signatures ();
 	
-	if (p->sig_added_id != 0) {
-		g_signal_handler_disconnect (signatures, p->sig_added_id);
-		p->sig_added_id = 0;
+	if (composer->sig_added_id != 0) {
+		g_signal_handler_disconnect (signatures, composer->sig_added_id);
+		composer->sig_added_id = 0;
 	}
 	
-	if (p->sig_removed_id != 0) {
-		g_signal_handler_disconnect (signatures, p->sig_removed_id);
-		p->sig_removed_id = 0;
+	if (composer->sig_removed_id != 0) {
+		g_signal_handler_disconnect (signatures, composer->sig_removed_id);
+		composer->sig_removed_id = 0;
 	}
 	
-	if (p->sig_changed_id != 0) {
-		g_signal_handler_disconnect (signatures, p->sig_changed_id);
-		p->sig_changed_id = 0;
+	if (composer->sig_changed_id != 0) {
+		g_signal_handler_disconnect (signatures, composer->sig_changed_id);
+		composer->sig_changed_id = 0;
 	}
 
 	if (GTK_OBJECT_CLASS (parent_class)->destroy != NULL)
@@ -2791,7 +2656,6 @@ attach_message(EMsgComposer *composer, CamelMimeMessage *msg)
 {
 	CamelMimePart *mime_part;
 	const char *subject;
-	EMsgComposerPrivate *p = composer->priv;
 
 	mime_part = camel_mime_part_new();
 	camel_mime_part_set_disposition(mime_part, "inline");
@@ -2806,7 +2670,7 @@ attach_message(EMsgComposer *composer, CamelMimeMessage *msg)
 
 	camel_medium_set_content_object((CamelMedium *)mime_part, (CamelDataWrapper *)msg);
 	camel_mime_part_set_content_type(mime_part, "message/rfc822");
-	e_attachment_bar_attach_mime_part(E_ATTACHMENT_BAR(p->attachment_bar), mime_part);
+	e_attachment_bar_attach_mime_part(E_ATTACHMENT_BAR(composer->attachment_bar), mime_part);
 	camel_object_unref(mime_part);
 }
 
@@ -2829,9 +2693,8 @@ struct _drop_data {
 int
 e_msg_composer_get_remote_download_count (EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	return e_attachment_bar_get_download_count 
-				(E_ATTACHMENT_BAR (p->attachment_bar));
+				(E_ATTACHMENT_BAR (composer->attachment_bar));
 }
 
 static void
@@ -2844,8 +2707,7 @@ drop_action(EMsgComposer *composer, GdkDragContext *context, guint32 action, Gtk
 	CamelMimeMessage *msg;
 	char *content_type;
 	int i, success=FALSE, delete=FALSE;
-	EMsgComposerPrivate *p = composer->priv;
-	
+
 	switch (info) {
 	case DND_TYPE_MESSAGE_RFC822:
 		d(printf ("dropping a message/rfc822\n"));
@@ -2891,12 +2753,12 @@ drop_action(EMsgComposer *composer, GdkDragContext *context, guint32 action, Gtk
 
 				if (!g_ascii_strcasecmp (url->protocol, "file"))
 					e_attachment_bar_attach
-						(E_ATTACHMENT_BAR (p->attachment_bar),
+						(E_ATTACHMENT_BAR (composer->attachment_bar),
 					 	url->path,
 						"attachment");
 				else	{
 					e_attachment_bar_attach_remote_file 
-						(E_ATTACHMENT_BAR (p->attachment_bar),
+						(E_ATTACHMENT_BAR (composer->attachment_bar),
 						str);
 				}
 				g_free (str);
@@ -2917,7 +2779,7 @@ drop_action(EMsgComposer *composer, GdkDragContext *context, guint32 action, Gtk
 		camel_mime_part_set_disposition (mime_part, "inline");
 		
 		e_attachment_bar_attach_mime_part
-			(E_ATTACHMENT_BAR (p->attachment_bar),
+			(E_ATTACHMENT_BAR (composer->attachment_bar),
 			 mime_part);
 		
 		camel_object_unref (mime_part);
@@ -2935,8 +2797,8 @@ drop_action(EMsgComposer *composer, GdkDragContext *context, guint32 action, Gtk
 
 		uids = g_ptr_array_new();
 
-		inptr = (char*)selection->data;
-		inend = (char*)(selection->data + selection->length);
+		inptr = selection->data;
+		inend = selection->data + selection->length;
 		while (inptr < inend) {
 			char *start = inptr;
 
@@ -2984,7 +2846,7 @@ drop_action(EMsgComposer *composer, GdkDragContext *context, guint32 action, Gtk
 					desc = g_strdup_printf(ngettext("Attached message", "%d attached messages", uids->len), uids->len);
 					camel_mime_part_set_description(mime_part, desc);
 					g_free(desc);
-					e_attachment_bar_attach_mime_part(E_ATTACHMENT_BAR(p->attachment_bar), mime_part);
+					e_attachment_bar_attach_mime_part(E_ATTACHMENT_BAR(composer->attachment_bar), mime_part);
 					camel_object_unref(mime_part);
 					camel_object_unref(mp);
 				}
@@ -3002,7 +2864,7 @@ drop_action(EMsgComposer *composer, GdkDragContext *context, guint32 action, Gtk
 				camel_object_unref(folder);
 			} else {
 				e_error_run((GtkWindow *)composer, "mail-composer:attach-nomessages",
-					    (const gchar*)selection->data, camel_exception_get_description(&ex), NULL);
+					    selection->data, camel_exception_get_description(&ex), NULL);
 			}
 
 			camel_exception_clear(&ex);
@@ -3016,9 +2878,9 @@ drop_action(EMsgComposer *composer, GdkDragContext *context, guint32 action, Gtk
 		break;
 	}
 
-	if (e_attachment_bar_get_num_attachments(E_ATTACHMENT_BAR(p->attachment_bar))) {
-		gtk_widget_show (p->attachment_expander);
-		gtk_widget_show (p->attachment_scrolled_window);
+	if (e_attachment_bar_get_num_attachments(E_ATTACHMENT_BAR(composer->attachment_bar))) {
+		gtk_widget_show (composer->attachment_expander);
+		gtk_widget_show (composer->attachment_scrolled_window);
 	}
 
 	gtk_drag_finish(context, success, delete, time);
@@ -3146,6 +3008,8 @@ class_init (EMsgComposerClass *klass)
 	gobject_class = G_OBJECT_CLASS(klass);
 	object_class = GTK_OBJECT_CLASS (klass);
 	widget_class = GTK_WIDGET_CLASS (klass);
+
+	g_type_class_add_private(gobject_class, sizeof(struct _EMsgComposerPrivate));
 	
 	gobject_class->finalize = composer_finalise;
 	gobject_class->dispose = composer_dispose;
@@ -3177,49 +3041,49 @@ class_init (EMsgComposerClass *klass)
 static void
 init (EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = g_new0(EMsgComposerPrivate,1);
+	EMsgComposerPrivate *p = _PRIVATE(composer);
 
-	p->uic                      = NULL;
-	
-	p->hdrs                     = NULL;
-	p->extra_hdr_names          = g_ptr_array_new ();
-	p->extra_hdr_values         = g_ptr_array_new ();
+	composer->uic                      = NULL;
 	
-	p->focused_entry            = NULL;
+	composer->hdrs                     = NULL;
+	composer->extra_hdr_names          = g_ptr_array_new ();
+	composer->extra_hdr_values         = g_ptr_array_new ();
 	
-	p->eeditor                   = NULL;
+	composer->focused_entry            = NULL;
 	
-	p->address_dialog           = NULL;
+	composer->editor                   = NULL;
 	
-	p->attachment_bar           = NULL;
-	p->attachment_scrolled_window = NULL;
+	composer->address_dialog           = NULL;
 	
-	p->persist_file_interface   = CORBA_OBJECT_NIL;
-	p->persist_stream_interface = CORBA_OBJECT_NIL;
+	composer->attachment_bar           = NULL;
+	composer->attachment_scrolled_window = NULL;
 	
-	p->eeditor_engine            = CORBA_OBJECT_NIL;
-	p->inline_images            = g_hash_table_new (g_str_hash, g_str_equal);
-	p->inline_images_by_url     = g_hash_table_new (g_str_hash, g_str_equal);
-	p->current_images           = NULL;
+	composer->persist_file_interface   = CORBA_OBJECT_NIL;
+	composer->persist_stream_interface = CORBA_OBJECT_NIL;
 	
-	p->attachment_bar_visible   = FALSE;
-	p->send_html                = FALSE;
-	p->pgp_sign                 = FALSE;
-	p->pgp_encrypt              = FALSE;
-	p->smime_sign               = FALSE;
-	p->smime_encrypt            = FALSE;
+	composer->editor_engine            = CORBA_OBJECT_NIL;
+	composer->inline_images            = g_hash_table_new (g_str_hash, g_str_equal);
+	composer->inline_images_by_url     = g_hash_table_new (g_str_hash, g_str_equal);
+	composer->current_images           = NULL;
 	
-	p->has_changed              = FALSE;
-	p->autosaved                = FALSE;
+	composer->attachment_bar_visible   = FALSE;
+	composer->send_html                = FALSE;
+	composer->pgp_sign                 = FALSE;
+	composer->pgp_encrypt              = FALSE;
+	composer->smime_sign               = FALSE;
+	composer->smime_encrypt            = FALSE;
 	
-	p->redirect                 = FALSE;
+	composer->has_changed              = FALSE;
+	composer->autosaved                = FALSE;
 	
-	p->charset                  = NULL;
+	composer->redirect                 = FALSE;
 	
-	p->enable_autosave          = TRUE;
-	p->autosave_file            = NULL;
-	p->autosave_fd              = -1;
+	composer->charset                  = NULL;
 	
+	composer->enable_autosave          = TRUE;
+	composer->autosave_file            = NULL;
+	composer->autosave_fd              = -1;
+
 	/** @HookPoint-EMMenu: Main Mail Menu
 	 * @Id: org.gnome.evolution.mail.composer
 	 * @Class: org.gnome.evolution.mail.bonobomenu:1.0
@@ -3229,8 +3093,6 @@ init (EMsgComposer *composer)
 	 * target will point to the EMsgComposer object.
 	 */
 	p->menu = em_menu_new("org.gnome.evolution.mail.composer");
-	
-	composer->priv = p;
 }
 
 
@@ -3260,43 +3122,42 @@ static void
 e_msg_composer_load_config (EMsgComposer *composer, int visible_mask)
 {
 	GConfClient *gconf;
-	EMsgComposerPrivate *p = composer->priv;
 	
 	gconf = gconf_client_get_default ();
 	
-	p->view_from = gconf_client_get_bool (
+	composer->view_from = gconf_client_get_bool (
 		gconf, "/apps/evolution/mail/composer/view/From", NULL);
-	p->view_replyto = gconf_client_get_bool (
+	composer->view_replyto = gconf_client_get_bool (
 		gconf, "/apps/evolution/mail/composer/view/ReplyTo", NULL);
-	p->view_to = gconf_client_get_bool (
+	composer->view_to = gconf_client_get_bool (
 		gconf, "/apps/evolution/mail/composer/view/To", NULL);
-	p->view_postto = gconf_client_get_bool (
+	composer->view_postto = gconf_client_get_bool (
 		gconf, "/apps/evolution/mail/composer/view/PostTo", NULL);
-	p->view_cc = gconf_client_get_bool ( 
+	composer->view_cc = gconf_client_get_bool ( 
 		gconf, "/apps/evolution/mail/composer/view/Cc", NULL);
-	p->view_bcc = gconf_client_get_bool (
+	composer->view_bcc = gconf_client_get_bool (
 		gconf, "/apps/evolution/mail/composer/view/Bcc", NULL);
-	p->view_subject = gconf_client_get_bool (
+	composer->view_subject = gconf_client_get_bool (
 		gconf, "/apps/evolution/mail/composer/view/Subject", NULL);
 	
 	/* if we're mailing, you cannot disable to so it should appear checked */
 	if (visible_mask & E_MSG_COMPOSER_VISIBLE_TO)
-		p->view_to = TRUE;
+		composer->view_to = TRUE;
 	else
-		p->view_to = FALSE;
+		composer->view_to = FALSE;
 	
 	/* ditto for post-to */
 	if (visible_mask & E_MSG_COMPOSER_VISIBLE_POSTTO)
-		p->view_postto = TRUE;
+		composer->view_postto = TRUE;
 	else
-		p->view_postto = FALSE;
+		composer->view_postto = FALSE;
 	
 	/* we set these to false initially if we're posting */
 	if (!(visible_mask & E_MSG_COMPOSER_VISIBLE_CC))
-		p->view_cc = FALSE;
+		composer->view_cc = FALSE;
 	
 	if (!(visible_mask & E_MSG_COMPOSER_VISIBLE_BCC))
-		p->view_bcc = FALSE;
+		composer->view_bcc = FALSE;
 	
 	g_object_unref (gconf);
 }
@@ -3305,21 +3166,20 @@ static int
 e_msg_composer_get_visible_flags (EMsgComposer *composer)
 {
 	int flags = 0;
-	EMsgComposerPrivate *p = composer->priv;
 	
-	if (p->view_from)
+	if (composer->view_from)
 		flags |= E_MSG_COMPOSER_VISIBLE_FROM;
-	if (p->view_replyto)
+	if (composer->view_replyto)
 		flags |= E_MSG_COMPOSER_VISIBLE_REPLYTO;
-	if (p->view_to)
+	if (composer->view_to)
 		flags |= E_MSG_COMPOSER_VISIBLE_TO;
-	if (p->view_postto)
+	if (composer->view_postto)
 		flags |= E_MSG_COMPOSER_VISIBLE_POSTTO;
-	if (p->view_cc)
+	if (composer->view_cc)
 		flags |= E_MSG_COMPOSER_VISIBLE_CC;
-	if (p->view_bcc)
+	if (composer->view_bcc)
 		flags |= E_MSG_COMPOSER_VISIBLE_BCC;
-	if (p->view_subject)
+	if (composer->view_subject)
 		flags |= E_MSG_COMPOSER_VISIBLE_SUBJECT;
 	
 	/*
@@ -3340,11 +3200,10 @@ map_default_cb (EMsgComposer *composer, gpointer user_data)
 	CORBA_Environment ev;
 	const char *subject;
 	const char *text;
-	EMsgComposerPrivate *p = composer->priv;
 
 	/* If the 'To:' field is empty, focus it */	
 
-	widget = e_msg_composer_hdrs_get_to_entry (E_MSG_COMPOSER_HDRS (p->hdrs));
+	widget = e_msg_composer_hdrs_get_to_entry (E_MSG_COMPOSER_HDRS (composer->hdrs));
 	text = gtk_entry_get_text (GTK_ENTRY (widget));
 	
 	if (!text || text[0] == '\0') {
@@ -3355,10 +3214,10 @@ map_default_cb (EMsgComposer *composer, gpointer user_data)
 	
 	/* If not, check the subject field */
 	
-	subject = e_msg_composer_hdrs_get_subject (E_MSG_COMPOSER_HDRS (p->hdrs));
+	subject = e_msg_composer_hdrs_get_subject (E_MSG_COMPOSER_HDRS (composer->hdrs));
 	
 	if (!subject || subject[0] == '\0') {
-		widget = e_msg_composer_hdrs_get_subject_entry (E_MSG_COMPOSER_HDRS (p->hdrs));
+		widget = e_msg_composer_hdrs_get_subject_entry (E_MSG_COMPOSER_HDRS (composer->hdrs));
 		gtk_widget_grab_focus (widget);
 		return;
 	}
@@ -3366,7 +3225,7 @@ map_default_cb (EMsgComposer *composer, gpointer user_data)
 	/* Jump to the editor as a last resort. */
 	
 	CORBA_exception_init (&ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "grab-focus", &ev);
+	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "grab-focus", &ev);
 	CORBA_exception_free (&ev);
 }
 
@@ -3405,23 +3264,22 @@ static gboolean
 composer_entry_focus_in_event_cb (GtkWidget *widget, GdkEventFocus *event, gpointer user_data)
 {
 	EMsgComposer *composer = user_data;
-	EMsgComposerPrivate *p = composer->priv;
 	BonoboUIContainer *container;
 
-	p->focused_entry = widget;
+	composer->focused_entry = widget;
 
 	container = bonobo_window_get_ui_container (BONOBO_WINDOW (composer));
-	bonobo_ui_component_set_container (p->entry_uic, bonobo_object_corba_objref (BONOBO_OBJECT (container)), NULL);
+	bonobo_ui_component_set_container (composer->entry_uic, bonobo_object_corba_objref (BONOBO_OBJECT (container)), NULL);
 
-	bonobo_ui_component_add_verb_list_with_data (p->entry_uic, entry_verbs, composer);
+	bonobo_ui_component_add_verb_list_with_data (composer->entry_uic, entry_verbs, composer);
 
-	bonobo_ui_component_freeze (p->entry_uic, NULL);
+	bonobo_ui_component_freeze (composer->entry_uic, NULL);
 
-	bonobo_ui_util_set_ui (p->entry_uic, PREFIX,
+	bonobo_ui_util_set_ui (composer->entry_uic, PREFIX,
 			       EVOLUTION_UIDIR "/evolution-composer-entries.xml",
 			       "evolution-composer-entries", NULL);
 	
-	bonobo_ui_component_thaw (p->entry_uic, NULL);
+	bonobo_ui_component_thaw (composer->entry_uic, NULL);
 	
 	return FALSE;
 }
@@ -3430,12 +3288,11 @@ static gboolean
 composer_entry_focus_out_event_cb (GtkWidget *widget, GdkEventFocus *event, gpointer user_data)
 {
 	EMsgComposer *composer = user_data;
-	EMsgComposerPrivate *p = composer->priv;
 	
-	g_assert (p->focused_entry == widget);
-	p->focused_entry = NULL;
+	g_assert (composer->focused_entry == widget);
+	composer->focused_entry = NULL;
 
-	bonobo_ui_component_unset_container (p->entry_uic, NULL);
+	bonobo_ui_component_unset_container (composer->entry_uic, NULL);
 	
 	return FALSE;
 }
@@ -3444,10 +3301,9 @@ static void
 setup_cut_copy_paste (EMsgComposer *composer)
 {
 	EMsgComposerHdrs *hdrs;
-	EMsgComposerPrivate *p = composer->priv;
 	GtkWidget *entry;
 	
-	hdrs = (EMsgComposerHdrs *) p->hdrs;
+	hdrs = (EMsgComposerHdrs *) composer->hdrs;
 	
 	entry = e_msg_composer_hdrs_get_subject_entry (hdrs);
 	g_signal_connect (entry, "focus_in_event", G_CALLBACK (composer_entry_focus_in_event_cb), composer);
@@ -3479,20 +3335,19 @@ composer_settings_update (GConfClient *gconf, guint cnxn_id, GConfEntry *entry,
 {
 	gboolean bool;
 	EMsgComposer *composer = data;
-	EMsgComposerPrivate *p = composer->priv;
 
 	bool = gconf_client_get_bool (gconf, "/apps/evolution/mail/composer/magic_smileys", NULL);
-	bonobo_widget_set_property (BONOBO_WIDGET (p->eeditor),
+	bonobo_widget_set_property (BONOBO_WIDGET (composer->editor),
 				    "MagicSmileys", TC_CORBA_boolean, bool,
 				    NULL);
 
 	bool = gconf_client_get_bool (gconf, "/apps/evolution/mail/composer/magic_links", NULL);
-	bonobo_widget_set_property (BONOBO_WIDGET (p->eeditor),
+	bonobo_widget_set_property (BONOBO_WIDGET (composer->editor),
 				    "MagicLinks", TC_CORBA_boolean, bool,
 				    NULL);
 
 	bool = gconf_client_get_bool (gconf, "/apps/evolution/mail/composer/inline_spelling", NULL);
-	bonobo_widget_set_property (BONOBO_WIDGET (p->eeditor),
+	bonobo_widget_set_property (BONOBO_WIDGET (composer->editor),
 				   "InlineSpelling", TC_CORBA_boolean, bool,
 				   NULL);
 }
@@ -3668,11 +3523,8 @@ create_composer (int visible_mask)
 	GtkWidget *html_widget = NULL;
 	gpointer servant;;
 	BonoboObject *impl;	
-	EMsgComposerPrivate *p;
 	
 	composer = g_object_new (E_TYPE_MSG_COMPOSER, "win_name", _("Compose a message"), NULL);
-	p = composer->priv;
-	
 	gtk_window_set_title ((GtkWindow *) composer, _("Compose a message"));
 	
 	all_composers = g_slist_prepend (all_composers, composer);
@@ -3703,49 +3555,49 @@ create_composer (int visible_mask)
 	vbox = gtk_vbox_new (FALSE, 0);
 	
 	vis = e_msg_composer_get_visible_flags (composer);
-	p->hdrs = e_msg_composer_hdrs_new (p->uic, visible_mask, vis);
-	if (!p->hdrs) {
+	composer->hdrs = e_msg_composer_hdrs_new (composer->uic, visible_mask, vis);
+	if (!composer->hdrs) {
 		e_error_run (GTK_WINDOW (composer), "mail-composer:no-address-control", NULL);
 		gtk_object_destroy (GTK_OBJECT (composer));
 		return NULL;
 	}
 	
 	gtk_box_set_spacing (GTK_BOX (vbox), 6);
-	gtk_box_pack_start (GTK_BOX (vbox), p->hdrs, FALSE, FALSE, 0);
-	g_signal_connect (p->hdrs, "subject_changed",
+	gtk_box_pack_start (GTK_BOX (vbox), composer->hdrs, FALSE, FALSE, 0);
+	g_signal_connect (composer->hdrs, "subject_changed",
 			  G_CALLBACK (subject_changed_cb), composer);
-	g_signal_connect (p->hdrs, "hdrs_changed",
+	g_signal_connect (composer->hdrs, "hdrs_changed",
 			  G_CALLBACK (hdrs_changed_cb), composer);
-	g_signal_connect (p->hdrs, "from_changed",
+	g_signal_connect (composer->hdrs, "from_changed",
 			  G_CALLBACK (from_changed_cb), composer);
-	gtk_widget_show (p->hdrs);
+	gtk_widget_show (composer->hdrs);
 	
 	setup_signatures_menu (composer);
 
-	from_changed_cb((EMsgComposerHdrs *)p->hdrs, composer);
+	from_changed_cb((EMsgComposerHdrs *)composer->hdrs, composer);
 
 	/* Editor component.  */
-	p->eeditor = bonobo_widget_new_control (
+	composer->editor = bonobo_widget_new_control (
 		GNOME_GTKHTML_EDITOR_CONTROL_ID,
-		bonobo_ui_component_get_container (p->uic));
-	if (!p->eeditor) {
+		bonobo_ui_component_get_container (composer->uic));
+	if (!composer->editor) {
 		e_error_run (GTK_WINDOW (composer), "mail-composer:no-editor-control", NULL);
 		gtk_object_destroy (GTK_OBJECT (composer));
 		return NULL;
 	}
 
-	control_frame = bonobo_widget_get_control_frame (BONOBO_WIDGET (p->eeditor));
+	control_frame = bonobo_widget_get_control_frame (BONOBO_WIDGET (composer->editor));
 	bonobo_control_frame_set_autoactivate (control_frame, TRUE);
 	
 	/* let the editor know which mode we are in */
-	bonobo_widget_set_property (BONOBO_WIDGET (p->eeditor), 
-				    "FormatHTML", TC_CORBA_boolean, p->send_html,
+	bonobo_widget_set_property (BONOBO_WIDGET (composer->editor), 
+				    "FormatHTML", TC_CORBA_boolean, composer->send_html,
 				    NULL);
 	
 	gconf = gconf_client_get_default ();
 	composer_settings_update (gconf, 0, NULL, composer);
 	gconf_client_add_dir (gconf, "/apps/evolution/mail/composer", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
-	p->notify_id = gconf_client_notify_add (gconf, "/apps/evolution/mail/composer",
+	composer->notify_id = gconf_client_notify_add (gconf, "/apps/evolution/mail/composer",
 						       composer_settings_update, composer, NULL, NULL);
 	gtk_window_set_default_size (GTK_WINDOW (composer),
 				     gconf_client_get_int (gconf, "/apps/evolution/mail/composer/width", NULL),
@@ -3753,68 +3605,68 @@ create_composer (int visible_mask)
 	g_signal_connect (composer, "unrealize", G_CALLBACK (e_msg_composer_unrealize), NULL);
 	g_object_unref (gconf);
 	
-	editor_server = bonobo_widget_get_objref (BONOBO_WIDGET (p->eeditor));
+	editor_server = bonobo_widget_get_objref (BONOBO_WIDGET (composer->editor));
 	
 	/* FIXME: handle exceptions */
 	CORBA_exception_init (&ev);
-	p->persist_file_interface
+	composer->persist_file_interface
 		= Bonobo_Unknown_queryInterface (editor_server, "IDL:Bonobo/PersistFile:1.0", &ev);
-	p->persist_stream_interface
+	composer->persist_stream_interface
 		= Bonobo_Unknown_queryInterface (editor_server, "IDL:Bonobo/PersistStream:1.0", &ev);
 	CORBA_exception_free (&ev);
 	
-	gtk_box_pack_start (GTK_BOX (vbox), p->eeditor, TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (vbox), composer->editor, TRUE, TRUE, 0);
 	
 	/* Attachment editor, wrapped into an EScrollFrame.  It's
            hidden in an EExpander. */
 	
-	p->attachment_scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (p->attachment_scrolled_window),
+	composer->attachment_scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (composer->attachment_scrolled_window),
 					     GTK_SHADOW_IN);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (p->attachment_scrolled_window),
+	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (composer->attachment_scrolled_window),
 					GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	
-	p->attachment_bar = e_attachment_bar_new (NULL);
+	composer->attachment_bar = e_attachment_bar_new (NULL);
 
-	g_signal_connect (p->attachment_bar, "button_press_event", G_CALLBACK (button_press_event), NULL);
-	g_signal_connect (p->attachment_bar, "key_press_event", G_CALLBACK (key_press_event), NULL);
-	g_signal_connect (p->attachment_bar, "popup-menu", G_CALLBACK (popup_menu_event), NULL);
+	g_signal_connect (composer->attachment_bar, "button_press_event", G_CALLBACK (button_press_event), NULL);
+	g_signal_connect (composer->attachment_bar, "key_press_event", G_CALLBACK (key_press_event), NULL);
+	g_signal_connect (composer->attachment_bar, "popup-menu", G_CALLBACK (popup_menu_event), NULL);
 	
-	GTK_WIDGET_SET_FLAGS (p->attachment_bar, GTK_CAN_FOCUS);
-	gtk_container_add (GTK_CONTAINER (p->attachment_scrolled_window),
-			   p->attachment_bar);
-	gtk_widget_show (p->attachment_bar);
-	g_signal_connect (p->attachment_bar, "changed",
+	GTK_WIDGET_SET_FLAGS (composer->attachment_bar, GTK_CAN_FOCUS);
+	gtk_container_add (GTK_CONTAINER (composer->attachment_scrolled_window),
+			   composer->attachment_bar);
+	gtk_widget_show (composer->attachment_bar);
+	g_signal_connect (composer->attachment_bar, "changed",
 			  G_CALLBACK (attachment_bar_changed_cb), composer);
 
-	p->attachment_expander_label =
+	composer->attachment_expander_label =
 		gtk_label_new_with_mnemonic (_("_Attachment Bar"));
-	p->attachment_expander_num = gtk_label_new ("");
-	gtk_label_set_use_markup (GTK_LABEL (p->attachment_expander_num), TRUE);
-	gtk_misc_set_alignment (GTK_MISC (p->attachment_expander_label), 0.0, 0.5);
-	gtk_misc_set_alignment (GTK_MISC (p->attachment_expander_num), 1.0, 0.5);
+	composer->attachment_expander_num = gtk_label_new ("");
+	gtk_label_set_use_markup (GTK_LABEL (composer->attachment_expander_num), TRUE);
+	gtk_misc_set_alignment (GTK_MISC (composer->attachment_expander_label), 0.0, 0.5);
+	gtk_misc_set_alignment (GTK_MISC (composer->attachment_expander_num), 1.0, 0.5);
 	expander_hbox = gtk_hbox_new (FALSE, 0);
 	
-	p->attachment_expander_icon = e_icon_factory_get_image ("stock_attach", E_ICON_SIZE_MENU);
-	gtk_misc_set_alignment (GTK_MISC (p->attachment_expander_icon), 1, 0.5);
-	gtk_widget_set_size_request (p->attachment_expander_icon, 100, -1);
+	composer->attachment_expander_icon = e_icon_factory_get_image ("stock_attach", E_ICON_SIZE_MENU);
+	gtk_misc_set_alignment (GTK_MISC (composer->attachment_expander_icon), 1, 0.5);
+	gtk_widget_set_size_request (composer->attachment_expander_icon, 100, -1);
 
-	gtk_box_pack_start (GTK_BOX (expander_hbox), p->attachment_expander_label,
+	gtk_box_pack_start (GTK_BOX (expander_hbox), composer->attachment_expander_label,
 			    TRUE, TRUE, GNOME_PAD_SMALL);
-	gtk_box_pack_start (GTK_BOX (expander_hbox), p->attachment_expander_icon,
+	gtk_box_pack_start (GTK_BOX (expander_hbox), composer->attachment_expander_icon,
 			    TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (expander_hbox), p->attachment_expander_num,
+	gtk_box_pack_start (GTK_BOX (expander_hbox), composer->attachment_expander_num,
 			    FALSE, FALSE, GNOME_PAD_SMALL);
 	gtk_widget_show_all (expander_hbox);
-	gtk_widget_hide (p->attachment_expander_icon);
+	gtk_widget_hide (composer->attachment_expander_icon);
 
 	
 	gtk_box_pack_start (GTK_BOX (vbox), expander_hbox, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), p->attachment_scrolled_window,
+	gtk_box_pack_start (GTK_BOX (vbox), composer->attachment_scrolled_window,
 			    FALSE, FALSE, GNOME_PAD_SMALL);
 	
-	p->attachment_expander = expander_hbox;
-	gtk_widget_hide (p->attachment_scrolled_window);
+	composer->attachment_expander = expander_hbox;
+	gtk_widget_hide (composer->attachment_scrolled_window);
 	gtk_widget_hide (expander_hbox);
 	
 	bonobo_window_set_contents (BONOBO_WINDOW (composer), vbox);
@@ -3823,10 +3675,10 @@ create_composer (int visible_mask)
 	/* If we show this widget earlier, we lose network transparency. i.e. the
 	   component appears on the machine evo is running on, ignoring any DISPLAY
 	   variable. */
-	gtk_widget_show (p->eeditor);
+	gtk_widget_show (composer->editor);
 	
 	prepare_engine (composer);
-	if (p->eeditor_engine == CORBA_OBJECT_NIL) {
+	if (composer->editor_engine == CORBA_OBJECT_NIL) {
 		e_error_run (GTK_WINDOW (composer), "mail-composer:no-editor-control", NULL);
 		gtk_object_destroy (GTK_OBJECT (composer));
 		return NULL;
@@ -3836,7 +3688,7 @@ create_composer (int visible_mask)
 	 * We'll use that to listen for DnD signals
 	 */
 	
-	servant = ORBit_small_get_servant (p->eeditor_engine);
+	servant = ORBit_small_get_servant (composer->editor_engine);
     	if (servant && (impl = bonobo_object (servant)))
 		html_widget = g_object_get_data (G_OBJECT(impl), "html-widget");
 
@@ -3853,7 +3705,7 @@ create_composer (int visible_mask)
 	
 	autosave_manager_register (am, composer);
 
-	p->has_changed = FALSE;
+	composer->has_changed = FALSE;
 	
 	return composer;
 }
@@ -3862,15 +3714,14 @@ static void
 set_editor_signature (EMsgComposer *composer)
 {
 	EAccountIdentity *id;
-	EMsgComposerPrivate *p = composer->priv;
 	
-	g_return_if_fail (E_MSG_COMPOSER_HDRS (p->hdrs)->account != NULL);
+	g_return_if_fail (E_MSG_COMPOSER_HDRS (composer->hdrs)->account != NULL);
 	
-	id = E_MSG_COMPOSER_HDRS (p->hdrs)->account->id;
+	id = E_MSG_COMPOSER_HDRS (composer->hdrs)->account->id;
 	if (id->sig_uid)
-		p->signature = mail_config_get_signature_by_uid (id->sig_uid);
+		composer->signature = mail_config_get_signature_by_uid (id->sig_uid);
 	else
-		p->signature = NULL;
+		composer->signature = NULL;
 	
 	sig_select_item (composer);
 }
@@ -4275,23 +4126,22 @@ static void
 set_signature_gui (EMsgComposer *composer)
 {
 	CORBA_Environment ev;
-	EMsgComposerPrivate *p = composer->priv;
 	
-	p->signature = NULL;
+	composer->signature = NULL;
 	
 	CORBA_exception_init (&ev);
-	if (GNOME_GtkHTML_Editor_Engine_searchByData (p->eeditor_engine, 1, "ClueFlow", "signature", "1", &ev)) {
+	if (GNOME_GtkHTML_Editor_Engine_searchByData (composer->editor_engine, 1, "ClueFlow", "signature", "1", &ev)) {
 		char *name, *str = NULL;
 		
-		str = GNOME_GtkHTML_Editor_Engine_getParagraphData (p->eeditor_engine, "signature_name", &ev);
+		str = GNOME_GtkHTML_Editor_Engine_getParagraphData (composer->editor_engine, "signature_name", &ev);
 		if (ev._major == CORBA_NO_EXCEPTION && str) {
 			if (!strncmp (str, "uid:", 4)) {
 				name = decode_signature_name (str + 4);
-				p->signature = mail_config_get_signature_by_uid (name);
+				composer->signature = mail_config_get_signature_by_uid (name);
 				g_free (name);
 			} else if (!strncmp (str, "name:", 5)) {
 				name = decode_signature_name (str + 4);
-				p->signature = mail_config_get_signature_by_name (name);
+				composer->signature = mail_config_get_signature_by_name (name);
 				g_free (name);
 			}
 		}
@@ -4334,7 +4184,6 @@ e_msg_composer_new_with_message (CamelMimeMessage *message)
 	EMsgComposer *new;
 	struct _camel_header_raw *xev;
 	int len, i;
-	EMsgComposerPrivate *p;
 	
 	for (headers = CAMEL_MIME_PART (message)->headers;headers;headers = headers->next) {
 		if (!strcmp(headers->name, "X-Evolution-PostTo"))
@@ -4342,8 +4191,6 @@ e_msg_composer_new_with_message (CamelMimeMessage *message)
 	}
 
 	new = create_composer (postto ? E_MSG_COMPOSER_VISIBLE_MASK_POST : E_MSG_COMPOSER_VISIBLE_MASK_MAIL);
-	p = new->priv;
-	
 	if (!new) {
 		g_list_foreach(postto, (GFunc)g_free, NULL);
 		g_list_free(postto);
@@ -4351,7 +4198,7 @@ e_msg_composer_new_with_message (CamelMimeMessage *message)
 	}
 	
 	if (postto) {
-		e_msg_composer_hdrs_set_post_to_list(E_MSG_COMPOSER_HDRS (p->hdrs), postto);
+		e_msg_composer_hdrs_set_post_to_list(E_MSG_COMPOSER_HDRS (new->hdrs), postto);
 		g_list_foreach(postto, (GFunc)g_free, NULL);
 		g_list_free(postto);
 		postto = NULL;
@@ -4522,8 +4369,8 @@ e_msg_composer_new_with_message (CamelMimeMessage *message)
 		if (!is_special_header (headers->name) ||
 		    !g_ascii_strcasecmp (headers->name, "References") ||
 		    !g_ascii_strcasecmp (headers->name, "In-Reply-To")) {
-			g_ptr_array_add (p->extra_hdr_names, g_strdup (headers->name));
-			g_ptr_array_add (p->extra_hdr_values, g_strdup (headers->value));
+			g_ptr_array_add (new->extra_hdr_names, g_strdup (headers->name));
+			g_ptr_array_add (new->extra_hdr_values, g_strdup (headers->value));
 		}
 		
 		headers = headers->next;
@@ -4572,17 +4419,16 @@ static void
 disable_editor (EMsgComposer *composer)
 {
 	CORBA_Environment ev;
-	EMsgComposerPrivate *p = composer->priv;
 
 	CORBA_exception_init (&ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "editable-off", &ev);
+	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "editable-off", &ev);
 	CORBA_exception_free (&ev);
 	
-	gtk_widget_set_sensitive (p->attachment_bar, FALSE);
+	gtk_widget_set_sensitive (composer->attachment_bar, FALSE);
 	
-	bonobo_ui_component_set_prop (p->uic, "/menu/Edit", "sensitive", "0", NULL);
-	bonobo_ui_component_set_prop (p->uic, "/menu/Format", "sensitive", "0", NULL);
-	bonobo_ui_component_set_prop (p->uic, "/menu/Insert", "sensitive", "0", NULL);
+	bonobo_ui_component_set_prop (composer->uic, "/menu/Edit", "sensitive", "0", NULL);
+	bonobo_ui_component_set_prop (composer->uic, "/menu/Format", "sensitive", "0", NULL);
+	bonobo_ui_component_set_prop (composer->uic, "/menu/Insert", "sensitive", "0", NULL);
 }
 
 /**
@@ -4602,11 +4448,9 @@ e_msg_composer_new_redirect (CamelMimeMessage *message, const char *resent_from)
 	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), NULL);
 	
 	composer = e_msg_composer_new_with_message (message);
-	EMsgComposerPrivate *p = composer->priv;
-	
 	subject = camel_mime_message_get_subject (message);
 	
-	p->redirect = message;
+	composer->redirect = message;
 	camel_object_ref (message);
 	
 	e_msg_composer_set_headers (composer, resent_from, NULL, NULL, NULL, subject);
@@ -4644,7 +4488,6 @@ static void
 handle_mailto (EMsgComposer *composer, const char *mailto)
 {
 	EMsgComposerHdrs *hdrs;
-	EMsgComposerPrivate *priv = composer->priv;
 	GList *to = NULL, *cc = NULL, *bcc = NULL;
 	EDestination **tov, **ccv, **bccv;
 	char *subject = NULL, *body = NULL;
@@ -4723,17 +4566,15 @@ handle_mailto (EMsgComposer *composer, const char *mailto)
 				/* Change file url to absolute path */
 				if (!g_ascii_strncasecmp (content, "file:", 5)) {
 					url = camel_url_new (content, NULL);
-					e_attachment_bar_attach (E_ATTACHMENT_BAR (priv->attachment_bar),
+					e_attachment_bar_attach (E_ATTACHMENT_BAR (composer->attachment_bar),
 							 	 url->path,
 								 "attachment");
 					camel_url_free (url);
 				} else {
-					e_attachment_bar_attach (E_ATTACHMENT_BAR (priv->attachment_bar),
+					e_attachment_bar_attach (E_ATTACHMENT_BAR (composer->attachment_bar),
 								 content,
 								 "attachment");
 				}
-				gtk_widget_show (priv->attachment_expander);
-        			gtk_widget_show (priv->attachment_scrolled_window);  
 			} else if (!g_ascii_strcasecmp (header, "from")) {
 				/* Ignore */
 			} else if (!g_ascii_strcasecmp (header, "reply-to")) {
@@ -4764,7 +4605,7 @@ handle_mailto (EMsgComposer *composer, const char *mailto)
 	g_list_free (cc);
 	g_list_free (bcc);
 	
-	hdrs = E_MSG_COMPOSER_HDRS (priv->hdrs);
+	hdrs = E_MSG_COMPOSER_HDRS (composer->hdrs);
 	
 	e_msg_composer_hdrs_set_to (hdrs, tov);
 	e_msg_composer_hdrs_set_cc (hdrs, ccv);
@@ -4833,11 +4674,10 @@ e_msg_composer_set_headers (EMsgComposer *composer,
 			    const char *subject)
 {
 	EMsgComposerHdrs *hdrs;
-	EMsgComposerPrivate *p = composer->priv;
 	
 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 	
-	hdrs = E_MSG_COMPOSER_HDRS (p->hdrs);
+	hdrs = E_MSG_COMPOSER_HDRS (composer->hdrs);
 	
 	e_msg_composer_hdrs_set_to (hdrs, to);
 	e_msg_composer_hdrs_set_cc (hdrs, cc);
@@ -4875,20 +4715,19 @@ void
 e_msg_composer_set_body (EMsgComposer *composer, const char *body,
 			 const char *mime_type)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 	
 	set_editor_text (composer, _("<b>(The composer contains a non-text message body, which cannot be edited.)<b>"), -1, FALSE, FALSE);
 	e_msg_composer_set_send_html (composer, FALSE);
 	disable_editor (composer);
 	
-	g_free (p->mime_body);
-	p->mime_body = g_strdup (body);
-	g_free (p->mime_type);
-	p->mime_type = g_strdup (mime_type);
+	g_free (composer->mime_body);
+	composer->mime_body = g_strdup (body);
+	g_free (composer->mime_type);
+	composer->mime_type = g_strdup (mime_type);
 
-	if (g_ascii_strncasecmp (p->mime_type, "text/calendar", 13) == 0) {
-		EMsgComposerHdrs *hdrs = E_MSG_COMPOSER_HDRS (p->hdrs);
+	if (g_ascii_strncasecmp (composer->mime_type, "text/calendar", 13) == 0) {
+		EMsgComposerHdrs *hdrs = E_MSG_COMPOSER_HDRS (composer->hdrs);
 		if (hdrs->account && hdrs->account->pgp_no_imip_sign)
 			e_msg_composer_set_pgp_sign (composer, FALSE);
 	}
@@ -4909,14 +4748,12 @@ void
 e_msg_composer_add_header (EMsgComposer *composer, const char *name,
 			   const char *value)
 {
-	EMsgComposerPrivate *p = composer->priv;
-
 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 	g_return_if_fail (name != NULL);
 	g_return_if_fail (value != NULL);
 	
-	g_ptr_array_add (p->extra_hdr_names, g_strdup (name));
-	g_ptr_array_add (p->extra_hdr_values, g_strdup (value));
+	g_ptr_array_add (composer->extra_hdr_names, g_strdup (name));
+	g_ptr_array_add (composer->extra_hdr_values, g_strdup (value));
 }
 
 
@@ -4931,15 +4768,14 @@ void
 e_msg_composer_attach (EMsgComposer *composer, CamelMimePart *attachment)
 {
 	EAttachmentBar *bar;
-	EMsgComposerPrivate *p = composer->priv;
 	
 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 	g_return_if_fail (CAMEL_IS_MIME_PART (attachment));
 	
-	bar = E_ATTACHMENT_BAR (p->attachment_bar);
+	bar = E_ATTACHMENT_BAR (composer->attachment_bar);
 	e_attachment_bar_attach_mime_part (bar, attachment);
-	gtk_widget_show (p->attachment_expander);
-	gtk_widget_show (p->attachment_scrolled_window);
+	gtk_widget_show (composer->attachment_expander);
+	gtk_widget_show (composer->attachment_scrolled_window);
 
 }
 
@@ -4964,7 +4800,6 @@ e_msg_composer_add_inline_image_from_file (EMsgComposer *composer,
 	CamelDataWrapper *wrapper;
 	CamelMimePart *part;
 	struct stat statbuf;
-	EMsgComposerPrivate *p = composer->priv;
 	
 	/* check for regular file */
 	if (stat (file_name, &statbuf) < 0 || !S_ISREG (statbuf.st_mode))
@@ -4994,10 +4829,10 @@ e_msg_composer_add_inline_image_from_file (EMsgComposer *composer,
 	camel_mime_part_set_encoding (part, CAMEL_TRANSFER_ENCODING_BASE64);
 	
 	url = g_strdup_printf ("file:%s", file_name);
-	g_hash_table_insert (p->inline_images_by_url, url, part);
+	g_hash_table_insert (composer->inline_images_by_url, url, part);
 	
 	url = g_strdup_printf ("cid:%s", cid);
-	g_hash_table_insert (p->inline_images, url, part);
+	g_hash_table_insert (composer->inline_images, url, part);
 	g_free (cid);
 	
 	return part;
@@ -5018,7 +4853,6 @@ e_msg_composer_add_inline_image_from_mime_part (EMsgComposer  *composer,
 {
 	char *url;
 	const char *location, *cid;
-	EMsgComposerPrivate *p = composer->priv;
 
 	cid = camel_mime_part_get_content_id (part);
 	if (!cid) {
@@ -5027,12 +4861,12 @@ e_msg_composer_add_inline_image_from_mime_part (EMsgComposer  *composer,
 	}
 	
 	url = g_strdup_printf ("cid:%s", cid);
-	g_hash_table_insert (p->inline_images, url, part);
+	g_hash_table_insert (composer->inline_images, url, part);
 	camel_object_ref (part);
 	
 	location = camel_mime_part_get_content_location (part);
 	if (location) {
-		g_hash_table_insert (p->inline_images_by_url,
+		g_hash_table_insert (composer->inline_images_by_url,
 				     g_strdup (location), part);
 	}
 }
@@ -5070,36 +4904,35 @@ e_msg_composer_get_message_draft (EMsgComposer *composer)
 	gboolean old_send_html;
 	GString *flags;
 	int i;
-	EMsgComposerPrivate *p = composer->priv;
-	
+
 	/* always save drafts as HTML to preserve formatting */
-	old_send_html = p->send_html;
-	p->send_html = TRUE;
-	old_flags[0] = p->pgp_sign;
-	p->pgp_sign = FALSE;
-	old_flags[1] = p->pgp_encrypt;
-	p->pgp_encrypt = FALSE;
-	old_flags[2] = p->smime_sign;
-	p->smime_sign = FALSE;
-	old_flags[3] = p->smime_encrypt;
-	p->smime_encrypt = FALSE;
+	old_send_html = composer->send_html;
+	composer->send_html = TRUE;
+	old_flags[0] = composer->pgp_sign;
+	composer->pgp_sign = FALSE;
+	old_flags[1] = composer->pgp_encrypt;
+	composer->pgp_encrypt = FALSE;
+	old_flags[2] = composer->smime_sign;
+	composer->smime_sign = FALSE;
+	old_flags[3] = composer->smime_encrypt;
+	composer->smime_encrypt = FALSE;
 	
 	msg = build_message (composer, TRUE);
 	
-	p->send_html = old_send_html;
-	p->pgp_sign = old_flags[0];
-	p->pgp_encrypt = old_flags[1];
-	p->smime_sign = old_flags[2];
-	p->smime_encrypt = old_flags[3];
+	composer->send_html = old_send_html;
+	composer->pgp_sign = old_flags[0];
+	composer->pgp_encrypt = old_flags[1];
+	composer->smime_sign = old_flags[2];
+	composer->smime_encrypt = old_flags[3];
 	
 	/* Attach account info to the draft. */
 	account = e_msg_composer_get_preferred_account (composer);
 	if (account && account->name)
 		camel_medium_set_header (CAMEL_MEDIUM (msg), "X-Evolution-Account", account->uid);
 	
-	/* build_message() set this to text/html since we set p->send_html to
+	/* build_message() set this to text/html since we set composer->send_html to
 	   TRUE before calling e_msg_composer_get_message() */
-	if (!p->send_html)
+	if (!composer->send_html)
 		flags = g_string_new("text/plain");
 	else
 		flags = g_string_new("text/html");
@@ -5122,23 +4955,22 @@ static void
 delete_old_signature (EMsgComposer *composer)
 {
 	CORBA_Environment ev;
-	EMsgComposerPrivate *p = composer->priv;
 	
 	/* printf ("delete_old_signature\n"); */
 	CORBA_exception_init (&ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "block-selection", &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "cursor-bod", &ev);
-	if (GNOME_GtkHTML_Editor_Engine_searchByData (p->eeditor_engine, 1, "ClueFlow", "signature", "1", &ev)) {
+	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "block-selection", &ev);
+	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "cursor-bod", &ev);
+	if (GNOME_GtkHTML_Editor_Engine_searchByData (composer->editor_engine, 1, "ClueFlow", "signature", "1", &ev)) {
 		/* printf ("found\n"); */
-		GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "select-paragraph", &ev);
-		GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "delete", &ev);
+		GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "select-paragraph", &ev);
+		GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "delete", &ev);
 		/* selection-move-right doesn't succeed means that we are already on the end of document */
 		/* if (!rv)
 		   break; */
-		GNOME_GtkHTML_Editor_Engine_setParagraphData (p->eeditor_engine, "signature", "0", &ev);
-		GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "delete-back", &ev);
+		GNOME_GtkHTML_Editor_Engine_setParagraphData (composer->editor_engine, "signature", "0", &ev);
+		GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "delete-back", &ev);
 	}
-	GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "unblock-selection", &ev);
+	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "unblock-selection", &ev);
 	CORBA_exception_free (&ev);
 }
 
@@ -5154,39 +4986,39 @@ e_msg_composer_show_sig_file (EMsgComposer *composer)
 {
 	CORBA_Environment ev;
 	char *html;
-	EMsgComposerPrivate *p = composer->priv;
+	
 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 	
 	/* printf ("e_msg_composer_show_sig_file\n"); */
-	/* printf ("set sig '%s' '%s'\n", sig_file, p->sig_file); */
+	/* printf ("set sig '%s' '%s'\n", sig_file, composer->sig_file); */
 	
-	p->in_signature_insert = TRUE;
+	composer->in_signature_insert = TRUE;
 	CORBA_exception_init (&ev);
-	GNOME_GtkHTML_Editor_Engine_freeze (p->eeditor_engine, &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "cursor-position-save", &ev);
-	GNOME_GtkHTML_Editor_Engine_undoBegin (p->eeditor_engine, "Set signature", "Reset signature", &ev);
+	GNOME_GtkHTML_Editor_Engine_freeze (composer->editor_engine, &ev);
+	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "cursor-position-save", &ev);
+	GNOME_GtkHTML_Editor_Engine_undoBegin (composer->editor_engine, "Set signature", "Reset signature", &ev);
 	
 	delete_old_signature (composer);
 	html = get_signature_html (composer);
 	if (html) {
-		GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "insert-paragraph", &ev);
-		if (!GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "cursor-backward", &ev))
-			GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "insert-paragraph", &ev);
+		GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "insert-paragraph", &ev);
+		if (!GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "cursor-backward", &ev))
+			GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "insert-paragraph", &ev);
 		else
-			GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "cursor-forward", &ev);
+			GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "cursor-forward", &ev);
 		/* printf ("insert %s\n", html); */
-		GNOME_GtkHTML_Editor_Engine_setParagraphData (p->eeditor_engine, "orig", "0", &ev);
-		GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "indent-zero", &ev);
-		GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "style-normal", &ev);
-		GNOME_GtkHTML_Editor_Engine_insertHTML (p->eeditor_engine, html, &ev);
+		GNOME_GtkHTML_Editor_Engine_setParagraphData (composer->editor_engine, "orig", "0", &ev);
+		GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "indent-zero", &ev);
+		GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "style-normal", &ev);
+		GNOME_GtkHTML_Editor_Engine_insertHTML (composer->editor_engine, html, &ev);
 		g_free (html);
 	}
-		
-	GNOME_GtkHTML_Editor_Engine_undoEnd (p->eeditor_engine, &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "cursor-position-restore", &ev);
-	GNOME_GtkHTML_Editor_Engine_thaw (p->eeditor_engine, &ev);
+	
+	GNOME_GtkHTML_Editor_Engine_undoEnd (composer->editor_engine, &ev);
+	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "cursor-position-restore", &ev);
+	GNOME_GtkHTML_Editor_Engine_thaw (composer->editor_engine, &ev);
 	CORBA_exception_free (&ev);
-	p->in_signature_insert = FALSE;
+	composer->in_signature_insert = FALSE;
 	
 	/* printf ("e_msg_composer_show_sig_file end\n"); */
 }
@@ -5204,33 +5036,31 @@ e_msg_composer_set_send_html (EMsgComposer *composer,
 			      gboolean send_html)
 {
 	CORBA_Environment ev;
-	EMsgComposerPrivate *p = composer->priv;
 	
 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 	
-	if (p->send_html && send_html)
+	if (composer->send_html && send_html)
 		return;
 	
-	if (!p->send_html && !send_html)
+	if (!composer->send_html && !send_html)
 		return;
 	
-	p->send_html = send_html;
+	composer->send_html = send_html;
 	
 	CORBA_exception_init (&ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "block-redraw", &ev);
+	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "block-redraw", &ev);
 	CORBA_exception_free (&ev);
 	
-	bonobo_ui_component_set_prop (p->uic, "/commands/FormatHtml",
-				      "state", p->send_html ? "1" : "0", NULL);
+	bonobo_ui_component_set_prop (composer->uic, "/commands/FormatHtml",
+				      "state", composer->send_html ? "1" : "0", NULL);
 	
 	/* let the editor know which mode we are in */
-	bonobo_widget_set_property (BONOBO_WIDGET (p->eeditor),
+	bonobo_widget_set_property (BONOBO_WIDGET (composer->editor),
 				    "FormatHTML", TC_CORBA_boolean,
-				    p->send_html, NULL);
-				    
+				    composer->send_html, NULL);
 	
 	CORBA_exception_init (&ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "unblock-redraw", &ev);
+	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "unblock-redraw", &ev);
 	CORBA_exception_free (&ev);
 }
 
@@ -5246,11 +5076,9 @@ e_msg_composer_set_send_html (EMsgComposer *composer,
 gboolean
 e_msg_composer_get_send_html (EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = composer->priv;
-
 	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
 	
-	return p->send_html;
+	return composer->send_html;
 }
 
 
@@ -5263,12 +5091,11 @@ e_msg_composer_get_send_html (EMsgComposer *composer)
 EAccount *
 e_msg_composer_get_preferred_account (EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	EMsgComposerHdrs *hdrs;
 	
 	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
 	
-	hdrs = E_MSG_COMPOSER_HDRS (p->hdrs);
+	hdrs = E_MSG_COMPOSER_HDRS (composer->hdrs);
 	
 	return hdrs->account;
 }
@@ -5284,19 +5111,18 @@ e_msg_composer_get_preferred_account (EMsgComposer *composer)
 void
 e_msg_composer_set_pgp_sign (EMsgComposer *composer, gboolean pgp_sign)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 	
-	if (p->pgp_sign && pgp_sign)
+	if (composer->pgp_sign && pgp_sign)
 		return;
-	if (!p->pgp_sign && !pgp_sign)
+	if (!composer->pgp_sign && !pgp_sign)
 		return;
 	
-	p->pgp_sign = pgp_sign;
+	composer->pgp_sign = pgp_sign;
 	e_msg_composer_set_changed (composer);
 	
-	bonobo_ui_component_set_prop (p->uic, "/commands/SecurityPGPSign",
-				      "state", p->pgp_sign ? "1" : "0", NULL);
+	bonobo_ui_component_set_prop (composer->uic, "/commands/SecurityPGPSign",
+				      "state", composer->pgp_sign ? "1" : "0", NULL);
 }
 
 
@@ -5311,10 +5137,9 @@ e_msg_composer_set_pgp_sign (EMsgComposer *composer, gboolean pgp_sign)
 gboolean
 e_msg_composer_get_pgp_sign (EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
 	
-	return p->pgp_sign;
+	return composer->pgp_sign;
 }
 
 
@@ -5328,19 +5153,18 @@ e_msg_composer_get_pgp_sign (EMsgComposer *composer)
 void
 e_msg_composer_set_pgp_encrypt (EMsgComposer *composer, gboolean pgp_encrypt)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 	
-	if (p->pgp_encrypt && pgp_encrypt)
+	if (composer->pgp_encrypt && pgp_encrypt)
 		return;
-	if (!p->pgp_encrypt && !pgp_encrypt)
+	if (!composer->pgp_encrypt && !pgp_encrypt)
 		return;
 	
-	p->pgp_encrypt = pgp_encrypt;
+	composer->pgp_encrypt = pgp_encrypt;
 	e_msg_composer_set_changed (composer);
 	
-	bonobo_ui_component_set_prop (p->uic, "/commands/SecurityPGPEncrypt",
-				      "state", p->pgp_encrypt ? "1" : "0", NULL);
+	bonobo_ui_component_set_prop (composer->uic, "/commands/SecurityPGPEncrypt",
+				      "state", composer->pgp_encrypt ? "1" : "0", NULL);
 }
 
 
@@ -5355,10 +5179,9 @@ e_msg_composer_set_pgp_encrypt (EMsgComposer *composer, gboolean pgp_encrypt)
 gboolean
 e_msg_composer_get_pgp_encrypt (EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
 	
-	return p->pgp_encrypt;
+	return composer->pgp_encrypt;
 }
 
 
@@ -5372,19 +5195,18 @@ e_msg_composer_get_pgp_encrypt (EMsgComposer *composer)
 void
 e_msg_composer_set_smime_sign (EMsgComposer *composer, gboolean smime_sign)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 	
-	if (p->smime_sign && smime_sign)
+	if (composer->smime_sign && smime_sign)
 		return;
-	if (!p->smime_sign && !smime_sign)
+	if (!composer->smime_sign && !smime_sign)
 		return;
 	
-	p->smime_sign = smime_sign;	
+	composer->smime_sign = smime_sign;	
 	e_msg_composer_set_changed (composer);
 
-	bonobo_ui_component_set_prop (p->uic, "/commands/SecuritySMimeSign",
-				      "state", p->smime_sign ? "1" : "0", NULL);
+	bonobo_ui_component_set_prop (composer->uic, "/commands/SecuritySMimeSign",
+				      "state", composer->smime_sign ? "1" : "0", NULL);
 }
 
 
@@ -5399,10 +5221,9 @@ e_msg_composer_set_smime_sign (EMsgComposer *composer, gboolean smime_sign)
 gboolean
 e_msg_composer_get_smime_sign (EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
 	
-	return p->smime_sign;
+	return composer->smime_sign;
 }
 
 
@@ -5416,19 +5237,18 @@ e_msg_composer_get_smime_sign (EMsgComposer *composer)
 void
 e_msg_composer_set_smime_encrypt (EMsgComposer *composer, gboolean smime_encrypt)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 	
-	if (p->smime_encrypt && smime_encrypt)
+	if (composer->smime_encrypt && smime_encrypt)
 		return;
-	if (!p->smime_encrypt && !smime_encrypt)
+	if (!composer->smime_encrypt && !smime_encrypt)
 		return;
 	
-	p->smime_encrypt = smime_encrypt;
+	composer->smime_encrypt = smime_encrypt;
 	e_msg_composer_set_changed (composer);
 	
-	bonobo_ui_component_set_prop (p->uic, "/commands/SecuritySMimeEncrypt",
-				      "state", p->smime_encrypt ? "1" : "0", NULL);
+	bonobo_ui_component_set_prop (composer->uic, "/commands/SecuritySMimeEncrypt",
+				      "state", composer->smime_encrypt ? "1" : "0", NULL);
 }
 
 
@@ -5443,10 +5263,9 @@ e_msg_composer_set_smime_encrypt (EMsgComposer *composer, gboolean smime_encrypt
 gboolean
 e_msg_composer_get_smime_encrypt (EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
 	
-	return p->smime_encrypt;
+	return composer->smime_encrypt;
 }
 
 
@@ -5461,10 +5280,9 @@ e_msg_composer_get_smime_encrypt (EMsgComposer *composer)
 gboolean
 e_msg_composer_get_view_from (EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
 	
-	return p->view_from;
+	return composer->view_from;
 }
 
 
@@ -5478,24 +5296,23 @@ e_msg_composer_get_view_from (EMsgComposer *composer)
 void
 e_msg_composer_set_view_from (EMsgComposer *composer, gboolean view_from)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	GConfClient *gconf;
 	
 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 	
-	if ((p->view_from && view_from) ||
-	    (!p->view_from && !view_from))
+	if ((composer->view_from && view_from) ||
+	    (!composer->view_from && !view_from))
 		return;
 	
-	p->view_from = view_from;
-	bonobo_ui_component_set_prop (p->uic, "/commands/ViewFrom",
-				      "state", p->view_from ? "1" : "0", NULL);
+	composer->view_from = view_from;
+	bonobo_ui_component_set_prop (composer->uic, "/commands/ViewFrom",
+				      "state", composer->view_from ? "1" : "0", NULL);
 	
 	gconf = gconf_client_get_default ();
 	gconf_client_set_bool (gconf, "/apps/evolution/mail/composer/view/From", view_from, NULL);
 	g_object_unref (gconf);
 	
-	e_msg_composer_hdrs_set_visible (E_MSG_COMPOSER_HDRS (p->hdrs),
+	e_msg_composer_hdrs_set_visible (E_MSG_COMPOSER_HDRS (composer->hdrs),
 					 e_msg_composer_get_visible_flags (composer));
 }
 
@@ -5511,10 +5328,9 @@ e_msg_composer_set_view_from (EMsgComposer *composer, gboolean view_from)
 gboolean
 e_msg_composer_get_view_replyto (EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
 	
-	return p->view_replyto;
+	return composer->view_replyto;
 }
 
 
@@ -5528,25 +5344,24 @@ e_msg_composer_get_view_replyto (EMsgComposer *composer)
 void
 e_msg_composer_set_view_replyto (EMsgComposer *composer, gboolean view_replyto)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	GConfClient *gconf;
 	
 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 	
-	if ((p->view_replyto && view_replyto) ||
-	    (!p->view_replyto && !view_replyto))
+	if ((composer->view_replyto && view_replyto) ||
+	    (!composer->view_replyto && !view_replyto))
 		return;
 	
-	p->view_replyto = view_replyto;
-	bonobo_ui_component_set_prop (p->uic, "/commands/ViewReplyTo",
-				      "state", p->view_replyto ? "1" : "0", NULL);
+	composer->view_replyto = view_replyto;
+	bonobo_ui_component_set_prop (composer->uic, "/commands/ViewReplyTo",
+				      "state", composer->view_replyto ? "1" : "0", NULL);
 	
 	/* we do this /only/ if the fields is in the visible_mask */
 	gconf = gconf_client_get_default ();
 	gconf_client_set_bool (gconf, "/apps/evolution/mail/composer/view/ReplyTo", view_replyto, NULL);
 	g_object_unref (gconf);
 	
-	e_msg_composer_hdrs_set_visible (E_MSG_COMPOSER_HDRS (p->hdrs),
+	e_msg_composer_hdrs_set_visible (E_MSG_COMPOSER_HDRS (composer->hdrs),
 					 e_msg_composer_get_visible_flags (composer));
 }
 
@@ -5562,10 +5377,9 @@ e_msg_composer_set_view_replyto (EMsgComposer *composer, gboolean view_replyto)
 gboolean
 e_msg_composer_get_view_to (EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
 	
-	return p->view_to;
+	return composer->view_to;
 }
 
 
@@ -5579,26 +5393,25 @@ e_msg_composer_get_view_to (EMsgComposer *composer)
 void
 e_msg_composer_set_view_to (EMsgComposer *composer, gboolean view_to)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	GConfClient *gconf;
 	
 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 	
-	if ((p->view_to && view_to) ||
-	    (!p->view_to && !view_to))
+	if ((composer->view_to && view_to) ||
+	    (!composer->view_to && !view_to))
 		return;
 	
-	p->view_to = view_to;
-	bonobo_ui_component_set_prop (p->uic, "/commands/ViewTo",
-				      "state", p->view_to ? "1" : "0", NULL);
+	composer->view_to = view_to;
+	bonobo_ui_component_set_prop (composer->uic, "/commands/ViewTo",
+				      "state", composer->view_to ? "1" : "0", NULL);
 	
-	if ((E_MSG_COMPOSER_HDRS(p->hdrs))->visible_mask & E_MSG_COMPOSER_VISIBLE_TO) {
+	if ((E_MSG_COMPOSER_HDRS(composer->hdrs))->visible_mask & E_MSG_COMPOSER_VISIBLE_TO) {
 		gconf = gconf_client_get_default ();
 		gconf_client_set_bool (gconf, "/apps/evolution/mail/composer/view/To", view_to, NULL);
 		g_object_unref (gconf);
 	}
 	
-	e_msg_composer_hdrs_set_visible (E_MSG_COMPOSER_HDRS (p->hdrs),
+	e_msg_composer_hdrs_set_visible (E_MSG_COMPOSER_HDRS (composer->hdrs),
 					 e_msg_composer_get_visible_flags (composer));
 }
 
@@ -5615,10 +5428,9 @@ e_msg_composer_set_view_to (EMsgComposer *composer, gboolean view_to)
 gboolean
 e_msg_composer_get_view_postto (EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
 	
-	return p->view_postto;
+	return composer->view_postto;
 }
 
 
@@ -5633,25 +5445,24 @@ void
 e_msg_composer_set_view_postto (EMsgComposer *composer, gboolean view_postto)
 {
 	GConfClient *gconf;
-	EMsgComposerPrivate *p = composer->priv;
 	
 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 	
-	if ((p->view_postto && view_postto) ||
-	    (!p->view_postto && !view_postto))
+	if ((composer->view_postto && view_postto) ||
+	    (!composer->view_postto && !view_postto))
 		return;
 	
-	p->view_postto = view_postto;
-	bonobo_ui_component_set_prop (p->uic, "/commands/ViewPostTo",
-				      "state", p->view_postto ? "1" : "0", NULL);
+	composer->view_postto = view_postto;
+	bonobo_ui_component_set_prop (composer->uic, "/commands/ViewPostTo",
+				      "state", composer->view_postto ? "1" : "0", NULL);
 	
-	if ((E_MSG_COMPOSER_HDRS(p->hdrs))->visible_mask & E_MSG_COMPOSER_VISIBLE_POSTTO) {
+	if ((E_MSG_COMPOSER_HDRS(composer->hdrs))->visible_mask & E_MSG_COMPOSER_VISIBLE_POSTTO) {
 		gconf = gconf_client_get_default ();
 		gconf_client_set_bool (gconf, "/apps/evolution/mail/composer/view/PostTo", view_postto, NULL);
 		g_object_unref (gconf);
 	}
 	
-	e_msg_composer_hdrs_set_visible (E_MSG_COMPOSER_HDRS (p->hdrs),
+	e_msg_composer_hdrs_set_visible (E_MSG_COMPOSER_HDRS (composer->hdrs),
 					 e_msg_composer_get_visible_flags (composer));
 }
 
@@ -5668,10 +5479,9 @@ e_msg_composer_set_view_postto (EMsgComposer *composer, gboolean view_postto)
 gboolean
 e_msg_composer_get_view_cc (EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
 	
-	return p->view_cc;
+	return composer->view_cc;
 }
 
 
@@ -5686,25 +5496,24 @@ void
 e_msg_composer_set_view_cc (EMsgComposer *composer, gboolean view_cc)
 {
 	GConfClient *gconf;
-	EMsgComposerPrivate *p = composer->priv;
 	
 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 	
-	if ((p->view_cc && view_cc) ||
-	    (!p->view_cc && !view_cc))
+	if ((composer->view_cc && view_cc) ||
+	    (!composer->view_cc && !view_cc))
 		return;
 	
-	p->view_cc = view_cc;
-	bonobo_ui_component_set_prop (p->uic, "/commands/ViewCC",
-				      "state", p->view_cc ? "1" : "0", NULL);
+	composer->view_cc = view_cc;
+	bonobo_ui_component_set_prop (composer->uic, "/commands/ViewCC",
+				      "state", composer->view_cc ? "1" : "0", NULL);
 	
-	if ((E_MSG_COMPOSER_HDRS (p->hdrs))->visible_mask & E_MSG_COMPOSER_VISIBLE_CC) {
+	if ((E_MSG_COMPOSER_HDRS (composer->hdrs))->visible_mask & E_MSG_COMPOSER_VISIBLE_CC) {
 		gconf = gconf_client_get_default ();
 		gconf_client_set_bool (gconf, "/apps/evolution/mail/composer/view/Cc", view_cc, NULL);
 		g_object_unref (gconf);
 	}
 	
-	e_msg_composer_hdrs_set_visible (E_MSG_COMPOSER_HDRS (p->hdrs),
+	e_msg_composer_hdrs_set_visible (E_MSG_COMPOSER_HDRS (composer->hdrs),
 					 e_msg_composer_get_visible_flags (composer));
 }
 
@@ -5721,11 +5530,9 @@ e_msg_composer_set_view_cc (EMsgComposer *composer, gboolean view_cc)
 gboolean
 e_msg_composer_get_view_bcc (EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = composer->priv;
-
 	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
 	
-	return p->view_bcc;
+	return composer->view_bcc;
 }
 
 
@@ -5740,25 +5547,24 @@ void
 e_msg_composer_set_view_bcc (EMsgComposer *composer, gboolean view_bcc)
 {
 	GConfClient *gconf;
-	EMsgComposerPrivate *p = composer->priv;
 	
 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 	
-	if ((p->view_bcc && view_bcc) ||
-	    (!p->view_bcc && !view_bcc))
+	if ((composer->view_bcc && view_bcc) ||
+	    (!composer->view_bcc && !view_bcc))
 		return;
 	
-	p->view_bcc = view_bcc;
-	bonobo_ui_component_set_prop (p->uic, "/commands/ViewBCC",
-				      "state", p->view_bcc ? "1" : "0", NULL);
+	composer->view_bcc = view_bcc;
+	bonobo_ui_component_set_prop (composer->uic, "/commands/ViewBCC",
+				      "state", composer->view_bcc ? "1" : "0", NULL);
 	
-	if ((E_MSG_COMPOSER_HDRS (p->hdrs))->visible_mask & E_MSG_COMPOSER_VISIBLE_BCC) {
+	if ((E_MSG_COMPOSER_HDRS (composer->hdrs))->visible_mask & E_MSG_COMPOSER_VISIBLE_BCC) {
 		gconf = gconf_client_get_default ();
 		gconf_client_set_bool (gconf, "/apps/evolution/mail/composer/view/Bcc", view_bcc, NULL);
 		g_object_unref (gconf);
 	}
 	
-	e_msg_composer_hdrs_set_visible (E_MSG_COMPOSER_HDRS (p->hdrs),
+	e_msg_composer_hdrs_set_visible (E_MSG_COMPOSER_HDRS (composer->hdrs),
 					 e_msg_composer_get_visible_flags (composer));
 }
 
@@ -5775,10 +5581,9 @@ e_msg_composer_set_view_bcc (EMsgComposer *composer, gboolean view_bcc)
 gboolean
 e_msg_composer_get_request_receipt (EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
 	
-	return p->request_receipt;
+	return composer->request_receipt;
 }
 
 
@@ -5792,16 +5597,15 @@ e_msg_composer_get_request_receipt (EMsgComposer *composer)
 void
 e_msg_composer_set_request_receipt (EMsgComposer *composer, gboolean request_receipt)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 	
-	if ((p->request_receipt && request_receipt) ||
-	    (!p->request_receipt && !request_receipt))
+	if ((composer->request_receipt && request_receipt) ||
+	    (!composer->request_receipt && !request_receipt))
 		return;
 	
-	p->request_receipt = request_receipt;
-	bonobo_ui_component_set_prop (p->uic, "/commands/RequestReceipt",
-				      "state", p->request_receipt ? "1" : "0", NULL);
+	composer->request_receipt = request_receipt;
+	bonobo_ui_component_set_prop (composer->uic, "/commands/RequestReceipt",
+				      "state", composer->request_receipt ? "1" : "0", NULL);
 }
 
 
@@ -5809,46 +5613,41 @@ e_msg_composer_set_request_receipt (EMsgComposer *composer, gboolean request_rec
 EDestination **
 e_msg_composer_get_recipients (EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
 
-	return p->hdrs ? e_msg_composer_hdrs_get_recipients (E_MSG_COMPOSER_HDRS (p->hdrs)) : NULL;
+	return composer->hdrs ? e_msg_composer_hdrs_get_recipients (E_MSG_COMPOSER_HDRS (composer->hdrs)) : NULL;
 }
 
 EDestination **
 e_msg_composer_get_to (EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
 	
-	return p->hdrs ? e_msg_composer_hdrs_get_to (E_MSG_COMPOSER_HDRS (p->hdrs)) : NULL;
+	return composer->hdrs ? e_msg_composer_hdrs_get_to (E_MSG_COMPOSER_HDRS (composer->hdrs)) : NULL;
 }
 
 EDestination **
 e_msg_composer_get_cc (EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
 	
-	return p->hdrs ? e_msg_composer_hdrs_get_cc (E_MSG_COMPOSER_HDRS (p->hdrs)) : NULL;
+	return composer->hdrs ? e_msg_composer_hdrs_get_cc (E_MSG_COMPOSER_HDRS (composer->hdrs)) : NULL;
 }
 
 EDestination **
 e_msg_composer_get_bcc (EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
 	
-	return p->hdrs ? e_msg_composer_hdrs_get_bcc (E_MSG_COMPOSER_HDRS (p->hdrs)) : NULL;
+	return composer->hdrs ? e_msg_composer_hdrs_get_bcc (E_MSG_COMPOSER_HDRS (composer->hdrs)) : NULL;
 }
 
 const char *
 e_msg_composer_get_subject (EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
 	
-	return p->hdrs ? e_msg_composer_hdrs_get_subject (E_MSG_COMPOSER_HDRS (p->hdrs)) : NULL;
+	return composer->hdrs ? e_msg_composer_hdrs_get_subject (E_MSG_COMPOSER_HDRS (composer->hdrs)) : NULL;
 }
 
 
@@ -5889,10 +5688,9 @@ e_msg_composer_guess_mime_type (const char *file_name)
 void
 e_msg_composer_set_changed (EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 	
-	p->has_changed = TRUE;
+	composer->has_changed = TRUE;
 }
 
 
@@ -5906,23 +5704,21 @@ e_msg_composer_set_changed (EMsgComposer *composer)
 void
 e_msg_composer_unset_changed (EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 	
-	p->has_changed = FALSE;
+	composer->has_changed = FALSE;
 }
 
 gboolean
 e_msg_composer_is_dirty (EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	CORBA_Environment ev;
 	gboolean rv;
 	
 	CORBA_exception_init (&ev);
-	rv = p->has_changed
-		|| (GNOME_GtkHTML_Editor_Engine_hasUndo (p->eeditor_engine, &ev) &&
-		    !GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "is-saved", &ev));
+	rv = composer->has_changed
+		|| (GNOME_GtkHTML_Editor_Engine_hasUndo (composer->editor_engine, &ev) &&
+		    !GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "is-saved", &ev));
 	CORBA_exception_free (&ev);
 
 	return rv;
@@ -5938,10 +5734,9 @@ e_msg_composer_is_dirty (EMsgComposer *composer)
 void
 e_msg_composer_set_autosaved (EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 
-	p->autosaved = TRUE;
+	composer->autosaved = TRUE;
 }
 
 
@@ -5955,38 +5750,34 @@ e_msg_composer_set_autosaved (EMsgComposer *composer)
 void
 e_msg_composer_unset_autosaved (EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 	
-	p->autosaved = FALSE;
+	composer->autosaved = FALSE;
 }
 
 gboolean
 e_msg_composer_is_autosaved (EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
 
-	return p->autosaved;
+	return composer->autosaved;
 }
 
 void
 e_msg_composer_set_enable_autosave  (EMsgComposer *composer, gboolean enabled)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 
-	p->enable_autosave = enabled;
+	composer->enable_autosave = enabled;
 }
 
 void
 e_msg_composer_drop_editor_undo (EMsgComposer *composer)
 {
-	EMsgComposerPrivate *p = composer->priv;
 	CORBA_Environment ev;
 	
 	CORBA_exception_init (&ev);
-	GNOME_GtkHTML_Editor_Engine_dropUndo (p->eeditor_engine, &ev);
+	GNOME_GtkHTML_Editor_Engine_dropUndo (composer->editor_engine, &ev);
 	CORBA_exception_free (&ev);
 }
 
@@ -6019,231 +5810,3 @@ e_msg_composer_check_autosave(GtkWindow *parent)
 		am->ask = TRUE;
 	}
 }
-
-void
-e_msg_composer_show_attachments_ui (EMsgComposer *composer)
-{
-	EMsgComposerPrivate *p = composer->priv;
-
-	if (e_attachment_bar_get_num_attachments(E_ATTACHMENT_BAR(p->attachment_bar))) {
-		gtk_widget_show (p->attachment_expander);
-		gtk_widget_show (p->attachment_scrolled_window);
-	}
-}
-
-void
-e_msg_composer_set_alternative (EMsgComposer *composer, gboolean alt)
-{
-	EMsgComposerPrivate *p = composer->priv;
-	
-	p->is_alternative = alt;
-	p->send_html = !alt;
-}
-
-void
-e_msg_composer_reply_indent (EMsgComposer *composer)
-{
-	EMsgComposerPrivate *p = composer->priv;
-	CORBA_Environment ev;
-	
-	CORBA_exception_init (&ev);
-	
-	if (!GNOME_GtkHTML_Editor_Engine_isParagraphEmpty (p->eeditor_engine, &ev)) {
-		if (GNOME_GtkHTML_Editor_Engine_isPreviousParagraphEmpty (p->eeditor_engine, &ev))
-			GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "cursor-backward", &ev);
-		else {
-			GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "text-default-color", &ev);
-			GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "italic-off", &ev);
-			GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "insert-paragraph", &ev);
-			return;
-		}
-	}
-
-	GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "style-normal", &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "indent-zero", &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "text-default-color", &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "italic-off", &ev);
-	
-	CORBA_exception_free (&ev);
-
-}
-
-void
-e_msg_composer_insert_paragraph_before (EMsgComposer *composer)
-{
-	EMsgComposerPrivate *p = composer->priv;
-	CORBA_Environment ev;
-	
-	CORBA_exception_init (&ev);
-		
-	if (!p->in_signature_insert) {
-		CORBA_char *orig, *signature;
-		gboolean changed = FALSE;
-		/* FIXME check for insert-paragraph command */
-
-		orig = GNOME_GtkHTML_Editor_Engine_getParagraphData (p->eeditor_engine, "orig", &ev);
-		if (ev._major == CORBA_NO_EXCEPTION) {
-			if (orig && *orig == '1') {
-				GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "text-default-color", &ev);
-				GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "italic-off", &ev);
-				changed = TRUE;
-			}
-			CORBA_free (orig);
-		}
-		if (!changed) {
-			signature = GNOME_GtkHTML_Editor_Engine_getParagraphData (p->eeditor_engine, "signature", &ev);
-			if (ev._major == CORBA_NO_EXCEPTION) {
-				if (signature && *signature == '1') {
-					GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "text-default-color",
-										&ev);
-					GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "italic-off", &ev);
-				}
-				CORBA_free (signature);
-			}
-		}
-	}
-	
-	CORBA_exception_free (&ev);
-}
-
-static void
-clear_signature (GNOME_GtkHTML_Editor_Engine e, CORBA_Environment * ev)
-{
-	if (GNOME_GtkHTML_Editor_Engine_isParagraphEmpty (e, ev))
-		GNOME_GtkHTML_Editor_Engine_setParagraphData (e, "signature", "0", ev);
-	else if (GNOME_GtkHTML_Editor_Engine_isPreviousParagraphEmpty (e, ev)
-		 && GNOME_GtkHTML_Editor_Engine_runCommand (e, "cursor-backward", ev)) {
-		GNOME_GtkHTML_Editor_Engine_setParagraphData (e, "signature", "0", ev);
-		GNOME_GtkHTML_Editor_Engine_runCommand (e, "cursor-forward", ev);
-	}
-	GNOME_GtkHTML_Editor_Engine_runCommand (e, "text-default-color", ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (e, "italic-off", ev);
-}
-
-void
-e_msg_composer_insert_paragraph_after (EMsgComposer *composer)
-{
-	EMsgComposerPrivate *p = composer->priv;
-	CORBA_Environment ev;
-	
-	CORBA_exception_init (&ev);
-	
-	if (!p->in_signature_insert) {
-	      CORBA_char *orig, *signature;
-	      /* FIXME check for insert-paragraph command */
-	      GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "text-default-color", &ev);
-	      GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "italic-off", &ev);
-	
-	      orig = GNOME_GtkHTML_Editor_Engine_getParagraphData (p->eeditor_engine, "orig", &ev);
-	      if (ev._major == CORBA_NO_EXCEPTION) {
-		      if (orig && *orig == '1')
-			      e_msg_composer_reply_indent (composer);
-		      GNOME_GtkHTML_Editor_Engine_setParagraphData (p->eeditor_engine, "orig", "0", &ev);
-		      CORBA_free (orig);
-	      }
-	      signature = GNOME_GtkHTML_Editor_Engine_getParagraphData (p->eeditor_engine, "signature", &ev);
-	      if (ev._major == CORBA_NO_EXCEPTION) {
-		      if (signature && *signature == '1')
-			      clear_signature (p->eeditor_engine, &ev);
-		      CORBA_free (signature);
-	      }
-	}
-	
-	CORBA_exception_free (&ev);
-}
-
-void
-e_msg_composer_delete (EMsgComposer *composer)
-{
-	EMsgComposerPrivate *p = composer->priv;
-	CORBA_Environment ev;
-	
-	CORBA_exception_init (&ev);
-	
-	if (GNOME_GtkHTML_Editor_Engine_isParagraphEmpty (p->eeditor_engine, &ev)) {
-		CORBA_char *orig;
-		CORBA_char *signature;
-	
-		orig = GNOME_GtkHTML_Editor_Engine_getParagraphData (p->eeditor_engine, "orig", &ev);
-		if (ev._major == CORBA_NO_EXCEPTION) {
-			if (orig && *orig == '1') {
-				GNOME_GtkHTML_Editor_Engine_setParagraphData (p->eeditor_engine, "orig", "0", &ev);
-
-				GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "indent-zero", &ev);
-				GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "style-normal", &ev);
-				GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "text-default-color", &ev);
-				GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "italic-off", &ev);
-				GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "insert-paragraph", &ev);
-				GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "delete-back", &ev);
-			}
-			CORBA_free (orig);
-		}
-		signature = GNOME_GtkHTML_Editor_Engine_getParagraphData (p->eeditor_engine, "signature", &ev);
-		if (ev._major == CORBA_NO_EXCEPTION) {
-			if (signature && *signature == '1')
-				GNOME_GtkHTML_Editor_Engine_setParagraphData (p->eeditor_engine, "signature", "0", &ev);
-			CORBA_free (signature);
-		}
-	}
-	CORBA_exception_free (&ev);
-}
-
-
-gchar *
-e_msg_composer_resolve_image_url (EMsgComposer *composer, gchar *url)
-{
-	EMsgComposerPrivate *p = composer->priv;
-	CamelMimePart *part;
-	const char *cid;
-
-	part = g_hash_table_lookup (p->inline_images_by_url, url);
-	if (!part && !strncmp (url, "file:", 5)) {
-		part = e_msg_composer_add_inline_image_from_file (composer, url + 5);
-	}
-	if (!part && !strncmp (url, "cid:", 4)) {
-		part = g_hash_table_lookup (p->inline_images, url);
-	}
-	if (!part)
-		return NULL;
-
-	p->current_images  = g_list_prepend (p->current_images, part);
-
-	cid = camel_mime_part_get_content_id (part);
-	if (!cid)
-		return NULL;
-
-	return g_strconcat ("cid:", cid, NULL);
-}
-
-CamelMimePart*
-e_msg_composer_url_requested (EMsgComposer *composer, gchar *url)
-{
-	EMsgComposerPrivate *p = composer->priv;
-	CamelMimePart *part = NULL;
-	
-	part = g_hash_table_lookup (p->inline_images_by_url, url);
-	if (!part)
-		part = g_hash_table_lookup (p->inline_images, url);
-	if (!part)
-		return NULL;
-
-	return part;
-}
-
-EMsgComposerHdrs*
-e_msg_composer_get_hdrs (EMsgComposer *composer)
-{
-	EMsgComposerPrivate *p = composer->priv;
-	return (EMsgComposerHdrs*)p->hdrs;
-}
-
-void
-e_msg_composer_set_saved (EMsgComposer *composer)
-{
-	CORBA_Environment ev;
-	EMsgComposerPrivate *p = composer->priv;
-	
-	CORBA_exception_init (&ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "saved", &ev);
-	CORBA_exception_free (&ev);
-}
diff --git a/configure.in b/configure.in
index 85fbe8d2cc..23797d4abb 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.5.2, http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution)
+AC_INIT(evolution, 2.4.2, http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution)
 AC_CONFIG_SRCDIR(README)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
@@ -23,7 +23,7 @@ dnl This is for api/versioning tracking for things like bonobo .server files
 dnl
 dnl This should always be the major/minor of the stable version or stable version to be
 dnl *************************************************************************************************
-BASE_VERSION=2.6
+BASE_VERSION=2.4
 AC_SUBST(BASE_VERSION)
 AC_DEFINE_UNQUOTED(BASE_VERSION, "$BASE_VERSION", [Base version (Major.Minor)])
 
@@ -45,7 +45,7 @@ dnl The controls whether things like the development warning in shell/main.c are
 dnl
 dnl This should be set to 0 for stable releases and 1 for unstable releases
 dnl *************************************************************************************************
-AC_DEFINE(DEVELOPMENT, 1, [If we are in development mode or not])
+AC_DEFINE(DEVELOPMENT, 0, [If we are in development mode or not])
 AC_SUBST(DEVELOPMENT)
 
 AC_ISC_POSIX
@@ -78,7 +78,7 @@ AC_SUBST(HAVE_JW)
 dnl I18N stuff
 AC_PROG_INTLTOOL([0.30])
 
-ALL_LINGUAS="am ar az be bg bn bs ca cs cy da de el en_AU en_CA en_GB es et eu fa fi fr ga gl gu he hr hu id is it ja ko ku lt lv mn ms nb ne nl nn no pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sv te th tr uk vi wa xh zh_CN zh_TW"
+ALL_LINGUAS="am ar az be bg bn bs ca cs cy da de el en_AU en_CA en_GB es et eu fa fi fr ga gl gu he hr hu id is it ja ko lt lv mn ms nb ne nl nn no pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sv te th tr uk vi wa xh zh_CN zh_TW"
 AM_GLIB_GNU_GETTEXT
 
 GETTEXT_PACKAGE=evolution-$BASE_VERSION
@@ -103,15 +103,14 @@ case "$host" in
     SA_JUNK_PLUGIN=''
     DL_LIB=''
     SOFTOKN3_LIB=''
-    HAL_REQUIREMENT=''
     ;;
 *)  os_win32=no
     NO_UNDEFINED=''
+    SOCKET_LIBS=''
     SOEXT='.so'
     SA_JUNK_PLUGIN=sa-junk-plugin
     DL_LIB='-ldl'
     SOFTOKN3_LIB='-lsoftokn3'
-    HAL_REQUIREMENT='hal'
     ;;
 esac
 AC_MSG_RESULT([$os_win32])
@@ -400,9 +399,69 @@ AC_SUBST(A11Y_CFLAGS)
 AC_SUBST(A11Y_LIBS)
 
 dnl **************************************************
+dnl * IPv6 support and getaddrinfo calls
+dnl **************************************************
+AC_CACHE_CHECK([if system supports getaddrinfo and getnameinfo], have_addrinfo,
+[
+	AC_TRY_COMPILE([
+		#include "confdefs.h"
+		#include <sys/types.h>
+		#include <sys/socket.h>
+		#include <netinet/in.h>
+		#include <netdb.h>
+
+	],[
+		struct addrinfo hints, *res;
+		struct sockaddr_in6 sin6;
+		int af = AF_INET6;
+		char host[NI_MAXHOST];
+		char serv[NI_MAXSERV];
+
+		getaddrinfo("www.ximian.com", 0, &hints, &res);
+		freeaddrinfo(res);
+		getnameinfo((struct sockaddr *)&sin6, sizeof(sin6), host, sizeof(host), serv, sizeof(serv), 0);
+	],[
+		have_addrinfo=yes
+	],[
+		have_addrinfo=no
+	])
+])
+
+if test x"$have_addrinfo" = "xno" ; then
+   AC_DEFINE(NEED_ADDRINFO,1,[Enable getaddrinfo emulation])
+   if test x"$enable_ipv6" = "xyes" ; then
+      AC_ERROR(system doesn't support necessary interfaces for ipv6 support)
+   fi
+   msg_ipv6=no
+else
+   AC_ARG_ENABLE(ipv6, [  --enable-ipv6=[no/yes]      Enable support for resolving IPv6 addresses.],,enable_ipv6=yes)
+   if test x"$enable_ipv6" = "xyes"; then
+        msg_ipv6=yes
+	AC_DEFINE(ENABLE_IPv6,1,[Enable IPv6 support])
+	AC_TRY_COMPILE([
+		#include "confdefs.h"
+		#include <sys/types.h>
+		#include <sys/socket.h>
+		#include <netinet/in.h>
+		#include <netdb.h>
+
+	],[
+		struct addrinfo hints;
+		
+		hints.ai_flags = AI_ADDRCONFIG;
+	],[
+		AC_DEFINE(HAVE_AI_ADDRCONFIG,1,[Define if the system defines the AI_ADDRCONFIG flag for getaddrinfo])
+	])
+   else
+	msg_ipv6=no
+   fi
+fi
+
+AM_CONDITIONAL(ENABLE_IPv6, test "x$enable_ipv6" = "xyes")
+
+dnl **************************************************
 dnl LDAP support.
 dnl **************************************************
-if test "$os_win32" != yes; then
 EVO_LDAP_CHECK(no)
 case $with_openldap in
 no)
@@ -418,15 +477,6 @@ no)
 		;;
 	esac
 esac
-else # Win32
-LDAP_CFLAGS=""
-LDAP_LIBS="-lwldap32"
-AC_SUBST(LDAP_CFLAGS)
-AC_SUBST(LDAP_LIBS)
-AC_DEFINE(HAVE_LDAP,1,[Define if you have LDAP support])
-AM_CONDITIONAL(ENABLE_LDAP, true)
-msg_ldap="yes"
-fi # Win32
 
 dnl **************************************************
 dnl NNTP support.
@@ -1133,16 +1183,6 @@ CPPFLAGS="$CPPFLAGS_save"
 PKG_CHECK_MODULES(EXTRA_GNOME, libgnomeprint-2.2 >= 2.2.0 libgnomeprintui-2.2 >= 2.2.1 $FULL_GNOME_DEPS)
 AC_SUBST(EXTRA_GNOME_LIBS)
 AC_SUBST(EXTRA_GNOME_CFLAGS)
-
-PKG_CHECK_MODULES(HAL, hal >= 0.5.4, HAVE_HAL="yes", HAVE_HAL="no")
-if test "x$HAVE_HAL" = "xyes"; then
-   AC_DEFINE(HAVE_HAL, 1, [hal available])
-   HAL_REQUIREMENT="hal"
-   IPOD_SYNC="ipod-sync"
-else
-   HAL_REQUIREMENT=""
-   IPOD_SYNC=""
-fi
  
 dnl --- Flags for the various libraries we build
 
@@ -1213,18 +1253,6 @@ AC_SUBST(EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS)
 AC_SUBST(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)
 fi
 
-LIBNOTIFY_CFLAGS=
-LIBNOTIFY_LIBS=
-PKG_CHECK_MODULES(LIBNOTIFY, libnotify, HAVE_LIBNOTIFY="yes", HAVE_LIBNOTIFY="no")
-if test "x$HAVE_LIBNOTIFY" = "xyes"; then
-	AC_DEFINE(HAVE_LIBNOTIFY, 1, [libnotify available])
-	libnotify="libnotify"
-else
-	libnotify=""
-fi
-AC_SUBST(LIBNOTIFY_CFLAGS)
-AC_SUBST(LIBNOTIFY_LIBS)
-
 dnl --- evolution-calendar flags
 PKG_CHECK_MODULES(SOUPTEMP, libsoup-2.4, have_libsoup_24="yes", have_libsoup_24="no")
 if test $have_libsoup_24 = yes; then
@@ -1239,7 +1267,7 @@ EVO_SET_COMPILE_FLAGS(LIBSOUP, $LIBSOUP >= $LIBSOUP_REQUIRED)
 AC_SUBST(LIBSOUP_CFLAGS)
 AC_SUBST(LIBSOUP_LIBS)
 
-EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 gnome-vfs-module-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libecal-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED $HAL_REQUIREMENT $libnotify)
+EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 gnome-vfs-module-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libecal-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED)
 AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)
 AC_SUBST(EVOLUTION_CALENDAR_LIBS)
 
@@ -1382,11 +1410,11 @@ AC_SUBST_FILE(EVO_PLUGIN_RULE)
 AC_ARG_ENABLE(plugins, [  --enable-plugins=[no/base/all/experimental/list]      Enable plugins.],enable_plugins="$enableval",enable_plugins=all)
 
 dnl Add any new plugins here
-plugins_base="calendar-file calendar-http calendar-weather itip-formatter plugin-manager default-source addressbook-file startup-wizard print-message mark-all-read groupwise-features groupwise-account-setup hula-account-setup mail-account-disable $SA_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN" 
+plugins_base="calendar-file calendar-http calendar-weather itip-formatter plugin-manager default-source addressbook-file startup-wizard print-message mark-all-read groupwise-features groupwise-account-setup mail-account-disable $SA_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN" 
 
 plugins_standard="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions new-mail-notify default-mailer" 
 
-plugins_experimental="backup-restore folder-unsubscribe mail-to-meeting mail-remote prefer-plain save-attachments $IPOD_SYNC"
+plugins_experimental="backup-restore folder-unsubscribe mail-to-meeting mail-remote prefer-plain save-attachments"
 
 case x"$enable_plugins" in
 xno)
@@ -1472,7 +1500,7 @@ if echo ${plugins_enabled} | grep "exchange-operations" > /dev/null ; then
 		dnl **************************************************
 		dnl * Exchange Operations plugin
 		dnl **************************************************
-		EVO_SET_COMPILE_FLAGS(CAMEL_EXCHANGE, libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 gthread-2.0 gconf-2.0 camel-provider-$EDS_PACKAGE libebook-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE libexchange-storage-$EDS_PACKAGE >= $EDS_REQUIRED libecal-$EDS_PACKAGE)
+		EVO_SET_COMPILE_FLAGS(CAMEL_EXCHANGE, camel-provider-$EDS_PACKAGE libedataserver-$EDS_PACKAGE libexchange-storage-$EDS_PACKAGE >= $EDS_REQUIRED)
 		AC_SUBST(CAMEL_EXCHANGE_CFLAGS)
 		AC_SUBST(CAMEL_EXCHANGE_LIBS)
 	else
@@ -1481,6 +1509,7 @@ if echo ${plugins_enabled} | grep "exchange-operations" > /dev/null ; then
 	fi
 fi
 
+
 ##################################################
 # Check for gtk-doc.
 ##################################################
@@ -1619,7 +1648,6 @@ views/addressbook/Makefile
 views/calendar/Makefile
 views/mail/Makefile
 views/tasks/Makefile
-views/memos/Makefile
 widgets/Makefile
 widgets/e-timezone-dialog/Makefile
 widgets/menus/Makefile
@@ -1633,7 +1661,6 @@ calendar/idl/Makefile
 calendar/conduits/Makefile
 calendar/conduits/todo/Makefile
 calendar/conduits/calendar/Makefile
-calendar/conduits/memo/Makefile
 calendar/gui/Makefile
 calendar/gui/alarm-notify/Makefile
 calendar/gui/dialogs/Makefile
@@ -1679,11 +1706,9 @@ plugins/addressbook-file/Makefile
 plugins/startup-wizard/Makefile
 plugins/print-message/Makefile
 plugins/groupwise-account-setup/Makefile
-plugins/hula-account-setup/Makefile
 plugins/groupwise-features/Makefile
 plugins/mail-account-disable/Makefile
 plugins/sa-junk-plugin/Makefile
-plugins/ipod-sync/Makefile
 smime/Makefile
 smime/lib/Makefile
 smime/gui/Makefile
@@ -1702,18 +1727,17 @@ fi
 
 echo "
 	Mail Directory:   $system_mail_dir, $system_mail_perm
-	LDAP support:     $msg_ldap
-	HAL:		  $HAVE_HAL"
+	LDAP support:     $msg_ldap"
 if test "$msg_nntp" = "yes"; then
 echo "\
 	NNTP support:     $msg_nntp"
 fi
 echo "\
 	Pilot conduits:   $msg_pilot
-	Libnotify:	  $HAVE_LIBNOTIFY
 	Kerberos 4/5:     $msg_krb4/$msg_krb5
 	SSL support:      $msg_ssl
 	SMIME support:    $msg_smime
+	IPv6 support:     $msg_ipv6
 	Plugins:	  $msg_plugins
 	Gtk-doc:	  $enable_gtk_doc
 	DBus API version  $DBUS_VERSION"
diff --git a/doc/devel/executive-summary/evolution-services.hierarchy b/doc/devel/executive-summary/evolution-services.hierarchy
deleted file mode 100644
index 37559d819d..0000000000
--- a/doc/devel/executive-summary/evolution-services.hierarchy
+++ /dev/null
@@ -1,7 +0,0 @@
-GtkObject
-  BonoboObject
-    ExecutiveSummaryComponent
-    ExecutiveSummaryComponentFactory
-    Handle to remote Bonobo::Unknown
-      ExecutiveSummaryComponentFactoryClient
-    ExecutiveSummaryHtmlView
diff --git a/doc/devel/importer/evolution-shell-importer.hierarchy b/doc/devel/importer/evolution-shell-importer.hierarchy
deleted file mode 100644
index c46ebdf782..0000000000
--- a/doc/devel/importer/evolution-shell-importer.hierarchy
+++ /dev/null
@@ -1,7 +0,0 @@
-GtkObject
-  BonoboObject
-    BonoboXObject
-      EvolutionImporter
-      EvolutionImporterListener
-    Handle to remote Bonobo::Unknown
-      EvolutionImporterClient
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index fe3b5357a0..c318da0c75 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,70 +1,9 @@
-2005-11-26  Tor Lillqvist  <tml@novell.com>
-
-	* e-dialog-utils.c
-	* e-gtk-utils.c: Conditionalize X11 specific code on GDK_WINDOWING_X11.
-
-	* e-menu.c (emph_construct_menu): Use g_get_tmp_dir() instead of
-	hardcoding /tmp.
-
-	* e-util.c (e_strstrcase): Use g_ascii_strncasecmp() instead of
-	the deprecated g_strncasecmp(). What kinds of strings this
-	function is supposed to be used on (UTF-8 or some random single-
-	or multi-byte encoding) is anybody's guess. This function isn't
-	used in Evolution and should probably go away, though. And this is
-	one of the files that have a partially duplicated copy in
-	e-d-s/libedataserver, too, so doubly so.
-	(e_filename_make_safe): Mark more bytes as unsafe on Win32. Add
-	comments. This function is really under-specified and weird, one
-	wonders whether it really does what the author thought it should
-	do.
-	(fsync): Add Win32 implementation of fsync().
-	
-	* e-xml-utils.c (e_xml_get_bool_prop_by_name_with_default): Use
-	g_ascii_strcasecmp() instead of the deprecated g_strcasecmp(),
-	especially as we are comparing to literal ASCII strings.
-
-2005-11-25  Tor Lillqvist  <tml@novell.com>
-
-	* e-util-private.h: Sort the stuff in the Win32 part for
-	clarity. Add some new run-time overrides for compile-time
-	paths. Include fcntl.h and define O_BINARY as zero if not defined
-	(on Unix).
-
-	* e-win32-reloc.c: Sort here, too, and add the implementation for
-	the new run-time overrides.
-
-	* Makefile.am: Ditto here. Link with INTLLIBS.
-
 2005-11-09  P. S. Chakravarthi <pchakravarthi@novell.com>
 
 	Fixes #314638
 	* e-categories-config.c (e_categories_config_get_icon_for):
-	added a g_object_unref to unref the GdkPixBuff object
-	created in this function.
-
-2005-10-18  Srinivasa Ragavan <sragavan@novell.com>
-
-	* e-dialog-utils.c: (save_ok), (e_file_dialog_save),
-	(save_folder_ok), (folderchooser_response),
-	(e_file_dialog_save_folder): Shows the default file name in the
-	save file dialog. Added code to choose folder to save multiple
-	attachments
-	* e-dialog-utils.h: Added an additional parameter to e_file_dialog_save.
-
-2005-10-04  Devashish Sharma  <sdevashish@novell.com>
-
-	* e-util.c (g_str_case_compare): added a function for case insensitive
-	and locale sensitive UTF8 string compare. See #207110.
-
-2005-09-28  Tor Lillqvist  <tml@novell.com>
-
-	* e-html-utils.c (e_text_to_html_full): Use g_ascii_strncasecmp()
-	instead of strncasecmp(). We are comparing to literal ASCII
-	strings, just casefolding ASCII is enough. Also better for
-	portability.
-
-	* e-profile-event.c (e_profile_event_target_new): Use
-	g_get_current_time() instead of gettimeofday() for portability.
+	added a g_object_unref to unref the GdkPixBuff object created
+	in this function.
 
 2005-08-23  Not Zed  <NotZed@Ximian.com>
 
diff --git a/e-util/e-categories-config.c b/e-util/e-categories-config.c
index 0bf75f9d5f..b7f647190d 100644
--- a/e-util/e-categories-config.c
+++ b/e-util/e-categories-config.c
@@ -53,10 +53,10 @@ e_categories_config_get_icon_for (const char *category, GdkPixmap **pixmap, GdkB
 
 	/* render the pixbuf to the pixmap and mask passed */
 	gdk_pixbuf_render_pixmap_and_mask (pixbuf, pixmap, &tmp_mask, 1);
+	g_object_unref (pixbuf);
 	if (mask != NULL)
 		*mask = tmp_mask;
 
-	g_object_unref (pixbuf);
 	return TRUE;
 }
 
diff --git a/help/C/evolution.xml b/help/C/evolution.xml
index b6cd0b1b5f..1ffc1e9a85 100644
--- a/help/C/evolution.xml
+++ b/help/C/evolution.xml
@@ -924,7 +924,7 @@
    <section id="usage-mail-getnsend-delete">
     <title>Deleting Mail</title>
     <para>After you read your mail, you might want to delete it. To delete a message, select it and press the Delete key, click the Trash button, press Ctrl+D, or right-click the message, then click Delete. </para>
-    <para>When you press Delete or click the Trash button, your mail isn&apos;t 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, click View &gt; Hide Deleted Messages. You can also find deleted messages in the your Trash folder. </para>
+    <para>When you press Delete or click the Trash button, your mail isn&apos;t 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, click View &gt; Hide Deleted Messages. 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>Both local and IMAP Trash folders are actually search folders that display all messages you have marked for later deletion. For more information about search folders, see <link linkend="usage-mail-organize-vfolders">Using Search Folders</link>. Because emptying your trash expunges the messages in your Trash folder, emptying Trash is the same as expunging deleted mail from all your folders.</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.</para>
@@ -982,7 +982,7 @@
 
    <section id="usage-mail-getnsend-get-attach">
     <title>Working with Attachments and HTML Mail</title>
-    <para>If someone sends you an <link linkend="attachment">attachment</link>, Evolution displays the file icon at the end of the message to which it&apos;s attached. Text, including HTML formatting and embedded images, appears as part of the message, rather than as a separate attachment. Attachements are also listed on the top bar of the message. To vie the attachments, click the arrow to expand the attachment window. To open an attachment, double-click the attachment. Click the Save All button save all the attachments.</para>
+    <para>If someone sends you an <link linkend="attachment">attachment</link>, Evolution displays the file icon at the end of the message to which it&apos;s attached. Text, including HTML formatting and embedded images, appears as part of the message, rather than as a separate attachment. Attachments are also listed on the top bar of the message. To view the attachments, click the arrow to expand the attachment window. To open an attachment, double-click the attachment. Click the Save All button save all the attachments.</para>
 
     <section id="usage-mail-getnsend-get-attach-actions">
      <title>Saving or Opening Attachments</title>
@@ -1130,7 +1130,7 @@
 
    <section id="usage-mail-getnsend-send-delay">
     <title>Sending Composed Messages Later</title>
-    <para>Evolution normally sends mail as soon as you click Send. However, can save a message to be sent later:</para>
+    <para>Evolution normally sends mail as soon as you click Send. However, you can save a message to be sent later:</para>
     <itemizedlist>
      <listitem>
       <para>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 mail, that message is sent.</para>
@@ -1414,7 +1414,7 @@
 
    <section id="usage-mail-getnsend-fwd">
     <title>Forwarding Mail</title>
-    <para>When you receive an e-mail from someone, 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 e-mail from someone, 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">inline</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, click Forward on the toolbar, click Actions &gt; Forward, or press Ctrl+F. If you prefer to forward the message <link linkend="inline">inline</link> instead of attached, click Actions &gt; Forward Inline from the menu. Select an addressee as you would when sending a new message; the subject is already entered, although you can alter it if you want. Add your comments on the message in the composition frame, then click Send.</para>
     <para>Attachments to a message you are forwarding only forwarded when you send the original message as an attachment. Inline messages do not forward any attachments.</para>
    </section>
@@ -4331,7 +4331,7 @@ Accepting and Replying to a Meeting Request</title>
        </listitem>
       </itemizedlist>
       <para>or</para>
-      <para>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 offline, and if you want the address book to be your default folder.</para>
+      <para>If you are creating the address book for a specific account, type the name of the address book. Select if you want the address book stored locally when offline, and if you want the address book to be your default folder.</para>
      </listitem>
      <listitem id="bxmw9v2">
       <para>Click OK.</para>
diff --git a/help/ChangeLog b/help/ChangeLog
index 4e8a013813..f1091cda78 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -2,14 +2,6 @@
 
 	* C/evolution.xml: Set id to index. Fixes #316297.
 
-2005-06-15  Andre Klapper  <a9016009@gmx.de>
- 	* quickref/C/quickref.tex: Updating and fixing several
- 	typos, wrong keyboard shortcuts and inconsistencies
- 	(fixes bug #268024)
-
-	committed on behalf of Andre since he does not have 
-	commit rights -partha
- 
 2005-08-29  Sankar P  <psankar@novell.com>
 
 	* C/evolution.xml: Committed on behalf of Jessica.  
diff --git a/help/devel/executive-summary/evolution-services.hierarchy b/help/devel/executive-summary/evolution-services.hierarchy
deleted file mode 100644
index 37559d819d..0000000000
--- a/help/devel/executive-summary/evolution-services.hierarchy
+++ /dev/null
@@ -1,7 +0,0 @@
-GtkObject
-  BonoboObject
-    ExecutiveSummaryComponent
-    ExecutiveSummaryComponentFactory
-    Handle to remote Bonobo::Unknown
-      ExecutiveSummaryComponentFactoryClient
-    ExecutiveSummaryHtmlView
diff --git a/help/devel/importer/evolution-shell-importer.hierarchy b/help/devel/importer/evolution-shell-importer.hierarchy
deleted file mode 100644
index c46ebdf782..0000000000
--- a/help/devel/importer/evolution-shell-importer.hierarchy
+++ /dev/null
@@ -1,7 +0,0 @@
-GtkObject
-  BonoboObject
-    BonoboXObject
-      EvolutionImporter
-      EvolutionImporterListener
-    Handle to remote Bonobo::Unknown
-      EvolutionImporterClient
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 6e5d425295..4047e8d8e0 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,152 +1,8 @@
-2005-11-28  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-folder-view.c (emfv_setting_notify): literal strings do not
-	need to be \0 terminated, they are already nul-terminated by
-	definition.
-
-2005-11-28  Sam Yang  <sam.yang@sun.com>
-
-	** See bug #322414
-	* em-folder-view.c: (emfv_setting_notify):
-	Respond to the change of /apps/evolution/mail/display/show_preview 
-	in gconf.
-
-2005-11-25  Tor Lillqvist  <tml@novell.com>
-
-	* em-composer-prefs.c (sig_add_script_response): Use gstdio
-	wrappers.
-	(url_requested): Use g_filename_from_uri()
-	instead of just stripping off the "file:" prefix.
-	(em_composer_prefs_construct): Construct glade file pathname at
-	run-time for Win32 install-anywhere.
-
-2005-11-23  Parthasarathi Susarla <sparthasarathi@novell.com>
-	
-	** See bug #315987
-	* em-composer-utils.c:
-	(em_utils_composer_send_cb): Send only if account is enabled
-	(em_utils_composer_save_draft_cb): Save message to server
-	folder only if the account is enabled, else save it locally
-	(generate_account_hash): Add default account into the account hash
-	only if the account none of the account is enabled.
-	(guess_account): use only enabled account
-
-	* mail.error.xml: Add error message for send-no-account-enabled
-
-2005-11-11  Boby Wang <boby.wang@sun.com>
-
-	** See bug 321214.
-	* mail-config.glade:
-	Focus on the Tools-> Settings-> Composer Preferences -> Forward
-	Style and Reply Style comboboxes.Comboboxes are named after
-	their current settings. Now the names were corrected.
-
-2005-10-26  Vivek Jain <jvivek@novell.com>
-	
-	**See #313096
-	
-	* em-junk-hook.c: (emjh_construct)
-	load the plugin only if it is enabled.
-
-2005-10-22  Parthasarathi Susarla <sparthasarathi@novell.com>
-	
-	* mail-config.c: (mail_config_get_default_account):
-	Return valid transport, only if the account is enabled.
-
-2005-10-22  Parthasarathi Susarla <sparthasarathi@novell.com>
-	
-	* em-composer-utils.c: (create_new_composer):
-	If the account corresponding to the fromuri is not enabled.
-	Then load the preferred account from the composer.
-
-2005-10-21  Jeff Cai <jeff.cai@sun.com>
-
-	Reverse previous patch because of bug 319376.	
-	* em-folder-view.h:
-
-2005-10-21  Jeff Cai <jeff.cai@sun.com>
-
-	* mail/em-folder-view.h : Change the declaration of flag 
-	'preview_active' from one bit of int to one bit of guint 
-	because it will be -1 on linux if being declared one bit of int.
-
-2005-10-19  Philip Van Hoof <pvanhoof@gnome.org>
-	
-	** See bug 318611
-
-	mail/em-composer-utils.c,
-	data hiding
-
-2005-10-19  Harish Krishnaswamy <kharish@novell.com>
-
-	* em-format-html-display.h : Include e-attachment-bar.h
-	relative to the top dir, so it stops borking the print-message
-	plugin.
-
-2005-10-18  Srinivasa Ragavan <sragavan@novell.com>
-
-	* em-folder-browser.c (emfb_focus_search) (emfb_tools_vfolders): Make '/' to 
-	focus on search bar entry. Fixes bug #268027
-
-	* em-folder-view.c (emfv_enable_menus): Set the target widget.
-
-	* em-format-html-display.[ch] (em_format_html_display_get_bar): Added a
-	function to get the attachment bar.
-
-	* em-utils.c (em_utils_temp_save_attachments): Added function to save
-	parts of the attachments.
-
-2005-10-03  Srinivasa Ragavan <sragavan@novell.com>
-
-	* em-folder-view.c (emfv_ena) (emfv_popup_items): Mark visible with
-	  junk flags as well.
-	* em-popup.[ch] (em_popup_target_new_select): Set the flags
-	  for junk respectively.
-	
-2005-10-18  Sankar P  <psankar@novell.com>
-	
-	- Enhances Signature-Preferences. 
-	- Added shortcuts for common operations.
-		-- Delete on Del key
-		-- Edit on Dbl.Click
-	- Prevents adding duplicate and NULL signatures
-	
-	* mail-signature-editor.c (menu_file_save_cb) (mail_signature_editor)
-	(sig_name_changed) (menu_file_save_close_cb) (delete_event_cb) (do_exit):
-		Modified the functions for handling the above scenarios.
-	* mail.error.xml:
-		Added error strings for duplicate and NULL signatures.
-	* em-composer-prefs.c (em_composer_prefs_construct) (sig_delete_cb) (sig_add_cb):
-		Modified the functions so as to handle the keyboard accelarators
-	and to grab focus to the list on deletion/insertion of signatures.	
-	* em-composer-prefs.c (signature_key_press)(sig_tree_event_cb):
-		Added new functions to handle the 
-	keypress events on the signatures list tree.
-
-	Fixes #269749
-	
 2005-09-29  Parthasarathi Susarla <sparthasarathi@novell.com>
 	
 	** See bug 317284
-	
-	* em-mailer-prefs.c: (emmp_header_add_header):
-	Check if its a valid header and only then add it
-	
-2005-09-28  Tor Lillqvist  <tml@novell.com>
-
-	* em-composer-utils.c (reply_get_composer, get_reply_list,
-	post_reply_to_message)
-	* em-folder-view.c (emfv_format_link_clicked)
-	* importers/netscape-importer.c (netscape_get_boolean): Use
-	g_ascii_str(n)casecmp() instead of str(n)casecmp(). We are
-	comparing to literal ASCII strings in these cases, so just
-	casefolding ASCII is enough. Also better for portability.
-
-	* em-format-html-display.c
-	* message-list.c: Define localtime_r() for Win32 using localtime()
-	(which is thread-safe in Microsoft's C library).
-
-	* mail-tools.c (mail_tool_do_movemail): Not implemented on Win32.
+	* em-mailer-prefs.c:(emmp_header_add_header):
+	Make sure that the header text is not empty
 
 2005-09-28  Parthasarathi Susarla <sparthasarathi@novell.com>
 	
@@ -154,14 +10,12 @@
 	* em-vfolder-rule.c: (em_vfolder_rule_add_source):
 	Do not add a NULL uri.
 
-2005-09-26  S.Antony Vincent Pandian <santony@gmail.com>
-
-	Fixes #208647
-
-	* em-folder-tree.c : Have added a menu item Empty 
-	Trash in the folder tree's context menu and also
-	added its callback.
+2005-09-27  Sankar P  <psankar@novell.com>
 
+	* em-account-editor.c (emae_check_complete) :
+	Removed a few wrong commits that accidentally went in 
+	while committing the patch for 315506.
+	
 2005-09-22  Carsten Guenther <carsten.guenther@scalix.com>
 
 	Fixes #316983
@@ -758,7 +612,6 @@
 	we don't update too often and suck loads of cpu time.
 
 2005-06-07  Andre Klapper <9016009@gmx.de>
-
 	* mail.error.xml: Fixing typo (bug 306151)
 
 2005-06-02  Not Zed  <NotZed@Ximian.com>
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 04ae1d2502..b211535710 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -2421,8 +2421,7 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data)
 
 	/* We use the page-check of various pages to 'prepare' or
 	   pre-load their values, only in the druid */
-	if (pageid
-	    && ((EConfig *)emae->priv->config)->type == E_CONFIG_DRUID) {
+	if (pageid && ((EConfig *)emae->priv->config)->type == E_CONFIG_DRUID) {
 		if (!strcmp(pageid, "00.identity")) {
 			if (!emae->priv->identity_set) {
 				char *uname;
@@ -2449,7 +2448,7 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data)
 			}
 		} else if (!strcmp(pageid, "20.receive_options")) {
 			if (emae->priv->source.provider
-			    && emae->priv->extra_provider != emae->priv->source.provider) {
+					&& emae->priv->extra_provider != emae->priv->source.provider) {
 				emae->priv->extra_provider = emae->priv->source.provider;
 				emae_auto_detect(emae);
 			}
@@ -2478,8 +2477,8 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data)
 			&& (tmp = e_account_get_string(emae->account, E_ACCOUNT_ID_ADDRESS))
 			&& is_email(tmp)
 			&& ((tmp = e_account_get_string(emae->account, E_ACCOUNT_ID_REPLY_TO)) == NULL
-			    || tmp[0] == 0
-			    || is_email(tmp));
+					|| tmp[0] == 0
+					|| is_email(tmp));
 		if (!ok)
 			d(printf("identity incomplete\n"));
 	}
@@ -2500,7 +2499,7 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data)
 		ok = (tmp = e_account_get_string(emae->account, E_ACCOUNT_NAME))
 			&& tmp[0]
 			&& ((ea = mail_config_get_account_by_name(tmp)) == NULL
-			    || ea == emae->original);
+					|| ea == emae->original);
 		if (!ok)
 			d(printf("management page incomplete\n"));
 	}
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index b0eac88d5e..452cad9bca 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -297,7 +297,7 @@ composer_get_message (EMsgComposer *composer, gboolean save_html_object_data)
 	
 	camel_object_unref (cia);
 
-	postlist = e_msg_composer_hdrs_get_post_to(e_msg_composer_get_hdrs (composer));
+	postlist = e_msg_composer_hdrs_get_post_to((EMsgComposerHdrs *) composer->hdrs);
 	num_post = g_list_length(postlist);
 	g_list_foreach(postlist, (GFunc)g_free, NULL);
 	g_list_free(postlist);
@@ -381,13 +381,6 @@ em_utils_composer_send_cb (EMsgComposer *composer, gpointer user_data)
 	CamelMessageInfo *info;
 	struct _send_data *send;
 	CamelFolder *mail_folder;
-	EAccount *account;
-
-	account = e_msg_composer_get_preferred_account (composer);
-	if (!account->enabled) {
-		e_error_run(NULL, "mail:send-no-account-enabled", NULL);
-		return;
-	}
 
 	if (!(message = composer_get_message (composer, FALSE)))
 		return;
@@ -428,11 +421,16 @@ save_draft_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *i
 {
 	struct _save_draft_info *sdi = user_data;
 	struct emcs_t *emcs;
+	CORBA_Environment ev;
 	
 	if (!ok)
 		goto done;
 
-	e_msg_composer_set_saved (sdi->composer);
+	if (sdi->composer->editor_engine) {
+		CORBA_exception_init (&ev);
+		GNOME_GtkHTML_Editor_Engine_runCommand (sdi->composer->editor_engine, "saved", &ev);
+		CORBA_exception_free (&ev);
+	}
 	
 	if ((emcs = sdi->emcs) == NULL) {
 		emcs = emcs_new ();
@@ -526,7 +524,7 @@ em_utils_composer_save_draft_cb (EMsgComposer *composer, int quit, gpointer user
 		id = mail_get_folder (account->drafts_folder_uri, 0, save_draft_folder, &folder, mail_thread_new);
 		mail_msg_wait (id);
 		
-		if (!folder || !account->enabled) {
+		if (!folder) {
 			if (e_error_run((GtkWindow *)composer, "mail:ask-default-drafts", NULL) != GTK_RESPONSE_YES) {
 				g_object_unref(composer);
 				camel_object_unref(msg);
@@ -595,13 +593,6 @@ create_new_composer (const char *subject, const char *fromuri)
 	if (fromuri)
 		account = mail_config_get_account_by_source_url(fromuri);
 
-	/* If the account corresponding to the fromuri is not enabled.
-	 * We get the preffered account from the composer and use that
-	 * as the account to send the mail.
-	 */
-	if (!account)
-		account = e_msg_composer_get_preferred_account (composer);
-
 	e_msg_composer_set_headers (composer, account?account->name:NULL, NULL, NULL, NULL, subject);
 
 	em_composer_utils_setup_default_callbacks (composer);
@@ -653,7 +644,7 @@ em_utils_compose_new_message_with_mailto (const char *url, const char *fromuri)
 
 	if (fromuri
 	    && (account = mail_config_get_account_by_source_url(fromuri)))
-		e_msg_composer_hdrs_set_from_account(e_msg_composer_get_hdrs(composer), account->name);
+		e_msg_composer_hdrs_set_from_account((EMsgComposerHdrs *)composer->hdrs, account->name);
 
 	e_msg_composer_unset_changed (composer);
 	e_msg_composer_drop_editor_undo (composer);
@@ -680,7 +671,7 @@ em_utils_post_to_folder (CamelFolder *folder)
 	if (folder != NULL) {
 		char *url = mail_tools_folder_to_url (folder);
 		
-		e_msg_composer_hdrs_set_post_to (e_msg_composer_get_hdrs (composer), url);
+		e_msg_composer_hdrs_set_post_to ((EMsgComposerHdrs *) ((EMsgComposer *) composer)->hdrs, url);
 		g_free (url);
 		
 		url = camel_url_to_string (CAMEL_SERVICE (folder->parent_store)->url, CAMEL_URL_HIDE_ALL);
@@ -688,7 +679,7 @@ em_utils_post_to_folder (CamelFolder *folder)
 		g_free (url);
 		
 		if (account)
-			e_msg_composer_hdrs_set_from_account (e_msg_composer_get_hdrs(composer), account->name);
+			e_msg_composer_hdrs_set_from_account ((EMsgComposerHdrs *) ((EMsgComposer *) composer)->hdrs, account->name);
 	}
 	
 	em_composer_utils_setup_default_callbacks (composer);
@@ -715,7 +706,7 @@ em_utils_post_to_url (const char *url)
 	composer = e_msg_composer_new_with_type (E_MSG_COMPOSER_POST);
 	
 	if (url != NULL)
-		e_msg_composer_hdrs_set_post_to (e_msg_composer_get_hdrs (composer), url);
+		e_msg_composer_hdrs_set_post_to ((EMsgComposerHdrs *) ((EMsgComposer *) composer)->hdrs, url);
 	
 	em_composer_utils_setup_default_callbacks (composer);
 	
@@ -1277,7 +1268,11 @@ generate_account_hash (void)
 	accounts = mail_config_get_accounts ();
 	account_hash = g_hash_table_new (camel_strcase_hash, camel_strcase_equal);
 	
-	def = mail_config_get_default_account ();
+	/* add the default account to the hash first */
+	if ((def = mail_config_get_default_account ())) {
+		if (def->id->address)
+			g_hash_table_insert (account_hash, (char *) def->id->address, (void *) def);
+	}
 	
 	iter = e_list_get_iterator ((EList *) accounts);
 	while (e_iterator_is_valid (iter)) {
@@ -1306,10 +1301,6 @@ generate_account_hash (void)
 	}
 	
 	g_object_unref (iter);
-
-	/* The default account has to be there if none of the enabled accounts are present */
-	if (g_hash_table_size (account_hash) == 0 && def && def->id->address)
-		g_hash_table_insert (account_hash, (char *) def->id->address, (void *) def);
 	
 	return account_hash;
 }
@@ -1377,7 +1368,7 @@ reply_get_composer (CamelMimeMessage *message, EAccount *account,
 
 	/* Set the subject of the new message. */
 	if ((subject = (char *) camel_mime_message_get_subject (message))) {
-		if (g_ascii_strncasecmp (subject, "Re: ", 4) != 0)
+		if (strncasecmp (subject, "Re: ", 4) != 0)
 			subject = g_strdup_printf ("Re: %s", subject);
 		else
 			subject = g_strdup (subject);
@@ -1401,7 +1392,7 @@ reply_get_composer (CamelMimeMessage *message, EAccount *account,
 		}
 
 		post = camel_address_encode((CamelAddress *)postto);
-		e_msg_composer_hdrs_set_post_to_base (e_msg_composer_get_hdrs(composer), store_url ? store_url : "", post);
+		e_msg_composer_hdrs_set_post_to_base (E_MSG_COMPOSER_HDRS (composer->hdrs), store_url ? store_url : "", post);
 		g_free(post);
 		g_free (store_url);
 	}
@@ -1467,7 +1458,7 @@ guess_account (CamelMimeMessage *message, CamelFolder *folder)
 		if (to) {
 			for (i = 0; camel_internet_address_get(to, i, NULL, &tmp); i++) {
 				account = g_hash_table_lookup(account_hash, tmp);
-				if (account && account->enabled)
+				if (account)
 					break;
 			}
 		}
@@ -1531,7 +1522,7 @@ get_reply_list (CamelMimeMessage *message, CamelInternetAddress *to)
 		header++;
 	
 	/* check for NO */
-	if (!g_ascii_strncasecmp (header, "NO", 2))
+	if (!strncasecmp (header, "NO", 2))
 		return FALSE;
 	
 	/* Search for the first mailto angle-bracket enclosed URL.
@@ -2007,7 +1998,7 @@ post_reply_to_message (CamelFolder *folder, const char *uid, CamelMimeMessage *m
 	
 	/* Set the subject of the new message. */
 	if ((subject = (char *) camel_mime_message_get_subject (message))) {
-		if (g_ascii_strncasecmp (subject, "Re: ", 4) != 0)
+		if (strncasecmp (subject, "Re: ", 4) != 0)
 			subject = g_strdup_printf ("Re: %s", subject);
 		else
 			subject = g_strdup (subject);
@@ -2020,7 +2011,7 @@ post_reply_to_message (CamelFolder *folder, const char *uid, CamelMimeMessage *m
 	g_free (subject);
 	
 	url = mail_tools_folder_to_url (real_folder);
-	e_msg_composer_hdrs_set_post_to (e_msg_composer_get_hdrs(composer), url);
+	e_msg_composer_hdrs_set_post_to ((EMsgComposerHdrs *) composer->hdrs, url);
 	g_free (url);
 	
 	/* Add In-Reply-To and References. */
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index c709165c02..29142c596a 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -1725,7 +1725,7 @@ emft_get_folder_info__got (struct _mail_msg *mm)
 	gtk_tree_model_get_iter ((GtkTreeModel *) model, &root, path);
 
 	/* if we had an error, then we need to re-set the load subdirs state and collapse the node */
-	if (!m->fi && camel_exception_is_set(&mm->ex)) {
+	if (camel_exception_is_set(&mm->ex)) {
 		gtk_tree_store_set(model, &root, COL_BOOL_LOAD_SUBDIRS, TRUE, -1);
 		gtk_tree_view_collapse_row (priv->treeview, path);
 		gtk_tree_path_free (path);
@@ -2013,12 +2013,6 @@ emft_popup_rename_folder (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static void
-emft_popup_empty_trash (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	em_utils_empty_trash (data);
-}
-
-static void
 emft_popup_properties (EPopup *ep, EPopupItem *pitem, void *data)
 {
 	EMFolderTree *emft = data;
@@ -2057,7 +2051,6 @@ static EPopupItem emft_popup_items[] = {
 	{ E_POPUP_BAR, "80.emc" },
 	{ E_POPUP_ITEM, "80.emc.00", N_("_Properties"), emft_popup_properties, NULL, "stock_folder-properties", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT }
 };
-static EPopupItem trash_popup_item = {E_POPUP_ITEM, "20.emc.03", N_("_Empty Trash"), emft_popup_empty_trash,NULL,NULL, 1, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT};
 
 static void
 emft_popup_free(EPopup *ep, GSList *items, void *data)
@@ -2077,7 +2070,6 @@ emft_popup (EMFolderTree *emft, GdkEvent *event)
 	GSList *menus = NULL;
 	guint32 info_flags = 0;
 	guint32 flags = 0;
-	guint32 folder_type_flags = 0;
 	gboolean isstore;
 	char *uri, *full_name;
 	GtkMenu *menu;
@@ -2096,7 +2088,7 @@ emft_popup (EMFolderTree *emft, GdkEvent *event)
 	
 	gtk_tree_model_get (model, &iter, COL_POINTER_CAMEL_STORE, &store,
 			    COL_STRING_URI, &uri, COL_STRING_FULL_NAME, &full_name,
-			    COL_BOOL_IS_STORE, &isstore, COL_UINT_FLAGS, &folder_type_flags, -1);
+			    COL_BOOL_IS_STORE, &isstore, -1);
 
 	/* Stores have full_name == NULL, otherwise its just a placeholder */
 	/* NB: This is kind of messy */
@@ -2137,9 +2129,6 @@ emft_popup (EMFolderTree *emft, GdkEvent *event)
 	for (i = 0; i < sizeof (emft_popup_items) / sizeof (emft_popup_items[0]); i++)
 		menus = g_slist_prepend (menus, &emft_popup_items[i]);
 	
-	if ((folder_type_flags & CAMEL_FOLDER_TYPE_MASK) == CAMEL_FOLDER_TYPE_TRASH)
-		menus = g_slist_prepend (menus, &trash_popup_item);
-
 	e_popup_add_items ((EPopup *)emp, menus, NULL, emft_popup_free, emft);
 
 	menu = e_popup_create_menu_once ((EPopup *)emp, (EPopupTarget *)target, 0);
diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c
index 4fe3cbfa68..00988514ee 100644
--- a/mail/em-mailer-prefs.c
+++ b/mail/em-mailer-prefs.c
@@ -385,7 +385,7 @@ emmp_header_add_header (GtkWidget *widget, EMMailerPrefs *prefs)
 	GtkTreeModel *model = GTK_TREE_MODEL (prefs->header_list_store);
 	GtkTreeIter iter;
 	const gchar *text = gtk_entry_get_text (prefs->entry_header);
-	
+
 	g_strstrip (text);
 
 	if (text && (strlen (text)>0)) {
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index 08af9b374d..d74e22b0f1 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,5 +1,5 @@
 2005-11-24  Sushma Rai  <rsushma@novell.com>
-
+	
 	* exchange-account-setup.c (org_gnome_exchange_settings): Initialize
 	OOF state and check for the OOF state and message only of the account
 	is valid. Fixes the problem of printing OOF error message in case
@@ -13,30 +13,12 @@
 	properly to get the efolder.
 	* exchange-folder.c (org_gnome_exchange_folder_inbox_unsubscribe),
 	(exchange_get_folder), (org_gnome_exchange_check_inbox_subscribed),
-	(unsubscribe_dialog_ab_response), (unsubscribe_dialog_response): 
+	(unsubscribe_dialog_ab_response), (unsubscribe_dialog_response):
 	Creating proper path.
-	
+
 	The above modifications will now allow the user to do the operations
 	like unsubscribed to Inbox and giving permission to a folder.
-		-
-
-2005-09-30  Shakti Sen <shprasad@novell.com>
-
-	* exchange-folder-subscription.c (setup_folder_name_combo): Sets the
-	corresponding 'Folder name'.
-	(create_folder_subscription_dialog): Sets the cursor to User's entry
-	text field.
-	* exchange-folder-subscription.h: Added one more argument to function
-	create_folder_subscription_dialog() to set the window title.
-	* exchange-folder.c (org_gnome_exchange_inbox_subscription),
-	(org_gnome_exchange_addressbook_subscription),
-	(org_gnome_exchange_calendar_subscription),
-	(org_gnome_exchange_tasks_subscription): Added newly.
-	* org-gnome-exchange-operations.eplug.in: Changed the activate callback
-	function names so that it can show appropriate window title.
-
-	Fixes bug #317019, #317023.
-	
+
 2005-09-28  Sarfraaz Ahmed <asarfraaz@novell.com>
 
 	* exchange-account-setup.c (owa_authenticate_user) : Propogate the
@@ -45,15 +27,6 @@
 	* exchange-contacts.c
 	* exchange-folder.c : Parse the new account uri.
 
-2005-09-28  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am (INCLUDES, LIBADD): Use just CAMEL_EXCHANGE_CFLAGS
-	and _LIBS, they now includes all necessary (see top-level
-	ChangeLog).
-	(LDFLAGS): Use NO_UNDEFINED.
-
-	* org-gnome-exchange-operations.eplug.in: Use SOEXT.
-
 2005-09-22  Praveen Kumar  <kpraveen@novell.com>
 
 	** Fixes bug 312849
diff --git a/plugins/exchange-operations/exchange-calendar.c b/plugins/exchange-operations/exchange-calendar.c
index 0117e18af7..28b70d699d 100644
--- a/plugins/exchange-operations/exchange-calendar.c
+++ b/plugins/exchange-operations/exchange-calendar.c
@@ -99,7 +99,6 @@ e_exchange_calendar_get_calendars (ECalSourceType ftype)
 			tmp = (gchar *)e_folder_get_physical_uri (folder);
 			if (g_str_has_prefix (tmp, uri_prefix)) {
 				ruri = g_strdup (tmp+prefix_len); /* ATTN: Shouldn't free this explictly */
-				printf ("adding ruri : %s\n", ruri);
 				g_ptr_array_add (calendar_list, (gpointer)ruri);
 			}
 		}
@@ -154,8 +153,6 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
 	const char *rel_uri;
 	int row, i;
 	gint offline_status;
-	char *offline_msg;
-	GtkWidget *lbl_offline_msg;
 
 
 	if (!hidden)
@@ -188,14 +185,7 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
 	if (offline_status == OFFLINE_MODE) {
 		/* Evolution is in offline mode; we will not be able to create
 		   new folders or modify existing folders. */
-		offline_msg = g_markup_printf_escaped ("<b>%s</b>", 
-						       _("Evolution is in offline mode. You cannot create or modify folders now.\nPlease switch to online mode for such operations."));
-		lbl_offline_msg = gtk_label_new ("");
-		gtk_label_set_markup (GTK_LABEL (lbl_offline_msg), offline_msg);
-		g_free (offline_msg);
-		gtk_widget_show (lbl_offline_msg);
-		gtk_table_attach (GTK_TABLE (parent), lbl_offline_msg, 0, 2, row, row+1, GTK_FILL|GTK_EXPAND, 0, 0, 0);
-		return lbl_offline_msg;		
+		return NULL;		
 	}
 
 	rel_uri = e_source_peek_relative_uri (t->source);
diff --git a/plugins/exchange-operations/exchange-contacts.c b/plugins/exchange-operations/exchange-contacts.c
index ae99fc5566..3bf753b750 100644
--- a/plugins/exchange-operations/exchange-contacts.c
+++ b/plugins/exchange-operations/exchange-contacts.c
@@ -136,8 +136,6 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data)
 
 	EABConfigTargetSource *t = (EABConfigTargetSource *) data->target;
 	ESource *source = t->source;
-	GtkWidget *lbl_offline_msg, *vb_offline_msg;
-	char *offline_msg;
 	gint offline_status;
 	
 
@@ -158,16 +156,7 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data)
 	if (offline_status == OFFLINE_MODE) {
 		/* Evolution is in offline mode; we will not be able to create
 		   new folders or modify existing folders. */
-		offline_msg = g_markup_printf_escaped ("<b>%s</b>", 
-						       _("Evolution is in offline mode. You cannot create or modify folders now.\nPlease switch to online mode for such operations."));
-		vb_offline_msg = gtk_vbox_new (FALSE, 6);		
-		gtk_container_add (GTK_CONTAINER (data->parent), vb_offline_msg);
-		lbl_offline_msg = gtk_label_new ("");
-		gtk_label_set_markup (GTK_LABEL (lbl_offline_msg), offline_msg);
-		g_free (offline_msg);
-		gtk_box_pack_start (GTK_BOX (vb_offline_msg), lbl_offline_msg, FALSE, FALSE, 0);
-		gtk_widget_show_all (vb_offline_msg);
-		return vb_offline_msg;		
+		return NULL;		
 	}
 
 	rel_uri = e_source_peek_relative_uri (source);
diff --git a/plugins/exchange-operations/exchange-folder.c b/plugins/exchange-operations/exchange-folder.c
index 1c6eeaeccf..9ddccfd1e3 100644
--- a/plugins/exchange-operations/exchange-folder.c
+++ b/plugins/exchange-operations/exchange-folder.c
@@ -43,11 +43,7 @@
 #include "addressbook/gui/widgets/eab-popup.h"
 #include "exchange-folder-subscription.h"
 
-void org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target, gchar *fname);
-void org_gnome_exchange_inbox_subscription (EPlugin *ep, EMMenuTargetSelect *target);
-void org_gnome_exchange_addressbook_subscription (EPlugin *ep, EMMenuTargetSelect *target);
-void org_gnome_exchange_calendar_subscription (EPlugin *ep, EMMenuTargetSelect *target);
-void org_gnome_exchange_tasks_subscription (EPlugin *ep, EMMenuTargetSelect *target);
+void org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target);
 void org_gnome_exchange_check_subscribed (EPlugin *ep, ECalPopupTargetSource *target);
 void org_gnome_exchange_folder_unsubscribe (EPopup *ep, EPopupItem *p, void *data);
 void org_gnome_exchange_check_address_book_subscribed (EPlugin *ep, EABPopupTargetSource *target);
@@ -544,7 +540,7 @@ org_gnome_exchange_folder_unsubscribe (EPopup *ep, EPopupItem *p, void *data)
 
 
 void
-org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target, gchar *fname)
+org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target)
 {
 	ExchangeAccount *account = NULL;
 	EFolder *folder = NULL;
@@ -574,7 +570,7 @@ org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target,
 		return;
 	}	
 
-	create_folder_subscription_dialog (account->account_name, fname, &user_email_address, &folder_name);
+	create_folder_subscription_dialog (account->account_name, &user_email_address, &folder_name);
 
 	if (user_email_address && folder_name) {
 		result = exchange_account_discover_shared_folder (account, user_email_address, folder_name, &folder);
@@ -615,27 +611,3 @@ org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target,
 	exchange_account_open_folder (account, g_strdup_printf ("/%s", user_email_address));
 }
 
-void
-org_gnome_exchange_calendar_subscription (EPlugin *ep, EMMenuTargetSelect *target)
-{
-	gchar *folder_name = "Calendar";
-	org_gnome_exchange_folder_subscription (ep, target, folder_name);
-}
-void
-org_gnome_exchange_addressbook_subscription (EPlugin *ep, EMMenuTargetSelect *target)
-{
-	gchar *folder_name = "Contacts";
-	org_gnome_exchange_folder_subscription (ep, target, folder_name);
-}
-void
-org_gnome_exchange_tasks_subscription (EPlugin *ep, EMMenuTargetSelect *target)
-{
-	gchar *folder_name = "Tasks";
-	org_gnome_exchange_folder_subscription (ep, target, folder_name);
-}
-void
-org_gnome_exchange_inbox_subscription (EPlugin *ep, EMMenuTargetSelect *target)
-{
-	gchar *folder_name = "Inbox";
-	org_gnome_exchange_folder_subscription (ep, target, folder_name);
-}
diff --git a/plugins/groupwise-account-setup/ChangeLog b/plugins/groupwise-account-setup/ChangeLog
index 11c5a318cd..db7c8029a3 100644
--- a/plugins/groupwise-account-setup/ChangeLog
+++ b/plugins/groupwise-account-setup/ChangeLog
@@ -1,16 +1,3 @@
-2005-11-24  Sushma Rai  <rsushma@novell.com>
-
-	* camel-gw-listener.c (add_addressbook_sources): Checking if the 
-	frequent contacts folder is read from the server, and if not
-	displaying the warning message to user, asking to use some other
-	GroupWise mail clinet to get it created.
-
-2005-11-09  Parthasarathi Susarla <sparthasarathi@novell.com>
-	
-	* camel-gw-listener.c (get_addressbook_names_from_server):
-	check if string (eg. use_ssl) are NULL before strcmp(). 
-	prevents a violation.
-
 2005-09-28  Sushma Rai  <rsushma@novell.com>
 
 	* camel-gw-listener.c (add_addressbook_sources): Removed name
diff --git a/plugins/groupwise-account-setup/camel-gw-listener.c b/plugins/groupwise-account-setup/camel-gw-listener.c
index 92b43ae20f..865705fe30 100644
--- a/plugins/groupwise-account-setup/camel-gw-listener.c
+++ b/plugins/groupwise-account-setup/camel-gw-listener.c
@@ -448,8 +448,6 @@ get_addressbook_names_from_server (char *source_url)
         if (!soap_port || strlen (soap_port) == 0)
                 soap_port = "7191";
 	use_ssl = camel_url_get_param (url, "use_ssl");
-	if (!use_ssl)
-		use_ssl = "";
 
 	key =  g_strdup_printf ("groupwise://%s@%s/", url->user, poa_address); 
 	
@@ -606,7 +604,6 @@ add_addressbook_sources (EAccount *account)
 	GConfClient* client;
 	const char* use_ssl;
 	const char *poa_address;
-	gboolean is_frequent_contacts = FALSE;
 
         url = camel_url_new (account->source->url, NULL);
 	if (url == NULL) {
@@ -631,8 +628,6 @@ add_addressbook_sources (EAccount *account)
 		return FALSE;
 	for (; temp_list != NULL; temp_list = g_list_next (temp_list)) {
 		const char *book_name =  e_gw_container_get_name (E_GW_CONTAINER(temp_list->data));
-		if (!is_frequent_contacts)
-			is_frequent_contacts = e_gw_container_get_is_frequent_contacts (E_GW_CONTAINER (temp_list->data));
 		source = e_source_new (book_name, g_strconcat (";",book_name, NULL));
 		e_source_set_property (source, "auth", "plain/password");
 		e_source_set_property (source, "auth-domain", "Groupwise");
@@ -641,7 +636,7 @@ add_addressbook_sources (EAccount *account)
 		/* mark system address book for offline usage */
 		/* FIXME: add isPersonal flag to container and use that isFrequentContact
 		 * properties, instead of using writable to distinguish between the
-		 * system address book and other address books.
+		 * system address book and other address books
 		 */
 		if (!e_gw_container_get_is_writable (E_GW_CONTAINER(temp_list->data)))
 			e_source_set_property (source, "offline_sync", "1");
@@ -662,11 +657,7 @@ add_addressbook_sources (EAccount *account)
 	g_object_unref (list);
 	g_object_unref (client);
 	g_free (base_uri);
-
-	if (!is_frequent_contacts) {
-		/* display warning message */
-		e_error_run (NULL, "addressbook:gw-book-list-init", NULL);
-	}	
+	
 	return TRUE;
 }
 
diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index 72d8ac0604..3be47ef98b 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/ChangeLog
@@ -1,9 +1,3 @@
-2005-11-10  Harish Krishnaswamy  <kharish@novell.com>
-
-	* mail-send-options.c: (org_gnome_compose_send_options):
-	Function signature specifies a void return. So, do not 
-	return NULL.
-	
 2005-10-20  Sankar P  <psankar@novell.com>
 
 	* proxy-login.c (org_gnome_proxy_account_login) (proxy_login_get_cnc): 
@@ -13,19 +7,7 @@
 
 	* proxy-login.c (proxy_login_update_tree) (proxy_login_get_cnc):
 	Added the missing unrefs for the connection object.
-
-2005-10-19  Shreyas Srinivasan  <sshreyas@novell.com>
-
-	* proxy.c (org_gnome_proxy): Dont try to connect when the account is
-	offline. Also connect to the server only when the proxy tab is clicked.
-	* Fixes #314297, #314345
-
-2005-10-14  Vivek Jain <jvivek@novell.com>
 	
-	* proxy.c :(proxy_get_cnc)
-	"use_ssl" should be Null checked before comparing it with any value. 
-	its NULL when evo is not compiled with ssl support and caused crash.
-
 2005-10-07  Vivek Jain <jvivek@novell.com>
 
 	* share-folder.c : (remove_clicked)
@@ -46,6 +28,11 @@
 	* install-shared.c 	: (org_gnome_popup_wizard)
 	enable shared-folder functionalilty, remove env check 
 
+2005-09-30  Shreyas Srinivasan  <sshreyas@novell.com>
+
+	* proxy.c (proxy_page_changed_cb): Load proxy list only when
+	the tab is clicked. Fixes #314337
+	
 2005-09-28  Sankar P  <psankar@novell.com>
 
 	*  proxy.c (proxy_dialog_store_widgets_data):
diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c
index b75e82340c..f7a0217003 100644
--- a/plugins/groupwise-features/proxy.c
+++ b/plugins/groupwise-features/proxy.c
@@ -54,13 +54,11 @@
 #include <mail/em-config.h>
 #include <mail/mail-component.h>
 #include <mail/mail-ops.h>
-#include <mail/mail-session.h>
 #include <e-util/e-account.h>
 #include <e-util/e-account-list.h>
 #include <e-util/e-icon-factory.h>
 
 #include <camel/camel-url.h>
-#include <camel/camel-offline-store.h>
 #include <libedataserverui/e-passwords.h>
 #include <libedataserverui/e-name-selector.h>
 #include <proxy.h>
@@ -490,7 +488,7 @@ proxy_get_cnc (EAccount *account)
 
 	key =  g_strdup_printf ("groupwise://%s@%s/", url->user, poa_address); 
 	
-	if (use_ssl && !g_str_equal (use_ssl, "never"))
+	if (!g_str_equal (use_ssl, "never"))
 		uri = g_strdup_printf ("https://%s:%s/soap", poa_address, soap_port);
 	else 
 		uri = g_strdup_printf ("http://%s:%s/soap", poa_address, soap_port);
@@ -645,18 +643,10 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 	GtkButton *addProxy, *removeProxy, *editProxy;
 	proxyDialog *prd;
 	proxyDialogPrivate *priv;
-	CamelOfflineStore *store;
-	CamelException ex;
 	int pag_num;
 
 	target_account = (EMConfigTargetAccount *)data->config->target;
 	account = target_account->account;
-
-	if (!(store = (CamelOfflineStore *) camel_session_get_service (session, e_account_get_string(account, E_ACCOUNT_SOURCE_URL), CAMEL_PROVIDER_STORE, &ex))) {	  
-		camel_exception_clear (&ex);
-		return NULL;
-	}
-
 	if (g_strrstr (e_account_get_string(account, E_ACCOUNT_SOURCE_URL), "groupwise://"))
 	{
 		prd = proxy_dialog_new ();
@@ -664,7 +654,7 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 		priv = prd->priv;
 		priv->xml_tab = glade_xml_new (EVOLUTION_GLADEDIR "/proxy-listing.glade", "proxy_vbox", NULL);
 
-		if (account->enabled && (store->state == CAMEL_OFFLINE_STORE_NETWORK_AVAIL)) {	
+		if (account->enabled) {	
 			priv->tab_dialog = GTK_WIDGET (glade_xml_get_widget (priv->xml_tab, "proxy_vbox"));
 			priv->tree = GTK_TREE_VIEW (glade_xml_get_widget (priv->xml_tab, "proxy_access_list"));
 			priv->store =  gtk_tree_store_new (2,
@@ -684,11 +674,6 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 			prd->cnc = proxy_get_cnc(account);
 			
 			priv->proxy_list = NULL;
-		} else if (account->enabled){
-			GtkWidget *label;
-			priv->tab_dialog = gtk_vbox_new (TRUE, 10);
-			label = gtk_label_new (_("The Proxy tab will be available only when the account is online."));
-			gtk_box_pack_start ((GtkBox *)priv->tab_dialog, label, TRUE, TRUE, 10);	
 		} else {
 			GtkWidget *label;
 			priv->tab_dialog = gtk_vbox_new (TRUE, 10);
@@ -708,13 +693,11 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 			priv = prd->priv;
 
 			if (priv) {
-				pag_num = gtk_notebook_page_num ( (GtkNotebook *)(data->parent), (GtkWidget *) priv->tab_dialog);
-				gtk_notebook_remove_page ( (GtkNotebook *)(data->parent), pag_num); 
+			pag_num = gtk_notebook_page_num ( (GtkNotebook *)(data->parent), (GtkWidget *) priv->tab_dialog);
+			gtk_notebook_remove_page ( (GtkNotebook *)(data->parent), pag_num); 
 			}
 		}	
 	}
-	
-	camel_object_unref (store);
 	return NULL;
 }
 
@@ -724,11 +707,10 @@ proxy_page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, int num, EA
 	proxyDialog *prd;
 	proxyDialogPrivate *priv;
 
-	prd = g_object_get_data ((GObject *) account, "prd");
-
-	if (!prd || !prd->priv)
+	if (!prd || !prd->priv || !prd->priv->proxy_list)
 		return;
 	
+	prd = g_object_get_data ((GObject *) account, "prd");
 	priv = prd->priv;
 
 	if (num == g_object_get_data ((GObject *) account, "proxy_tab_num") && account->enabled) {
diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog
index a4eda4f95f..96cf9e520c 100644
--- a/plugins/itip-formatter/ChangeLog
+++ b/plugins/itip-formatter/ChangeLog
@@ -1,14 +1,3 @@
-2005-11-24  Tor Lillqvist  <tml@novell.com>
-
-	* itip-view.c: Drop extra inclusion of e-util/e-time-utils.h,
-	which is going away anyway.
-
-2005-11-07  Dinesh Layek  <ldinesh@novell.com>
-
-	Fixes #308752
-	* itip-formatter.c: (itip_formatter_page_factory): changed the label 
-	"Meetings and Tasks" as "Calendar and Tasks"
-
 2005-09-12  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	Fixes #315345
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index ba31ee153f..48385a4c66 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -42,6 +42,7 @@
 #include <mail/em-format-html.h>
 #include <e-util/e-account-list.h>
 #include <e-util/e-icon-factory.h>
+#include <e-util/e-time-utils.h>
 #include <e-util/e-gtk-utils.h>
 #include <e-util/e-util.h>
 #include <calendar/gui/itip-utils.h>
diff --git a/plugins/sa-junk-plugin/ChangeLog b/plugins/sa-junk-plugin/ChangeLog
index f1d8bfb1f9..cb32b8cbdd 100644
--- a/plugins/sa-junk-plugin/ChangeLog
+++ b/plugins/sa-junk-plugin/ChangeLog
@@ -1,10 +1,3 @@
-2005-10-06  Vivek Jain <jvivek@novell.com>
-	
-	** See Bug #268852
-	* em-junk-filter.c : (em_junk_sa_run_spamd)
-	allow max one chid to be spawned for 
-	spamd. 
-
 2005-10-03  Vivek Jain <jvivek@novell.com>
 
 	* em-junk-filter.c: added (e_plugin_lib_enable)
diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c
index 431b0b3a12..0e7b29469f 100644
--- a/plugins/sa-junk-plugin/em-junk-filter.c
+++ b/plugins/sa-junk-plugin/em-junk-filter.c
@@ -311,10 +311,8 @@ em_junk_sa_run_spamd (char *binary)
 		
 	if (em_junk_sa_local_only)
 		argv[i++] = "--local";
-
-	/* See bug #268852*/
-	argv[i++] = "--max-children=1";
-	/*argv[i++] = "--daemonize";*/
+		
+	//argv[i++] = "--daemonize";
 	argv[i++] = "--pidfile";
 	argv[i++] = em_junk_sa_spamd_pidfile;
 	argv[i] = NULL;
diff --git a/po/ChangeLog b/po/ChangeLog
index d90bc70fa9..ba9ffe9c3a 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,162 +1,52 @@
-2005-11-28  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+2005-11-30  Changwoo Ryu  <cwryu@debian.org>
 
-	* th.po: Updated Thai translation.
-
-2005-11-27  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2005-11-27  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation (QA)
-
-2005-11-27  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
-
-	* zh_TW.po: Updated Traditional Chinese translation.
-
-2005-11-25  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2005-11-25  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
+	* ko.po: Updated Korean translation.
 
 2005-11-25  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
-	* es.po: Updated Spanish translation.
-
-2005-11-24  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-11-24  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician translation.
+	* es.po: Updated Spanish translation. (QA team)
 
 2005-11-24  Priit Laes  <plaes@cvs.gnome.org>
 
 	* et.po: Translation updated by Ivar Smolin.
 
-2005-11-23  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
 2005-11-23  Priit Laes  <plaes@cvs.gnome.org>
 
 	* et.po: Translation updated by Ivar Smolin.
 
-2005-11-21  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2005-11-21  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2005-11-20  Takeshi AIHANA <aihana@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2005-11-18  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
+2005-11-15  Alexander Shopov  <ash@contact.bg>
 
-	* es.po: Updated Spanish translation.
-
-2005-11-17  Adam Weinberger  <adamw@gnome.org>
-
-	* POTFILES.in: Add a half dozen missing files.
-	* en_CA.po: Updated Canadian English translation.
-
-2005-11-17  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-11-17  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2005-11-15  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-	* no.po: Same.
-
-2005-11-14  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
+	* bg.po: Updated Bulgarian translation by
+	Rostislav Raykov <zbrox@i-space.org>
 
 2005-11-14  Ilkka Tuohela  <hile@iki.fi>
 
 	* fi.po: Updated Finnish translation.
 
-2005-11-14  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Rostislav Raykov <zbrox@i-space.org>
-
-2005-11-13  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
+2005-11-13  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
-	* es.po: Updated Spanish translation.
+	* gl.po: Updated Galician Translation
 
 2005-11-10  Ilkka Tuohela  <hile@iki.fi>
 
 	* fi.po: Updated Finnish translation.
 
-2005-11-09  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-11-07  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
 2005-11-07  Priit Laes  <plaes@cvs.gnome.org>
 
 	* et.po: Translation updated by Ivar Smolin.
 
-2005-110-03  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation
-
-2005-11-01  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-11-01  Žygimantas Beručka  <zygis@gnome.org>
-
-	* lt.po: Updated Lithuanian translation.
-
-2005-11-1  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+2005-10-24  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
 	* gl.po: Updated Galician Translation.
 
-2005-10-27  Erdal Ronahi  <erdal.ronahi@gmail.com>
-
-	* ku.po: Added Kurdish translation.
-
-2005-10-23  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-10-23  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-10-22  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated SPanish translation.
-
-2005-10-21  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
-
-	* zh_TW.po: Updated Traditional Chinese translation.
+2005-10-20  Christophe Merlet  <redfox@redfoxcenter.org>
 
-2005-10-19  Adam Weinberger  <adamw@gnome.org>
+	* fr.po: Updated French translation from
+	Stéphane Raimbault <stephane.raimbault@free.fr>.
 
-	* POTFILES.in: Added a number of missing files.
-	* en_CA.po: Updated Canadian English translation.
+2005-10-19  Inaki Larranaga  <dooteo@euskalgnu.org>
 
-2005-10-19  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
+	* eu.po: Updated Basque translation.
 
 2005-10-17  Martin Willemoes Hansen  <mwh@sysrq.dk>
 
@@ -166,76 +56,90 @@
 
 	* et.po: Translation updated by Ivar Smolin.
 
-2005-10-17  Runa Bhattacharjee  <runa@bengalinux.org>
-
-	* bn.po: Added Bengali (bn) Translation.
+2005-10-09  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
-2005-10-16  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
+	* gl.po: Updated Galician Translation.
 
-	* zh_TW.po: Updated Traditional Chinese translation.
+2005-10-08  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
-2005-10-15  Vincent van Adrighem  <adrighem@gnome.org>
+	* es.po: Updated Spanish translation.
 
-	* nl.po: Translation updated.
+2005-10-01  Žygimantas Beručka  <zygis@gnome.org>
 
-2005-10-14  Adam Weinberger  <adamw@gnome.org>
+	* lt.po: Updated Lithuanian translation.
 
-	* en_CA.po: Updated Canadian English translation.
+2005-09-30  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
+    
+	* ru.po: Updated Russian translation.
 
-2005-10-13  Priit Laes  <plaes@cvs.gnome.org>
+2005-09-29  Christian Rose  <menthos@menthos.com>
 
-	* et.po: Translation updated by Ivar Smolin.
+	* sv.po: Updated Swedish translation.
 
-2005-09-30  Adam Weinberger  <adamw@gnome.org>
+2005-09-26  Gabor Kelemen  <kelemeng@gnome.hu>
 
-	* POTFILES.in: Added missing file.
-	* en_CA.po: Updated Canadian English translation.
+	* hu.po: Hungarian translation updated.
 
-2005-09-29  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
+2005-09-20  Clytie Siddall <clytie@riverland.net.au>
 
-	* ru.po: Updated Russian translation.
+        * vi.po: Updated Vietnamese translation.
 
-2005-09-29  Christian Rose  <menthos@menthos.com>
+2005-09-18  Alessio Frusciante  <algol@firenze.linux.it>
 
-	* sv.po: Reverted unauthorized changes made by
-	user 'kloczek'. Also updated the translation.
+	* it.po: Updated Italian translation by
+	Luca Ferretti <elle.uca@infinito.it>.
 
-2005-09-13  Roozbeh Pournader  <roozbeh@farsiweb.info>
+2005-09-18  Theppitak Karoonboonyanan  <thep@linux.thai.net>
 
-	* fa.po: Updated Persian translation by Elnaz Sarbar
-	  <elnaz@farsiweb.info> and Meelad Zakaria <meelad@farsiweb.info>.
+	* th.po: Updated Thai translation (merge from HEAD).
 
 2005-09-12  Mugurel Tudor  <mugurelu@gnome.ro>
 
 	* ro.po: Updated Romanian translation.
 
-2005-09-08  Ilkka Tuohela  <hile@iki.fi>
+2005-09-07  Ilkka Tuohela  <hile@iki.fi>
 
-	* fi.po: Fixed a typo in Finnish translation
+	* fi.po: Fixed a typo in Finnish translation.
 
 2005-09-07  Christophe Merlet  <redfox@redfoxcenter.org>
 
 	* fr.po: Updated French translation.
 
-2005-09-04  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+2005-09-07  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated by Ivar Smolin.
 
-	* th.po: Minor fixes & updates in Thai translation.
+2005-09-06  Inaki Larranaga  <dooteo@euskalgnu.org>
 
-2005-09-04  Mugurel Tudor  <mugurelu@gnome.ro>
+	* eu.po: Updated Basque translation.
 
-	* ro.po: Updated Romanian translation, again.
+2005-09-05  Baris Cicek <baris@teamforce.name.tr>
+
+	* tr.po: Updated Turkish Translation
+
+2005-09-05  Žygimantas Beručka  <zygis@gnome.org>
+
+	* lt.po: Updated Lithuanian translation.
+
+2005-09-05  Runa Bhattacharjee <runa@bengalinux.org>
+	* bn.po:  Added Bengali (bn) Translation
+
+2005-09-04  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated by Ivar Smolin.
 
 2005-09-04  Mugurel Tudor  <mugurelu@gnome.ro>
 
 	* ro.po: Updated Romanian translation.
 
-2005-09-03  Christophe Merlet  <redfox@redfoxcenter.org>
+2005-09-04  Roozbeh Pournader  <roozbeh@farsiweb.info>
 
-	* fr.po: Updated French translation.
+	* fa.po: Updated Persian translation by Elnaz Sarbar
+	  <elnaz@farsiweb.info> and Meelad Zakaria <meelad@farsiweb.info>.
 
-2005-09-03  Baris Cicek <baris@teamforce.name.tr>
+2005-09-04  Mugurel Tudor  <mugurelu@gnome.ro>
 
-	* tr.po: Updated Turkish Translation
+	* ro.po: Updated Romanian translation.
 
 2005-09-03  Christophe Merlet  <redfox@redfoxcenter.org>
 
@@ -243,18 +147,14 @@
 	Vincent Untz <vuntz@gnome.org> and
 	Stéphane Raimbault <stephane.raimbault@free.fr>.
 
-2005-09-02  Mugurel Tudor  <mugurelu@gnome.ro>
+2005-09-03  Mugurel Tudor  <mugurelu@gnome.ro>
 
 	* ro.po: Updated Romanian translation.
 
-2005-09-01  Rhys Jones  <rhys@sucs.org>
+2005-09-03  Rhys Jones  <rhys@sucs.org>
 
 	* cy.po: Updated Welsh translation.
 
-2005-08-31  Mugurel Tudor  <mugurelu@gnome.ro>
-
-	* ro.po: Updated Romanian translation.
-
 2005-08-31  Duarte Loreto <happyguy_pt@hotmail.com>
 
 	* pt.po: Updated Portuguese translation.
diff --git a/po/bg.po b/po/bg.po
index 3237983a7b..7388b44629 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution 2.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-14 15:22+0200\n"
-"PO-Revision-Date: 2005-11-14 13:35+0200\n"
+"POT-Creation-Date: 2005-11-16 13:48+0200\n"
+"PO-Revision-Date: 2005-11-16 12:36+0200\n"
 "Last-Translator: Rostislav \"zbrox\" Raykov <zbrox@i-space.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "MIME-Version: 1.0\n"
@@ -47,7 +47,7 @@ msgstr[0] "текущата папка на адресника е с %d визи
 msgstr[1] "текущата папка на адресника е с %d визитки"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../calendar/gui/alarm-notify/alarm-queue.c:969
+#: ../calendar/gui/alarm-notify/alarm-queue.c:965
 #: ../ui/evolution-message-composer.xml.h:11
 msgid "Open"
 msgstr "Отваряне"
@@ -101,7 +101,7 @@ msgstr "Нова среща"
 msgid "New All Day Event"
 msgstr "Ново събитие за целия ден"
 
-#: ../a11y/calendar/ea-cal-view.c:308
+#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1522
 msgid "New Meeting"
 msgstr "Ново събрание"
 
@@ -462,7 +462,7 @@ msgstr ""
 "бъде премахнат от източника. Вместо това искате ли да го копирате?"
 
 #: ../addressbook/addressbook.error.xml.h:28
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:59
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -537,7 +537,7 @@ msgstr "Конфигуриране на авт. довършване"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1180
+#: ../addressbook/gui/component/addressbook-view.c:1133
 #: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:388
 msgid "Contacts"
 msgstr "Контакти"
@@ -578,12 +578,10 @@ msgstr "Управление на S/MIME сертификати"
 #. On This Computer is always first and Search Folders is always last
 #: ../addressbook/gui/component/addressbook-component.c:137
 #: ../addressbook/gui/component/addressbook-migrate.c:502
-#: ../calendar/gui/calendar-component.c:208
-#: ../calendar/gui/memos-component.c:192 ../calendar/gui/migration.c:462
-#: ../calendar/gui/migration.c:555 ../calendar/gui/migration.c:1057
-#: ../calendar/gui/tasks-component.c:188 ../mail/em-folder-tree-model.c:197
-#: ../mail/em-folder-tree-model.c:199 ../mail/mail-component.c:292
-#: ../mail/mail-vfolder.c:223
+#: ../calendar/gui/calendar-component.c:208 ../calendar/gui/migration.c:462
+#: ../calendar/gui/migration.c:555 ../calendar/gui/tasks-component.c:188
+#: ../mail/em-folder-tree-model.c:197 ../mail/em-folder-tree-model.c:199
+#: ../mail/mail-component.c:292 ../mail/mail-vfolder.c:223
 msgid "On This Computer"
 msgstr "На този компютър"
 
@@ -595,12 +593,10 @@ msgstr "На този компютър"
 #: ../addressbook/gui/component/addressbook-component.c:145
 #: ../addressbook/gui/component/addressbook-migrate.c:510
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../calendar/gui/calendar-component.c:216
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:470
-#: ../calendar/gui/migration.c:563 ../calendar/gui/migration.c:1065
-#: ../calendar/gui/tasks-component.c:196 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1043 ../mail/mail-config.c:78
-#: ../mail/mail-config.glade.h:104
+#: ../calendar/gui/calendar-component.c:216 ../calendar/gui/migration.c:470
+#: ../calendar/gui/migration.c:563 ../calendar/gui/tasks-component.c:196
+#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1043
+#: ../mail/mail-config.c:78 ../mail/mail-config.glade.h:104
 msgid "Personal"
 msgstr "Лично"
 
@@ -627,7 +623,7 @@ msgid "Create a new contact list"
 msgstr "Създаване на нов списък с контакти"
 
 #: ../addressbook/gui/component/addressbook-component.c:241
-#: ../addressbook/gui/component/addressbook-config.c:1149
+#: ../addressbook/gui/component/addressbook-config.c:1118
 #: ../addressbook/gui/component/addressbook-view.c:763
 msgid "New Address Book"
 msgstr "Нов адресник"
@@ -644,61 +640,60 @@ msgstr "Създаване на нов адресник"
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "Неуспех при осъвременяването на настройките и папките на адресника."
 
-#: ../addressbook/gui/component/addressbook-config.c:316
+#: ../addressbook/gui/component/addressbook-config.c:313
 msgid "Base"
 msgstr "База"
 
-#: ../addressbook/gui/component/addressbook-config.c:511
+#: ../addressbook/gui/component/addressbook-config.c:508
 #: ../calendar/gui/dialogs/calendar-setup.c:192
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Тип:"
 
-#: ../addressbook/gui/component/addressbook-config.c:610
+#: ../addressbook/gui/component/addressbook-config.c:607
 msgid "Copy book content locally for offline operation"
 msgstr ""
 "Копиране на съдържанието на адресника за локална употреба в режим „Изключен“"
 
-#: ../addressbook/gui/component/addressbook-config.c:933
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/addressbook-config.c:902
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:366
+#: ../calendar/gui/dialogs/calendar-setup.c:377
 #: ../mail/em-folder-properties.c:215 ../mail/mail-config.glade.h:85
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Основни"
 
-#: ../addressbook/gui/component/addressbook-config.c:934
+#: ../addressbook/gui/component/addressbook-config.c:903
 #: ../mail/importers/pine-importer.c:393
 msgid "Addressbook"
 msgstr "Адресник"
 
-#: ../addressbook/gui/component/addressbook-config.c:938
+#: ../addressbook/gui/component/addressbook-config.c:907
 msgid "Server Information"
 msgstr "Информация за сървъра"
 
-#: ../addressbook/gui/component/addressbook-config.c:940
+#: ../addressbook/gui/component/addressbook-config.c:909
 msgid "Authentication"
 msgstr "Удостоверяване"
 
-#: ../addressbook/gui/component/addressbook-config.c:943
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/addressbook-config.c:912
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 #: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Подробности"
 
-#: ../addressbook/gui/component/addressbook-config.c:944
+#: ../addressbook/gui/component/addressbook-config.c:913
 msgid "Searching"
 msgstr "Търсене"
 
-#: ../addressbook/gui/component/addressbook-config.c:946
+#: ../addressbook/gui/component/addressbook-config.c:915
 msgid "Downloading"
 msgstr "Изтегляне"
 
-#: ../addressbook/gui/component/addressbook-config.c:1147
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/addressbook-config.c:1116
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Настройки на адресника"
 
@@ -766,19 +761,20 @@ msgstr ""
 
 #: ../addressbook/gui/component/addressbook-view.c:764
 #: ../addressbook/gui/widgets/e-addressbook-view.c:952
-#: ../calendar/gui/memos-component.c:450 ../mail/em-filter-i18n.h:11
-#: ../ui/evolution-addressbook.xml.h:9 ../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
+#: ../calendar/gui/calendar-component.c:537
+#: ../calendar/gui/tasks-component.c:441 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Изтриване"
 
 #: ../addressbook/gui/component/addressbook-view.c:766
-#: ../calendar/gui/memos-component.c:451
+#: ../calendar/gui/calendar-component.c:538
+#: ../calendar/gui/tasks-component.c:442
 msgid "Properties..."
 msgstr "Настройки..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1191
+#: ../addressbook/gui/component/addressbook-view.c:1144
 msgid "Contact Source Selector"
 msgstr "Избиране на контакти"
 
@@ -787,12 +783,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Анонимен достъп до LDAP сървъра"
 
 #: ../addressbook/gui/component/addressbook.c:191
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:490
 msgid "Failed to authenticate.\n"
 msgstr "Неуспешно удостоверяване.\n"
 
 #: ../addressbook/gui/component/addressbook.c:198
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:469
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Въвеждане парола за %s (потребител %s)"
@@ -838,7 +834,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "URI на папката, последно използвана в диалога за избор на име."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 msgid "Vertical pane position"
 msgstr "Разположение на вертикалния панел"
 
@@ -847,121 +843,127 @@ msgid "Whether to show the preview pane."
 msgstr "Показване на панела „Предварителен преглед на писмата“."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:1
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/event-page.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../mail/message-tags.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:1
+msgid "*"
+msgstr "*"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr "1"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:2
+#: ../addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:3
+#: ../addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:5
+#: ../addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:6
+#: ../addressbook/gui/component/ldap-config.glade.h:7
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Удостоверяване</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:7
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Display</b>"
 msgstr "<b>Изобразяване</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:8
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Downloading</b>"
 msgstr "<b>Изтегляне</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Searching</b>"
 msgstr "<b>Търсене</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Server Information</b>"
 msgstr "<b>Информация за сървъра</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:12
 msgid "<b>Type:</b>"
 msgstr "<b>Вид:</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add Address Book"
 msgstr "Добавяне на адресник"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 #: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:759
 msgid "Always"
 msgstr "Винаги"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Анонимно"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 msgid "Basic"
 msgstr "Основни"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr "Отличително име"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid "Email address"
 msgstr "Електронна поща"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr "Evolution ще използва този адрес за удостоверяване пред сървъра."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:22
 msgid "Find Possible Search Bases"
 msgstr "Намиране на възможни основи за търсене"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "Lo_gin:"
 msgstr "Потребител:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 #: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:758
 msgid "Never"
 msgstr "Никога"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "Едно ниво"
 
-#: ../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 or TLS."
@@ -969,7 +971,7 @@ msgstr ""
 "При избирането на тази опция Evolution ще се свързва с LDAP сървъра само ако "
 "поддържа SSL или TLS."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a insecure environment. For example, if you and your LDAP server "
@@ -981,7 +983,7 @@ msgstr ""
 "(firewall), тогава Evolution няма да използва SSL/TLS, защото ще ползвате "
 "сигурна връзка."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 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 "
@@ -991,15 +993,15 @@ msgstr ""
 "означава, че вашата Интернет връзка ще бъде несигурна и ще бъдете уязвими на "
 "атаки срещу сигурността. "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Sub"
 msgstr "В цялото дърво"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid "Supported Search Bases"
 msgstr "Поддържани основи за търсене"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 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 "
@@ -1009,7 +1011,7 @@ msgstr ""
 "търсенето. Ако го оставите празно, търсенето ще започне от корена на дървото "
 "с директории."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 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 "
@@ -1021,13 +1023,13 @@ msgstr ""
 "търсене. „Едно ниво“ ще включва само записите, които са едно ниво под "
 "основата."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Това е пълното име на LDAP сървъра. Примерно, „ldap.company.com“."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1035,7 +1037,7 @@ msgstr ""
 "Това е максималният брой записи, които да бъдат изтеглени. Поставяне на "
 "прекалено голяма цифра тук може да забави адресника."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1045,7 +1047,7 @@ msgstr ""
 "че ако го настроите на „Електронен адрес“, достъпът до ldap сървъра трябва "
 "да е анонимен."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1053,7 +1055,7 @@ msgstr ""
 "Това е името на този сървър, което ще бъде показвано в списъка с папки на "
 "Evolution. Това име е само за лично ползване."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 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 "
@@ -1063,36 +1065,36 @@ msgstr ""
 "Предоставен е списък със стандартни портове, попитайте системния "
 "администратор кой порт трябва да посочите."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid "Using distinguished name (DN)"
 msgstr "Използване на отличително име (DN)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid "Using email address"
 msgstr "Използване на е-поща"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 #: ../mail/em-account-editor.c:301
 msgid "Whenever Possible"
 msgstr "Когато е възможно"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid "_Add Address Book"
 msgstr "_Добавяне на адресник"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "_Download limit:"
 msgstr "_Ограничаване на изтеглянията:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid "_Find Possible Search Bases"
 msgstr "Намиране на възмо_жни основи за търсене"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "_Login method:"
 msgstr "_Метод за идентификация в системата:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 #: ../calendar/gui/dialogs/calendar-setup.c:244
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:8
 #: ../mail/mail-config.glade.h:164
@@ -1100,32 +1102,32 @@ msgstr "_Метод за идентификация в системата:"
 msgid "_Name:"
 msgstr "_Име:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Port:"
 msgstr "_Порт:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Search scope:"
 msgstr "Обхват на _търсене:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 #: ../mail/mail-config.glade.h:171
 msgid "_Server:"
 msgstr "_Сървър:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Timeout:"
 msgstr "Гра_тисен период:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Use secure connection:"
 msgstr "_Използване на сигурна връзка (SSL):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 msgid "cards"
 msgstr "карти"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
@@ -1135,31 +1137,6 @@ msgstr "карти"
 msgid "minutes"
 msgstr "минути"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-#: ../calendar/gui/dialogs/event-page.glade.h:1
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../mail/message-tags.glade.h:1
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
-#: ../plugins/groupwise-features/properties.glade.h:1
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>Е-поща</b>"
@@ -1213,7 +1190,7 @@ msgstr "Контакт"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:525
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:540
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2372
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2353
 msgid "Contact Editor"
 msgstr "Редактор на контакти"
 
@@ -1271,7 +1248,7 @@ msgstr "_Годишнина:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Assistant:"
-msgstr "_Помощник:"
+msgstr "_Асистент:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Birthday:"
@@ -2456,20 +2433,20 @@ msgid "Changed"
 msgstr "Променени"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:535
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2367
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2348
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Редактор на контакти - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2680
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2661
 msgid "Please select an image for this contact"
 msgstr "Изберете изображение за този контакт"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2681
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2662
 msgid "No image"
 msgstr "Няма изображение"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2960
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2941
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2477,7 +2454,7 @@ msgstr ""
 "Информацията на контакта е невалидна:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3012
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2993
 msgid "Invalid contact."
 msgstr "Невалиден контакт."
 
@@ -2630,8 +2607,8 @@ msgstr "Услуга за бързи съобщения:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:234
-#: ../plugins/exchange-operations/exchange-contacts.c:214
+#: ../plugins/exchange-operations/exchange-calendar.c:224
+#: ../plugins/exchange-operations/exchange-contacts.c:203
 msgid "_Location:"
 msgstr "Местопо_ложение:"
 
@@ -2808,9 +2785,8 @@ msgstr "Източник"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:377
+#: ../calendar/gui/e-meeting-list-view.c:370
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Тип"
 
@@ -2820,16 +2796,14 @@ msgstr "Адресник"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:807
 #: ../addressbook/gui/widgets/e-addressbook-view.c:936
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2018
-#: ../ui/evolution-addressbook.xml.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2016
+#: ../ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Запазване като VCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:930
-#: ../calendar/gui/dialogs/comp-editor.c:1119
 #: ../calendar/gui/e-calendar-table.c:1167
-#: ../calendar/gui/e-calendar-view.c:1549 ../calendar/gui/e-memo-table.c:845
-#: ../ui/evolution-addressbook.xml.h:38
+#: ../calendar/gui/e-calendar-view.c:1545 ../ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Отваряне"
 
@@ -2842,7 +2816,7 @@ msgid "New Contact List..."
 msgstr "Нов списък с контакти..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:937
-#: ../ui/evolution-addressbook.xml.h:11
+#: ../ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Препращане на контакт"
 
@@ -2863,10 +2837,9 @@ msgid "Send Message to Contacts"
 msgstr "Изпращане на писмо до контакти"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:942
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2512
-#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:11
-#: ../ui/evolution-tasks.xml.h:14
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2510
+#: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Печат"
 
@@ -2879,21 +2852,19 @@ msgid "Move to Address Book..."
 msgstr "Преместване в адресника..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:949
-#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-memos.xml.h:4
-#: ../ui/evolution-tasks.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Изрязване"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:950
-#: ../calendar/gui/memos-component.c:449 ../ui/evolution-addressbook.xml.h:3
-#: ../ui/evolution-mail-message.xml.h:11 ../ui/evolution-memos.xml.h:2
-#: ../ui/evolution-tasks.xml.h:2
+#: ../calendar/gui/calendar-component.c:536
+#: ../calendar/gui/tasks-component.c:440 ../ui/evolution-addressbook.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:11 ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Копиране"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:951
-#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-memos.xml.h:8
-#: ../ui/evolution-tasks.xml.h:11
+#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Поставяне"
 
@@ -2903,14 +2874,13 @@ msgstr "Поставяне"
 msgid "Any Category"
 msgstr "Всяка категория"
 
-#. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1767
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1766
 msgid "Print cards"
 msgstr "Печатане на карти"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 msgid "Assistant"
-msgstr "Помощник"
+msgstr "Асистент"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant Phone"
@@ -2940,7 +2910,6 @@ msgstr "Телефон в автомобил"
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 #: ../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 "Категории"
 
@@ -3045,7 +3014,7 @@ msgstr "Радио"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:388
+#: ../calendar/gui/e-meeting-list-view.c:378
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
 msgid "Role"
@@ -3314,7 +3283,7 @@ msgstr "Протоколът не се подържа"
 #: ../calendar/gui/e-cal-component-preview.c:232
 #: ../calendar/gui/e-cal-model-tasks.c:348
 #: ../calendar/gui/e-cal-model-tasks.c:661
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2375
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2373
 msgid "Cancelled"
 msgstr "Прекратено"
 
@@ -3542,16 +3511,6 @@ msgstr "Множество VCards"
 msgid "VCard for %s"
 msgstr "VCard за %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1031
-#: ../addressbook/gui/widgets/eab-gui-util.c:1049
-msgid "Contact information"
-msgstr "Информация за контакта"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:1051
-#, c-format
-msgid "Contact information for %s"
-msgstr "Информация за %s"
-
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -3647,8 +3606,8 @@ msgstr "Печатане на плик"
 msgid "Print contacts"
 msgstr "Печатане на контакти"
 
-#: ../addressbook/printing/e-contact-print.c:1117
-#: ../addressbook/printing/e-contact-print.c:1145
+#: ../addressbook/printing/e-contact-print.c:1116
+#: ../addressbook/printing/e-contact-print.c:1144
 msgid "Print contact"
 msgstr "Печатане на контакт"
 
@@ -3802,8 +3761,8 @@ msgstr "Сенки"
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
 #: ../plugins/exchange-operations/exchange-account-setup.c:940
-#: ../plugins/exchange-operations/exchange-calendar.c:224
-#: ../plugins/exchange-operations/exchange-contacts.c:197
+#: ../plugins/exchange-operations/exchange-calendar.c:214
+#: ../plugins/exchange-operations/exchange-contacts.c:186
 msgid "Size:"
 msgstr "Размер:"
 
@@ -4081,13 +4040,12 @@ msgid "Delete calendar '{0}'?"
 msgstr "Изтриване на календара „{0}“?"
 
 #: ../calendar/calendar.error.xml.h:26
-#, fuzzy
-msgid "Delete memo list '{0}'?"
+msgid "Delete task list '{0}'?"
 msgstr "Изтриване на списъка със задачи „{0}“?"
 
 #: ../calendar/calendar.error.xml.h:27
-msgid "Delete task list '{0}'?"
-msgstr "Изтриване на списъка със задачи „{0}“?"
+msgid "Discard Changes"
+msgstr "Игнориране на промените"
 
 #: ../calendar/calendar.error.xml.h:28
 msgid "Don't Send"
@@ -4125,15 +4083,10 @@ msgid "Error loading calendar"
 msgstr "Грешка при зареждане на календара"
 
 #: ../calendar/calendar.error.xml.h:35
-#, fuzzy
-msgid "Error loading memo list"
-msgstr "Грешка при зареждане на списък със задачи"
-
-#: ../calendar/calendar.error.xml.h:36
 msgid "Error loading task list"
 msgstr "Грешка при зареждане на списък със задачи"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:36
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the journal has been deleted."
@@ -4141,7 +4094,7 @@ msgstr ""
 "Ако не изпратите известие за отмяна, другите участници може да не разберат, "
 "че записът в дневника е отменен."
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:37
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the meeting is canceled."
@@ -4149,7 +4102,7 @@ msgstr ""
 "Ако не изпратите известие за отмяна, другите участници може да не разберат, "
 "че събранието е било отменено."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the task has been deleted."
@@ -4157,6 +4110,10 @@ msgstr ""
 "Ако не изпратите известие за отмяна, другите участници може да не разберат, "
 "че задачата е била отменена."
 
+#: ../calendar/calendar.error.xml.h:39
+msgid "Save Changes"
+msgstr "Запазване на промените"
+
 #: ../calendar/calendar.error.xml.h:40
 #: ../ui/evolution-message-composer.xml.h:28
 msgid "Send"
@@ -4195,104 +4152,84 @@ msgid "The calendar is not marked for offline usage"
 msgstr "Календарът не е избран за работа в режим „Изключен“"
 
 #: ../calendar/calendar.error.xml.h:48
-#, fuzzy
-msgid "The memo list is not marked for offline usage"
-msgstr "Списъкът със задачи не е избран за работа в режим „Изключен“"
-
-#: ../calendar/calendar.error.xml.h:49
 msgid "The task list is not marked for offline usage"
 msgstr "Списъкът със задачи не е избран за работа в режим „Изключен“"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:49
 msgid "This calendar will be removed permanently."
 msgstr "Този календар ще бъде премахнат завинаги."
 
-#: ../calendar/calendar.error.xml.h:51
-#, fuzzy
-msgid "This memo list will be removed permanently."
-msgstr "Този списък със задачи ще бъде премахнат завинаги."
-
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:50
 msgid "This task list will be removed permanently."
 msgstr "Този списък със задачи ще бъде премахнат завинаги."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:51
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Искате ли да запазите промените по тази среща?"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:52
 msgid "Would you like to save your changes to this task?"
 msgstr "Искате ли да запазите промените по тази задача?"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:53
 msgid "Would you like to send a cancellation notice for this journal entry?"
 msgstr "Искате ли да изпратите известие за отмяна за този запис в дневника?"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:54
 msgid "Would you like to send all the participants a cancellation notice?"
 msgstr "Искате ли да изпратите на всички участници съобщения за отмяната?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:55
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Искате ли да изпратите покани до участниците в събранието?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:56
 msgid "Would you like to send this task to participants?"
 msgstr "Искате ли да изпратите тази задача на участниците?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to send updated meeting information to participants?"
 msgstr ""
 "Искате ли да изпратите обновената информация за събранието на участниците?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send updated task information to participants?"
 msgstr ""
 "Искате ли да изпратите обновената информация за задачите на участниците?"
 
-#: ../calendar/calendar.error.xml.h:62
-#, fuzzy
-msgid "You have changed this appointment, but not yet saved them."
+#: ../calendar/calendar.error.xml.h:60
+msgid "You have made changes to this appointment, but not yet saved them."
 msgstr "Направихте промени по тази среща, но още не сте ги запазили."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:61
 msgid "You have made changes to this task, but not yet saved them."
 msgstr "Направихте промени по тази задача, но още не сте ги запазили."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:62
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Вашите календари няма да бъдат налични, докато не рестартирате Evolution."
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:63
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Вашите задачи няма да бъдат налични, докато не рестартирате Evolution."
 
-#: ../calendar/calendar.error.xml.h:66
-#: ../composer/mail-composer.error.xml.h:29
-msgid "_Discard Changes"
-msgstr "_Игнориране на промените"
-
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:64
 #: ../ui/evolution-message-composer.xml.h:51
 #: ../ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Запазване"
 
-#: ../calendar/calendar.error.xml.h:68
-msgid "_Save Changes"
-msgstr "_Запазване на промените"
-
-#: ../calendar/calendar.error.xml.h:69
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:127
+#: ../calendar/calendar.error.xml.h:65
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:123
 msgid "_Send"
 msgstr "Изпра_щане"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:66
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:323
+#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:322
 #: ../smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Въвеждане на парола"
@@ -4303,10 +4240,8 @@ msgstr "Разделяне на събития, по-дълги от един д
 
 #: ../calendar/conduits/calendar/calendar-conduit.c:1377
 #: ../calendar/conduits/calendar/calendar-conduit.c:1378
-#: ../calendar/conduits/memo/memo-conduit.c:854
-#: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:988
-#: ../calendar/conduits/todo/todo-conduit.c:989
+#: ../calendar/conduits/todo/todo-conduit.c:879
+#: ../calendar/conduits/todo/todo-conduit.c:880
 msgid "Could not start evolution-data-server"
 msgstr "Не може да се стартира evolution-data-server"
 
@@ -4315,35 +4250,16 @@ msgstr "Не може да се стартира evolution-data-server"
 msgid "Could not read pilot's Calendar application block"
 msgstr "Не може да се прочете календара от pilot"
 
-#: ../calendar/conduits/memo/memo-conduit.c:937
-#: ../calendar/conduits/memo/memo-conduit.c:940
-#, fuzzy
-msgid "Could not read pilot's Memo application block"
-msgstr "Не може да се прочете списъка със задачи от pilot"
-
-#: ../calendar/conduits/memo/memo-conduit.c:976
-#: ../calendar/conduits/memo/memo-conduit.c:979
-#, fuzzy
-msgid "Could not write pilot's Memo application block"
-msgstr "Не може да се прочете списъка със задачи от pilot"
-
-#: ../calendar/conduits/todo/todo-conduit.c:237
+#: ../calendar/conduits/todo/todo-conduit.c:234
 msgid "Default Priority:"
 msgstr "Стандартен приоритет:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1071
-#: ../calendar/conduits/todo/todo-conduit.c:1074
+#: ../calendar/conduits/todo/todo-conduit.c:959
+#: ../calendar/conduits/todo/todo-conduit.c:962
 msgid "Could not read pilot's ToDo application block"
 msgstr "Не може да се прочете списъка със задачи от pilot"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1110
-#: ../calendar/conduits/todo/todo-conduit.c:1113
-#, fuzzy
-msgid "Could not write pilot's ToDo application block"
-msgstr "Не може да се прочете списъка със задачи от pilot"
-
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:1968
 msgid "Calendar and Tasks"
 msgstr "Календар и задачи"
 
@@ -4378,41 +4294,26 @@ msgid "Evolution's Calendar component"
 msgstr "Компонент за календари на Evolution"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution's Memos component"
-msgstr "Компонент за тестове на Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Tasks component"
 msgstr "Компонент за задачи на Evolution"
 
-#: ../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-memos.c:1091 ../calendar/gui/memos-component.c:528
-#: ../calendar/gui/memos-component.c:998 ../calendar/gui/memos-control.c:334
-msgid "Memos"
-msgstr "Бележки"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-tasks.c:1333 ../calendar/gui/print.c:1831
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#: ../calendar/gui/e-tasks.c:1282 ../calendar/gui/print.c:1831
 #: ../calendar/gui/tasks-component.c:519
-#: ../calendar/gui/tasks-component.c:1013 ../calendar/gui/tasks-control.c:466
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:456
 #: ../calendar/importers/icalendar-importer.c:79
 #: ../calendar/importers/icalendar-importer.c:707
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:589
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Задачи"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 msgid "_Calendars"
 msgstr "_Календари"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
 #: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Задачи"
@@ -4447,7 +4348,7 @@ msgstr "Срещи"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/e-itip-control.c:1117
+#: ../calendar/gui/e-itip-control.c:1120
 #: ../plugins/itip-formatter/itip-view.c:884
 msgid "Location:"
 msgstr "Местоположение:"
@@ -4461,13 +4362,13 @@ msgstr "Време за _отлагане:"
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:6
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:13
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-addressbook.xml.h:34 ../ui/evolution-calendar.xml.h:41
 #: ../ui/evolution-composer-entries.xml.h:8
-#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:5
 #: ../ui/evolution-message-composer.xml.h:44
 #: ../ui/evolution-signature-editor.xml.h:12
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution.xml.h:32
 msgid "_Edit"
 msgstr "_Редактиране"
 
@@ -4483,28 +4384,28 @@ msgstr "описание на среща"
 msgid "location of appointment"
 msgstr "място на среща"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:970
+#: ../calendar/gui/alarm-notify/alarm-queue.c:966
 msgid "Dismiss"
 msgstr "Освобождаване"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:971
+#: ../calendar/gui/alarm-notify/alarm-queue.c:967
 msgid "Dismiss All"
 msgstr "Освобождаване на всички"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1053
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1049
 msgid "No summary available."
 msgstr "Няма обобщение."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1062
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1064
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1058
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1060
 msgid "No description available."
 msgstr "Няма описание."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1072
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1068
 msgid "No location information available."
 msgstr "Няма информация за местоположението."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1088
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1084
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -4517,12 +4418,12 @@ msgstr ""
 "Започва на %s\n"
 "Спира на %s"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1191
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1215
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1187
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1211
 msgid "Warning"
 msgstr "Внимание"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1195
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1191
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4534,7 +4435,7 @@ msgstr ""
 "да изпраща поща. Вместо това, Evolution ще покаже стандартен прозорец за "
 "напомняне."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1221
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1217
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4551,7 +4452,7 @@ msgstr ""
 "\n"
 "Сигурни ли сте, че искате да стартирате тази програма?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1235
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1231
 msgid "Do not ask me about this program again."
 msgstr "Без запитвания за тази програма отново."
 
@@ -4762,28 +4663,18 @@ msgid "Show display alarms in notification tray"
 msgstr "Показване на алармите в зоната за уведомяване"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
-#: ../mail/evolution-mail.schemas.in.in.h:73
-msgid "Show the \"Preview\" pane"
-msgstr "Показване на панела „Предварителен преглед на писмата“."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
-#: ../mail/evolution-mail.schemas.in.in.h:74
-msgid "Show the \"Preview\" pane."
-msgstr "Показване на панела „Предварителен преглед на писмата“."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show week numbers in date navigator"
 msgstr "Показване номерата на седмиците при прегледа на дати"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Tasks due today color"
 msgstr "Цвят на задачите за днес"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Tasks vertical pane position"
 msgstr "Разположение на вертикалния панел със задачи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -4791,7 +4682,7 @@ msgstr ""
 "Стандартният часови пояс за дати и време в календара, във вид на непреведена "
 "база от данни на Olsen за местоположения, например „America/New York“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
 #, no-c-format
 msgid ""
 "The url template to use as a free/busy data fallback, %u is replaced by the "
@@ -4800,55 +4691,55 @@ msgstr ""
 "Шаблонът за използване на адреси за данни свободен/зает, %u се заменя с "
 "потребителската част от адреса на е-поща, а %d се заменя от домейна."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Time divisions"
 msgstr "Времеви разделения"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Time the last alarm ran, in time_t."
 msgstr "Времето на последната аларма, в time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Timezone"
 msgstr "Часови пояс"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Twenty four hour time format"
 msgstr "24 часов формат на времето"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Мерни единици в подразбиращото се напомняне - „минути“, „часове“ или „дни“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Единици за определяне кога да се скриват задачи, „минути“, „часове“ или "
 "„дни“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid "Week start"
 msgstr "Начало на седмицата"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Ден, в който започва работната седмица, от неделя (0) до събота (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Дали да се използва зоната за уведомяване за изобразяване на аларми."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Дали да пита за потвърждение при изтриване на среща или задача."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Дали да пита за потвърждение при изтриване на срещи или задачи."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -4856,52 +4747,52 @@ msgstr ""
 "Дали да се свиват почивните дни в месечния изглед, което ще изобрази "
 "съботите и неделите като един разделителен почивен ден."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Дали да се показва края на срещите в седмичните и месечните календарни "
 "изгледи."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Дали да се изобразява кривата на Marcus Bains (в текущо време) в календара."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Дали да се скриват завършените задачи в списъка със задачи."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Whether to set a default reminder for appointments."
 msgstr "Дали да бъде зададено стандартното напомняне за срещи."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 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.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Дали да се показват номерата на седмиците в навигатора за дати."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Work days"
 msgstr "Работни дни"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid "Workday end hour"
 msgstr "Час, в който завършва работния ден"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Workday end minute"
 msgstr "Минута, в която завършва работния ден"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid "Workday start hour"
 msgstr "Час, в който започва работния ден"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Workday start minute"
 msgstr "Минута, в която започва работния ден"
 
@@ -4927,11 +4818,11 @@ msgstr "Несъвпадащ"
 
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:367
 #: ../calendar/gui/gnome-cal.c:2116
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:590
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:588
 msgid "Calendar"
 msgstr "Календар"
 
@@ -4958,13 +4849,10 @@ 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:234
-#: ../calendar/gui/memos-component.c:219 ../calendar/gui/migration.c:489
-#: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1084
-#: ../calendar/gui/tasks-component.c:215
+#: ../calendar/gui/calendar-component.c:234 ../calendar/gui/migration.c:489
+#: ../calendar/gui/migration.c:582 ../calendar/gui/tasks-component.c:215
 msgid "On The Web"
 msgstr "В Интернет"
 
@@ -4979,44 +4867,15 @@ msgid "Weather"
 msgstr "Време"
 
 #: ../calendar/gui/calendar-component.c:535
-msgid "_New Calendar"
-msgstr "_Нов календар"
-
-#: ../calendar/gui/calendar-component.c:536
-#: ../calendar/gui/dialogs/comp-editor.c:429
-#: ../calendar/gui/e-calendar-table.c:1175
-#: ../calendar/gui/e-calendar-view.c:1556 ../calendar/gui/e-memo-table.c:853
-#: ../calendar/gui/tasks-component.c:440 ../composer/e-msg-composer.c:3049
-#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1035
-#: ../mail/message-list.c:1718 ../ui/evolution-addressbook.xml.h:32
-#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
-#: ../ui/evolution-mail-message.xml.h:102 ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
-msgid "_Copy"
-msgstr "_Копиране"
-
-#. FIXME: need to disable for undeletable folders
-#: ../calendar/gui/calendar-component.c:537
-#: ../calendar/gui/e-calendar-table.c:1187
-#: ../calendar/gui/e-calendar-view.c:1569 ../calendar/gui/e-memo-table.c:862
-#: ../calendar/gui/tasks-component.c:441 ../mail/em-folder-tree.c:2054
-#: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:34
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
-#: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
-msgid "_Delete"
-msgstr "_Изтриване"
-
-#: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/tasks-component.c:442
-#, fuzzy
-msgid "_Properties..."
-msgstr "Настройки..."
+#: ../calendar/gui/dialogs/calendar-setup.c:449
+msgid "New Calendar"
+msgstr "Нов календар"
 
 #: ../calendar/gui/calendar-component.c:858
 msgid "Failed upgrading calendars."
 msgstr "Неуспех при осъвременяването на календарите."
 
-#: ../calendar/gui/calendar-component.c:1157
+#: ../calendar/gui/calendar-component.c:1154
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
@@ -5253,18 +5112,17 @@ msgstr "%.0fG"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:311
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
-#: ../calendar/gui/dialogs/comp-editor.c:2483
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:138
-#: ../mail/em-utils.c:483 ../mail/em-utils.c:520
-#: ../widgets/misc/e-attachment-bar.c:341
+#: ../calendar/gui/dialogs/comp-editor.c:2440
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:444
+#: ../mail/em-utils.c:481 ../widgets/misc/e-attachment-bar.c:341
 msgid "attachment"
 msgstr "прикрепено"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:473
-#: ../calendar/gui/dialogs/comp-editor.c:1120
-#: ../calendar/gui/dialogs/meeting-page.c:908
+#: ../calendar/gui/dialogs/comp-editor.c:1083
+#: ../calendar/gui/dialogs/meeting-page.c:887
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3545
+#: ../composer/e-msg-composer.c:3400
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
@@ -5272,23 +5130,23 @@ msgid "_Remove"
 msgstr "_Премахване"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:474
-#: ../calendar/gui/dialogs/comp-editor.c:1121
+#: ../calendar/gui/dialogs/comp-editor.c:1084
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3546 ../mail/em-folder-tree.c:2058
+#: ../composer/e-msg-composer.c:3401 ../mail/em-folder-tree.c:2052
 #: ../ui/evolution-mail-list.xml.h:29
 msgid "_Properties"
 msgstr "_Настройки"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:476
-#: ../calendar/gui/dialogs/comp-editor.c:1123
+#: ../calendar/gui/dialogs/comp-editor.c:1086
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3548
+#: ../composer/e-msg-composer.c:3403
 msgid "_Add attachment..."
 msgstr "_Прикачяне на файл...."
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:736
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:969
+#: ../widgets/misc/e-attachment-bar.c:963
 msgid "Attachment Bar"
 msgstr "Лента за прикачени файлове"
 
@@ -5303,7 +5161,7 @@ msgid "Suggest automatic display of attachment"
 msgstr "Предлагане на автоматично показване на прикачен"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
-#: ../composer/e-msg-composer-select-file.c:239
+#: ../composer/e-msg-composer-select-file.c:241
 msgid "Attach file(s)"
 msgstr "Прикачване на файл(ове)"
 
@@ -5338,7 +5196,7 @@ msgstr "Настройки на прикрепения документ"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:267
-#: ../calendar/gui/e-itip-control.c:1163
+#: ../calendar/gui/e-itip-control.c:1166
 #: ../calendar/gui/e-itip-control.glade.h:6
 #: ../composer/e-msg-composer-attachment.glade.h:3
 #: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
@@ -5359,7 +5217,7 @@ msgstr "MIME тип:"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:576
-#: ../mail/em-account-prefs.c:504 ../mail/em-composer-prefs.c:919
+#: ../mail/em-account-prefs.c:504 ../mail/em-composer-prefs.c:891
 #: ../plugins/plugin-manager/plugin-manager.c:213
 msgid "Enabled"
 msgstr "Разрешен"
@@ -5482,7 +5340,7 @@ msgstr "Свободен/зает"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: ../calendar/gui/dialogs/recurrence-page.c:1049
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Friday"
 msgstr "Петък"
 
@@ -5496,7 +5354,7 @@ msgstr "Минути"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: ../calendar/gui/dialogs/recurrence-page.c:1045
-#: ../calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Monday"
 msgstr "Понеделник"
 
@@ -5510,7 +5368,7 @@ msgstr "_Нед"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ../calendar/gui/dialogs/recurrence-page.c:1050
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Saturday"
 msgstr "Събота"
 
@@ -5524,7 +5382,7 @@ msgstr "Показване на номерата на седмиците в на
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: ../calendar/gui/dialogs/recurrence-page.c:1051
-#: ../calendar/gui/e-itip-control.c:726
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Sunday"
 msgstr "Неделя"
 
@@ -5542,7 +5400,7 @@ msgstr "Шаблон:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 #: ../calendar/gui/dialogs/recurrence-page.c:1048
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Thursday"
 msgstr "Четвъртък"
 
@@ -5556,7 +5414,7 @@ msgstr "Формат на време:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/dialogs/recurrence-page.c:1046
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Tuesday"
 msgstr "Вторник"
 
@@ -5566,7 +5424,7 @@ msgstr "С_едмицата започва в:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #: ../calendar/gui/dialogs/recurrence-page.c:1047
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Wednesday"
 msgstr "Сряда"
 
@@ -5657,45 +5515,23 @@ msgstr ""
 "Копиране на съдържанието на списъка със задачи за локална употреба в режим "
 "„Изключен“"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-#, fuzzy
-msgid "Copy memo list contents locally for offline operation"
-msgstr ""
-"Копиране на съдържанието на списъка със задачи за локална употреба в режим "
-"„Изключен“"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:341
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "_Цвят:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:378
 msgid "Tasks List"
 msgstr "Списък със задачи"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-#, fuzzy
-msgid "Memos List"
-msgstr "Списък на писмата"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:460
+#: ../calendar/gui/dialogs/calendar-setup.c:447
 msgid "Calendar Properties"
 msgstr "Настройки на календара"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:462
-msgid "New Calendar"
-msgstr "Нов календар"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:528
+#: ../calendar/gui/dialogs/calendar-setup.c:515
 msgid "Task List Properties"
 msgstr "Настройки на списък със задачи"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:594
-#: ../calendar/gui/memos-component.c:448
-#, fuzzy
-msgid "New Memo List"
-msgstr "Нов списък със задачи"
-
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
 msgstr "Добавяне на календар"
@@ -5805,106 +5641,105 @@ msgstr " (Краен срок "
 msgid "Due "
 msgstr "Краен срок "
 
-#: ../calendar/gui/dialogs/comp-editor.c:191 ../composer/e-msg-composer.c:2800
+#: ../calendar/gui/dialogs/comp-editor.c:190 ../composer/e-msg-composer.c:2664
 #, c-format
 msgid "Attached message - %s"
 msgstr "Прикачено писмо - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:196
-#: ../calendar/gui/dialogs/comp-editor.c:366 ../composer/e-msg-composer.c:2805
-#: ../composer/e-msg-composer.c:2984
+#: ../calendar/gui/dialogs/comp-editor.c:195
+#: ../calendar/gui/dialogs/comp-editor.c:365 ../composer/e-msg-composer.c:2669
+#: ../composer/e-msg-composer.c:2846
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Прикачено писмо"
 msgstr[1] "%d прикачени писма"
 
-#: ../calendar/gui/dialogs/comp-editor.c:430 ../composer/e-msg-composer.c:3050
+#: ../calendar/gui/dialogs/comp-editor.c:428
+#: ../calendar/gui/e-calendar-table.c:1175
+#: ../calendar/gui/e-calendar-view.c:1552 ../composer/e-msg-composer.c:2911
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1035
+#: ../mail/message-list.c:1708 ../ui/evolution-addressbook.xml.h:31
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:102 ../ui/evolution-tasks.xml.h:21
+msgid "_Copy"
+msgstr "_Копиране"
+
+#: ../calendar/gui/dialogs/comp-editor.c:429 ../composer/e-msg-composer.c:2912
 #: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1719
+#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1709
 msgid "_Move"
 msgstr "Пре_местване"
 
-#: ../calendar/gui/dialogs/comp-editor.c:432 ../composer/e-msg-composer.c:3052
-#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1721
+#: ../calendar/gui/dialogs/comp-editor.c:431 ../composer/e-msg-composer.c:2914
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1711
 msgid "Cancel _Drag"
 msgstr "Отказване на _извлачването"
 
-#: ../calendar/gui/dialogs/comp-editor.c:775
+#: ../calendar/gui/dialogs/comp-editor.c:774
 msgid "Could not update object"
 msgstr "Обектът не може да бъде актуализиран"
 
-#: ../calendar/gui/dialogs/comp-editor.c:978 ../composer/e-msg-composer.c:2443
+#: ../calendar/gui/dialogs/comp-editor.c:977 ../composer/e-msg-composer.c:2318
 #, 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:1008
-#, fuzzy
-msgid "Hide Attachment _Bar"
-msgstr "Лента за прикачени файлове"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1011
-#: ../calendar/gui/dialogs/comp-editor.c:1289
-#, fuzzy
-msgid "Show Attachment _Bar"
-msgstr "Лента за прикачени файлове"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1313
-msgid "Attachment Button: Press space key to toggle attachment bar"
-msgstr ""
+#: ../calendar/gui/dialogs/comp-editor.c:1249
+msgid "_Attachment Bar (drop attachments here)"
+msgstr "Лент_а за прикрепени файлове (пускайте обектите за прикачване тук)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1892
-#: ../calendar/gui/dialogs/comp-editor.c:1935
+#: ../calendar/gui/dialogs/comp-editor.c:1850
+#: ../calendar/gui/dialogs/comp-editor.c:1893
 msgid "Edit Appointment"
 msgstr "Редактиране на среща"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1898
-#: ../calendar/gui/dialogs/comp-editor.c:1941
+#: ../calendar/gui/dialogs/comp-editor.c:1856
+#: ../calendar/gui/dialogs/comp-editor.c:1899
 #, c-format
 msgid "Meeting - %s"
 msgstr "Събрание - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1900
-#: ../calendar/gui/dialogs/comp-editor.c:1943
+#: ../calendar/gui/dialogs/comp-editor.c:1858
+#: ../calendar/gui/dialogs/comp-editor.c:1901
 #, c-format
 msgid "Appointment - %s"
 msgstr "Среща - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1904
-#: ../calendar/gui/dialogs/comp-editor.c:1947
+#: ../calendar/gui/dialogs/comp-editor.c:1862
+#: ../calendar/gui/dialogs/comp-editor.c:1905
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Назначена задача - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1906
-#: ../calendar/gui/dialogs/comp-editor.c:1949
+#: ../calendar/gui/dialogs/comp-editor.c:1864
+#: ../calendar/gui/dialogs/comp-editor.c:1907
 #, c-format
 msgid "Task - %s"
 msgstr "Задача - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1909
-#: ../calendar/gui/dialogs/comp-editor.c:1952
+#: ../calendar/gui/dialogs/comp-editor.c:1867
+#: ../calendar/gui/dialogs/comp-editor.c:1910
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Запис в дневника - %s"
 
+#: ../calendar/gui/dialogs/comp-editor.c:1878
 #: ../calendar/gui/dialogs/comp-editor.c:1920
-#: ../calendar/gui/dialogs/comp-editor.c:1962
 msgid "No summary"
 msgstr "Няма обобщение"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2575
-#: ../calendar/gui/dialogs/comp-editor.c:2608
-#: ../calendar/gui/dialogs/comp-editor.c:2632
+#: ../calendar/gui/dialogs/comp-editor.c:2532
+#: ../calendar/gui/dialogs/comp-editor.c:2565
+#: ../calendar/gui/dialogs/comp-editor.c:2589
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Промените по този запис може да бъдат презаписани, ако пристигне обновяване"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2656
+#: ../calendar/gui/dialogs/comp-editor.c:2613
 msgid "Unable to use current version!"
 msgstr "Не може да се използва текущата версия!"
 
@@ -5981,36 +5816,32 @@ msgstr "Делегиране на:"
 msgid "Enter Delegate"
 msgstr "Въвеждане на делегат"
 
-#: ../calendar/gui/dialogs/event-editor.c:141
-#, fuzzy
-msgid "Appoint_ment"
+#: ../calendar/gui/dialogs/event-editor.c:141 ../calendar/gui/print.c:2307
+msgid "Appointment"
 msgstr "Среща"
 
 #: ../calendar/gui/dialogs/event-editor.c:150
-#, fuzzy
-msgid "_Recurrence"
+msgid "Recurrence"
 msgstr "Повторение"
 
 #: ../calendar/gui/dialogs/event-editor.c:164
-#: ../calendar/gui/dialogs/event-editor.c:239
-#: ../calendar/gui/dialogs/event-editor.c:413
-#, fuzzy
-msgid "Schedulin_g"
+#: ../calendar/gui/dialogs/event-editor.c:248
+#: ../calendar/gui/dialogs/event-editor.c:422
+msgid "Scheduling"
 msgstr "Разпределение"
 
 #: ../calendar/gui/dialogs/event-editor.c:174
-#, fuzzy
-msgid "_Delegatees"
+msgid "Delegatees"
 msgstr "Делегирани"
 
 #: ../calendar/gui/dialogs/event-editor.c:178
-msgid "_Attendees"
-msgstr "_Присъстващи"
+msgid "Attendees"
+msgstr "Присъстващи"
 
-#: ../calendar/gui/dialogs/event-editor.c:242
-#: ../calendar/gui/dialogs/event-editor.c:416
-msgid "In_vitations"
-msgstr "По_кани"
+#: ../calendar/gui/dialogs/event-editor.c:251
+#: ../calendar/gui/dialogs/event-editor.c:425
+msgid "Invitations"
+msgstr "Покани"
 
 #: ../calendar/gui/dialogs/event-page.c:731
 msgid "Event with no start date"
@@ -6037,26 +5868,26 @@ msgstr "Началният час е грешен"
 msgid "End time is wrong"
 msgstr "Крайният час е грешен"
 
-#: ../calendar/gui/dialogs/event-page.c:1693
+#: ../calendar/gui/dialogs/event-page.c:1686
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Не може да се отвори календара „%s“."
 
-#: ../calendar/gui/dialogs/event-page.c:1894
+#: ../calendar/gui/dialogs/event-page.c:1892
 #, 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:1902
+#: ../calendar/gui/dialogs/event-page.c:1900
 #, 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:1910
+#: ../calendar/gui/dialogs/event-page.c:1908
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
@@ -6100,93 +5931,88 @@ msgid "Ad_vanced send options"
 msgstr "_Допълнителни опции за изпращането"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:10
-msgid "Ala_rm"
-msgstr "Ала_рма"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:11
 msgid "C_ustomize..."
 msgstr "Персона_лизиране..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
+#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/task-page.glade.h:5
 msgid "Ca_tegories..."
 msgstr "Ка_тегории..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Cale_ndar:"
 msgstr "К_алендар:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Classi_fication:"
 msgstr "Класи_фикация:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:8
 #: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:325
 #: ../calendar/gui/e-calendar-table.c:364
 msgid "Confidential"
 msgstr "Поверително"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:16
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Event Description"
 msgstr "Описание на събитие"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:17
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "Locat_ion:"
 msgstr "Местоположен_ие:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.glade.h:17
 #: ../calendar/gui/dialogs/task-page.glade.h:10
 #: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:323
 #: ../calendar/gui/e-calendar-table.c:363
 msgid "Private"
 msgstr "Частен"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:19
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
+#: ../calendar/gui/dialogs/event-page.glade.h:18
 #: ../calendar/gui/dialogs/task-page.glade.h:11
 #: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:314
 #: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:362
 msgid "Public"
 msgstr "Публичен"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:20
-#, fuzzy
-msgid "Show time as bus_y"
+#: ../calendar/gui/dialogs/event-page.glade.h:19
+msgid "Show time as _busy"
 msgstr "Показване на времето като _заето"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:21
+#: ../calendar/gui/dialogs/event-page.glade.h:20
 #: ../calendar/gui/dialogs/task-page.glade.h:13
 msgid "Su_mmary:"
 msgstr "О_бобщение:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:22
+#: ../calendar/gui/dialogs/event-page.glade.h:21
 msgid "This appointment has customized alarms"
 msgstr "Тази среща има персонализирани аларми"
 
+#: ../calendar/gui/dialogs/event-page.glade.h:22
+msgid "_Alarm"
+msgstr "_Аларма"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:23
 msgid "_Description:"
 msgstr "_Описание:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:24
-#: ../calendar/gui/e-meeting-time-sel.c:645
+#: ../calendar/gui/e-meeting-time-sel.c:642
 msgid "_End time:"
 msgstr "_Край:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:25
-#: ../calendar/gui/e-meeting-time-sel.c:618
+#: ../calendar/gui/e-meeting-time-sel.c:615
 msgid "_Start time:"
 msgstr "_Начало:"
 
-#: ../calendar/gui/dialogs/meeting-page.c:305
+#: ../calendar/gui/dialogs/meeting-page.c:303
 msgid "<b>Dele_gatees</b>"
 msgstr "<b>Деле_гирани</b>"
 
-#: ../calendar/gui/dialogs/meeting-page.c:309
+#: ../calendar/gui/dialogs/meeting-page.c:307
 msgid "<b>From:</b>"
 msgstr "<b>От:</b>"
 
@@ -6195,10 +6021,10 @@ msgstr "<b>От:</b>"
 #. When "None" is selected we want the field to be cleared.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../calendar/gui/dialogs/meeting-page.c:315
+#: ../calendar/gui/dialogs/meeting-page.c:313
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:653
-#: ../calendar/gui/e-itip-control.c:1103 ../composer/e-msg-composer.c:2246
+#: ../calendar/gui/e-itip-control.c:1106 ../composer/e-msg-composer.c:2122
 #: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
 #: ../mail/em-account-editor.c:1348 ../mail/em-account-prefs.c:464
 #: ../mail/em-folder-view.c:1064 ../mail/em-junk-hook.c:78
@@ -6212,23 +6038,24 @@ msgstr "<b>От:</b>"
 msgid "None"
 msgstr "Без"
 
-#: ../calendar/gui/dialogs/meeting-page.c:463
+#: ../calendar/gui/dialogs/meeting-page.c:461
 msgid "The organizer selected no longer has an account."
 msgstr "Избраният организатор вече няма абонамент."
 
-#: ../calendar/gui/dialogs/meeting-page.c:469
+#: ../calendar/gui/dialogs/meeting-page.c:467
 msgid "An organizer is required."
 msgstr "Необходим е организатор."
 
-#: ../calendar/gui/dialogs/meeting-page.c:484
+#: ../calendar/gui/dialogs/meeting-page.c:482
 msgid "At least one attendee is required."
 msgstr "Необходим е поне един участник."
 
-#: ../calendar/gui/dialogs/meeting-page.c:909
-msgid "_Add "
-msgstr "Доб_авяне "
+#: ../calendar/gui/dialogs/meeting-page.c:884
+msgid "_Delegate To..."
+msgstr "_Делегиране на..."
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
+#: ../calendar/gui/e-meeting-list-view.c:358
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Присъстващ"
@@ -6264,14 +6091,15 @@ msgid "Member"
 msgstr "Член"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:399
+#: ../calendar/gui/e-meeting-list-view.c:386
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
+#: ../calendar/gui/dialogs/task-editor.c:146
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:410
+#: ../calendar/gui/e-meeting-list-view.c:394
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
 #: ../mail/message-list.etspec.h:12
 msgid "Status"
@@ -6286,8 +6114,9 @@ msgid "C_hange Organizer"
 msgstr "Пром_яна на организатор"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Co_ntacts..."
-msgstr "Конт_акти..."
+#: ../calendar/gui/e-meeting-time-sel.c:428
+msgid "Con_tacts..."
+msgstr "К_онтакти..."
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 msgid "Or_ganizer:"
@@ -6302,29 +6131,6 @@ msgstr "Организатор"
 msgid "Organizer:"
 msgstr "Организатор:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:130 ../calendar/gui/print.c:2311
-msgid "Memo"
-msgstr "Бележка"
-
-#: ../calendar/gui/dialogs/memo-page.c:489
-#, fuzzy, c-format
-msgid "Unable to open memos in '%s'."
-msgstr "Не може да се отворят задачите в „%s“."
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:2
-#, fuzzy
-msgid "<span weight=\"bold\">Basics</span>"
-msgstr "<span weight=\"bold\">Състояние</span>"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:8
-#: ../calendar/gui/dialogs/task-page.glade.h:16
-msgid "_Group:"
-msgstr "_Група:"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:9
-msgid "_Memo Content:"
-msgstr "Съдържание на _бележката:"
-
 #: ../calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Настройки на календара</b>"
@@ -6514,15 +6320,15 @@ msgstr "<span weight=\"bold\">Състояние</span>"
 #: ../calendar/gui/e-cal-component-preview.c:229
 #: ../calendar/gui/e-cal-model-tasks.c:346
 #: ../calendar/gui/e-cal-model-tasks.c:659
-#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/e-itip-control.c:895
+#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/e-itip-control.c:898
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../calendar/gui/print.c:2372 ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/print.c:2370 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Завършено"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-calendar-table.c:384 ../mail/message-list.c:1018
+#: ../calendar/gui/e-calendar-table.c:384 ../mail/message-list.c:1008
 msgid "High"
 msgstr "Високо"
 
@@ -6531,20 +6337,20 @@ msgstr "Високо"
 #: ../calendar/gui/e-cal-model-tasks.c:344
 #: ../calendar/gui/e-cal-model-tasks.c:657
 #: ../calendar/gui/e-cal-model-tasks.c:732
-#: ../calendar/gui/e-calendar-table.c:458 ../calendar/gui/print.c:2369
+#: ../calendar/gui/e-calendar-table.c:458 ../calendar/gui/print.c:2367
 msgid "In Progress"
 msgstr "В прогрес"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1016
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1006
 msgid "Low"
 msgstr "Ниско"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-cal-model.c:920 ../calendar/gui/e-calendar-table.c:385
-#: ../mail/message-list.c:1017
+#: ../mail/message-list.c:1007
 msgid "Normal"
 msgstr "Нормално"
 
@@ -6552,7 +6358,7 @@ msgstr "Нормално"
 #: ../calendar/gui/e-cal-component-preview.c:236
 #: ../calendar/gui/e-cal-model-tasks.c:342
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:457 ../calendar/gui/print.c:2366
+#: ../calendar/gui/e-calendar-table.c:457 ../calendar/gui/print.c:2364
 msgid "Not Started"
 msgstr "Не е стартиран"
 
@@ -6561,56 +6367,46 @@ 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:387
 msgid "Undefined"
 msgstr "Неопределено"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "_Date completed:"
 msgstr "_Дата на приключване:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:14
+#: ../calendar/gui/dialogs/task-details-page.glade.h:13
 #: ../widgets/misc/e-send-options.glade.h:31
 msgid "_Priority:"
 msgstr "_Приоритет:"
 
+#: ../calendar/gui/dialogs/task-details-page.glade.h:14
+msgid "_Status:"
+msgstr "_Състояние:"
+
 #: ../calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Web Page:"
 msgstr "_Интернет страница:"
 
-#: ../calendar/gui/dialogs/task-editor.c:137
-#: ../calendar/gui/tasks-component.c:1172
-msgid "_Task"
-msgstr "_Задача"
-
-#: ../calendar/gui/dialogs/task-editor.c:146
-msgid "_Status"
-msgstr "_Състояние"
+#: ../calendar/gui/dialogs/task-editor.c:137 ../calendar/gui/print.c:2309
+msgid "Task"
+msgstr "Задача"
 
 #: ../calendar/gui/dialogs/task-editor.c:161
 #: ../calendar/gui/dialogs/task-editor.c:223
 #: ../calendar/gui/dialogs/task-editor.c:380
-#, fuzzy
-msgid "Assig_nment"
+msgid "Assignment"
 msgstr "Задача"
 
 #: ../calendar/gui/dialogs/task-page.c:529
 msgid "Due date is wrong"
 msgstr "Крайният срок е невалиден"
 
-#: ../calendar/gui/dialogs/task-page.c:880
+#: ../calendar/gui/dialogs/task-page.c:873
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Не може да се отворят задачите в „%s“."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:5
-msgid "Categor_ies..."
-msgstr "Ка_тегории..."
-
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "D_escription:"
 msgstr "Описани_е:"
@@ -6627,6 +6423,10 @@ msgstr "Описание на задача"
 msgid "_Due date:"
 msgstr "_Крайна дата:"
 
+#: ../calendar/gui/dialogs/task-page.glade.h:16
+msgid "_Group:"
+msgstr "_Група:"
+
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Free/Busy C_alendars</b>"
 msgstr "<b>К_алендари свободен/зает</b>"
@@ -6752,27 +6552,17 @@ msgstr "%s в %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s е неизвестен тип за превключване"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2704
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2703
 #, c-format
 msgid "Click to open %s"
 msgstr "Натиснете, за да отворите %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:199
-msgid "Memo:"
-msgstr "Бележка:"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:232
-#: ../calendar/gui/e-cal-component-preview.c:299
-msgid "Web Page:"
-msgstr "Интернет страница:"
-
 #: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:796
 msgid "Untitled"
 msgstr "Неименувано"
 
 #: ../calendar/gui/e-cal-component-preview.c:186
-#: ../calendar/gui/e-itip-control.c:1107
+#: ../calendar/gui/e-itip-control.c:1110
 #: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Обобщено:"
@@ -6789,7 +6579,7 @@ msgstr "Крайна дата:"
 #. write status
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:222
-#: ../calendar/gui/e-itip-control.c:1131
+#: ../calendar/gui/e-itip-control.c:1134
 #: ../plugins/exchange-operations/exchange-account-setup.c:265
 #: ../plugins/itip-formatter/itip-view.c:909
 msgid "Status:"
@@ -6799,6 +6589,10 @@ msgstr "Състояние:"
 msgid "Priority:"
 msgstr "Приоритет:"
 
+#: ../calendar/gui/e-cal-component-preview.c:299
+msgid "Web Page:"
+msgstr "Интернет страница:"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Крайна дата"
@@ -6809,8 +6603,7 @@ 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:16
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../mail/mail-dialogs.glade.h:16 ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "Обобщение"
 
@@ -6821,7 +6614,7 @@ msgstr "Свободно"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
 #: ../calendar/gui/e-calendar-table.c:437
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Busy"
 msgstr "Заето"
 
@@ -6852,17 +6645,15 @@ msgstr "Не"
 
 #. This is the default filename used for temporary file creation
 #: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-model.c:330
-#: ../calendar/gui/e-cal-popup.c:106 ../calendar/gui/e-cal-popup.c:121
-#: ../calendar/gui/e-cal-popup.c:165 ../calendar/gui/e-itip-control.c:1148
-#: ../calendar/gui/e-itip-control.c:1289
+#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.c:1292
 #: ../calendar/gui/e-meeting-list-view.c:168
 #: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1283
+#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1244
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1652
 #: ../plugins/plugin-manager/plugin-manager.c:72
-#: ../widgets/misc/e-attachment-bar.c:665
+#: ../widgets/misc/e-attachment-bar.c:659
 #: ../widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "Неизвестен"
@@ -6875,40 +6666,6 @@ msgstr "Повтарящ се"
 msgid "Assigned"
 msgstr "Назначен"
 
-#: ../calendar/gui/e-cal-popup.c:171 ../mail/em-popup.c:411
-msgid "Save As..."
-msgstr "Запазване като..."
-
-#: ../calendar/gui/e-cal-popup.c:187 ../mail/em-format-html-display.c:1812
-msgid "Select folder to save selected attachments..."
-msgstr "Изберете папка, където да се запазят избраните прикачени файлове..."
-
-#: ../calendar/gui/e-cal-popup.c:216 ../mail/em-popup.c:436
-#, c-format
-msgid "untitled_image.%s"
-msgstr "неозаглавено_изображение.%s"
-
-#: ../calendar/gui/e-cal-popup.c:270 ../calendar/gui/e-calendar-table.c:1169
-#: ../calendar/gui/e-calendar-view.c:1550 ../calendar/gui/e-memo-table.c:847
-#: ../mail/em-folder-view.c:1045 ../mail/em-popup.c:553 ../mail/em-popup.c:564
-msgid "_Save As..."
-msgstr "Запазване _като..."
-
-#: ../calendar/gui/e-cal-popup.c:271 ../mail/em-popup.c:554
-#: ../mail/em-popup.c:565
-msgid "Set as _Background"
-msgstr "Използване за _фон"
-
-#: ../calendar/gui/e-cal-popup.c:272
-#, fuzzy
-msgid "_Save Selected"
-msgstr "Запазване на избраните"
-
-#: ../calendar/gui/e-cal-popup.c:394 ../mail/em-popup.c:774
-#, c-format
-msgid "Open in %s..."
-msgstr "Отваряне в %s..."
-
 #: ../calendar/gui/e-calendar-table.c:406
 msgid "0%"
 msgstr "0%"
@@ -6958,58 +6715,58 @@ msgid "Task Table"
 msgstr "Таблица със задачи"
 
 #: ../calendar/gui/e-calendar-table.c:696
-#: ../calendar/gui/e-calendar-view.c:671 ../calendar/gui/e-memo-table.c:426
+#: ../calendar/gui/e-calendar-view.c:671
 msgid "Deleting selected objects"
 msgstr "Изтриване на избраните обекти"
 
 #: ../calendar/gui/e-calendar-table.c:875
-#: ../calendar/gui/e-calendar-view.c:799 ../calendar/gui/e-memo-table.c:603
+#: ../calendar/gui/e-calendar-view.c:799
 msgid "Updating objects"
 msgstr "Обновяване на обектите"
 
 #: ../calendar/gui/e-calendar-table.c:1025
-#: ../calendar/gui/e-calendar-view.c:1126 ../calendar/gui/e-memo-table.c:735
-#: ../composer/e-msg-composer.c:1341
+#: ../calendar/gui/e-calendar-view.c:1122 ../composer/e-msg-composer.c:1243
 msgid "Save as..."
 msgstr "Запазване като..."
 
-#: ../calendar/gui/e-calendar-table.c:1168 ../calendar/gui/e-memo-table.c:846
+#: ../calendar/gui/e-calendar-table.c:1168
 msgid "Open _Web Page"
 msgstr "Отваряне на страница в _Интернет"
 
+#: ../calendar/gui/e-calendar-table.c:1169
+#: ../calendar/gui/e-calendar-view.c:1546 ../mail/em-folder-view.c:1045
+#: ../mail/em-popup.c:541 ../mail/em-popup.c:552
+msgid "_Save As..."
+msgstr "Запазване _като..."
+
 #: ../calendar/gui/e-calendar-table.c:1170
-#: ../calendar/gui/e-calendar-view.c:1530
-#: ../calendar/gui/e-calendar-view.c:1551 ../calendar/gui/e-memo-table.c:848
-#: ../mail/em-folder-view.c:1046
+#: ../calendar/gui/e-calendar-view.c:1526
+#: ../calendar/gui/e-calendar-view.c:1547 ../mail/em-folder-view.c:1046
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-tasks.xml.h:27
 msgid "_Print..."
 msgstr "_Разпечатване..."
 
 #: ../calendar/gui/e-calendar-table.c:1174
-#: ../calendar/gui/e-calendar-view.c:1555 ../calendar/gui/e-memo-table.c:852
-#: ../ui/evolution-addressbook.xml.h:1 ../ui/evolution-calendar.xml.h:1
-#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-view.c:1551 ../ui/evolution-addressbook.xml.h:1
+#: ../ui/evolution-calendar.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Из_рязване"
 
 #: ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:1533
-#: ../calendar/gui/e-calendar-view.c:1557 ../calendar/gui/e-memo-table.c:854
-#: ../ui/evolution-addressbook.xml.h:39 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-composer-entries.xml.h:9 ../ui/evolution-memos.xml.h:19
-#: ../ui/evolution-tasks.xml.h:28
+#: ../calendar/gui/e-calendar-view.c:1529
+#: ../calendar/gui/e-calendar-view.c:1553 ../ui/evolution-addressbook.xml.h:38
+#: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
+#: ../ui/evolution-tasks.xml.h:26
 msgid "_Paste"
 msgstr "_Поставяне"
 
-#: ../calendar/gui/e-calendar-table.c:1180 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1180 ../ui/evolution-tasks.xml.h:20
 msgid "_Assign Task"
 msgstr "_Задаване на задача"
 
-#: ../calendar/gui/e-calendar-table.c:1181 ../calendar/gui/e-memo-table.c:858
-#: ../ui/evolution-tasks.xml.h:26
+#: ../calendar/gui/e-calendar-table.c:1181 ../ui/evolution-tasks.xml.h:24
 msgid "_Forward as iCalendar"
 msgstr "_Препращане като iCalendar"
 
@@ -7021,11 +6778,20 @@ msgstr "_Отбелязване като приключено"
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Отбелязване на избраните задачи като приключени"
 
+#. FIXME: need to disable for undeletable folders
+#: ../calendar/gui/e-calendar-table.c:1187
+#: ../calendar/gui/e-calendar-view.c:1565 ../mail/em-folder-tree.c:2048
+#: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:33
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
+#: ../ui/evolution-tasks.xml.h:22
+msgid "_Delete"
+msgstr "_Изтриване"
+
 #: ../calendar/gui/e-calendar-table.c:1188
 msgid "_Delete Selected Tasks"
 msgstr "_Изтриване на избраните задачи"
 
-#: ../calendar/gui/e-calendar-table.c:1421
+#: ../calendar/gui/e-calendar-table.c:1407
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Натиснете, за да добавите задача"
@@ -7060,79 +6826,73 @@ msgstr "Начална дата"
 msgid "Task sort"
 msgstr "Подреждане на задачи"
 
-#: ../calendar/gui/e-calendar-view.c:1252
+#: ../calendar/gui/e-calendar-view.c:1248
 msgid "Moving items"
 msgstr "Преместване на обекти"
 
-#: ../calendar/gui/e-calendar-view.c:1254
+#: ../calendar/gui/e-calendar-view.c:1250
 msgid "Copying items"
 msgstr "Копиране на обекти"
 
-#: ../calendar/gui/e-calendar-view.c:1524
+#: ../calendar/gui/e-calendar-view.c:1520
 msgid "New _Appointment..."
 msgstr "Нова _среща..."
 
-#: ../calendar/gui/e-calendar-view.c:1525
+#: ../calendar/gui/e-calendar-view.c:1521
 msgid "New All Day _Event"
 msgstr "Всички нови _събития за деня"
 
-#: ../calendar/gui/e-calendar-view.c:1526
-msgid "New _Meeting"
-msgstr "Ново _събрание"
-
-#: ../calendar/gui/e-calendar-view.c:1527
-msgid "New _Task"
-msgstr "Нова _задача"
+#: ../calendar/gui/e-calendar-view.c:1523
+msgid "New Task"
+msgstr "Нова задача"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1537
-#: ../widgets/menus/gal-view-menus.c:291
-msgid "_Current View"
-msgstr "_Текущ изглед"
+#: ../calendar/gui/e-calendar-view.c:1533
+msgid "Current View"
+msgstr "Текущ изглед"
 
-#: ../calendar/gui/e-calendar-view.c:1539
-#, fuzzy
-msgid "Select T_oday"
+#: ../calendar/gui/e-calendar-view.c:1535 ../ui/evolution-calendar.xml.h:26
+msgid "Select _Today"
 msgstr "Избиране на _днес"
 
-#: ../calendar/gui/e-calendar-view.c:1540
+#: ../calendar/gui/e-calendar-view.c:1536
 msgid "_Select Date..."
 msgstr "Избор на д_ата..."
 
 #. TODO: Why is this in a context menu when it applies globally?
-#: ../calendar/gui/e-calendar-view.c:1545 ../ui/evolution-calendar.xml.h:45
+#: ../calendar/gui/e-calendar-view.c:1541 ../ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Публикуване на информация свободен/зает"
 
-#: ../calendar/gui/e-calendar-view.c:1561
+#: ../calendar/gui/e-calendar-view.c:1557
 msgid "Cop_y to Calendar..."
 msgstr "Копиране в _календар..."
 
-#: ../calendar/gui/e-calendar-view.c:1562
+#: ../calendar/gui/e-calendar-view.c:1558
 msgid "Mo_ve to Calendar..."
 msgstr "Преме_стване в календар..."
 
-#: ../calendar/gui/e-calendar-view.c:1563
+#: ../calendar/gui/e-calendar-view.c:1559
 msgid "_Delegate Meeting..."
 msgstr "_Делегиране на събрание..."
 
-#: ../calendar/gui/e-calendar-view.c:1564
+#: ../calendar/gui/e-calendar-view.c:1560
 msgid "_Schedule Meeting..."
 msgstr "Насрочване на с_ъбрание..."
 
-#: ../calendar/gui/e-calendar-view.c:1565
+#: ../calendar/gui/e-calendar-view.c:1561
 msgid "_Forward as iCalendar..."
 msgstr "Препра_ща като iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1570
+#: ../calendar/gui/e-calendar-view.c:1566
 msgid "Make this Occurrence _Movable"
 msgstr "Прави това събитие пр_еместваемо"
 
-#: ../calendar/gui/e-calendar-view.c:1571
+#: ../calendar/gui/e-calendar-view.c:1567
 msgid "Delete this _Occurrence"
 msgstr "Изтриване на това с_ъбитие"
 
-#: ../calendar/gui/e-calendar-view.c:1572
+#: ../calendar/gui/e-calendar-view.c:1568
 msgid "Delete _All Occurrences"
 msgstr "Изтриване на всички _събития"
 
@@ -7195,94 +6955,94 @@ msgstr "сутрин"
 msgid "pm"
 msgstr "следобед"
 
-#: ../calendar/gui/e-itip-control.c:760
+#: ../calendar/gui/e-itip-control.c:763
 msgid "Yes. (Complex Recurrence)"
 msgstr "Да (сложно повторение)"
 
-#: ../calendar/gui/e-itip-control.c:771
+#: ../calendar/gui/e-itip-control.c:774
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Всеки ден"
 msgstr[1] "На всеки %d дена"
 
-#: ../calendar/gui/e-itip-control.c:776
+#: ../calendar/gui/e-itip-control.c:779
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Всяка седмица"
 msgstr[1] "На всеки %d седмици"
 
-#: ../calendar/gui/e-itip-control.c:778
+#: ../calendar/gui/e-itip-control.c:781
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Всяка седмица в "
 msgstr[1] "На всеки %d седмици в "
 
-#: ../calendar/gui/e-itip-control.c:786
+#: ../calendar/gui/e-itip-control.c:789
 msgid " and "
 msgstr " и "
 
-#: ../calendar/gui/e-itip-control.c:793
+#: ../calendar/gui/e-itip-control.c:796
 #, c-format
 msgid "The %s day of "
 msgstr "%s ден от "
 
-#: ../calendar/gui/e-itip-control.c:806
+#: ../calendar/gui/e-itip-control.c:809
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s от "
 
-#: ../calendar/gui/e-itip-control.c:813
+#: ../calendar/gui/e-itip-control.c:816
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "всеки месец"
 msgstr[1] "на всеки %d месеца"
 
-#: ../calendar/gui/e-itip-control.c:817
+#: ../calendar/gui/e-itip-control.c:820
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Всяка година"
 msgstr[1] "На всеки %d години"
 
-#: ../calendar/gui/e-itip-control.c:828
+#: ../calendar/gui/e-itip-control.c:831
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] "общо %d път"
 msgstr[1] "общо %d пъти"
 
-#: ../calendar/gui/e-itip-control.c:837
+#: ../calendar/gui/e-itip-control.c:840
 msgid ", ending on "
 msgstr ", завършва на "
 
-#: ../calendar/gui/e-itip-control.c:861
+#: ../calendar/gui/e-itip-control.c:864
 msgid "Starts"
 msgstr "Начало"
 
-#: ../calendar/gui/e-itip-control.c:874
+#: ../calendar/gui/e-itip-control.c:877
 msgid "Ends"
 msgstr "Край"
 
-#: ../calendar/gui/e-itip-control.c:908
+#: ../calendar/gui/e-itip-control.c:911
 #: ../plugins/save-calendar/csv-format.c:395
 msgid "Due"
 msgstr "Краен срок"
 
-#: ../calendar/gui/e-itip-control.c:948 ../calendar/gui/e-itip-control.c:1005
+#: ../calendar/gui/e-itip-control.c:951 ../calendar/gui/e-itip-control.c:1008
 msgid "iCalendar Information"
 msgstr "iCalendar информация"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:965
+#: ../calendar/gui/e-itip-control.c:968
 msgid "iCalendar Error"
 msgstr "Грешка в iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1037 ../calendar/gui/e-itip-control.c:1053
-#: ../calendar/gui/e-itip-control.c:1064 ../calendar/gui/e-itip-control.c:1081
+#: ../calendar/gui/e-itip-control.c:1040 ../calendar/gui/e-itip-control.c:1056
+#: ../calendar/gui/e-itip-control.c:1067 ../calendar/gui/e-itip-control.c:1084
 #: ../plugins/itip-formatter/itip-view.c:338
 #: ../plugins/itip-formatter/itip-view.c:339
 #: ../plugins/itip-formatter/itip-view.c:406
@@ -7291,7 +7051,7 @@ msgid "An unknown person"
 msgstr "Неизвестна личност"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1088
+#: ../calendar/gui/e-itip-control.c:1091
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7299,298 +7059,298 @@ msgstr ""
 "<br> Прегледайте следната информация и тогава изберете действие от долното "
 "меню."
 
-#: ../calendar/gui/e-itip-control.c:1136
+#: ../calendar/gui/e-itip-control.c:1139
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:546
+#: ../calendar/gui/itip-utils.c:548
 #: ../plugins/itip-formatter/itip-formatter.c:1640
 msgid "Accepted"
 msgstr "Прието"
 
-#: ../calendar/gui/e-itip-control.c:1140 ../calendar/gui/itip-utils.c:549
+#: ../calendar/gui/e-itip-control.c:1143 ../calendar/gui/itip-utils.c:551
 #: ../plugins/itip-formatter/itip-formatter.c:1643
 msgid "Tentatively Accepted"
 msgstr "Неуверено прието"
 
-#: ../calendar/gui/e-itip-control.c:1144
+#: ../calendar/gui/e-itip-control.c:1147
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/itip-utils.c:552 ../calendar/gui/itip-utils.c:581
+#: ../calendar/gui/itip-utils.c:554 ../calendar/gui/itip-utils.c:583
 #: ../plugins/itip-formatter/itip-formatter.c:1646
 msgid "Declined"
 msgstr "Отказано"
 
-#: ../calendar/gui/e-itip-control.c:1228
+#: ../calendar/gui/e-itip-control.c:1231
 msgid ""
 "The meeting has been cancelled, however it could not be found in your "
 "calendars"
 msgstr ""
 "Събранието беше отменено, но не може да бъде намерено във вашите календари"
 
-#: ../calendar/gui/e-itip-control.c:1230
+#: ../calendar/gui/e-itip-control.c:1233
 msgid ""
 "The task has been cancelled, however it could not be found in your task lists"
 msgstr ""
 "Задачата беше отказана, но не може да бъде намерена във вашия списък със "
 "задачи"
 
-#: ../calendar/gui/e-itip-control.c:1309
+#: ../calendar/gui/e-itip-control.c:1312
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> публикува информация за събрание."
 
-#: ../calendar/gui/e-itip-control.c:1310
+#: ../calendar/gui/e-itip-control.c:1313
 msgid "Meeting Information"
 msgstr "Информация за събрание"
 
-#: ../calendar/gui/e-itip-control.c:1316
+#: ../calendar/gui/e-itip-control.c:1319
 #, 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:1318
+#: ../calendar/gui/e-itip-control.c:1321
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> изисква вашето присъствие на събрание."
 
-#: ../calendar/gui/e-itip-control.c:1319
+#: ../calendar/gui/e-itip-control.c:1322
 msgid "Meeting Proposal"
 msgstr "Предложение за събрание"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1325
+#: ../calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> иска да бъде добавен към съществуващо събрание."
 
-#: ../calendar/gui/e-itip-control.c:1326
+#: ../calendar/gui/e-itip-control.c:1329
 msgid "Meeting Update"
 msgstr "Обновяване на събранието"
 
-#: ../calendar/gui/e-itip-control.c:1330
+#: ../calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> иска да получи последната информация за събранието."
 
-#: ../calendar/gui/e-itip-control.c:1331
+#: ../calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update Request"
 msgstr "Заявка за обновяване на събранието"
 
-#: ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-itip-control.c:1341
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> отговори на запитване за събрание."
 
-#: ../calendar/gui/e-itip-control.c:1339
+#: ../calendar/gui/e-itip-control.c:1342
 msgid "Meeting Reply"
 msgstr "Отговор за събрание"
 
-#: ../calendar/gui/e-itip-control.c:1346
+#: ../calendar/gui/e-itip-control.c:1349
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> отказа събранието."
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1350
 msgid "Meeting Cancellation"
 msgstr "Отказ от присъствие на събранието"
 
-#: ../calendar/gui/e-itip-control.c:1357 ../calendar/gui/e-itip-control.c:1434
-#: ../calendar/gui/e-itip-control.c:1474
+#: ../calendar/gui/e-itip-control.c:1360 ../calendar/gui/e-itip-control.c:1437
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> е изпратил неразбираемо съобщение."
 
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1361
 msgid "Bad Meeting Message"
 msgstr "Лошо съобщение за събрание"
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1388
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> публикува информация за задачата."
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1389
 msgid "Task Information"
 msgstr "Информация за задача"
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1396
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> изисква %s, за да бъде изпълнена задачата."
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1398
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> изисква вашето участие в задача.."
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1399
 msgid "Task Proposal"
 msgstr "Предложение за задача"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1402
+#: ../calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> иска да бъде добавен към съществуваща задача."
 
-#: ../calendar/gui/e-itip-control.c:1403
+#: ../calendar/gui/e-itip-control.c:1406
 msgid "Task Update"
 msgstr "Актуализиране на задача"
 
-#: ../calendar/gui/e-itip-control.c:1407
+#: ../calendar/gui/e-itip-control.c:1410
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> иска да получи последната информация за задача."
 
-#: ../calendar/gui/e-itip-control.c:1408
+#: ../calendar/gui/e-itip-control.c:1411
 msgid "Task Update Request"
 msgstr "Заявка за обновяване на задача"
 
-#: ../calendar/gui/e-itip-control.c:1415
+#: ../calendar/gui/e-itip-control.c:1418
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> отговори на включване в задача."
 
-#: ../calendar/gui/e-itip-control.c:1416
+#: ../calendar/gui/e-itip-control.c:1419
 msgid "Task Reply"
 msgstr "Отговор на задача"
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1426
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> прекъсна задача."
 
-#: ../calendar/gui/e-itip-control.c:1424
+#: ../calendar/gui/e-itip-control.c:1427
 msgid "Task Cancellation"
 msgstr "Прекъсване на задача"
 
-#: ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1438
 msgid "Bad Task Message"
 msgstr "Лошо съобщение за задача"
 
-#: ../calendar/gui/e-itip-control.c:1459
+#: ../calendar/gui/e-itip-control.c:1462
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> публикува информация свободен/зает."
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Free/Busy Information"
 msgstr "Информация свободен/зает"
 
-#: ../calendar/gui/e-itip-control.c:1464
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> изисква от вас информация за свободен/зает."
 
-#: ../calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Free/Busy Request"
 msgstr "Заявка свободен/зает"
 
-#: ../calendar/gui/e-itip-control.c:1469
+#: ../calendar/gui/e-itip-control.c:1472
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> отговори на заявката свободен/зает."
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1473
 msgid "Free/Busy Reply"
 msgstr "Отговор свободен/зает"
 
-#: ../calendar/gui/e-itip-control.c:1475
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Bad Free/Busy Message"
 msgstr "Лошо свободен/зает съобщение"
 
-#: ../calendar/gui/e-itip-control.c:1550
+#: ../calendar/gui/e-itip-control.c:1553
 msgid "The message does not appear to be properly formed"
 msgstr "Изглежда съобщението е повредено."
 
-#: ../calendar/gui/e-itip-control.c:1609
+#: ../calendar/gui/e-itip-control.c:1612
 msgid "The message contains only unsupported requests."
 msgstr "Съобщението съдържа само неподдържани заявки."
 
-#: ../calendar/gui/e-itip-control.c:1642
+#: ../calendar/gui/e-itip-control.c:1645
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Прикаченото не съдържа валидно съобщение за календар."
 
-#: ../calendar/gui/e-itip-control.c:1674
+#: ../calendar/gui/e-itip-control.c:1677
 msgid "The attachment has no viewable calendar items"
 msgstr "Прикаченото няма видими обекти на календар"
 
-#: ../calendar/gui/e-itip-control.c:1908
+#: ../calendar/gui/e-itip-control.c:1911
 msgid "Update complete\n"
 msgstr "Обновяването приключено\n"
 
-#: ../calendar/gui/e-itip-control.c:1936
+#: ../calendar/gui/e-itip-control.c:1939
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Обектът е невалиден и не може да бъде осъвременен\n"
 
-#: ../calendar/gui/e-itip-control.c:1946
+#: ../calendar/gui/e-itip-control.c:1949
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Този отговор не е от текущ присъстващ.  Да се добави ли като участник?"
 
-#: ../calendar/gui/e-itip-control.c:1958
+#: ../calendar/gui/e-itip-control.c:1961
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Състоянието на присъстващия не може да бъде осъвременено заради невалидно "
 "състояние!\n"
 
-#: ../calendar/gui/e-itip-control.c:1975
+#: ../calendar/gui/e-itip-control.c:1978
 msgid "Attendee status updated\n"
 msgstr "Състоянието на присъстващия е осъвременено\n"
 
-#: ../calendar/gui/e-itip-control.c:1978
+#: ../calendar/gui/e-itip-control.c:1981
 #: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Състоянието на присъстващия не може да бъде осъвременено, защото обекта вече "
 "не съществува"
 
-#: ../calendar/gui/e-itip-control.c:2008
+#: ../calendar/gui/e-itip-control.c:2011
 msgid "Removal Complete"
 msgstr "Преместването е приключено"
 
-#: ../calendar/gui/e-itip-control.c:2031 ../calendar/gui/e-itip-control.c:2079
+#: ../calendar/gui/e-itip-control.c:2034 ../calendar/gui/e-itip-control.c:2082
 msgid "Item sent!\n"
 msgstr "Обектът е изпратен!\n"
 
-#: ../calendar/gui/e-itip-control.c:2033 ../calendar/gui/e-itip-control.c:2083
+#: ../calendar/gui/e-itip-control.c:2036 ../calendar/gui/e-itip-control.c:2086
 msgid "The item could not be sent!\n"
 msgstr "Обектът не може да бъде изпратен!\n"
 
-#: ../calendar/gui/e-itip-control.c:2163
+#: ../calendar/gui/e-itip-control.c:2166
 msgid "Choose an action:"
 msgstr "Избор на действие:"
 
-#: ../calendar/gui/e-itip-control.c:2234
+#: ../calendar/gui/e-itip-control.c:2237
 msgid "Update"
 msgstr "Актуализиране"
 
-#: ../calendar/gui/e-itip-control.c:2262
+#: ../calendar/gui/e-itip-control.c:2265
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Приемане"
 
-#: ../calendar/gui/e-itip-control.c:2263
+#: ../calendar/gui/e-itip-control.c:2266
 msgid "Tentatively accept"
 msgstr "Временно приемане"
 
-#: ../calendar/gui/e-itip-control.c:2264
+#: ../calendar/gui/e-itip-control.c:2267
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Отказване"
 
-#: ../calendar/gui/e-itip-control.c:2293
+#: ../calendar/gui/e-itip-control.c:2296
 msgid "Send Free/Busy Information"
 msgstr "Изпращане на информация свободен/зает"
 
-#: ../calendar/gui/e-itip-control.c:2321
+#: ../calendar/gui/e-itip-control.c:2324
 msgid "Update respondent status"
 msgstr "Обновяване на състоянието на отговарящия"
 
-#: ../calendar/gui/e-itip-control.c:2349
+#: ../calendar/gui/e-itip-control.c:2352
 msgid "Send Latest Information"
 msgstr "Изпращане на най-новата информация"
 
-#: ../calendar/gui/e-itip-control.c:2377 ../calendar/gui/itip-utils.c:569
+#: ../calendar/gui/e-itip-control.c:2380 ../calendar/gui/itip-utils.c:571
 #: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
@@ -7702,22 +7462,17 @@ msgstr "Необходими действия"
 
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Tentative"
 msgstr "Пробен"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
 #: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/itip-utils.c:555
+#: ../calendar/gui/itip-utils.c:557
 #: ../plugins/itip-formatter/itip-formatter.c:1649
 msgid "Delegated"
 msgstr "Делегиран"
 
-#. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:361
-msgid "Attendee                          "
-msgstr "Присъстващ"
-
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
 msgid "In Process"
 msgstr "В прогрес"
@@ -7725,7 +7480,7 @@ 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:444
-#: ../calendar/gui/e-meeting-time-sel.c:2105
+#: ../calendar/gui/e-meeting-time-sel.c:2102
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7736,7 +7491,7 @@ msgstr "%A, %B %d, %Y"
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
 #: ../calendar/gui/e-meeting-time-sel-item.c:448
-#: ../calendar/gui/e-meeting-time-sel.c:2138 ../e-util/e-time-utils.c:203
+#: ../calendar/gui/e-meeting-time-sel.c:2135 ../e-util/e-time-utils.c:203
 #: ../e-util/e-time-utils.c:296 ../e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
@@ -7752,83 +7507,64 @@ msgstr "%a %m/%d/%Y"
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:416 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Извън офиса"
 
-#: ../calendar/gui/e-meeting-time-sel.c:417
+#: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "No Information"
 msgstr "Няма информация"
 
-#: ../calendar/gui/e-meeting-time-sel.c:431
-msgid "Con_tacts..."
-msgstr "К_онтакти..."
-
-#: ../calendar/gui/e-meeting-time-sel.c:448
+#: ../calendar/gui/e-meeting-time-sel.c:445
 msgid "O_ptions"
 msgstr "Оп_ции"
 
-#: ../calendar/gui/e-meeting-time-sel.c:465
+#: ../calendar/gui/e-meeting-time-sel.c:462
 msgid "Show _only working hours"
 msgstr "Показване _само на работните часове"
 
-#: ../calendar/gui/e-meeting-time-sel.c:475
+#: ../calendar/gui/e-meeting-time-sel.c:472
 msgid "Show _zoomed out"
 msgstr "Показване като _умалено"
 
-#: ../calendar/gui/e-meeting-time-sel.c:490
+#: ../calendar/gui/e-meeting-time-sel.c:487
 msgid "_Update free/busy"
 msgstr "_Актуализиране на свободен/зает"
 
-#: ../calendar/gui/e-meeting-time-sel.c:505
+#: ../calendar/gui/e-meeting-time-sel.c:502
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:523
+#: ../calendar/gui/e-meeting-time-sel.c:520
 msgid "_Autopick"
 msgstr "_Авт. избиране"
 
-#: ../calendar/gui/e-meeting-time-sel.c:538
+#: ../calendar/gui/e-meeting-time-sel.c:535
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:555
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "_All people and resources"
 msgstr "_Всички хора и ресурси"
 
-#: ../calendar/gui/e-meeting-time-sel.c:564
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "All _people and one resource"
 msgstr "Вси_чки хора и един ресурс"
 
-#: ../calendar/gui/e-meeting-time-sel.c:573
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "_Required people"
 msgstr "Ну_жни хора"
 
-#: ../calendar/gui/e-meeting-time-sel.c:582
+#: ../calendar/gui/e-meeting-time-sel.c:579
 msgid "Required people and _one resource"
 msgstr "Нужни хора и _един ресурс"
 
-#: ../calendar/gui/e-memo-table.c:267
-msgid "Memo Table"
-msgstr "Таблица за бележки"
-
-#: ../calendar/gui/e-memo-table.c:863
-#, fuzzy
-msgid "_Delete Selected Memos"
-msgstr "_Изтриване на избраните задачи"
-
-#: ../calendar/gui/e-memo-table.c:986 ../calendar/gui/e-memo-table.etspec.h:2
-#, fuzzy
-msgid "Click to add a memo"
-msgstr "Натиснете, за да добавите задача"
-
-#: ../calendar/gui/e-memo-table.etspec.h:3
-#, fuzzy
-msgid "Memo sort"
-msgstr "Не са подредени"
+#: ../calendar/gui/e-pub-utils.c:321
+#, c-format
+msgid "Enter the password for %s"
+msgstr "Въведете паролата за %s"
 
-#: ../calendar/gui/e-memos.c:727 ../calendar/gui/e-tasks.c:822
-#: ../calendar/gui/gnome-cal.c:2556
+#: ../calendar/gui/e-tasks.c:820 ../calendar/gui/gnome-cal.c:2554
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7837,39 +7573,24 @@ msgstr ""
 "Грешка в %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:775
-#, fuzzy
-msgid "Loading memos"
-msgstr "Зареждане на задачи"
-
-#: ../calendar/gui/e-memos.c:860
-#, fuzzy, c-format
-msgid "Opening memos at %s"
-msgstr "Отваряне на задачи в %s"
-
-#: ../calendar/gui/e-memos.c:1033 ../calendar/gui/e-tasks.c:1225
-msgid "Deleting selected objects..."
-msgstr "Изтриване на избраните обекти..."
-
-#: ../calendar/gui/e-pub-utils.c:322
-#, c-format
-msgid "Enter the password for %s"
-msgstr "Въведете паролата за %s"
-
-#: ../calendar/gui/e-tasks.c:870
+#: ../calendar/gui/e-tasks.c:868
 msgid "Loading tasks"
 msgstr "Зареждане на задачи"
 
-#: ../calendar/gui/e-tasks.c:957
+#: ../calendar/gui/e-tasks.c:952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Отваряне на задачи в %s"
 
-#: ../calendar/gui/e-tasks.c:1202
+#: ../calendar/gui/e-tasks.c:1151
 msgid "Completing tasks..."
 msgstr "Завършване на задачи..."
 
-#: ../calendar/gui/e-tasks.c:1252
+#: ../calendar/gui/e-tasks.c:1174
+msgid "Deleting selected objects..."
+msgstr "Изтриване на избраните обекти..."
+
+#: ../calendar/gui/e-tasks.c:1201
 msgid "Expunging"
 msgstr "Изчистване на изтритите писма"
 
@@ -7888,35 +7609,37 @@ msgstr "%d %B"
 msgid "Updating query"
 msgstr "Актуализиране на заявката"
 
-#: ../calendar/gui/gnome-cal.c:2231
-msgid "_Custom View"
-msgstr "_Личен изглед"
+#. bonobo displays this string so it must be in locale
+#: ../calendar/gui/gnome-cal.c:2231 ../widgets/menus/gal-view-instance.c:585
+#: ../widgets/menus/gal-view-menus.c:350
+msgid "Custom View"
+msgstr "Личен изглед"
 
-#: ../calendar/gui/gnome-cal.c:2232
-#, fuzzy
-msgid "_Save Custom View"
+#: ../calendar/gui/gnome-cal.c:2232 ../widgets/menus/gal-view-instance.c:586
+msgid "Save Custom View"
 msgstr "Запазване на личния изглед"
 
-#: ../calendar/gui/gnome-cal.c:2237
-msgid "_Define Views..."
-msgstr "_Определяне на изгледите..."
+#: ../calendar/gui/gnome-cal.c:2237 ../widgets/menus/gal-view-instance.c:590
+#: ../widgets/menus/gal-view-menus.c:372
+msgid "Define Views..."
+msgstr "Определяне на изгледите..."
 
-#: ../calendar/gui/gnome-cal.c:2399
+#: ../calendar/gui/gnome-cal.c:2400
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Зареждане на срещи на %s"
 
-#: ../calendar/gui/gnome-cal.c:2418
+#: ../calendar/gui/gnome-cal.c:2419
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Зареждане на задачи на %s"
 
-#: ../calendar/gui/gnome-cal.c:2522
+#: ../calendar/gui/gnome-cal.c:2520
 #, c-format
 msgid "Opening %s"
 msgstr "Отваряне на %s..."
 
-#: ../calendar/gui/gnome-cal.c:3440
+#: ../calendar/gui/gnome-cal.c:3437
 msgid "Purging"
 msgstr "Прочистване"
 
@@ -7976,126 +7699,60 @@ msgstr "Септември"
 msgid "_Select Today"
 msgstr "_Избиране на „Днес“"
 
-#: ../calendar/gui/itip-utils.c:351 ../calendar/gui/itip-utils.c:400
-#: ../calendar/gui/itip-utils.c:440
+#: ../calendar/gui/itip-utils.c:353 ../calendar/gui/itip-utils.c:402
+#: ../calendar/gui/itip-utils.c:442
 msgid "An organizer must be set."
 msgstr "Трябва да бъде зададен организатор."
 
-#: ../calendar/gui/itip-utils.c:387
+#: ../calendar/gui/itip-utils.c:389
 msgid "At least one attendee is necessary"
 msgstr "Необходим е поне един участник."
 
-#: ../calendar/gui/itip-utils.c:508 ../calendar/gui/itip-utils.c:630
+#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:632
 msgid "Event information"
 msgstr "Информация за събитие"
 
-#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:632
+#: ../calendar/gui/itip-utils.c:512 ../calendar/gui/itip-utils.c:634
 msgid "Task information"
 msgstr "Информация за задача"
 
-#: ../calendar/gui/itip-utils.c:512 ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:514 ../calendar/gui/itip-utils.c:636
 msgid "Journal information"
 msgstr "Информация за дневник"
 
-#: ../calendar/gui/itip-utils.c:514 ../calendar/gui/itip-utils.c:652
+#: ../calendar/gui/itip-utils.c:516 ../calendar/gui/itip-utils.c:654
 msgid "Free/Busy information"
 msgstr "Информация свободен/зает"
 
-#: ../calendar/gui/itip-utils.c:516
+#: ../calendar/gui/itip-utils.c:518
 msgid "Calendar information"
 msgstr "Календарна информация"
 
-#: ../calendar/gui/itip-utils.c:565
+#: ../calendar/gui/itip-utils.c:567
 msgid "Updated"
 msgstr "Осъвременен"
 
-#: ../calendar/gui/itip-utils.c:573
+#: ../calendar/gui/itip-utils.c:575
 msgid "Refresh"
 msgstr "Презареждане"
 
-#: ../calendar/gui/itip-utils.c:577
+#: ../calendar/gui/itip-utils.c:579
 msgid "Counter-proposal"
 msgstr "Контра-предложение"
 
-#: ../calendar/gui/itip-utils.c:648
+#: ../calendar/gui/itip-utils.c:650
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Информация свободен/зает (%s на %s)"
 
-#: ../calendar/gui/itip-utils.c:658
+#: ../calendar/gui/itip-utils.c:660
 msgid "iCalendar information"
 msgstr "iCalendar информация"
 
-#: ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:815
 msgid "You must be an attendee of the event."
 msgstr "Трябва да сте участник в събитието."
 
-#: ../calendar/gui/memos-component.c:524
-#, c-format
-msgid "%d memo"
-msgid_plural "%d memos"
-msgstr[0] "%d бележка"
-msgstr[1] "%d бележки"
-
-#: ../calendar/gui/memos-component.c:526 ../calendar/gui/tasks-component.c:517
-#: ../mail/mail-component.c:548
-#, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] ", %d избран"
-msgstr[1] ", %d избрани"
-
-#: ../calendar/gui/memos-component.c:573
-#, fuzzy
-msgid "Failed upgrading memos."
-msgstr "Неуспех при актуализирането на задачите."
-
-#: ../calendar/gui/memos-component.c:869
-#, fuzzy, c-format
-msgid "Unable to open the memo list '%s' for creating events and meetings"
-msgstr ""
-"Неуспех при отварянето на списъка със задачи „%s“ за създаване на събития и "
-"събрания."
-
-#: ../calendar/gui/memos-component.c:882
-#, fuzzy
-msgid "There is no calendar available for creating memos"
-msgstr "Няма наличен календар, за да създавате задачи"
-
-#: ../calendar/gui/memos-component.c:973
-#, fuzzy
-msgid "Memo Source Selector"
-msgstr "Избор на източниците за задачи"
-
-#: ../calendar/gui/memos-component.c:1156
-msgid "New memo"
-msgstr "Нова бележка"
-
-#: ../calendar/gui/memos-component.c:1157
-msgid "_Memo"
-msgstr "_Бележка"
-
-#: ../calendar/gui/memos-component.c:1158
-msgid "Create a new memo"
-msgstr "Създаване на нова бележка"
-
-#: ../calendar/gui/memos-component.c:1164
-#, fuzzy
-msgid "New memo list"
-msgstr "Нов списък със задачи"
-
-#: ../calendar/gui/memos-component.c:1165
-msgid "Memo l_ist"
-msgstr "С_писък с бележки"
-
-#: ../calendar/gui/memos-component.c:1166
-msgid "Create a new memo list"
-msgstr "Създаване на нов списък с бележки"
-
-#: ../calendar/gui/memos-control.c:334
-msgid "Print Memos"
-msgstr "Печат на бележки"
-
 #: ../calendar/gui/migration.c:151
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
@@ -8322,65 +7979,57 @@ msgstr "Избран месец (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Избрана година (%Y)"
 
-#: ../calendar/gui/print.c:2307
-msgid "Appointment"
-msgstr "Среща"
-
-#: ../calendar/gui/print.c:2309
-msgid "Task"
-msgstr "Задача"
-
-#: ../calendar/gui/print.c:2331
+#: ../calendar/gui/print.c:2329
 #, c-format
 msgid "Summary: %s"
 msgstr "Обобщено: %s"
 
-#: ../calendar/gui/print.c:2339
+#: ../calendar/gui/print.c:2337
 #, c-format
 msgid "Location: %s"
 msgstr "Местоположение: %s"
 
-#: ../calendar/gui/print.c:2382
+#: ../calendar/gui/print.c:2380
 #, c-format
 msgid "Status: %s"
 msgstr "Състояние: %s"
 
-#: ../calendar/gui/print.c:2399
+#: ../calendar/gui/print.c:2397
 #, c-format
 msgid "Priority: %s"
 msgstr "Приоритет: %s"
 
-#: ../calendar/gui/print.c:2411
+#: ../calendar/gui/print.c:2409
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Приключено в проценти: %i"
 
-#: ../calendar/gui/print.c:2423
+#: ../calendar/gui/print.c:2421
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2437
+#: ../calendar/gui/print.c:2435
 #, c-format
 msgid "Categories: %s"
 msgstr "Категории: %s"
 
-#: ../calendar/gui/print.c:2448
+#: ../calendar/gui/print.c:2446
 msgid "Contacts: "
 msgstr "Контакти:"
 
-#: ../calendar/gui/print.c:2588 ../calendar/gui/print.c:2676
-#: ../calendar/gui/print.c:2802 ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2586 ../calendar/gui/print.c:2674
+#: ../calendar/gui/print.c:2800 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Преглед преди разпечатване"
 
-#: ../calendar/gui/print.c:2623
+#: ../calendar/gui/print.c:2621
 msgid "Print Item"
 msgstr "Печат на обект"
 
 #: ../calendar/gui/tasks-component.c:439
-msgid "_New Task List"
-msgstr "_Нов списък със задачи"
+msgid "New Task List"
+msgstr "Нов списък със задачи"
 
 #: ../calendar/gui/tasks-component.c:515
 #, c-format
@@ -8389,58 +8038,69 @@ msgid_plural "%d tasks"
 msgstr[0] "%d задача"
 msgstr[1] "%d задачи"
 
+#: ../calendar/gui/tasks-component.c:517 ../mail/mail-component.c:548
+#, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] ", %d избран"
+msgstr[1] ", %d избрани"
+
 #: ../calendar/gui/tasks-component.c:564
 msgid "Failed upgrading tasks."
 msgstr "Неуспех при актуализирането на задачите."
 
-#: ../calendar/gui/tasks-component.c:875
+#: ../calendar/gui/tasks-component.c:872
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Неуспех при отварянето на списъка със задачи „%s“ за създаване на събития и "
 "събрания."
 
-#: ../calendar/gui/tasks-component.c:888
+#: ../calendar/gui/tasks-component.c:887
 msgid "There is no calendar available for creating tasks"
 msgstr "Няма наличен календар, за да създавате задачи"
 
-#: ../calendar/gui/tasks-component.c:988
+#: ../calendar/gui/tasks-component.c:987
 msgid "Task Source Selector"
 msgstr "Избор на източниците за задачи"
 
-#: ../calendar/gui/tasks-component.c:1171
+#: ../calendar/gui/tasks-component.c:1170
 msgid "New task"
 msgstr "Нова задача"
 
-#: ../calendar/gui/tasks-component.c:1173
+#: ../calendar/gui/tasks-component.c:1171
+msgid "_Task"
+msgstr "_Задача"
+
+#: ../calendar/gui/tasks-component.c:1172
 msgid "Create a new task"
 msgstr "Създаване на нова задача"
 
-#: ../calendar/gui/tasks-component.c:1179
+#: ../calendar/gui/tasks-component.c:1178
 msgid "New assigned task"
 msgstr "Новоназначена задача"
 
-#: ../calendar/gui/tasks-component.c:1180
+#: ../calendar/gui/tasks-component.c:1179
 msgid "Assigne_d Task"
 msgstr "Назначаване на за_дача"
 
-#: ../calendar/gui/tasks-component.c:1181
+#: ../calendar/gui/tasks-component.c:1180
 msgid "Create a new assigned task"
 msgstr "Създаване на новоназначена задача"
 
-#: ../calendar/gui/tasks-component.c:1187
+#: ../calendar/gui/tasks-component.c:1186
 msgid "New task list"
 msgstr "Нов списък със задачи"
 
-#: ../calendar/gui/tasks-component.c:1188
+#: ../calendar/gui/tasks-component.c:1187
 msgid "Task l_ist"
 msgstr "Спис_ък със задачи"
 
-#: ../calendar/gui/tasks-component.c:1189
+#: ../calendar/gui/tasks-component.c:1188
 msgid "Create a new task list"
 msgstr "Създаване на нов списък със задачи"
 
-#: ../calendar/gui/tasks-control.c:429
+#: ../calendar/gui/tasks-control.c:419
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8452,11 +8112,11 @@ msgstr ""
 "\n"
 "Наистина ли искате да изтриете тези задачи?"
 
-#: ../calendar/gui/tasks-control.c:432
+#: ../calendar/gui/tasks-control.c:422
 msgid "Do not ask me again."
 msgstr "Да не се задава този въпрос отново."
 
-#: ../calendar/gui/tasks-control.c:466
+#: ../calendar/gui/tasks-control.c:456
 msgid "Print Tasks"
 msgstr "Задачи за разпечатване"
 
@@ -10116,14 +9776,14 @@ msgstr "Копиране в папка:"
 msgid "A_ttach"
 msgstr "_Прикрепяне"
 
-#: ../composer/e-msg-composer.c:832
+#: ../composer/e-msg-composer.c:738
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Заминаващото писмо не може да бъде подписано: за този абонамент няма зададен "
 "сертификат за подписване"
 
-#: ../composer/e-msg-composer.c:839
+#: ../composer/e-msg-composer.c:745
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10131,47 +9791,47 @@ msgstr ""
 "Изпращащото се писмо не може да бъде криптирано: няма зададен сертификат за "
 "криптиране към този абонамент"
 
-#: ../composer/e-msg-composer.c:1322 ../composer/e-msg-composer.c:1356
+#: ../composer/e-msg-composer.c:1224 ../composer/e-msg-composer.c:1257
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Причината е неизвестна"
 
-#: ../composer/e-msg-composer.c:1394
+#: ../composer/e-msg-composer.c:1294
 msgid "Could not open file"
 msgstr "Не може да се отвори файл"
 
-#: ../composer/e-msg-composer.c:1402
+#: ../composer/e-msg-composer.c:1302
 msgid "Unable to retrieve message from editor"
 msgstr "Не може да се получи съобщение от редактора"
 
-#: ../composer/e-msg-composer.c:1677
+#: ../composer/e-msg-composer.c:1572
 msgid "Untitled Message"
 msgstr "Писмо без тема"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1712
+#: ../composer/e-msg-composer.c:1606
 msgid "Open File"
 msgstr "Отваряне на файл"
 
-#: ../composer/e-msg-composer.c:2126 ../mail/em-account-editor.c:588
+#: ../composer/e-msg-composer.c:2006 ../mail/em-account-editor.c:588
 #: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:700
 msgid "Autogenerated"
 msgstr "Автоматично генериран"
 
-#: ../composer/e-msg-composer.c:2229
+#: ../composer/e-msg-composer.c:2105
 msgid "Si_gnature:"
 msgstr "_Подпис:"
 
-#: ../composer/e-msg-composer.c:2472 ../composer/e-msg-composer.c:3673
-#: ../composer/e-msg-composer.c:3676
+#: ../composer/e-msg-composer.c:2347 ../composer/e-msg-composer.c:3527
+#: ../composer/e-msg-composer.c:3528
 msgid "Compose a message"
 msgstr "Писане на писмо"
 
-#: ../composer/e-msg-composer.c:3791
+#: ../composer/e-msg-composer.c:3643
 msgid "_Attachment Bar"
 msgstr "Лент_а за прикачени файлове"
 
-#: ../composer/e-msg-composer.c:4881
+#: ../composer/e-msg-composer.c:4720
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10204,7 +9864,7 @@ msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "Заради „{0}“, може да се наложи да изберете други настройки на пощата."
 
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:17
 msgid "Because &quot;{1}&quot;."
 msgstr "Защото „{1}“."
 
@@ -10313,6 +9973,10 @@ msgstr "Не можете да прикрепите файла „{0}“ към
 msgid "You need to configure an account before you can compose mail."
 msgstr "Преди да изпращате писма, трябва да настроите поне един абонамент."
 
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Discard Changes"
+msgstr "_Игнориране на промените"
+
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Save Message"
 msgstr "_Запазване на писмото"
@@ -10441,7 +10105,7 @@ msgstr ""
 "Какво трябва да предприеме Evolution, когато се получи писмо, настояващо да "
 "бъде прочетено?"
 
-#: ../e-util/e-dialog-utils.c:270
+#: ../e-util/e-dialog-utils.c:267
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10449,7 +10113,7 @@ msgstr ""
 "Файл със същото име вече съществува.\n"
 "Да бъде ли презаписан?"
 
-#: ../e-util/e-dialog-utils.c:272 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:269 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Презаписване на файла?"
 
@@ -10494,7 +10158,7 @@ msgstr "Искате ли да се презапише?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "Файлът съществува „{0}“."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:126
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:122
 msgid "_Overwrite"
 msgstr "Пре_записване"
 
@@ -10729,11 +10393,11 @@ msgid "Include threads"
 msgstr "Включване на нишките"
 
 #: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:330
+#: ../mail/em-utils.c:291
 msgid "Incoming"
 msgstr "Входящи"
 
-#: ../filter/filter-rule.c:978 ../mail/em-utils.c:331
+#: ../filter/filter-rule.c:978 ../mail/em-utils.c:292
 msgid "Outgoing"
 msgstr "Изходящи"
 
@@ -10757,7 +10421,7 @@ msgstr "Липсваща дата."
 msgid "Missing file name."
 msgstr "Липсващо име на файл."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:67
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:65
 msgid "Missing name."
 msgstr "Липсващо име."
 
@@ -10984,11 +10648,11 @@ msgstr "Получаване на настройки"
 msgid "Checking for New Mail"
 msgstr "Проверка за нова поща"
 
-#: ../mail/em-account-editor.c:2662 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2661 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Редактор на абонаменти"
 
-#: ../mail/em-account-editor.c:2662 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2661 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Помощник на Evolution за абонаментите"
 
@@ -11009,35 +10673,35 @@ msgstr "Протокол"
 msgid "Mail Accounts Table"
 msgstr "Таблица с пощенски абонаменти"
 
-#: ../mail/em-composer-prefs.c:309 ../mail/em-composer-prefs.c:435
+#: ../mail/em-composer-prefs.c:307 ../mail/em-composer-prefs.c:430
 #: ../mail/mail-config.c:958
 msgid "Unnamed"
 msgstr "Без име"
 
-#: ../mail/em-composer-prefs.c:925
+#: ../mail/em-composer-prefs.c:897
 msgid "Language(s)"
 msgstr "Език/ци"
 
-#: ../mail/em-composer-prefs.c:968
+#: ../mail/em-composer-prefs.c:940
 msgid "Add signature script"
 msgstr "Добавяне на скрипт за подпис"
 
-#: ../mail/em-composer-prefs.c:988
+#: ../mail/em-composer-prefs.c:960
 msgid "Signature(s)"
 msgstr "Подпис(и)"
 
-#: ../mail/em-composer-utils.c:855 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:853 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Препратено съобщение --------"
 
-#: ../mail/em-composer-utils.c:1650
+#: ../mail/em-composer-utils.c:1648
 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:1697
+#: ../mail/em-composer-utils.c:1695
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11389,12 +11053,12 @@ msgstr "Преместване на папка %s"
 msgid "Copying folder %s"
 msgstr "Копиране на папка %s"
 
-#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1623
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1613
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Преместване на писма в папка %s"
 
-#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1625
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1615
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Копиране на писма в папка %s"
@@ -11416,39 +11080,34 @@ msgstr "Преместване в _папка"
 msgid "Scanning folders in \"%s\""
 msgstr "Сканиране на папки в „%s“"
 
-#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:44
+#: ../mail/em-folder-tree.c:2036 ../ui/evolution-addressbook.xml.h:44
 #: ../ui/evolution-mail-global.xml.h:22
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:45
 msgid "_View"
 msgstr "_Изглед"
 
-#: ../mail/em-folder-tree.c:2043
+#: ../mail/em-folder-tree.c:2037
 msgid "Open in _New Window"
 msgstr "Отваряне в _нов прозорец"
 
-#: ../mail/em-folder-tree.c:2047
+#: ../mail/em-folder-tree.c:2041
 msgid "_Copy..."
 msgstr "_Копиране..."
 
-#: ../mail/em-folder-tree.c:2048
+#: ../mail/em-folder-tree.c:2042
 msgid "_Move..."
 msgstr "Пре_местване..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2052
+#: ../mail/em-folder-tree.c:2046
 msgid "_New Folder..."
 msgstr "_Нова папка..."
 
-#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:30
+#: ../mail/em-folder-tree.c:2049 ../ui/evolution-mail-list.xml.h:30
 msgid "_Rename..."
 msgstr "П_реименуване..."
 
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:123
-msgid "_Empty Trash"
-msgstr "Изчистване на _кошчето"
-
 #: ../mail/em-folder-utils.c:104
 #, c-format
 msgid "Copying `%s' to `%s'"
@@ -11495,7 +11154,7 @@ msgstr "Създаване на папка"
 msgid "Specify where to create the folder:"
 msgstr "Указване къде да бъде създадена папката:"
 
-#: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:558 ../mail/em-popup.c:569
+#: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:546 ../mail/em-popup.c:557
 msgid "Reply to _All"
 msgstr "Отговор до _всички"
 
@@ -11503,7 +11162,7 @@ msgstr "Отговор до _всички"
 msgid "_Reply to Sender"
 msgstr "Отгово_р до подателя"
 
-#: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:560 ../mail/em-popup.c:571
+#: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:548 ../mail/em-popup.c:559
 #: ../ui/evolution-mail-message.xml.h:107
 msgid "_Forward"
 msgstr "_Препращане"
@@ -11516,11 +11175,11 @@ msgstr "Р_едактиране като ново писмо..."
 msgid "U_ndelete"
 msgstr "В_ъзстановяване на изтрито"
 
-#: ../mail/em-folder-view.c:1051 ../ui/evolution-addressbook.xml.h:37
+#: ../mail/em-folder-view.c:1051 ../ui/evolution-addressbook.xml.h:36
 msgid "_Move to Folder..."
 msgstr "Пре_местване в папка..."
 
-#: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:33
+#: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Копиране в папка..."
 
@@ -11597,62 +11256,62 @@ msgid "Filter on _Mailing List"
 msgstr "Филтър по _пощенски списък"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1922 ../mail/em-folder-view.c:1966
+#: ../mail/em-folder-view.c:1921 ../mail/em-folder-view.c:1965
 msgid "Default"
 msgstr "Стандартно"
 
-#: ../mail/em-folder-view.c:2065
+#: ../mail/em-folder-view.c:2064
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Разпечатване на писмото"
 
-#: ../mail/em-folder-view.c:2221
+#: ../mail/em-folder-view.c:2220
 msgid "Unable to retrieve message"
 msgstr "Не може да се получи съобщението"
 
-#: ../mail/em-folder-view.c:2414
+#: ../mail/em-folder-view.c:2413
 msgid "_Copy Link Location"
 msgstr "Копиране на мес_тоположението на връзката"
 
-#: ../mail/em-folder-view.c:2416
+#: ../mail/em-folder-view.c:2415
 msgid "Create _Search Folder"
 msgstr "Създаване на п_апка за търсене"
 
-#: ../mail/em-folder-view.c:2417
+#: ../mail/em-folder-view.c:2416
 msgid "_From this Address"
 msgstr "_От този адрес"
 
-#: ../mail/em-folder-view.c:2418
+#: ../mail/em-folder-view.c:2417
 msgid "_To this Address"
 msgstr "_До този адрес"
 
-#: ../mail/em-folder-view.c:2699
+#: ../mail/em-folder-view.c:2698
 #, c-format
 msgid "Click to mail %s"
 msgstr "Натиснете, за да изпратите писмо на %s"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:461
+#: ../mail/em-format-html-display.c:445
 #, c-format
 msgid "Matches: %d"
 msgstr "Съвпадения: %d"
 
-#: ../mail/em-format-html-display.c:712 ../mail/em-format-html.c:597
+#: ../mail/em-format-html-display.c:696 ../mail/em-format-html.c:597
 msgid "Unsigned"
 msgstr "Неподписано"
 
-#: ../mail/em-format-html-display.c:712
+#: ../mail/em-format-html-display.c:696
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "Това писмо не е подписано. Няма гаранции, че това писмо е автентично."
 
-#: ../mail/em-format-html-display.c:713 ../mail/em-format-html.c:598
+#: ../mail/em-format-html-display.c:697 ../mail/em-format-html.c:598
 msgid "Valid signature"
 msgstr "Валиден подпис"
 
-#: ../mail/em-format-html-display.c:713
+#: ../mail/em-format-html-display.c:697
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11660,11 +11319,11 @@ msgstr ""
 "Това писмо е подписано и е валидно, което означава, че най-вероятно е "
 "автентично."
 
-#: ../mail/em-format-html-display.c:714 ../mail/em-format-html.c:599
+#: ../mail/em-format-html-display.c:698 ../mail/em-format-html.c:599
 msgid "Invalid signature"
 msgstr "Невалиден подпис"
 
-#: ../mail/em-format-html-display.c:714
+#: ../mail/em-format-html-display.c:698
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11672,11 +11331,11 @@ msgstr ""
 "Подписът на това писмо не може да бъде проверен. Възможно е то вече да е "
 "било променено, преди да бъде получено."
 
-#: ../mail/em-format-html-display.c:715
+#: ../mail/em-format-html-display.c:699
 msgid "Valid signature, cannot verify sender"
 msgstr "Валиден подпис, не може да се потвърди подателя"
 
-#: ../mail/em-format-html-display.c:715
+#: ../mail/em-format-html-display.c:699
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11684,11 +11343,11 @@ msgstr ""
 "Това писмо е подписано с валиден подпис, но подателят не може да бъде "
 "проверен."
 
-#: ../mail/em-format-html-display.c:721 ../mail/em-format-html.c:606
+#: ../mail/em-format-html-display.c:705 ../mail/em-format-html.c:606
 msgid "Unencrypted"
 msgstr "Некриптирано"
 
-#: ../mail/em-format-html-display.c:721
+#: ../mail/em-format-html-display.c:705
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -11696,11 +11355,11 @@ msgstr ""
 "Това писмо не е криптирано. Докато пътува през Интернет, трети лица могат да "
 "видят неговото съдържание."
 
-#: ../mail/em-format-html-display.c:722 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:706 ../mail/em-format-html.c:607
 msgid "Encrypted, weak"
 msgstr "Слабо криптиране"
 
-#: ../mail/em-format-html-display.c:722
+#: ../mail/em-format-html-display.c:706
 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 "
@@ -11710,11 +11369,11 @@ msgstr ""
 "трудно, но не невъзможно да декриптират неговото съдържание за сравнително "
 "кратък период от време."
 
-#: ../mail/em-format-html-display.c:723 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:707 ../mail/em-format-html.c:608
 msgid "Encrypted"
 msgstr "Криптирано"
 
-#: ../mail/em-format-html-display.c:723
+#: ../mail/em-format-html-display.c:707
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11722,11 +11381,11 @@ msgstr ""
 "Това писмо е криптирано. На трети лица ще бъде много трудно да видят "
 "неговото съдържание."
 
-#: ../mail/em-format-html-display.c:724 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:708 ../mail/em-format-html.c:609
 msgid "Encrypted, strong"
 msgstr "Силно криптирано"
 
-#: ../mail/em-format-html-display.c:724
+#: ../mail/em-format-html-display.c:708
 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 "
@@ -11735,67 +11394,71 @@ msgstr ""
 "Това писмо е криптирано чрез много силен алгоритъм. За трети лица ще бъде "
 "много трудно да го декриптират."
 
-#: ../mail/em-format-html-display.c:825 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:809 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Преглед на сертификат"
 
-#: ../mail/em-format-html-display.c:840
+#: ../mail/em-format-html-display.c:824
 msgid "This certificate is not viewable"
 msgstr "Този сертификат не може да се преглежда"
 
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1106
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Завършено на %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1130
+#: ../mail/em-format-html-display.c:1114
 msgid "Overdue:"
 msgstr "Просрочено:"
 
-#: ../mail/em-format-html-display.c:1133
+#: ../mail/em-format-html-display.c:1117
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "от %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1193
+#: ../mail/em-format-html-display.c:1177
 msgid "_View Inline"
 msgstr "_Вграден преглед"
 
-#: ../mail/em-format-html-display.c:1194
+#: ../mail/em-format-html-display.c:1178
 msgid "_Hide"
 msgstr "_Скриване"
 
-#: ../mail/em-format-html-display.c:1195
+#: ../mail/em-format-html-display.c:1179
 msgid "_Fit to Width"
 msgstr "Съразмерно ширината"
 
-#: ../mail/em-format-html-display.c:1196
+#: ../mail/em-format-html-display.c:1180
 msgid "Show _Original Size"
 msgstr "Оригинален раз_мер"
 
-#: ../mail/em-format-html-display.c:1566
+#: ../mail/em-format-html-display.c:1550
 msgid "Attachment Button"
 msgstr "Бутон за прикрепените файлове"
 
-#: ../mail/em-format-html-display.c:1773
+#: ../mail/em-format-html-display.c:1757
 msgid "Select folder to save all attachments..."
 msgstr "Изберете папка, където да се запазят всички прикачени файлове"
 
-#: ../mail/em-format-html-display.c:1820
+#: ../mail/em-format-html-display.c:1796
+msgid "Select folder to save selected attachments..."
+msgstr "Изберете папка, където да се запазят избраните прикачени файлове..."
+
+#: ../mail/em-format-html-display.c:1804
 msgid "Save Selected..."
 msgstr "Запазване на избраното..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1887
+#: ../mail/em-format-html-display.c:1871
 #, c-format
 msgid "%d attachment"
 msgid_plural "%d attachments"
 msgstr[0] "%d прикачен файл"
 msgstr[1] "%d прикачени файла"
 
-#: ../mail/em-format-html-display.c:1951
+#: ../mail/em-format-html-display.c:1935
 msgid "No Attachment"
 msgstr "Няма прикачени файлове"
 
-#: ../mail/em-format-html-display.c:1954
+#: ../mail/em-format-html-display.c:1938
 msgid "Save All"
 msgstr "Запазване на всички"
 
@@ -12006,27 +11669,45 @@ msgstr ""
 "Неуспех при четенето на настройките от предишната инсталация на Evolution, "
 "„evolution/config.xmldb“ не съществува или е повреден."
 
-#: ../mail/em-popup.c:556 ../mail/em-popup.c:567
+#: ../mail/em-popup.c:399
+msgid "Save As..."
+msgstr "Запазване като..."
+
+#: ../mail/em-popup.c:424
+#, c-format
+msgid "untitled_image.%s"
+msgstr "неозаглавено_изображение.%s"
+
+#: ../mail/em-popup.c:542 ../mail/em-popup.c:553
+msgid "Set as _Background"
+msgstr "Използване за _фон"
+
+#: ../mail/em-popup.c:544 ../mail/em-popup.c:555
 msgid "_Reply to sender"
 msgstr "_Отговор на подателя"
 
-#: ../mail/em-popup.c:557 ../mail/em-popup.c:568
+#: ../mail/em-popup.c:545 ../mail/em-popup.c:556
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Отговор до _списъка"
 
-#: ../mail/em-popup.c:619
+#: ../mail/em-popup.c:607
 msgid "_Open Link in Browser"
 msgstr "Отваряне на връзката в _браузър"
 
-#: ../mail/em-popup.c:620
+#: ../mail/em-popup.c:608
 msgid "_Send New Message To..."
 msgstr "_Изпращане на ново писмо до..."
 
-#: ../mail/em-popup.c:621
+#: ../mail/em-popup.c:609
 msgid "_Add to Addressbook"
 msgstr "_Добавяне към адресника"
 
+#: ../mail/em-popup.c:762
+#, c-format
+msgid "Open in %s..."
+msgstr "Отваряне в %s..."
+
 #: ../mail/em-subscribe-editor.c:614
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Хранилището не поддържа записвания, или те не са включени."
@@ -12048,28 +11729,28 @@ msgstr "Изберете сървър."
 msgid "No server has been selected"
 msgstr "Не е избран сървър"
 
-#: ../mail/em-utils.c:106
+#: ../mail/em-utils.c:105
 msgid "Don't show this message again."
 msgstr "Да не се показва това съобщение отново."
 
-#: ../mail/em-utils.c:338
+#: ../mail/em-utils.c:299
 msgid "Filters"
 msgstr "Филтри"
 
-#: ../mail/em-utils.c:481 ../mail/em-utils.c:518
+#: ../mail/em-utils.c:442 ../mail/em-utils.c:479
 msgid "message"
 msgstr "писмо"
 
-#: ../mail/em-utils.c:653
+#: ../mail/em-utils.c:614
 msgid "Save Message..."
 msgstr "Запазване на писмо..."
 
-#: ../mail/em-utils.c:702
+#: ../mail/em-utils.c:663
 msgid "Add address"
 msgstr "Добавяне на адрес"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1181
+#: ../mail/em-utils.c:1142
 #, c-format
 msgid "Messages from %s"
 msgstr "Писма от %s"
@@ -12412,6 +12093,14 @@ msgstr "Показване на изтритите писма като заче�
 msgid "Show deleted messages in the message-list"
 msgstr "Показване на изтритите писма в списъка с писмата"
 
+#: ../mail/evolution-mail.schemas.in.in.h:73
+msgid "Show the \"Preview\" pane"
+msgstr "Показване на панела „Предварителен преглед на писмата“."
+
+#: ../mail/evolution-mail.schemas.in.in.h:74
+msgid "Show the \"Preview\" pane."
+msgstr "Показване на панела „Предварителен преглед на писмата“."
+
 #: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Изпълнение на звуков файл при пристигане на ново писмо."
@@ -13769,7 +13458,6 @@ msgid "Checking for new mail"
 msgstr "Проверка за нови съобщения"
 
 #: ../mail/mail-session.c:207
-#: ../plugins/exchange-operations/exchange-config-listener.c:601
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Въведете парола за %s"
@@ -13782,20 +13470,20 @@ msgstr "Въвеждане на парола"
 msgid "User canceled operation."
 msgstr "Потребителят прекрати операцията."
 
-#: ../mail/mail-signature-editor.c:381
+#: ../mail/mail-signature-editor.c:372
 msgid "Edit signature"
 msgstr "Редактиране на подпис"
 
-#: ../mail/mail-signature-editor.c:423
+#: ../mail/mail-signature-editor.c:412
 msgid "Enter a name for this signature."
 msgstr "Въведете име за този подпис."
 
-#: ../mail/mail-signature-editor.c:426
+#: ../mail/mail-signature-editor.c:415
 #: ../plugins/groupwise-features/properties.glade.h:5
 msgid "Name:"
 msgstr "Име:"
 
-#: ../mail/mail-tools.c:115
+#: ../mail/mail-tools.c:116
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Неуспех при създаването на директория spool „%s“: %s"
@@ -13805,16 +13493,16 @@ msgstr "Неуспех при създаването на директория s
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "Опит за преместване на източник, различен от mbox „%s“"
 
-#: ../mail/mail-tools.c:249
+#: ../mail/mail-tools.c:242
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Препратено писмо - %s"
 
-#: ../mail/mail-tools.c:251
+#: ../mail/mail-tools.c:244
 msgid "Forwarded message"
 msgstr "Препратено писмо"
 
-#: ../mail/mail-tools.c:291
+#: ../mail/mail-tools.c:284
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Невалидна папка: „%s“"
@@ -13868,13 +13556,6 @@ msgstr ""
 "уведомление до {0}?"
 
 #: ../mail/mail.error.xml.h:7
-#, fuzzy
-msgid ""
-"A signature already exists with the name &quot;{0}&quot;. Please specify a "
-"different name."
-msgstr "Вече съществува папка с име „{1}“. Изберете друго име."
-
-#: ../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."
@@ -13882,21 +13563,21 @@ msgstr ""
 "Добавянето на смислена тема на вашите писма ще даде на получателите някаква "
 "идея какво точно ще прочетат в писмо."
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:8
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr ""
 "Сигурни ли сте, че искате да изтриете този абонамент и всичките му сървъри "
 "посредници?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account?"
 msgstr "Сигурни ли сте, че искате да изтриете този абонамент?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:10
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr "Сигурни ли сте, че искате да отворите едновременно {0} писма?"
 
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:11
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -13904,7 +13585,7 @@ msgstr ""
 "Сигурни ли сте, че искате да премахнете за постоянно всички изтрити писма от "
 "всички папки?"
 
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:12
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
@@ -13912,82 +13593,78 @@ msgstr ""
 "Сигурни ли сте, че искате да премахнете за постоянно всички изтрити писма в "
 "папката „{0}“?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:13
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Сигурни ли сте, че искате да изпратите писмо в HTML формат?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:14
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
 "Сигурни ли сте, че искате да изпратите писмото само с получатели в полето "
 "„Скрито копие до“?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Сигурни ли сте, че искате да изпратите писмото без тема?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:16
 msgid "Because &quot;{0}&quot;."
 msgstr "Защото „{0}“."
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{2}&quot;."
 msgstr "Защото „{2}“."
 
-#: ../mail/mail.error.xml.h:20
-msgid "Blank Signature"
-msgstr "Празен подпис"
-
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:19
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "Неуспех при добавянето на папката за търсене „{0}“."
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:20
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Неуспех при копирането на папка „{0}“ в „{1}“."
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:21
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "Неуспех при създаването на папка „{0}“."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot create temporary save directory."
 msgstr "Не може да се създаде временна директория за запазвания."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "Не може да се създаде директория за запазването, защото „{1}“"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "Неуспех при изтриването на папката „{0}“."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "Системната папка „{0}“ не може да бъде изтрита."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr ""
 "Не може да се редактира папката за търсене „{0}“, защото тя не съществува."
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Неуспех при преместването на папка „{0}“ в „{1}“."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "Неуспех при отварянето на източника „{1}“."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "Неуспех при отварянето на източника „{2}“."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "Неуспех при отварянето на целта „{2}“."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:31
 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 "
@@ -13996,31 +13673,31 @@ msgstr ""
 "Не може да се прочете лицензния файл „{0}“ заради инсталационен проблем. "
 "Няма да можете да използвате този доставчик преди да приемете неговия лиценз."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Неуспех при преименуването на „{0}“ в „{1}“."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr "Системната папка „{0}“ не може да бъде преименувана или преместена."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot save changes to account."
 msgstr "Неуспех при запазването на промените в абонаментa."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "Неуспех при запазването в папка „{0}“."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "Неуспех при запазването във файл „{0}“."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "Не може да се зададе скрипт за подписване „{0}“."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:38
 msgid ""
 "Check to make sure your password is spelled correctly.  Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14029,64 +13706,64 @@ msgstr ""
 "големите и малките букви имат значение. Може би клавишът „Caps Lock“ е "
 "натиснат."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:39
 msgid "Could not save signature file."
 msgstr "Неуспех при запазването на файла с подписа."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:40
 msgid "Delete &quot;{0}&quot;?"
 msgstr "Изтриване на „{0}“?"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:41
 msgid "Delete account?"
 msgstr "Изтриване на абонамента?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
 msgid "Discard changed?"
 msgstr "Игнориране на промените?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr "Искате ли операцията да се извърши и в подпапките?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid "Do you wish to save your changes?"
 msgstr "Искате ли да запазите направените промени?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:45
 msgid "Don't delete"
 msgstr "Да не се изтрива"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:46
 msgid "Enter password."
 msgstr "Въвеждане на парола."
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:47
 msgid "Error loading filter definitions."
 msgstr "Грешка при зареждането на дефинициите за филтрите."
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid "Error while performing operation."
 msgstr "Грешка при изпълнение на операцията."
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Error while {0}."
 msgstr "Грешка по време на {0}."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:50
 msgid "File exists but cannot overwrite it."
 msgstr "Файлът съществува, но не може да бъде презаписан."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "File exists but is not a regular file."
 msgstr "Файлът съществува, но не е обикновен файл."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "If you continue, you will not be able to recover these messages."
 msgstr ""
 "Ако продължите, няма да имате втора възможност да възстановите тези писма."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:53
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -14094,7 +13771,7 @@ msgstr ""
 "Ако изтриете папката, цялото й съдържание, както и съдържанието на всички "
 "нейни под-папки, ще бъде изтрито за постоянно."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:54
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14102,12 +13779,12 @@ msgstr ""
 "Ако продължите, информацията за абонамента\n"
 "и цялата информация за сървъри посредници ще бъде изтрита за постоянно."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:56
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 "Ако продължите, информацията за абонамента ще бъде изтрита за постоянно."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:57
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -14115,19 +13792,19 @@ msgstr ""
 "Ако спрете програмата, вашите писма няма да бъдат изпратени, докато не "
 "стартирате отново Evolution."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:58
 msgid "Ignore"
 msgstr "Игнориране"
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:59
 msgid "Invalid authentication"
 msgstr "Невалидно удостоверяване"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:60
 msgid "Mail filters automatically updated."
 msgstr "Филтрите на пощата са актуализирани автоматично."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:61
 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 "
@@ -14139,31 +13816,31 @@ msgstr ""
 "добавена, всички получатели ще се покажат така или иначе. За да избегнете "
 "това, добавете поне един получател в полето „До“ или „Копие до“."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:62
 msgid "Mark all messages as read"
 msgstr "Отбелязване на всички писма като прочетени"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:63
 msgid "Mark all messages as read in the selected folder"
 msgstr "Отбелязване на всички писма в избраната папка като прочетени"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:64
 msgid "Missing folder."
 msgstr "Липсваща папка."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:66
 msgid "No sources selected."
 msgstr "Няма избрани източници."
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:67
 msgid "Opening too many messages at once may take a long time."
 msgstr "Отварянето на много писма едновременно може да отнеме много време."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:68
 msgid "Please check your account settings and try again."
 msgstr "Проверете настройките на вашия абонамент и опитайте отново."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:69
 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."
@@ -14172,7 +13849,7 @@ msgstr ""
 "чрез натискане на бутона „До:“, който се намира до полето за въвеждане на "
 "адреси."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:70
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14184,49 +13861,39 @@ msgstr ""
 "{0}\n"
 "Изпращане въпреки това?"
 
-#: ../mail/mail.error.xml.h:75
-#, fuzzy
-msgid "Please provide an unique name to identify this signature."
-msgstr "Въведете име за този подпис."
-
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:73
 msgid "Please wait."
 msgstr "Изчакайте."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:74
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Проблем по време на мигрирането на папка със стара поща „{0}“."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:75
 msgid "Querying server"
 msgstr "Обръщане към сървър"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:76
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Сървърът се проверява за поддържаните методи на удостоверяване."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:77
 msgid "Read receipt requested."
 msgstr "Изискано е известие за прочитане."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:78
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Наистина ли искате да изтриете папката „{0}“ и всички нейни под-папки?"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:79
 msgid "Search Folders automatically updated."
 msgstr "Папките за търсене са автоматично обновени."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:80
 msgid "Send Receipt"
 msgstr "Изпращане на известие за прочитане"
 
-#: ../mail/mail.error.xml.h:84
-#, fuzzy
-msgid "Signature Already Exists"
-msgstr "Сертификатът вече съществува"
-
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -14234,7 +13901,7 @@ msgstr ""
 "За да работи правилно Ximian Evolution, програмата се нуждае от системни "
 "папки, които не можете да преименувате, премествате или изтривате."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:82
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14250,7 +13917,7 @@ msgstr ""
 "добавена, всички получатели ще се покажат така или иначе. За да избегнете "
 "това, добавете поне един получател в полето „До“ или „Копие до“. "
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:85
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14264,7 +13931,7 @@ msgstr ""
 "    „{1}“\n"
 "и бяха актуализирани."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14278,7 +13945,7 @@ msgstr ""
 "    „{1}“\n"
 "и бяха актуализирани."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "The message was sent via the &quot;sendmail&quot; external application.  "
 "Sendmail reports the following error: status 67: mail not sent.\n"
@@ -14290,11 +13957,11 @@ msgstr ""
 "Писмото е запазено в папката „За изпращане“. Проверете за грешки и опитайте "
 "отново."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:97
 msgid "The script file must exist and be executable."
 msgstr "Този скриптов файл трябва да съществува и да бъде изпълним."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14303,13 +13970,13 @@ msgstr ""
 "Отидете в редактора за папки за търсене и я добавете изрично, ако това се "
 "налага."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:100
 msgid ""
 "This message cannot be sent because you have not specified any Recipients"
 msgstr ""
 "Това писмо не може да бъде изпратено, защото не сте посочили получател(и)"
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:101
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14317,15 +13984,15 @@ msgstr ""
 "Сървърът не поддържа този тип удостоверяване и като цяло може да не поддържа "
 "изобщо какъвто и да е тип."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:102
 msgid "This signature has been changed, but has not been saved."
 msgstr "Този подпис беше променен, но промените не бяха запазени."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:103
 msgid "Unable to connect to the GroupWise server."
 msgstr "Неуспех при свързването със сървър GroupWise."
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "Unable to open the drafts folder for this account.  Use the system drafts "
 "folder instead?"
@@ -14333,39 +14000,39 @@ msgstr ""
 "Неуспех при отварянето на папката за чернови към този абонамент. Да се "
 "използва ли стандартната папка за чернови?"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:105
 msgid "Unable to read license file."
 msgstr "Неуспех при прочитането на файла с лицензното споразумение."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:106
 msgid "Use _Default"
 msgstr "Използване на _стандартни"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:107
 msgid "Use default drafts folder?"
 msgstr "Да бъде ли използвана стандартната папка за чернови?"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:108
 msgid "You have not filled in all of the required information."
 msgstr "Не сте подали цялата необходима информация."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:109
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Имате неизпратени писма, искате ли да спрете програмата въпреки това?"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:110
 msgid "You may not create two accounts with the same name."
 msgstr "Не може да имате два абонамента с едно и също име."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:111
 msgid "You must name this Search Folder."
 msgstr "Трябва да дадете име на тази папка за търсене"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:112
 msgid "You must specify a folder."
 msgstr "Трябва да определите папка."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14375,98 +14042,102 @@ msgstr ""
 "избирайки папки поотделно, и/или всички локални папки, всички отдалечени "
 "папки, или и двете."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:115
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "Влизането в сървъра „{0}“ като „{0}“ е неуспешно."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:116
 msgid "Your message with the subject &quot;{0}&quot; was not delivered."
 msgstr "Писмото с тема „{0}“ не беше доставено."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:117
 msgid "_Append"
 msgstr "_Закачане"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:118
 msgid "_Discard changes"
 msgstr "_Игнориране на промените"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:119
+msgid "_Empty Trash"
+msgstr "Изчистване на _кошчето"
+
+#: ../mail/mail.error.xml.h:120
 msgid "_Expunge"
 msgstr "_Изчистване"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:121
 msgid "_Open Messages"
 msgstr "Отваряне на _писма"
 
-#: ../mail/message-list.c:1006
+#: ../mail/message-list.c:996
 msgid "Unseen"
 msgstr "Непрегледано"
 
-#: ../mail/message-list.c:1007
+#: ../mail/message-list.c:997
 msgid "Seen"
 msgstr "Прегледано"
 
-#: ../mail/message-list.c:1008
+#: ../mail/message-list.c:998
 msgid "Answered"
 msgstr "Отговорено"
 
-#: ../mail/message-list.c:1009
+#: ../mail/message-list.c:999
 msgid "Multiple Unseen Messages"
 msgstr "Множество непрегледани писма"
 
-#: ../mail/message-list.c:1010
+#: ../mail/message-list.c:1000
 msgid "Multiple Messages"
 msgstr "Множество писма"
 
-#: ../mail/message-list.c:1014
+#: ../mail/message-list.c:1004
 msgid "Lowest"
 msgstr "Най-ниска"
 
-#: ../mail/message-list.c:1015
+#: ../mail/message-list.c:1005
 msgid "Lower"
 msgstr "Ниска"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1009
 msgid "Higher"
 msgstr "Висока"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1010
 msgid "Highest"
 msgstr "Най-висока"
 
-#: ../mail/message-list.c:1348 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1338 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1355 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1345 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Днес %l:%M %p"
 
-#: ../mail/message-list.c:1364 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1354 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Вчера %l:%M %p"
 
-#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1366 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1384 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1374 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1386 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2052
+#: ../mail/message-list.c:2042
 msgid "Message List"
 msgstr "Списък на писмата"
 
-#: ../mail/message-list.c:3397
+#: ../mail/message-list.c:3387
 msgid "Generating message list"
 msgstr "Генериране на списък на писмата"
 
@@ -14626,27 +14297,27 @@ msgstr ""
 msgid "Restore Settings..."
 msgstr "Възстановяване на настройките..."
 
-#: ../plugins/bbdb/bbdb.c:410
+#: ../plugins/bbdb/bbdb.c:404
 msgid "Automatic Contacts"
 msgstr "Автоматични конткати"
 
-#: ../plugins/bbdb/bbdb.c:419
+#: ../plugins/bbdb/bbdb.c:413
 msgid "<span weight=\"bold\">Automatic Contacts</span>"
 msgstr "<span weight=\"bold\">Автоматични контакти</span>"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:432
+#: ../plugins/bbdb/bbdb.c:426
 msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
 msgstr ""
 "_Автоматично добавяне на контакти в адресника, при отговор на писмо от тях"
 
-#: ../plugins/bbdb/bbdb.c:450
+#: ../plugins/bbdb/bbdb.c:444
 msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
 msgstr "<span weight=\"bold\">Бързи съобщения до контакти</span>"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:463
+#: ../plugins/bbdb/bbdb.c:457
 msgid ""
 "Periodically synchronize contact information and images from my _instant "
 "messenger"
@@ -14655,7 +14326,7 @@ msgstr ""
 "и изображенията с програмата за _бързи съобщения"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:470
+#: ../plugins/bbdb/bbdb.c:464
 msgid "Synchronize with _buddy list now"
 msgstr "Синхронизиране със _списъка с приятели"
 
@@ -14904,13 +14575,6 @@ msgstr "Тип удостоверяване"
 msgid "Ch_eck for Supported Types"
 msgstr "_Проверка за поддържани типове"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:192
-#: ../plugins/exchange-operations/exchange-contacts.c:162
-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.
 #.
@@ -15058,29 +14722,24 @@ msgstr "Име на папка"
 msgid "Folder Size"
 msgstr "Размер на папката"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:180
-#, fuzzy
-msgid "Subscribe to Other User's"
-msgstr "Абониране за задачите на друг потребител"
-
 #: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
 msgid "Exchange Folder Tree"
 msgstr "Дървовидна структура на Exchange"
 
-#: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:227
-#: ../plugins/exchange-operations/exchange-folder.c:237
+#: ../plugins/exchange-operations/exchange-folder.c:62
+#: ../plugins/exchange-operations/exchange-folder.c:223
+#: ../plugins/exchange-operations/exchange-folder.c:233
 msgid "Unsubscribe Folder..."
 msgstr "Преустановяване на абонамент за папката..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:464
-#: ../plugins/exchange-operations/exchange-folder.c:524
+#: ../plugins/exchange-operations/exchange-folder.c:460
+#: ../plugins/exchange-operations/exchange-folder.c:520
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Отписване от папка „%s“?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:476
-#: ../plugins/exchange-operations/exchange-folder.c:536
+#: ../plugins/exchange-operations/exchange-folder.c:472
+#: ../plugins/exchange-operations/exchange-folder.c:532
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Спиране на абонамента за „%s“"
@@ -15668,7 +15327,7 @@ msgstr "Влизане в сървъра посредник"
 
 #: ../plugins/groupwise-features/proxy-login.c:219
 #: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:501
+#: ../plugins/groupwise-features/proxy.c:499
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -15678,13 +15337,7 @@ msgstr "%sВъведете парола за %s (потребител %s)"
 msgid "_Proxy Login..."
 msgstr "_Влизане в сървъра посредник..."
 
-#: ../plugins/groupwise-features/proxy.c:690
-#, fuzzy
-msgid "The Proxy tab will be available only when the account is online."
-msgstr ""
-"Раздела „Сървър посредник“ ще е наличен само, когато абонамента е активиран."
-
-#: ../plugins/groupwise-features/proxy.c:695
+#: ../plugins/groupwise-features/proxy.c:680
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 "Раздела „Сървър посредник“ ще е наличен само, когато абонамента е активиран."
@@ -15709,63 +15362,6 @@ msgstr "Споделяне"
 msgid "Track Message Status..."
 msgstr "Следене на състоянието на писмото..."
 
-#: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:137
-msgid "iCalendar format (.ics)"
-msgstr "файлов формат на iCalendar (.ics)"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
-msgstr "Синхронизиране на избраната задача/календар/адресник с Apple iPod"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
-msgid "Synchronize to iPod"
-msgstr "Синхронизиране с iPod"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
-msgid "iPod Synchronization"
-msgstr "Синхронизация с iPod"
-
-#: ../plugins/ipod-sync/sync.c:158
-#, fuzzy
-msgid "No output directory!"
-msgstr "Възстановяване на директорията Evolution"
-
-#: ../plugins/ipod-sync/sync.c:159
-msgid ""
-"The output directory was not found on iPod! Please ensure that iPod has been "
-"correctly set up and try again."
-msgstr ""
-
-#: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
-#, fuzzy
-msgid "Could not export data!"
-msgstr "Не може да се запишат данните: %s"
-
-#: ../plugins/ipod-sync/sync.c:203
-#, fuzzy
-msgid "Exporting data failed."
-msgstr "Внасяне на данни."
-
-#: ../plugins/ipod-sync/sync.c:231
-#, fuzzy
-msgid "Could not open addressbook!"
-msgstr "Адресникът не може да бъде зареден"
-
-#: ../plugins/ipod-sync/sync.c:232
-#, fuzzy
-msgid "Could not open the Evolution addressbook to export data."
-msgstr "Адресникът на Evolution спря неочаквано."
-
-#: ../plugins/ipod-sync/sync.c:291
-#, fuzzy
-msgid "Could not open calendar/todo!"
-msgstr "Местоположението не може да бъде отворено"
-
-#: ../plugins/ipod-sync/sync.c:292
-msgid "Could not open the Evolution calendar/todo list to export data."
-msgstr ""
-
 #: ../plugins/itip-formatter/itip-formatter.c:724
 msgid "Unable to parse item"
 msgstr "Неуспех при анализирането на елемента"
@@ -15863,6 +15459,10 @@ msgstr ""
 "За да бъдат обработени тези записи, файлът трябва да бъде запазен и "
 "календарът внесен"
 
+#: ../plugins/itip-formatter/itip-formatter.c:1968
+msgid "Meetings and Tasks"
+msgstr "Събрания и задачи"
+
 #. Delete message after acting
 #. FIXME Need a schema for this
 #: ../plugins/itip-formatter/itip-formatter.c:1991
@@ -16453,7 +16053,7 @@ msgstr "_Отбелязване на календара за работа в р�
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
-msgstr "Приставка, която имплементира Mono приставка."
+msgstr "Приставка, която имплементира Mono приставки."
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
 msgid "Mono Loader"
@@ -16562,9 +16162,8 @@ msgid "Gives an option to print mail from composer"
 msgstr "Дава възможност за печатане на писма от компонента за писане"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:18 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-memos.xml.h:12
-#: ../ui/evolution-tasks.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "_Печатен преглед"
 
@@ -16696,6 +16295,10 @@ msgstr "Енкапсулиране на стойностите с:"
 msgid "Comma separated value format (.csv)"
 msgstr "Текстов файл с разделители (.csv)"
 
+#: ../plugins/save-calendar/ical-format.c:137
+msgid "iCalendar format (.ics)"
+msgstr "файлов формат на iCalendar (.ics)"
+
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
 msgstr "Запазване на избраните"
@@ -17037,27 +16640,27 @@ msgstr "В името на папката не може да се съдържа
 msgid "'.' and '..' are reserved folder names."
 msgstr "„.“ и „..“ са запазени имена на папка."
 
-#: ../shell/e-shell-window-commands.c:71
+#: ../shell/e-shell-window-commands.c:70
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Инструментите GNOME Pilot изглежда не са инсталирани на тази система."
 
-#: ../shell/e-shell-window-commands.c:79
+#: ../shell/e-shell-window-commands.c:78
 #, c-format
 msgid "Error executing %s."
 msgstr "Грешка при изпълнение на %s."
 
-#: ../shell/e-shell-window-commands.c:128
+#: ../shell/e-shell-window-commands.c:127
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy не е инсталиран."
 
-#: ../shell/e-shell-window-commands.c:136
+#: ../shell/e-shell-window-commands.c:135
 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 box
-#: ../shell/e-shell-window-commands.c:533
+#: ../shell/e-shell-window-commands.c:532
 msgid "translator-credits"
 msgstr ""
 "Владимир „Kaladan“ Петков <vpetkov@i-space,org>\n"
@@ -17068,19 +16671,19 @@ msgstr ""
 "Научете повече за нас на http://gnome.cult.bg\n"
 "Докладвайте за грешки на http://gnome.cult.bg/bugs"
 
-#: ../shell/e-shell-window-commands.c:547
+#: ../shell/e-shell-window-commands.c:546
 msgid "Groupware Suite"
 msgstr "Програма за работа в група"
 
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:774
 msgid "_Work Online"
 msgstr "Работа в режим „_Включен“"
 
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:49
+#: ../shell/e-shell-window-commands.c:787 ../ui/evolution.xml.h:47
 msgid "_Work Offline"
 msgstr "Работа в режим „_Изключен“"
 
-#: ../shell/e-shell-window-commands.c:801
+#: ../shell/e-shell-window-commands.c:800
 msgid "Work Offline"
 msgstr "Работа в режим „Изключен“"
 
@@ -17100,7 +16703,7 @@ msgstr ""
 "Evolution в момента е в режим „Изключен“. Натиснете този бутон, за да се "
 "върнете в режим „Включен“."
 
-#: ../shell/e-shell-window.c:735
+#: ../shell/e-shell-window.c:724
 #, c-format
 msgid "Switch to %s"
 msgstr "Превключване към %s"
@@ -17186,7 +16789,7 @@ msgstr ""
 
 #. Preview/Alpha/Beta version warning message
 #: ../shell/main.c:230
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -17197,7 +16800,7 @@ msgid ""
 "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"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
 "This product comes with no warranty and is not intended for\n"
 "individuals prone to violent fits of anger.\n"
 "\n"
@@ -17949,99 +17552,99 @@ msgstr "Не може да се изпълни „%s“: %s\n"
 msgid "Shutting down %s (%s)\n"
 msgstr "Спиране на %s (%s)\n"
 
-#: ../ui/evolution-addressbook.xml.h:2
-msgid "Contact _Preview"
-msgstr "Пре_глед на контакта"
-
-#: ../ui/evolution-addressbook.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:3
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "Копиране на избраните контакти в друга папка..."
 
-#: ../ui/evolution-addressbook.xml.h:5 ../ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:4 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Копиране на избраното"
 
-#: ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-addressbook.xml.h:5
 msgid "Copy to Folder..."
 msgstr "Копиране в папка..."
 
-#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Изрязване на избраното"
 
-#: ../ui/evolution-addressbook.xml.h:10
+#: ../ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Изтриване на избраните контакти"
 
-#: ../ui/evolution-addressbook.xml.h:12
+#: ../ui/evolution-addressbook.xml.h:11
 msgid "Move Selected Contacts to Another Folder..."
 msgstr "Преместване на избраните контакти в друга папка..."
 
-#: ../ui/evolution-addressbook.xml.h:13
+#: ../ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr "Преместване в папка..."
 
-#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
 msgstr "Поставяне съдържанието на буфера за обмен"
 
-#: ../ui/evolution-addressbook.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Преглед на контактите за печат"
 
-#: ../ui/evolution-addressbook.xml.h:19
+#: ../ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Разпечатване на избраните контакти"
 
-#: ../ui/evolution-addressbook.xml.h:21
+#: ../ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Запазване на избраните контакти като VCard."
 
-#: ../ui/evolution-addressbook.xml.h:22 ../widgets/text/e-text.c:2684
+#: ../ui/evolution-addressbook.xml.h:21 ../widgets/text/e-text.c:2684
 msgid "Select All"
 msgstr "Избор на всичко"
 
-#: ../ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Избиране на всички контакти"
 
-#: ../ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-addressbook.xml.h:23
 msgid "Send a message to the selected contacts."
 msgstr "Изпращане на писмо до избраните контакти."
 
-#: ../ui/evolution-addressbook.xml.h:25
+#: ../ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Изпращане на писмо на контакт"
 
-#: ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Изпращане на избрания контакт до друг човек."
 
-#: ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-addressbook.xml.h:26
 msgid "Show contact preview window"
 msgstr "Показване на прозореца за преглед на контакти"
 
-#: ../ui/evolution-addressbook.xml.h:28
+#: ../ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Спиране"
 
-#: ../ui/evolution-addressbook.xml.h:29
+#: ../ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Спиране на зареждането"
 
-#: ../ui/evolution-addressbook.xml.h:30
+#: ../ui/evolution-addressbook.xml.h:29
 msgid "View the current contact"
 msgstr "Преглеждане на текущия контакт"
 
-#: ../ui/evolution-addressbook.xml.h:31 ../ui/evolution-calendar.xml.h:38
-#: ../ui/evolution-mail-list.xml.h:26 ../ui/evolution-tasks.xml.h:21
+#: ../ui/evolution-addressbook.xml.h:30 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-mail-list.xml.h:26 ../ui/evolution-tasks.xml.h:19
 msgid "_Actions"
 msgstr "_Действия"
 
-#: ../ui/evolution-addressbook.xml.h:36
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "_Forward Contact..."
 msgstr "_Препращане на контакт..."
 
+#: ../ui/evolution-addressbook.xml.h:39
+msgid "_Preview Pane"
+msgstr "_Предварителен преглед на писмата"
+
 #: ../ui/evolution-addressbook.xml.h:41
 msgid "_Save as VCard..."
 msgstr "_Запазване като VCard..."
@@ -18126,10 +17729,6 @@ msgstr "Прочистване на стари срещи и събрания"
 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 "Избор на определена дата"
@@ -18236,9 +17835,8 @@ msgid "Message F_ilters"
 msgstr "Пощенски _филтри"
 
 #: ../ui/evolution-mail-global.xml.h:10
-#, fuzzy
 msgid "Message _List As"
-msgstr "Списък на писмата"
+msgstr "_Списък на писмата като"
 
 #: ../ui/evolution-mail-global.xml.h:11
 msgid "Message _Preview"
@@ -18273,9 +17871,8 @@ msgid "_Move Folder To..."
 msgstr "Пре_местване на папка в..."
 
 #: ../ui/evolution-mail-global.xml.h:19
-#, fuzzy
 msgid "_New Search _Folder (FIXME)"
-msgstr "Нова папка за търсене"
+msgstr "_Нова папка за търсене"
 
 #: ../ui/evolution-mail-global.xml.h:20
 msgid "_New..."
@@ -18327,8 +17924,7 @@ msgid ""
 msgstr "Скриване на изтритите писма, вместо да се показват като зачертани"
 
 #: ../ui/evolution-mail-list.xml.h:12
-#, fuzzy
-msgid "Mar_k Messages as Read"
+msgid "Mark Me_ssages as Read"
 msgstr "_Отбелязване на писмата като прочетени"
 
 #: ../ui/evolution-mail-list.xml.h:13 ../ui/evolution-mail-message.xml.h:68
@@ -18818,49 +18414,10 @@ msgstr "_Затваряне"
 #: ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:45
 #: ../ui/evolution-signature-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:34
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:33
 msgid "_File"
 msgstr "_Файл"
 
-#: ../ui/evolution-memos.xml.h:3
-#, fuzzy
-msgid "Copy selected memo"
-msgstr "Копиране на избраната задача"
-
-#: ../ui/evolution-memos.xml.h:5
-#, fuzzy
-msgid "Cut selected memo"
-msgstr "Отрязване на избраната задача"
-
-#: ../ui/evolution-memos.xml.h:7
-#, fuzzy
-msgid "Delete selected memos"
-msgstr "Изтриване на избраните задачи"
-
-#: ../ui/evolution-memos.xml.h:9
-#, fuzzy
-msgid "Paste memo from the clipboard"
-msgstr "Поставяне на текст от буфера за обмен"
-
-#: ../ui/evolution-memos.xml.h:10
-#, fuzzy
-msgid "Previews the list of memos to be printed"
-msgstr "Преглеждане на списъка със задачи, които ще се отпечатат"
-
-#: ../ui/evolution-memos.xml.h:13
-#, fuzzy
-msgid "Print the list of memos"
-msgstr "Разпечатване на списъка от задачи"
-
-#: ../ui/evolution-memos.xml.h:14
-#, fuzzy
-msgid "View the selected memo"
-msgstr "Преглед на избраната задача"
-
-#: ../ui/evolution-memos.xml.h:18
-msgid "_Open Memo"
-msgstr "Отваряне на _бележка"
-
 #: ../ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Прикрепяне"
@@ -19139,19 +18696,10 @@ msgid "Print the list of tasks"
 msgstr "Разпечатване на списъка от задачи"
 
 #: ../ui/evolution-tasks.xml.h:18
-#, fuzzy
-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
+#: ../ui/evolution-tasks.xml.h:25
 msgid "_Open Task"
 msgstr "_Отваряне на задача"
 
@@ -19188,9 +18736,8 @@ msgid "Display window buttons with text only"
 msgstr "Изобразяване на бутоните само с текст"
 
 #: ../ui/evolution.xml.h:10
-#, fuzzy
 msgid "Evolution _FAQ"
-msgstr "Evolution"
+msgstr "ЧЗВ за Evolution"
 
 #: ../ui/evolution.xml.h:11
 msgid "Exit the program"
@@ -19266,66 +18813,58 @@ msgid "Tool_bar style"
 msgstr "Стил на лентата с _инструменти"
 
 #: ../ui/evolution.xml.h:30
-msgid "View/Hide the Status Bar"
-msgstr "Показване/Скриване на лентата за състоянието"
-
-#: ../ui/evolution.xml.h:31
 msgid "_About Evolution..."
 msgstr "_Относно Evolution..."
 
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:31
 msgid "_Close Window"
 msgstr "Зат_варяне на този прозорец"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:34
 msgid "_Help"
 msgstr "_Помощ"
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:35
 msgid "_Hide buttons"
 msgstr "_Скриване на бутоните"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:36
 msgid "_Icons only"
 msgstr "Са_мо икони"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:37
 msgid "_Import..."
 msgstr "_Внасяне..."
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:38
 msgid "_New"
 msgstr "_Нов"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:39
 msgid "_Quick Reference"
 msgstr "_Бърза справка"
 
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:40
 msgid "_Quit"
 msgstr "_Спиране на програмата"
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:41
 msgid "_Send / Receive"
 msgstr "_Изпращане и получаване на поща"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:42
 msgid "_Switcher Appearance"
 msgstr "_Изглед на превключвател"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:43
 msgid "_Synchronization Options..."
 msgstr "Опции за _синхронизация..."
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:44
 msgid "_Text only"
 msgstr "Само _текст"
 
-#: ../ui/evolution.xml.h:47
-msgid "_View Status Bar"
-msgstr "_Показване на лентата за състоянието"
-
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:46
 msgid "_Window"
 msgstr "_Прозорец"
 
@@ -19385,10 +18924,6 @@ msgstr "По _последователност в разговора"
 msgid "_Messages"
 msgstr "_Писма"
 
-#: ../views/memos/galview.xml.h:1
-msgid "_Memos"
-msgstr "_Бележки"
-
 #: ../views/tasks/galview.xml.h:1
 msgid "With _Due Date"
 msgstr "С _краен срок"
@@ -19476,20 +19011,9 @@ msgstr "_Създаване на нов изглед"
 msgid "_Replace existing view"
 msgstr "_Замяна на съществуващия изглед"
 
-#. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:585
-#: ../widgets/menus/gal-view-menus.c:350
-msgid "Custom View"
-msgstr "Личен изглед"
-
-#: ../widgets/menus/gal-view-instance.c:586
-msgid "Save Custom View"
-msgstr "Запазване на личния изглед"
-
-#: ../widgets/menus/gal-view-instance.c:590
-#: ../widgets/menus/gal-view-menus.c:372
-msgid "Define Views..."
-msgstr "Определяне на изгледите..."
+#: ../widgets/menus/gal-view-menus.c:291
+msgid "_Current View"
+msgstr "_Текущ изглед"
 
 #: ../widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View..."
@@ -19847,41 +19371,41 @@ msgstr "Ширина на колоната"
 
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:346
+#: ../widgets/misc/e-search-bar.c:345
 msgid "Search Text Entry"
 msgstr "Дума за търсене"
 
-#: ../widgets/misc/e-search-bar.c:550
+#: ../widgets/misc/e-search-bar.c:549
 msgid "_Search"
 msgstr "_Търсене"
 
-#: ../widgets/misc/e-search-bar.c:556
+#: ../widgets/misc/e-search-bar.c:555
 msgid "_Find Now"
 msgstr "_Намиране сега"
 
-#: ../widgets/misc/e-search-bar.c:557 ../widgets/misc/e-search-bar.c:944
+#: ../widgets/misc/e-search-bar.c:556 ../widgets/misc/e-search-bar.c:943
 msgid "_Clear"
 msgstr "Изчиств_ане"
 
-#: ../widgets/misc/e-search-bar.c:648
+#: ../widgets/misc/e-search-bar.c:647
 msgid "Search Type"
 msgstr "Тип търсене"
 
-#: ../widgets/misc/e-search-bar.c:852
+#: ../widgets/misc/e-search-bar.c:851
 msgid "Item ID"
 msgstr "Идентификатор на елемента"
 
-#: ../widgets/misc/e-search-bar.c:859
+#: ../widgets/misc/e-search-bar.c:858
 msgid "Subitem ID"
 msgstr "Идентификатор на поделемента"
 
-#: ../widgets/misc/e-search-bar.c:866 ../widgets/text/e-entry.c:1249
+#: ../widgets/misc/e-search-bar.c:865 ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3462
 #: ../widgets/text/e-text.c:3463
 msgid "Text"
 msgstr "Текст"
 
-#: ../widgets/misc/e-search-bar.c:946
+#: ../widgets/misc/e-search-bar.c:945
 msgid "Find _Now"
 msgstr "Търсене _сега"
 
@@ -20586,24 +20110,6 @@ msgstr "Контекст за IM"
 msgid "Handle Popup"
 msgstr "Управление на изскачащи прозорци"
 
-#~ msgid "Discard Changes"
-#~ msgstr "Игнориране на промените"
-
-#~ msgid "_Attachment Bar (drop attachments here)"
-#~ msgstr "Лент_а за прикрепени файлове (пускайте обектите за прикачване тук)"
-
-#~ msgid "_Alarm"
-#~ msgstr "_Аларма"
-
-#~ msgid "_Delegate To..."
-#~ msgstr "_Делегиране на..."
-
-#~ msgid "Current View"
-#~ msgstr "Текущ изглед"
-
-#~ msgid "Meetings and Tasks"
-#~ msgstr "Събрания и задачи"
-
 #~ msgid ""
 #~ "The suggested filename extension of this filetype (%s) is unused in the "
 #~ "chosen filename. Do you want to continue?"
@@ -20611,5 +20117,14 @@ msgstr "Управление на изскачащи прозорци"
 #~ "Предложеното файлово разширение на типа файл (%s) не се използва в "
 #~ "избрания файл. Искате ли да продължите?"
 
-#~ msgid "_Preview Pane"
-#~ msgstr "_Предварителен преглед на писмата"
+#~ msgid "Mo_ve to Folder..."
+#~ msgstr "Пре_местване в папка..."
+
+#~ msgid "Unknown error verifying signed messaage"
+#~ msgstr "Неизвестна грешка при проверката на подписа"
+
+#~ msgid "Unknown error decrypting messaage"
+#~ msgstr "Неизвестна грешка при декриптиране на писмото"
+
+#~ msgid "FIll stipple"
+#~ msgstr "Запълващ пунктир"
diff --git a/po/bn.po b/po/bn.po
index fbbdb81b49..ea2504fab6 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -1,4 +1,4 @@
-# Translation of evolution.HEAD bangla
+# Translation of evolution.gnome-2-12.po to bangla
 # This file is distributed under the same license as the Evolution package.
 # Copyright (C) 2004 Free Software Foundation
 # Moumita Nandi <rimi19822003@yahoo.co.in> 2004.
@@ -7,13 +7,14 @@
 # Deepayan Sarkar <deepayan@bengalinux.org>, 2004.
 # Progga <progga@bengalinux.org>, 2004.
 # Sayamindu Dasgupta <sayamindu@bengalinux.org>, 2004.
+# Runa Bhattacharjee <runa@bengalinux.org>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution.HEAD.bn\n"
+"Project-Id-Version: evolution.gnome-2-12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-17 04:54+0200\n"
-"PO-Revision-Date: 2005-10-17 17:08+0530\n"
+"POT-Creation-Date: 2005-09-04 21:54+0000\n"
+"PO-Revision-Date: 2005-09-05 12:35+0530\n"
 "Last-Translator: Runa Bhattacharjee <runa@bengalinux.org>\n"
 "Language-Team: Bangla <gnome-translation@bengalinux.org>\n"
 "MIME-Version: 1.0\n"
@@ -48,7 +49,7 @@ msgstr[0] "বর্তমান ঠিকানাবইয়ের ফোল্�
 msgstr[1] "বর্তমান ঠিকানাবইয়ের ফোল্ডারের মধ্যে %d-টি কার্ড উপস্থিত রয়েছে"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../calendar/gui/alarm-notify/alarm-queue.c:968
+#: ../calendar/gui/alarm-notify/alarm-queue.c:953
 #: ../ui/evolution-message-composer.xml.h:11
 msgid "Open"
 msgstr "খুলুন"
@@ -102,7 +103,7 @@ msgstr "নতুন সাক্ষাত্‍কার"
 msgid "New All Day Event"
 msgstr "সারাদনব্যাপী নতুন অনুষ্ঠান"
 
-#: ../a11y/calendar/ea-cal-view.c:308
+#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1505
 msgid "New Meeting"
 msgstr "নতুন সভা"
 
@@ -389,7 +390,7 @@ msgid "Server Version"
 msgstr "সার্ভারের সংস্করণ"
 
 #: ../addressbook/addressbook.error.xml.h:14
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:44
 msgid "Some features may not work properly with your current server"
 msgstr ""
 "আপনার দ্বারা বর্তমানে ব্যবহৃত সার্ভারের মধ্যে কয়েকটি বৈশিষ্ট্য সঠিকরূপে চলতে না পারার "
@@ -400,7 +401,8 @@ msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Evolution ঠিকানাবই অপ্রত্যাশিতরূপে প্রস্থান করেছে।"
 
 #: ../addressbook/addressbook.error.xml.h:16
-msgid "The image you have selected is large. Do you want to resize and store it?"
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "আপনার নির্বাচিত ছবিটি অত্যাধিক বড়। আপনি কি এটি মাপ পরিবর্তন করে এটি সংরক্ষণ করতে "
 "ইচ্ছুক?"
@@ -465,7 +467,7 @@ msgstr ""
 "করতে ইচ্ছুক?"
 
 #: ../addressbook/addressbook.error.xml.h:28
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:59
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -484,19 +486,21 @@ msgstr ""
 "ইচ্ছুক?"
 
 #: ../addressbook/addressbook.error.xml.h:30
-msgid "Your contacts for {0} will not be available until Evolution is restarted."
-msgstr "Evolution পুনরায় আরম্ভ না করা হলে আপনার {0} সংখ্যক পরিচিতির তথ্য উপলব্ধ হবে না।"
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+"Evolution পুনরায় আরম্ভ না করা হলে আপনার {0} সংখ্যক পরিচিতির তথ্য উপলব্ধ হবে না।"
 
-#: ../addressbook/addressbook.error.xml.h:31 ../mail/em-vfolder-rule.c:495
+#: ../addressbook/addressbook.error.xml.h:31 ../mail/em-vfolder-rule.c:494
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
 msgid "_Add"
-msgstr "যোগ করুন (_A)"
+msgstr "যোগ করুন (_য)"
 
 #: ../addressbook/addressbook.error.xml.h:32
 msgid "_Discard"
-msgstr "বাতিল করুন (_D)"
+msgstr "বাতিল করুন (_ব)"
 
 #: ../addressbook/addressbook.error.xml.h:33
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
@@ -527,7 +531,7 @@ msgstr "স্বয়ংক্রিয়ভাবে সম্পুর্ণ ক�
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "C_ontacts"
-msgstr "পরিচিতি (_o)"
+msgstr "পরিচিতি (_প)"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
 msgid "Certificates"
@@ -539,7 +543,7 @@ msgstr "স্বয়ংক্রিয়ভাবে সম্পূর্ণ ক�
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1180
+#: ../addressbook/gui/component/addressbook-view.c:1133
 #: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:388
 msgid "Contacts"
 msgstr "পরিচিতি"
@@ -611,7 +615,7 @@ msgstr "LDAP সার্ভারের মধ্যে"
 
 #: ../addressbook/gui/component/addressbook-component.c:226
 msgid "_Contact"
-msgstr "পরিচিতি (_C)"
+msgstr "পরিচিতি (_প)"
 
 #: ../addressbook/gui/component/addressbook-component.c:227
 msgid "Create a new contact"
@@ -619,7 +623,7 @@ msgstr "নতুন পরিচিতি নির্মাণ"
 
 #: ../addressbook/gui/component/addressbook-component.c:234
 msgid "Contact _List"
-msgstr "পরিচিতি তালিকা (_L)"
+msgstr "পরিচিতি তালিকা (_ত)"
 
 #: ../addressbook/gui/component/addressbook-component.c:235
 msgid "Create a new contact list"
@@ -633,7 +637,7 @@ msgstr "নতুন ঠিকানাবই"
 
 #: ../addressbook/gui/component/addressbook-component.c:242
 msgid "Address _Book"
-msgstr "ঠিকানাবই (_B)"
+msgstr "ঠিকানাবই (_ক)"
 
 #: ../addressbook/gui/component/addressbook-component.c:243
 msgid "Create a new address book"
@@ -651,7 +655,7 @@ msgstr "ভিত্তি"
 #: ../calendar/gui/dialogs/calendar-setup.c:192
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
-msgstr "ধরন: (_T)"
+msgstr "ধরন (_ধ):"
 
 #: ../addressbook/gui/component/addressbook-config.c:607
 msgid "Copy book content locally for offline operation"
@@ -764,17 +768,20 @@ msgstr ""
 
 #: ../addressbook/gui/component/addressbook-view.c:764
 #: ../addressbook/gui/widgets/e-addressbook-view.c:952
-#: ../mail/em-filter-i18n.h:11 ../ui/evolution-addressbook.xml.h:9
-#: ../ui/evolution-calendar.xml.h:5 ../ui/evolution-mail-message.xml.h:26
-#: ../ui/evolution-tasks.xml.h:6
+#: ../calendar/gui/calendar-component.c:537
+#: ../calendar/gui/tasks-component.c:441 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:26 ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "মুছে ফেলুন"
 
 #: ../addressbook/gui/component/addressbook-view.c:766
+#: ../calendar/gui/calendar-component.c:538
+#: ../calendar/gui/tasks-component.c:442
 msgid "Properties..."
 msgstr "বৈশিষ্ট্যাবলী..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1191
+#: ../addressbook/gui/component/addressbook-view.c:1144
 msgid "Contact Source Selector"
 msgstr "পরিচিতির উত্‍‌স নির্বাচক"
 
@@ -783,12 +790,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP সার্ভারের সাথে বেনামীভাবে সংযোগ স্থাপন করা হচ্ছে"
 
 #: ../addressbook/gui/component/addressbook.c:191
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:490
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:485
 msgid "Failed to authenticate.\n"
 msgstr "পরিচয় প্রমাণে ব্যর্থ।\n"
 
 #: ../addressbook/gui/component/addressbook.c:198
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:469
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:464
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s-র(ব্যবহারকারী %s) জন্য পাসওয়ার্ড লিখুন"
@@ -834,7 +841,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "নাম নির্বাচনের ডায়লগে সর্বশেষ ব্যবহৃত ফোল্ডারের URI।"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 msgid "Vertical pane position"
 msgstr "উলম্ভ পেইনের অবস্থান"
 
@@ -938,7 +945,8 @@ msgid "Email address"
 msgstr "ই-মেইল ঠিকানা"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
-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 ""
 "সার্ভারের নিকট আপনার পরিচয় প্রমাণের সময় Evolution-র দ্বারা উল্লিখিত ই-মেইল "
 "ঠিকানা ব্যবহার করা হবে।"
@@ -949,7 +957,7 @@ msgstr "সম্ভাব্য অনুসন্ধানের স্থা�
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "Lo_gin:"
-msgstr "লগ-ইন: (_g)"
+msgstr "লগ-ইন: (_গ)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:25
 #: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:758
@@ -963,7 +971,7 @@ msgstr "এক"
 # FIXME: 'ভিত্তি' শব্দটার ব্যবহার ঠিক ভাল লাগতেছে না :-(
 #: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid "Search _base:"
-msgstr "অনুসন্ধানের স্থান: (_b)"
+msgstr "অনুসন্ধানের স্থান: (_স)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid ""
@@ -1085,19 +1093,19 @@ msgstr "যখন সম্ভব"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid "_Add Address Book"
-msgstr "ঠিকানাবই যোগ করুন (_A)"
+msgstr "ঠিকানাবই যোগ করুন (_য)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "_Download limit:"
-msgstr "ডাউনলোডের সীমা: (_D)"
+msgstr "ডাউনলোডের সীমা (_ড):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid "_Find Possible Search Bases"
-msgstr "সম্ভাব্য অনুসন্ধানের স্থান খোঁজ করুন (_F)"
+msgstr "সম্ভাব্য অনুসন্ধানের স্থান খোঁজ করুন (_খ)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "_Login method:"
-msgstr "লগ-ইন প্রক্রিয়া (_L):"
+msgstr "লগ-ইন প্রক্রিয়া (_ল):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:47
 #: ../calendar/gui/dialogs/calendar-setup.c:244
@@ -1105,28 +1113,28 @@ msgstr "লগ-ইন প্রক্রিয়া (_L):"
 #: ../mail/mail-config.glade.h:164
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
 msgid "_Name:"
-msgstr "নাম :(_N)"
+msgstr "নাম (_ন):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Port:"
-msgstr "পোর্ট: (_P)"
+msgstr "পোর্ট (_প):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Search scope:"
-msgstr "অনুসন্ধানের ক্ষেত্র: (_S)"
+msgstr "অনুসন্ধানের ক্ষেত্র (_ন):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:50
 #: ../mail/mail-config.glade.h:171
 msgid "_Server:"
-msgstr "সার্ভার: (_S)"
+msgstr "সার্ভার (_স):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Timeout:"
-msgstr "সময়সীমা: (_T)"
+msgstr "সময়সীমা (_ম):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Use secure connection:"
-msgstr "সুরক্ষিত সংযোগ ব্যবহার করুন: (_U)"
+msgstr "সুরক্ষিত সংযোগ ব্যবহার করুন (_র):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
 msgid "cards"
@@ -1201,7 +1209,7 @@ msgstr "পরিচিতি সম্পাদক"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
-msgstr "সম্পূর্ণ নাম ...(_N)"
+msgstr "সম্পূর্ণ নাম (_প)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
@@ -1218,7 +1226,7 @@ msgstr "চিঠি লেখার ঠিকানা"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Ni_ckname:"
-msgstr "ডাকনাম: (_c)"
+msgstr "ডাকনাম (_ড):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
@@ -1245,113 +1253,113 @@ msgstr "কর্ম"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_Address:"
-msgstr "ঠিকানা: (_A)"
+msgstr "ঠিকানা (_ঠ):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Anniversary:"
-msgstr "বার্ষিকী:(_A)"
+msgstr "বার্ষিকী(_ব):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Assistant:"
-msgstr "সহকারী:(_A)"
+msgstr "সহকারী(_স):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Birthday:"
-msgstr "জন্মদিন:(_B)"
+msgstr "জন্মদিন(_জ):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 #: ../plugins/itip-formatter/itip-view.c:1662
 msgid "_Calendar:"
-msgstr "বর্ষপঞ্জি:(_C)"
+msgstr "বর্ষপঞ্জি(_ব):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Categories"
-msgstr "শ্রেণীবিভাগ(_C)"
+msgstr "শ্রেণীবিভাগ(_ব)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
-msgstr "শহর:(_C)"
+msgstr "শহর(_শ):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
-msgstr "কোম্পানি:(_C)"
+msgstr "কোম্পানি(_ক):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
-msgstr "দেশ:(_C)"
+msgstr "দেশ(_দ):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
-msgstr "বিভাগ:(_D)"
+msgstr "বিভাগ(_ভ):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
-msgstr "এর মধ্যে ফাইল করুন: (_F)"
+msgstr "এর মধ্যে ফাইল করুন (_ফ):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
-msgstr "মুক্ত/ব্যস্ত(_F):"
+msgstr "মুক্ত/ব্যস্ত(_ম):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
-msgstr "হোম পেজ(_H):"
+msgstr "হোম পেজ(_হ):"
 
 # "Manager" এর বাংলা হইলো 'ব্যবস্থাপক'। তবে Context বুঝতে না পারায় আপাতত সেটা লিখলাম না।
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
-msgstr "ম্যানেজার(_M):"
+msgstr "ম্যানেজার(_ম):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
-msgstr "নোট(_N) :"
+msgstr "নোট(_ন) :"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
-msgstr "কার্যালয়(_O) :"
+msgstr "কার্যালয়(_ক) :"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
-msgstr "পোস্ট বক্স (_P):"
+msgstr "পোস্ট বক্স (_প):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
-msgstr "পেশা(_P):"
+msgstr "পেশা(_প):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
-msgstr "স্বামী/স্ত্রী(_S):"
+msgstr "স্বামী/স্ত্রী(_ম):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
-msgstr "রাষ্ট্র/প্রদেশ (_S):"
+msgstr "রাষ্ট্র/প্রদেশ (_র):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 #: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
-msgstr "শিরোনাম (_T):"
+msgstr "শিরোনাম (_শ):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
-msgstr "ভিডিও চ্যাট(_V):"
+msgstr "ভিডিও চ্যাট(_ভ):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
-msgstr "HTML বিন্যাসের মেইল প্রাপ্ত করতে ইচ্ছুক(_W)"
+msgstr "HTML বিন্যাসের মেইল প্রাপ্ত করতে ইচ্ছুক(_ক)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
-msgstr "ওয়েব লগ(_W):"
+msgstr "ওয়েব লগ(_য়):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
 msgid "_Where:"
-msgstr "কোথায় (_W):"
+msgstr "কোথায় (_ক):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
-msgstr "জিপ/পোস্টাল কোড(_Z):"
+msgstr "জিপ/পোস্টাল কোড(_জ):"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:96
 #: ../addressbook/gui/widgets/eab-contact-display.c:367
@@ -2494,15 +2502,15 @@ msgstr "ঝটপট পরিচিতি সংযোজন"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "_Edit Full"
-msgstr "সম্পূর্ণ সম্পাদন করুন (_E)"
+msgstr "সম্পূর্ণ সম্পাদন করুন (_স)"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:306
 msgid "_Full name:"
-msgstr "সম্পূর্ণ নাম (_F):"
+msgstr "সম্পূর্ণ নাম (_প):"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:316
 msgid "E-_mail:"
-msgstr "ই-মেইল (_m):"
+msgstr "ই-মেইল (_ম):"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:323
 #, c-format
@@ -2540,15 +2548,15 @@ msgstr ""
 
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
-msgstr "দ্বিতীয় ঠিকানা (_2):"
+msgstr "দ্বিতীয় ঠিকানা (_২):"
 
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Ci_ty:"
-msgstr "শহর (_t):"
+msgstr "শহর (_শ):"
 
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
-msgstr "দেশ (_y):"
+msgstr "দেশ (_দ):"
 
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Full Address"
@@ -2556,7 +2564,7 @@ msgstr "সম্পূর্ণ ঠিকানা"
 
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
-msgstr "জিপ কোড (_Z):"
+msgstr "জিপ কোড (_জ):"
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
@@ -2609,20 +2617,20 @@ msgstr "সিনিয়র"
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
-msgstr "প্রথম (_F):"
+msgstr "প্রথম (_প):"
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
-msgstr "শেষ (_L):"
+msgstr "শেষ (_শ):"
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
-msgstr "মধ্য (_M):"
+msgstr "মধ্য (_ম):"
 
 # FIXME
 #: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
-msgstr "সাফিক্স (_S):"
+msgstr "সাফিক্স (_স):"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:2
 msgid "Add IM Account"
@@ -2630,18 +2638,18 @@ msgstr "IM অ্যাকাউন্ট যোগ করুন"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:3
 msgid "_Account name:"
-msgstr "অ্যাকাউন্টের নাম (_A):"
+msgstr "অ্যাকাউন্টের নাম (_ক):"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:4
 msgid "_IM Service:"
-msgstr "IM পরিসেবা (_I):"
+msgstr "IM পরিসেবা (_প):"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:234
-#: ../plugins/exchange-operations/exchange-contacts.c:214
+#: ../plugins/exchange-operations/exchange-calendar.c:215
+#: ../plugins/exchange-operations/exchange-contacts.c:193
 msgid "_Location:"
-msgstr "অবস্থান(_L):"
+msgstr "অবস্থান(_ব):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 msgid "\n"
@@ -2670,19 +2678,20 @@ msgstr "লিস্ট থেকে একটি ই-মেইল ঠিকা�
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
-msgstr "এই লিস্টে মেইল প্রেরণের সময় ঠিকানা আড়াল করা হবে (_H)"
+msgstr "এই লিস্টে মেইল প্রেরণের সময় ঠিকানা আড়াল করা হবে (_ল)"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
-msgstr "লিস্টের নাম (_L):"
+msgstr "লিস্টের নাম (_ল):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Select"
-msgstr "নির্বাচন করুন (_S)"
+msgstr "নির্বাচন করুন (_ন)"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr "একটি ই-মেইল ঠিকানা লিখুন অথবা কোনো পরিচিতি টেনে এনে নীচের তালিকায় ফেলুন: (_T)"
+msgstr ""
+"একটি ই-মেইল ঠিকানা লিখুন অথবা কোনো পরিচিতি টেনে এনে নীচের তালিকায় ফেলুন: (_খ)"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
@@ -2699,7 +2708,7 @@ msgstr "হল নতুন লিস্ট"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:707
 msgid "_Members"
-msgstr "সদস্য(_M)"
+msgstr "সদস্য(_স)"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:710
 msgid "Contact List Members"
@@ -2820,7 +2829,7 @@ msgstr "উত্‍স"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:377
+#: ../calendar/gui/e-meeting-list-view.c:370
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "ধরন"
@@ -2831,16 +2840,16 @@ msgstr "ঠিকানা-বই"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:807
 #: ../addressbook/gui/widgets/e-addressbook-view.c:936
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2018
-#: ../ui/evolution-addressbook.xml.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2011
+#: ../ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "VCard হিসাবে সংরক্ষণ করা হবে..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:930
-#: ../calendar/gui/e-calendar-table.c:1167
-#: ../calendar/gui/e-calendar-view.c:1549 ../ui/evolution-addressbook.xml.h:38
+#: ../calendar/gui/e-calendar-table.c:1154
+#: ../calendar/gui/e-calendar-view.c:1528 ../ui/evolution-addressbook.xml.h:37
 msgid "_Open"
-msgstr "খোলো (_O)"
+msgstr "খোলো (_খ)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:932
 msgid "New Contact..."
@@ -2852,7 +2861,7 @@ msgstr "নতুন পরিচিতি তালিকা..."
 
 # FIXME
 #: ../addressbook/gui/widgets/e-addressbook-view.c:937
-#: ../ui/evolution-addressbook.xml.h:11
+#: ../ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "পরিচিতি ফরওয়ার্ড করুন"
 
@@ -2867,15 +2876,15 @@ msgstr "এই পরিচিতিকে বার্তা প্রেরণ
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "Send Message to List"
-msgstr "লিস্টে বার্তা প্রেরণ করুন"
+msgstr "লিস্টে বার্তা প্রেরণ করুন (_ব)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "Send Message to Contacts"
 msgstr "পরিচিতিদের বার্তা প্রেরণ করুন"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:942
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2510
-#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:19
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2501
+#: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
 #: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "প্রিন্ট করুন"
@@ -2889,29 +2898,29 @@ msgid "Move to Address Book..."
 msgstr "ঠিকানা-বইয়ে সরিয়ে নিন..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:949
-#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-tasks.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "কাট করুন"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:950
-#: ../ui/evolution-addressbook.xml.h:3 ../ui/evolution-mail-message.xml.h:12
-#: ../ui/evolution-tasks.xml.h:2
+#: ../calendar/gui/calendar-component.c:536
+#: ../calendar/gui/tasks-component.c:440 ../ui/evolution-addressbook.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:12 ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "কপি করুন"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:951
-#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-tasks.xml.h:11
+#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "পেস্ট করুন"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1565
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1562
 #: ../calendar/gui/cal-search-bar.c:346
 msgid "Any Category"
 msgstr "যেকোনো শ্রেণী"
 
-#. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1767
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1761
 msgid "Print cards"
 msgstr "কার্ড প্রিন্ট করুন"
 
@@ -2955,7 +2964,7 @@ msgid "Company Phone"
 msgstr "কোম্পানির ফোন"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:567
+#: ../addressbook/gui/widgets/eab-contact-display.c:564
 #: ../smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "ই-মেইল"
@@ -3052,7 +3061,7 @@ msgstr "রেডিও"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:388
+#: ../calendar/gui/e-meeting-list-view.c:378
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
 msgid "Role"
@@ -3250,7 +3259,7 @@ msgid "WWW"
 msgstr "WWW"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:378
-#: ../addressbook/gui/widgets/eab-contact-display.c:602
+#: ../addressbook/gui/widgets/eab-contact-display.c:599
 msgid "Blog"
 msgstr "ব্লগ"
 
@@ -3258,11 +3267,11 @@ msgstr "ব্লগ"
 msgid "personal"
 msgstr "ব্যক্তিগত"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:563
+#: ../addressbook/gui/widgets/eab-contact-display.c:560
 msgid "Job Title"
 msgstr "কাজের শিরোনাম"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:594
+#: ../addressbook/gui/widgets/eab-contact-display.c:591
 msgid "Home page"
 msgstr "হোম পেজ"
 
@@ -3322,7 +3331,7 @@ msgstr "অসমর্থিত প্রোটোকল"
 #: ../calendar/gui/e-cal-component-preview.c:232
 #: ../calendar/gui/e-cal-model-tasks.c:348
 #: ../calendar/gui/e-cal-model-tasks.c:661
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2373
+#: ../calendar/gui/e-calendar-table.c:456 ../calendar/gui/print.c:2364
 msgid "Cancelled"
 msgstr "বাতিল করা হয়েছে"
 
@@ -3618,18 +3627,18 @@ msgstr "কার্ড ভিউ"
 msgid "GTK Tree View"
 msgstr "GTK শাখা-প্রশাখার ভিউ"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:582
+#: ../addressbook/importers/evolution-ldif-importer.c:486
 #: ../addressbook/importers/evolution-vcard-importer.c:249
 #: ../calendar/importers/icalendar-importer.c:311
 #: ../calendar/importers/icalendar-importer.c:643 ../shell/shell.error.xml.h:6
 msgid "Importing ..."
 msgstr "ইম্পোর্ট করা হচ্ছে..."
 
-#: ../addressbook/importers/evolution-ldif-importer.c:748
+#: ../addressbook/importers/evolution-ldif-importer.c:652
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "এলড্যাপ-এর তথ্য বিনিময় রীতি (Format) (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:749
+#: ../addressbook/importers/evolution-ldif-importer.c:653
 msgid "Evolution LDIF importer"
 msgstr "Evolution এলডিআইএফ ইম্পোর্টার"
 
@@ -3646,13 +3655,13 @@ msgstr "Evolution VCard Importer"
 msgid "Print envelope"
 msgstr "খাম প্রিন্ট করুন"
 
-#: ../addressbook/printing/e-contact-print.c:1014
+#: ../addressbook/printing/e-contact-print.c:1001
 msgid "Print contacts"
 msgstr "পরিচিতি প্রিন্ট করুন"
 
 # FIXME
-#: ../addressbook/printing/e-contact-print.c:1105
-#: ../addressbook/printing/e-contact-print.c:1133
+#: ../addressbook/printing/e-contact-print.c:1066
+#: ../addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "পরিচিতি প্রিন্ট করুন"
 
@@ -3683,7 +3692,7 @@ msgstr "মাত্রা:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:7
 msgid "F_ont..."
-msgstr "ফন্ট (_o)..."
+msgstr "ফন্ট (_ফ)..."
 
 #: ../addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
@@ -3811,9 +3820,9 @@ msgstr "ছায়া"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:940
-#: ../plugins/exchange-operations/exchange-calendar.c:224
-#: ../plugins/exchange-operations/exchange-contacts.c:197
+#: ../plugins/exchange-operations/exchange-account-setup.c:917
+#: ../plugins/exchange-operations/exchange-calendar.c:205
+#: ../plugins/exchange-operations/exchange-contacts.c:176
 msgid "Size:"
 msgstr "মাপ:"
 
@@ -3840,7 +3849,7 @@ msgstr "প্রস্থ:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:42
 msgid "_Font..."
-msgstr "ফন্ট (_F)..."
+msgstr "ফন্ট (_ফ)..."
 
 #: ../addressbook/printing/test-contact-print-style-editor.c:53
 msgid "Contact Print Style Editor Test"
@@ -3902,15 +3911,18 @@ msgid "Export in asynchronous mode"
 msgstr "অ্যাসিঙ্ক্রোনাস মোডে এক্সপোর্ট করা হবে"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
-msgid "The number of cards in one output file in asychronous mode, default size 100."
-msgstr "অ্যাসিঙ্ক্রোনাস মোডে একটি আউপুট ফাইলের মধ্যে উপস্থিত কার্ড সংখ্যা, ডিফল্ট সংখ্যা ১০০।"
+msgid ""
+"The number of cards in one output file in asychronous mode, default size 100."
+msgstr ""
+"অ্যাসিঙ্ক্রোনাস মোডে একটি আউপুট ফাইলের মধ্যে উপস্থিত কার্ড সংখ্যা, ডিফল্ট সংখ্যা ১০০।"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "NUMBER"
 msgstr "NUMBER"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:91
-msgid "Command line arguments error, please use --help option to see the usage."
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "কমান্ড লাইন আর্গুমেন্ট-এ ত্রুটি, অনুগ্রহ করে --help অপশনটির সাহায্যে ব্যবহার প্রক্রিয়া "
 "দেখুন।"
@@ -3979,11 +3991,14 @@ msgstr ""
 msgid ""
 "All information in these journal entries will be deleted and can not be "
 "restored."
-msgstr "এই সাময়িকী এন্ট্রি-গুলি সংক্রান্ত সকল তথ্য মুছে ফেলা হবে এবং তা উদ্ধার করা যাবে না।"
+msgstr ""
+"এই সাময়িকী এন্ট্রি-গুলি সংক্রান্ত সকল তথ্য মুছে ফেলা হবে এবং তা উদ্ধার করা যাবে না।"
 
 #: ../calendar/calendar.error.xml.h:6
-msgid "All information in this journal will be deleted and can not be restored."
-msgstr "এই সাময়ীকিতে উপস্থিত সব তথ্য মুছে ফেলা হবে এবং তা পুনরায় উদ্ধার করা সম্ভব হবে না।"
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+"এই সাময়ীকিতে উপস্থিত সব তথ্য মুছে ফেলা হবে এবং তা পুনরায় উদ্ধার করা সম্ভব হবে না।"
 
 #: ../calendar/calendar.error.xml.h:7
 msgid ""
@@ -3996,17 +4011,20 @@ msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "এই কর্ম-গুলি সংক্রান্ত সকল তথ্য মুছে ফেলা হবে এবং তা উদ্ধার করা যাবে না।"
 
 #: ../calendar/calendar.error.xml.h:9
-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:10
 msgid ""
 "All information on this journal entry will be deleted and can not be "
 "restored."
-msgstr "এই সাময়িকী এন্ট্রি সংক্রান্ত সকল তথ্য মুছে ফেলা হবে এবং তা উদ্ধার করা যাবে না।"
+msgstr ""
+"এই সাময়িকী এন্ট্রি সংক্রান্ত সকল তথ্য মুছে ফেলা হবে এবং তা উদ্ধার করা যাবে না।"
 
 #: ../calendar/calendar.error.xml.h:11
-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:12
@@ -4070,28 +4088,33 @@ msgid "Delete task list '{0}'?"
 msgstr "'{0}' কর্মসূচী মুছে ফেলা হবে কি?"
 
 #: ../calendar/calendar.error.xml.h:27
+msgid "Discard Changes"
+msgstr "পরিবর্তন বাতিল করুন"
+
+#: ../calendar/calendar.error.xml.h:28
 msgid "Don't Send"
 msgstr "প্রেরণ করবে না"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:29
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "ডাউনলোড কর্ম বর্তমানে চলমান। আপনি কি সাক্ষাত্‍‌কার সংরক্ষণ করতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
 msgid "Download in progress. Do you want to save the task?"
 msgstr "ডাউনলোড কর্ম বর্তমানে চলমান। আপনি কি কর্ম সংরক্ষণ করতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
 msgid "Editor could not be loaded."
 msgstr "এডিটর লোড করা যায়নি।"
 
-#: ../calendar/calendar.error.xml.h:31
-msgid "Email invitations will be sent to all participants and allow them to RSVP."
+#: ../calendar/calendar.error.xml.h:32
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
 msgstr ""
 "সকল অংশগ্রহণকারীদেরকে ই-মেইলে আমন্ত্রনপত্র প্রেরণ করা হবে এবং তারা তাদের "
 "অনুপস্থিতির সুচনা প্রেরণ করতে পারবেন।"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -4099,15 +4122,15 @@ msgstr ""
 "সকল অংশগ্রহণকারীদেরকে ই-মেইলে আমন্ত্রনপত্র প্রেরণ করা হবে এবং তারা ঐ কর্মটি গ্রহণ "
 "করতে পারবেন।"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
 msgid "Error loading calendar"
 msgstr "বর্ষপঞ্জি লোড করতে সমস্যা"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
 msgid "Error loading task list"
 msgstr "কর্মের তালিকা লোড করতে সমস্যা"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the journal has been deleted."
@@ -4115,7 +4138,7 @@ msgstr ""
 "বিলোপন সংক্রান্ত কোনো সূচনা আপনি প্রেরণ না করলে অন্যান্য অংশগ্রহণকারীদের কাছে, এই "
 "সাময়িকী এন্ট্রিটি মুছে ফেলার খবর অজানা থাকবে।"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:37
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the meeting is canceled."
@@ -4123,7 +4146,7 @@ msgstr ""
 "বিলোপনের কোনো সূচনা আপনি প্রেরণ না করলে অন্যান্য অংশগ্রহণকারীদের কাছে সভা বাতিল "
 "হওয়ার খবর অাজানা থাকবে।"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the task has been deleted."
@@ -4131,16 +4154,20 @@ msgstr ""
 "বিলোপনের কোনো সূচনা আপনি প্রেরণ না করলে অন্যান্য অংশগ্রহণকারীদের কাছে এই কর্মটি "
 "মুছে ফেলার খবর অজানা থাকবে।"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:39
+msgid "Save Changes"
+msgstr "পরিবর্তন সংরক্ষণ করুন"
+
+#: ../calendar/calendar.error.xml.h:40
 #: ../ui/evolution-message-composer.xml.h:28
 msgid "Send"
 msgstr "প্রেরণ করুন"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:41
 msgid "Send Notice"
 msgstr "সূচনা প্রদান করুন"
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:42
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4148,7 +4175,7 @@ msgstr ""
 "অংশগ্রণকারীদেরকে আপডেট করা তথ্য প্রেরণ করা হলে তারা তাদের বর্ষপঞ্জিটি আপডেট করে "
 "রাখতে পারেন।"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4156,102 +4183,93 @@ msgstr ""
 "অংশগ্রহণকারীদেরকে আপডেট করা তথ্য প্রেরণ করা হলে তারা তাদের কর্মতালিকাটি আপডেট "
 "করে রাখতে পারেন।"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:45
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution বর্ষপঞ্জিকাটি অপ্রত্যাশিতভাবে বন্ধ হয়ে গেছে।"
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:46
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution-র কর্মগুলি অপ্রত্যাশিতভাবে বন্ধ হয়ে গেছে।"
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:47
 msgid "The calendar is not marked for offline usage"
 msgstr "বর্ষপঞ্জিটি অফ-লাইন ব্যবহারের উদ্দেশ্যে চিহ্নিত করা হয়নি"
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:48
 msgid "The task list is not marked for offline usage"
 msgstr "কর্মতালিকা অফ-লাইন ব্যবহারের উদ্দেশ্যে চিহ্নিত করা হয়নি"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:49
 msgid "This calendar will be removed permanently."
 msgstr "বর্ষপঞ্জিটি স্থায়ীরূপে মুছে ফেলা হবে।"
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:50
 msgid "This task list will be removed permanently."
 msgstr "কর্মতালিকা স্থায়ীরূপে মুছে ফেলা হবে।"
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:51
 msgid "Would you like to save your changes to this appointment?"
 msgstr "আপনি কি এই সাক্ষাত্‍কারে করা পরিবর্তনগুলি সংরক্ষণ করতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:52
 msgid "Would you like to save your changes to this task?"
 msgstr "আপনি কি এই কর্মের জন্য করা পরিবর্তনগুলি সংরক্ষণ করতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:53
 msgid "Would you like to send a cancellation notice for this journal entry?"
 msgstr "এই সাময়িকী এন্ট্রি বিলোপন করা সংক্রান্ত কোনো সূচনা কি আপনি প্রেরণ করতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:54
 msgid "Would you like to send all the participants a cancellation notice?"
 msgstr "বিলোপনের সূচনা কি আপনি সমস্ত অংশগ্রহণকারীকে প্রেরণ করতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:55
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "আপনি কি অংশগ্রহণকারীদেরকে সভার আমন্ত্রনপত্র প্রেরণ করতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:56
 msgid "Would you like to send this task to participants?"
 msgstr "আপনি কি এই কর্মটি অংশগ্রহণকারীদেরকে প্রেরণ করতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "আপনি কি সভা সংক্রান্ত তথ্য আপডেট করে অংশগ্রহনকারীদেরকে প্রেরণ করতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send updated task information to participants?"
 msgstr "আপনি কি কার্য সংক্রান্ত তথ্য আপডেট করে অংশগ্রহণকারীদেরকে প্রেরণ করতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:58
-msgid "You have changed this appointment, but not yet saved them."
-msgstr "আপনি এই সাক্ষাত্‍কারে কিছু পরিবর্তন করেছেন, কিন্তু সেগুলি সংরক্ষণ করেননি।"
+#: ../calendar/calendar.error.xml.h:60
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "আপনি এই সাক্ষাত্‍কারে কিছু পরিবর্তন করেছেন, কিন্তু তা এখনো সংরক্ষণ করন নি।"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:61
 msgid "You have made changes to this task, but not yet saved them."
 msgstr "আপনি এই কর্মতে কিছু পরিবর্তন করেছেন, কিন্তু তা এখনো সংরক্ষণ করন নি।"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:62
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Evolution পুনরায় আরম্ভ না করা হলে আপনার বর্ষপঞ্জিগুলি উপলব্ধ হবে না।"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:63
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Evolution পুনরায় আরম্ভ না করা হলে আপনার কর্মগুলি উপলব্ধ হবে না।"
 
-#: ../calendar/calendar.error.xml.h:62
-#: ../composer/mail-composer.error.xml.h:29
-msgid "_Discard Changes"
-msgstr "পরিবর্তন পরিত্যাগ করুন (_D)"
-
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:64
 #: ../ui/evolution-message-composer.xml.h:51
 msgid "_Save"
-msgstr "সংরক্ষণ করুন (_S)"
-
-#: ../calendar/calendar.error.xml.h:64
-msgid "_Save Changes"
-msgstr "পরিবর্তন সংরক্ষণ করুন (_S)"
+msgstr "সংরক্ষণ করুন (_র)"
 
 #: ../calendar/calendar.error.xml.h:65
 #: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:123
 msgid "_Send"
-msgstr "প্রেরণ করুন (_S)"
+msgstr "প্রেরণ করুন (_প)"
 
 #: ../calendar/calendar.error.xml.h:66
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:312
+#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:301
 #: ../smime/gui/component.c:48
 msgid "Enter password"
 msgstr "পাসওয়ার্ড লিখুন"
@@ -4260,15 +4278,15 @@ msgstr "পাসওয়ার্ড লিখুন"
 msgid "Split Multi-Day Events:"
 msgstr "একাধিক-দিনব্যাপী অনুষ্ঠানগুলিকে ভাগ করা হবে:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1377
-#: ../calendar/conduits/calendar/calendar-conduit.c:1378
+#: ../calendar/conduits/calendar/calendar-conduit.c:1365
+#: ../calendar/conduits/calendar/calendar-conduit.c:1366
 #: ../calendar/conduits/todo/todo-conduit.c:879
 #: ../calendar/conduits/todo/todo-conduit.c:880
 msgid "Could not start evolution-data-server"
 msgstr "Evolution-data-server আরম্ভ করা সম্ভব হয়নি"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1486
-#: ../calendar/conduits/calendar/calendar-conduit.c:1489
+#: ../calendar/conduits/calendar/calendar-conduit.c:1474
+#: ../calendar/conduits/calendar/calendar-conduit.c:1477
 msgid "Could not read pilot's Calendar application block"
 msgstr "পাইলটের বর্ষপঞ্জি অ্যাপলিকেশন ব্লক পড়া যায়নি"
 
@@ -4320,25 +4338,25 @@ msgid "Evolution's Tasks component"
 msgstr "ইভোলিউশন কার্যের কম্পোনেন্ট"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#: ../calendar/gui/e-tasks.c:1332 ../calendar/gui/print.c:1831
+#: ../calendar/gui/e-tasks.c:1257 ../calendar/gui/print.c:1822
 #: ../calendar/gui/tasks-component.c:519
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:466
+#: ../calendar/gui/tasks-component.c:1006 ../calendar/gui/tasks-control.c:457
 #: ../calendar/importers/icalendar-importer.c:79
 #: ../calendar/importers/icalendar-importer.c:707
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:589
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:582
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "কর্ম"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 msgid "_Calendars"
-msgstr "বর্ষপঞ্জি (_C)"
+msgstr "বর্ষপঞ্জি (_ব)"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
 #: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
-msgstr "কর্ম (_T)"
+msgstr "কর্ম (_ক)"
 
 # FIXME
 #: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
@@ -4351,11 +4369,11 @@ msgid_plural "minutes"
 msgstr[0] "মিনিট"
 msgstr[1] "মিনিট"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:250
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:248
 msgid "Start time"
 msgstr "আরম্ভের সময়"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:349
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:347
 #, c-format
 msgid ""
 "<big><b>%s</b></big>\n"
@@ -4378,26 +4396,26 @@ msgstr "অবস্থান:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
 msgid "Snooze _time:"
-msgstr "ঘুমের সময়কাল: (_t)"
+msgstr "ঘুমের সময়কাল: (_ঘ)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:6
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:13
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-addressbook.xml.h:34 ../ui/evolution-calendar.xml.h:41
 #: ../ui/evolution-composer-entries.xml.h:8
 #: ../ui/evolution-mail-messagedisplay.xml.h:5
 #: ../ui/evolution-message-composer.xml.h:44
 #: ../ui/evolution-signature-editor.xml.h:23
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution.xml.h:35
 msgid "_Edit"
-msgstr "সম্পাদনা (_E)"
+msgstr "সম্পাদন করুন (_ম)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
 msgid "_Snooze"
-msgstr "ঘুম (_S)"
+msgstr "ঘুম (_ঘ)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 msgid "description of appointment"
@@ -4407,28 +4425,28 @@ msgstr "সাক্ষাত্‍কারের বিবরণ"
 msgid "location of appointment"
 msgstr "সাক্ষাত্‍কারের স্থান"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:969
+#: ../calendar/gui/alarm-notify/alarm-queue.c:954
 msgid "Dismiss"
 msgstr "বাতিল করুন"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:970
+#: ../calendar/gui/alarm-notify/alarm-queue.c:955
 msgid "Dismiss All"
 msgstr "সমস্ত বাতিল করুন"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1052
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1037
 msgid "No summary available."
 msgstr "সারসংক্ষেপবিহীন।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1061
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1063
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1046
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1048
 msgid "No description available."
 msgstr "বিবরণহীন।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1071
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1056
 msgid "No location information available."
 msgstr "স্থান সম্পর্কে কোনো তথ্য উপলব্ধ নেই।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1087
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1072
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -4441,12 +4459,12 @@ msgstr ""
 "%s -এ আরম্ভ হচ্ছে\n"
 "%s -এ সমাপ্ত হচ্ছে"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1190
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1214
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1175
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1199
 msgid "Warning"
 msgstr "সতর্কবাণী"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1194
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1179
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4459,7 +4477,7 @@ msgstr ""
 "সাধারণ ডায়লগ বাক্স প্রদর্শন\n"
 "করবে।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1220
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1205
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4476,16 +4494,16 @@ msgstr ""
 "\n"
 "আপনি কি এই প্রোগ্রামটি নিশ্চিতরূপে চালাতে ইচ্ছুক?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1234
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1219
 msgid "Do not ask me about this program again."
 msgstr "আমাকে এই প্রোগ্রামটির ব্যাপারে আর জিজ্ঞাসা করবে না।"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:147
+#: ../calendar/gui/alarm-notify/notify-main.c:140
 msgid "Could not initialize Bonobo"
 msgstr "বোনোবো চালু করা যায়নি"
 
 # FIXME
-#: ../calendar/gui/alarm-notify/notify-main.c:158
+#: ../calendar/gui/alarm-notify/notify-main.c:151
 msgid "Could not create the alarm notify service factory"
 msgstr "সতর্কধ্বনি প্রদানকারী সার্ভিস ফ্যাক্টরি তৈরি করা যায়নি"
 
@@ -4516,7 +4534,8 @@ msgid "Calendars to run alarms for"
 msgstr "বর্ষপঞ্জি উল্লিখিত কারনে সতর্কধ্বনি দেবে"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.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 "সময়ের বারে মার্কাস বেইন লাইন আঁকতে ব্যবহৃত রং (ডিফল্ট হলে ফাঁকা)।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
@@ -4581,7 +4600,8 @@ msgstr "দিনের কাজ যে সময় আরম্ভ হবে, �
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr "দিন ও সাপ্তাহিক কর্মের দিন অনুযায়ী প্রদর্শনে উল্লিখিত অন্তরাল, মিনিট অনুসারে ব্যক্ত।"
+msgstr ""
+"দিন ও সাপ্তাহিক কর্মের দিন অনুযায়ী প্রদর্শনে উল্লিখিত অন্তরাল, মিনিট অনুসারে ব্যক্ত।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
@@ -4629,7 +4649,7 @@ msgstr "কর্ম আড়াল করার সময় নির্ধার�
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
-msgstr "সময়োত্তীর্ণ কাজ চিহ্নিত করতে ব্যবহৃত রং"
+msgstr "সময়োত্তীর্ণ কাজ (_য়):"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid ""
@@ -4677,35 +4697,26 @@ msgstr "চেতাবনির অংশ হিসাবে যে সমস�
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show appointment end times in week and month views"
-msgstr "সাপ্তাহিক ও মাস অনুসারে প্রদর্শনক্ষেত্রে সাক্ষাত্‍‌কার সমাপ্তির সময় প্রদর্শন করা হবে।"
+msgstr ""
+"সাপ্তাহিক ও মাস অনুসারে প্রদর্শনক্ষেত্রে সাক্ষাত্‍‌কার সমাপ্তির সময় প্রদর্শন করা হবে।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show display alarms in notification tray"
 msgstr "সূচনাপ্রদানের ট্রের মধ্যে প্রদর্শনযোগ্য সতর্কবার্তা প্রদর্শিত হবে"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
-#: ../mail/evolution-mail.schemas.in.in.h:73
-msgid "Show the \"Preview\" pane"
-msgstr "\"পূর্বপ্রদর্শন\" পেইন প্রদর্শন করা হবে"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
-#: ../mail/evolution-mail.schemas.in.in.h:74
-msgid "Show the \"Preview\" pane."
-msgstr "\"পূর্বপ্রদর্শন\" পেইন প্রদর্শন করা হবে।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show week numbers in date navigator"
 msgstr "তারিখ নেভিগেটরে সপ্তাহের সংখ্যা প্রদর্শন করা হবে"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Tasks due today color"
 msgstr "আজকের তারিখ করণীয় কর্ম চিহ্নিত করতে ব্যবহৃত রং"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Tasks vertical pane position"
 msgstr "কর্ম সংক্রান্ত উলম্ব পেইনের অবস্থান"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -4713,7 +4724,7 @@ msgstr ""
 "বর্ষপঞ্জির মধ্যে তারিখ ও সময় উল্লেখ করতে ডিফল্টরূপে ব্যবহৃত প্রাদেশিক সময়, অননুবাদিত "
 "Olsen সময়ের অঞ্চলের ডাটাবেসের অঞ্চল যেমন \"America/New York\" হিসাবে নির্ধারিত।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
 #, no-c-format
 msgid ""
 "The url template to use as a free/busy data fallback, %u is replaced by the "
@@ -4723,51 +4734,55 @@ msgstr ""
 "is replaced by the user part of the mail address and %d is replaced by the "
 "domain."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Time divisions"
 msgstr "সময় অনুসারে বিভাজন"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Time the last alarm ran, in time_t."
 msgstr "সর্তকীকরণ চালনার সর্বশেষ সময়, time_t-এ ব্যক্ত।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Timezone"
 msgstr "সময়-অঞ্চল"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Twenty four hour time format"
 msgstr "চব্বিশ ঘন্টা সময়ের বিন্যাস"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "ডিফল্ট তাগাদা ব্যবস্থায় ব্যবহৃত একক, \"মিনিট\", \"ঘন্টা\" অথবা \"দিন\"।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
-msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr "কর্ম আড়াল করার সময় নির্ধারণ করতে ব্যবহৃত মানক, \"মিনিট\", \"ঘন্টা\" অথবা \"দিন\"।"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+"কর্ম আড়াল করার সময় নির্ধারণ করতে ব্যবহৃত মানক, \"মিনিট\", \"ঘন্টা\" অথবা \"দিন\"।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid "Week start"
 msgstr "সপ্তাহের আরম্ভ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "সপ্তাহের যে দিনে সপ্তাহ আরম্ভ হবে, রবিবার (০) থেকে শনিবারের মধ্যে (৬)।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "চেতাবনি বার্তার জন্য নোটিফিকেশন ট্রে ব্যবহার করা হবে কি না"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Whether to ask for confirmation when deleting an appointment or task."
-msgstr "সাক্ষাত্কার অথবা কর্ম মুছে ফেলার পূর্বে নিশ্চিত হওয়ার জন্য জিঞ্জাসা করা হবে কি না।"
+msgstr ""
+"সাক্ষাত্কার অথবা কর্ম মুছে ফেলার পূর্বে নিশ্চিত হওয়ার জন্য জিঞ্জাসা করা হবে কি না।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr "সাক্ষাত্কার কর্ম স্থায়ীরূপে মুছে ফেলার পূর্বে নিশ্চিত হওয়ার জন্য জিঞ্জাসা করা হবে কি না।"
+msgstr ""
+"সাক্ষাত্কার কর্ম স্থায়ীরূপে মুছে ফেলার পূর্বে নিশ্চিত হওয়ার জন্য জিঞ্জাসা করা হবে কি না।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -4775,47 +4790,49 @@ msgstr ""
 "মাস অনুযায়ী প্রদর্শন ক্ষেত্রের মধ্যে সপ্তান্তের দিন একসাথে প্রদর্শন করা হবে কিনা। এর "
 "ফলে শনিবার ও রবিবার একটি সাপ্তাহিক কর্মের দিনের স্থানে স্থাপন করা হবে।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "সপ্তাহ ও মাস অনুযায়ী প্রদর্শনের মধ্যে ঘটনা সমাপ্তির সময় প্রদর্শন করা হবে কিনা।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
-msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "বর্ষপঞ্জির মধ্যে মার্কাস মেইন্স রেখা (বর্তমান সময়ের রেখা) আঁকা হবে কিনা।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "কর্ম অনুযায়ী প্রদর্শনক্ষেত্রে সমাপ্ত কর্ম আড়াল করা হবে কি না।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Whether to set a default reminder for appointments."
 msgstr "সাক্ষাত্‍‌কারের জন্য একটি ডিফল্ট তাগাদা নির্ধারণ করা হবে কি না।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
-msgid "Whether to show times in twenty four hour format instead of using am/pm."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "সময় পূর্বাহ্ণ/অপরাহ্ণ ফরমার পরিবর্তে ২৪-ঘন্টার ফরমায় প্রদর্শন করা হবে কি না।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to show week numbers in the date navigator."
 msgstr "তারিখ নেভিগেটরের উপর সপ্তাহের সংখ্যা প্রদর্শন করা হবে কি না।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Work days"
 msgstr "কার্যদিবস"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid "Workday end hour"
 msgstr "কার্যদিবস সমাপ্তির ঘন্টা"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Workday end minute"
 msgstr "কার্যদিবস সমাপ্তির মিনিট"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid "Workday start hour"
 msgstr "কার্যদিবস আরম্ভের ঘন্টা"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Workday start minute"
 msgstr "কার্যদিবস আরম্ভের মিনিট"
 
@@ -4842,10 +4859,10 @@ msgstr "গরমিল"
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:708
 #: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/gnome-cal.c:2113
+#: ../calendar/gui/gnome-cal.c:2094
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:588
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:581
 msgid "Calendar"
 msgstr "বর্ষপঞ্জি"
 
@@ -4890,36 +4907,9 @@ msgid "Weather"
 msgstr "আবহাওয়া"
 
 #: ../calendar/gui/calendar-component.c:535
-msgid "_New Calendar"
-msgstr "নতুন বর্ষপঞ্জি (_N)"
-
-#: ../calendar/gui/calendar-component.c:536
-#: ../calendar/gui/dialogs/comp-editor.c:428
-#: ../calendar/gui/e-calendar-table.c:1175
-#: ../calendar/gui/e-calendar-view.c:1556
-#: ../calendar/gui/tasks-component.c:440 ../composer/e-msg-composer.c:2911
-#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1035
-#: ../mail/message-list.c:1718 ../ui/evolution-addressbook.xml.h:32
-#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
-#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-tasks.xml.h:23
-msgid "_Copy"
-msgstr "কপি করুন (_C)"
-
-#. FIXME: need to disable for undeletable folders
-#: ../calendar/gui/calendar-component.c:537
-#: ../calendar/gui/e-calendar-table.c:1187
-#: ../calendar/gui/e-calendar-view.c:1569
-#: ../calendar/gui/tasks-component.c:441 ../mail/em-folder-tree.c:2054
-#: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:34
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
-#: ../ui/evolution-tasks.xml.h:24
-msgid "_Delete"
-msgstr "মুছে ফেলুন (_D)"
-
-#: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/tasks-component.c:442
-msgid "_Properties..."
-msgstr "বৈশিষ্ট্যাবলী...(_P)"
+#: ../calendar/gui/dialogs/calendar-setup.c:449
+msgid "New Calendar"
+msgstr "নতুন বর্ষপঞ্জি"
 
 #: ../calendar/gui/calendar-component.c:858
 msgid "Failed upgrading calendars."
@@ -4944,7 +4934,7 @@ msgstr "নতুন সাক্ষাত্‍কার"
 
 #: ../calendar/gui/calendar-component.c:1476
 msgid "_Appointment"
-msgstr "সাক্ষাত্‍কার (_A)"
+msgstr "সাক্ষাত্‍কার (_স)"
 
 #: ../calendar/gui/calendar-component.c:1477
 msgid "Create a new appointment"
@@ -4956,7 +4946,7 @@ msgstr "নতুন সভা"
 
 #: ../calendar/gui/calendar-component.c:1484
 msgid "M_eeting"
-msgstr "সভা (_e)"
+msgstr "সভা (_ভ)"
 
 #: ../calendar/gui/calendar-component.c:1485
 msgid "Create a new meeting request"
@@ -4968,7 +4958,7 @@ msgstr "নতুন সারাদিনব্যাপী সাক্ষা�
 
 #: ../calendar/gui/calendar-component.c:1492
 msgid "All Day A_ppointment"
-msgstr "সারাদিনব্যাপী সাক্ষাত্‍কার (_p)"
+msgstr "সারাদিনব্যাপী সাক্ষাত্‍কার (_দ)"
 
 #: ../calendar/gui/calendar-component.c:1493
 msgid "Create a new all-day appointment"
@@ -4980,7 +4970,7 @@ msgstr "নতুন বর্ষপঞ্জি"
 
 #: ../calendar/gui/calendar-component.c:1500
 msgid "Cale_ndar"
-msgstr "বর্ষপঞ্জি (_n)"
+msgstr "বর্ষপঞ্জি (_ব)"
 
 #: ../calendar/gui/calendar-component.c:1501
 msgid "Create a new calendar"
@@ -5036,7 +5026,7 @@ msgstr "সতর্কধ্বনি যোগ করুন"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
 msgid "Custom _message"
-msgstr "স্বনির্বচিত বার্তা (_m)"
+msgstr "স্বনির্বচিত বার্তা (_স)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
 msgid "Custom alarm sound"
@@ -5044,7 +5034,7 @@ msgstr "স্বনির্বাচিত সতর্কধ্বনির �
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
 msgid "Mes_sage:"
-msgstr "বার্তা (_s):"
+msgstr "বার্তা (_ব):"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
 #: ../calendar/gui/e-alarm-list.c:444
@@ -5072,19 +5062,19 @@ msgstr "একটি ই-মেইল প্রেরণ করুন"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 msgid "_Arguments:"
-msgstr "আর্গুমেন্ট (_A):"
+msgstr "আর্গুমেন্ট (_গ):"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
 msgid "_Program:"
-msgstr "প্রোগ্রাম (_P):"
+msgstr "প্রোগ্রাম (_প):"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
 msgid "_Repeat the alarm"
-msgstr "পুনরায় সতর্কধ্বনি বাজাও (_R)"
+msgstr "পুনরায় সতর্কধ্বনি বাজাও (_ন)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "_Sound:"
-msgstr "আওয়াজ (_S):"
+msgstr "আওয়াজ (_জ):"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
 msgid "after"
@@ -5133,7 +5123,7 @@ msgstr "কর্ম/ট্রিগার"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
 msgid "A_dd"
-msgstr "যোগ করুন (_d)"
+msgstr "যোগ করুন (_য)"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 msgid "Alarms"
@@ -5162,41 +5152,41 @@ msgstr "%.0fG"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:311
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
-#: ../calendar/gui/dialogs/comp-editor.c:2459
+#: ../calendar/gui/dialogs/comp-editor.c:2440
 #: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:444
 #: ../mail/em-utils.c:481 ../widgets/misc/e-attachment-bar.c:341
 msgid "attachment"
 msgstr "সংযুক্ত বস্তু"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:473
-#: ../calendar/gui/dialogs/comp-editor.c:1099
-#: ../calendar/gui/dialogs/meeting-page.c:908
+#: ../calendar/gui/dialogs/comp-editor.c:1083
+#: ../calendar/gui/dialogs/meeting-page.c:887
 #: ../composer/e-msg-composer-attachment-bar.c:470
 #: ../composer/e-msg-composer.c:3400
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
-msgstr "সরাও (_R)"
+msgstr "সরাও (_স)"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:474
-#: ../calendar/gui/dialogs/comp-editor.c:1100
+#: ../calendar/gui/dialogs/comp-editor.c:1084
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3401 ../mail/em-folder-tree.c:2058
+#: ../composer/e-msg-composer.c:3401 ../mail/em-folder-tree.c:2047
 #: ../ui/evolution-mail-list.xml.h:29
 msgid "_Properties"
-msgstr "বৈশিষ্ট্যাবলী (_P)"
+msgstr "বৈশিষ্ট্যাবলী (_ব)"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:476
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1086
 #: ../composer/e-msg-composer-attachment-bar.c:473
 #: ../composer/e-msg-composer.c:3403
 msgid "_Add attachment..."
-msgstr "বস্তু সংযুক্ত করুন (_A)..."
+msgstr "বস্তু সংযুক্ত করুন (য)..."
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:736
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:969
+#: ../widgets/misc/e-attachment-bar.c:963
 msgid "Attachment Bar"
 msgstr "সংযুক্ত বস্তু প্রদর্শনের বার"
 
@@ -5272,29 +5262,29 @@ msgstr "MIME -এর ধরন:"
 msgid "Enabled"
 msgstr "সক্রিয়"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:730
 msgid "Are you sure you want to remove this URL?"
 msgstr "এই ইউআরএলটি কি আপনি নিশ্চিতরূপে মুছে ফেলতে ইচ্ছুক?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:736
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:733
 msgid "Remove"
 msgstr "মুছে ফেলুন"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:741
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:738
 msgid "Don't Remove"
 msgstr "মুছে ফেলা হবে না"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:823
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:856
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:853
 #: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
 #: ../mail/em-account-prefs.c:406
 msgid "Disable"
 msgstr "নিষ্ক্রিয় করুন"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:823
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:858
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:855
 #: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
 #: ../mail/em-account-prefs.c:408
 msgid "Enable"
@@ -5350,7 +5340,8 @@ msgstr "<b>কর্মসপ্তাহ</b>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #, 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>"
@@ -5370,7 +5361,7 @@ msgstr "আজকের জন্য নির্ধারিত কাজের
 # FIXME
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Day _ends:"
-msgstr "দিনের সমাপ্তি (_e):"
+msgstr "দিনের সমাপ্তি (_স):"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Days"
@@ -5383,14 +5374,14 @@ msgstr "প্রদর্শন করা হবে"
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 #: ../mail/mail-config.glade.h:74
 msgid "E_nable"
-msgstr "সক্রিয় করুন (_n)"
+msgstr "সক্রিয় করুন (_স)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Free/Busy"
 msgstr "মুক্ত/ব্যস্ত"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
+#: ../calendar/gui/dialogs/recurrence-page.c:1048
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Friday"
 msgstr "শুক্রবার"
@@ -5404,7 +5395,7 @@ msgid "Minutes"
 msgstr "মিনিট"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Monday"
 msgstr "সোমবার"
@@ -5416,66 +5407,66 @@ msgstr "প্রকাশনার ব্যবহৃত টেবিল"
 # FIXME
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "S_un"
-msgstr "রবি (_u)"
+msgstr "রবি (_র)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1049
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Saturday"
 msgstr "শনিবার"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Sh_ow a reminder"
-msgstr "একটি তাগিদ প্রদর্শন করুন (_o)"
+msgstr "একটি তাগিদ প্রদর্শন করুন (_দ)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Show week _numbers in date navigator"
-msgstr "তারিখ নেভিগেটরে সপ্তাহের সংখ্যা প্রদর্শন করা হবে (_n)"
+msgstr "তারিখ নেভিগেটরে সপ্তাহের সংখ্যা প্রদর্শন করা হবে (_স)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1051
+#: ../calendar/gui/dialogs/recurrence-page.c:1050
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Sunday"
 msgstr "রবিবার"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "T_asks due today:"
-msgstr "আজকের জন্য নির্ধারিত কাজ (_a):"
+msgstr "আজকের জন্য নির্ধারিত কাজ (_জ):"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "T_hu"
-msgstr "বৃহঃ (_h)"
+msgstr "বৃহঃ (_হ)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Template:"
 msgstr "টেমপ্লেট:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Thursday"
 msgstr "বৃহঃস্পতিবার"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Time _zone:"
-msgstr "সময়-অঞ্চল (_z):"
+msgstr "সময়-অঞ্চল (_ম):"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Time format:"
 msgstr "সময় বিন্যাস:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Tuesday"
 msgstr "মঙ্গলবার"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "W_eek starts:"
-msgstr "সপ্তাহের শুরু (_e):"
+msgstr "সপ্তাহের শুরু (_প):"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
 #: ../calendar/gui/e-itip-control.c:732
 msgid "Wednesday"
 msgstr "বুধবার"
@@ -5486,63 +5477,63 @@ msgstr "কার্যদিবস:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_12 hour (AM/PM)"
-msgstr "১২ ঘন্টা (পূর্বাহ্ণ/অপরাহ্ণ) (_1)"
+msgstr "১২ ঘন্টা (পূর্বাহ্ণ/অপরাহ্ণ) (_১)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_24 hour"
-msgstr "২৪ ঘন্টা (_2)"
+msgstr "২৪ ঘন্টা (_২)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Add URL"
-msgstr "URL যোগ করুন (_A)"
+msgstr "URL যোগ করুন (_য)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Ask for confirmation when deleting items"
-msgstr "কিছু মুছে ফেলার পূর্বে নিশ্চিত হওয়ার জন্য জিঞ্জাসা করা হবে (_A)"
+msgstr "কিছু মুছে ফেলার পূর্বে নিশ্চিত হওয়ার জন্য জিঞ্জাসা করা হবে (_জ)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Compress weekends in month view"
-msgstr "মাস অনুযায়ী প্রদর্শন ক্ষেত্রে সাপ্তাহান্তের ছুটি একত্রিত করা হবে(_C)"
+msgstr "মাস অনুযাীয়ী প্রদর্শন ক্ষেত্রে সাপ্তাহান্তের ছুটি একত্রিত করা হবে"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Day begins:"
-msgstr "দিনের আরম্ভ: (_D)"
+msgstr "দিনের আরম্ভ: (_দ)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Fri"
-msgstr "শুক্র (_F)"
+msgstr "শুক্র (_শ)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Hide completed tasks after"
-msgstr "উল্লিখিত সময়ের পর সম্পন্ন কর্ম আড়াল করা হবে (_H)"
+msgstr "উল্লিখিত সময়ের পর সম্পন্ন কর্ম আড়াল করা হবে (_ল)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Mon"
-msgstr "সোম (_M)"
+msgstr "সোম (_ম)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Overdue tasks:"
-msgstr "সময়োত্তীর্ণ কাজ (_O):"
+msgstr "সময়োত্তীর্ণ কাজ (_য়):"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Sat"
-msgstr "শনি (_S)"
+msgstr "শনি (_ই)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Show appointment end times in week and month views"
-msgstr "সপ্তাহ ও মাস অনুযায়ী প্রদর্শন ক্ষেত্রে সাক্ষাত্‍কার সমাপ্তির সময় প্রদর্শন করা হবে (_S)"
+msgstr "সপ্তাহ ও মাস অনুযায়ী প্রদর্শন ক্ষেত্রে সাক্ষাত্‍কার সমাপ্তির সময় প্রদর্শন করা হবে (_প)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Time divisions:"
-msgstr "সময় বিভাজন: (_T)"
+msgstr "সময় বিভাজন: (_ম)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Tue"
-msgstr "মঙ্গল (_T)"
+msgstr "মঙ্গল (_ম)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Wed"
-msgstr "বুধ (_W)"
+msgstr "বুধ (_ব)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "before every appointment"
@@ -5567,7 +5558,7 @@ msgstr "অফলাইন কর্মের উদ্দেশ্যে কা
 #: ../calendar/gui/dialogs/calendar-setup.c:341
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
-msgstr "রঙ (_o):"
+msgstr "রঙ (_র):"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:378
 msgid "Tasks List"
@@ -5577,10 +5568,6 @@ msgstr "কার্য-তালিকা"
 msgid "Calendar Properties"
 msgstr "বর্ষপঞ্জির বৈশিষ্ট্যাবলী"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:449
-msgid "New Calendar"
-msgstr "নতুন বর্ষপঞ্জি"
-
 #: ../calendar/gui/dialogs/calendar-setup.c:515
 msgid "Task List Properties"
 msgstr "কার্য-তালিকার বৈশিষ্ট্যাবলী"
@@ -5600,22 +5587,22 @@ msgstr "একটি রঙ নির্বাচন করুন"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
-msgstr "বর্ষপঞ্জি যোগ করুন (_A)"
+msgstr "বর্ষপঞ্জি যোগ করুন (_ব)"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Task List"
-msgstr "কার্য-তালিকা যোগ করুন (_A)"
+msgstr "কার্য-তালিকা যোগ করুন (_ক)"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:9
 #: ../plugins/calendar-http/calendar-http.c:248
 #: ../plugins/calendar-weather/calendar-weather.c:548
 msgid "_Refresh:"
-msgstr "নতুন করে প্রদর্শন করা হবে (_R):"
+msgstr "নতুন করে প্রদর্শন করা হবে (_ন):"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:11
 #: ../plugins/calendar-http/calendar-http.c:120
 msgid "_URL:"
-msgstr "_URL:"
+msgstr "ইউআরএল (_উ):"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:15
 #: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:266
@@ -5676,24 +5663,24 @@ msgstr "%s  আপনি কোনো পরিবর্তন সাধন ক�
 msgid "Validation error: %s"
 msgstr "বৈধতা সংক্রান্ত ত্রুটি: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2270
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2261
 msgid " to "
 msgstr " প্রতি "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2274
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2265
 msgid " (Completed "
 msgstr " (সম্পন্ন "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2276
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2267
 msgid "Completed "
 msgstr "সম্পন্ন"
 
 # FIXME
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2281
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2272
 msgid " (Due "
 msgstr " (পূর্বনির্ধারিত "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2283
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2274
 msgid "Due "
 msgstr "পূর্বনির্ধারিত "
 
@@ -5712,16 +5699,26 @@ msgid_plural "%d attached messages"
 msgstr[0] "সংযুক্ত বার্তা"
 msgstr[1] "%d-টি সংযুক্ত বার্তা"
 
+#: ../calendar/gui/dialogs/comp-editor.c:428
+#: ../calendar/gui/e-calendar-table.c:1162
+#: ../calendar/gui/e-calendar-view.c:1535 ../composer/e-msg-composer.c:2911
+#: ../mail/em-folder-tree.c:974 ../mail/em-folder-view.c:1035
+#: ../mail/message-list.c:1708 ../ui/evolution-addressbook.xml.h:31
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-tasks.xml.h:21
+msgid "_Copy"
+msgstr "কপি করুন (_ক)"
+
 #: ../calendar/gui/dialogs/comp-editor.c:429 ../composer/e-msg-composer.c:2912
-#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1719
+#: ../mail/em-folder-tree.c:975 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1709
 msgid "_Move"
-msgstr "স্থানান্তর করুন (_M)"
+msgstr "সরাও (_স)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:431 ../composer/e-msg-composer.c:2914
-#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1721
+#: ../mail/em-folder-tree.c:977 ../mail/message-list.c:1711
 msgid "Cancel _Drag"
-msgstr "ড্র্যাগ প্রক্রিয়া বাতিল করুন (_D)"
+msgstr "ড্র্যাগ প্রক্রিয়া বাতিল করুন (_b)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:774
 msgid "Could not update object"
@@ -5734,66 +5731,58 @@ msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> -টি সংযুক্ত বস্তু"
 msgstr[1] "<b>%d</b> -টি ফাইল সংযুক্ত"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1007
-msgid "Hide Attachment _Bar"
-msgstr "সংযুক্ত বস্তুর বার আড়াল করুন (_B)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1010
-#: ../calendar/gui/dialogs/comp-editor.c:1265
-msgid "Show Attachment _Bar"
-msgstr "সংযুক্ত বস্তুসহ বার প্রদর্শন করা হবে (_B)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1289
-msgid "Attachment Button: Press space key to toggle attachment bar"
-msgstr ""
+#: ../calendar/gui/dialogs/comp-editor.c:1249
+msgid "_Attachment Bar (drop attachments here)"
+msgstr "সংযুক্ত বস্তু প্রদর্শনের বার (সংযুক্ত বস্তু এই স্থানে যোগ করুন) (_স)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1868
-#: ../calendar/gui/dialogs/comp-editor.c:1911
+#: ../calendar/gui/dialogs/comp-editor.c:1850
+#: ../calendar/gui/dialogs/comp-editor.c:1893
 msgid "Edit Appointment"
 msgstr "সাক্ষাত্‍কার সম্পাদন করুন"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1874
-#: ../calendar/gui/dialogs/comp-editor.c:1917
+#: ../calendar/gui/dialogs/comp-editor.c:1856
+#: ../calendar/gui/dialogs/comp-editor.c:1899
 #, c-format
 msgid "Meeting - %s"
 msgstr "সভা - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1876
-#: ../calendar/gui/dialogs/comp-editor.c:1919
+#: ../calendar/gui/dialogs/comp-editor.c:1858
+#: ../calendar/gui/dialogs/comp-editor.c:1901
 #, c-format
 msgid "Appointment - %s"
 msgstr "সাক্ষাত্‍কার - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1880
-#: ../calendar/gui/dialogs/comp-editor.c:1923
+#: ../calendar/gui/dialogs/comp-editor.c:1862
+#: ../calendar/gui/dialogs/comp-editor.c:1905
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "নির্ধারিত কর্ম - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1882
-#: ../calendar/gui/dialogs/comp-editor.c:1925
+#: ../calendar/gui/dialogs/comp-editor.c:1864
+#: ../calendar/gui/dialogs/comp-editor.c:1907
 #, c-format
 msgid "Task - %s"
 msgstr "কর্ম - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1885
-#: ../calendar/gui/dialogs/comp-editor.c:1928
+#: ../calendar/gui/dialogs/comp-editor.c:1867
+#: ../calendar/gui/dialogs/comp-editor.c:1910
 #, c-format
 msgid "Journal entry - %s"
 msgstr "সাময়িকীর এন্ট্রি - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1896
-#: ../calendar/gui/dialogs/comp-editor.c:1938
+#: ../calendar/gui/dialogs/comp-editor.c:1878
+#: ../calendar/gui/dialogs/comp-editor.c:1920
 msgid "No summary"
 msgstr "সারাংশহীন"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2551
-#: ../calendar/gui/dialogs/comp-editor.c:2584
-#: ../calendar/gui/dialogs/comp-editor.c:2608
+#: ../calendar/gui/dialogs/comp-editor.c:2528
+#: ../calendar/gui/dialogs/comp-editor.c:2561
+#: ../calendar/gui/dialogs/comp-editor.c:2585
 msgid "Changes made to this item may be discarded if an update arrives"
-msgstr "কোনো আপডেটের আবির্ভাব ঘটলে এখানে যেসব পরিবর্তন করা হয়েছে তা বাতিল করা হতে পারে"
+msgstr ""
+"কোনো আপডেটের আবির্ভাব ঘটলে এখানে যেসব পরিবর্তন করা হয়েছে তা বাতিল করা হতে পারে"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2632
+#: ../calendar/gui/dialogs/comp-editor.c:2609
 msgid "Unable to use current version!"
 msgstr "বর্তমান সংস্করণ ব্যবহার করা সম্ভব হয়নি!"
 
@@ -5872,32 +5861,32 @@ msgstr "বন্টন করুন:"
 msgid "Enter Delegate"
 msgstr "প্রতিনিধির নাম লিখুন"
 
-#: ../calendar/gui/dialogs/event-editor.c:141
-msgid "Appoint_ment"
-msgstr "সাক্ষাত্‍কার(_m)"
+#: ../calendar/gui/dialogs/event-editor.c:141 ../calendar/gui/print.c:2298
+msgid "Appointment"
+msgstr "সাক্ষাত্‍কার"
 
 #: ../calendar/gui/dialogs/event-editor.c:150
-msgid "_Recurrence"
-msgstr "পুনরাবৃত্তি(_R)"
+msgid "Recurrence"
+msgstr "পুনরাবৃত্তি"
 
 #: ../calendar/gui/dialogs/event-editor.c:164
 #: ../calendar/gui/dialogs/event-editor.c:248
 #: ../calendar/gui/dialogs/event-editor.c:422
-msgid "Schedulin_g"
-msgstr "অনুসূচনা(_g)"
+msgid "Scheduling"
+msgstr "অনুসূচনা"
 
 #: ../calendar/gui/dialogs/event-editor.c:174
-msgid "_Delegatees"
-msgstr "প্রতিনিধিবৃন্দ(_D)"
+msgid "Delegatees"
+msgstr "প্রতিনিধিবৃন্দ"
 
 #: ../calendar/gui/dialogs/event-editor.c:178
-msgid "_Attendees"
-msgstr "অংশগ্রহণকারীবৃন্দ(_A)"
+msgid "Attendees"
+msgstr "অংশগ্রহণকারীবৃন্দ"
 
 #: ../calendar/gui/dialogs/event-editor.c:251
 #: ../calendar/gui/dialogs/event-editor.c:425
-msgid "In_vitations"
-msgstr "আমন্ত্রনপত্র(_v)"
+msgid "Invitations"
+msgstr "আমন্ত্রনপত্র"
 
 #: ../calendar/gui/dialogs/event-page.c:731
 msgid "Event with no start date"
@@ -5980,95 +5969,96 @@ msgstr "<b>প্রেরণ সংক্রান্ত অপশন</b>"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:8
 msgid "A_ll day event"
-msgstr "সারাদিনব্যাপী ঘটনা (_l)"
+msgstr "সারাদিনব্যাপী ঘটনা (_ব)"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Ad_vanced send options"
-msgstr "প্রেরণ সংক্রান্ত উন্নত অপশন (_v)"
+msgstr "প্রেরণ সংক্রান্ত উন্নত অপশন (_ত)"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:10
-msgid "Ala_rm"
-msgstr "সতর্কধ্বনি(_r)"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:11
 msgid "C_ustomize..."
-msgstr "স্বনির্বাচিত (_u)..."
+msgstr "স্বনির্বাচিত (_ন)..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/task-page.glade.h:5
 msgid "Ca_tegories..."
-msgstr "শ্রেণীবিভাগ (_t)..."
+msgstr "শ্রেণীবিভাগ (_শ)..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Cale_ndar:"
-msgstr "বর্ষপঞ্জি(_n)"
+msgstr "বর্ষপঞ্জি(_ব)"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Classi_fication:"
-msgstr "শ্রেণীবিভাগ (_f):"
+msgstr "শ্রেণীবিভাগ (_শ):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:8
 #: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:364
+#: ../calendar/gui/e-calendar-table.c:360
 msgid "Confidential"
 msgstr "গোপনীয়"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:16
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Event Description"
 msgstr "ঘটনা সংক্রান্ত বিবরণ:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:17
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "Locat_ion:"
-msgstr "অবস্থান (_i):"
+msgstr "অবস্থান (_ব):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:18
+#: ../calendar/gui/dialogs/event-page.glade.h:17
 #: ../calendar/gui/dialogs/task-page.glade.h:10
 #: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:359
 msgid "Private"
 msgstr "ব্যক্তিগত"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:19
+#: ../calendar/gui/dialogs/event-page.glade.h:18
 #: ../calendar/gui/dialogs/task-page.glade.h:11
 #: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:362
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:358
 msgid "Public"
 msgstr "পাবলিক"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:20
-msgid "Show time as bus_y"
-msgstr "ব্যস্ত হিসাবে সময় প্রদর্শন করা হবে(_y)"
+#: ../calendar/gui/dialogs/event-page.glade.h:19
+msgid "Show time as _busy"
+msgstr "ব্যস্ত হিসাবে সময় প্রদর্শন করা হবে"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:21
+#: ../calendar/gui/dialogs/event-page.glade.h:20
 #: ../calendar/gui/dialogs/task-page.glade.h:13
 msgid "Su_mmary:"
-msgstr "সারাংশ (_m):"
+msgstr "সারাংশ (_র):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:22
+#: ../calendar/gui/dialogs/event-page.glade.h:21
 msgid "This appointment has customized alarms"
 msgstr "এই সাক্ষাত্কারের জন্য স্বনির্বাচিত সতর্কধ্বনি রয়েছে"
 
+#: ../calendar/gui/dialogs/event-page.glade.h:22
+msgid "_Alarm"
+msgstr "সতর্কধ্বনি (_ত)"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:23
 msgid "_Description:"
-msgstr "বর্ণণা (_D):"
+msgstr "বর্ণণা (_ব):"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:24
-#: ../calendar/gui/e-meeting-time-sel.c:645
+#: ../calendar/gui/e-meeting-time-sel.c:642
 msgid "_End time:"
-msgstr "সমাপ্তির সময় (_E):"
+msgstr "সমাপ্তির সময় (_ম):"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:25
-#: ../calendar/gui/e-meeting-time-sel.c:618
+#: ../calendar/gui/e-meeting-time-sel.c:615
 msgid "_Start time:"
-msgstr "আরম্ভের সময় (_S):"
+msgstr "আরম্ভের সময় (_র):"
 
-#: ../calendar/gui/dialogs/meeting-page.c:305
+#: ../calendar/gui/dialogs/meeting-page.c:303
 msgid "<b>Dele_gatees</b>"
-msgstr "<b>প্রতিনিধিবৃন্দ(_g)</b>"
+msgstr "<b>প্রতিনিধিবৃন্দ(_প)</b>"
 
-#: ../calendar/gui/dialogs/meeting-page.c:309
+#: ../calendar/gui/dialogs/meeting-page.c:307
 msgid "<b>From:</b>"
 msgstr "<b>প্রেরক:</b>"
 
@@ -6077,7 +6067,7 @@ msgstr "<b>প্রেরক:</b>"
 #. When "None" is selected we want the field to be cleared.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../calendar/gui/dialogs/meeting-page.c:315
+#: ../calendar/gui/dialogs/meeting-page.c:313
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:653
 #: ../calendar/gui/e-itip-control.c:1106 ../composer/e-msg-composer.c:2122
@@ -6094,23 +6084,24 @@ msgstr "<b>প্রেরক:</b>"
 msgid "None"
 msgstr "একটিও নয়"
 
-#: ../calendar/gui/dialogs/meeting-page.c:463
+#: ../calendar/gui/dialogs/meeting-page.c:461
 msgid "The organizer selected no longer has an account."
 msgstr "যে সংগঠকেকে নির্বাচন করা হয়েছে তার কোনো অ্যাকাউন্ট বর্তমানে উপস্থিত নেই।"
 
-#: ../calendar/gui/dialogs/meeting-page.c:469
+#: ../calendar/gui/dialogs/meeting-page.c:467
 msgid "An organizer is required."
 msgstr "একটি সংগঠক আবশ্যক"
 
-#: ../calendar/gui/dialogs/meeting-page.c:484
+#: ../calendar/gui/dialogs/meeting-page.c:482
 msgid "At least one attendee is required."
 msgstr "অন্তত একজন অংশগ্রহণকারী আবশ্যক।"
 
-#: ../calendar/gui/dialogs/meeting-page.c:909
-msgid "_Add "
-msgstr "যোগ করুন (_A)"
+#: ../calendar/gui/dialogs/meeting-page.c:884
+msgid "_Delegate To..."
+msgstr "বন্টন করুন (_ব)..."
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
+#: ../calendar/gui/e-meeting-list-view.c:358
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "অংশগ্রহণকারী"
@@ -6146,14 +6137,15 @@ msgid "Member"
 msgstr "সদস্য"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:399
+#: ../calendar/gui/e-meeting-list-view.c:386
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "আর-এস-ভি-পি"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
+#: ../calendar/gui/dialogs/task-editor.c:147
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:410
+#: ../calendar/gui/e-meeting-list-view.c:394
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
 #: ../mail/message-list.etspec.h:12
 msgid "Status"
@@ -6161,19 +6153,20 @@ msgstr "অবস্থা"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:1
 msgid "<b>Att_endees</b>"
-msgstr "<b>অংশগ্রহণকারী (_e)</b>"
+msgstr "<b>অংশগ্রহণকারী (_গ)</b>"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:2
 msgid "C_hange Organizer"
-msgstr "সংগঠক পরিবর্তন করুন (_h)"
+msgstr "সংগঠক পরিবর্তন করুন (_র)"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Co_ntacts..."
-msgstr "পরিচিতি...(_n)"
+#: ../calendar/gui/e-meeting-time-sel.c:428
+msgid "Con_tacts..."
+msgstr "পরিচিতি (_চ)..."
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 msgid "Or_ganizer:"
-msgstr "সংগঠক(_g):"
+msgstr "সংগঠক(_গ):"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "Organizer"
@@ -6227,15 +6220,16 @@ msgstr "আপনি একটি রেকারিং ঘটনা বদল �
 #: ../calendar/gui/dialogs/recur-comp.c:54
 msgid "You are delegating a recurring event, what would like to delegate?"
 msgstr ""
-"আপনি একটি পুনরাবৃত্তি করার যোগ্য ঘটনা বন্টন করার প্রচেষ্টা করছেন, আপনি কোোন অংশটি "
-"বন্টন করতে ইচ্ছুক?"
+"আপনি একটি পুনরাবৃত্তি করার যোগ্য ঘটনা বন্টন করার প্রচেষ্টা করছেন, আপনি "
+"কোোন অংশটি বন্টন করতে ইচ্ছুক?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:58
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "আপনি একটি রেকারিং কার্য বদল করছেন,আপনি কী বদলাতে ইচ্ছুক?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:62
-msgid "You are modifying a recurring journal entry, what would you like to modify?"
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
 msgstr "আপনি একটি রেকারিং সাময়ীকি এন্ট্রি বদল করছেন,আপনি কী বদলাতে ইচ্ছুক?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:90
@@ -6254,53 +6248,53 @@ msgstr "এটি এবং ভবিষ্যতের ইনস্ট্যা
 msgid "All Instances"
 msgstr "সমস্ত ইনস্ট্যান্স"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:497
+#: ../calendar/gui/dialogs/recurrence-page.c:496
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "চিহ্নিত সাক্ষাত্‍‌কারের মধ্যে উপস্থিত পুনরাবৃত্তিকর বিষয়বস্ত Evolution-র দ্বারা সম্পাদন "
 "করা সম্ভব নয়।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:818
+#: ../calendar/gui/dialogs/recurrence-page.c:817
 msgid "Recurrence date is invalid"
 msgstr "রেকারেন্সের তারিখ বৈধ নয়"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:929
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "উপর"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:989
+#: ../calendar/gui/dialogs/recurrence-page.c:988
 msgid "first"
 msgstr "প্রথম"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:990
+#: ../calendar/gui/dialogs/recurrence-page.c:989
 msgid "second"
 msgstr "দ্বিতীয়"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:991
+#: ../calendar/gui/dialogs/recurrence-page.c:990
 msgid "third"
 msgstr "তৃতীয়"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#: ../calendar/gui/dialogs/recurrence-page.c:991
 msgid "fourth"
 msgstr "চতুর্থ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:993
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "last"
 msgstr "শেষ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1016
+#: ../calendar/gui/dialogs/recurrence-page.c:1015
 msgid "Other Date"
 msgstr "অন্য তারিখ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
 msgid "day"
 msgstr "দিন"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1181
+#: ../calendar/gui/dialogs/recurrence-page.c:1180
 msgid "on the"
 msgstr "এর উপর"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1370
+#: ../calendar/gui/dialogs/recurrence-page.c:1369
 msgid "occurrences"
 msgstr "ঘটনাসমূহ"
 
@@ -6327,7 +6321,7 @@ msgstr "প্রত্যেক"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "This appointment rec_urs"
-msgstr "চিহ্নিত সাক্ষাত্‍‌কার পুনরাবৃত্তি হয়(_u)"
+msgstr "চিহ্নিত সাক্ষাত্‍‌কার পুনরাবৃত্তি হয়"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
@@ -6376,15 +6370,15 @@ msgstr "<span weight=\"bold\">অবস্থা</span>"
 #: ../calendar/gui/e-cal-component-preview.c:229
 #: ../calendar/gui/e-cal-model-tasks.c:346
 #: ../calendar/gui/e-cal-model-tasks.c:659
-#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-calendar-table.c:455 ../calendar/gui/e-itip-control.c:898
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../calendar/gui/print.c:2370 ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/print.c:2361 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "সম্পন্ন"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-calendar-table.c:384 ../mail/message-list.c:1018
+#: ../calendar/gui/e-calendar-table.c:380 ../mail/message-list.c:1008
 msgid "High"
 msgstr "উঁচু"
 
@@ -6393,20 +6387,20 @@ msgstr "উঁচু"
 #: ../calendar/gui/e-cal-model-tasks.c:344
 #: ../calendar/gui/e-cal-model-tasks.c:657
 #: ../calendar/gui/e-cal-model-tasks.c:732
-#: ../calendar/gui/e-calendar-table.c:458 ../calendar/gui/print.c:2367
+#: ../calendar/gui/e-calendar-table.c:454 ../calendar/gui/print.c:2358
 msgid "In Progress"
 msgstr "চলছে"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1016
+#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1006
 msgid "Low"
 msgstr "নিচু"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model.c:920 ../calendar/gui/e-calendar-table.c:385
-#: ../mail/message-list.c:1017
+#: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:381
+#: ../mail/message-list.c:1007
 msgid "Normal"
 msgstr "স্বাভাবিক"
 
@@ -6414,50 +6408,45 @@ msgstr "স্বাভাবিক"
 #: ../calendar/gui/e-cal-component-preview.c:236
 #: ../calendar/gui/e-cal-model-tasks.c:342
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:457 ../calendar/gui/print.c:2364
+#: ../calendar/gui/e-calendar-table.c:453 ../calendar/gui/print.c:2355
 msgid "Not Started"
 msgstr "আরম্ভ হয়নি"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:10
 msgid "P_ercent complete:"
-msgstr "শতাংশ সম্পন্ন (_e):"
+msgstr "শতাংশ সম্পন্ন (_শ):"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:11
-msgid "Stat_us:"
-msgstr "অবস্থা:(_u)"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:383
 msgid "Undefined"
 msgstr "অনুল্লেখকৃত"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "_Date completed:"
-msgstr "সমাপ্তির তারিখ (_D):"
+msgstr "সমাপ্তির তারিখ (_স):"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:14
+#: ../calendar/gui/dialogs/task-details-page.glade.h:13
 #: ../widgets/misc/e-send-options.glade.h:31
 msgid "_Priority:"
-msgstr "অগ্রগণ্য (_P):"
+msgstr "অগ্রগণ্য (_গ):"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:14
+msgid "_Status:"
+msgstr "অবস্থা (_ব):"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Web Page:"
-msgstr "ওয়েব পেজে (_W):"
-
-#: ../calendar/gui/dialogs/task-editor.c:137
-#: ../calendar/gui/tasks-component.c:1171
-msgid "_Task"
-msgstr "কাজ (_T)"
+msgstr "ওয়েব পেজে (_ব):"
 
-#: ../calendar/gui/dialogs/task-editor.c:146
-msgid "_Status"
-msgstr "অবস্থা: (_S)"
+#: ../calendar/gui/dialogs/task-editor.c:138 ../calendar/gui/print.c:2300
+msgid "Task"
+msgstr "কাজ"
 
-#: ../calendar/gui/dialogs/task-editor.c:161
-#: ../calendar/gui/dialogs/task-editor.c:223
-#: ../calendar/gui/dialogs/task-editor.c:380
-msgid "Assig_nment"
-msgstr "কর্ম(_n)"
+#: ../calendar/gui/dialogs/task-editor.c:162
+#: ../calendar/gui/dialogs/task-editor.c:224
+#: ../calendar/gui/dialogs/task-editor.c:378
+msgid "Assignment"
+msgstr "কর্ম"
 
 #: ../calendar/gui/dialogs/task-page.c:529
 msgid "Due date is wrong"
@@ -6468,17 +6457,13 @@ msgstr "দেয় তারিখ সঠিক নয়"
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s'-এ উপস্থিত কার্য খোলা সম্ভব হয়নি।"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:5
-msgid "Categor_ies..."
-msgstr "শ্রেণীবিভাগ...(_i)"
-
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "D_escription:"
-msgstr "বিবরণ (_e):"
+msgstr "বিবরণ (_ব):"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:12
 msgid "Sta_rt date:"
-msgstr "আরম্ভের তারিখ (_r):"
+msgstr "আরম্ভের তারিখ (_ত):"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:14
 msgid "Task Description"
@@ -6486,15 +6471,15 @@ msgstr "কর্মের বিবরণ"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:15
 msgid "_Due date:"
-msgstr "দেয় তারিখ (_D):"
+msgstr "দেয় তারিখ (_দ):"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:16
 msgid "_Group:"
-msgstr "দল (_G):"
+msgstr "দল (_দ):"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Free/Busy C_alendars</b>"
-msgstr "<b>মুক্ত/ব্যস্ত বর্ষপঞ্জিকা (_a)</b>"
+msgstr "<b>মুক্ত/ব্যস্ত বর্ষপঞ্জিকা (_ষ)</b>"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
 msgid "<b>Publishing Frequency</b>"
@@ -6502,7 +6487,7 @@ msgstr "<b>প্রকাশনার হার</b>"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
 msgid "<b>Publishing _Location</b>"
-msgstr "<b>পাবলিশ করার অবস্থান (_L)</b>"
+msgstr "<b>পাবলিশ করার অবস্থান (_স)</b>"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
 msgid "Free/Busy Publishing Settings"
@@ -6510,27 +6495,27 @@ msgstr "মুক্ত/ব্যস্ত প্রকাশনা সংক্
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
 msgid "_Daily"
-msgstr "দৈনিক (_D)"
+msgstr "দৈনিক (_দ)"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
 msgid "_Manual"
-msgstr "সহায়িকা(_M)"
+msgstr "সহায়ক পুস্তিকা(_প)"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
 msgid "_Password:"
-msgstr "পাসওয়ার্ড (_P):"
+msgstr "পাসওয়ার্ড (_প):"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
 msgid "_Remember password"
-msgstr "এই পাসওয়ার্ডটি মনে রাখা হবে (_R)"
+msgstr "এই পাসওয়ার্ডটি মনে রাখবে (_ম)"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
 msgid "_Username:"
-msgstr "ব্যবহারকারীর নাম (_U):"
+msgstr "ব্যবহারকারীর নাম (_ব):"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:12
 msgid "_Weekly"
-msgstr "সাপ্তাহিক(_W)"
+msgstr "সাপ্তাহিক(_প)"
 
 #: ../calendar/gui/e-alarm-list.c:395
 #, c-format
@@ -6645,7 +6630,7 @@ msgstr "দেয় তারিখ:"
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:222
 #: ../calendar/gui/e-itip-control.c:1134
-#: ../plugins/exchange-operations/exchange-account-setup.c:265
+#: ../plugins/exchange-operations/exchange-account-setup.c:263
 #: ../plugins/itip-formatter/itip-view.c:909
 msgid "Status:"
 msgstr "অবস্থা:"
@@ -6673,13 +6658,13 @@ msgid "Summary"
 msgstr "সারাংশ"
 
 #: ../calendar/gui/e-cal-model-calendar.c:180
-#: ../calendar/gui/e-calendar-table.c:436
+#: ../calendar/gui/e-calendar-table.c:432
 msgid "Free"
 msgstr "মুক্ত"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:437
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-calendar-table.c:433
+#: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Busy"
 msgstr "ব্যস্ত"
 
@@ -6693,7 +6678,7 @@ msgstr ""
 "\n"
 "৪৫.৪৩৬৮৪৫, ১২৫.৮৬২৫০১"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:925
 #: ../calendar/gui/e-meeting-list-view.c:192
 #: ../calendar/gui/e-meeting-store.c:168 ../calendar/gui/e-meeting-store.c:178
 #: ../calendar/gui/e-meeting-store.c:808
@@ -6701,7 +6686,7 @@ msgstr ""
 msgid "Yes"
 msgstr "হ্যাঁ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:925
 #: ../calendar/gui/e-meeting-list-view.c:193
 #: ../calendar/gui/e-meeting-store.c:180
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
@@ -6718,136 +6703,145 @@ msgstr "না"
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1652
 #: ../plugins/plugin-manager/plugin-manager.c:72
-#: ../widgets/misc/e-attachment-bar.c:665
+#: ../widgets/misc/e-attachment-bar.c:659
 #: ../widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "অজানা"
 
-#: ../calendar/gui/e-cal-model.c:922
+#: ../calendar/gui/e-cal-model.c:921
 msgid "Recurring"
 msgstr "পুনরাবৃত্ত"
 
-#: ../calendar/gui/e-cal-model.c:924
+#: ../calendar/gui/e-cal-model.c:923
 msgid "Assigned"
 msgstr "বরাদ্দকৃত"
 
-#: ../calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:402
 msgid "0%"
 msgstr "০%"
 
-#: ../calendar/gui/e-calendar-table.c:407
+#: ../calendar/gui/e-calendar-table.c:403
 msgid "10%"
 msgstr "১০%"
 
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:404
 msgid "20%"
 msgstr "২০%"
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:405
 msgid "30%"
 msgstr "৩০%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:406
 msgid "40%"
 msgstr "৪০%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:407
 msgid "50%"
 msgstr "৫০%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "60%"
 msgstr "৬০%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "70%"
 msgstr "৭০%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "80%"
 msgstr "৮০%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "90%"
 msgstr "৯০%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "100%"
 msgstr "১০০%"
 
-#: ../calendar/gui/e-calendar-table.c:518
+#: ../calendar/gui/e-calendar-table.c:514
 msgid "Task Table"
 msgstr "কর্ম সংক্রান্ত টেবিল"
 
-#: ../calendar/gui/e-calendar-table.c:696
-#: ../calendar/gui/e-calendar-view.c:671
+#: ../calendar/gui/e-calendar-table.c:692
+#: ../calendar/gui/e-calendar-view.c:661
 msgid "Deleting selected objects"
 msgstr "নির্বাচিত অবজেক্টগুলি মোছা হচ্ছে"
 
-#: ../calendar/gui/e-calendar-table.c:875
-#: ../calendar/gui/e-calendar-view.c:799
+#: ../calendar/gui/e-calendar-table.c:871
+#: ../calendar/gui/e-calendar-view.c:789
 msgid "Updating objects"
 msgstr "অবজেক্টগুলি আপডেট করা হচ্ছে"
 
-#: ../calendar/gui/e-calendar-table.c:1025
-#: ../calendar/gui/e-calendar-view.c:1126 ../composer/e-msg-composer.c:1243
+#: ../calendar/gui/e-calendar-table.c:1012
+#: ../calendar/gui/e-calendar-view.c:1105 ../composer/e-msg-composer.c:1243
 msgid "Save as..."
 msgstr "নতুন নামে সংরক্ষণ..."
 
-#: ../calendar/gui/e-calendar-table.c:1168
+#: ../calendar/gui/e-calendar-table.c:1155
 msgid "Open _Web Page"
-msgstr "ওয়েব পেজ খুলুন (_W)"
+msgstr "ওয়েব পেজ খোলো (_প)"
 
-#: ../calendar/gui/e-calendar-table.c:1169
-#: ../calendar/gui/e-calendar-view.c:1550 ../mail/em-folder-view.c:1045
+#: ../calendar/gui/e-calendar-table.c:1156
+#: ../calendar/gui/e-calendar-view.c:1529 ../mail/em-folder-view.c:1045
 #: ../mail/em-popup.c:541 ../mail/em-popup.c:552
 msgid "_Save As..."
-msgstr "নতুন নামে সংরক্ষণ করুন (_S)..."
+msgstr "নতুন নামে সংরক্ষণ করুন (_র)..."
 
-#: ../calendar/gui/e-calendar-table.c:1170
-#: ../calendar/gui/e-calendar-view.c:1530
-#: ../calendar/gui/e-calendar-view.c:1551 ../mail/em-folder-view.c:1046
+#: ../calendar/gui/e-calendar-table.c:1157
+#: ../calendar/gui/e-calendar-view.c:1509
+#: ../calendar/gui/e-calendar-view.c:1530 ../mail/em-folder-view.c:1046
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:120 ../ui/evolution-tasks.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:120 ../ui/evolution-tasks.xml.h:27
 msgid "_Print..."
-msgstr "প্রিন্ট করুন (_P)..."
+msgstr "প্রিন্ট করুন (_প)..."
 
-#: ../calendar/gui/e-calendar-table.c:1174
-#: ../calendar/gui/e-calendar-view.c:1555 ../ui/evolution-addressbook.xml.h:1
+#: ../calendar/gui/e-calendar-table.c:1161
+#: ../calendar/gui/e-calendar-view.c:1534 ../ui/evolution-addressbook.xml.h:1
 #: ../ui/evolution-calendar.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
-msgstr "কাট করুন (_u)"
+msgstr "কাট করুন (_ট)"
 
-#: ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:1533
-#: ../calendar/gui/e-calendar-view.c:1557 ../ui/evolution-addressbook.xml.h:39
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:1512
+#: ../calendar/gui/e-calendar-view.c:1536 ../ui/evolution-addressbook.xml.h:38
 #: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
-#: ../ui/evolution-tasks.xml.h:28
+#: ../ui/evolution-tasks.xml.h:26
 msgid "_Paste"
-msgstr "পেস্ট করুন (_P)"
+msgstr "পেস্ট করুন (_স)"
 
-#: ../calendar/gui/e-calendar-table.c:1180 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1167 ../ui/evolution-tasks.xml.h:20
 msgid "_Assign Task"
-msgstr "কর্ম বরাদ্দ করুন (_A)"
+msgstr "কর্ম বরাদ্দ করুন (_ব)"
 
-#: ../calendar/gui/e-calendar-table.c:1181 ../ui/evolution-tasks.xml.h:26
+#: ../calendar/gui/e-calendar-table.c:1168 ../ui/evolution-tasks.xml.h:24
 msgid "_Forward as iCalendar"
-msgstr "iCalendar হিসাবে ফরওয়ার্ড করুন (_F)"
+msgstr "iCalendar হিসাবে ফরওয়ার্ড করুন (_ফ)"
 
-#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-table.c:1169
 msgid "_Mark as Complete"
-msgstr "সম্পন্ন হিসাবে চিহ্নিত করা হবে(_M)"
+msgstr "সম্পন্ন হিসাবে চিহ্নিত করা হবে(_চ)"
 
-#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-table.c:1170
 msgid "_Mark Selected Tasks as Complete"
-msgstr "নির্বাচিত কার্যগুলিকে সম্পন্ন হিসাবে চিহ্নিত করা হবে(_M)"
+msgstr "নির্বাচিত কার্যগুলিকে সম্পন্ন হিসাবে চিহ্নিত করা হবে(_হ)"
 
-#: ../calendar/gui/e-calendar-table.c:1188
+#. FIXME: need to disable for undeletable folders
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1548 ../mail/em-folder-tree.c:2043
+#: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:33
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
+#: ../ui/evolution-tasks.xml.h:22
+msgid "_Delete"
+msgstr "মুছে ফেলুন (_ম)"
+
+#: ../calendar/gui/e-calendar-table.c:1175
 msgid "_Delete Selected Tasks"
-msgstr "নির্বাচিত কার্যগুলি মুছে ফেলুন (_D)"
+msgstr "নির্বাচিত কার্যগুলি মুছে ফেলুন (_ম)"
 
-#: ../calendar/gui/e-calendar-table.c:1421
+#: ../calendar/gui/e-calendar-table.c:1326
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "কার্য যোগ করতে হলে ক্লিক করুন"
@@ -6882,81 +6876,76 @@ msgstr "আরম্ভের তারিখ"
 msgid "Task sort"
 msgstr "ক্রমানুসারে কর্মের বিন্যাস"
 
-#: ../calendar/gui/e-calendar-view.c:1252
+#: ../calendar/gui/e-calendar-view.c:1231
 msgid "Moving items"
 msgstr "বস্তু সরানো হচ্ছে"
 
-#: ../calendar/gui/e-calendar-view.c:1254
+#: ../calendar/gui/e-calendar-view.c:1233
 msgid "Copying items"
 msgstr "বস্তু কপি করা হচ্ছে"
 
-#: ../calendar/gui/e-calendar-view.c:1524
+#: ../calendar/gui/e-calendar-view.c:1503
 msgid "New _Appointment..."
-msgstr "নতুন সাক্ষাত্কার (_A)..."
+msgstr "নতুন সাক্ষাত্কার (_স)..."
 
-#: ../calendar/gui/e-calendar-view.c:1525
+#: ../calendar/gui/e-calendar-view.c:1504
 msgid "New All Day _Event"
-msgstr "নতুন সমস্তদিনব্যাপী ঘটনা (_E)"
+msgstr "নতুন সমস্তদিনব্যাপী ঘটনা (_ঘ)"
 
-#: ../calendar/gui/e-calendar-view.c:1526
-msgid "New _Meeting"
-msgstr "নতুন সভা(_M)"
-
-#: ../calendar/gui/e-calendar-view.c:1527
-msgid "New _Task"
-msgstr "নতুন কার্য(_T)"
+#: ../calendar/gui/e-calendar-view.c:1506
+msgid "New Task"
+msgstr "নতুন কার্য"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1537
-#: ../widgets/menus/gal-view-menus.c:291
-msgid "_Current View"
-msgstr "বর্তমান প্রদর্শনক্ষেত্র (_C)"
+#: ../calendar/gui/e-calendar-view.c:1516
+msgid "Current View"
+msgstr "বর্তমান ভিউ"
 
-#: ../calendar/gui/e-calendar-view.c:1539
-msgid "Select T_oday"
-msgstr "আজকের তারিখ নির্বাচন করুন (_o)"
+#: ../calendar/gui/e-calendar-view.c:1518 ../ui/evolution-calendar.xml.h:26
+msgid "Select _Today"
+msgstr "আজকের তারিখ নির্বাচন করুন (_জ)"
 
-#: ../calendar/gui/e-calendar-view.c:1540
+#: ../calendar/gui/e-calendar-view.c:1519
 msgid "_Select Date..."
-msgstr "তারিখ নির্বাচন করুন (_S)..."
+msgstr "তারিখ নির্বাচন করুন (_ন)..."
 
 #. TODO: Why is this in a context menu when it applies globally?
-#: ../calendar/gui/e-calendar-view.c:1545 ../ui/evolution-calendar.xml.h:45
+#: ../calendar/gui/e-calendar-view.c:1524 ../ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
-msgstr "মুক্ত/ব্যস্ত তথ্য পাবলিশ করুন (_P)"
+msgstr "মুক্ত/ব্যস্ত তথ্য পাবলিশ করুন (_প)"
 
-#: ../calendar/gui/e-calendar-view.c:1561
+#: ../calendar/gui/e-calendar-view.c:1540
 msgid "Cop_y to Calendar..."
-msgstr "বর্ষপঞ্জিতে কপি করুন (_y)..."
+msgstr "বর্ষপঞ্জিতে কপি করুন (_প)..."
 
-#: ../calendar/gui/e-calendar-view.c:1562
+#: ../calendar/gui/e-calendar-view.c:1541
 msgid "Mo_ve to Calendar..."
-msgstr "বর্ষপঞ্জিতে স্থানান্তর করুন (_v)..."
+msgstr "বর্ষপঞ্জিতে সরিয়ে দেও (_র)..."
 
-#: ../calendar/gui/e-calendar-view.c:1563
+#: ../calendar/gui/e-calendar-view.c:1542
 msgid "_Delegate Meeting..."
-msgstr "সভার কর্ম বন্টন করুন (_D)..."
+msgstr "সভার কর্ম বন্টন করুন (_ব)..."
 
-#: ../calendar/gui/e-calendar-view.c:1564
+#: ../calendar/gui/e-calendar-view.c:1543
 msgid "_Schedule Meeting..."
-msgstr "সভার অনুসূচী তৈরি করুন (_S)..."
+msgstr "সভার অনুসূচী তৈরি করুন (_ম)..."
 
 # msgstr "সভার অনুসূচনা করে (_ম)..."
-#: ../calendar/gui/e-calendar-view.c:1565
+#: ../calendar/gui/e-calendar-view.c:1544
 msgid "_Forward as iCalendar..."
-msgstr "iCalendar হিসাবে ফরওয়ার্ড করুন (_F)...."
+msgstr "iCalendar হিসাবে ফরওয়ার্ড করুন (_ফ)...."
 
-#: ../calendar/gui/e-calendar-view.c:1570
+#: ../calendar/gui/e-calendar-view.c:1549
 msgid "Make this Occurrence _Movable"
-msgstr "এই ঘটনাটি স্থানান্তরযোগ্য বানাও (_M)"
+msgstr "এই ঘটনাটি স্থানান্তরযোগ্য বানাও (_স)"
 
-#: ../calendar/gui/e-calendar-view.c:1571
+#: ../calendar/gui/e-calendar-view.c:1550
 msgid "Delete this _Occurrence"
-msgstr "এই ঘটনাটি মুছে ফেলুন (_O)"
+msgstr "এই ঘটনাটি মুছে ফেলুন (_ঘ)"
 
-#: ../calendar/gui/e-calendar-view.c:1572
+#: ../calendar/gui/e-calendar-view.c:1551
 msgid "Delete _All Occurrences"
-msgstr "সমস্ত ঘটনাগুলি মুছে ফেলুন (_A)"
+msgstr "সমস্ত ঘটনাগুলি মুছে ফেলুন (_স)"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
 #. strptime format of a weekday, a date and a time,
@@ -7001,7 +6990,7 @@ msgstr "%02i মিনিট ভাগসমূহ"
 #. order but don't change the specifiers or add
 #. anything.
 #: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1493
-#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1526
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1517
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -7149,8 +7138,10 @@ msgid ""
 msgstr "সভাটি যদিও বাতিল করা হয়েছে, কিন্তু এটি আপনার বর্যপঞ্জিতে খুঁজে পাওয়া যায়নি।"
 
 #: ../calendar/gui/e-itip-control.c:1233
-msgid "The task has been cancelled, however it could not be found in your task lists"
-msgstr "কাজটি যদিও বাতিল করা হয়েছে, কিন্তু এটি আপনার কার্যতালিকাতে খুঁজে পাওয়া যায়নি।"
+msgid ""
+"The task has been cancelled, however it could not be found in your task lists"
+msgstr ""
+"কাজটি যদিও বাতিল করা হয়েছে, কিন্তু এটি আপনার কার্যতালিকাতে খুঁজে পাওয়া যায়নি।"
 
 #: ../calendar/gui/e-itip-control.c:1312
 #, c-format
@@ -7518,7 +7509,7 @@ msgstr "কর্ম প্রয়েজন"
 
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Tentative"
 msgstr "অস্থযায়ীরূপে"
 
@@ -7529,11 +7520,6 @@ msgstr "অস্থযায়ীরূপে"
 msgid "Delegated"
 msgstr "বন্টন করা হয়েছে"
 
-#. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:361
-msgid "Attendee                          "
-msgstr "অংশগ্রহনকারী                          "
-
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
 msgid "In Process"
 msgstr "প্রসেস করা হচ্ছে"
@@ -7541,7 +7527,7 @@ 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:444
-#: ../calendar/gui/e-meeting-time-sel.c:2105
+#: ../calendar/gui/e-meeting-time-sel.c:2102
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7552,7 +7538,7 @@ msgstr "%A, %B %d, %Y"
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
 #: ../calendar/gui/e-meeting-time-sel-item.c:448
-#: ../calendar/gui/e-meeting-time-sel.c:2138 ../e-util/e-time-utils.c:203
+#: ../calendar/gui/e-meeting-time-sel.c:2135 ../e-util/e-time-utils.c:203
 #: ../e-util/e-time-utils.c:296 ../e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
@@ -7568,68 +7554,64 @@ msgstr "%a %m/%d/%Y"
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:416 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "অফিসে উপস্থিত নেই"
 
-#: ../calendar/gui/e-meeting-time-sel.c:417
+#: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "No Information"
 msgstr "কোনো তথ্য নেই"
 
-#: ../calendar/gui/e-meeting-time-sel.c:431
-msgid "Con_tacts..."
-msgstr "পরিচিতি (_t)..."
-
-#: ../calendar/gui/e-meeting-time-sel.c:448
+#: ../calendar/gui/e-meeting-time-sel.c:445
 msgid "O_ptions"
-msgstr "অপশন (_p)"
+msgstr "অপশন (_প)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:465
+#: ../calendar/gui/e-meeting-time-sel.c:462
 msgid "Show _only working hours"
-msgstr "শুধুমাত্র কাজের ঘন্টা প্রদর্শন করা হবে (_o)"
+msgstr "শুধুমাত্র কাজের ঘন্টা প্রদর্শন করা হবে (_শ)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:475
+#: ../calendar/gui/e-meeting-time-sel.c:472
 msgid "Show _zoomed out"
-msgstr "ছোট করে প্রদর্শন করা হবে(_z)"
+msgstr "ছোট করে প্রদর্শন করা হবে(_ছ)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:490
+#: ../calendar/gui/e-meeting-time-sel.c:487
 msgid "_Update free/busy"
-msgstr "মুক্ত/ ব্যস্ত অবস্থা আপডেট করা হবে (_U)"
+msgstr "মুক্ত/ ব্যস্ত অবস্থা আপডেট করা হবে (_প)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:505
+#: ../calendar/gui/e-meeting-time-sel.c:502
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:523
+#: ../calendar/gui/e-meeting-time-sel.c:520
 msgid "_Autopick"
-msgstr "অটোপিক (_A)"
+msgstr "অটোপিক (_প)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:538
+#: ../calendar/gui/e-meeting-time-sel.c:535
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:555
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "_All people and resources"
-msgstr "সকল ব্যক্তি এবং রিসোর্সসমূহ (_A)"
+msgstr "সকল লোক এবং রিসোর্সসমূহ (_স)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:564
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "All _people and one resource"
-msgstr "সকল ব্যক্তি এবং একটি রিসোর্স (_p)"
+msgstr "সকল লোক এবং একটি রিসোর্স (_ল)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:573
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "_Required people"
-msgstr "আবশ্যক ব্যক্তি (_R)"
+msgstr "আবশ্যক লোক (_জ)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:582
+#: ../calendar/gui/e-meeting-time-sel.c:579
 msgid "Required people and _one resource"
-msgstr "আবশ্যক ব্যক্তি এবং একটি রিসোর্স (_o)"
+msgstr "আবশ্যক লোক এবং একটি রিসোর্স (_ক)"
 
-#: ../calendar/gui/e-pub-utils.c:311
+#: ../calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
 msgstr "%s -এর জন্য পাসওয়ার্ড লিখুন"
 
-#: ../calendar/gui/e-tasks.c:824 ../calendar/gui/gnome-cal.c:2551
+#: ../calendar/gui/e-tasks.c:798 ../calendar/gui/gnome-cal.c:2532
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7638,24 +7620,24 @@ msgstr ""
 "%s-এ ত্রুটি:\n"
 " %s"
 
-#: ../calendar/gui/e-tasks.c:872
+#: ../calendar/gui/e-tasks.c:846
 msgid "Loading tasks"
 msgstr "কাজ লোড করা হচ্ছে"
 
-#: ../calendar/gui/e-tasks.c:956
+#: ../calendar/gui/e-tasks.c:930
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s -এ কাজ খোলো"
 
-#: ../calendar/gui/e-tasks.c:1201
+#: ../calendar/gui/e-tasks.c:1126
 msgid "Completing tasks..."
 msgstr "কর্ম সম্পন্ন করা হচ্ছে..."
 
-#: ../calendar/gui/e-tasks.c:1224
+#: ../calendar/gui/e-tasks.c:1149
 msgid "Deleting selected objects..."
 msgstr "নির্বাচিত অবজেক্ট মোছা হচ্ছে..."
 
-#: ../calendar/gui/e-tasks.c:1251
+#: ../calendar/gui/e-tasks.c:1176
 msgid "Expunging"
 msgstr "এক্সপাঞ্জ করা হচ্ছে"
 
@@ -7666,42 +7648,45 @@ 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:329 ../calendar/gui/print.c:1510
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1501
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:790
+#: ../calendar/gui/gnome-cal.c:789
 msgid "Updating query"
 msgstr "কোয়েরি আপডেট করা হচ্ছে"
 
-#: ../calendar/gui/gnome-cal.c:2228
-msgid "_Custom View"
-msgstr "স্বনির্বাচিত প্রদর্শনক্ষেত্র(_C)"
+#. bonobo displays this string so it must be in locale
+#: ../calendar/gui/gnome-cal.c:2209 ../widgets/menus/gal-view-instance.c:585
+#: ../widgets/menus/gal-view-menus.c:350
+msgid "Custom View"
+msgstr "স্বনির্বাচিত ভিউ"
 
-#: ../calendar/gui/gnome-cal.c:2229
-msgid "_Save Custom View"
-msgstr "স্বনির্বাচিত প্রদর্শনক্ষেত্র সংরক্ষণ করুন(_S)"
+#: ../calendar/gui/gnome-cal.c:2210 ../widgets/menus/gal-view-instance.c:586
+msgid "Save Custom View"
+msgstr "স্বনির্বাচিত প্রদর্শনক্ষেত্র সংরক্ষণ করুন"
 
-#: ../calendar/gui/gnome-cal.c:2234
-msgid "_Define Views..."
-msgstr "প্রদর্শনক্ষেত্র নির্ধারণ করুন...(_D)"
+#: ../calendar/gui/gnome-cal.c:2215 ../widgets/menus/gal-view-instance.c:590
+#: ../widgets/menus/gal-view-menus.c:372
+msgid "Define Views..."
+msgstr "ভিউ নির্ধারণ করুন..."
 
-#: ../calendar/gui/gnome-cal.c:2397
+#: ../calendar/gui/gnome-cal.c:2378
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "%s-এর সাক্ষাত্‍কার লোড করা হচ্ছে"
 
-#: ../calendar/gui/gnome-cal.c:2416
+#: ../calendar/gui/gnome-cal.c:2397
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%s-এর কাজ লোড করা হচ্ছে"
 
-#: ../calendar/gui/gnome-cal.c:2517
+#: ../calendar/gui/gnome-cal.c:2498
 #, c-format
 msgid "Opening %s"
 msgstr "%s খোলা হচ্ছে"
 
-#: ../calendar/gui/gnome-cal.c:3408
+#: ../calendar/gui/gnome-cal.c:3388
 msgid "Purging"
 msgstr "মুছে ফেলা হচ্ছে"
 
@@ -7759,7 +7744,7 @@ msgstr "সেপ্টেম্বর"
 
 #: ../calendar/gui/goto-dialog.glade.h:14
 msgid "_Select Today"
-msgstr "আজকের তারিখ নির্বাচন করুন (_S)"
+msgstr "আজকের তারিখ নির্বাচন করুন (_জ)"
 
 #: ../calendar/gui/itip-utils.c:353 ../calendar/gui/itip-utils.c:402
 #: ../calendar/gui/itip-utils.c:442
@@ -8009,97 +7994,89 @@ msgid "Sa"
 msgstr "শনি"
 
 #. Day
-#: ../calendar/gui/print.c:1926
+#: ../calendar/gui/print.c:1917
 msgid "Selected day (%a %b %d %Y)"
 msgstr "নির্বাচিত দিন (%a %b %d %Y)"
 
-#: ../calendar/gui/print.c:1951 ../calendar/gui/print.c:1955
+#: ../calendar/gui/print.c:1942 ../calendar/gui/print.c:1946
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: ../calendar/gui/print.c:1952
+#: ../calendar/gui/print.c:1943
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: ../calendar/gui/print.c:1956 ../calendar/gui/print.c:1958
-#: ../calendar/gui/print.c:1959
+#: ../calendar/gui/print.c:1947 ../calendar/gui/print.c:1949
+#: ../calendar/gui/print.c:1950
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: ../calendar/gui/print.c:1963
+#: ../calendar/gui/print.c:1954
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "নির্বাচিত সপ্তাহ (%s - %s)"
 
 #. Month
-#: ../calendar/gui/print.c:1971
+#: ../calendar/gui/print.c:1962
 msgid "Selected month (%b %Y)"
 msgstr "নির্বাচিত মাস (%b %Y)"
 
 #. Year
-#: ../calendar/gui/print.c:1978
+#: ../calendar/gui/print.c:1969
 msgid "Selected year (%Y)"
 msgstr "নির্বাচিত বছর (%Y)"
 
-#: ../calendar/gui/print.c:2307
-msgid "Appointment"
-msgstr "সাক্ষাত্‍কার"
-
-#: ../calendar/gui/print.c:2309
-msgid "Task"
-msgstr "কাজ"
-
-#: ../calendar/gui/print.c:2329
+#: ../calendar/gui/print.c:2320
 #, c-format
 msgid "Summary: %s"
 msgstr "সারাংশ: %s"
 
-#: ../calendar/gui/print.c:2337
+#: ../calendar/gui/print.c:2328
 #, c-format
 msgid "Location: %s"
 msgstr "অবস্থান: %s"
 
-#: ../calendar/gui/print.c:2380
+#: ../calendar/gui/print.c:2371
 #, c-format
 msgid "Status: %s"
 msgstr "অবস্থা: %s"
 
-#: ../calendar/gui/print.c:2397
+#: ../calendar/gui/print.c:2388
 #, c-format
 msgid "Priority: %s"
 msgstr "প্রাধান্য: %s"
 
-#: ../calendar/gui/print.c:2409
+#: ../calendar/gui/print.c:2400
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "শতাংশ সম্পন্ন : %i"
 
-#: ../calendar/gui/print.c:2421
+#: ../calendar/gui/print.c:2412
 #, c-format
 msgid "URL: %s"
 msgstr "ইউ-আর-এল: %s"
 
-#: ../calendar/gui/print.c:2435
+#: ../calendar/gui/print.c:2426
 #, c-format
 msgid "Categories: %s"
 msgstr "শ্রেণীসমূহ: %s"
 
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2437
 msgid "Contacts: "
 msgstr "পরিচিতি: "
 
-#: ../calendar/gui/print.c:2586 ../calendar/gui/print.c:2674
-#: ../calendar/gui/print.c:2800 ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2577 ../calendar/gui/print.c:2665
+#: ../calendar/gui/print.c:2791 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "পূর্বপ্রদর্শন"
 
-#: ../calendar/gui/print.c:2621
+#: ../calendar/gui/print.c:2612
 msgid "Print Item"
 msgstr "বস্তুটি প্রিন্ট করুন"
 
 #: ../calendar/gui/tasks-component.c:439
-msgid "_New Task List"
-msgstr "নতুন কার্য-তালিকা(_N)"
+msgid "New Task List"
+msgstr "নতুন কার্য-তালিকা"
 
 #: ../calendar/gui/tasks-component.c:515
 #, c-format
@@ -8128,43 +8105,47 @@ msgstr "ঘটনা এবং সভা তৈরি করার কার্�
 msgid "There is no calendar available for creating tasks"
 msgstr "কর্ম তৈরি করার জন্য কোনো বর্ষপঞ্জি উপলব্ধ নেই"
 
-#: ../calendar/gui/tasks-component.c:987
+#: ../calendar/gui/tasks-component.c:981
 msgid "Task Source Selector"
 msgstr "কর্মের উত্‍‌স নির্বাচক"
 
-#: ../calendar/gui/tasks-component.c:1170
+#: ../calendar/gui/tasks-component.c:1164
 msgid "New task"
 msgstr "নতুন কাজ"
 
-#: ../calendar/gui/tasks-component.c:1172
+#: ../calendar/gui/tasks-component.c:1165
+msgid "_Task"
+msgstr "কাজ (_ক)"
+
+#: ../calendar/gui/tasks-component.c:1166
 msgid "Create a new task"
 msgstr "একটি নতুন কাজ তৈরি করুন"
 
-#: ../calendar/gui/tasks-component.c:1178
+#: ../calendar/gui/tasks-component.c:1172
 msgid "New assigned task"
 msgstr "নতুন কর্ম যা বরাদ্দ করা হয়েছে"
 
-#: ../calendar/gui/tasks-component.c:1179
+#: ../calendar/gui/tasks-component.c:1173
 msgid "Assigne_d Task"
-msgstr "বরাদ্দ কর্ম (_d)"
+msgstr "বরাদ্দ কর্ম (_ব)"
 
-#: ../calendar/gui/tasks-component.c:1180
+#: ../calendar/gui/tasks-component.c:1174
 msgid "Create a new assigned task"
 msgstr "একটি নতুন বরাদ্দ কর্ম তৈরি করুন"
 
-#: ../calendar/gui/tasks-component.c:1186
+#: ../calendar/gui/tasks-component.c:1180
 msgid "New task list"
 msgstr "নতুন কার্য তালিকা"
 
-#: ../calendar/gui/tasks-component.c:1187
+#: ../calendar/gui/tasks-component.c:1181
 msgid "Task l_ist"
-msgstr "কার্য-তালিকা (_i)"
+msgstr "কার্য-তালিকা (_য)"
 
-#: ../calendar/gui/tasks-component.c:1188
+#: ../calendar/gui/tasks-component.c:1182
 msgid "Create a new task list"
 msgstr "একটি নতুন কার্য-তালিকা তৈরি করুন"
 
-#: ../calendar/gui/tasks-control.c:429
+#: ../calendar/gui/tasks-control.c:419
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8176,11 +8157,11 @@ msgstr ""
 "\n"
 "সত্যি-ই কাজগুলি মুছে দেবো?"
 
-#: ../calendar/gui/tasks-control.c:432
+#: ../calendar/gui/tasks-control.c:422
 msgid "Do not ask me again."
 msgstr "আমাকে পুনরায় জিঞ্জাসা করবে না।"
 
-#: ../calendar/gui/tasks-control.c:466
+#: ../calendar/gui/tasks-control.c:457
 msgid "Print Tasks"
 msgstr "কর্ম প্রিন্ট করুন"
 
@@ -9778,25 +9759,25 @@ msgstr "ঠিকানাবই পড়ার জন্য এখানে ক�
 #.
 #: ../composer/e-msg-composer-hdrs.c:623
 msgid "_Reply-To:"
-msgstr "উত্তর-প্রাপক:(_R)"
+msgstr "উত্তর-প্রাপক:(_র)"
 
 #.
 #. * From
 #.
 #: ../composer/e-msg-composer-hdrs.c:630
 msgid "Fr_om:"
-msgstr "প্রেরক(_o):"
+msgstr "প্রেরক(_র):"
 
 #.
 #. * Subject
 #.
 #: ../composer/e-msg-composer-hdrs.c:637
 msgid "S_ubject:"
-msgstr "বিষয়(_u):"
+msgstr "বিষয়(_ষ):"
 
 #: ../composer/e-msg-composer-hdrs.c:646
 msgid "_To:"
-msgstr "প্রাপক(_T):"
+msgstr "প্রাপক(_প):"
 
 #: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the recipients of the message"
@@ -9804,7 +9785,7 @@ msgstr "বার্তা প্রাপকদের নাম লিখুন
 
 #: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Cc:"
-msgstr "অনুলিপি প্রাপক(_C):"
+msgstr "অনুলিপি প্রাপক(_ন):"
 
 #: ../composer/e-msg-composer-hdrs.c:651
 msgid "Enter the addresses that will receive a carbon copy of the message"
@@ -9812,7 +9793,7 @@ msgstr "বার্তার অনুলিপি প্রাপকদের
 
 #: ../composer/e-msg-composer-hdrs.c:654
 msgid "_Bcc:"
-msgstr "অপ্রকাশিত অনুলিপি প্রাপক(_B):"
+msgstr "অপ্রকাশিত অনুলিপি প্রাপক(_প):"
 
 #: ../composer/e-msg-composer-hdrs.c:655
 msgid ""
@@ -9825,7 +9806,7 @@ msgstr "বার্তার অপ্রকাশিত অনুলিপি
 #.
 #: ../composer/e-msg-composer-hdrs.c:662
 msgid "_Post To:"
-msgstr "উল্লিখিত স্থানে পোস্ট করুন(_P):"
+msgstr "উল্লিখিত স্থানে পোস্ট করুন(_প):"
 
 #: ../composer/e-msg-composer-hdrs.c:667
 msgid "Click here to select folders to post to"
@@ -9837,10 +9818,11 @@ msgstr "এখানে পোস্ট করুন:"
 
 #: ../composer/e-msg-composer-select-file.c:82
 msgid "A_ttach"
-msgstr "সংযুক্ত করুন (_t)"
+msgstr "সংযুক্ত করুন (_স)"
 
 #: ../composer/e-msg-composer.c:738
-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 ""
 "বহির্মুখি বার্তা স্বাক্ষর করা সম্ভব নয়: এই অ্যাকাউন্টের জন্য কোনো স্বাক্ষরকারী "
 "সার্টিফিকেট নির্ধারিত হয়নি"
@@ -9882,7 +9864,7 @@ msgstr "স্বয়ংক্রিয়ভাবে উত্পন্ন"
 
 #: ../composer/e-msg-composer.c:2105
 msgid "Si_gnature:"
-msgstr "স্বাক্ষর(_g):"
+msgstr "স্বাক্ষর(_র):"
 
 #: ../composer/e-msg-composer.c:2347 ../composer/e-msg-composer.c:3527
 #: ../composer/e-msg-composer.c:3528
@@ -9891,13 +9873,14 @@ msgstr "বার্তা লিখুন"
 
 #: ../composer/e-msg-composer.c:3643
 msgid "_Attachment Bar"
-msgstr "সংযুক্ত বস্তু ধারণকারী বার (_A)"
+msgstr "সংযুক্ত বস্তু ধারণকারী বার (_স)"
 
-#: ../composer/e-msg-composer.c:4722
+#: ../composer/e-msg-composer.c:4718
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
-msgstr "<b>(কম্পোসারে একটি নন-টেক্সট বার্তার মূল অংশ রয়েছে, যা সম্পাদন করা যাবে না।)<b>"
+msgstr ""
+"<b>(কম্পোসারে একটি নন-টেক্সট বার্তার মূল অংশ রয়েছে, যা সম্পাদন করা যাবে না।)<b>"
 
 #: ../composer/mail-composer.error.xml.h:1
 msgid ""
@@ -9919,7 +9902,8 @@ msgstr "আপনি '{0}' শীরোনামের যে বার্তা
 
 #: ../composer/mail-composer.error.xml.h:4
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
-msgstr "&quot;{0}&quot;-র কারণে, বিভিন্ন মেইল অপশন নির্বাচন করার প্রয়োজন হতে পারে।"
+msgstr ""
+"&quot;{0}&quot;-র কারণে, বিভিন্ন মেইল অপশন নির্বাচন করার প্রয়োজন হতে পারে।"
 
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
 #: ../mail/mail.error.xml.h:17
@@ -10034,9 +10018,13 @@ msgstr "আপনি `{0}' ফাইলটিকে এই বার্তার
 msgid "You need to configure an account before you can compose mail."
 msgstr "মেইল লেখার আগে আপনাকে একটি অ্যাকাউন্ট কনফিগার করতে হবে।"
 
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Discard Changes"
+msgstr "পরিবর্তন পরিত্যাগ করুন (_প)"
+
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Save Message"
-msgstr "বার্তা সংরক্ষণ করুন (_S)"
+msgstr "বার্তা সংরক্ষণ করুন (_ব)"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
@@ -10125,8 +10113,8 @@ msgid ""
 msgstr ""
 "<small>আপনার প্রেরিত কোনো বার্তা পড়া হয়েছে কিনা তার সূচনা আপনি পেতে ইচ্ছুক কিনা "
 "এবং \n"
-"কোনো প্রেরক আপনার থেকে মেইল-পাঠের সূচনা পেতে ইচ্ছুক হলে Evolution কী করবে, তা "
-"আপনি এই পৃষ্ঠায় উল্লেখ করতে পারবেন।</small>"
+"কোনো প্রেরক আপনার থেকে মেইল-পাঠের সূচনা পেতে ইচ্ছুক হলে Evolution "
+"কী করবে, তা আপনি এই পৃষ্ঠায় উল্লেখ করতে পারবেন।</small>"
 
 #: ../designs/read_receipts/read.glade.h:6
 msgid "Always send back a read receipt"
@@ -10191,8 +10179,10 @@ msgstr "ইভোলিউশন কোয়েরি"
 #. setup a dummy error
 #: ../e-util/e-error.c:438
 #, c-format
-msgid "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
-msgstr "<span weight=\"bold\">অভ্যন্তরীণ সমস্যা, অজানা সমস্যা '%s' অনুরোধ করা হয়েছে</span>"
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr ""
+"<span weight=\"bold\">অভ্যন্তরীণ সমস্যা, অজানা সমস্যা '%s' অনুরোধ করা হয়েছে</span>"
 
 #: ../e-util/e-system.error.xml.h:2
 msgid "Cannot open file &quot;{0}&quot;."
@@ -10214,7 +10204,7 @@ msgstr "&quot;{0}&quot; ফাইলটি বর্তমানে উপস্
 
 #: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:122
 msgid "_Overwrite"
-msgstr "মুছে নতুন করে লিখুন(_O)"
+msgstr "মুছে নতুন করে লেখো(_ন)"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
@@ -10412,7 +10402,7 @@ msgstr "পরীক্ষা"
 
 #: ../filter/filter-rule.c:791
 msgid "_Rule name:"
-msgstr "নিয়মের নাম(_R):"
+msgstr "নিয়মের নাম(_ন):"
 
 #: ../filter/filter-rule.c:819
 msgid "If"
@@ -10502,7 +10492,7 @@ msgstr "আপনাকে একটি ফাইলের নাম নির�
 
 #: ../filter/filter.glade.h:1
 msgid "<b>_Filter Rules</b>"
-msgstr "<b>ফিল্টারের নিয়মাবলী</b>(_F)"
+msgstr "<b>ফিল্টারের নিয়মাবলী</b>(_ফ)"
 
 #: ../filter/filter.glade.h:2
 msgid "Compare against"
@@ -10582,7 +10572,8 @@ msgid "Composer Preferences"
 msgstr "কম্পোসারের বৈশিষ্ট্যাবলী"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr "সুরক্ষা এবং মেইল প্রদর্শণসহ মেইলের বৈশিষ্ট্য এখানে কনফিগার করুন"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
@@ -10637,7 +10628,7 @@ msgstr "মেইলের বৈশিষ্ট্যাবলী"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
 msgid "_Mail"
-msgstr "মেইল (_M)"
+msgstr "মেইল (_ম)"
 
 #: ../mail/em-account-editor.c:387
 #, c-format
@@ -10658,7 +10649,7 @@ msgstr ""
 "জানাবার জন্য চেকবক্সটিতে টিক (tick) চিহ্ন দিন\n"
 
 #: ../mail/em-account-editor.c:464 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:495
+#: ../mail/em-vfolder-rule.c:494
 msgid "Select Folder"
 msgstr "ফোল্ডার নির্বাচন করুন"
 
@@ -10676,36 +10667,36 @@ msgstr "ই-মেইল আহরণ করা হচ্ছে"
 
 #: ../mail/em-account-editor.c:1943
 msgid "Automatically check for _new mail every"
-msgstr "স্বয়ংক্রিয়ভাবে নতুন মেইলের জন্য পরীক্ষা করা হবে প্রতি (_n)"
+msgstr "স্বয়ংক্রিয়ভাবে নতুন মেইলের জন্য পরীক্ষা করা হবে প্রতি (_ন)"
 
 #: ../mail/em-account-editor.c:2111 ../mail/mail-config.glade.h:128
 msgid "Sending Email"
 msgstr "ই-মেইল প্রেরণ করা হচ্ছে"
 
-#: ../mail/em-account-editor.c:2165 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2162 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "ডিফল্ট মান"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2226 ../mail/mail-config.glade.h:122
-#: ../plugins/exchange-operations/exchange-account-setup.c:313
+#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:122
+#: ../plugins/exchange-operations/exchange-account-setup.c:311
 msgid "Security"
 msgstr "সুরক্ষা"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2263 ../mail/em-account-editor.c:2337
+#: ../mail/em-account-editor.c:2260 ../mail/em-account-editor.c:2334
 msgid "Receiving Options"
 msgstr "আহরণের অপশন"
 
-#: ../mail/em-account-editor.c:2264 ../mail/em-account-editor.c:2338
+#: ../mail/em-account-editor.c:2261 ../mail/em-account-editor.c:2335
 msgid "Checking for New Mail"
 msgstr "নতুন মেইল আছে কিনা তা পরীক্ষা করা হচ্ছে"
 
-#: ../mail/em-account-editor.c:2662 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2659 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "অ্যাকাউন্ট এডিটর"
 
-#: ../mail/em-account-editor.c:2662 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2659 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolution অ্যাকাউন্টের সাহায়ক"
 
@@ -10764,7 +10755,7 @@ msgstr ""
 
 #: ../mail/em-filter-editor.c:147
 msgid "_Filter Rules"
-msgstr "ফিল্টারের নিয়মাবলী(_F)"
+msgstr "ফিল্টারের নিয়মাবলী(_ফ)"
 
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:2
@@ -11029,7 +11020,7 @@ msgstr "<b>তাহলে</b>"
 
 #: ../mail/em-folder-browser.c:134
 msgid "C_reate Search Folder From Search..."
-msgstr "অনুসন্ধানের ফলাফল থেকে অনুসন্ধানের ফোল্ডার নির্মাণ করা হবে (_r)..."
+msgstr "অনুসন্ধানের ফলাফল থেকে অনুসন্ধানের ফোল্ডার নির্মাণ করা হবে (_ম)..."
 
 #. TODO: can this be done in a loop?
 #: ../mail/em-folder-properties.c:144
@@ -11059,7 +11050,7 @@ msgstr "তৈরি করুন"
 
 #: ../mail/em-folder-selector.c:265
 msgid "Folder _name:"
-msgstr "ফোল্ডারের নাম (_n):"
+msgstr "ফোল্ডারের নাম (_ন):"
 
 #: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
 #: ../mail/mail-vfolder.c:937 ../mail/mail-vfolder.c:1007
@@ -11088,83 +11079,78 @@ msgstr "আউটবক্স"
 msgid "Sent"
 msgstr "প্রেরণ করা বস্তু"
 
-#: ../mail/em-folder-tree-model.c:499 ../mail/em-folder-tree-model.c:803
+#: ../mail/em-folder-tree-model.c:498 ../mail/em-folder-tree-model.c:802
 msgid "Loading..."
 msgstr "লোড করা হচ্ছে..."
 
-#: ../mail/em-folder-tree.c:694
+#: ../mail/em-folder-tree.c:689
 msgid "Mail Folder Tree"
 msgstr "মেইল ফোল্ডার ট্রি"
 
-#: ../mail/em-folder-tree.c:854
+#: ../mail/em-folder-tree.c:849
 #, c-format
 msgid "Moving folder %s"
 msgstr "%s ফোল্ডারটি সরিয়ে ফেলা হচ্ছে"
 
-#: ../mail/em-folder-tree.c:856
+#: ../mail/em-folder-tree.c:851
 #, c-format
 msgid "Copying folder %s"
 msgstr "%s ফোল্ডারটি কপি করা হচ্ছে"
 
-#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1623
+#: ../mail/em-folder-tree.c:858 ../mail/message-list.c:1613
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "%s ফোল্ডারে বার্তা সরিয়ে নেওয়া হচ্ছে"
 
-#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1625
+#: ../mail/em-folder-tree.c:860 ../mail/message-list.c:1615
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "%s ফোল্ডারে বার্তা কপি করা হচ্ছে"
 
-#: ../mail/em-folder-tree.c:881
+#: ../mail/em-folder-tree.c:876
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "উপরের স্তরের সংগ্রহস্থলে বার্তা ফেলা যাচ্ছে না"
 
-#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:972 ../ui/evolution-mail-message.xml.h:104
 msgid "_Copy to Folder"
-msgstr "উল্লিখিত ফোল্ডারে কপি করুন (_C)"
+msgstr "উল্লিখিত ফোল্ডারে কপি করুন (_প)"
 
-#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:114
+#: ../mail/em-folder-tree.c:973 ../ui/evolution-mail-message.xml.h:114
 msgid "_Move to Folder"
-msgstr "এই ফোল্ডারে সরাও (_M)"
+msgstr "এই ফোল্ডারে সরাও (_স)"
 
-#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1057
+#: ../mail/em-folder-tree.c:1678 ../mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" এ রক্ষিত ফোল্ডারগুলি স্ক্যান করা হচ্ছে"
 
-#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:44
+#: ../mail/em-folder-tree.c:2031 ../ui/evolution-addressbook.xml.h:44
 #: ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:48
 msgid "_View"
-msgstr "প্রদর্শণ (_V)"
+msgstr "প্রদর্শণ (_প)"
 
-#: ../mail/em-folder-tree.c:2043
+#: ../mail/em-folder-tree.c:2032
 msgid "Open in _New Window"
-msgstr "নতুন উইন্ডোতে খোলো (_N)"
+msgstr "নতুন উইন্ডোতে খোলো (_ন)"
 
-#: ../mail/em-folder-tree.c:2047
+#: ../mail/em-folder-tree.c:2036
 msgid "_Copy..."
-msgstr "কপি করুন (_C)..."
+msgstr "কপি করুন (_প)..."
 
-#: ../mail/em-folder-tree.c:2048
+#: ../mail/em-folder-tree.c:2037
 msgid "_Move..."
-msgstr "স্থানান্তর করুন (_M)..."
+msgstr "সরাও (_র)..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2052
+#: ../mail/em-folder-tree.c:2041
 msgid "_New Folder..."
-msgstr "নতুন ফোল্ডার (_N)..."
+msgstr "নতুন ফোল্ডার (_ন)..."
 
-#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:30
+#: ../mail/em-folder-tree.c:2044 ../ui/evolution-mail-list.xml.h:30
 msgid "_Rename..."
-msgstr "নাম পরিবর্তন করুন (_R)..."
-
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:119
-msgid "_Empty Trash"
-msgstr "আবর্জনা ফাঁকা করা হবে (_E)"
+msgstr "নাম পরিবর্তন করুন (_প)..."
 
 #: ../mail/em-folder-utils.c:104
 #, c-format
@@ -11179,7 +11165,7 @@ msgstr "ফোল্ডার নির্বাচন করুন"
 
 #: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:946
 msgid "C_opy"
-msgstr "কপি করুন (_o)"
+msgstr "কপি করুন (_প)"
 
 #: ../mail/em-folder-utils.c:503
 #, c-format
@@ -11202,68 +11188,68 @@ msgstr "`%s' ফোল্ডারটি তৈরি করা হচ্ছে"
 
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:384
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "ফোল্ডার তৈরি করুন"
 
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:384
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "ফোল্ডার কোথায় তৈরি করা হবে তা নির্ধারণ করুন:"
 
 #: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:546 ../mail/em-popup.c:557
 msgid "Reply to _All"
-msgstr "সকলের প্রতি উত্তর (_A)"
+msgstr "সকলের প্রতি উত্তর (_ক)"
 
 #: ../mail/em-folder-view.c:1040 ../ui/evolution-mail-message.xml.h:122
 msgid "_Reply to Sender"
-msgstr "প্রেরকের প্রতি উত্তর (_R)"
+msgstr "প্রেরকের প্রতি উত্তর (_র)"
 
 #: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:548 ../mail/em-popup.c:559
 #: ../ui/evolution-mail-message.xml.h:108
 msgid "_Forward"
-msgstr "ফরওয়ার্ড (_F)"
+msgstr "ফরওয়ার্ড (_ফ)"
 
 #: ../mail/em-folder-view.c:1044 ../ui/evolution-mail-message.xml.h:106
 msgid "_Edit as New Message..."
-msgstr "নতুন বার্তা হিসাবে সম্পাদন করুন (_E)..."
+msgstr "নতুন বার্তা হিসাবে সম্পাদন করুন (_ম)..."
 
 #: ../mail/em-folder-view.c:1050
 msgid "U_ndelete"
-msgstr "পুনরুদ্ধার করুন (_n)"
+msgstr "পুনরুদ্ধার করুন (_দ)"
 
-#: ../mail/em-folder-view.c:1051 ../ui/evolution-addressbook.xml.h:37
+#: ../mail/em-folder-view.c:1051 ../ui/evolution-addressbook.xml.h:36
 msgid "_Move to Folder..."
-msgstr "এই ফোল্ডারে সরিয়ে ফেলুন (_M)..."
+msgstr "এই ফোল্ডারে সরিয়ে ফেলুন (_স)..."
 
-#: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:33
+#: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
-msgstr "এই ফোল্ডারে কপি করুন ... (_C)"
+msgstr "এই ফোল্ডারে কপি করুন ... (_ক)"
 
 #: ../mail/em-folder-view.c:1055
 msgid "Mar_k as Read"
-msgstr "পড়া হয়েছে হিসাবে চিহ্নিত করুন (_k)"
+msgstr "পড়া হয়েছে হিসাবে চিহ্নিত করুন (_প)"
 
 #: ../mail/em-folder-view.c:1056
 msgid "Mark as _Unread"
-msgstr "পড়া-হয়নি হিসাবে চিহ্নিত করা হবে(_U)"
+msgstr "পড়া-হয়নি হিসাবে চিহ্নিত করা হবে"
 
 #: ../mail/em-folder-view.c:1057
 msgid "Mark as _Important"
-msgstr "প্রয়োজনীয় হিসাবে চিহ্নিত করুন (_I)"
+msgstr "প্রয়োজনীয় হিসাবে চিহ্নিত করুন (_র)"
 
 #: ../mail/em-folder-view.c:1058
 msgid "_Mark as Unimportant"
-msgstr "অপ্রয়োজনীয় হিসাবে চিহ্নিত করুন (_M)"
+msgstr "অপ্রয়োজনীয় হিসাবে চিহ্নিত করুন (_চ)"
 
 #: ../mail/em-folder-view.c:1059
 msgid "Mark as _Junk"
-msgstr "অনাকঙ্ক্ষিত হিসাবে চিহ্নিত করুন (_J)"
+msgstr "অনাকঙ্ক্ষিত হিসাবে চিহ্নিত করুন (_জ)"
 
 #: ../mail/em-folder-view.c:1060
 msgid "Mark as _Not Junk"
-msgstr "অনাকাঙ্ক্ষিত নয় হিসাবে চিহ্নিত করুন (_N)"
+msgstr "অনাকাঙ্ক্ষিত নয় হিসাবে চিহ্নিত করুন (_ন)"
 
 #: ../mail/em-folder-view.c:1061
 msgid "Mark for Follo_w Up..."
@@ -11271,47 +11257,47 @@ msgstr ""
 
 #: ../mail/em-folder-view.c:1069
 msgid "Fla_g Completed"
-msgstr "কাজ সম্পুর্ণর ফ্ল্যাগে (_g)"
+msgstr "কাজ সম্পুর্ণর ফ্ল্যাগে (_ফ)"
 
 #: ../mail/em-folder-view.c:1070
 msgid "Cl_ear Flag"
-msgstr "ফ্ল্যাগ মুছে ফেলুন (_e)"
+msgstr "ফ্ল্যাগ মুছে ফেলুন (_ম)"
 
 #: ../mail/em-folder-view.c:1073
 msgid "Crea_te Rule From Message"
-msgstr "বার্তা থেকে নিয়ম তৈরি করুন (_t)"
+msgstr "বার্তা থেকে নিয়ম তৈরি করুন (_ন)"
 
 #: ../mail/em-folder-view.c:1074
 msgid "Search Folder from _Subject"
-msgstr "বিষয় অনুসারে অনুসন্ধান ফোল্ডার (_S)"
+msgstr "বিষয় অনুসারে অনুসন্ধান ফোল্ডার (_ব)"
 
 #: ../mail/em-folder-view.c:1075
 msgid "Search Folder from Se_nder"
-msgstr "প্রেরক অনুসারে অনুসন্ধানের ফোল্ডার (_n)"
+msgstr "প্রেরক অনুসারে অনুসন্ধানের ফোল্ডার (_র)"
 
 #: ../mail/em-folder-view.c:1076
 msgid "Search Folder from _Recipients"
-msgstr "প্রাপক অনুসারে অনুসন্ধানের ফোল্ডার (_R)"
+msgstr "প্রাপক অনুসারে অনুসন্ধানের ফোল্ডার (_প)"
 
 #: ../mail/em-folder-view.c:1077
 msgid "Search Folder from Mailing _List"
-msgstr "মেইলিং-লিস্ট অনুসারে অনুসন্ধানের ফোল্ডার (_L)"
+msgstr "মেইলিং-লিস্ট অনুসারে অনুসন্ধানের ফোল্ডার (_ম)"
 
 #: ../mail/em-folder-view.c:1081
 msgid "Filter on Sub_ject"
-msgstr "বিষয় অনুযায়ী ফিল্টার করা হবে (_j)"
+msgstr "বিষয় অনুযায়ী ফিল্টার করা হবে (_ব)"
 
 #: ../mail/em-folder-view.c:1082
 msgid "Filter on Sen_der"
-msgstr "প্রেরক অনুযায়ী ফিল্টার করা হবে (_d)"
+msgstr "প্রেরক অনুযায়ী ফিল্টার করা হবে (_র)"
 
 #: ../mail/em-folder-view.c:1083
 msgid "Filter on Re_cipients"
-msgstr "প্রাপকদের অনুযায়ী ফিল্টার করা হবে (_c)"
+msgstr "প্রাপকদের অনুযায়ী ফিল্টার করা হবে (_প)"
 
 #: ../mail/em-folder-view.c:1084
 msgid "Filter on _Mailing List"
-msgstr "মেইলিং লিস্ট অনুযায়ী ফিল্টার করা হবে (_M)"
+msgstr "মেইলিং লিস্ট অনুযায়ী ফিল্টার করা হবে (_ল)"
 
 #. default charset used in mail view
 #: ../mail/em-folder-view.c:1921 ../mail/em-folder-view.c:1965
@@ -11330,19 +11316,19 @@ msgstr " বার্তা উদ্ধার করা সম্ভব হয়�
 
 #: ../mail/em-folder-view.c:2413
 msgid "_Copy Link Location"
-msgstr "লিঙ্কের স্থান কপি করুন (_C)"
+msgstr "লিঙ্কের স্থান কপি করুন (_প)"
 
 #: ../mail/em-folder-view.c:2415
 msgid "Create _Search Folder"
-msgstr "অনুসন্ধানের ফোল্ডার নির্মাণ (_S)"
+msgstr "অনুসন্ধানের ফোল্ডার নির্মাণ (_ন)"
 
 #: ../mail/em-folder-view.c:2416
 msgid "_From this Address"
-msgstr "উল্লিখিত ঠিকানা থেকে প্রাপ্ত(_F)"
+msgstr "উল্লিখিত ঠিকানা থেকে প্রাপ্ত(_ঠ)"
 
 #: ../mail/em-folder-view.c:2417
 msgid "_To this Address"
-msgstr "উল্লিখিত ঠিকানায় প্রেরিত (_T)"
+msgstr "উল্লিখিত ঠিকানায় প্রেরিত (_র)"
 
 #: ../mail/em-folder-view.c:2698
 #, c-format
@@ -11350,36 +11336,36 @@ msgid "Click to mail %s"
 msgstr "%s -কে মেইল করতে হলে ক্লিক করুন"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:455
+#: ../mail/em-format-html-display.c:445
 #, c-format
 msgid "Matches: %d"
 msgstr "মিল: %d"
 
-#: ../mail/em-format-html-display.c:706 ../mail/em-format-html.c:597
+#: ../mail/em-format-html-display.c:696 ../mail/em-format-html.c:597
 msgid "Unsigned"
 msgstr "স্বাক্ষরিত নয়"
 
-#: ../mail/em-format-html-display.c:706
+#: ../mail/em-format-html-display.c:696
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "এই বার্তাটি ডিজিটালি স্বাক্ষরিত নয়। এই বার্তাটির সত্যতা প্রমানিত হয়নি।"
 
-#: ../mail/em-format-html-display.c:707 ../mail/em-format-html.c:598
+#: ../mail/em-format-html-display.c:697 ../mail/em-format-html.c:598
 msgid "Valid signature"
 msgstr "বৈধ স্বাক্ষর"
 
-#: ../mail/em-format-html-display.c:707
+#: ../mail/em-format-html-display.c:697
 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:708 ../mail/em-format-html.c:599
+#: ../mail/em-format-html-display.c:698 ../mail/em-format-html.c:599
 msgid "Invalid signature"
 msgstr "অবৈধ স্বাক্ষর"
 
-#: ../mail/em-format-html-display.c:708
+#: ../mail/em-format-html-display.c:698
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11387,11 +11373,11 @@ msgstr ""
 "এই বার্তাটির স্বাক্ষরটি পরীক্ষা করা সম্ভব হয়নি, সম্ভবত যাত্রাকালে এতে পরিবর্তন করা "
 "হয়েছে।"
 
-#: ../mail/em-format-html-display.c:709
+#: ../mail/em-format-html-display.c:699
 msgid "Valid signature, cannot verify sender"
 msgstr "বৈধ স্বাক্ষর, কিন্তু প্রেরকের পরিচয় নিশ্চিতায়ন করা সম্ভব হয়নি"
 
-#: ../mail/em-format-html-display.c:709
+#: ../mail/em-format-html-display.c:699
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11399,11 +11385,11 @@ msgstr ""
 "এই বার্তাটি একটি বৈধ স্বাক্ষরসহ স্বাক্ষরিত হয়েছে, কিন্তু প্রেরকের পরিচয় নিশ্চিতায়ন "
 "করা সম্ভব হয়নি।"
 
-#: ../mail/em-format-html-display.c:715 ../mail/em-format-html.c:606
+#: ../mail/em-format-html-display.c:705 ../mail/em-format-html.c:606
 msgid "Unencrypted"
 msgstr "এনক্রিপ্ট করা নয়"
 
-#: ../mail/em-format-html-display.c:715
+#: ../mail/em-format-html-display.c:705
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -11411,11 +11397,11 @@ msgstr ""
 "এই বার্তাটি এনক্রিপ্ট করা হয়নি।  ইন্টারনেটের মাধ্যমে যাত্রাকালে এতে অন্তর্ভুক্ত বস্তু "
 "প্রত্যক্ষ করা সম্ভব।"
 
-#: ../mail/em-format-html-display.c:716 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:706 ../mail/em-format-html.c:607
 msgid "Encrypted, weak"
 msgstr "এনক্রিপ্ট করা, দুর্বল"
 
-#: ../mail/em-format-html-display.c:716
+#: ../mail/em-format-html-display.c:706
 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 "
@@ -11425,11 +11411,11 @@ msgstr ""
 "বহিরাগত ব্যক্তি সহজে না হলেও, কিছু সময় ব্যয় করলে এতে অন্তর্ভুক্ত বস্তু পড়তে সক্ষম হতে "
 "পারে।"
 
-#: ../mail/em-format-html-display.c:717 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:707 ../mail/em-format-html.c:608
 msgid "Encrypted"
 msgstr "এনক্রিপ্ট করা হয়েছে"
 
-#: ../mail/em-format-html-display.c:717
+#: ../mail/em-format-html-display.c:707
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11437,11 +11423,11 @@ msgstr ""
 "এই বার্তাটি এনক্রিপ্ট করা হয়েছে।  কোনো বহিরাগত ব্যক্তি সহজে এতে অন্তর্ভুক্ত বস্তু পড়তে "
 "পারবে না।"
 
-#: ../mail/em-format-html-display.c:718 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:708 ../mail/em-format-html.c:609
 msgid "Encrypted, strong"
 msgstr "এনক্রিপ্ট করা, দৃঢ়ভাবে"
 
-#: ../mail/em-format-html-display.c:718
+#: ../mail/em-format-html-display.c:708
 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 "
@@ -11451,71 +11437,71 @@ msgstr ""
 "বহিরাগত ব্যক্তির দ্বারা স্বাভাবিক সময়ের মধ্যে এই বার্তার বিষয়বস্তু পাঠ করা সম্ভব হবে "
 "না।"
 
-#: ../mail/em-format-html-display.c:819 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:809 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
-msgstr "সার্টিফিকেট প্রত্যক্ষ করুন (_V)"
+msgstr "সার্টিফিকেট প্রত্যক্ষ করুন (_প)"
 
-#: ../mail/em-format-html-display.c:834
+#: ../mail/em-format-html-display.c:824
 msgid "This certificate is not viewable"
 msgstr "সার্টিফিকেট প্রদর্শনযোগ্য নয়"
 
-#: ../mail/em-format-html-display.c:1116
+#: ../mail/em-format-html-display.c:1106
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p -এ সম্পন্ন হয়েছে"
 
-#: ../mail/em-format-html-display.c:1124
+#: ../mail/em-format-html-display.c:1114
 msgid "Overdue:"
 msgstr "সময়সীমা পার হয়ে গেছে:"
 
-#: ../mail/em-format-html-display.c:1127
+#: ../mail/em-format-html-display.c:1117
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p র দ্বারা"
 
-#: ../mail/em-format-html-display.c:1187
+#: ../mail/em-format-html-display.c:1177
 msgid "_View Inline"
-msgstr "ইনলাইন প্রতক্ষ্য করুন (_V)"
+msgstr "ইনলাইন প্রতক্ষ্য করুন (_প)"
 
-#: ../mail/em-format-html-display.c:1188
+#: ../mail/em-format-html-display.c:1178
 msgid "_Hide"
-msgstr "লুকিয়ে ফেলুন (_H)"
+msgstr "লুকিয়ে ফেলুন (_ল)"
 
-#: ../mail/em-format-html-display.c:1189
+#: ../mail/em-format-html-display.c:1179
 msgid "_Fit to Width"
-msgstr "প্রস্থের মাপ অনুযায়ী (_F)"
+msgstr "প্রস্থের মাপ অনুযায়ী (_ম)"
 
-#: ../mail/em-format-html-display.c:1190
+#: ../mail/em-format-html-display.c:1180
 msgid "Show _Original Size"
-msgstr "মূল মাপ প্রদর্শন করা হবে (_O)"
+msgstr "মূল মাপ প্রদর্শন করা হবে (_ম)"
 
-#: ../mail/em-format-html-display.c:1560
+#: ../mail/em-format-html-display.c:1550
 msgid "Attachment Button"
 msgstr "সংযুক্ত করতে ব্যবহৃত বাটন"
 
-#: ../mail/em-format-html-display.c:1767
+#: ../mail/em-format-html-display.c:1757
 msgid "Select folder to save all attachments..."
 msgstr "সমস্ত সংযুক্ত বস্তু সংরক্ষণের উদ্দেশ্যে ফোল্ডার নির্বাচন করুন..."
 
-#: ../mail/em-format-html-display.c:1806
+#: ../mail/em-format-html-display.c:1796
 msgid "Select folder to save selected attachments..."
 msgstr "নির্বাচিত সংযুক্ত বস্তু সংরক্ষণের উদ্দেশ্যে নির্বাচিত ফোল্ডার নির্বাচিত করুন..."
 
-#: ../mail/em-format-html-display.c:1814
+#: ../mail/em-format-html-display.c:1804
 msgid "Save Selected..."
 msgstr "নির্বাচিত বস্তু সংরক্ষণ করুন..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1881
+#: ../mail/em-format-html-display.c:1871
 #, c-format
 msgid "%d attachment"
 msgid_plural "%d attachments"
 msgstr[0] "%d-টি সংযুক্ত বস্তু"
 msgstr[1] "%d সংযুক্ত বস্তু"
 
-#: ../mail/em-format-html-display.c:1945
+#: ../mail/em-format-html-display.c:1935
 msgid "No Attachment"
 msgstr "সংযুক্ত বস্তু নেই"
 
-#: ../mail/em-format-html-display.c:1948
+#: ../mail/em-format-html-display.c:1938
 msgid "Save All"
 msgstr "সমস্ত সংরক্ষণ করা হবে"
 
@@ -11595,7 +11581,7 @@ msgstr "অপ্রকাশিত অনুলিপি প্রাপক"
 
 #. pseudo-header
 #: ../mail/em-format-html.c:1576 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:992
+#: ../mail/em-mailer-prefs.c:987
 msgid "Mailer"
 msgstr "মেইলার"
 
@@ -11733,32 +11719,32 @@ msgstr "নতুন নামে সংরক্ষণ করুন..."
 #: ../mail/em-popup.c:424
 #, c-format
 msgid "untitled_image.%s"
-msgstr "untitled_image.%s"
+msgstr "নামবিহীন ছবি (_ছ)।%s"
 
 #: ../mail/em-popup.c:542 ../mail/em-popup.c:553
 msgid "Set as _Background"
-msgstr "পটভূমী হিসাবে নির্ধারণ করুন(_B)"
+msgstr "পটভূমী হিসাবে নির্ধারণ করুন(_প)"
 
 #: ../mail/em-popup.c:544 ../mail/em-popup.c:555
 msgid "_Reply to sender"
-msgstr "প্রেরকের প্রতি উত্তর (_R)"
+msgstr "প্রেরকের প্রতি উত্তর (_প)"
 
 #: ../mail/em-popup.c:545 ../mail/em-popup.c:556
 #: ../ui/evolution-mail-message.xml.h:84
 msgid "Reply to _List"
-msgstr "লিস্টে উত্তর(_L)"
+msgstr "লিস্টে উত্তর"
 
 #: ../mail/em-popup.c:607
 msgid "_Open Link in Browser"
-msgstr "লিঙ্কটি ব্রাউজারে প্রদর্শন করুন (_O)"
+msgstr "লিঙ্কটি ব্রাউজারে প্রদর্শন করুন (_দ)"
 
 #: ../mail/em-popup.c:608
 msgid "_Send New Message To..."
-msgstr "নতুন বার্তা প্রাপক (_S)..."
+msgstr "নতুন বার্তা প্রাপক (_প)..."
 
 #: ../mail/em-popup.c:609
 msgid "_Add to Addressbook"
-msgstr "ঠিকানাবইয়ে যোগ করুন (_A)"
+msgstr "ঠিকানাবইয়ে যোগ করুন (_য)"
 
 #: ../mail/em-popup.c:762
 #, c-format
@@ -11814,9 +11800,9 @@ msgstr "%s থেকে বার্তা"
 
 #: ../mail/em-vfolder-editor.c:104
 msgid "Search _Folders"
-msgstr "ফোল্ডার অনুসন্ধান করুন (_F)"
+msgstr "ফোল্ডার অনুসন্ধান করুন (_ফ)"
 
-#: ../mail/em-vfolder-rule.c:575
+#: ../mail/em-vfolder-rule.c:574
 msgid "Search Folder source"
 msgstr "অনুসন্ধান ফোল্ডারের উত্‍‌স"
 
@@ -12067,11 +12053,14 @@ msgstr "কোনো বিষয় না উল্লিখিত না হল�
 
 #: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
-msgstr "কোনো ফোল্ডার এক্সপাঞ্জ করার চেষ্টা করলে ব্যবহারকারীকে সতর্কবাণী প্রদর্শন করবে।"
+msgstr ""
+"কোনো ফোল্ডার এক্সপাঞ্জ করার চেষ্টা করলে ব্যবহারকারীকে সতর্কবাণী প্রদর্শন করবে।"
 
 #: ../mail/evolution-mail.schemas.in.in.h:57
-msgid "Prompt the user when he or she tries to send a message without a Subject."
-msgstr "বিষয়হীন বার্তা প্রেরণ করার চেষ্টা করলে ব্যবহারকারীকে সতর্কবাণী প্রদর্শন করবে।"
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+"বিষয়হীন বার্তা প্রেরণ করার চেষ্টা করলে ব্যবহারকারীকে সতর্কবাণী প্রদর্শন করবে।"
 
 #: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
@@ -12079,7 +12068,8 @@ msgstr "ব্যবহারকারী এক্সপাঞ্জ করল�
 
 #: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
-msgstr "ব্যবহারকারী শুধুমাত্র অপ্রকাশিত অনুলীপিপ্রাপকের নাম লিখলে সতর্কবাণী প্রদর্শন করবে"
+msgstr ""
+"ব্যবহারকারী শুধুমাত্র অপ্রকাশিত অনুলীপিপ্রাপকের নাম লিখলে সতর্কবাণী প্রদর্শন করবে"
 
 #: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
@@ -12092,8 +12082,8 @@ msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
-"HTML বার্তা গ্রহণে অনিচ্ছুক প্রাপকদের ব্অবহারকারী HTML বার্তা প্রেরণ করার চেষ্টা করলে "
-"সতর্কবাণী প্রদর্শন করবে।"
+"HTML বার্তা গ্রহণে অনিচ্ছুক প্রাপকদের ব্অবহারকারী HTML বার্তা প্রেরণ করার চেষ্টা "
+"করলে সতর্কবাণী প্রদর্শন করবে।"
 
 #: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
@@ -12141,6 +12131,14 @@ msgstr "মুছে ফেলা বার্তাগুলিকে বার
 msgid "Show deleted messages in the message-list"
 msgstr "বার্তা-তলিকায় মুছে-ফেলা বার্তা প্রদর্শন করা হবে"
 
+#: ../mail/evolution-mail.schemas.in.in.h:73
+msgid "Show the \"Preview\" pane"
+msgstr "\"পূর্বপ্রদর্শন\" পেইন প্রদর্শন করা হবে"
+
+#: ../mail/evolution-mail.schemas.in.in.h:74
+msgid "Show the \"Preview\" pane."
+msgstr "\"পূর্বপ্রদর্শন\" পেইন প্রদর্শন করা হবে।"
+
 #: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "নতুন মেইল এলে যে শব্দের ফাইল বাজানো হবে।"
@@ -12518,7 +12516,7 @@ msgstr "নতুন মেইল বার্তা"
 
 #: ../mail/mail-component.c:766
 msgid "_Mail Message"
-msgstr "মেইল বার্তা (_M)"
+msgstr "মেইল বার্তা (_ম)"
 
 #: ../mail/mail-component.c:767
 msgid "Compose a new mail message"
@@ -12530,7 +12528,7 @@ msgstr "নতুন মেইল ফোল্ডার"
 
 #: ../mail/mail-component.c:774
 msgid "Mail _Folder"
-msgstr "মেইল ফোল্ডার (_F)"
+msgstr "মেইল ফোল্ডার (_ফ)"
 
 #: ../mail/mail-component.c:775
 msgid "Create a new mail folder"
@@ -12548,7 +12546,7 @@ msgstr "    "
 
 #: ../mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
-msgstr " সমর্থিত ধরন পরীক্ষা করা হবে (_e) "
+msgstr " সমর্থিত ধরন পরীক্ষা করা হবে (_ধ) "
 
 #: ../mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
@@ -12556,11 +12554,11 @@ msgstr "<b>বর্তমান গঠনের Evolution SSL সমর্থ�
 
 #: ../mail/mail-config.glade.h:5
 msgid "<b>S_ignatures</b>"
-msgstr "<b>স্বাক্ষর (_i)</b>"
+msgstr "<b>স্বাক্ষর (_স)</b>"
 
 #: ../mail/mail-config.glade.h:6
 msgid "<b>_Languages</b>"
-msgstr "<b>ভাষা (_L)</b>"
+msgstr "<b>ভাষা (_ভ)</b>"
 
 #: ../mail/mail-config.glade.h:7
 msgid "<small>This will make the the filter more reliable, but slower</small>"
@@ -12600,7 +12598,7 @@ msgstr "<span weight=\"bold\">মেইল মুছে ফেলুন</span>"
 
 #: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
-msgstr "<span weight=\"bold\">প্রদর্শিত মেইল হেডার (_H)</span>"
+msgstr "<span weight=\"bold\">প্রদর্শিত মেইল হেডার (_প)</span>"
 
 #: ../mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Filter Options</span>"
@@ -12677,35 +12675,37 @@ msgstr "অ্যাকাউন্ট নিয়ন্ত্রন"
 
 #: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
-msgstr "নতুন স্বাক্ষর যোগ করা হবে (_w)..."
+msgstr "নতুন স্বাক্ষর যোগ করা হবে (_ন)..."
 
 #: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
-msgstr "স্ক্রিপ্ট যোগ করা হবে (_S)"
+msgstr "স্ক্রিপ্ট যোগ করা হবে (_ক)"
 
 #: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
-msgstr "চিহ্নিত অ্যাকাউন্ট ব্যবহার করে প্রেরিত বার্তা সর্বদা স্বাক্ষর করা হবে (_w)"
+msgstr "চিহ্নিত অ্যাকাউন্ট ব্যবহার করে প্রেরিত বার্তা সর্বদা স্বাক্ষর করা হবে (_স)"
 
 #: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted mail"
-msgstr "এনক্রিপ্ট করা মেইল প্রেরণের সময় নিজের ঠিকানাতেও বার্তা এনক্রিপ্ট করা হবে (_f)"
+msgstr ""
+"এনক্রিপ্ট করা মেইল প্রেরণের সময় নিজের ঠিকানাতেও বার্তা এনক্রিপ্ট করা হবে (_ন)"
 
 #: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
-msgstr "সর্বদা এখানে একটি অনুলিপি প্রেরণ করবে (_s):"
+msgstr "সর্বদা এখানে একটি অনুলিপি প্রেরণ করবে (_ব):"
 
 #: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "সর্বদা এখানে একটি অপ্রকাশিত অনুলিপি প্রেরণ করবে (_b):"
+msgstr "সর্বদা এখানে একটি অপ্রকাশিত অনুলিপি প্রেরণ করবে (_প):"
 
 #: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
-msgstr "এনক্রিপ্ট করার সময় আমার কীরিং-এর কী (key)গুলিকে সর্বদা বিশ্বাস করা হবে (_t)"
+msgstr "এনক্রিপ্ট করার সময় আমার কীরিং-এর কী (key)গুলিকে সর্বদা বিশ্বাস করা হবে (_ব)"
 
 #: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted mail"
-msgstr "এনক্রিপ্ট করা মেইল প্রেরণের সময় নিজের ক্ষেত্রে বার্তা সর্বদা এনক্রিপ্ট করা হবে (_m)"
+msgstr ""
+"এনক্রিপ্ট করা মেইল প্রেরণের সময় নিজের ক্ষেত্রে বার্তা সর্বদা এনক্রিপ্ট করা হবে (_ন)"
 
 #: ../mail/mail-config.glade.h:44
 msgid "Attach original message"
@@ -12717,7 +12717,7 @@ msgstr "সংযুক্ত বস্তু"
 
 #: ../mail/mail-config.glade.h:46
 msgid "Automatically _insert smiley images"
-msgstr "স্বয়ংক্রিয়ভাবে স্মাইলি ছবি সন্নিবেশ করা হবে (_i)"
+msgstr "স্বয়ংক্রিয়ভাবে স্মাইলি ছবি সন্নিবেশ করা হবে (_ন)"
 
 #: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
@@ -12729,23 +12729,23 @@ msgstr "বল্টিক (ISO-8859-4)"
 
 #: ../mail/mail-config.glade.h:49
 msgid "Beep w_hen new mail arrives"
-msgstr "নতুন মেইল এলে শব্দ করবে (_h)"
+msgstr "নতুন মেইল এলে শব্দ করবে (_ব)"
 
 #: ../mail/mail-config.glade.h:50
 msgid "C_haracter set:"
-msgstr "অক্ষর মালা (_h):"
+msgstr "অক্ষর মালা (_ম):"
 
 #: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
-msgstr "সমর্থিত ধরন পরীক্ষা করা হবে (_e)"
+msgstr "সমর্থিত ধরন পরীক্ষা করা হবে (_ধ)"
 
 #: ../mail/mail-config.glade.h:52
 msgid "Check _incoming mail for junk"
-msgstr "অন্তর্মুখী মেইলের মাঝে অনাকাঙ্ক্ষিত মেইল পরীক্ষা করুন (_i)"
+msgstr "অন্তর্মুখী মেইলের মাঝে অনাকাঙ্ক্ষিত মেইল পরীক্ষা করুন (_ন)"
 
 #: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
-msgstr "টাইপ করার সময় বানান পরীক্ষা করবে (_t)"
+msgstr "টাইপ করার সময় বানান পরীক্ষা করবে (_ট)"
 
 #: ../mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
@@ -12753,15 +12753,15 @@ msgstr "অন্তর্মুখী মেইলের মাঝে অনা
 
 #: ../mail/mail-config.glade.h:55
 msgid "Cle_ar"
-msgstr "মুছে ফেলুন (_a)"
+msgstr "মুছে ফেলুন (_ম)"
 
 #: ../mail/mail-config.glade.h:56
 msgid "Clea_r"
-msgstr "মুছে ফেলুন (_r)"
+msgstr "মুছে ফেলুন (_ম)"
 
 #: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
-msgstr "ভূল বানান যে রং দিয়ে চিহ্নিত করা হবে (_m):"
+msgstr "ভূল বানান যে রং দিয়ে চিহ্নিত করা হবে (_ব):"
 
 #: ../mail/mail-config.glade.h:58
 msgid "Colors"
@@ -12769,7 +12769,7 @@ msgstr "রঙ"
 
 #: ../mail/mail-config.glade.h:59
 msgid "Confirm _when expunging a folder"
-msgstr "কোনো ফোল্ডার এক্সপাঞ্জ করার আগে সম্মতি নেবে(_w)"
+msgstr "কোনো ফোল্ডার এক্সপাঞ্জ করার আগে সম্মতি নেবে(_য)"
 
 #: ../mail/mail-config.glade.h:60
 msgid ""
@@ -12789,15 +12789,15 @@ msgstr ""
 
 #: ../mail/mail-config.glade.h:66
 msgid "De_fault"
-msgstr "ডিফল্ট (_f)"
+msgstr "ডিফল্ট (_ড)"
 
 #: ../mail/mail-config.glade.h:67
 msgid "Default character e_ncoding:"
-msgstr "অক্ষরের ডিফল্ট এনকোডিং (_n):"
+msgstr "অক্ষরের ডিফল্ট এনকোডিং (_ক):"
 
 #: ../mail/mail-config.glade.h:70
 msgid "Digitally _sign outgoing messages (by default)"
-msgstr "বহির্গামী বার্তা ডিজিট্যালভাবে স্বাক্ষর করা হবে (ডিফল্টরূপে) (_s)"
+msgstr "বহির্গামী বার্তা ডিজিট্যালভাবে স্বাক্ষর করা হবে (ডিফল্টরূপে) (_ড)"
 
 #: ../mail/mail-config.glade.h:71
 msgid "Do not quote original message"
@@ -12809,7 +12809,7 @@ msgstr "সম্পন্ন"
 
 #: ../mail/mail-config.glade.h:73
 msgid "Drafts _Folder:"
-msgstr "খসড়ার ফোল্ডার (_F):"
+msgstr "খসড়ার ফোল্ডার (_ফ):"
 
 #: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
@@ -12817,19 +12817,19 @@ msgstr "ই-মেইল অ্যাকাউন্ট"
 
 #: ../mail/mail-config.glade.h:76
 msgid "Email _Address:"
-msgstr "ই-মেইল ঠিকানা (_A):"
+msgstr "ই-মেইল ঠিকানা (_ঠ):"
 
 #: ../mail/mail-config.glade.h:77
 msgid "Empty trash folders on e_xit"
-msgstr "প্রস্থান করার সময় আবর্জনার ফোল্ডার খালি করবে (_x)"
+msgstr "প্রস্থান করার সময় আবর্জনার ফোল্ডার খালি করবে (_প)"
 
 #: ../mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
-msgstr "এনক্রিপশন সার্টিফিকেট (_p):"
+msgstr "এনক্রিপশন সার্টিফিকেট (_প):"
 
 #: ../mail/mail-config.glade.h:79
 msgid "Encrypt out_going messages (by default)"
-msgstr "বহির্গামী বার্তা এনক্রিপ্ট করা হবে (ডিফল্টরূপে) (_g)"
+msgstr "বহির্গামী বার্তা এনক্রিপ্ট করা হবে (ডিফল্টরূপে) (_ন)"
 
 #: ../mail/mail-config.glade.h:81
 msgid "Execute Command..."
@@ -12837,7 +12837,7 @@ msgstr "কমান্ড চালাও ..."
 
 #: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
-msgstr "স্থায়ী-প্রস্থ (_x):"
+msgstr "স্থায়ী-প্রস্থ (_থ):"
 
 #: ../mail/mail-config.glade.h:83
 msgid "Font Properties"
@@ -12845,7 +12845,7 @@ msgstr "ফন্টের বৈশিষ্ট্য"
 
 #: ../mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
-msgstr "HTML বিন্যাসে বার্তা ফরম্যাট করুন(_H)"
+msgstr "HTML বিন্যাসে বার্তা ফরম্যাট করুন"
 
 #: ../mail/mail-config.glade.h:86
 msgid "HTML Mail"
@@ -12857,11 +12857,11 @@ msgstr "হেডার"
 
 #: ../mail/mail-config.glade.h:88
 msgid "Highlight _quotations with"
-msgstr "এর দ্বারা উদ্ধৃতি উজ্জ্বলিত করা হবে (_q)"
+msgstr "এর দ্বারা উদ্ধৃতি উজ্জ্বলিত করা হবে (_ত)"
 
 #: ../mail/mail-config.glade.h:89
 msgid "I_nclude remote tests"
-msgstr "দূরবর্তী পরীক্ষণ অন্তর্ভুক্ত করা হবে(_n)"
+msgstr "দূরবর্তী পরীক্ষণ অন্তর্ভুক্ত করা হবে"
 
 #: ../mail/mail-config.glade.h:92
 msgid "Inline"
@@ -12895,7 +12895,7 @@ msgstr "উল্লেখ্য: প্রথমবার সংযোগ ন�
 
 #: ../mail/mail-config.glade.h:102
 msgid "Or_ganization:"
-msgstr "প্রতিষ্ঠান (_g):"
+msgstr "প্রতিষ্ঠান (_প):"
 
 #: ../mail/mail-config.glade.h:103
 msgid "PGP/GPG _Key ID:"
@@ -12903,7 +12903,7 @@ msgstr "PGP/GPG _Key ID:"
 
 #: ../mail/mail-config.glade.h:106
 msgid "Play sound file when new mail arri_ves"
-msgstr "নতুন মেইল এলে শব্দ করবে (_v)"
+msgstr "নতুন মেইল এলে শব্দ করবে (_ল)"
 
 #: ../mail/mail-config.glade.h:107
 msgid ""
@@ -12938,7 +12938,7 @@ msgstr "নিম্নলিখিত অপশনের মধ্য থেক
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "বার্তায় শুধুমাত্র অপ্রকাশিত অনুলিপি প্রাপকদের নাম লেখা থাকলে সতর্কবাণী প্রদর্শন করবে"
-"(_o)"
+"(_প)"
 
 #: ../mail/mail-config.glade.h:113
 msgid "Quote original message"
@@ -12950,27 +12950,27 @@ msgstr "উদ্ধৃত"
 
 #: ../mail/mail-config.glade.h:115
 msgid "Re_member password"
-msgstr "পাসওয়ার্ড মনে রাখবে (_m)"
+msgstr "পাসওয়ার্ড মনে রাখবে (_ম)"
 
 #: ../mail/mail-config.glade.h:116
 msgid "Re_ply-To:"
-msgstr "উত্তর-প্রাপক (_p):"
+msgstr "উত্তর-প্রাপক (_প):"
 
 #: ../mail/mail-config.glade.h:118
 msgid "Remember _password"
-msgstr "পাসওয়ার্ড মনে রাখবে (_p)"
+msgstr "পাসওয়ার্ড মনে রাখবে (_প)"
 
 #: ../mail/mail-config.glade.h:119
 msgid "S_elect..."
-msgstr "নির্বাচন করুন (_e)..."
+msgstr "নির্বাচন করুন (_ন)..."
 
 #: ../mail/mail-config.glade.h:120
 msgid "S_tandard Font:"
-msgstr "আদর্শ ফন্ট (_t):"
+msgstr "আদর্শ ফন্ট (_দ):"
 
 #: ../mail/mail-config.glade.h:121
 msgid "Se_lect..."
-msgstr "নির্বাচন করুন (_l)..."
+msgstr "নির্বাচন করুন (_ন)..."
 
 #: ../mail/mail-config.glade.h:123
 msgid "Select HTML fixed width font"
@@ -12998,23 +12998,23 @@ msgstr "মেইল প্রেরণ করা হচ্ছে"
 
 #: ../mail/mail-config.glade.h:130
 msgid "Sent _Messages Folder:"
-msgstr "প্রেরিত বার্তার ফোল্ডার (_M):"
+msgstr "প্রেরিত বার্তার ফোল্ডার (_ব):"
 
 #: ../mail/mail-config.glade.h:131
 msgid "Ser_ver requires authentication"
-msgstr "সার্ভারে অনুমোদনের প্রয়োজন আছে (_v)"
+msgstr "সার্ভারে অনুমোদনের প্রয়োজন আছে (_স)"
 
 #: ../mail/mail-config.glade.h:132
 msgid "Server _Type: "
-msgstr "সার্ভারের ধরন (_T): "
+msgstr "সার্ভারের ধরন (_ধ): "
 
 #: ../mail/mail-config.glade.h:133
 msgid "Sig_ning certificate:"
-msgstr "স্বাক্ষরকারী সার্টিফিকেট (_n):"
+msgstr "স্বাক্ষরকারী সার্টিফিকেট (_স):"
 
 #: ../mail/mail-config.glade.h:134
 msgid "Signat_ure:"
-msgstr "স্বাক্ষর (_u):"
+msgstr "স্বাক্ষর (_স):"
 
 #: ../mail/mail-config.glade.h:135
 msgid "Signatures"
@@ -13026,7 +13026,7 @@ msgstr "স্বাক্ষরের টেবিল"
 
 #: ../mail/mail-config.glade.h:137
 msgid "Specify _filename:"
-msgstr "ফাইলের নাম নির্ধারণ করুন (_f):"
+msgstr "ফাইলের নাম নির্ধারণ করুন (_ফ):"
 
 #: ../mail/mail-config.glade.h:138
 msgid "Spell Checking"
@@ -13034,17 +13034,18 @@ msgstr "বানান পরীক্ষণ"
 
 #: ../mail/mail-config.glade.h:139
 msgid "T_erminal Font:"
-msgstr "টার্মিনালের ফন্ট (_e):"
+msgstr "টার্মিনালের ফন্ট (_ট):"
 
 #: ../mail/mail-config.glade.h:140
 msgid "T_ype: "
-msgstr "ধরন(_y): "
+msgstr "ধরন(_ধ): "
 
 #: ../mail/mail-config.glade.h:141
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
-msgstr "এই স্থানে প্রদর্শিত ভাষার তালিকায় উপস্থিত ভাষাগুলির জন্য অভিধান ইনস্টল করা হয়েছে।"
+msgstr ""
+"এই স্থানে প্রদর্শিত ভাষার তালিকায় উপস্থিত ভাষাগুলির জন্য অভিধান ইনস্টল করা হয়েছে।"
 
 #: ../mail/mail-config.glade.h:142
 msgid ""
@@ -13066,11 +13067,11 @@ msgstr ""
 
 #: ../mail/mail-config.glade.h:148
 msgid "User_name:"
-msgstr "ব্যবহারকারীর নাম (_n):"
+msgstr "ব্যবহারকারীর নাম (_ব):"
 
 #: ../mail/mail-config.glade.h:149
 msgid "V_ariable-width:"
-msgstr "পরিবর্তনশীল-বিস্তার (_a):"
+msgstr "পরিবর্তনশীল-বিস্তার (_প):"
 
 #: ../mail/mail-config.glade.h:150
 msgid ""
@@ -13084,77 +13085,78 @@ msgstr ""
 
 #: ../mail/mail-config.glade.h:154
 msgid "_Add Signature"
-msgstr "স্বাক্ষর যোগ করুন (_A)"
+msgstr "স্বাক্ষর যোগ করুন (_য)"
 
 #: ../mail/mail-config.glade.h:155
 msgid "_Always load images from the Internet"
-msgstr "ইন্টারনেট থেকে সর্বদা ছবি লোড করবে (_A)"
+msgstr "ইন্টারনেট থেকে সর্বদা ছবি লোড করবে (_স)"
 
 #: ../mail/mail-config.glade.h:156
 msgid "_Do not notify me when new mail arrives"
-msgstr "নতুন মেইল এলে সতর্ক করার প্রয়োজন নেই (_D)"
+msgstr "নতুন মেইল এলে সতর্ক করার প্রয়োজন নেই (_ন)"
 
 #: ../mail/mail-config.glade.h:157
 msgid "_Don't sign meeting requests (for Outlook compatibility)"
-msgstr "সভার অনুরোধ সাক্ষর করা হবে না (Outlook সাথে সামঞ্জস্য বজায় রাখার উদ্দেশ্যে) (_D)"
+msgstr ""
+"সভার অনুরোধ সাক্ষর করা হবে না (Outlook সাথে সামঞ্জস্য বজায় রাখার উদ্দেশ্যে) (_ভ)"
 
 #: ../mail/mail-config.glade.h:159
 msgid "_Forward style:"
-msgstr "ফরওয়ার্ডের ধরন (_F):"
+msgstr "ফরওয়ার্ডের ধরন (_ফ):"
 
 #: ../mail/mail-config.glade.h:160
 msgid "_Full Name:"
-msgstr "সম্পূর্ণ নাম (_F):"
+msgstr "সম্পূর্ণ নাম (_প):"
 
 #: ../mail/mail-config.glade.h:161
 msgid "_Load images in mail from contacts"
-msgstr "পরিচিত প্রেরকদের থেকে প্রাপ্ত মেইলের ছবি লোড করা হবে (_L)"
+msgstr "পরিচিত প্রেরকদের থেকে প্রাপ্ত মেইলের ছবি লোড করা হবে (_ল)"
 
 #: ../mail/mail-config.glade.h:162
 msgid "_Make this my default account"
-msgstr "আমার ডিফল্ট অ্যাকাউন্ট হিসাবে চিহ্নিত করা হবে (_M)"
+msgstr "আমার ডিফল্ট অ্যাকাউন্ট হিসাবে চিহ্নিত করা হবে (_চ)"
 
 #: ../mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
-msgstr "কত সময়ের পরে বার্তাগুলিতে পড়া-হয়েছে চিহ্ন দেওয়া হবে (_M)"
+msgstr "কত সময়ের পরে বার্তাগুলিতে পড়া-হয়েছে চিহ্ন দেওয়া হবে (_চ)"
 
 #: ../mail/mail-config.glade.h:165
 msgid "_Never load images from the Internet"
-msgstr "ইন্টারনেট থেকে ছবি কখনো লোড করবে না (_N)"
+msgstr "ইন্টারনেট থেকে ছবি কখনো লোড করবে না (_ন)"
 
 #: ../mail/mail-config.glade.h:166
 msgid "_Path:"
-msgstr "পাথ (_P):"
+msgstr "পাথ (_প):"
 
 #: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "HTML বার্তা গ্রহনে অনিচ্ছুক প্রাপকদের HTML বার্তা প্রেরণ করার পূর্বে সতর্কবাণী দেবে "
-"(_P)"
+"(_স)"
 
 #: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
-msgstr "বার্তার বিষয় আলাদা ভাবে উল্লেখ না করা থাকলে সতর্কবাণী দেবে (_P)"
+msgstr "বার্তার বিষয় আলাদা ভাবে উল্লেখ না করা থাকলে সতর্কবাণী দেবে (_স)"
 
 #: ../mail/mail-config.glade.h:169
 msgid "_Reply style:"
-msgstr "উত্তর লেখার ধরন (_R):"
+msgstr "উত্তর লেখার ধরন (_ত):"
 
 #: ../mail/mail-config.glade.h:170
 msgid "_Script:"
-msgstr "স্ক্রিপ্ট (_S):"
+msgstr "স্ক্রিপ্ট (_স):"
 
 #: ../mail/mail-config.glade.h:172
 msgid "_Show animated images"
-msgstr "অ্যানিমেশন ছবি প্রদর্শন করা হবে (_S)"
+msgstr "অ্যানিমেশন ছবি প্রদর্শন করা হবে (_দ)"
 
 #: ../mail/mail-config.glade.h:173
 msgid "_Use Secure Connection:"
-msgstr "সুরক্ষিত সংযোগব্যবস্থা প্রয়োগ করা হবে (_U):"
+msgstr "সুরক্ষিত সংযোগব্যবস্থা প্রয়োগ করা হবে (_র):"
 
 #: ../mail/mail-config.glade.h:174
 msgid "_Use the same fonts as other applications"
-msgstr "অন্যান্য অ্যাপ্লিকেশনে ব্যবহৃত ফন্ট ব্যবহার করা হবে (_U)"
+msgstr "অন্যান্য অ্যাপ্লিকেশনে ব্যবহৃত ফন্ট ব্যবহার করা হবে (_ব)"
 
 #: ../mail/mail-config.glade.h:175
 msgid "color"
@@ -13178,15 +13180,15 @@ msgstr "<span weight=\"bold\">এনক্রিপশন প্রক্রি�
 
 #: ../mail/mail-dialogs.glade.h:5
 msgid "Case _Sensitive"
-msgstr "অক্ষরের ছাঁদ সম্পর্কে সচেতন (_S)"
+msgstr "অক্ষরের ছাঁদ সম্পর্কে সচেতন (_স)"
 
 #: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
-msgstr "সমাপ্ত (_m)"
+msgstr "সমাপ্ত (_ম)"
 
 #: ../mail/mail-dialogs.glade.h:8
 msgid "F_ind:"
-msgstr "অনুসন্ধান(_i):"
+msgstr "অনুসন্ধান(_ন):"
 
 #: ../mail/mail-dialogs.glade.h:9
 msgid "Find in Message"
@@ -13211,7 +13213,7 @@ msgstr "কিছু বাছাই করা হয়নি"
 
 #: ../mail/mail-dialogs.glade.h:14
 msgid "S_erver:"
-msgstr "সার্ভার (_e):"
+msgstr "সার্ভার (_স):"
 
 #: ../mail/mail-dialogs.glade.h:15
 msgid "Security Information"
@@ -13225,28 +13227,28 @@ msgstr ""
 
 #: ../mail/mail-dialogs.glade.h:19
 msgid "_Accept License"
-msgstr "লাইসেন্সে সম্মতি প্রদান করুন(_A)"
+msgstr "লাইসেন্সে সম্মতি প্রদান করুন(_স)"
 
 #: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
 msgid "_Due By:"
-msgstr "নির্ধারিত সময়সীমা (_D):"
+msgstr "নির্ধারিত সময়সীমা (_স):"
 
 #: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
-msgstr "ফ্ল্যাগ (_F):"
+msgstr "ফ্ল্যাগ (_ফ):"
 
 #: ../mail/mail-dialogs.glade.h:22
 msgid "_Subscribe"
-msgstr "সাবস্ক্রাইব করুন(_S)"
+msgstr "সাবস্ক্রাইব করুন(_ব)"
 
 #: ../mail/mail-dialogs.glade.h:23
 msgid "_Tick this to accept the license agreement"
-msgstr "লাইসেন্স সংক্রান্ত চুক্তিপত্র গ্রহণ করতে এই স্থানে টিক (tick) চিহ্ন দিন(_T)"
+msgstr "লাইসেন্স সংক্রান্ত চুক্তিপত্র গ্রহণ করতে এই স্থানে টিক (tick) চিহ্ন দিন(_ট)"
 
 #: ../mail/mail-dialogs.glade.h:24
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
-msgstr "আনসাবস্ক্রাইব (_U)"
+msgstr "আনসাবস্ক্রাইব (_ন)"
 
 #: ../mail/mail-dialogs.glade.h:25
 msgid "specific folders only"
@@ -13474,7 +13476,7 @@ msgstr "মেইল প্রেরণ এবং গ্রহণ করুন"
 
 #: ../mail/mail-send-recv.c:327
 msgid "Cancel _All"
-msgstr "সব বাতিল করুন (_A)"
+msgstr "সব বাতিল করুন (_ব)"
 
 #: ../mail/mail-send-recv.c:416
 msgid "Updating..."
@@ -13489,7 +13491,6 @@ msgid "Checking for new mail"
 msgstr "নতুনপ্রাপ্ত মেইল অনুসন্ধান করা হচ্ছে"
 
 #: ../mail/mail-session.c:207
-#: ../plugins/exchange-operations/exchange-config-listener.c:601
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s -এর জন্য পাসওয়ার্ড লিখুন"
@@ -13515,7 +13516,7 @@ msgstr "এই স্বাক্ষরের জন্য একটি না�
 msgid "Name:"
 msgstr "নাম:"
 
-#: ../mail/mail-tools.c:115
+#: ../mail/mail-tools.c:116
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "`%s' স্পুল ডিরেক্টরিটি তৈরি করা যায়নি: %s"
@@ -13525,16 +13526,16 @@ msgstr "`%s' স্পুল ডিরেক্টরিটি তৈরি ক�
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "একটি non-mbox উত্স `%s'-কে movemail করার চেষ্টা হচ্ছে"
 
-#: ../mail/mail-tools.c:249
+#: ../mail/mail-tools.c:242
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "ফরওয়ার্ড করা বার্তা - %s"
 
-#: ../mail/mail-tools.c:251
+#: ../mail/mail-tools.c:244
 msgid "Forwarded message"
 msgstr "ফরওয়ার্ড করা বার্তা"
 
-#: ../mail/mail-tools.c:291
+#: ../mail/mail-tools.c:284
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "অবৈধ ফোল্ডার: `%s'"
@@ -13563,7 +13564,8 @@ msgid "New Search Folder"
 msgstr "নতুন অনুসন্ধানের ফোল্ডার"
 
 #: ../mail/mail.error.xml.h:1
-msgid "A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgid ""
+"A folder named &quot;{1}&quot; already exists. Please use a different name."
 msgstr ""
 "&quot;{1}&quot; নামের একটি ফোল্ডার বর্তমানে উপস্থিত আছে। অনুগ্রহ করে অন্য একটি নাম "
 "নির্বাচন করুন।"
@@ -13816,7 +13818,8 @@ msgstr "অগ্রসর হলে, এই অ্যাকাউন্ট স�
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
-msgstr "এখন প্রস্থান করলে, Evolution পুনরায় আরম্ভ না করা হলে এই বার্তাগুলি প্রেরিত হবে না।"
+msgstr ""
+"এখন প্রস্থান করলে, Evolution পুনরায় আরম্ভ না করা হলে এই বার্তাগুলি প্রেরিত হবে না।"
 
 #: ../mail/mail.error.xml.h:58
 msgid "Ignore"
@@ -13848,7 +13851,8 @@ msgstr "সমস্ত বার্তা পড়া-হয়েছে হিস�
 
 #: ../mail/mail.error.xml.h:63
 msgid "Mark all messages as read in the selected folder"
-msgstr "নির্বাচিত ফোল্ডারের মধ্যে উপস্থিত সমস্ত বার্তা পড়া-হয়েছে হিসাবে চিহ্নিত করা হবে"
+msgstr ""
+"নির্বাচিত ফোল্ডারের মধ্যে উপস্থিত সমস্ত বার্তা পড়া-হয়েছে হিসাবে চিহ্নিত করা হবে (_চ)"
 
 #: ../mail/mail.error.xml.h:64
 msgid "Missing folder."
@@ -13911,7 +13915,8 @@ msgstr "মেইল-পাঠের সূচনার অনুরোধ ক�
 
 #: ../mail/mail.error.xml.h:78
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
-msgstr "ফোল্ডার &quot;{0}&quot; এবং এর সকল সাবফোল্ডারগুলি কি নিশ্চিতরূপে মুছে ফেলা হবে?"
+msgstr ""
+"ফোল্ডার &quot;{0}&quot; এবং এর সকল সাবফোল্ডারগুলি কি নিশ্চিতরূপে মুছে ফেলা হবে?"
 
 #: ../mail/mail.error.xml.h:79
 msgid "Search Folders automatically updated."
@@ -13999,7 +14004,8 @@ msgstr ""
 "স্পষ্টভাবে যোগ করুন।"
 
 #: ../mail/mail.error.xml.h:100
-msgid "This message cannot be sent because you have not specified any Recipients"
+msgid ""
+"This message cannot be sent because you have not specified any Recipients"
 msgstr "আপনি কোনো প্রাপক উল্লেখ না করার দরুন এই বার্তাটি প্রেরণ করা সম্ভব নয়"
 
 #: ../mail/mail.error.xml.h:101
@@ -14032,7 +14038,7 @@ msgstr "লাইসেন্স ফাইল পড়তে ব্যর্থ।
 
 #: ../mail/mail.error.xml.h:106
 msgid "Use _Default"
-msgstr "ডিফল্ট মান ব্যবহার করা হবে (_D)"
+msgstr "ডিফল্ট মান ব্যবহার করা হবে (_ড)"
 
 #: ../mail/mail.error.xml.h:107
 msgid "Use default drafts folder?"
@@ -14070,7 +14076,8 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:115
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
-msgstr "আপনার সার্ভার &quot;{0}&quot; -এ আপনার লগ-ইন &quot;{0}&quot; ব্যর্থ হয়েছে।"
+msgstr ""
+"আপনার সার্ভার &quot;{0}&quot; -এ আপনার লগ-ইন &quot;{0}&quot; ব্যর্থ হয়েছে।"
 
 #: ../mail/mail.error.xml.h:116
 msgid "Your message with the subject &quot;{0}&quot; was not delivered."
@@ -14078,88 +14085,92 @@ msgstr "&quot;{0}&quot; বিষয়সহ আপনার বার্তাট
 
 #: ../mail/mail.error.xml.h:117
 msgid "_Append"
-msgstr "শেষে যোগ করা হবে (_A)"
+msgstr "শেষে যোগ করা হবে (_য)"
 
 #: ../mail/mail.error.xml.h:118
 msgid "_Discard changes"
-msgstr "পরিবর্তন বাতিল করা হবে (_D)"
+msgstr "পরিবর্তন বাতিল করা হবে (_ব)"
+
+#: ../mail/mail.error.xml.h:119
+msgid "_Empty Trash"
+msgstr "আবর্জনা ফাঁকা করা হবে (_ফ)"
 
 #: ../mail/mail.error.xml.h:120
 msgid "_Expunge"
-msgstr "স্থায়ীরূপে বর্জন করা হবে (_E)"
+msgstr "স্থায়ীরূপে বর্জন করা হবে (_ক)"
 
 #: ../mail/mail.error.xml.h:121
 msgid "_Open Messages"
-msgstr "খোলা বার্তা (_O)"
+msgstr "খোলা বার্তা (_খ)"
 
-#: ../mail/message-list.c:1006
+#: ../mail/message-list.c:996
 msgid "Unseen"
 msgstr "পড়া হয়নি"
 
-#: ../mail/message-list.c:1007
+#: ../mail/message-list.c:997
 msgid "Seen"
 msgstr "পড়া হয়েছে"
 
-#: ../mail/message-list.c:1008
+#: ../mail/message-list.c:998
 msgid "Answered"
 msgstr "উত্তর দেওয়া হয়েছে"
 
-#: ../mail/message-list.c:1009
+#: ../mail/message-list.c:999
 msgid "Multiple Unseen Messages"
 msgstr "একাধিক না পড়া বার্তা"
 
-#: ../mail/message-list.c:1010
+#: ../mail/message-list.c:1000
 msgid "Multiple Messages"
 msgstr "একাধিক বার্তা"
 
-#: ../mail/message-list.c:1014
+#: ../mail/message-list.c:1004
 msgid "Lowest"
 msgstr "সর্বনিম্ন"
 
-#: ../mail/message-list.c:1015
+#: ../mail/message-list.c:1005
 msgid "Lower"
 msgstr "নিম্নতর"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1009
 msgid "Higher"
 msgstr "উচ্চতর"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1010
 msgid "Highest"
 msgstr "সর্বোত্তম"
 
-#: ../mail/message-list.c:1348 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1338 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1355 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1345 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "আজ %l:%M %p"
 
-#: ../mail/message-list.c:1364 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1354 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "গতকাল %l:%M %p"
 
-#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1366 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1384 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1374 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1386 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2052
+#: ../mail/message-list.c:2042
 msgid "Message List"
 msgstr "বার্তার তালিকা"
 
-#: ../mail/message-list.c:3397
+#: ../mail/message-list.c:3387
 msgid "Generating message list"
 msgstr "বার্তার তালিকা প্রস্তুত করা হচ্ছে"
 
@@ -14269,7 +14280,7 @@ msgstr "Evolution আর্কাইভের নাম নির্বাচন
 
 #: ../plugins/backup-restore/backup-restore.c:61
 msgid "_Restart Evolution after backup"
-msgstr "ব্যাক-আপ সমাপ্ত করে Evolution পুনরায় আরম্ভ করুন(_R)"
+msgstr "ব্যাক-আপ সমাপ্ত করে Evolution পুনরায় আরম্ভ করুন"
 
 #: ../plugins/backup-restore/backup-restore.c:89
 msgid "Select Evolution archive to restore"
@@ -14277,7 +14288,7 @@ msgstr "পুনরুদ্ধারের উদ্দেশ্যে Evoluti
 
 #: ../plugins/backup-restore/backup-restore.c:97
 msgid "_Restart Evolution after restore"
-msgstr "তথ্য পুনরুদ্ধারে পরে Evolution পুনরায় আরম্ভ করুন (_R)"
+msgstr "তথ্য পুনরুদ্ধারে পরে Evolution পুনরায় আরম্ভ করুন (_র)"
 
 #: ../plugins/backup-restore/backup.c:109
 msgid "Backup Evolution directory"
@@ -14317,36 +14328,38 @@ msgid "Restore Settings..."
 msgstr "পুনরুদ্ধার সংক্রান্ত বৈশিষ্ট্যাবলী..."
 
 # FIXME
-#: ../plugins/bbdb/bbdb.c:410
+#: ../plugins/bbdb/bbdb.c:404
 msgid "Automatic Contacts"
 msgstr "স্বয়ংক্রিয় পরিচিতি"
 
-#: ../plugins/bbdb/bbdb.c:419
+#: ../plugins/bbdb/bbdb.c:413
 msgid "<span weight=\"bold\">Automatic Contacts</span>"
 msgstr "<span weight=\"bold\">স্বয়ংক্রিয় পরিচিতি</span>"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:432
-msgid "_Automatically create entries in the addressbook when responding to mail"
+#: ../plugins/bbdb/bbdb.c:426
+msgid ""
+"_Automatically create entries in the addressbook when responding to mail"
 msgstr ""
 "বার্তার প্রত্যুত্তর প্রেরণ করার সময় স্বয়ংক্রিয়রূপে ঠিকানাবইয়ের মধ্যে পরিচিতি তথ্য যোগ "
-"করা হবে (_A)"
+"করা হবে (_ক)"
 
-#: ../plugins/bbdb/bbdb.c:450
+#: ../plugins/bbdb/bbdb.c:444
 msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
 msgstr "<span weight=\"bold\">ইনস্ট্যান্ট মেসেজিং-র পরিচিতি</span>"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:463
+#: ../plugins/bbdb/bbdb.c:457
 msgid ""
 "Periodically synchronize contact information and images from my _instant "
 "messenger"
-msgstr "ইনস্ট্যান্ট মেসেনজারে উপস্থিত পরিচিতি তালিকার তথ্য ও ছবি নিয়মিতরূপে সুসংগত করা হবে(_I)"
+msgstr ""
+"ইনস্ট্যান্ট মেসেনজারে উপস্থিত পরিচিতি তালিকার তথ্য ও ছবি নিয়মিতরূপে সুসংগত করা হবে"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:470
+#: ../plugins/bbdb/bbdb.c:464
 msgid "Synchronize with _buddy list now"
-msgstr "বন্ধুদের তালিকার সাথে এই মুহুর্তে সুসংগত করা হবে (_b)"
+msgstr "বন্ধুদের তালিকার সাথে এই মুহুর্তে সুসংগত করা হবে (_ব)"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic contacts"
@@ -14416,7 +14429,7 @@ msgstr "অবস্থান নির্বাচন করুন"
 
 #: ../plugins/calendar-weather/calendar-weather.c:654
 msgid "_Units:"
-msgstr "একক(_U):"
+msgstr "একক(_ক):"
 
 #: ../plugins/calendar-weather/calendar-weather.c:661
 msgid "Metric (Celsius, cm, etc)"
@@ -14444,7 +14457,7 @@ msgstr ""
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
 msgid "Copy _Email Address"
-msgstr "ই-মেইল ঠিকানা কপি করুন (_E)"
+msgstr "ই-মেইল ঠিকানা কপি করুন (_ম)"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
@@ -14455,14 +14468,16 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "Evolution ডিফল্ট মেইলার কিনা তা পরীক্ষা করা হবে"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.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 "
@@ -14483,15 +14498,15 @@ msgstr "অন্যান্য ব্যবহারকারীর ফোল�
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
 msgid "_Account:"
-msgstr "অ্যাকাউন্ট (_A):"
+msgstr "অ্যাকাউন্ট (_ক):"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3
 msgid "_Folder Name:"
-msgstr "ফোল্ডারের নাম (_F):"
+msgstr "ফোল্ডারের নাম (_ন):"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4
 msgid "_User:"
-msgstr "ব্যবহারকারী (_U):"
+msgstr "ব্যবহারকারীর নাম (_ব):"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
 #: ../plugins/exchange-operations/exchange-account-setup.c:63
@@ -14519,11 +14534,11 @@ msgstr ""
 "এই অপশনটির মাধ্যমে প্লেইনটেক্সট পাসওয়ার্ড অনুমোদন ব্যবস্থার সাহায্যে Exchange "
 "সার্ভারের সাথে সংযোগ করা হবে।"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:253
+#: ../plugins/exchange-operations/exchange-account-setup.c:251
 msgid "Out Of Office"
 msgstr "অফিসে উপস্থিত নেই"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:260
+#: ../plugins/exchange-operations/exchange-account-setup.c:258
 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."
@@ -14531,75 +14546,68 @@ msgstr ""
 "অফিসে অনুপস্থিত থাকাকালীন প্রাপ্ত বার্তার প্রেরকদের নিম্নোক্ত বার্তাটি \n"
 "স্বয়ংক্রিয়ভবে প্রেরণ করা হবে।"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:272
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
+#: ../plugins/exchange-operations/exchange-account-setup.c:270
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
 msgid "I am out of the office"
 msgstr "বর্তমানে আমি অফিসে উপস্থিত নেই"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:273
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
+#: ../plugins/exchange-operations/exchange-account-setup.c:271
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
 msgid "I am in the office"
 msgstr "বর্তমানে আমি অফিসে উপস্থিত"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:324
+#: ../plugins/exchange-operations/exchange-account-setup.c:321
 msgid "Change the password for Exchange account"
 msgstr "Exchange অ্যাকাউন্টের পাসওয়ার্ড পরিবর্তন করুন"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:326
+#: ../plugins/exchange-operations/exchange-account-setup.c:323
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Change Password"
 msgstr "পাসওয়ার্ড পরিবর্তন"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:331
+#: ../plugins/exchange-operations/exchange-account-setup.c:327
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Exchange অ্যাকাউন্টের কর্মবন্টন সংক্রান্ত বৈশিষ্ট্যাবলী পরিচালনা"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:333
+#: ../plugins/exchange-operations/exchange-account-setup.c:329
 msgid "Delegation Assitant"
 msgstr "কর্মবন্টন সহায়ক"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:345
+#: ../plugins/exchange-operations/exchange-account-setup.c:339
 msgid "Miscelleneous"
 msgstr "বিবিধ"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:355
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
 msgid "View the size of all Exchange folders"
 msgstr "সমস্ত Exchange ফোল্ডারের মাপ প্রদর্শন করুন"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:357
+#: ../plugins/exchange-operations/exchange-account-setup.c:351
 msgid "Folders Size"
 msgstr "ফোল্ডারের মাপ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:364
+#: ../plugins/exchange-operations/exchange-account-setup.c:358
 msgid "Exchange Settings"
 msgstr "Exchange সংক্রান্ত বৈশিষ্ট্যাবলী"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:611
+#: ../plugins/exchange-operations/exchange-account-setup.c:601
 msgid "_OWA Url:"
 msgstr "_OWA Url:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:636
+#: ../plugins/exchange-operations/exchange-account-setup.c:626
 msgid "A_uthenticate"
-msgstr "পরিচয় প্রমাণ ব্যবস্থা (_u)"
+msgstr "পরিচয় প্রমাণ ব্যবস্থা (_প)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:824
+#: ../plugins/exchange-operations/exchange-account-setup.c:814
 msgid "Authentication Type"
 msgstr "পরিচয় প্রমাণ ব্যবস্থার প্রকৃতি"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:838
+#: ../plugins/exchange-operations/exchange-account-setup.c:828
 msgid "Ch_eck for Supported Types"
-msgstr "সমর্থিত ধরন পরীক্ষা করুন (_e)"
-
-#: ../plugins/exchange-operations/exchange-calendar.c:192
-#: ../plugins/exchange-operations/exchange-contacts.c:162
-msgid ""
-"Evolution is in offline mode. You cannot create or modify folders now.\n"
-"Please switch to online mode for such operations."
-msgstr ""
+msgstr "সমর্থিত ধরন পরীক্ষা করুন (_প)"
 
 #. User entered a wrong existing
 #. * password. Prompt him again.
@@ -14630,7 +14638,8 @@ msgstr "নতুন পাসওয়ার্ড:"
 
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:6
 msgid "Your current password has expired. Please change your password now."
-msgstr "আপনার বর্তমান পাসওয়ার্ডের মেয়াদ পূর্ণ হয়েছে। অনুগ্রহ করে পাসওয়ার্ড পরিবর্তন করুন।"
+msgstr ""
+"আপনার বর্তমান পাসওয়ার্ডের মেয়াদ পূর্ণ হয়েছে। অনুগ্রহ করে পাসওয়ার্ড পরিবর্তন করুন।"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:144
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:576
@@ -14690,11 +14699,11 @@ msgstr "লেখক (পড়ুন, নির্মাণ করুন)"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:2
 msgid "C_alendar:"
-msgstr "বর্ষপঞ্জি(_a):"
+msgstr "বর্ষপঞ্জি(_ব):"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:3
 msgid "Co_ntacts:"
-msgstr "পরিচিতি(_n): "
+msgstr "পরিচিতি(_চ): "
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:4
 msgid "Delegate Permissions"
@@ -14726,15 +14735,15 @@ msgstr ""
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:12
 msgid "_Delegate can see private items"
-msgstr "প্রতিনিধি ব্যক্তিগত তথ্য দেখতে পারবেন (_D)"
+msgstr "প্রতিনিধি ব্যক্তিগত তথ্য দেখতে পারবেন (_প)"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:14
 msgid "_Inbox:"
-msgstr "ইনবক্স(_I):"
+msgstr "ইনবক্স(_ন):"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 msgid "_Tasks:"
-msgstr "কর্ম (_T):"
+msgstr "কর্ম (_ক):"
 
 #: ../plugins/exchange-operations/exchange-folder-permission.c:58
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
@@ -14749,28 +14758,24 @@ msgstr "ফোল্ডারের নাম"
 msgid "Folder Size"
 msgstr "ফোল্ডারের মাপ"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:180
-msgid "Subscribe to Other User's"
-msgstr "অন্যান্য ব্যবহারকারীদের কর্মে সাবস্ক্রাইব করুন"
-
 #: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
 msgid "Exchange Folder Tree"
 msgstr "Exchange ফোল্ডার ট্রি"
 
-#: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:227
-#: ../plugins/exchange-operations/exchange-folder.c:237
+#: ../plugins/exchange-operations/exchange-folder.c:62
+#: ../plugins/exchange-operations/exchange-folder.c:223
+#: ../plugins/exchange-operations/exchange-folder.c:233
 msgid "Unsubscribe Folder..."
 msgstr "ফোল্ডার থেকে আনসাবস্ক্রাইব করুন..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:464
-#: ../plugins/exchange-operations/exchange-folder.c:524
+#: ../plugins/exchange-operations/exchange-folder.c:460
+#: ../plugins/exchange-operations/exchange-folder.c:520
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "\"%s\" ফোল্ডার থেকে নিশ্চিতরূপে আন-সবাস্ক্রাইব করা হবে কি?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:476
-#: ../plugins/exchange-operations/exchange-folder.c:536
+#: ../plugins/exchange-operations/exchange-folder.c:472
+#: ../plugins/exchange-operations/exchange-folder.c:532
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "\"%s\" থেকে আন-সবাস্ক্রাইব করুন"
@@ -14999,7 +15004,8 @@ msgstr "URL-টি সঠিকরূপে উল্লিখিত হয়ে�
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Make sure the server name is spelled correctly and try again."
-msgstr "সার্ভারের নামের বানান সঠিকরূপে উল্লিখিত হয়েছে কিনা পরীক্ষা করে পুনরায় প্রচেষ্টা করুন।"
+msgstr ""
+"সার্ভারের নামের বানান সঠিকরূপে উল্লিখিত হয়েছে কিনা পরীক্ষা করে পুনরায় প্রচেষ্টা করুন।"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Make sure the username and password are correct and try again."
@@ -15208,15 +15214,15 @@ msgstr "অনাকাঙ্ক্ষিত বার্তা সংক্র�
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
 #: ../plugins/mail-account-disable/mail-account-disable.c:46
 msgid "_Disable"
-msgstr "নিষ্ক্রিয় করুন (_D)"
+msgstr "নিষ্ক্রিয় করুন (_ন)"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:6
 msgid "_Enable"
-msgstr "সক্রিয় করুন (_E)"
+msgstr "সক্রিয় করুন (_স)"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:7
 msgid "_Junk List"
-msgstr "অনাকাঙ্ক্ষিত বস্তুর তালিকা(_J)"
+msgstr "অনাকাঙ্ক্ষিত বস্তুর তালিকা(_ন)"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
@@ -15258,23 +15264,23 @@ msgstr "অংশগ্রহণকারীরা নিম্নলিখি�
 
 #: ../plugins/groupwise-features/properties.glade.h:11
 msgid "_Contacts..."
-msgstr "পরিচিতি (_C)..."
+msgstr "পরিচিতি (_প)..."
 
 #: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Cutomize notification message"
-msgstr "সূচনাবার্তা নিজস্ব প্রয়োজন অনুসারে বিন্যাস করুন (_C)"
+msgstr "সূচনাবার্তা নিজস্ব প্রয়োজন অনুসারে বিন্যাস করুন (_ব)"
 
 #: ../plugins/groupwise-features/properties.glade.h:13
 msgid "_Not Shared"
-msgstr "যৌথরূপে ব্যবহৃত নয় (_N)"
+msgstr "যৌথরূপে ব্যবহৃত নয় (_ন)"
 
 #: ../plugins/groupwise-features/properties.glade.h:15
 msgid "_Shared With ..."
-msgstr "যৌথরূপে ব্যবহৃত হয়েছে (_S) ..."
+msgstr "যৌথরূপে ব্যবহৃত হয়েছে (_য) ..."
 
 #: ../plugins/groupwise-features/properties.glade.h:16
 msgid "_Sharing"
-msgstr "যৌথরূপে ব্যবহার (_S)"
+msgstr "যৌথরূপে ব্যবহার (_য)"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:1
 msgid "<b>Name</b>"
@@ -15290,15 +15296,15 @@ msgstr "যোগ করুণ/সম্পাদন"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5
 msgid "Con_tacts"
-msgstr "পরিচিতি(_t)"
+msgstr "পরিচিতি(_প)"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
 msgid "Modify _folders/options/rules/"
-msgstr "ফোল্ডার/অপশন/নিয়ম পরিবর্তন করুন (_f)"
+msgstr "ফোল্ডার/অপশন/নিয়ম পরিবর্তন করুন (_ফ)"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
 msgid "Read items marked _private"
-msgstr "ব্যক্তিগত হিসাবে চিহ্নিত বিষয়বস্তু পড়া হবে (_p)"
+msgstr "ব্যক্তিগত হিসাবে চিহ্নিত বিষয়বস্তু পড়া হবে (_ব)"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
 msgid "Reminder Notes"
@@ -15306,20 +15312,20 @@ msgstr "তাগাদা বার্তা"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
 msgid "Subscribe to my _alarms"
-msgstr "আমার সতর্কধবনিতে সাবস্ক্রাইব করা হবে (_a)"
+msgstr "আমার সতর্কধবনিতে সাবস্ক্রাইব করা হবে (_স)"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
 msgid "Subscribe to my _notifications"
-msgstr "আমার সূচনাবার্তায় সাবস্ক্রাইব করা হবে (_n)"
+msgstr "আমার সূচনাবার্তায় সাবস্ক্রাইব করা হবে (_ব)"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
 #: ../ui/evolution-mail-message.xml.h:121
 msgid "_Read"
-msgstr "পড়ুন (_R)"
+msgstr "পড়ুন (_প)"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:14
 msgid "_Write"
-msgstr "লিখুন (_W)"
+msgstr "লিখুন (_ল)"
 
 #: ../plugins/groupwise-features/proxy-listing.glade.h:1
 msgid "Proxy"
@@ -15342,7 +15348,7 @@ msgstr "প্রক্সি লগ-ইন"
 
 #: ../plugins/groupwise-features/proxy-login.c:219
 #: ../plugins/groupwise-features/proxy-login.c:261
-#: ../plugins/groupwise-features/proxy.c:497
+#: ../plugins/groupwise-features/proxy.c:490
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -15350,9 +15356,9 @@ msgstr "%s %s -র(ব্যবহারকারী %s) জন্য পাস�
 
 #: ../plugins/groupwise-features/proxy-login.c:484
 msgid "_Proxy Login..."
-msgstr "প্রক্সি লগ-ইন(_P)..."
+msgstr "প্রক্সি লগ-ইন(_প)..."
 
-#: ../plugins/groupwise-features/proxy.c:679
+#: ../plugins/groupwise-features/proxy.c:672
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "শুধমাত্র অ্যাকউন্ট সক্রিয় করা হলে প্রক্সি সংক্রান্ত ট্যাব উপলব্ধ করা হবে।"
 
@@ -15366,9 +15372,9 @@ msgstr "ব্যবহারকারীদের নাম উল্লেখ
 
 #: ../plugins/groupwise-features/share-folder-common.c:338
 msgid "New _Shared Folder..."
-msgstr "যৌথরূপে ব্যবহৃত নতুন ফোল্ডার(_S)..."
+msgstr "যৌথরূপে ব্যবহৃত নতুন ফোল্ডার(_য)..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:446
+#: ../plugins/groupwise-features/share-folder-common.c:453
 msgid "Sharing"
 msgstr "যৌথরূপে ব্যবহার"
 
@@ -15467,7 +15473,8 @@ msgstr "সংযুক্ত বর্ষপঞ্জির মধ্যে এ
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
-msgstr "সমস্ত চিহ্নিত বস্তুর ব্যবস্থাপনার জন্য ফাইলটি সংরক্ষণ করে বর্ষপঞ্জিটি ইম্পোর্ট করা আবশ্যক"
+msgstr ""
+"সমস্ত চিহ্নিত বস্তুর ব্যবস্থাপনার জন্য ফাইলটি সংরক্ষণ করে বর্ষপঞ্জিটি ইম্পোর্ট করা আবশ্যক"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1968
 msgid "Meetings and Tasks"
@@ -15477,7 +15484,7 @@ msgstr "সভা ও কার্যতালিকা"
 #. FIXME Need a schema for this
 #: ../plugins/itip-formatter/itip-formatter.c:1991
 msgid "_Delete message after acting"
-msgstr "কর্ম সঞ্চালনের পরে বার্তা মুছে ফেলা হবে (_D)"
+msgstr "কর্ম সঞ্চালনের পরে বার্তা মুছে ফেলা হবে (_ম)"
 
 #: ../plugins/itip-formatter/itip-formatter.c:2001
 msgid "<span weight=\"bold\">Conflict Search</span>"
@@ -15653,7 +15660,8 @@ msgstr "<b>%s</b>-র দ্বারা নিম্নলিখিত সভ�
 #: ../plugins/itip-formatter/itip-view.c:354
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr "<b>%s</b>-র দ্বারা, %s-র মাধ্যমে নিম্নলিখিত সভায় আপনার উপস্থিতি অনুরোধ করেছেন:"
+msgstr ""
+"<b>%s</b>-র দ্বারা, %s-র মাধ্যমে নিম্নলিখিত সভায় আপনার উপস্থিতি অনুরোধ করেছেন:"
 
 #: ../plugins/itip-formatter/itip-view.c:356
 #, c-format
@@ -15663,7 +15671,8 @@ msgstr "<b>%s</b>-র দ্বারা নিম্নলিখিত সভ�
 #: ../plugins/itip-formatter/itip-view.c:362
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
-msgstr "<b>%s</b>-র দ্বারা, %s-র মাধ্যমে একটি বিদ্যমান সভায় যোগ করার অনুরোধ জানানো হয়েছে:"
+msgstr ""
+"<b>%s</b>-র দ্বারা, %s-র মাধ্যমে একটি বিদ্যমান সভায় যোগ করার অনুরোধ জানানো হয়েছে:"
 
 #: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
@@ -15672,7 +15681,8 @@ msgstr "<b>%s</b>-র দ্বারা একটি বিদ্যমান �
 
 #: ../plugins/itip-formatter/itip-view.c:367
 #, 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:370
@@ -15693,7 +15703,8 @@ msgstr "<b>%s</b>-র দ্বারা নিম্নলিখিত সভ�
 #: ../plugins/itip-formatter/itip-view.c:379
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
-msgstr "<b>%s</b>-র দ্বারা সভা সংক্রান্ত নিম্নলিখিত পরিবর্তনগুলির প্রস্তাব জানানো হয়েছে।"
+msgstr ""
+"<b>%s</b>-র দ্বারা সভা সংক্রান্ত নিম্নলিখিত পরিবর্তনগুলির প্রস্তাব জানানো হয়েছে।"
 
 #: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
@@ -15720,7 +15731,8 @@ msgstr "<b>%s</b> নিম্নলিখিত কর্ম প্রকাশ
 #: ../plugins/itip-formatter/itip-view.c:419
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
-msgstr "<b>%s</b>-র দ্বারা নিম্নলিখিত কর্মের জন্য %s-কে নিযুক্ত করার অনুরোধ জানানো হয়েছে:"
+msgstr ""
+"<b>%s</b>-র দ্বারা নিম্নলিখিত কর্মের জন্য %s-কে নিযুক্ত করার অনুরোধ জানানো হয়েছে:"
 
 #: ../plugins/itip-formatter/itip-view.c:422
 #, c-format
@@ -15767,7 +15779,8 @@ msgstr "<b>%s</b>-র দ্বারা, নিম্নলিখিত বর�
 #: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
-msgstr "<b>%s</b>-র দ্বারা নিম্নলিখিত বরাদ্দ কর্ম সংক্রান্ত পরিবর্তনের প্রস্তাব জানানো হয়েছে:"
+msgstr ""
+"<b>%s</b>-র দ্বারা নিম্নলিখিত বরাদ্দ কর্ম সংক্রান্ত পরিবর্তনের প্রস্তাব জানানো হয়েছে:"
 
 #: ../plugins/itip-formatter/itip-view.c:451
 #, c-format
@@ -15797,11 +15810,11 @@ msgstr "বক্তব্য:"
 
 #: ../plugins/itip-formatter/itip-view.c:981
 msgid "Send u_pdates to attendees"
-msgstr "সভায় অংশগ্রহণকারীদের আপডেট প্রেরণ করা হবে (_p)"
+msgstr "সভায় অংশগ্রহণকারীদের আপডেট প্রেরণ করা হবে (_প)"
 
 #: ../plugins/itip-formatter/itip-view.c:990
 msgid "A_pply to all instances"
-msgstr "সমস্ত ইনস্ট্যান্সের ক্ষেত্রে প্রয়োগ করা হবে (_p)"
+msgstr "সমস্ত ইনস্ট্যান্সের ক্ষেত্রে প্রয়োগ করা হবে (_প)"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
 msgid "Displays text/calendar parts in messages."
@@ -15824,14 +15837,15 @@ 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 ""
 "বর্তমানে উপস্থিত কোনো অংশগ্রহণকারীর থেকে এই প্রত্যূত্তরটি প্রাপ্ত করার হয়নি।  নতুন "
 "অংশগ্রহণকারী হিসাবে যোগ করা হবে কি?"
 
 #: ../plugins/mail-account-disable/mail-account-disable.c:47
 msgid "Proxy _Logout"
-msgstr "প্রক্সি থেকে লগ-আউট (_L)"
+msgstr "প্রক্সি থেকে লগ-আউট (_ল)"
 
 #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
 msgid "Allows disabling of accounts."
@@ -15860,7 +15874,8 @@ msgid "No store available"
 msgstr "সংগ্রহস্থল উপলব্ধ নেই"
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
-msgid "A plugin which implements a CORBA interface for accessing mail data remotely."
+msgid ""
+"A plugin which implements a CORBA interface for accessing mail data remotely."
 msgstr ""
 "দূরবর্তী অবস্থান থেকে মেইলের তথ্য ব্যবহার করার জন্য একটি CORBA ইন্টারফেস কার্যকর "
 "করার উদ্দেশ্যে প্রয়োগ করা প্লাগ-ইন।"
@@ -15877,7 +15892,7 @@ msgstr "বার্তার বিষয়বস্তু অনুসারে
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
 msgid "Con_vert to Meeting"
-msgstr "সভায় রূপান্তর করা হবে (_v)"
+msgstr "সভায় রূপান্তর করা হবে (_প)"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
 msgid "Mail to meeting"
@@ -15891,7 +15906,7 @@ msgstr "বার্তার বিষয়বস্তু অনুসারে
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
 msgid "Con_vert to Task"
-msgstr "কর্মে রূপান্তর করা হবে (_v)"
+msgstr "কর্মে রূপান্তর করা হবে (_প)"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
 msgid "Mail to task"
@@ -15900,17 +15915,17 @@ msgstr "মেইল থেকে কর্মে পরিবর্তন"
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
 msgid "Contact list _owner"
-msgstr "পরিচিতি তালিকার মালিক (_o)"
+msgstr "পরিচিতি তালিকার মালিক (_ম)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get list _archive"
-msgstr "লিস্টের আর্কাইভ প্রাপ্ত করুন (_a)"
+msgstr "লিস্টের আর্কাইভ প্রাপ্ত করুন (_ক)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
 msgid "Get list _usage information"
-msgstr "লিস্ট ব্যবহার সংক্রান্ত তথ্য প্রাপ্ত করুন(_u)"
+msgstr "লিস্ট ব্যবহার সংক্রান্ত তথ্য প্রাপ্ত করুন(_ব)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
 msgid "Mailing List Actions"
@@ -15919,7 +15934,7 @@ 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 "মেইলিং লিস্ট (_L)"
+msgstr "মেইলিং লিস্ট (_ল)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
 msgid ""
@@ -15932,17 +15947,17 @@ msgstr ""
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
 msgid "_Post message to list"
-msgstr "লিস্টে বার্তা প্রেরণ করুন (_P)"
+msgstr "লিস্টে বার্তা প্রেরণ করুন (_ব)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
 msgid "_Subscribe to list"
-msgstr "লিস্টে সাবস্ক্রাইব করুন (_S)"
+msgstr "লিস্টে সাবস্ক্রাইব করুন (_স)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
 msgid "_Un-subscribe to list"
-msgstr "লিস্ট থেকে আন-সাবস্ক্রাইব করুন (_U)"
+msgstr "লিস্ট থেকে আন-সাবস্ক্রাইব করুন (_ন)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 msgid "Action not available"
@@ -16015,11 +16030,11 @@ msgstr "উল্লিখিত কর্মের জন্য প্রযো
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
 msgid "_Edit message"
-msgstr "বার্তা সম্পাদনা (_E)"
+msgstr "বার্তা সম্পাদনা (_স)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18
 msgid "_Send message"
-msgstr "বার্তা প্রেরণ করুন (_S)"
+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"
@@ -16055,11 +16070,11 @@ msgstr "অফলাইন অবস্থা প্রদর্শনের উ
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
 msgid "_Do not make this available offline"
-msgstr "এটি অফলাইন অবস্থায় উপলব্ধ করা হবে না (_D)"
+msgstr "এটি অফলাইন অবস্থায় উপলব্ধ করা হবে না (_ন)"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
 msgid "_Mark Calendar for offline use"
-msgstr "অফলাইন ব্যবহারের উদ্দেশ্যে বর্ষপঞ্জি উপলব্ধ করুন (_M)"
+msgstr "অফলাইন ব্যবহারের উদ্দেশ্যে বর্ষপঞ্জি উপলব্ধ করুন (_চ)"
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
@@ -16173,16 +16188,16 @@ msgid "Gives an option to print mail from composer"
 msgstr "কম্পোসার থেকে বার্তা প্রিন্ট করার ব্যবস্থা উপলব্ধ করা হয়"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:18 ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
 #: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
-msgstr "প্রিন্টের পূর্বপ্রদর্শন (_v)"
+msgstr "প্রিন্টের পূর্বপ্রদর্শন (_প)"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:2
 msgid "Prints the message"
 msgstr "বার্তাটি প্রিন্ট করে"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:99
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:98
 msgid "Spamassassin (built-in)"
 msgstr "স্প্যামএসাসিন (বিল্ট-ইন)"
 
@@ -16314,7 +16329,7 @@ msgstr "নির্বাচিত বস্তু সংরক্ষণ"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
 msgid "Save to _Disk"
-msgstr "নির্বাচিত বস্তু ডিস্কে সংরক্ষণ করুন (_D)"
+msgstr "নির্বাচিত বস্তু ডিস্কে সংরক্ষণ করুন (_ড)"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
 msgid "Saves selected calendar or tasks list to disk."
@@ -16357,11 +16372,11 @@ msgstr "প্রদর্শনের উদ্দেশ্যে একটি
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
 msgid "_Show only this Calendar"
-msgstr "শুধুমাত্র এই বর্ষপঞ্জি প্রদর্শন করা হবে (_S)"
+msgstr "শুধুমাত্র এই বর্ষপঞ্জি প্রদর্শন করা হবে (_প)"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
 msgid "_Show only this Task List"
-msgstr "শুধুমাত্র চিহ্নিত কর্মের তালিকা প্রদর্শন করা হবে (_S)"
+msgstr "শুধুমাত্র চিহ্নিত কর্মের তালিকা প্রদর্শন করা হবে (_প)"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
 msgid "Startup wizard"
@@ -16419,7 +16434,7 @@ msgstr "বিষয় অনুযায়ী বার্তার থ্রেড
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
 #: ../plugins/subject-thread/subject-thread.c:54
 msgid "Fall back to threading messages by sub_ject"
-msgstr "বিষয় অনুসারে বার্তার থ্রেড নির্মাণ করা হবে (_j)"
+msgstr "বিষয় অনুসারে বার্তার থ্রেড নির্মাণ করা হবে (_ব)"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
@@ -16466,8 +16481,10 @@ msgid "Last upgraded configuration version"
 msgstr "সর্বশেষ আপগ্রেড কনফিগারেশন সংস্করণ"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:8
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
-msgstr "অফলাইন ব্যবহারের জন্য ডিস্কের সাথে যে ফোল্ডারগুলির সামঞ্জস্য করা হবে, তার তালিকা"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
+"অফলাইন ব্যবহারের জন্য ডিস্কের সাথে যে ফোল্ডারগুলির সামঞ্জস্য করা হবে, তার তালিকা"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:9
 msgid "Printer settings"
@@ -16482,7 +16499,8 @@ msgid "Start in offline mode"
 msgstr "অফলাইন মোডে আরম্ভ করা হবে"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "The configuration version of Evolution, with major/minor/configuration level"
+msgid ""
+"The configuration version of Evolution, with major/minor/configuration level"
 msgstr "Evolution-র কনফিগারেশন সংস্করণ, গুরুতর/গৌণ/কনফিগারেশন স্তর সহ"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:13
@@ -16501,7 +16519,8 @@ msgstr "সাইডবারের ডিফল্ট প্রস্থ, প�
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level"
-msgstr "সর্বশেষ আপ-গ্রেড করার Evolution-র কনফিগারেশন সংস্করণ, গুরুতর/গৌণ/কনফিগারেশন স্তর সহ"
+msgstr ""
+"সর্বশেষ আপ-গ্রেড করার Evolution-র কনফিগারেশন সংস্করণ, গুরুতর/গৌণ/কনফিগারেশন স্তর সহ"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid ""
@@ -16526,7 +16545,8 @@ msgid "Whether the toolbar should be visible."
 msgstr "টুলবার প্রদর্শিত হবে কি না।"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:21
-msgid "Whether the warning dialog in development versions of Evolution is skipped."
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Evolution ডিভেলপমেন্ট সংস্করণে সতর্কবাণীর ডায়লগ বাক্সের প্রদর্শন এড়িয়ে যাওয়া হবে "
 "কি না।"
@@ -16596,7 +16616,7 @@ msgstr ""
 
 #: ../shell/e-shell-importer.c:283
 msgid "F_ilename:"
-msgstr "ফাইলের নাম(_i):"
+msgstr "ফাইলের নাম(_ফ):"
 
 #: ../shell/e-shell-importer.c:288
 msgid "Select a file"
@@ -16604,19 +16624,19 @@ msgstr "একটি ফাইল নির্বাচন করুন"
 
 #: ../shell/e-shell-importer.c:300
 msgid "File _type:"
-msgstr "ফাইলের ধরন (_t):"
+msgstr "ফাইলের ধরন (_ধ):"
 
 #: ../shell/e-shell-importer.c:336
 msgid "Import data and settings from _older programs"
-msgstr "পুরোনো প্রোগ্রাম থেকে ডাটা এবং বৈশিষ্ট্য ইম্পোর্ট করুন (_o)"
+msgstr "পুরোনো প্রোগ্রাম থেকে ডাটা এবং বৈশিষ্ট্য ইম্পোর্ট করুন (_প)"
 
 #: ../shell/e-shell-importer.c:339
 msgid "Import a _single file"
-msgstr "শুধুমাত্র একটি ফাইল ইম্পোর্ট করুন (_s)"
+msgstr "শুধুমাত্র একটি ফাইল ইম্পোর্ট করুন (_ক)"
 
 #: ../shell/e-shell-importer.c:698
 msgid "_Import"
-msgstr "ইম্পোর্ট (_I)"
+msgstr "ইম্পোর্ট (_ম)"
 
 #: ../shell/e-shell-settings-dialog.c:318
 msgid "Evolution Settings"
@@ -16642,47 +16662,43 @@ msgstr "ফোল্ডারের নামের মাঝে \"#\" অক্
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' এবং '..' ফোল্ডারের নামগুলি সংরক্ষিত।"
 
-#: ../shell/e-shell-window-commands.c:71
+#: ../shell/e-shell-window-commands.c:70
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "গহনোম পাইলট টুলগুলি সম্ভবত এই সিস্টেমে ইনস্টল করা হয়নি।"
 
-#: ../shell/e-shell-window-commands.c:79
+#: ../shell/e-shell-window-commands.c:78
 #, c-format
 msgid "Error executing %s."
 msgstr "%s চালাতে সমস্যা হয়েছে।"
 
-#: ../shell/e-shell-window-commands.c:128
+#: ../shell/e-shell-window-commands.c:127
 msgid "Bug buddy is not installed."
 msgstr "বাগ-বাডি ইনস্টল করা হয়নি।"
 
-#: ../shell/e-shell-window-commands.c:136
+#: ../shell/e-shell-window-commands.c:135
 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 box
-#: ../shell/e-shell-window-commands.c:533
+#: ../shell/e-shell-window-commands.c:532
 msgid "translator-credits"
-msgstr ""
-"Moumita Nandi <rimi19822003@yahoo.co.in>, Semati Ghosh <semanti_84@yahoo.co."
-"in>, Sampat Kundu  <skk_84@rediffmail.com> 2004, Deepayan Sarkar "
-"<deepayan@bengalinux.org>, Progga <progga@bengalinux.org>, Sayamindu "
-"Dasgupta <sayamindu@bengalinux.org>, Runa Bhattacharjee <runa@bengalinux.org>"
+msgstr "Moumita Nandi <rimi19822003@yahoo.co.in>, Semati Ghosh <semanti_84@yahoo.co.in>, Sampat Kundu  <skk_84@rediffmail.com> 2004, Deepayan Sarkar <deepayan@bengalinux.org>, Progga <progga@bengalinux.org>, Sayamindu Dasgupta <sayamindu@bengalinux.org>, Runa Bhattacharjee <runa@bengalinux.org>"
 
-#: ../shell/e-shell-window-commands.c:547
+#: ../shell/e-shell-window-commands.c:546
 msgid "Groupware Suite"
 msgstr "Groupware Suite"
 
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:774
 msgid "_Work Online"
-msgstr "অনলাইন কাজ করা হবে (_W)"
+msgstr "অনলাইন কাজ করা হবে (_ক)"
 
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:52
+#: ../shell/e-shell-window-commands.c:787 ../ui/evolution.xml.h:50
 msgid "_Work Offline"
-msgstr "অফলাইন কাজ করুন (_W)"
+msgstr "অফলাইন কাজ করুন (_ক)"
 
-#: ../shell/e-shell-window-commands.c:801
+#: ../shell/e-shell-window-commands.c:800
 msgid "Work Offline"
 msgstr "অফলাইন কাজ করুন"
 
@@ -16698,7 +16714,7 @@ msgstr "Evolution অফলাইন যাচ্ছে।"
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr "Evolution বর্তমানে অফলাইন কাজ করছে।  এই বাটনটি টিপে অনলাইনে কাজ করুন।"
 
-#: ../shell/e-shell-window.c:735
+#: ../shell/e-shell-window.c:724
 #, c-format
 msgid "Switch to %s"
 msgstr "%s-এ পরিবর্তন করুন"
@@ -16738,7 +16754,7 @@ msgstr "নতুন পরীক্ষা"
 
 #: ../shell/evolution-test-component.c:141
 msgid "_Test"
-msgstr "পরীক্ষা(_T)"
+msgstr "পরীক্ষা(_প)"
 
 #: ../shell/evolution-test-component.c:142
 msgid "Create a new test item"
@@ -16974,15 +16990,15 @@ msgstr ""
 
 #: ../shell/shell.error.xml.h:31
 msgid "_Forget"
-msgstr "মুছে ফেলা হবে (_F)"
+msgstr "মুছে ফেলা হবে (_ম)"
 
 #: ../shell/shell.error.xml.h:32
 msgid "_Keep Data"
-msgstr "ডাটা রক্ষা করা হবে (_K)"
+msgstr "ডাটা রক্ষা করা হবে (_র)"
 
 #: ../shell/shell.error.xml.h:33
 msgid "_Remind Me Later"
-msgstr "পরে মনে করাবে (_R)"
+msgstr "পরে মনে করাবে (_ম)"
 
 #: ../shell/shell.error.xml.h:34
 msgid ""
@@ -17264,7 +17280,8 @@ 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 ""
 "আপনার কাছে এই সার্টিফিকেট-অথেরিটিগুলির পরিচয়-প্রমানকারী সার্টিফিকেট ফাইলে উপস্থিত "
 "রয়েছে:"
@@ -17279,7 +17296,7 @@ msgstr "আপনার সার্টিফিকেট"
 
 #: ../smime/gui/smime-ui.glade.h:47
 msgid "_Edit CA Trust"
-msgstr "CA ট্রাস্ট সম্পাদন করুন (_E)"
+msgstr "CA ট্রাস্ট সম্পাদন করুন (_ম)"
 
 #. XXX we shouldn't be popping up dialogs in this code.
 #: ../smime/lib/e-cert-db.c:651
@@ -17538,111 +17555,111 @@ msgstr "'%s' চালানো সম্ভব হয়নি: %s\n"
 msgid "Shutting down %s (%s)\n"
 msgstr "%s (%s) বন্ধ করা হচ্ছে\n"
 
-#: ../ui/evolution-addressbook.xml.h:2
-msgid "Contact _Preview"
-msgstr "পরিচিতির তথ্যের পূর্বপ্রদর্শন (_P)"
-
-#: ../ui/evolution-addressbook.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:3
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "নির্বাচিত পরিচিতিদের তথ্য অন্য ফোল্ডারে কপি করুন..."
 
-#: ../ui/evolution-addressbook.xml.h:5 ../ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:4 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "নির্বাচিত বস্তু কপি করুন"
 
-#: ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-addressbook.xml.h:5
 msgid "Copy to Folder..."
 msgstr "ফোল্ডারে কপি করুন ..."
 
-#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "নির্বাচিত বস্তু কাট করুন"
 
-#: ../ui/evolution-addressbook.xml.h:10
+#: ../ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "নির্বাচিত পরিচিতি মুছে ফেলুন"
 
-#: ../ui/evolution-addressbook.xml.h:12
+#: ../ui/evolution-addressbook.xml.h:11
 msgid "Move Selected Contacts to Another Folder..."
 msgstr "নির্বাচিত পরিচিতিদের তথ্য অন্য একটি ফোল্ডারে সরিয়ে ফেলুন..."
 
-#: ../ui/evolution-addressbook.xml.h:13
+#: ../ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr "ফোল্ডারে সরিয়ে ফেলুন ..."
 
-#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
 msgstr "ক্লিপবোর্ডের বস্তু পেস্ট করুন"
 
-#: ../ui/evolution-addressbook.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "যে পরিচিতিগুলি প্রিন্ট করা হবে তার পূর্বপ্রদর্শন করে"
 
-#: ../ui/evolution-addressbook.xml.h:19
+#: ../ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "নির্বাচিত পরিচিতি প্রিন্ট করুন"
 
-#: ../ui/evolution-addressbook.xml.h:21
+#: ../ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "নির্বাচিত পরিচিতিকে ভিকার্ড (VCard) হিসাবে সংরক্ষণ করুন।"
 
-#: ../ui/evolution-addressbook.xml.h:22 ../widgets/text/e-text.c:2684
+#: ../ui/evolution-addressbook.xml.h:21 ../widgets/text/e-text.c:2684
 msgid "Select All"
 msgstr "সমস্ত নির্বাচন করুন"
 
-#: ../ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "সকল পরিচিতিদের নির্বাচন করুন"
 
-#: ../ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-addressbook.xml.h:23
 msgid "Send a message to the selected contacts."
 msgstr "নির্বাচিত পরিচিতিদের নিকট বার্তা প্রেরণ করুন।"
 
-#: ../ui/evolution-addressbook.xml.h:25
+#: ../ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "এই পরিচিতির নিকট বার্তা প্রেরণ করুন"
 
-#: ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "নির্বাচিত পরিচিতিদেরকে অন্য কোনো ব্যক্তির কাছে প্রেরণ করুন"
 
-#: ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-addressbook.xml.h:26
 msgid "Show contact preview window"
 msgstr "পরিচিতি পূর্বপ্রদর্শনের উইন্ডোটি প্রদর্শন করা হবে"
 
-#: ../ui/evolution-addressbook.xml.h:28
+#: ../ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "বন্ধ করুন"
 
-#: ../ui/evolution-addressbook.xml.h:29
+#: ../ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "লোড করার প্রক্রিয়া স্থগিত করুন"
 
-#: ../ui/evolution-addressbook.xml.h:30
+#: ../ui/evolution-addressbook.xml.h:29
 msgid "View the current contact"
 msgstr "বর্তমান পরিচিতি দেখুন"
 
-#: ../ui/evolution-addressbook.xml.h:31 ../ui/evolution-calendar.xml.h:38
-#: ../ui/evolution-tasks.xml.h:21
+#: ../ui/evolution-addressbook.xml.h:30 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-tasks.xml.h:19
 msgid "_Actions"
-msgstr "কর্ম (_A)"
+msgstr "কর্ম (_ক)"
 
 # FIXME
-#: ../ui/evolution-addressbook.xml.h:36
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "_Forward Contact..."
-msgstr "পরিচিতি ফরওয়ার্ড করুন(_F)..."
+msgstr "পরিচিতি ফরওয়ার্ড করুন(_ব)..."
+
+#: ../ui/evolution-addressbook.xml.h:39
+msgid "_Preview Pane"
+msgstr "পূর্বপ্রদর্শনের পেইন (_প)"
 
 #: ../ui/evolution-addressbook.xml.h:41
 msgid "_Save as VCard..."
-msgstr "VCard হিসাবে সংরক্ষণ করুন (_V)..."
+msgstr "VCard হিসাবে সংরক্ষণ করুন (_ভ)..."
 
 #: ../ui/evolution-addressbook.xml.h:42
 msgid "_Select All"
-msgstr "সমস্ত নির্বাচন করুন (_S)"
+msgstr "সমস্ত নির্বাচন করুন (_ম)"
 
 #: ../ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
-msgstr "এই পরিচিতির নিকট বার্তা প্রেরণ করুন(_S)..."
+msgstr "এই পরিচিতির নিকট বার্তা প্রেরণ করুন(_প)..."
 
 #: ../ui/evolution-calendar.xml.h:4
 msgid "Day"
@@ -17706,7 +17723,7 @@ msgstr "এই বর্ষপঞ্জির জন্য মুক্ত/ব�
 
 #: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
-msgstr "সম্পূর্ণরূপে মুছে ফেলুন(_e)"
+msgstr "সম্পূর্ণরূপে মুছে ফেলুন(_ম)"
 
 #: ../ui/evolution-calendar.xml.h:24
 msgid "Purge old appointments and meetings"
@@ -17714,11 +17731,7 @@ msgstr "পুরোনো সাক্ষাত্কার এবং সভা
 
 #: ../ui/evolution-calendar.xml.h:25
 msgid "Select _Date"
-msgstr "তারিখ নির্বাচন করুন(_D)"
-
-#: ../ui/evolution-calendar.xml.h:26
-msgid "Select _Today"
-msgstr "আজকের তারিখ নির্বাচন করুন (_T)"
+msgstr "তারিখ নির্বাচন করুন(_ত)"
 
 #: ../ui/evolution-calendar.xml.h:27
 msgid "Select a specific date"
@@ -17763,7 +17776,7 @@ msgstr "কার্যসপ্তাহ"
 
 #: ../ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
-msgstr "সাক্ষাত্‍কার খোলো(_O)"
+msgstr "সাক্ষাত্‍কার খোলো(_স)"
 
 #: ../ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
@@ -17771,7 +17784,7 @@ msgstr "নির্বাচিত টেক্সটটি ক্লিপব�
 
 #: ../ui/evolution-composer-entries.xml.h:2
 msgid "Cu_t"
-msgstr "কাট করুন (_t)"
+msgstr "কাট করুন (_ট)"
 
 #: ../ui/evolution-composer-entries.xml.h:3
 msgid "Cut selected text to the clipboard"
@@ -17783,7 +17796,7 @@ msgstr "ক্লিপবোর্ড থেকে টেক্সট পেস
 
 #: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
-msgstr "সমস্ত নির্বাচন করুন (_A)"
+msgstr "সমস্ত নির্বাচন করুন (_ম)"
 
 #: ../ui/evolution-composer-entries.xml.h:6
 msgid "Select all text"
@@ -17815,20 +17828,20 @@ msgstr "নতুন মেইল ফিল্টার করার জন্�
 
 #: ../ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
-msgstr "আবর্জনা মুছে ফেলুন (_T)"
+msgstr "আবর্জনা মুছে ফেলুন (_ব)"
 
 #: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:7
 #: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
-msgstr "ফোল্ডার (_o)"
+msgstr "ফোল্ডার (_ফ)"
 
 #: ../ui/evolution-mail-global.xml.h:9
 msgid "Message F_ilters"
-msgstr "মেইলের ফিল্টার(_i)"
+msgstr "মেইলের ফিল্টার(_ফ)"
 
 #: ../ui/evolution-mail-global.xml.h:10
 msgid "Message _Preview"
-msgstr "বার্তার পূর্বপ্রদর্শন(_P)"
+msgstr "বার্তার পূর্বপ্রদর্শন(_প)"
 
 #: ../ui/evolution-mail-global.xml.h:11
 msgid "Move the selected folder into another folder"
@@ -17841,7 +17854,7 @@ msgstr "সমস্ত ফোল্ডার থেকে সকল মুছ�
 
 #: ../ui/evolution-mail-global.xml.h:14
 msgid "Search F_olders"
-msgstr "ফোল্ডার অনুসন্ধান করুন (_o)"
+msgstr "ফোল্ডার অনুসন্ধান করুন (_ফ)"
 
 #: ../ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
@@ -17853,22 +17866,22 @@ msgstr "দূরবর্তী সার্ভারে অবস্থিত
 
 #: ../ui/evolution-mail-global.xml.h:17
 msgid "_Copy Folder To..."
-msgstr "ফোল্ডার কপি করার স্থান (_C)..."
+msgstr "ফোল্ডার কপি করার স্থান (_ক)..."
 
 #: ../ui/evolution-mail-global.xml.h:18
 msgid "_Move Folder To..."
-msgstr "ফোল্ডার স্থানান্তরের স্থান (_M)..."
+msgstr "ফোল্ডার স্থানান্তরের স্থান (_ক)..."
 
 #: ../ui/evolution-mail-global.xml.h:19
 msgid "_New..."
-msgstr "নতুন (_N)..."
+msgstr "নতুন (_ন)..."
 
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
 #: ../ui/evolution-mail-global.xml.h:23
 msgid "_Subscriptions"
-msgstr "সাবস্ক্রিপশন(_S)"
+msgstr "সাবস্ক্রিপশন(_স)"
 
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
@@ -17889,31 +17902,32 @@ msgstr "নির্বাচিত বার্তা ক্লিপবোর�
 
 #: ../ui/evolution-mail-list.xml.h:6
 msgid "E_xpunge"
-msgstr "স্থায়ীরূপে বর্জন করুন (_x)"
+msgstr "স্থায়ীরূপে বর্জন করুন (_ক)"
 
 #: ../ui/evolution-mail-list.xml.h:8
 msgid "Group By _Threads"
-msgstr "থ্রেড অনুসারে দলভুক্ত করা হবে (_T)"
+msgstr "থ্রেড অনুসারে দলভুক্ত করা হবে (_ড)"
 
 #: ../ui/evolution-mail-list.xml.h:9
 msgid "Hide S_elected Messages"
-msgstr "নির্বাচিত বার্তাগুলি আড়াল করুন (_e)"
+msgstr "নির্বাচিত বার্তাগুলি আড়াল করুন (_ল)"
 
 #: ../ui/evolution-mail-list.xml.h:10
 msgid "Hide _Deleted Messages"
-msgstr "মুছে ফেলা বার্তাগুলি লুকিয়ে ফেলুন (_D)"
+msgstr "মুছে ফেলা বার্তাগুলি লুকিয়ে ফেলুন (_ম)"
 
 #: ../ui/evolution-mail-list.xml.h:11
 msgid "Hide _Read Messages"
-msgstr "পড়া বার্তাগুলি আড়াল করুন (_R)"
+msgstr "পড়া বার্তাগুলি আড়াল করুন (_প)"
 
 #: ../ui/evolution-mail-list.xml.h:12
-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:13
-msgid "Mar_k Messages as Read"
-msgstr "বার্তাগুলিকে পড়া-হয়েছে হিসাবে চিহ্নিত করুন (_k)"
+msgid "Mark Me_ssages as Read"
+msgstr "বার্তাগুলিকে পড়া-হয়েছে হিসাবে চিহ্নিত করুন (_ব)"
 
 #: ../ui/evolution-mail-list.xml.h:14 ../ui/evolution-mail-message.xml.h:69
 msgid "Paste message(s) from the clipboard"
@@ -17929,11 +17943,11 @@ msgstr "চিহ্নিত ফোল্ডার স্থায়ীরূপ�
 
 #: ../ui/evolution-mail-list.xml.h:17
 msgid "Select Message _Thread"
-msgstr "বার্তার থ্রেড নির্বাচন করুন (_T)"
+msgstr "বার্তার থ্রেড নির্বাচন করুন (_ড)"
 
 #: ../ui/evolution-mail-list.xml.h:18
 msgid "Select _All Messages"
-msgstr "সমস্ত বার্তা নির্বাচন করুন(_A)"
+msgstr "সমস্ত বার্তা নির্বাচন করুন(_স)"
 
 #: ../ui/evolution-mail-list.xml.h:19
 msgid "Select all and only the messages that are not currently selected"
@@ -17949,7 +17963,7 @@ msgstr "সকল দৃশ্যমান বার্তা নির্বা
 
 #: ../ui/evolution-mail-list.xml.h:22
 msgid "Sh_ow Hidden Messages"
-msgstr "আড়াল করা বার্তা প্রদর্শন করুন (_o)"
+msgstr "আড়াল করা বার্তা প্রদর্শন করুন (_শ)"
 
 #: ../ui/evolution-mail-list.xml.h:23
 msgid "Show messages that have been temporarily hidden"
@@ -17970,15 +17984,15 @@ msgstr "থ্রেড অনুযায়ী বার্তার তালি
 #: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:113
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
-msgstr "বার্তা (_M)"
+msgstr "বার্তা (_ব)"
 
 #: ../ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
-msgstr "প্রেরকের নাম ঠিকানাবইয়ে যোগ করুন (_d)"
+msgstr "প্রেরকের নাম ঠিকানাবইয়ে যোগ করুন (_য)"
 
 #: ../ui/evolution-mail-message.xml.h:2
 msgid "A_pply Filters"
-msgstr "ফিল্টার প্রয়োগ করুন (_p)"
+msgstr "ফিল্টার প্রয়োগ করুন (_প)"
 
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-message.xml.h:4
@@ -17987,7 +18001,7 @@ msgstr "প্রেরকের নাম ঠিকানাবইয়ে যো
 
 #: ../ui/evolution-mail-message.xml.h:5
 msgid "All Message _Headers"
-msgstr "সমস্ত বার্তার হেডার (_H)"
+msgstr "সমস্ত বার্তার হেডার (_হ)"
 
 #: ../ui/evolution-mail-message.xml.h:6
 msgid "Apply filter rules to the selected messages"
@@ -17995,11 +18009,11 @@ msgstr "নির্বাচিত বার্তাগুলিতে ফি�
 
 #: ../ui/evolution-mail-message.xml.h:7
 msgid "Check for _Junk"
-msgstr "অনাকাঙ্ক্ষিত বার্তা পরীক্ষা করা হচ্ছে (_J)"
+msgstr "অনাকাঙ্ক্ষিত বার্তা পরীক্ষা করা হচ্ছে (_ন)"
 
 #: ../ui/evolution-mail-message.xml.h:8
 msgid "Compose _New Message"
-msgstr "নতুন বার্তা লেখো (_N)"
+msgstr "নতুন বার্তা লেখো (_ন)"
 
 #: ../ui/evolution-mail-message.xml.h:9
 msgid "Compose a reply to all of the recipients of the selected message"
@@ -18019,7 +18033,7 @@ msgstr "নির্বাচিত বার্তাগুলি অন্য
 
 #: ../ui/evolution-mail-message.xml.h:15
 msgid "Create R_ule"
-msgstr "নিয়ম নির্মাণ করুন (_u)"
+msgstr "নিয়ম নির্মাণ করুন (_ন)"
 
 #: ../ui/evolution-mail-message.xml.h:16
 msgid "Create a Search Folder for these recipients"
@@ -18087,23 +18101,24 @@ msgstr "পূর্ববর্তী না-পড়া বার্তা প�
 
 #: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
-msgstr "মেইলিং লিস্ট অনুসারে ফিল্টার (_L)..."
+msgstr "মেইলিং লিস্ট অনুসারে ফিল্টার (_ল)..."
 
 #: ../ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
-msgstr "প্রেরক অনুসারে ফিল্টার (_n)..."
+msgstr "প্রেরক অনুসারে ফিল্টার (_প)..."
 
 #: ../ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
-msgstr "প্রাপক অনুসারে ফিল্টার (_R)..."
+msgstr "প্রাপক অনুসারে ফিল্টার (_ক)..."
 
 #: ../ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
-msgstr "বিষয় অনুসারে ফিল্টার (_S)..."
+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 message(s) for follow-up"
@@ -18139,7 +18154,7 @@ msgstr "হরফের মাপ বৃদ্ধি করুন"
 
 #: ../ui/evolution-mail-message.xml.h:49
 msgid "Mar_k as"
-msgstr "এই রূপে চিহ্নিত করা হবে (_k)"
+msgstr "এই রূপে চিহ্নিত করা হবে (_চ)"
 
 #: ../ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as having been read"
@@ -18183,15 +18198,15 @@ msgstr "নির্বাচিত বার্তা অন্য একটি
 
 #: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Important Message"
-msgstr "পরবর্তী গুরুত্বপূর্ণ বার্তা (_I)"
+msgstr "পরবর্তী গুরুত্বপূর্ণ বার্তা (_ব)"
 
 #: ../ui/evolution-mail-message.xml.h:62
 msgid "Next _Thread"
-msgstr "পরবর্তী থ্রেড (_T)"
+msgstr "পরবর্তী থ্রেড (_থ)"
 
 #: ../ui/evolution-mail-message.xml.h:63
 msgid "Next _Unread Message"
-msgstr "পরবর্তী না-পড়া বার্তা (_U)"
+msgstr "পরবর্তী না-পড়া বার্তা (_ন)"
 
 #: ../ui/evolution-mail-message.xml.h:64
 msgid "Not Junk"
@@ -18211,15 +18226,15 @@ msgstr "নির্বাচিত বার্তাটি কম্পোজ�
 
 #: ../ui/evolution-mail-message.xml.h:68
 msgid "P_revious Unread Message"
-msgstr "পূর্ববর্তী না-পড়া বার্তা (_r)"
+msgstr "পূর্ববর্তী না-পড়া বার্তা (_ন)"
 
 #: ../ui/evolution-mail-message.xml.h:70
 msgid "Pos_t New Message to Folder"
-msgstr "ফোল্ডারে নতুন বার্তা পোস্ট করুন (_t)"
+msgstr "ফোল্ডারে নতুন বার্তা পোস্ট করুন (_প)"
 
 #: ../ui/evolution-mail-message.xml.h:71
 msgid "Post a Repl_y"
-msgstr "একটি প্রত্যত্তুর পোস্ট করুন (_y)"
+msgstr "একটি প্রত্যত্তুর পোস্ট করুন (_প)"
 
 #: ../ui/evolution-mail-message.xml.h:72
 msgid "Post a message to a Public folder"
@@ -18231,7 +18246,7 @@ msgstr "পাবলিক ফোল্ডারে অবস্থিত এক
 
 #: ../ui/evolution-mail-message.xml.h:74
 msgid "Pr_evious Important Message"
-msgstr "পূর্ববর্তী গুরুত্বপূর্ণ বার্তা (_e)"
+msgstr "পূর্ববর্তী গুরুত্বপূর্ণ বার্তা (_গ)"
 
 #: ../ui/evolution-mail-message.xml.h:75
 msgid "Preview the message to be printed"
@@ -18243,7 +18258,7 @@ msgstr "এই বার্তাটি প্রিন্ট করুন"
 
 #: ../ui/evolution-mail-message.xml.h:80
 msgid "Re_direct"
-msgstr "রি-ডাইরেক্ট করুন (_d)"
+msgstr "রি-ডাইরেক্ট করুন (_ড)"
 
 #: ../ui/evolution-mail-message.xml.h:81
 msgid "Redirect (bounce) the selected message to someone"
@@ -18259,7 +18274,7 @@ msgstr "বার্তাটি টেক্সট ফাইল হিসাব
 
 #: ../ui/evolution-mail-message.xml.h:87
 msgid "Search Folder from Mailing _List..."
-msgstr "মেইলিং লিস্ট ব্যবহার করে অনুসন্ধান ফোল্ডার নির্মাণ করুন (_L)..."
+msgstr "মেইলিং লিস্ট ব্যবহার করে অনুসন্ধান ফোল্ডার নির্মাণ করুন (_ল)..."
 
 #: ../ui/evolution-mail-message.xml.h:88
 msgid "Search Folder from Recipients..."
@@ -18267,11 +18282,11 @@ msgstr "প্রাপকদের তথ্য ব্যবহার করে
 
 #: ../ui/evolution-mail-message.xml.h:89
 msgid "Search Folder from S_ubject..."
-msgstr "বিষয় ব্যবহার করে অনুসন্ধান ফোল্ডার নির্মাণ করুন (_u)..."
+msgstr "বিষয় ব্যবহার করে অনুসন্ধান ফোল্ডার নির্মাণ করুন (_ব)..."
 
 #: ../ui/evolution-mail-message.xml.h:90
 msgid "Search Folder from Sen_der..."
-msgstr "প্রেরকদের তথ্য ব্যবহার করে অনুসন্ধান ফোল্ডার নির্মাণ করুন (_d)..."
+msgstr "প্রেরকদের তথ্য ব্যবহার করে অনুসন্ধান ফোল্ডার নির্মাণ করুন (_র)..."
 
 #: ../ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
@@ -18279,7 +18294,7 @@ msgstr "প্রদর্শিত বার্তার মূল অংশে
 
 #: ../ui/evolution-mail-message.xml.h:92
 msgid "Select _All Text"
-msgstr "সমস্ত টেক্সট নির্বাচন করুন (_A)"
+msgstr "সমস্ত টেক্সট নির্বাচন করুন (_স)"
 
 #: ../ui/evolution-mail-message.xml.h:93
 msgid "Select all the text in a message"
@@ -18311,75 +18326,75 @@ msgstr "নির্বাচিত বার্তাগুলি মুছে
 
 #: ../ui/evolution-mail-message.xml.h:100
 msgid "Uni_mportant"
-msgstr "অপ্রয়োজনীয়(_m)"
+msgstr "অপ্রয়োজনীয়(_প)"
 
 #: ../ui/evolution-mail-message.xml.h:101
 msgid "Zoom _Out"
-msgstr "ছোট করে প্রদর্শন (_O)"
+msgstr "ছোট করে প্রদর্শন (_ছ)"
 
 #: ../ui/evolution-mail-message.xml.h:102
 msgid "_Caret Mode"
-msgstr "ক্যারেট মোড (_C)"
+msgstr "ক্যারেট মোড (_ক)"
 
 #: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
-msgstr "বার্তা মুছে ফেলুন (_D)"
+msgstr "বার্তা মুছে ফেলুন (_ম)"
 
 #: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
-msgstr "বার্তার মধ্যে অনুসন্ধান করুন (_F)..."
+msgstr "বার্তার মধ্যে অনুসন্ধান করুন (_ন)..."
 
 #: ../ui/evolution-mail-message.xml.h:109
 msgid "_Go To"
-msgstr "এখানে যাও (_G)"
+msgstr "এখানে যাও (_য)"
 
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Important"
-msgstr "গুরুত্বপূর্ণ(_I)"
+msgstr "প্রয়োজনীয়(_প)"
 
 #: ../ui/evolution-mail-message.xml.h:111
 msgid "_Junk"
-msgstr "অনাকাঙ্ক্ষিত(_J)"
+msgstr "অনাকাঙ্ক্ষিত(_ন)"
 
 #: ../ui/evolution-mail-message.xml.h:112
 msgid "_Load Images"
-msgstr "ছবি লোড করা হবে (_L)"
+msgstr "ছবি লোড করা হবে (_ল)"
 
 #: ../ui/evolution-mail-message.xml.h:115
 msgid "_Next Message"
-msgstr "পরবর্তী বার্তা (_N)"
+msgstr "পরবর্তী বার্তা (_র)"
 
 #: ../ui/evolution-mail-message.xml.h:116
 msgid "_Normal Size"
-msgstr "স্বাভাবিক মাপ (_N)"
+msgstr "স্বাভাবিক মাপ (_ভ)"
 
 #: ../ui/evolution-mail-message.xml.h:117
 msgid "_Not Junk"
-msgstr "অনাকাঙ্ক্ষিত নয়(_N)"
+msgstr "অনাকাঙ্ক্ষিত নয়(_ন)"
 
 #: ../ui/evolution-mail-message.xml.h:118
 msgid "_Open in New Window"
-msgstr "নতুন উইন্ডোতে খুলুন(_O)"
+msgstr "নতুন উইন্ডোতে খুলুন(_খ)"
 
 #: ../ui/evolution-mail-message.xml.h:119
 msgid "_Previous Message"
-msgstr "পূর্ববর্তী বার্তা (_P)"
+msgstr "পূর্ববর্তী বার্তা (_প)"
 
 #: ../ui/evolution-mail-message.xml.h:123
 msgid "_Save Message..."
-msgstr "বার্তা সংরক্ষণ করুন(_S)..."
+msgstr "বার্তা সংরক্ষণ করুন(_স)..."
 
 #: ../ui/evolution-mail-message.xml.h:124
 msgid "_Undelete Message"
-msgstr "মুছে ফেলা বার্তা পুনরুদ্ধার (_U)"
+msgstr "মুছে ফেলা বার্তা পুনরুদ্ধার (_প)"
 
 #: ../ui/evolution-mail-message.xml.h:125
 msgid "_Unread"
-msgstr "পড়া হয়নি(_U)"
+msgstr "পড়া হয়নি(_ন)"
 
 #: ../ui/evolution-mail-message.xml.h:126
 msgid "_Zoom In"
-msgstr "বড় করে প্রদর্শন (_Z)"
+msgstr "বড় করে প্রদর্শন (_ব)"
 
 #.
 #. <cmd name="FileSave" _label="Save"
@@ -18403,14 +18418,14 @@ msgstr "প্রধান টুলবার"
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:42 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
-msgstr "বন্ধ করুন (_C)"
+msgstr "বন্ধ করুন (_ব)"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:45
 #: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:37
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:36
 msgid "_File"
-msgstr "ফাইল (_F)"
+msgstr "ফাইল (_ফ)"
 
 #: ../ui/evolution-message-composer.xml.h:1
 msgid "Attach"
@@ -18450,11 +18465,11 @@ msgstr "চিহ্নিত বার্তাটি আপনার S/MIME �
 #: ../ui/evolution-message-composer.xml.h:9
 #: ../ui/evolution-signature-editor.xml.h:14
 msgid "For_mat"
-msgstr "বিন্যাস (_m)"
+msgstr "বিন্যাস (_ব)"
 
 #: ../ui/evolution-message-composer.xml.h:10
 msgid "HT_ML"
-msgstr "HT_ML"
+msgstr "HTML (_ম)"
 
 #: ../ui/evolution-message-composer.xml.h:12
 msgid "Open a file"
@@ -18490,11 +18505,11 @@ msgstr "খসড়া হিসাবে সংরক্ষণ করুন"
 
 #: ../ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
-msgstr "নতুন নামে সংরক্ষণ করুন (_A)..."
+msgstr "নতুন নামে সংরক্ষণ করুন (_ন)..."
 
 #: ../ui/evolution-message-composer.xml.h:22
 msgid "Save _Draft"
-msgstr "খসড়া হিসাবে সংরক্ষণ করুন (_D)"
+msgstr "খসড়া হিসাবে সংরক্ষণ করুন (_স)"
 
 #: ../ui/evolution-message-composer.xml.h:23
 msgid "Save as draft"
@@ -18559,56 +18574,56 @@ msgstr "প্রাপকের নামের ক্ষেত্রটি প
 
 #: ../ui/evolution-message-composer.xml.h:39
 msgid "_Attachment..."
-msgstr "সংযুক্ত বস্তু(_A)..."
+msgstr "সংযুক্ত বস্তু(_স)..."
 
 #: ../ui/evolution-message-composer.xml.h:40
 msgid "_Bcc Field"
-msgstr "অপ্রকাশিত অনুলিপিপ্রাপকের ক্ষেত্র (_B)"
+msgstr "অপ্রকাশিত অনুলিপিপ্রাপকের ক্ষেত্র (_প)"
 
 #: ../ui/evolution-message-composer.xml.h:41
 msgid "_Cc Field"
-msgstr "অনুলিপিপ্রাপকের ক্ষেত্র (_C)"
+msgstr "অনুলিপিপ্রাপকের ক্ষেত্র (_ল)"
 
 #: ../ui/evolution-message-composer.xml.h:43
 msgid "_Delete all"
-msgstr "সমস্ত মুছে ফেলুন (_D)"
+msgstr "সমস্ত মুছে ফেলুন (_ম)"
 
 #: ../ui/evolution-message-composer.xml.h:46
 msgid "_From Field"
-msgstr "প্রেরক ক্ষেত্র (_F)"
+msgstr "প্রেরক ক্ষেত্র (_ক)"
 
 #: ../ui/evolution-message-composer.xml.h:47
 #: ../ui/evolution-signature-editor.xml.h:25
 msgid "_Insert"
-msgstr "সন্নিবেশ করুন (_I)"
+msgstr "সন্নিবেশ করুন (_)"
 
 #: ../ui/evolution-message-composer.xml.h:48
 msgid "_Open..."
-msgstr "খুলুন(_O)..."
+msgstr "খোলো(_খ)..."
 
 #: ../ui/evolution-message-composer.xml.h:49
 msgid "_Post-To Field"
-msgstr "এখানে-পোস্ট-করুন ক্ষেত্র (_P)"
+msgstr "এখানে-পোস্ট-করুন ক্ষেত্র (_প)"
 
 #: ../ui/evolution-message-composer.xml.h:50
 msgid "_Reply-To Field"
-msgstr "উত্তর-প্রাপক ক্ষেত্র (_R)"
+msgstr "উত্তর-প্রাপক ক্ষেত্র (_ত)"
 
 #: ../ui/evolution-message-composer.xml.h:52
 msgid "_Security"
-msgstr "সুরক্ষা (_S)"
+msgstr "সুরক্ষা (_র)"
 
 #: ../ui/evolution-message-composer.xml.h:53
 msgid "_To Field"
-msgstr "প্রাপকের নামের ক্ষেত্র (_T)"
+msgstr "প্রাপকের নামের ক্ষেত্র (_প)"
 
 #: ../ui/evolution-signature-editor.xml.h:1
 msgid "C_lose"
-msgstr "বন্ধ (_l)"
+msgstr "বন্ধ (_ব)"
 
 #: ../ui/evolution-signature-editor.xml.h:15
 msgid "H_TML"
-msgstr "H_TML"
+msgstr "HTML (_ট)"
 
 #: ../ui/evolution-signature-editor.xml.h:16
 msgid "Save and Close"
@@ -18619,7 +18634,7 @@ msgstr "সংরক্ষণ করে বন্ধ করুন"
 #.
 #: ../ui/evolution-signature-editor.xml.h:20
 msgid "Save and _Close"
-msgstr "সংরক্ষণ করে বন্ধ করুন (_C)"
+msgstr "সংরক্ষণ করে বন্ধ করুন (_স)"
 
 #: ../ui/evolution-signature-editor.xml.h:21
 msgid "Save the current file and close the window"
@@ -18651,7 +18666,7 @@ msgstr "আনসাবস্ক্রাইব করুন"
 
 #: ../ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
-msgstr "নির্বাচন প্রত্যাহার করুন (_I)"
+msgstr "নির্বাচন প্রত্যাহার করুন (_প)"
 
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
@@ -18671,7 +18686,7 @@ msgstr "নির্বাচিত কর্মগুলি মুছে ফে
 
 #: ../ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
-msgstr "সম্পন্ন-রূপে চিহ্নিত করুন (_k)"
+msgstr "সম্পন্ন-রূপে চিহ্নিত করুন (_ম)"
 
 #: ../ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
@@ -18690,20 +18705,12 @@ 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 "কর্মের পূর্বপ্রদর্শন(_P)"
-
-#: ../ui/evolution-tasks.xml.h:20
 msgid "View the selected task"
 msgstr "নির্বাচিত কর্মটি প্রদর্শন করুন"
 
-#: ../ui/evolution-tasks.xml.h:27
+#: ../ui/evolution-tasks.xml.h:25
 msgid "_Open Task"
-msgstr "কর্ম খুলুন (_O)"
+msgstr "কর্ম খোলো (_খ)"
 
 #: ../ui/evolution.xml.h:1
 msgid "About Evolution..."
@@ -18743,7 +18750,7 @@ msgstr "প্রোগ্রাম থেকে প্রস্থান কর
 
 #: ../ui/evolution.xml.h:11
 msgid "Forget _Passwords"
-msgstr "পাসওয়ার্ড মনে রাখঅ হবে না (_P)"
+msgstr "পাসওয়ার্ড ভুলে যাও (_ভ)"
 
 #: ../ui/evolution.xml.h:12
 msgid "Forget remembered passwords so you will be prompted for them again"
@@ -18755,7 +18762,7 @@ msgstr "উইন্ডো বাটন আড়াল করা হবে"
 
 #: ../ui/evolution.xml.h:14
 msgid "Icons _and text"
-msgstr "আইকন এবং টেক্সট (_a)"
+msgstr "আইকন এবং টেক্সট (_ব)"
 
 #: ../ui/evolution.xml.h:15
 msgid "Import data from other programs"
@@ -18763,11 +18770,11 @@ msgstr "অন্যান্য প্রোগ্রাম থেকে ডা
 
 #: ../ui/evolution.xml.h:17
 msgid "New _Window"
-msgstr "নতুন উইন্ডো (_W)"
+msgstr "নতুন উইন্ডো (_ড)"
 
 #: ../ui/evolution.xml.h:18
 msgid "Prefere_nces"
-msgstr "পছন্দ(_n)"
+msgstr "পছন্দ(_প)"
 
 #: ../ui/evolution.xml.h:19
 msgid "Send / Receive"
@@ -18795,7 +18802,7 @@ msgstr "বাগ রিপোর্ট প্রেরণ করুন"
 #. <separator/>
 #: ../ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
-msgstr "বাগ রিপোর্ট প্রেরণ করুন (_B)"
+msgstr "বাগ রিপোর্ট প্রেরণ করুন (_ব)"
 
 #: ../ui/evolution.xml.h:29
 msgid "Submit a bug report using Bug Buddy"
@@ -18807,123 +18814,115 @@ msgstr "অফলাইন কাজ করা হচ্ছে কিনা ট�
 
 #: ../ui/evolution.xml.h:31
 msgid "Tool_bar"
-msgstr "টুলবার (_b)"
+msgstr "টুলবার (_ট)"
 
 #: ../ui/evolution.xml.h:32
 msgid "Tool_bar style"
-msgstr "টুলবারের বিন্যাস(_b)"
+msgstr "টুলবারের বিন্যাস(_ব)"
 
 #: ../ui/evolution.xml.h:33
-msgid "View/Hide the Status Bar"
-msgstr "স্ট্যাটাস বার প্রদর্শন/আড়াল করুন"
-
-#: ../ui/evolution.xml.h:34
 msgid "_About Evolution..."
-msgstr "Evolution পরিচিতি...(_A)"
+msgstr "Evolution সম্বন্ধে...(_স)"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:34
 msgid "_Close Window"
-msgstr "উইন্ডো বন্ধ করুন (_C)"
+msgstr "উইন্ডো বন্ধ করুন (_ব)"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:37
 msgid "_Help"
-msgstr "সাহায্য (_H)"
+msgstr "সহায়িকা (_স)"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:38
 msgid "_Hide buttons"
-msgstr "বাটন আড়াল করা হবে (_H)"
+msgstr "বাটন আড়াল করা হবে (_ল)"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:39
 msgid "_Icons only"
-msgstr "শুধুমাত্র আইকন ব্যবহৃত হবে (_I)"
+msgstr "শুধুমাত্র আইকন ব্যবহৃত হবে (_ক)"
 
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:40
 msgid "_Import..."
-msgstr "ইম্পোর্ট করুন (_I)..."
+msgstr "ইম্পোর্ট করুন (_ম)..."
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:41
 msgid "_New"
-msgstr "নতুন (_N)"
+msgstr "নাম (_ন)"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:42
 msgid "_Quick Reference"
 msgstr ""
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:43
 msgid "_Quit"
-msgstr "প্রস্থান (_Q)"
+msgstr "প্রস্থান (_ন)"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:44
 msgid "_Send / Receive"
-msgstr "মেইল প্রেরণ / গ্রহণ (_S)"
+msgstr "মেইল প্রেরণ / গ্রহণ করুন (_ক)"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:45
 msgid "_Switcher Appearance"
-msgstr "অদলবদলকারীর চেহারাছবি (_S)"
+msgstr "অদলবদলকারীর চেহারাছবি (_দ)"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:46
 msgid "_Synchronization Options..."
-msgstr "সুসংগতি সংক্রান্ত অপশন (_S)..."
+msgstr "সুসংগতি সংক্রান্ত অপশন (_স)..."
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:47
 msgid "_Text only"
-msgstr "শুধুমাত্র টেক্সট(_T)"
-
-#: ../ui/evolution.xml.h:50
-msgid "_View Status Bar"
-msgstr "স্ট্যাটার বার প্রদর্শন (_V)"
+msgstr "শুধুমাত্র টেক্সট(_ট)"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:49
 msgid "_Window"
-msgstr "উইন্ডো (_W)"
+msgstr "উইন্ডো (_ড)"
 
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
-msgstr "কোম্পানি অনুযায়ী (_C)"
+msgstr "কোম্পানি অনুযায়ী (_ক)"
 
 #: ../views/addressbook/galview.xml.h:2
 msgid "_Address Cards"
-msgstr "ঠিকানার কার্ড (_A)"
+msgstr "ঠিকানার কার্ড (_ঠ)"
 
 #: ../views/addressbook/galview.xml.h:3
 msgid "_Phone List"
-msgstr "ফোনের তালিকা (_P)"
+msgstr "ফোনের তালিকা (_ফ)"
 
 #: ../views/calendar/galview.xml.h:1
 msgid "W_eek View"
-msgstr "সপ্তাহ ভিউ (_e)"
+msgstr "সপ্তাহ ভিউ (_প)"
 
 #: ../views/calendar/galview.xml.h:2
 msgid "_Day View"
-msgstr "দিন ভিউ (_D)"
+msgstr "দিন ভিউ (_দ)"
 
 #: ../views/calendar/galview.xml.h:3
 msgid "_List View"
-msgstr "লিস্ট ভিউ (_L)"
+msgstr "লিস্ট ভিউ (_ল)"
 
 #: ../views/calendar/galview.xml.h:4
 msgid "_Month View"
-msgstr "মাস ভিউ (_M)"
+msgstr "মাস ভিউ (_ম)"
 
 #: ../views/calendar/galview.xml.h:5
 msgid "_Work Week View"
-msgstr "কার্যসপ্তাহ ভিউ (_W)"
+msgstr "কার্যসপ্তাহ ভিউ (_ক)"
 
 #: ../views/mail/galview.xml.h:1
 msgid "As _Sent Folder"
-msgstr "প্রেরিত ফোল্ডার হিসাবে (_S)"
+msgstr "প্রেরিত ফোল্ডার হিসাবে (_র)"
 
 #: ../views/mail/galview.xml.h:2
 msgid "By S_tatus"
-msgstr "অবস্থা অনুযায়ী (_t)"
+msgstr "অবস্থা অনুযায়ী (_ব)"
 
 #: ../views/mail/galview.xml.h:3
 msgid "By Se_nder"
-msgstr "প্রেরক অনুযায়ী (_n)"
+msgstr "প্রেরক অনুযায়ী (_য)"
 
 #: ../views/mail/galview.xml.h:4
 msgid "By Su_bject"
-msgstr "বিষয় অনুযায়ী (_b)"
+msgstr "বিষয় অনুযায়ী (_ব)"
 
 #: ../views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
@@ -18931,15 +18930,15 @@ msgstr ""
 
 #: ../views/mail/galview.xml.h:6
 msgid "_Messages"
-msgstr "বার্তা (_M)"
+msgstr "বার্তা (_ব)"
 
 #: ../views/tasks/galview.xml.h:1
 msgid "With _Due Date"
-msgstr "প্রদেয় তারিখসহ (_D)"
+msgstr "প্রদেয় তারিখসহ (_ত)"
 
 #: ../views/tasks/galview.xml.h:2
 msgid "With _Status"
-msgstr "অবস্থা সহ (_S)"
+msgstr "অবস্থা সহ (_ব)"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:195
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:637
@@ -18952,7 +18951,7 @@ msgstr "<b>সময়ের অঞ্চল</b>"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "<b>_Selection</b>"
-msgstr "<b>নির্বাচন (_S)</b>"
+msgstr "<b>নির্বাচন (_ন)</b>"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Select a Time Zone"
@@ -18995,7 +18994,7 @@ msgstr "\"%s\"-র জন্য প্রদর্শনক্ষেত্র �
 
 #: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit..."
-msgstr "সম্পাদনা (_E)..."
+msgstr "সম্পাদনা (_স)..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
 #: ../widgets/table/e-table-header-item.c:1845
@@ -19014,26 +19013,15 @@ msgstr "বর্তমান প্রদর্শন সংরক্ষণ ক
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
 msgid "_Create new view"
-msgstr "নতুন প্রদর্শন ক্ষেত্র নির্মাণ (_C)"
+msgstr "নতুন প্রদর্শন ক্ষেত্র নির্মাণ (_ন)"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
 msgid "_Replace existing view"
-msgstr "উপস্থিত প্রদর্শন ক্ষেত্র পরিবর্তন করুন (_R)"
-
-#. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:585
-#: ../widgets/menus/gal-view-menus.c:350
-msgid "Custom View"
-msgstr "স্বনির্বাচিত ভিউ"
+msgstr "উপস্থিত প্রদর্শন ক্ষেত্র পরিবর্তন করুন (_প)"
 
-#: ../widgets/menus/gal-view-instance.c:586
-msgid "Save Custom View"
-msgstr "স্বনির্বাচিত প্রদর্শনক্ষেত্র সংরক্ষণ করুন"
-
-#: ../widgets/menus/gal-view-instance.c:590
-#: ../widgets/menus/gal-view-menus.c:372
-msgid "Define Views..."
-msgstr "ভিউ নির্ধারণ করুন..."
+#: ../widgets/menus/gal-view-menus.c:291
+msgid "_Current View"
+msgstr "বর্তমান ভিউ (_ব)"
 
 #: ../widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View..."
@@ -19326,7 +19314,7 @@ msgstr "অধিকৃতি চিহ্নের পারিপার্শ�
 # FIXME: 'ভিত্তি' শব্দটার ব্যবহার ঠিক ভাল লাগতেছে না :-(
 #: ../widgets/misc/e-filter-bar.c:195
 msgid "_Searches"
-msgstr "অনুসন্ধান(_S)"
+msgstr "অনুসন্ধান(_ন)"
 
 # No case in bangla
 #: ../widgets/misc/e-filter-bar.c:197
@@ -19340,15 +19328,15 @@ msgstr "অনুসন্ধান সংরক্ষণ করুন"
 
 #: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
-msgstr "অনুসন্ধান সংরক্ষণ করুন(_S)..."
+msgstr "অনুসন্ধান সংরক্ষণ করুন(_স)..."
 
 #: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
-msgstr "সংরক্ষিত অনুসন্ধান ফল সম্পাদন করুন (_E)..."
+msgstr "সংরক্ষিত অনুসন্ধান ফল সম্পাদন করুন (_ম)..."
 
 #: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
 msgid "_Advanced Search..."
-msgstr "উন্নত অনুসন্ধান প্রক্রিয়া(_A)..."
+msgstr "উন্নত অনুসন্ধান প্রক্রিয়া(_ন)..."
 
 #: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
@@ -19395,43 +19383,43 @@ msgstr "কলামের প্রস্থ"
 # No case in bangla
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:346
+#: ../widgets/misc/e-search-bar.c:345
 msgid "Search Text Entry"
 msgstr "টেক্সট এন্টি অনুসন্ধান"
 
-#: ../widgets/misc/e-search-bar.c:550
+#: ../widgets/misc/e-search-bar.c:549
 msgid "_Search"
-msgstr "অনুসন্ধান করুন (_S)"
+msgstr "অনুসন্ধান করুন (_স)"
 
-#: ../widgets/misc/e-search-bar.c:556
+#: ../widgets/misc/e-search-bar.c:555
 msgid "_Find Now"
-msgstr "এখন অনুসন্ধান করুন (_F)"
+msgstr "এখন অনুসন্ধান করুন (_খ)"
 
-#: ../widgets/misc/e-search-bar.c:557 ../widgets/misc/e-search-bar.c:944
+#: ../widgets/misc/e-search-bar.c:556 ../widgets/misc/e-search-bar.c:943
 msgid "_Clear"
-msgstr "মুছে ফেলুন (_C)"
+msgstr "মুছে ফেলুন (_ম)"
 
-#: ../widgets/misc/e-search-bar.c:648
+#: ../widgets/misc/e-search-bar.c:647
 msgid "Search Type"
 msgstr "অনুসন্ধানের ধরন"
 
-#: ../widgets/misc/e-search-bar.c:852
+#: ../widgets/misc/e-search-bar.c:851
 msgid "Item ID"
 msgstr "আইটেমের পরিচিতি"
 
-#: ../widgets/misc/e-search-bar.c:859
+#: ../widgets/misc/e-search-bar.c:858
 msgid "Subitem ID"
 msgstr "সাবআইটেমের পরিচিতি"
 
-#: ../widgets/misc/e-search-bar.c:866 ../widgets/text/e-entry.c:1249
+#: ../widgets/misc/e-search-bar.c:865 ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3462
 #: ../widgets/text/e-text.c:3463
 msgid "Text"
 msgstr "টেক্সট"
 
-#: ../widgets/misc/e-search-bar.c:946
+#: ../widgets/misc/e-search-bar.c:945
 msgid "Find _Now"
-msgstr "এখন অনুসন্ধান করুন (_N)"
+msgstr "এখন অনুসন্ধান করুন (_খ)"
 
 #: ../widgets/misc/e-selection-model-array.c:546
 #: ../widgets/table/e-tree-selection-model.c:811
@@ -19457,7 +19445,7 @@ msgstr "কার্সারের মোড"
 
 #: ../widgets/misc/e-send-options.c:521
 msgid "When de_leted:"
-msgstr "মুছে ফেলার সময়(_l):"
+msgstr "মুছে ফেলার সময়(_ছ):"
 
 #: ../widgets/misc/e-send-options.glade.h:1
 msgid "<b>Delivery Options</b>"
@@ -19477,23 +19465,23 @@ msgstr "<b>অবস্থা অনুসরণকারী</b>"
 
 #: ../widgets/misc/e-send-options.glade.h:5
 msgid "A_uto-delete sent item"
-msgstr "প্রেরিত বস্তু স্বয়ংক্রিয়রূপে মুছে ফেলুন(_u)"
+msgstr "প্রেরিত বস্তু স্বয়ংক্রিয়রূপে মুছে ফেলুন(_য়)"
 
 #: ../widgets/misc/e-send-options.glade.h:6
 msgid "C_lassification"
-msgstr "শ্রেণীবিভাগ (_l)"
+msgstr "শ্রেণীবিভাগ (_শ)"
 
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
-msgstr "তথ্য অনুসরণ করার জন্য একটি প্রেরিত বস্তু নির্মাণ করুন (_e)"
+msgstr "তথ্য অনুসরণ করার জন্য একটি প্রেরিত বস্তু নির্মাণ করুন (_ম)"
 
 #: ../widgets/misc/e-send-options.glade.h:8
 msgid "Deli_vered and opened"
-msgstr "প্রেরিত এবং পড়া হয়েছে (_v)"
+msgstr "প্রেরিত এবং পড়া হয়েছে (_র)"
 
 #: ../widgets/misc/e-send-options.glade.h:9
 msgid "Gene_ral Options"
-msgstr "সাধারণ অপশন (_r)"
+msgstr "সাধারণ অপশন (_ধ)"
 
 #: ../widgets/misc/e-send-options.glade.h:10
 msgid ""
@@ -19515,11 +19503,11 @@ msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:16
 msgid "R_eply requested"
-msgstr "উত্তরের অনুরোধ জানানো হয়েছে (_e)"
+msgstr "উত্তরের অনুরোধ জানানো হয়েছে (_ত)"
 
 #: ../widgets/misc/e-send-options.glade.h:18
 msgid "Sta_tus Tracking"
-msgstr "অবস্থার তথ্য নিরীক্ষণ ব্যবস্থা(_t)"
+msgstr "অবস্থার তথ্য নিরীক্ষণ ব্যবস্থা"
 
 #: ../widgets/misc/e-send-options.glade.h:19
 msgid ""
@@ -19535,51 +19523,51 @@ msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:23
 msgid "W_ithin"
-msgstr "অন্তর্গত (_i)"
+msgstr "অন্তর্গত (_গ)"
 
 #: ../widgets/misc/e-send-options.glade.h:24
 msgid "When acce_pted:"
-msgstr "গ্রহণ করার সময় (_p):"
+msgstr "গ্রহণ করার সময় (_গ):"
 
 #: ../widgets/misc/e-send-options.glade.h:25
 msgid "When co_mpleted:"
-msgstr "সমাপ্তির সময়(_m):"
+msgstr "সমাপ্তির সময়(_স):"
 
 #: ../widgets/misc/e-send-options.glade.h:26
 msgid "When decli_ned:"
-msgstr "প্রত্যাখ্যানের সময় (_n):"
+msgstr "প্রত্যাখ্যানের সময় (_খ):"
 
 #: ../widgets/misc/e-send-options.glade.h:27
 msgid "_After:"
-msgstr "পরে (_A):"
+msgstr "পরে (_প):"
 
 #: ../widgets/misc/e-send-options.glade.h:28
 msgid "_All information"
-msgstr "সমস্ত তথ্য (_A)"
+msgstr "সমস্ত তথ্য (_ত)"
 
 #: ../widgets/misc/e-send-options.glade.h:29
 msgid "_Delay message delivery"
-msgstr "বিলম্বের পরে বার্তা প্রেরণ করা হবে (_D)"
+msgstr "বিলম্বের পরে বার্তা প্রেরণ করা হবে (_ব)"
 
 #: ../widgets/misc/e-send-options.glade.h:30
 msgid "_Delivered"
-msgstr "প্রেরিত হয়েছে (_D)"
+msgstr "প্রেরিত হয়েছে (_প)"
 
 #: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Set expiration date"
-msgstr "মেয়াদপূর্তীর তারিখ নির্ধারণ করুন (_S)"
+msgstr "মেয়াদপূর্তীর তারিখ নির্ধারণ করুন (_ন)"
 
 #: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Until:"
-msgstr "অবধি (_U):"
+msgstr "অবধি (_ব):"
 
 #: ../widgets/misc/e-send-options.glade.h:34
 msgid "_When convenient"
-msgstr "সুবিধাজনক সময়ে (_W)"
+msgstr "সুবিধাজনক সময়ে (_ম)"
 
 #: ../widgets/misc/e-send-options.glade.h:35
 msgid "_When opened:"
-msgstr "খোলার সময় (_W):"
+msgstr "খোলার সময় (_স):"
 
 #: ../widgets/misc/e-task-widget.c:208
 #, c-format
@@ -19601,11 +19589,11 @@ msgstr "প্রধান বিভাগের তালিকা সম্প
 
 #: ../widgets/misc/gal-categories.glade.h:3
 msgid "Item(s) belong to these _categories:"
-msgstr "বস্তুগুলি উল্লিখিত শ্রেণীবিভাগের অন্তর্গত(_c):"
+msgstr "বস্তুগুলি উল্লিখিত শ্রেণীবিভাগের অন্তর্গত(_ব):"
 
 #: ../widgets/misc/gal-categories.glade.h:4
 msgid "_Available Categories:"
-msgstr "উপস্থিত শ্রেণীবিভাগ(_A):"
+msgstr "উপস্থিত শ্রেণীবিভাগ(_ব):"
 
 #: ../widgets/misc/gal-categories.glade.h:5
 msgid "categories"
@@ -19653,12 +19641,12 @@ msgstr ""
 
 #: ../widgets/table/e-table-config-no-group.glade.h:1
 msgid "<- _Remove"
-msgstr "<- অপসারণ(_R)"
+msgstr "<- অপসারণ(_প)"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:2
 #: ../widgets/table/e-table-config.glade.h:1
 msgid "A_vailable Fields:"
-msgstr "উপস্থিত ক্ষেত্র (_v):"
+msgstr "উপস্থিত ক্ষেত্র (_প):"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:3
 #: ../widgets/table/e-table-config.glade.h:2
@@ -19683,22 +19671,22 @@ msgstr "বস্তু উল্লিখিত পরিমাপ অনুয
 #: ../widgets/table/e-table-config-no-group.glade.h:9
 #: ../widgets/table/e-table-config.glade.h:8
 msgid "Move _Down"
-msgstr "নীচে স্থানান্তর করুন (_D)"
+msgstr "নীচে স্থানান্তর করুন (_স)"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:9
 msgid "Move _Up"
-msgstr "উপরে স্থানান্তর করুন (_U)"
+msgstr "উপরে স্থানান্তর করুন (_প)"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:11
 msgid "Sh_ow these fields in order:"
-msgstr "ক্রমানুসারে এই ক্ষেত্রগুলি প্রদর্শন করা হবে (_o):"
+msgstr "ক্রমানুসারে এই ক্ষেত্রগুলি প্রদর্শন করা হবে (প):"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:12
 #: ../widgets/table/e-table-config.c:563
 #: ../widgets/table/e-table-config.glade.h:10
 msgid "Show Fields"
-msgstr "ক্ষেত্র প্রদর্শন করা হবে"
+msgstr "প্রাপকের নামের ক্ষেত্র (_প)"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:11
@@ -19722,17 +19710,17 @@ msgstr "পরবর্তী ক্রমিক মান"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:17
 msgid "_Add ->"
-msgstr "যোগ করুন (_A) ->"
+msgstr "যোগ করুন (_য) ->"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:18
 #: ../widgets/table/e-table-config.glade.h:16
 msgid "_Fields Shown..."
-msgstr "প্রদর্শিত ক্ষেত্র (_F)..."
+msgstr "প্রদর্শিত ক্ষেত্র (_প)..."
 
 #: ../widgets/table/e-table-config-no-group.glade.h:19
 #: ../widgets/table/e-table-config.glade.h:20
 msgid "_Sort..."
-msgstr "ক্রমানুসারে বিন্যাস (_S)..."
+msgstr "ক্রমানুসারে বিন্যাস (_ব)..."
 
 #: ../widgets/table/e-table-config.c:150
 msgid "State"
@@ -19760,11 +19748,11 @@ msgstr "উপস্থিত ক্ষেত্র"
 
 #: ../widgets/table/e-table-config.glade.h:17
 msgid "_Group By..."
-msgstr "উল্লিখিত বিষয় অনুসারে দল নির্মাণ (_G)..."
+msgstr "উল্লিখিত বিষয় অনুসারে দল নির্মাণ..."
 
 #: ../widgets/table/e-table-config.glade.h:19
 msgid "_Show these fields in order:"
-msgstr "ক্রমানুসারে এই ক্ষেত্রগুলি প্রদর্শন করা হবে :(_S)"
+msgstr "ক্রমানুসারে এই ক্ষেত্রগুলি প্রদর্শন করা হবে (প):"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:646
@@ -20134,3 +20122,8 @@ msgstr "IM অনুযায়ী"
 msgid "Handle Popup"
 msgstr "পপ-আপ ব্যবস্থাপন"
 
+#~ msgid "_New Search _Folder (FIXME)"
+#~ msgstr "_New Search _Folder (FIXME)"
+
+#~ msgid "Evolution _FAQ"
+#~ msgstr "Evolution FAQ (_ফ)"
diff --git a/po/cy.po b/po/cy.po
index bed0651f93..291ac5b60a 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-11 17:30+0200\n"
+"POT-Creation-Date: 2005-09-03 07:21+0100\n"
 "PO-Revision-Date: 2005-09-01 17:45+0100\n"
 "Last-Translator: Rhys Jones <rhys@sucs.org>\n"
 "Language-Team: Cymraeg <gnome-cy@pengwyn.linux.org.uk>\n"
@@ -780,7 +780,7 @@ msgstr ""
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/tasks-component.c:441 ../mail/em-filter-i18n.h:11
 #: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:26 ../ui/evolution-tasks.xml.h:6
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Dileu"
 
@@ -2858,7 +2858,7 @@ msgstr "Anfon Neges at Gysylltiadau"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:942
 #: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2501
 #: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-tasks.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Argraffu"
 
@@ -2878,7 +2878,7 @@ msgstr "Torri"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:950
 #: ../calendar/gui/calendar-component.c:536
 #: ../calendar/gui/tasks-component.c:440 ../ui/evolution-addressbook.xml.h:2
-#: ../ui/evolution-mail-message.xml.h:12 ../ui/evolution-tasks.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:11 ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copïo"
 
@@ -4242,6 +4242,7 @@ msgstr "Ni fydd eich tasgau ar gael tan mae Evolution wedi ei ailgychwyn."
 
 #: ../calendar/calendar.error.xml.h:64
 #: ../ui/evolution-message-composer.xml.h:51
+#: ../ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Cadw"
 
@@ -4391,9 +4392,9 @@ msgstr "Amser _hepian:"
 #: ../ui/evolution-composer-entries.xml.h:8
 #: ../ui/evolution-mail-messagedisplay.xml.h:5
 #: ../ui/evolution-message-composer.xml.h:44
-#: ../ui/evolution-signature-editor.xml.h:23
+#: ../ui/evolution-signature-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:23
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:32
 msgid "_Edit"
 msgstr "_Golygu"
 
@@ -5693,7 +5694,7 @@ msgstr[2] "%d neges wedi'u hatodi"
 #: ../mail/em-folder-tree.c:974 ../mail/em-folder-view.c:1035
 #: ../mail/message-list.c:1708 ../ui/evolution-addressbook.xml.h:31
 #: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
-#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-tasks.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:102 ../ui/evolution-tasks.xml.h:21
 msgid "_Copy"
 msgstr "_Copïo"
 
@@ -6792,7 +6793,7 @@ msgstr "_Cadw Fel..."
 #: ../calendar/gui/e-calendar-view.c:1530 ../mail/em-folder-view.c:1046
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:120 ../ui/evolution-tasks.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-tasks.xml.h:27
 msgid "_Print..."
 msgstr "_Argraffu..."
 
@@ -10904,7 +10905,7 @@ msgid "is not Flagged"
 msgstr "ddim yn Fanerog"
 
 #: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
-#: ../ui/evolution-mail-message.xml.h:48
+#: ../ui/evolution-mail-message.xml.h:47
 msgid "Junk"
 msgstr "Sothach"
 
@@ -11134,11 +11135,11 @@ msgstr "Copïo ffeiliau i mewn i'r blygell %s"
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Methu gollwng neges(euon) i'r storfa level uchaf"
 
-#: ../mail/em-folder-tree.c:972 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:972 ../ui/evolution-mail-message.xml.h:103
 msgid "_Copy to Folder"
 msgstr "_Copïo i Blygell"
 
-#: ../mail/em-folder-tree.c:973 ../ui/evolution-mail-message.xml.h:114
+#: ../mail/em-folder-tree.c:973 ../ui/evolution-mail-message.xml.h:113
 msgid "_Move to Folder"
 msgstr "_Symud i Blygell"
 
@@ -11148,9 +11149,9 @@ msgid "Scanning folders in \"%s\""
 msgstr "Sganio plygellau o fewn \"%s\""
 
 #: ../mail/em-folder-tree.c:2031 ../ui/evolution-addressbook.xml.h:44
-#: ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution-mail-global.xml.h:22
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:45
 msgid "_View"
 msgstr "_Golwg"
 
@@ -11225,16 +11226,16 @@ msgstr "Penodwch ble i greu'r blygell:"
 msgid "Reply to _All"
 msgstr "Ateb i _Bawb"
 
-#: ../mail/em-folder-view.c:1040 ../ui/evolution-mail-message.xml.h:122
+#: ../mail/em-folder-view.c:1040 ../ui/evolution-mail-message.xml.h:121
 msgid "_Reply to Sender"
 msgstr "_Ateb i'r Danfonwr"
 
 #: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:548 ../mail/em-popup.c:559
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Forward"
 msgstr "_Ymlaen"
 
-#: ../mail/em-folder-view.c:1044 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1044 ../ui/evolution-mail-message.xml.h:105
 msgid "_Edit as New Message..."
 msgstr "_Golygu fel Neges Newydd..."
 
@@ -11758,7 +11759,7 @@ msgid "_Reply to sender"
 msgstr "_Ateb i'r danfonwr"
 
 #: ../mail/em-popup.c:545 ../mail/em-popup.c:556
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Ateb i'r _Rhestr"
 
@@ -14264,7 +14265,7 @@ msgstr "Dilynol"
 msgid "For Your Information"
 msgstr "Er Gwybodaeth"
 
-#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:41
 msgid "Forward"
 msgstr "Ymlaen"
 
@@ -14272,11 +14273,11 @@ msgstr "Ymlaen"
 msgid "No Response Necessary"
 msgstr "Dim Ymateb Angenrheidiol"
 
-#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:82
+#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply"
 msgstr "Ateb"
 
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:83
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to All"
 msgstr "Ateb i Bawb"
 
@@ -14357,8 +14358,7 @@ msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr ""
 "Ategyn er mwyn creu copi wrth gefn, ac adfer data a gosodiadau Evolution."
 
-#. the path to the shared library
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
 msgid "Backup and restore plugin"
 msgstr "Ategyn er mwyn creu copi wrth gefn, ac adfer data"
 
@@ -15381,7 +15381,7 @@ msgid "Subscribe to my _notifications"
 msgstr "Tanysgrifio i'm _hysbysiadau"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Read"
 msgstr "_Darllen"
 
@@ -16250,7 +16250,7 @@ msgstr "Rhoi'r opsiwn i argraffu e-bost o fewn y cyfansoddwr"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
 #: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-tasks.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "_Rhagolwg Argraffu"
 
@@ -16274,8 +16274,7 @@ msgstr "Dysgu am negeseuon sothach gan ddefnyddio spamd."
 msgid "A plugin for saving all attachments or parts of a message at once."
 msgstr "Ategyn i gadw pob atodiad neu ran o neges ar unwaith."
 
-#. the path to the shared library
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
+#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:2
 msgid "Save attachments"
 msgstr "Cadw atodiadau"
 
@@ -16297,6 +16296,7 @@ msgstr "Math MIME"
 
 #: ../plugins/save-attachments/save-attachments.c:359
 #: ../ui/evolution-message-composer.xml.h:18
+#: ../ui/evolution-signature-editor.xml.h:6
 msgid "Save"
 msgstr "Cadw"
 
@@ -16763,7 +16763,7 @@ msgstr "Cyfres Meddalwedd Grŵp"
 msgid "_Work Online"
 msgstr "_Gweithio Ar-lein"
 
-#: ../shell/e-shell-window-commands.c:787 ../ui/evolution.xml.h:50
+#: ../shell/e-shell-window-commands.c:787 ../ui/evolution.xml.h:47
 msgid "_Work Offline"
 msgstr "_Gweithio All-lein"
 
@@ -17709,7 +17709,7 @@ msgid "View the current contact"
 msgstr "Dangoswch y cyswllt cyfredol"
 
 #: ../ui/evolution-addressbook.xml.h:30 ../ui/evolution-calendar.xml.h:38
-#: ../ui/evolution-tasks.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:26 ../ui/evolution-tasks.xml.h:19
 msgid "_Actions"
 msgstr "_Gweithredoedd"
 
@@ -17773,7 +17773,7 @@ msgstr "Rhestr"
 msgid "Month"
 msgstr "Mis"
 
-#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:59
 msgid "Next"
 msgstr "Nesaf"
 
@@ -17781,7 +17781,7 @@ msgstr "Nesaf"
 msgid "Previews the calendar to be printed"
 msgstr "Rhagolygu'r calendr i'w argraffu"
 
-#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:75
 msgid "Previous"
 msgstr "Blaenorol"
 
@@ -17901,7 +17901,7 @@ msgstr "Creu neu olygu rheolau ar gyfer hidlo e-bost newydd"
 msgid "Empty _Trash"
 msgstr "Gwagu'r Sbwriel"
 
-#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:7
+#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:6
 #: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Plygell"
@@ -17911,14 +17911,17 @@ msgid "Message F_ilters"
 msgstr "_Hidlyddion Ebost"
 
 #: ../ui/evolution-mail-global.xml.h:10
+msgid "Message _List As"
+msgstr "Rhestri _Negeseuon Fel"
+
+#: ../ui/evolution-mail-global.xml.h:11
 msgid "Message _Preview"
 msgstr "_Rhagolwg Neges"
 
-#: ../ui/evolution-mail-global.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:12
 msgid "Move the selected folder into another folder"
 msgstr "Symud y blygell a ddewiswyd i blygell arall"
 
-#. Alphabetical by name, yo
 #: ../ui/evolution-mail-global.xml.h:13
 msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
@@ -17945,13 +17948,14 @@ msgid "_Move Folder To..."
 msgstr "_Symud Plygell i..."
 
 #: ../ui/evolution-mail-global.xml.h:19
+msgid "_New Search _Folder (FIXME)"
+msgstr "_Plygell Chwilio Newydd"
+
+#: ../ui/evolution-mail-global.xml.h:20
 msgid "_New..."
 msgstr "_Newydd..."
 
-#.
-#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
-#.
-#: ../ui/evolution-mail-global.xml.h:23
+#: ../ui/evolution-mail-global.xml.h:21
 msgid "_Subscriptions"
 msgstr "_Tanysgrifiadau"
 
@@ -17963,102 +17967,101 @@ msgstr "Newid enw'r blygell"
 msgid "Change the properties of this folder"
 msgstr "Newid priodweddau'r blygell"
 
-#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:12
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Copïo'r neges/negeseuon a ddewiswyd i'r clipfwrdd"
 
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-list.xml.h:5 ../ui/evolution-mail-message.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:4 ../ui/evolution-mail-message.xml.h:23
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Torri'r neges/negeseuon a ddewiswyd i'r clipfwrdd"
 
-#: ../ui/evolution-mail-list.xml.h:6
+#: ../ui/evolution-mail-list.xml.h:5
 msgid "E_xpunge"
 msgstr "_Glanhau"
 
-#: ../ui/evolution-mail-list.xml.h:8
+#: ../ui/evolution-mail-list.xml.h:7
 msgid "Group By _Threads"
 msgstr "Grwpio mewn _Edafedd"
 
-#: ../ui/evolution-mail-list.xml.h:9
+#: ../ui/evolution-mail-list.xml.h:8
 msgid "Hide S_elected Messages"
 msgstr "Cuddio Negeseuon _Ddewiswyd"
 
-#: ../ui/evolution-mail-list.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:9
 msgid "Hide _Deleted Messages"
 msgstr "Cuddio Negeseuon _Ddilëwyd"
 
-#: ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-list.xml.h:10
 msgid "Hide _Read Messages"
 msgstr "Cuddio Negeseuon _Ddarllenwyd"
 
-#: ../ui/evolution-mail-list.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:11
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 "Cuddio negeseuon wedi'u dileu yn hytrach na'u dangos gyda llinell drwyddynt"
 
-#: ../ui/evolution-mail-list.xml.h:13
+#: ../ui/evolution-mail-list.xml.h:12
 msgid "Mark Me_ssages as Read"
 msgstr "_Marcio negeseuon fel rhai wedi eu darllen"
 
-#: ../ui/evolution-mail-list.xml.h:14 ../ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-list.xml.h:13 ../ui/evolution-mail-message.xml.h:68
 msgid "Paste message(s) from the clipboard"
 msgstr "Gludo neges/negeseuon o'r clipfwrdd"
 
-#: ../ui/evolution-mail-list.xml.h:15
+#: ../ui/evolution-mail-list.xml.h:14
 msgid "Permanently remove all deleted messages from this folder"
 msgstr ""
 "Tynnu'n barhaol o'r blygell hon bob neges sydd wedi marcio fel un wedi'i "
 "ddileu"
 
-#: ../ui/evolution-mail-list.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:15
 msgid "Permanently remove this folder"
 msgstr "Dileu'r blygell hon yn barhaol"
 
-#: ../ui/evolution-mail-list.xml.h:17
+#: ../ui/evolution-mail-list.xml.h:16
 msgid "Select Message _Thread"
 msgstr "Pob _Trywydd Neges"
 
-#: ../ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:17
 msgid "Select _All Messages"
 msgstr "Dewis _Bob Neges"
 
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:18
 msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 "Dewis pob un o'r negeseuon, a dim ond y negeseuon, nad ydynt wedi'u dewis ar "
 "hyn o bryd"
 
-#: ../ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:19
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Dewis pob neges o fewn yr un trywydd â'r neges a ddewiswyd"
 
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:20
 msgid "Select all visible messages"
 msgstr "Dewis bob neges weladwy"
 
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:21
 msgid "Sh_ow Hidden Messages"
 msgstr "_Dangos Negeseuon Cudd"
 
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:22
 msgid "Show messages that have been temporarily hidden"
 msgstr "Dangos negeseuon sydd wedi eu cuddio dros dro"
 
-#: ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:23
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Cuddio dros dro pob neges sydd eisoes wedi'i darllen"
 
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:24
 msgid "Temporarily hide the selected messages"
 msgstr "Cuddio dros dro'r negeseuon a ddewiswyd"
 
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "Threaded Message list"
 msgstr "Rhestr Drywyddau Neges"
 
-#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:112
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Neges"
@@ -18071,416 +18074,410 @@ msgstr "Ychwanegu'r Danfonwr at y Llyfr Cyfeiriadau"
 msgid "A_pply Filters"
 msgstr "_Defnyddio Hidlyddion"
 
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-message.xml.h:4
+#: ../ui/evolution-mail-message.xml.h:3
 msgid "Add Sender to Address Book"
 msgstr "Ychwanegu'r Danfonwr at y Llyfr Cyfeiriadau"
 
-#: ../ui/evolution-mail-message.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:4
 msgid "All Message _Headers"
 msgstr "Pob _Pennawd Neges"
 
-#: ../ui/evolution-mail-message.xml.h:6
+#: ../ui/evolution-mail-message.xml.h:5
 msgid "Apply filter rules to the selected messages"
 msgstr "Defnyddio rheolau hidlydd ar y negeseuon a ddewiswyd"
 
-#: ../ui/evolution-mail-message.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:6
 msgid "Check for _Junk"
 msgstr "Gwirio am _Sothach"
 
-#: ../ui/evolution-mail-message.xml.h:8
+#: ../ui/evolution-mail-message.xml.h:7
 msgid "Compose _New Message"
 msgstr "Cyfansoddi Neges _Newydd"
 
-#: ../ui/evolution-mail-message.xml.h:9
+#: ../ui/evolution-mail-message.xml.h:8
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Cyfansoddi ateb at bob un o dderbynwyr y neges a ddewiswyd"
 
-#: ../ui/evolution-mail-message.xml.h:10
+#: ../ui/evolution-mail-message.xml.h:9
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Cyfansoddi ateb at restr e-bostio'r neges a ddewiswyd"
 
-#: ../ui/evolution-mail-message.xml.h:11
+#: ../ui/evolution-mail-message.xml.h:10
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Cyfansoddi ateb at anfonwr y neges a ddewiswyd"
 
-#: ../ui/evolution-mail-message.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:13
 msgid "Copy selected messages to another folder"
 msgstr "Copïo'r negeseuon a ddewiswyd i blygell arall"
 
-#: ../ui/evolution-mail-message.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:14
 msgid "Create R_ule"
 msgstr "Creu _Rheol"
 
-#: ../ui/evolution-mail-message.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:15
 msgid "Create a Search Folder for these recipients"
 msgstr "Creu Plygell Chwilio ar gyfer y derbynwyr yma"
 
-#: ../ui/evolution-mail-message.xml.h:17
+#: ../ui/evolution-mail-message.xml.h:16
 msgid "Create a Search Folder for this mailing list"
 msgstr "Creu Plygell Chwilio ar gyfer y rhestr e-bostio"
 
-#: ../ui/evolution-mail-message.xml.h:18
+#: ../ui/evolution-mail-message.xml.h:17
 msgid "Create a Search Folder for this sender"
 msgstr "Creu Plygell Chwilio ar gyfer yr danfonwr yma"
 
-#: ../ui/evolution-mail-message.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:18
 msgid "Create a Search Folder for this subject"
 msgstr "Creu Plygell Chwilio ar gyfer y pwnc yma"
 
-#: ../ui/evolution-mail-message.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a rule to filter messages from this sender"
 msgstr "Creu rheol er mwyn hidlo negeseuon oddi wrth yr anfonwr yma"
 
-#: ../ui/evolution-mail-message.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Creu rheol er mwyn hidlo negeseuon at y derbynwyr yma"
 
-#: ../ui/evolution-mail-message.xml.h:22
+#: ../ui/evolution-mail-message.xml.h:21
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Creu rheol er mwyn hidlo negeseuon at y rhestr e-bost hon"
 
-#: ../ui/evolution-mail-message.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:22
 msgid "Create a rule to filter messages with this subject"
 msgstr "Creu rheol er mwyn hidlo negeseuon gyda'r pwnc hwn"
 
-#: ../ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-mail-message.xml.h:24
 msgid "Decrease the text size"
 msgstr "Lleihau maint testun"
 
-#: ../ui/evolution-mail-message.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:26
 msgid "Display the next important message"
 msgstr "Dangos y neges bwysig nesaf"
 
-#: ../ui/evolution-mail-message.xml.h:28
+#: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next message"
 msgstr "Dangos y neges nesaf"
 
-#: ../ui/evolution-mail-message.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:28
 msgid "Display the next unread message"
 msgstr "Dangos y neges nesaf sydd heb ei darllen"
 
-#: ../ui/evolution-mail-message.xml.h:30
+#: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the next unread thread"
 msgstr "Dangos y trywydd nesaf sydd heb ei ddarllen"
 
-#: ../ui/evolution-mail-message.xml.h:31
+#: ../ui/evolution-mail-message.xml.h:30
 msgid "Display the previous important message"
 msgstr "Dangos y neges bwysig flaenorol"
 
-#: ../ui/evolution-mail-message.xml.h:32
+#: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous message"
 msgstr "Dangos y neges flaenorol"
 
-#: ../ui/evolution-mail-message.xml.h:33
+#: ../ui/evolution-mail-message.xml.h:32
 msgid "Display the previous unread message"
 msgstr "Dangos y neges flaenorol sydd heb ei darllen"
 
-#: ../ui/evolution-mail-message.xml.h:34
+#: ../ui/evolution-mail-message.xml.h:33
 msgid "Filter on Mailing _List..."
 msgstr "Hidlo ar sail _Rhestr E-bostio..."
 
-#: ../ui/evolution-mail-message.xml.h:35
+#: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Se_nder..."
 msgstr "Hidlo ar sail D_anfonwr..."
 
-#: ../ui/evolution-mail-message.xml.h:36
+#: ../ui/evolution-mail-message.xml.h:35
 msgid "Filter on _Recipients..."
 msgstr "Hidlo ar sail _Derbynwyr..."
 
-#: ../ui/evolution-mail-message.xml.h:37
+#: ../ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Subject..."
 msgstr "Hidlo ar sail _Pwnc..."
 
-#: ../ui/evolution-mail-message.xml.h:38
+#: ../ui/evolution-mail-message.xml.h:37
 msgid "Filter the selected messages for junk status"
 msgstr "Hidlo'r negeseuon a ddewiswyd am statws sothach"
 
-#: ../ui/evolution-mail-message.xml.h:39
+#: ../ui/evolution-mail-message.xml.h:38
 msgid "Flag selected message(s) for follow-up"
 msgstr "Marcio neges(euon) ddewiswyd er mwyn eu dilyn i fyny"
 
-#: ../ui/evolution-mail-message.xml.h:40
+#: ../ui/evolution-mail-message.xml.h:39
 msgid "Follow _Up..."
 msgstr "Dilyn i _fyny..."
 
-#: ../ui/evolution-mail-message.xml.h:41
+#: ../ui/evolution-mail-message.xml.h:40
 msgid "Force images in HTML mail to be loaded"
 msgstr "Gorfodi i ddelweddau mewn e-bost HTML gael eu llwytho"
 
-#: ../ui/evolution-mail-message.xml.h:43
+#: ../ui/evolution-mail-message.xml.h:42
 msgid "Forward the selected message in the body of a new message"
 msgstr "Gyrru'r neges ddewisedig ymlaen yng nghorff neges newydd"
 
-#: ../ui/evolution-mail-message.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message quoted like a reply"
 msgstr "Gyrru'r neges sydd wedi ei dewis ymlaen, wedi'i dyfynnu fel ymateb"
 
-#: ../ui/evolution-mail-message.xml.h:45
+#: ../ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message to someone"
 msgstr "Anfon y neges ddewisedig at rywun"
 
-#: ../ui/evolution-mail-message.xml.h:46
+#: ../ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Gyrru'r neges sydd wedi ei dewis ymlaen at rywun fel atodiad"
 
-#: ../ui/evolution-mail-message.xml.h:47
+#: ../ui/evolution-mail-message.xml.h:46
 msgid "Increase the text size"
 msgstr "Cynyddu maint testun"
 
-#: ../ui/evolution-mail-message.xml.h:49
+#: ../ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as"
 msgstr "_Marcio fel"
 
-#: ../ui/evolution-mail-message.xml.h:50
+#: ../ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected message(s) as having been read"
 msgstr "Marcio'r neges(euon) ddewiswyd fel rhai wedi'u darllen"
 
-#: ../ui/evolution-mail-message.xml.h:51
+#: ../ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as important"
 msgstr "Marcio neges/negeseuon dewisedig yn rai pwysig"
 
-#: ../ui/evolution-mail-message.xml.h:52
+#: ../ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected message(s) as junk"
 msgstr "Marcio neges/negeseuon dewisedig yn sothach"
 
-#: ../ui/evolution-mail-message.xml.h:53
+#: ../ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected message(s) as not being junk"
 msgstr "Marcio'r neges(euon) ddewiswyd fel rhai sydd ddim yn sothach"
 
-#: ../ui/evolution-mail-message.xml.h:54
+#: ../ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Marcio'r neges(euon) ddewiswyd fel rhai heb eu darllen"
 
-#: ../ui/evolution-mail-message.xml.h:55
+#: ../ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Marcio neges/negeseuon dewisedig yn rai ddim yn bwysig"
 
-#: ../ui/evolution-mail-message.xml.h:56
+#: ../ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected messages for deletion"
 msgstr "Marcio'r neges(euon) ddewiswyd ar gyfer eu dileu"
 
-#: ../ui/evolution-mail-message.xml.h:57
+#: ../ui/evolution-mail-message.xml.h:56
 msgid "Message Source"
 msgstr "Ffynhonnell Neges"
 
-#: ../ui/evolution-mail-message.xml.h:58
+#: ../ui/evolution-mail-message.xml.h:57
 msgid "Move"
 msgstr "Symud"
 
-#: ../ui/evolution-mail-message.xml.h:59
+#: ../ui/evolution-mail-message.xml.h:58
 msgid "Move selected message(s) to another folder"
 msgstr "Symud y neges(euon) ddewiswyd i blygell arall"
 
-#: ../ui/evolution-mail-message.xml.h:61
+#: ../ui/evolution-mail-message.xml.h:60
 msgid "Next _Important Message"
 msgstr "Neges _Pwysig Nesaf"
 
-#: ../ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Thread"
 msgstr "_Trywydd Nesaf"
 
-#: ../ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:62
 msgid "Next _Unread Message"
 msgstr "Neges Nesaf _heb ei Darllen"
 
-#: ../ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:63
 msgid "Not Junk"
 msgstr "Ddim yn Sothach"
 
-#: ../ui/evolution-mail-message.xml.h:65
+#: ../ui/evolution-mail-message.xml.h:64
 msgid "Open a window for composing a mail message"
 msgstr "Agor ffenestr er mwyn cyfansoddi neges e-bost"
 
-#: ../ui/evolution-mail-message.xml.h:66
+#: ../ui/evolution-mail-message.xml.h:65
 msgid "Open the selected message in a new window"
 msgstr "Agor y neges ddewisedig mewn ffenestr newydd"
 
-#: ../ui/evolution-mail-message.xml.h:67
+#: ../ui/evolution-mail-message.xml.h:66
 msgid "Open the selected message in the composer for editing"
 msgstr "Agor y neges a ddewiswyd yn y cyfansoddwr er mwyn golygu"
 
-#: ../ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-message.xml.h:67
 msgid "P_revious Unread Message"
 msgstr "Neges Flaenorol Heb ei _Darllen"
 
-#: ../ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Pos_t New Message to Folder"
 msgstr "Postio Neges _Newydd i'r Blygell"
 
-#: ../ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:70
 msgid "Post a Repl_y"
 msgstr "Postio _Ymateb"
 
-#: ../ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-mail-message.xml.h:71
 msgid "Post a message to a Public folder"
 msgstr "Postio neges i blygell Gyhoeddus"
 
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:72
 msgid "Post a reply to a message in a Public folder"
 msgstr "Postio ymateb i neges mewn plygell Cyhoeddus"
 
-#: ../ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Pr_evious Important Message"
 msgstr "Neges Bwysig _Flaenorol"
 
-#: ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-mail-message.xml.h:74
 msgid "Preview the message to be printed"
 msgstr "Dangos rhagolwg y neges i'w phrintio"
 
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:78
 msgid "Print this message"
 msgstr "Argraffu'r neges hon"
 
-#: ../ui/evolution-mail-message.xml.h:80
+#: ../ui/evolution-mail-message.xml.h:79
 msgid "Re_direct"
 msgstr "_Ailgyfeirio"
 
-#: ../ui/evolution-mail-message.xml.h:81
+#: ../ui/evolution-mail-message.xml.h:80
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Dargyfeirio (bownsio) y neges a ddewiswyd at rywun"
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Reset the text to its original size"
 msgstr "Adfer y testun i'w faint gwreiddiol"
 
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:85
 msgid "Save the message as a text file"
 msgstr "Cadw'r neges fel ffeil destun"
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Search Folder from Mailing _List..."
 msgstr "Plygell Chwilio ar sail _Rhestr E-bostio..."
 
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Search Folder from Recipients..."
 msgstr "Plygell Chwilio ar sail _Derbynwyr..."
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Search Folder from S_ubject..."
 msgstr "Plygell Chwilio ar sail _Pwnc..."
 
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:89
 msgid "Search Folder from Sen_der..."
 msgstr "Plygell Chwilio ar sail _Danfonwr..."
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Search for text in the body of the displayed message"
 msgstr "Chwilio am destun yng nghorff y neges a ddangosir"
 
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Select _All Text"
 msgstr "Dewis yr _holl destun"
 
-#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Select all the text in a message"
 msgstr "Dewis yr holl destun o fewn y neges"
 
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Set up the page settings for your current printer"
 msgstr "Gosod y dewisiadau tudalen i fyny ar gyfer eich argraffydd presennol"
 
-#: ../ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr ""
 "Dangos cyrchwr sy'n chwincian yng nghorff y negeseuon sy'n cael eu dangos"
 
-#: ../ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Show message in the normal style"
 msgstr "Dangos neges yn yr arddull normal"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show message with all email headers"
 msgstr "Dangos neges gyda phob pennawd e-bost"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Show the raw email source of the message"
 msgstr "Dangos ffynhonnell graidd o e-bost y neges"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Un-delete the selected messages"
 msgstr "Dad-ddileu'r negeseuon a ddewiswyd"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Uni_mportant"
 msgstr "_Ddim yn Bwysig"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "Zoom _Out"
 msgstr "_Crebachu"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
 msgstr "Modd _Caret"
 
-#: ../ui/evolution-mail-message.xml.h:105
+#: ../ui/evolution-mail-message.xml.h:104
 msgid "_Delete Message"
 msgstr "_Dileu Neges"
 
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Find in Message..."
 msgstr "_Canfod o fewn y Neges..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Go To"
 msgstr "_Mynd I"
 
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Important"
 msgstr "_Pwysig"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Junk"
 msgstr "_Sothach"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Load Images"
 msgstr "Llwytho _Delweddau"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Next Message"
 msgstr "Neges _Nesaf"
 
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Normal Size"
 msgstr "Maint _Arferol"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Not Junk"
 msgstr "_Ddim yn Sothach"
 
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Open in New Window"
 msgstr "Agor mewn Ffenestr _Newydd"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Previous Message"
 msgstr "_Neges Cynt"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Save Message..."
 msgstr "_Cadw Neges..."
 
-#: ../ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:123
 msgid "_Undelete Message"
 msgstr "_Dad-ddileu Neges"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Unread"
 msgstr "_Heb Ddarllen"
 
-#: ../ui/evolution-mail-message.xml.h:126
+#: ../ui/evolution-mail-message.xml.h:125
 msgid "_Zoom In"
 msgstr "_Chwyddo"
 
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
 #: ../ui/evolution-mail-messagedisplay.xml.h:1
 #: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:7
+#: ../ui/evolution-signature-editor.xml.h:2
 msgid "Close"
 msgstr "Cau"
 
@@ -18488,7 +18485,7 @@ msgstr "Cau"
 msgid "Close this window"
 msgstr "_Cau'r ffenestr hon"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "Bar offer"
 
@@ -18499,8 +18496,8 @@ msgstr "_Cau"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:45
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:36
+#: ../ui/evolution-signature-editor.xml.h:13
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:33
 msgid "_File"
 msgstr "_Ffeil"
 
@@ -18516,13 +18513,8 @@ msgstr "Atodi Ffeil"
 msgid "Check to get delivery notification when your message is read"
 msgstr "Ticiwch i gael hysbysiad pan fo'ch neges yn cael ei darllen"
 
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
 #: ../ui/evolution-message-composer.xml.h:5
-#: ../ui/evolution-signature-editor.xml.h:13
+#: ../ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
 msgstr "Cau'r ffeil cyfredol"
 
@@ -18539,7 +18531,7 @@ msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Amgryptio'r neges gyda'ch Tystysgrif Amgryptiad S/MIME"
 
 #: ../ui/evolution-message-composer.xml.h:9
-#: ../ui/evolution-signature-editor.xml.h:14
+#: ../ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
 msgstr "_Fformat"
 
@@ -18596,6 +18588,7 @@ msgid "Save in folder..."
 msgstr "Cadw mewn plygell..."
 
 #: ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-signature-editor.xml.h:9
 msgid "Save the current file"
 msgstr "Cadw'r ffeil cyfredol"
 
@@ -18608,7 +18601,7 @@ msgid "Save the message in a specified folder"
 msgstr "Cadw'r neges mewn plygell benodol"
 
 #: ../ui/evolution-message-composer.xml.h:29
-#: ../ui/evolution-signature-editor.xml.h:22
+#: ../ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
 msgstr "Anfon yr e-bost ar ffurf HTML"
 
@@ -18669,7 +18662,7 @@ msgid "_From Field"
 msgstr "Maes _Oddi wrth"
 
 #: ../ui/evolution-message-composer.xml.h:47
-#: ../ui/evolution-signature-editor.xml.h:25
+#: ../ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Mewnosod"
 
@@ -18697,22 +18690,19 @@ msgstr "Maes _I"
 msgid "C_lose"
 msgstr "_Cau"
 
-#: ../ui/evolution-signature-editor.xml.h:15
+#: ../ui/evolution-signature-editor.xml.h:5
 msgid "H_TML"
 msgstr "_HTML"
 
-#: ../ui/evolution-signature-editor.xml.h:16
+#: ../ui/evolution-signature-editor.xml.h:7
 msgid "Save and Close"
 msgstr "Cadw a Chau"
 
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:20
+#: ../ui/evolution-signature-editor.xml.h:8
 msgid "Save and _Close"
 msgstr "Cadw a _Chau"
 
-#: ../ui/evolution-signature-editor.xml.h:21
+#: ../ui/evolution-signature-editor.xml.h:10
 msgid "Save the current file and close the window"
 msgstr "Cadw'r ffeil cyfredol a chau'r ffenestr"
 
@@ -18823,136 +18813,136 @@ msgid "Display window buttons with text only"
 msgstr "Dangos botymau ffenestr gyda thestun yn unig"
 
 #: ../ui/evolution.xml.h:10
+msgid "Evolution _FAQ"
+msgstr "_Cwestiynau Ofynnir Amlaf am Evolution"
+
+#: ../ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Gadael y rhaglen"
 
-#: ../ui/evolution.xml.h:11
+#: ../ui/evolution.xml.h:12
 msgid "Forget _Passwords"
 msgstr "Anghofio _Cyfrineiriau"
 
-#: ../ui/evolution.xml.h:12
+#: ../ui/evolution.xml.h:13
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 "Anghofio'r cyfrineiriau a gofiwyd, fel eich bod yn cael eich promptio "
 "amdanynt unwaith eto"
 
-#: ../ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:14
 msgid "Hide window buttons"
 msgstr "Cuddio botymau ffenestr"
 
-#: ../ui/evolution.xml.h:14
+#: ../ui/evolution.xml.h:15
 msgid "Icons _and text"
 msgstr "Eiconau _a thestun"
 
-#: ../ui/evolution.xml.h:15
+#: ../ui/evolution.xml.h:16
 msgid "Import data from other programs"
 msgstr "Mewnforio data o raglenni eraill"
 
-#: ../ui/evolution.xml.h:17
+#: ../ui/evolution.xml.h:18
 msgid "New _Window"
 msgstr "_Ffenestr Newydd"
 
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:19
 msgid "Prefere_nces"
 msgstr "H_offterau"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:20
 msgid "Send / Receive"
 msgstr "Anfon / Derbyn"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "Anfon yr eitemau sydd yn y ciw, a galw am eitemau newydd"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "Gosod cyfluniad _Peilot"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:23
 msgid "Show information about Evolution"
 msgstr "Dangos gwybodaeth ynghylch Evolution"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "Anfon Adroddiad Nam"
 
-#. <menuitem name="HelpFAQ" verb=""
-#. _label="Evolution _FAQ"/>
-#.
-#. <separator/>
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "Anfon Adroddiad _Nam"
 
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Cyflwyno adroddiad nam defnyddio Bug Buddy"
 
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:27
 msgid "Toggle whether we are working offline."
 msgstr "Toglu a ydyn ni'n gweithio all-lein."
 
-#: ../ui/evolution.xml.h:31
+#: ../ui/evolution.xml.h:28
 msgid "Tool_bar"
 msgstr "_Bar offer"
 
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:29
 msgid "Tool_bar style"
 msgstr "_Arddull bar offer"
 
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:30
 msgid "_About Evolution..."
 msgstr "_Ynghylch Evolution..."
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:31
 msgid "_Close Window"
 msgstr "_Cau Ffenestr"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:34
 msgid "_Help"
 msgstr "_Cymorth"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:35
 msgid "_Hide buttons"
 msgstr "_Cuddio botymau"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:36
 msgid "_Icons only"
 msgstr "_Eiconau'n unig"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:37
 msgid "_Import..."
 msgstr "_Mewnforio..."
 
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:38
 msgid "_New"
 msgstr "_Newydd"
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:39
 msgid "_Quick Reference"
 msgstr "Cyfeiriad _Cyflym"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:40
 msgid "_Quit"
 msgstr "_Gadael"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:41
 msgid "_Send / Receive"
 msgstr "_Anfon / Derbyn"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:42
 msgid "_Switcher Appearance"
 msgstr "_Ymddangosiad y Newidydd"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:43
 msgid "_Synchronization Options..."
 msgstr "_Opsiynau Cysoni..."
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:44
 msgid "_Text only"
 msgstr "_Testun yn unig"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:46
 msgid "_Window"
 msgstr "_Ffenestr"
 
@@ -20197,3 +20187,750 @@ msgstr "Cyd-destun IM"
 #: ../widgets/text/e-text.c:3683 ../widgets/text/e-text.c:3684
 msgid "Handle Popup"
 msgstr "Deliwr Naidlen"
+
+#~ msgid "Mo_ve to Folder..."
+#~ msgstr "_Symud i Blygell..."
+
+#~ msgid "Unknown error verifying signed messaage"
+#~ msgstr "Gwall anhysbys wrth wirio neges wedi'i llofnodi"
+
+#~ msgid "Unknown error decrypting messaage"
+#~ msgstr "Gwall anhysbys wrth ddadgryptio neges"
+
+#~ msgid "FIll stipple"
+#~ msgstr "Llenwi dotwaith"
+
+#~ msgid "vFolders"
+#~ msgstr "Rhith-blygellau"
+
+#~ msgid "Create _vFolder"
+#~ msgstr "Creu _Rhith-blygell"
+
+#~ msgid "v_Folders"
+#~ msgstr "_Rhith-blygellau"
+
+#~ msgid "vFolder source"
+#~ msgstr "Ffynhonnell Rhith-blygell"
+
+#~ msgid "Edit vFolder"
+#~ msgstr "Golygu Rhith-blygell"
+
+#~ msgid "New vFolder"
+#~ msgstr "Rhith-blygell Newydd"
+
+#~ msgid "Your server needs to be updated"
+#~ msgstr "Rhaid diweddaru'ch gweinydd"
+
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr ""
+#~ "Ydych chi'n siŵr eich bod\n"
+#~ "am ddileu'r cyswllt hwn?"
+
+#~ msgid "Save Appointment"
+#~ msgstr "Arbed yr Apwyntiad"
+
+#~ msgid ""
+#~ " Some features may not work correctly with your current server version "
+#~ msgstr ""
+#~ "Efallai na fydd rhai nodweddion yn gweithio'n gywir gyda'r fersiwn "
+#~ "gweinydd presennol"
+
+#~ msgid "Appointment Title"
+#~ msgstr "Enw'r Apwyntiad"
+
+#~ msgid "end-time"
+#~ msgstr "amser gorffen"
+
+#~ msgid "start-time"
+#~ msgstr "amser cychwyn"
+
+#~ msgid "Show _Attachment Bar (drop attachments here)"
+#~ msgstr "Dangos y _Bar Atodiadau (gollyngwch atodiadau fan hyn)"
+
+#~ msgid "Attachment Button: Press space key to toggle attachment bar"
+#~ msgstr "Botwm Atodiadau: Gwasgwch y bylchwr i doglu'r bar atodiadau"
+
+#~ msgid "Ad_vanced  send options"
+#~ msgstr "Opsiynau anfon _estynedig"
+
+#~ msgid "N"
+#~ msgstr "Gog"
+
+#~ msgid "S"
+#~ msgstr "De"
+
+#~ msgid "W"
+#~ msgstr "Gor"
+
+#~ msgid ""
+#~ "Evolution has found Gnome Calendar files.\n"
+#~ "Would you like to import them into Evolution?"
+#~ msgstr ""
+#~ "Mae Evolution wedi canfod ffeiliau Calendr Gnome.\n"
+#~ "Hoffech chi eu mewnforio i Evolution?"
+
+#~ msgid "<b>If</b>"
+#~ msgstr "<b>Os</b>"
+
+#~ msgid "port for starting user runned spamd"
+#~ msgstr "porth er mwyn rhedeg spamd wedi'i gychwyn gan y defnyddiwr"
+
+#~ msgid "spamd port"
+#~ msgstr "porth spamd"
+
+#~ msgid "Evolution Netscape Mail importer"
+#~ msgstr "Mewnforiwr Ebost Netscape i Evolution"
+
+#~ msgid "Evolution Outlook Express 4 importer"
+#~ msgstr "Mewnforiwr Outlook Express 4 i Evolution"
+
+#~ msgid "Evolution mbox importer"
+#~ msgstr "Mewnforiwr mbox Evolution"
+
+#~ msgid "MBox (mbox)"
+#~ msgstr "MBox (mbox)"
+
+#~ msgid "Outlook Express 4 (.mbx)"
+#~ msgstr "Outlook Express 4 (.mbx)"
+
+#~ msgid "Evolution is importing your old Elm mail"
+#~ msgstr "Mae Evolution yn mewnforio'ch hen ebost Elm"
+
+#~ msgid ""
+#~ "Evolution has found Elm mail files\n"
+#~ "Would you like to import them into Evolution?"
+#~ msgstr ""
+#~ "Mae Evolution wedi canfod ffeiliau e-bost Elm\n"
+#~ "Hoffech chi eu mewnforio i Evolution?"
+
+#~ msgid "Elm"
+#~ msgstr "Elm"
+
+#~ msgid "Evolution is importing your old Pine data"
+#~ msgstr "Mae Evolution yn mewnforio'ch hen ddata Pine"
+
+#~ msgid ""
+#~ "Evolution has found Pine mail files.\n"
+#~ "Would you like to import them into Evolution?"
+#~ msgstr ""
+#~ "Mae Evolution wedi canfod hen ffeiliau ebost Pine.\n"
+#~ "Hoffech chi eu mewnforio i Evolution?"
+
+#~ msgid "Pine"
+#~ msgstr "Pine"
+
+#~ msgid "_Host:"
+#~ msgstr "_Gwesteiwr:"
+
+#~ msgid "_Load images if sender is in address book"
+#~ msgstr "_Llwytho delweddau os yw'r anfonwr yn y llyfr cyfeiriadau"
+
+#~ msgid "{1}."
+#~ msgstr "{1}."
+
+#~ msgid "Mark  as default folder"
+#~ msgstr "Marcio  yn blygell ragosodedig"
+
+#~ msgid "Out of office Message:"
+#~ msgstr "Neges Allan o'r Swyddfa"
+
+#~ msgid "<b>%s</b> requests the presence of %s at the following meeting:"
+#~ msgstr "Mae <b>%s</b> am i %s fod yn bresennol yn y cyfarfod canlynol:"
+
+#~ msgid "Manage Plugins..."
+#~ msgstr "Rheoli Ategion..."
+
+#~ msgid "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
+#~ msgstr "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
+
+#~ msgid ""
+#~ "Uid%sSummary%sDescription List%sCategories List%sComment List%sCompleted%"
+#~ "sCreated%sContact List%sStart%sEnd%sDue%sPercent Done%sPriority%sUrl%"
+#~ "sAttendees List%sLocation%sModified%s"
+#~ msgstr ""
+#~ "Uid%sCrynodeb%sRhestr Ddisgrifiadau%sRhestr Gategoriau%sRhestr Sylwadau%"
+#~ "sCwblhawyd%sCrëwyd%sRhestr Cysylltiadau%sCychwyn%sDiwedd%sAngen Erbyn%"
+#~ "sCanran Wedi'i Gwblhau%sBlaenoriaeth%sLau%sRhestr Mynychwyr%sLleoliad%"
+#~ "sNewidiwyd%s"
+
+#~ msgid "Invalid user"
+#~ msgstr "Defnyddiwr annilys"
+
+#~ msgid ""
+#~ "\n"
+#~ "You cannot share folder with specified user \"{0}\" \n"
+#~ msgstr ""
+#~ "\n"
+#~ "Fedrwch chi ddim rhannu plygell gyda'r defnyddiwr a ddewiswyd \"{0}\" \n"
+
+#~ msgid "Specify User"
+#~ msgstr "Penodwch Ddefnyddiwr"
+
+#~ msgid ""
+#~ "\n"
+#~ "\tYou have to specify a user name whom you want to add to the list \n"
+#~ msgstr ""
+#~ "\n"
+#~ "\tRhaid i chi benodi enw defnyddiwr yr ydych am ychwanegu at y rhestr \n"
+
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importing item %d."
+#~ msgstr ""
+#~ "Mewnforio %s\n"
+#~ "Mewnforio eitem %d."
+
+#~ msgid "Select importer"
+#~ msgstr "Dewiswch fewnforiwr"
+
+#~ msgid "Importing"
+#~ msgstr "Mewnforio"
+
+#~ msgid "Importing %s.\n"
+#~ msgstr "Mewnforio %s.\n"
+
+#~ msgid "Error loading %s"
+#~ msgstr "Gwall wrth lwytho %s"
+
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importing item 1."
+#~ msgstr ""
+#~ "Mewnforio %s\n"
+#~ "Mewnforio eitem 1."
+
+#~ msgid "Automatic"
+#~ msgstr "Awtomatig"
+
+#~ msgid ""
+#~ "Please wait...\n"
+#~ "Scanning for existing setups"
+#~ msgstr ""
+#~ "Arhoswch...\n"
+#~ "Yn chwilio am osodiadau sydd eisoes yn bodoli"
+
+#~ msgid "Starting Intelligent Importers"
+#~ msgstr "Dechrau Mewnforwyr Deallus"
+
+#~ msgid "No importer available for file %s"
+#~ msgstr "Dim mewnforiwr ar gael ar gyfer ffeil %s"
+
+#~ msgid "Unable to execute importer"
+#~ msgstr "Methu gweithredu mewnforiwr"
+
+#~ msgid "Closing connections..."
+#~ msgstr "Cau cysylltiadau..."
+
+#~ msgid "Don't import"
+#~ msgstr "Peidiwch â mewnforio"
+
+#~ msgid "Don't ask me again"
+#~ msgstr "Peidiwch â gofyn eto."
+
+#~ msgid "Evolution can import data from the following files:"
+#~ msgstr "Gall Evolution fewnforio data o'r ffeiliau canlynol:"
+
+#~ msgid "Disable the mono plugin environment."
+#~ msgstr "Analluogi amgylchedd ategyn mono."
+
+#~ msgid "Cannot start Evolution"
+#~ msgstr "Ni ellir cychwyn Evolution"
+
+#~ msgid "_Filters..."
+#~ msgstr "_Hidlyddion..."
+
+#~ msgid "vFolder _Editor..."
+#~ msgstr "_Golygydd Rhith-blygellau..."
+
+#~ msgid "Mark All as _Read"
+#~ msgstr "Marcio'r Cyfan wedi eu _Darllen"
+
+#~ msgid "_Folder"
+#~ msgstr "_Plygell"
+
+#~ msgid "_Threaded Message List"
+#~ msgstr "_Rhestr Negeseuon wedi Edafu"
+
+#~ msgid "Create _vFolder From Message"
+#~ msgstr "Creu _Rhith-blygell o'r Neges"
+
+#~ msgid "F_orward As..."
+#~ msgstr "_Ymlaen Fel..."
+
+#~ msgid "Filter _Junk"
+#~ msgstr "Hidlo _Sothach"
+
+#~ msgid "Mark as I_mportant"
+#~ msgstr "_Nodi yn Bwysig"
+
+#~ msgid "Mark as Unimp_ortant"
+#~ msgstr "Nodi _Ddim yn Bwysig"
+
+#~ msgid "S_earch in Message..."
+#~ msgstr "_Chwilio yn y Neges..."
+
+#~ msgid "S_maller"
+#~ msgstr "_Llai"
+
+#~ msgid "Show Email _Source"
+#~ msgstr "Dangos _Ffynhonnell Ebost"
+
+#~ msgid "Text Si_ze"
+#~ msgstr "Maint _Testun"
+
+#~ msgid "_Attached"
+#~ msgstr "Wedi _atodi"
+
+#~ msgid "_Create Filter From Message"
+#~ msgstr "_Creu Hidlydd o'r Neges"
+
+#~ msgid "_Inline"
+#~ msgstr "Yn _fewnol"
+
+#~ msgid "_Larger"
+#~ msgstr "_Mwy"
+
+#~ msgid "_Message Display"
+#~ msgstr "Dangosydd _Neges"
+
+#~ msgid "_Open Message"
+#~ msgstr "_Agor Neges"
+
+#~ msgid "_Tools"
+#~ msgstr "_Offer"
+
+#~ msgid "_Undelete"
+#~ msgstr "_Dad-ddileu"
+
+#~ msgid "Show / hide attachments"
+#~ msgstr "Dangos / cuddio atodiadau"
+
+#~ msgid "Show _attachments"
+#~ msgstr "Dangos _atodiadau"
+
+#~ msgid "Show attachments"
+#~ msgstr "Dangos atodiadau"
+
+#~ msgid "E_xit"
+#~ msgstr "_Gorffen"
+
+#~ msgid "Window B_uttons"
+#~ msgstr "_Botymau Ffenest"
+
+#~ msgid "_Advanced..."
+#~ msgstr "_Uwch..."
+
+#~ msgid ""
+#~ "None\n"
+#~ "Mail Receipt\n"
+#~ msgstr ""
+#~ "Dim\n"
+#~ "Derbyniad yr e-bost\n"
+
+#~ msgid "Starting import"
+#~ msgstr "Dechrau mewnforio"
+
+#~ msgid "Importing Files"
+#~ msgstr "Mewnforio Ffeiliau"
+
+#~ msgid "Timezone "
+#~ msgstr "Cylchfa amser"
+
+#~ msgid "have "
+#~ msgstr "cael "
+
+#~ msgid "has "
+#~ msgstr "gan "
+
+#~ msgid " cards"
+#~ msgstr " cardiau"
+
+#~ msgid " card"
+#~ msgstr " cerdyn"
+
+#~ msgid "contact's header: "
+#~ msgstr "penawdau’r cyswllt: "
+
+#~ msgid "Remove All"
+#~ msgstr "Tynnu Popeth"
+
+#~ msgid "View Contact List"
+#~ msgstr "Dangos Restr Cyswllt"
+
+#~ msgid "View Contact Info"
+#~ msgstr "Dangos Gwybodaeth Cyswllt"
+
+#~ msgid "Send HTML Mail?"
+#~ msgstr "Anfon E-Bost HTML?"
+
+#~ msgid "Unnamed Contact"
+#~ msgstr "Cyswllt Heb Enw"
+
+#~ msgid "Select Contacts from Address Book"
+#~ msgstr "Dewis Cysylltion o'r Llyfr Cysylltion"
+
+#~ msgid "<b>Contacts</b>"
+#~ msgstr "<b>Cysylltion</b>"
+
+#~ msgid "<b>Show Contacts</b>"
+#~ msgstr "<b>Dangos Cysylltion</b>"
+
+#~ msgid "Address _Book:"
+#~ msgstr "_Llyfr Cysylltion"
+
+#~ msgid "C_ategory:"
+#~ msgstr "_Categori:"
+
+#~ msgid "_Find"
+#~ msgstr "_Chwilio"
+
+#~ msgid "_Search:"
+#~ msgstr "_Chwilio:"
+
+#~ msgid "Address:"
+#~ msgstr "Cyfeiriad:"
+
+#~ msgid "PO Box:"
+#~ msgstr "Blwch Post:"
+
+#~ msgid "State/Province:"
+#~ msgstr "Talaith/Rhanbarth:"
+
+#~ msgid "Title:"
+#~ msgstr "Teitl:"
+
+#~ msgid "Go to Folder..."
+#~ msgstr "Mynd at Blygell..."
+
+#~ msgid "Import..."
+#~ msgstr "Mewnforio..."
+
+#~ msgid "Address Book Sources..."
+#~ msgstr "Ffynhonellau Llyfr Cysylltion.."
+
+#~ msgid "Print Envelope"
+#~ msgstr "Argraffu Amlen"
+
+#~ msgid "Edit Contact Info"
+#~ msgstr "Golygu Gwybodaeth Gyswllt"
+
+#~ msgid "Evolution VCard importer"
+#~ msgstr "Mewnforwr VCard Evolution"
+
+#~ msgid "Impossible internal error."
+#~ msgstr "Gwall mewnol amhosib."
+
+#~ msgid "Unnamed List"
+#~ msgstr "Rhestr Ddienw"
+
+#~ msgid "Starting:"
+#~ msgstr "Yn dechrau:"
+
+#~ msgid "Ending:"
+#~ msgstr "Yn gorffen"
+
+#~ msgid "%A %d %B %Y"
+#~ msgstr "%A %d %B %Y"
+
+#~ msgid "backend_go_offline(): %s"
+#~ msgstr "backend_go_offline(): %s"
+
+#~ msgid "backend_go_online(): %s"
+#~ msgstr "backend_go_online(): %s"
+
+#~ msgid "open_client(): %s"
+#~ msgstr "open_client(): %s"
+
+#~ msgid "_Destination"
+#~ msgstr "_Cyrchfan"
+
+#~ msgid "Free/Busy Editor"
+#~ msgstr "Golygydd Rhydd/Prysur"
+
+#~ msgid "Print Setup"
+#~ msgstr "Ffurfweddiad Argraffu"
+
+#~ msgid "Cannot open message"
+#~ msgstr "Methu agor y neges"
+
+#~ msgid "Getting message %d of %d"
+#~ msgstr "nôl neges %d o %d"
+
+#~ msgid "Moving messages"
+#~ msgstr "Symud negeseuon"
+
+#~ msgid "Copying messages"
+#~ msgstr "Copïo negeseuon"
+
+#~ msgid ""
+#~ "Failed to GPG %s: %s\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Methwyd GPG: %s: %s\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid "Failed to GPG %s: %s\n"
+#~ msgstr "Methwyd GPG %s: %s\n"
+
+#~ msgid "Failed to execute gpg: %s"
+#~ msgstr "Methu gweithredu gpg: %s"
+
+#~ msgid "Failed to execute gpg."
+#~ msgstr "Methu gweithredu gpg."
+
+#~ msgid "Could not open mail file %s: %s"
+#~ msgstr "Methu agor y ffeil ebost %s: %s"
+
+#~ msgid "(Unknown error)"
+#~ msgstr "(Gwall anhysbys)"
+
+#~ msgid "CRAM-MD5"
+#~ msgstr "CRAM-MD5"
+
+#~ msgid "DIGEST-MD5"
+#~ msgstr "DIGEST-MD5"
+
+#~ msgid "Kerberos 4"
+#~ msgstr "Kerberos 4"
+
+#~ msgid "NTLM / SPA"
+#~ msgstr "NTLM / SPA"
+
+#~ msgid "PLAIN"
+#~ msgstr "PLAIN"
+
+#~ msgid "Good signature"
+#~ msgstr "Llofnod da"
+
+#~ msgid "Bad signature"
+#~ msgstr "Llofnod gwael"
+
+#~ msgid "Processing error"
+#~ msgstr "Gwall prosesu"
+
+#~ msgid "Trash"
+#~ msgstr "Sbwriel"
+
+#~ msgid "Out of memory"
+#~ msgstr "Dim cof"
+
+#~ msgid "Check for new messages in all folders"
+#~ msgstr "Gwirio am negeseuon newydd ym mhob plygell"
+
+#~ msgid "Password"
+#~ msgstr "Cyfrinair"
+
+#~ msgid "This message is not currently available"
+#~ msgstr "Nid yw'r neges hon ar gael ar hyn o bryd"
+
+#~ msgid "Connection to Server"
+#~ msgstr "Cysylltiad at Weinydd"
+
+#~ msgid "Show only subscribed folders"
+#~ msgstr "Dangoswch blygellau tanysgrifiwyd iddynt yn unig"
+
+#~ msgid "Namespace"
+#~ msgstr "Gofod enwau"
+
+#~ msgid "IMAP"
+#~ msgstr "IMAP"
+
+#~ msgid "IMAP server %s"
+#~ msgstr "Gweinydd IMAP %s"
+
+#~ msgid "IMAP service for %s on %s"
+#~ msgstr "Gwasanaeth IMAP ar gyfer %s ar %s"
+
+#~ msgid "Connection cancelled"
+#~ msgstr "Diddymwyd y cysylltiad "
+
+#~ msgid ""
+#~ "Unable to authenticate to IMAP server.\n"
+#~ "%s\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Methwyd dilysu at weinydd IMAP.\n"
+#~ "%s\n"
+#~ "\n"
+
+#~ msgid "IMAPv4rev1"
+#~ msgstr "IMAPv4rev1"
+
+#~ msgid "%sPlease enter the IMAP password for %s on host %s"
+#~ msgstr "%sRhowch y cyfrinair IMAP ar gyfer %s ar y gwesteiwr %s"
+
+#~ msgid "Cannot authenticate to IMAP server %s using %s"
+#~ msgstr "Ni ellir dilysu at weinydd IMAP %s gan ddefnyddio %s"
+
+#~ msgid "IMAP+"
+#~ msgstr "IMAP+"
+
+#~ msgid "~%s (%s)"
+#~ msgstr "~%s (%s)"
+
+#~ msgid "mailbox:%s (%s)"
+#~ msgstr "Blwch ebost:%s (%s)"
+
+#~ msgid "Could not open file: %s: %s"
+#~ msgstr "Methwyd agor y ffeil: %s: %s"
+
+#~ msgid "Unknown error: %s"
+#~ msgstr "Gwall anhysbys: %s"
+
+#~ msgid ""
+#~ "Could not open folder `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Methu agor plygell `%s':\n"
+#~ "%s"
+
+#~ msgid "User cancelled"
+#~ msgstr "Defnyddiwr diddymwyd"
+
+#~ msgid "USENET news"
+#~ msgstr "Newyddion USENET"
+
+#~ msgid "USENET News via %s"
+#~ msgstr "Newyddion USENET drwy %s"
+
+#~ msgid "No such folder: %s"
+#~ msgstr "Dim plygell o'r fath: %s"
+
+#~ msgid "Use cancel"
+#~ msgstr "Defnyddiwch ddiddymu"
+
+#~ msgid "Delete after %s day(s)"
+#~ msgstr "Dileu ar ôl %s dydd"
+
+#~ msgid "POP"
+#~ msgstr "POP"
+
+#~ msgid "No such folder `%s'."
+#~ msgstr "Dim plygell o'r fath '%s'."
+
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "sendmail"
+#~ msgstr "sendmail"
+
+#~ msgid "SMTP"
+#~ msgstr "SMTP"
+
+#~ msgid "Command not implemented"
+#~ msgstr "Gorchymyn heb weithredu"
+
+#~ msgid "Command parameter not implemented"
+#~ msgstr "Paramedr gorchymyn heb weithredu"
+
+#~ msgid "Help message"
+#~ msgstr "Neges cymorth"
+
+#~ msgid "SMTP server %s"
+#~ msgstr "Gweinydd SMTP %s"
+
+#~ msgid "SMTP Greeting"
+#~ msgstr "Cyfarchiad SMTP"
+
+#~ msgid "Attach a file to the message"
+#~ msgstr "Atodi ffeil i'r neges"
+
+#~ msgid "_Remember this password"
+#~ msgstr "_Cofio'r cyfrinair yma"
+
+#~ msgid "incoming"
+#~ msgstr "dod i mewn"
+
+#~ msgid "Virtual _Folders"
+#~ msgstr "_Plygellau Rhithwir"
+
+#~ msgid "Receiving Mail"
+#~ msgstr "Yn Derbyn Post"
+
+#~ msgid "<span weight=\"bold\">Checking for New Mail</span>"
+#~ msgstr "<span weight=\"bold\">Edrych am Ebost Newydd</span>"
+
+#~ msgid "IMAPv4 "
+#~ msgstr "IMAPv4 "
+
+#~ msgid "Kerberos "
+#~ msgstr "Kerberos"
+
+#~ msgid "Qmail maildir "
+#~ msgstr "Maildir Qmail "
+
+#~ msgid "C_ompleted"
+#~ msgstr "_Gwblheuwyd"
+
+#~ msgid "Body or subject contains"
+#~ msgstr "Corff neu bwnc yn cynnwys"
+
+#~ msgid "Subject does not contain"
+#~ msgstr "Pwnc ddim yn cynnwys"
+
+#~ msgid "Close this item"
+#~ msgstr "Cau'r eitem hon"
+
+#~ msgid "Preview the printed item"
+#~ msgstr "Rhagolwg yr eitem argraffwyd"
+
+#~ msgid "Print this item"
+#~ msgstr "Argraffu eitem hon"
+
+#~ msgid "Save the item and close the dialog box"
+#~ msgstr "Cadw'r eitem a chau'r blwch ymgom"
+
+#~ msgid "Save this item to disk"
+#~ msgstr "Cadw'r eitem i ddisg"
+
+#~ msgid "Print En_velope..."
+#~ msgstr "_Argraffu Amlen..."
+
+#~ msgid "Save the contact and close the dialog box"
+#~ msgstr "Cadw'r cyswllt a chau'r blwch ymgom"
+
+#~ msgid "Send _Message to Contact..."
+#~ msgstr "Anfon _Neges i Gyswllt..."
+
+#~ msgid "Save the list and close the dialog box"
+#~ msgstr "Cadw'r rhestr a chau'r blwch ymgom"
+
+#~ msgid "Se_nd list to other..."
+#~ msgstr "Anfon rhestr i eraill..."
+
+#~ msgid "_Delete..."
+#~ msgstr "_Dileu..."
+
+#~ msgid "Cancel the meeting for this item"
+#~ msgstr "Diddymu'r cyfarfod am yr eitem hon"
+
+#~ msgid "Forward as i_Calendar"
+#~ msgstr "Blaenyrru fel i_Calendar"
+
+#~ msgid "Forward this item via email"
+#~ msgstr "Blaenyrru'r eitem drwy ebost"
+
+#~ msgid "Re_fresh Meeting"
+#~ msgstr "_Ailfywio Cyfarfod"
+
+#~ msgid "Schedule _Meeting"
+#~ msgstr "Trefnlen _Cyfarfod"
+
+#~ msgid "Schedule a meeting for this item"
+#~ msgstr "Trefnlen cyfarfod am yr eitem hon"
+
+#~ msgid "Assign this task to others"
+#~ msgstr "Neilltuo'r dasg i eraill"
+
+#~ msgid "Cancel Task"
+#~ msgstr "Diddymu Tasg"
+
+#~ msgid "Cancel this task"
+#~ msgstr "Diddymu'r Dasg"
+
+#~ msgid "Re_fresh Task"
+#~ msgstr "_Ailfywio Tasg"
diff --git a/po/da.po b/po/da.po
index 46463458bb..d2a1565bc7 100644
--- a/po/da.po
+++ b/po/da.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-17 17:45+0200\n"
+"POT-Creation-Date: 2005-10-17 17:20+0200\n"
 "PO-Revision-Date: 2005-10-17 17:09+0200\n"
 "Last-Translator: Marie Lund <marielund@post.cybercity.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -67,7 +67,7 @@ msgstr[0] "Aktuel adressebogmappe har %d kort"
 msgstr[1] "Aktuel adressebogmappe har %d kort"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../calendar/gui/alarm-notify/alarm-queue.c:968
+#: ../calendar/gui/alarm-notify/alarm-queue.c:965
 #: ../ui/evolution-message-composer.xml.h:11
 msgid "Open"
 msgstr "Åbn"
@@ -121,7 +121,7 @@ msgstr "Ny aftale"
 msgid "New All Day Event"
 msgstr "Ny heldagsbegivenhed"
 
-#: ../a11y/calendar/ea-cal-view.c:308
+#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1522
 msgid "New Meeting"
 msgstr "Nyt møde"
 
@@ -406,7 +406,7 @@ msgid "Server Version"
 msgstr "Serverversion"
 
 #: ../addressbook/addressbook.error.xml.h:14
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:44
 msgid "Some features may not work properly with your current server"
 msgstr ""
 "Muligvis virker nogle af faciliteterne ikke ordentligt med din nuværende "
@@ -480,7 +480,7 @@ msgstr ""
 "ikke flyttes fra kilden. Vil du gemme en kopi i stedet?"
 
 #: ../addressbook/addressbook.error.xml.h:28
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:59
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -554,7 +554,7 @@ msgstr "Konfigurér automatisk fuldføring her"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1180
+#: ../addressbook/gui/component/addressbook-view.c:1133
 #: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:388
 msgid "Contacts"
 msgstr "Kontakter"
@@ -778,17 +778,20 @@ msgstr ""
 
 #: ../addressbook/gui/component/addressbook-view.c:764
 #: ../addressbook/gui/widgets/e-addressbook-view.c:952
-#: ../mail/em-filter-i18n.h:11 ../ui/evolution-addressbook.xml.h:9
-#: ../ui/evolution-calendar.xml.h:5 ../ui/evolution-mail-message.xml.h:26
-#: ../ui/evolution-tasks.xml.h:6
+#: ../calendar/gui/calendar-component.c:537
+#: ../calendar/gui/tasks-component.c:441 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:26 ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Slet"
 
 #: ../addressbook/gui/component/addressbook-view.c:766
+#: ../calendar/gui/calendar-component.c:538
+#: ../calendar/gui/tasks-component.c:442
 msgid "Properties..."
 msgstr "Egenskaber ..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1191
+#: ../addressbook/gui/component/addressbook-view.c:1144
 msgid "Contact Source Selector"
 msgstr "Kontaktkilde-vælger"
 
@@ -847,7 +850,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "URI for mappen der sidst blev brugt i \"vælg navne\"-vinduet."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 msgid "Vertical pane position"
 msgstr "Vertikal position for ruden"
 
@@ -2627,8 +2630,8 @@ msgstr "_Kvikbesked-tjeneste:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:234
-#: ../plugins/exchange-operations/exchange-contacts.c:214
+#: ../plugins/exchange-operations/exchange-calendar.c:224
+#: ../plugins/exchange-operations/exchange-contacts.c:203
 msgid "_Location:"
 msgstr "_Sted:"
 
@@ -2805,7 +2808,7 @@ msgstr "Kilde"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:377
+#: ../calendar/gui/e-meeting-list-view.c:370
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Type"
@@ -2816,14 +2819,14 @@ msgstr "Adressebog"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:807
 #: ../addressbook/gui/widgets/e-addressbook-view.c:936
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2018
-#: ../ui/evolution-addressbook.xml.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2016
+#: ../ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Gem som VCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:930
 #: ../calendar/gui/e-calendar-table.c:1167
-#: ../calendar/gui/e-calendar-view.c:1549 ../ui/evolution-addressbook.xml.h:38
+#: ../calendar/gui/e-calendar-view.c:1545 ../ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Åbn"
 
@@ -2836,7 +2839,7 @@ msgid "New Contact List..."
 msgstr "Ny kontaktliste..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:937
-#: ../ui/evolution-addressbook.xml.h:11
+#: ../ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Videresend kontakt"
 
@@ -2858,7 +2861,7 @@ msgstr "Send besked til kontakter"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:942
 #: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2510
-#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
 #: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Udskriv"
@@ -2872,18 +2875,19 @@ msgid "Move to Address Book..."
 msgstr "Flyt til adressebog..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:949
-#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-tasks.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klip ud"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:950
-#: ../ui/evolution-addressbook.xml.h:3 ../ui/evolution-mail-message.xml.h:12
-#: ../ui/evolution-tasks.xml.h:2
+#: ../calendar/gui/calendar-component.c:536
+#: ../calendar/gui/tasks-component.c:440 ../ui/evolution-addressbook.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:12 ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopier"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:951
-#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-tasks.xml.h:11
+#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Indsæt"
 
@@ -2893,8 +2897,7 @@ msgstr "Indsæt"
 msgid "Any Category"
 msgstr "Enhver kategori"
 
-#. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1767
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1766
 msgid "Print cards"
 msgstr "Udskriv kort"
 
@@ -3034,7 +3037,7 @@ msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:388
+#: ../calendar/gui/e-meeting-list-view.c:378
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
 msgid "Role"
@@ -3629,8 +3632,8 @@ msgstr "Udskriv konvolut"
 msgid "Print contacts"
 msgstr "Udskriv kontakter"
 
-#: ../addressbook/printing/e-contact-print.c:1105
-#: ../addressbook/printing/e-contact-print.c:1133
+#: ../addressbook/printing/e-contact-print.c:1104
+#: ../addressbook/printing/e-contact-print.c:1132
 msgid "Print contact"
 msgstr "Udskriv kontakt"
 
@@ -3784,8 +3787,8 @@ msgstr "Skyggelægning"
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
 #: ../plugins/exchange-operations/exchange-account-setup.c:940
-#: ../plugins/exchange-operations/exchange-calendar.c:224
-#: ../plugins/exchange-operations/exchange-contacts.c:197
+#: ../plugins/exchange-operations/exchange-calendar.c:214
+#: ../plugins/exchange-operations/exchange-contacts.c:186
 msgid "Size:"
 msgstr "Størrelse:"
 
@@ -4067,29 +4070,33 @@ msgid "Delete task list '{0}'?"
 msgstr "Slet opgave-listen \"{0}\"?"
 
 #: ../calendar/calendar.error.xml.h:27
+msgid "Discard Changes"
+msgstr "Forkast ændringer"
+
+#: ../calendar/calendar.error.xml.h:28
 msgid "Don't Send"
 msgstr "Send ikke"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:29
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Overføring i gang. Vil du gemme aftalen?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Overføring i gang. Vil du gemme opgaven?"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
 msgid "Editor could not be loaded."
 msgstr "Redigeringsprogram kunne ikke indlæses."
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
 msgid ""
 "Email invitations will be sent to all participants and allow them to RSVP."
 msgstr ""
 "E-post-invitationer bliver sendt til alle deltagerne således at de kan "
 "reservere."
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -4097,15 +4104,15 @@ msgstr ""
 "E-post-invitationer sendes til alle deltagerne således at de kan godkende "
 "denne opgave."
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
 msgid "Error loading calendar"
 msgstr "Fejl ved indlæsning af kalender"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
 msgid "Error loading task list"
 msgstr "Fejl ved indlæsning af opgaveliste"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the journal has been deleted."
@@ -4113,7 +4120,7 @@ msgstr ""
 "Hvis du ikke sender en aflysningsbesked vil de andre deltagere måske ikke "
 "vide at journalen er slettet."
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:37
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the meeting is canceled."
@@ -4121,7 +4128,7 @@ msgstr ""
 "Hvis du ikke sender en aflysningsbesked vil de andre deltagere ikke vide at "
 "mødet er aflyst."
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the task has been deleted."
@@ -4129,16 +4136,21 @@ msgstr ""
 "Hvis du ikke sender en aflysningsbesked, vil de andre deltagere ikke vide at "
 "opgaven er slettet."
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:39
+#, fuzzy
+msgid "Save Changes"
+msgstr "_Gem ændringer"
+
+#: ../calendar/calendar.error.xml.h:40
 #: ../ui/evolution-message-composer.xml.h:28
 msgid "Send"
 msgstr "Send"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:41
 msgid "Send Notice"
 msgstr "Send notits:"
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:42
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4146,7 +4158,7 @@ msgstr ""
 "Ved at sende opdateret information vil andre deltagere kunne holde deres "
 "kalendere opdateret."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4154,92 +4166,84 @@ msgstr ""
 "Ved at sende opdateret information, vil de andre deltagere kunne opdatere "
 "deres opgavelister."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:45
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution-kalenderen har uventet afsluttet."
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:46
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution-opgaver har afsluttet uventet."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:47
 msgid "The calendar is not marked for offline usage"
 msgstr "Kalenderen er ikke markeret til afkoblet brug"
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:48
 msgid "The task list is not marked for offline usage"
 msgstr "Opgavelisten er ikke markeret til afkoblet brug"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:49
 msgid "This calendar will be removed permanently."
 msgstr "Denne kalender vil blive fjernet permanent."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:50
 msgid "This task list will be removed permanently."
 msgstr "Denne opgaveliste vil blive fjernet permanent."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:51
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Vil du gemme dine ændringer for denne aftale?"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:52
 msgid "Would you like to save your changes to this task?"
 msgstr "Vil du gemme dine ændringer af opgaven?"
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:53
 msgid "Would you like to send a cancellation notice for this journal entry?"
 msgstr "Vil du sende en aflysningsnotits for denne journalopføring?"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:54
 msgid "Would you like to send all the participants a cancellation notice?"
 msgstr "Vil du sende en aflysningsbesked til alle deltagerne?"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:55
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Vil du sende mødeinvitationer til deltagerne?"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:56
 msgid "Would you like to send this task to participants?"
 msgstr "Vil du sende denne opgave til deltagerne?"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Vil du sende opdateret mødeinformation til alle deltagerne?"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send updated task information to participants?"
 msgstr "Vil du sende opdateret opgaveinformation til deltagerne?"
 
-#: ../calendar/calendar.error.xml.h:58
-msgid "You have changed this appointment, but not yet saved them."
+#: ../calendar/calendar.error.xml.h:60
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
 msgstr "Du har ændret denne aftale, men ikke gemt ændringerne endnu."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:61
 msgid "You have made changes to this task, but not yet saved them."
 msgstr "Du har lavet ændringer af opgaven, men ikke gemt dem endnu."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:62
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Dine kalendere vil ikke være tilgængelige før Evolution genstartes."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:63
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Dine opgaver vil ikke være tilgængelige før Evolution genstartes."
 
-#: ../calendar/calendar.error.xml.h:62
-#: ../composer/mail-composer.error.xml.h:29
-msgid "_Discard Changes"
-msgstr "_Forkast ændringer"
-
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:64
 #: ../ui/evolution-message-composer.xml.h:51
 msgid "_Save"
 msgstr "_Gem"
 
-#: ../calendar/calendar.error.xml.h:64
-msgid "_Save Changes"
-msgstr "_Gem ændringer"
-
 #: ../calendar/calendar.error.xml.h:65
 #: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:123
 msgid "_Send"
@@ -4317,9 +4321,9 @@ msgid "Evolution's Tasks component"
 msgstr "Evolutions opgavekomponent"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#: ../calendar/gui/e-tasks.c:1332 ../calendar/gui/print.c:1831
+#: ../calendar/gui/e-tasks.c:1282 ../calendar/gui/print.c:1831
 #: ../calendar/gui/tasks-component.c:519
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:466
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:456
 #: ../calendar/importers/icalendar-importer.c:79
 #: ../calendar/importers/icalendar-importer.c:707
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
@@ -4381,13 +4385,13 @@ msgstr "Udsæt_tid:"
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:6
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:13
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-addressbook.xml.h:34 ../ui/evolution-calendar.xml.h:41
 #: ../ui/evolution-composer-entries.xml.h:8
 #: ../ui/evolution-mail-messagedisplay.xml.h:5
 #: ../ui/evolution-message-composer.xml.h:44
 #: ../ui/evolution-signature-editor.xml.h:23
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution.xml.h:35
 msgid "_Edit"
 msgstr "R_edigér"
 
@@ -4403,28 +4407,28 @@ msgstr "aftalebeskrivelse"
 msgid "location of appointment"
 msgstr "placering af aftale"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:969
+#: ../calendar/gui/alarm-notify/alarm-queue.c:966
 msgid "Dismiss"
 msgstr "Se bort fra"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:970
+#: ../calendar/gui/alarm-notify/alarm-queue.c:967
 msgid "Dismiss All"
 msgstr "Se bort fra alle"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1052
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1049
 msgid "No summary available."
 msgstr "Intet sammendrag tilgængelig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1061
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1063
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1058
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1060
 msgid "No description available."
 msgstr "Ingen beskrivelse tilgængelig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1071
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1068
 msgid "No location information available."
 msgstr "Ingen stedinformation tilgængelig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1087
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1084
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -4437,12 +4441,12 @@ msgstr ""
 "Starter %s\n"
 "Slutter %s"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1190
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1214
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1187
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1211
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1194
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1191
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4454,7 +4458,7 @@ msgstr ""
 "at sende e-post. Evolution vil vise et normalt vindue\n"
 "for påmindelse i stedet."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1220
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1217
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4471,7 +4475,7 @@ msgstr ""
 "\n"
 "Er du sikker på du vil køre dette program?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1234
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1231
 msgid "Do not ask me about this program again."
 msgstr "Spørg mig ikke om dette program igen."
 
@@ -4682,28 +4686,18 @@ msgid "Show display alarms in notification tray"
 msgstr "Vis skærmalarmer i statusfeltet"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
-#: ../mail/evolution-mail.schemas.in.in.h:73
-msgid "Show the \"Preview\" pane"
-msgstr "Vis forhåndsvisningsruden"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
-#: ../mail/evolution-mail.schemas.in.in.h:74
-msgid "Show the \"Preview\" pane."
-msgstr "Vis forhåndsvisningsruden."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show week numbers in date navigator"
 msgstr "Vis ugenumre i datonavigationen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Tasks due today color"
 msgstr "Farve for dagens opgaver"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Tasks vertical pane position"
 msgstr "Vertikal position for opgaveruden"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -4711,7 +4705,7 @@ msgstr ""
 "Den forvalgte tidszone til brug for datoer og tid i kalenderen, som et "
 "uoversat Olsen-tidszone-database-sted ligesom \"America/New York\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
 #, no-c-format
 msgid ""
 "The url template to use as a free/busy data fallback, %u is replaced by the "
@@ -4721,57 +4715,57 @@ msgstr ""
 "u udskiftes med brugerdelen af e-post-adressen, mens %d udskiftes med "
 "domænet."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Time divisions"
 msgstr "Tidsintervaller"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Time the last alarm ran, in time_t."
 msgstr "Udførselstiden for forrige alarm, i time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Timezone"
 msgstr "Tidszone"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Twenty four hour time format"
 msgstr "24-timers-format"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Enheder for en forvalgt påmindelse, \"minutes\", \"hours\" eller \"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Enheder for at bestemme når opgaver skal skjules, \"minutes\", \"hours\" "
 "eller \"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid "Week start"
 msgstr "Ugestart"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Ugedag hvorpå ugen starter, fra søndag (0) til lørdag (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Om statusfeltet skal anvendes til visning af alarmer."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr ""
 "Om der spørges efter bekræftelse ved sletning af aftaler eller opgaver."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr ""
 "Om der spørges efter bekræftelse ved sletning af aftaler eller opgaver."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -4779,51 +4773,51 @@ msgstr ""
 "Om weekender skal komprimeres i månedsoversigten, hvilket vil give lørdag og "
 "søndag samme plads som en enkelt ugedag."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Om sluttiderne for begivenheder i uge- og måneds-oversigterne skal vises."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Om Marcus Bains-linjen (linje ved aktuel tid) skal tegnes i kalenderen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Om løste opgaver skjules i opgave-oversigten."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Whether to set a default reminder for appointments."
 msgstr "Om begivenheder skal have en standardpåmindelse."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Om tider skal vises i 24-timers-format i stedet for at bruge am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Om ugenumre vises i datonavigationen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Work days"
 msgstr "Arbejdsdage"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid "Workday end hour"
 msgstr "Time for arbejdsdagens afslutning"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Workday end minute"
 msgstr "Minut for arbejdsdagens afslutning"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid "Workday start hour"
 msgstr "Time for arbejdsdagens start"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Workday start minute"
 msgstr "Minut for arbejdsdagens start"
 
@@ -4899,36 +4893,9 @@ msgid "Weather"
 msgstr "Vejr"
 
 #: ../calendar/gui/calendar-component.c:535
-msgid "_New Calendar"
-msgstr "_Ny kalender"
-
-#: ../calendar/gui/calendar-component.c:536
-#: ../calendar/gui/dialogs/comp-editor.c:428
-#: ../calendar/gui/e-calendar-table.c:1175
-#: ../calendar/gui/e-calendar-view.c:1556
-#: ../calendar/gui/tasks-component.c:440 ../composer/e-msg-composer.c:2911
-#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1035
-#: ../mail/message-list.c:1718 ../ui/evolution-addressbook.xml.h:32
-#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
-#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-tasks.xml.h:23
-msgid "_Copy"
-msgstr "_Kopiér"
-
-#. FIXME: need to disable for undeletable folders
-#: ../calendar/gui/calendar-component.c:537
-#: ../calendar/gui/e-calendar-table.c:1187
-#: ../calendar/gui/e-calendar-view.c:1569
-#: ../calendar/gui/tasks-component.c:441 ../mail/em-folder-tree.c:2054
-#: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:34
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
-#: ../ui/evolution-tasks.xml.h:24
-msgid "_Delete"
-msgstr "_Slet"
-
-#: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/tasks-component.c:442
-msgid "_Properties..."
-msgstr "_Egenskaber ..."
+#: ../calendar/gui/dialogs/calendar-setup.c:449
+msgid "New Calendar"
+msgstr "Ny kalender"
 
 #: ../calendar/gui/calendar-component.c:858
 msgid "Failed upgrading calendars."
@@ -5172,15 +5139,15 @@ msgstr "%.0f G"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:311
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
-#: ../calendar/gui/dialogs/comp-editor.c:2459
+#: ../calendar/gui/dialogs/comp-editor.c:2440
 #: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:444
 #: ../mail/em-utils.c:481 ../widgets/misc/e-attachment-bar.c:341
 msgid "attachment"
 msgstr "bilag"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:473
-#: ../calendar/gui/dialogs/comp-editor.c:1099
-#: ../calendar/gui/dialogs/meeting-page.c:908
+#: ../calendar/gui/dialogs/comp-editor.c:1083
+#: ../calendar/gui/dialogs/meeting-page.c:887
 #: ../composer/e-msg-composer-attachment-bar.c:470
 #: ../composer/e-msg-composer.c:3400
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
@@ -5190,15 +5157,15 @@ msgid "_Remove"
 msgstr "Fje_rn"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:474
-#: ../calendar/gui/dialogs/comp-editor.c:1100
+#: ../calendar/gui/dialogs/comp-editor.c:1084
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3401 ../mail/em-folder-tree.c:2058
+#: ../composer/e-msg-composer.c:3401 ../mail/em-folder-tree.c:2052
 #: ../ui/evolution-mail-list.xml.h:29
 msgid "_Properties"
 msgstr "_Egenskaber"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:476
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1086
 #: ../composer/e-msg-composer-attachment-bar.c:473
 #: ../composer/e-msg-composer.c:3403
 msgid "_Add attachment..."
@@ -5206,7 +5173,7 @@ msgstr "_Tilføj bilag..."
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:736
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:969
+#: ../widgets/misc/e-attachment-bar.c:963
 msgid "Attachment Bar"
 msgstr "Bilagslinje"
 
@@ -5585,10 +5552,6 @@ msgstr "Opgaveliste"
 msgid "Calendar Properties"
 msgstr "Kalenderegenskaber"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:449
-msgid "New Calendar"
-msgstr "Ny kalender"
-
 #: ../calendar/gui/dialogs/calendar-setup.c:515
 msgid "Task List Properties"
 msgstr "Opgavelisteegenskaber"
@@ -5719,14 +5682,24 @@ msgid_plural "%d attached messages"
 msgstr[0] "Vedlagt besked"
 msgstr[1] "%d vedlagte beskeder"
 
+#: ../calendar/gui/dialogs/comp-editor.c:428
+#: ../calendar/gui/e-calendar-table.c:1175
+#: ../calendar/gui/e-calendar-view.c:1552 ../composer/e-msg-composer.c:2911
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1035
+#: ../mail/message-list.c:1708 ../ui/evolution-addressbook.xml.h:31
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-tasks.xml.h:21
+msgid "_Copy"
+msgstr "_Kopiér"
+
 #: ../calendar/gui/dialogs/comp-editor.c:429 ../composer/e-msg-composer.c:2912
 #: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1719
+#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1709
 msgid "_Move"
 msgstr "_Flyt"
 
 #: ../calendar/gui/dialogs/comp-editor.c:431 ../composer/e-msg-composer.c:2914
-#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1721
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1711
 msgid "Cancel _Drag"
 msgstr "Annullér _træk"
 
@@ -5741,68 +5714,59 @@ msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> Bilag"
 msgstr[1] "<b>%d</b> Bilag"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1007
-msgid "Hide Attachment _Bar"
-msgstr "_Skjlu bilagslinje"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1010
-#: ../calendar/gui/dialogs/comp-editor.c:1265
-msgid "Show Attachment _Bar"
-msgstr "_Vis bilagslinje"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1289
-msgid "Attachment Button: Press space key to toggle attachment bar"
-msgstr ""
+#: ../calendar/gui/dialogs/comp-editor.c:1249
+msgid "_Attachment Bar (drop attachments here)"
+msgstr " _Bilagslinje (læg bilag her)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1868
-#: ../calendar/gui/dialogs/comp-editor.c:1911
+#: ../calendar/gui/dialogs/comp-editor.c:1850
+#: ../calendar/gui/dialogs/comp-editor.c:1893
 msgid "Edit Appointment"
 msgstr "Redigér aftale"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1874
-#: ../calendar/gui/dialogs/comp-editor.c:1917
+#: ../calendar/gui/dialogs/comp-editor.c:1856
+#: ../calendar/gui/dialogs/comp-editor.c:1899
 #, c-format
 msgid "Meeting - %s"
 msgstr "Møde - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1876
-#: ../calendar/gui/dialogs/comp-editor.c:1919
+#: ../calendar/gui/dialogs/comp-editor.c:1858
+#: ../calendar/gui/dialogs/comp-editor.c:1901
 #, c-format
 msgid "Appointment - %s"
 msgstr "Aftale - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1880
-#: ../calendar/gui/dialogs/comp-editor.c:1923
+#: ../calendar/gui/dialogs/comp-editor.c:1862
+#: ../calendar/gui/dialogs/comp-editor.c:1905
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tildelt opgave - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1882
-#: ../calendar/gui/dialogs/comp-editor.c:1925
+#: ../calendar/gui/dialogs/comp-editor.c:1864
+#: ../calendar/gui/dialogs/comp-editor.c:1907
 #, c-format
 msgid "Task - %s"
 msgstr "Opgave - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1885
-#: ../calendar/gui/dialogs/comp-editor.c:1928
+#: ../calendar/gui/dialogs/comp-editor.c:1867
+#: ../calendar/gui/dialogs/comp-editor.c:1910
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journalopføring - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1896
-#: ../calendar/gui/dialogs/comp-editor.c:1938
+#: ../calendar/gui/dialogs/comp-editor.c:1878
+#: ../calendar/gui/dialogs/comp-editor.c:1920
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2551
-#: ../calendar/gui/dialogs/comp-editor.c:2584
-#: ../calendar/gui/dialogs/comp-editor.c:2608
+#: ../calendar/gui/dialogs/comp-editor.c:2532
+#: ../calendar/gui/dialogs/comp-editor.c:2565
+#: ../calendar/gui/dialogs/comp-editor.c:2589
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Ændringer af dette element bliver muligvis ignoreret hvis en opdatering "
 "ankommer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2632
+#: ../calendar/gui/dialogs/comp-editor.c:2613
 msgid "Unable to use current version!"
 msgstr "Kan ikke bruge nuværende version!"
 
@@ -5879,31 +5843,36 @@ msgstr "Delegér til:"
 msgid "Enter Delegate"
 msgstr "Indtast delegat"
 
-#: ../calendar/gui/dialogs/event-editor.c:141
-msgid "Appoint_ment"
-msgstr "_Aftale"
+#: ../calendar/gui/dialogs/event-editor.c:141 ../calendar/gui/print.c:2307
+msgid "Appointment"
+msgstr "Aftale"
 
 #: ../calendar/gui/dialogs/event-editor.c:150
-msgid "_Recurrence"
+#, fuzzy
+msgid "Recurrence"
 msgstr "_Genindtræffelse"
 
 #: ../calendar/gui/dialogs/event-editor.c:164
 #: ../calendar/gui/dialogs/event-editor.c:248
 #: ../calendar/gui/dialogs/event-editor.c:422
-msgid "Schedulin_g"
+#, fuzzy
+msgid "Scheduling"
 msgstr "_Tidsplanlægning"
 
 #: ../calendar/gui/dialogs/event-editor.c:174
-msgid "_Delegatees"
+#, fuzzy
+msgid "Delegatees"
 msgstr "_Delegerede"
 
 #: ../calendar/gui/dialogs/event-editor.c:178
-msgid "_Attendees"
+#, fuzzy
+msgid "Attendees"
 msgstr "D_eltagere"
 
 #: ../calendar/gui/dialogs/event-editor.c:251
 #: ../calendar/gui/dialogs/event-editor.c:425
-msgid "In_vitations"
+#, fuzzy
+msgid "Invitations"
 msgstr "_Invitationer"
 
 #: ../calendar/gui/dialogs/event-page.c:731
@@ -5994,87 +5963,89 @@ msgid "Ad_vanced send options"
 msgstr "A_vancerede afsendingsindstillinger"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:10
-msgid "Ala_rm"
-msgstr "_Alarm"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:11
 msgid "C_ustomize..."
 msgstr "_Tilpas..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/task-page.glade.h:5
 msgid "Ca_tegories..."
 msgstr "Ka_tegorier..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Cale_ndar:"
 msgstr "Kale_nder:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Classi_fication:"
 msgstr "Klassificering:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:8
 #: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:325
 #: ../calendar/gui/e-calendar-table.c:364
 msgid "Confidential"
 msgstr "Fortroligt"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:16
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Event Description"
 msgstr "Beskrivelse af begivenhed"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:17
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "Locat_ion:"
 msgstr "_Sted:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:18
+#: ../calendar/gui/dialogs/event-page.glade.h:17
 #: ../calendar/gui/dialogs/task-page.glade.h:10
 #: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:323
 #: ../calendar/gui/e-calendar-table.c:363
 msgid "Private"
 msgstr "Privat"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:19
+#: ../calendar/gui/dialogs/event-page.glade.h:18
 #: ../calendar/gui/dialogs/task-page.glade.h:11
 #: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:314
 #: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:362
 msgid "Public"
 msgstr "Offentligt"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:20
-msgid "Show time as bus_y"
+#: ../calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "Show time as _busy"
 msgstr "Vis tid som _optaget"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:21
+#: ../calendar/gui/dialogs/event-page.glade.h:20
 #: ../calendar/gui/dialogs/task-page.glade.h:13
 msgid "Su_mmary:"
 msgstr "Sa_mmendrag:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:22
+#: ../calendar/gui/dialogs/event-page.glade.h:21
 msgid "This appointment has customized alarms"
 msgstr "Denne aftale har brugertilpassede alarmer"
 
+#: ../calendar/gui/dialogs/event-page.glade.h:22
+msgid "_Alarm"
+msgstr "_Alarm"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:23
 msgid "_Description:"
 msgstr "_Beskrivelse:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:24
-#: ../calendar/gui/e-meeting-time-sel.c:645
+#: ../calendar/gui/e-meeting-time-sel.c:642
 msgid "_End time:"
 msgstr "S_luttid:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:25
-#: ../calendar/gui/e-meeting-time-sel.c:618
+#: ../calendar/gui/e-meeting-time-sel.c:615
 msgid "_Start time:"
 msgstr "_Starttid:"
 
-#: ../calendar/gui/dialogs/meeting-page.c:305
+#: ../calendar/gui/dialogs/meeting-page.c:303
 msgid "<b>Dele_gatees</b>"
 msgstr "<b>_Delegerede</b>"
 
-#: ../calendar/gui/dialogs/meeting-page.c:309
+#: ../calendar/gui/dialogs/meeting-page.c:307
 msgid "<b>From:</b>"
 msgstr "<b>Fra:</b>"
 
@@ -6083,7 +6054,7 @@ msgstr "<b>Fra:</b>"
 #. When "None" is selected we want the field to be cleared.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../calendar/gui/dialogs/meeting-page.c:315
+#: ../calendar/gui/dialogs/meeting-page.c:313
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:653
 #: ../calendar/gui/e-itip-control.c:1106 ../composer/e-msg-composer.c:2122
@@ -6100,23 +6071,24 @@ msgstr "<b>Fra:</b>"
 msgid "None"
 msgstr "Ingen"
 
-#: ../calendar/gui/dialogs/meeting-page.c:463
+#: ../calendar/gui/dialogs/meeting-page.c:461
 msgid "The organizer selected no longer has an account."
 msgstr "Den valgte organisator har ikke længere en konto."
 
-#: ../calendar/gui/dialogs/meeting-page.c:469
+#: ../calendar/gui/dialogs/meeting-page.c:467
 msgid "An organizer is required."
 msgstr "En organisator er påkrævet."
 
-#: ../calendar/gui/dialogs/meeting-page.c:484
+#: ../calendar/gui/dialogs/meeting-page.c:482
 msgid "At least one attendee is required."
 msgstr "Mindst en deltager er nødvendig"
 
-#: ../calendar/gui/dialogs/meeting-page.c:909
-msgid "_Add "
-msgstr "_Tilføj"
+#: ../calendar/gui/dialogs/meeting-page.c:884
+msgid "_Delegate To..."
+msgstr "_Deleger til..."
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
+#: ../calendar/gui/e-meeting-list-view.c:358
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Deltager"
@@ -6152,14 +6124,15 @@ msgid "Member"
 msgstr "Medlem"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:399
+#: ../calendar/gui/e-meeting-list-view.c:386
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "SU"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
+#: ../calendar/gui/dialogs/task-editor.c:146
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:410
+#: ../calendar/gui/e-meeting-list-view.c:394
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
 #: ../mail/message-list.etspec.h:12
 msgid "Status"
@@ -6174,8 +6147,9 @@ msgid "C_hange Organizer"
 msgstr "_Ændr organisator"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Co_ntacts..."
-msgstr "_Kontakter ..."
+#: ../calendar/gui/e-meeting-time-sel.c:428
+msgid "Con_tacts..."
+msgstr "_Kontakter..."
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 msgid "Or_ganizer:"
@@ -6388,7 +6362,7 @@ msgstr "Fuldført"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-calendar-table.c:384 ../mail/message-list.c:1018
+#: ../calendar/gui/e-calendar-table.c:384 ../mail/message-list.c:1008
 msgid "High"
 msgstr "Høj"
 
@@ -6403,14 +6377,14 @@ msgstr "I gang"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1016
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1006
 msgid "Low"
 msgstr "Lav"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-cal-model.c:920 ../calendar/gui/e-calendar-table.c:385
-#: ../mail/message-list.c:1017
+#: ../mail/message-list.c:1007
 msgid "Normal"
 msgstr "Normal"
 
@@ -6427,40 +6401,37 @@ msgid "P_ercent complete:"
 msgstr "Færdige _procenter:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:11
-msgid "Stat_us:"
-msgstr "_Status:"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 #: ../calendar/gui/e-calendar-table.c:387
 msgid "Undefined"
 msgstr "Udefineret"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "_Date completed:"
 msgstr "_Dato for fuldførelse:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:14
+#: ../calendar/gui/dialogs/task-details-page.glade.h:13
 #: ../widgets/misc/e-send-options.glade.h:31
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
+#: ../calendar/gui/dialogs/task-details-page.glade.h:14
+#, fuzzy
+msgid "_Status:"
+msgstr "_Status"
+
 #: ../calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Web Page:"
 msgstr "_Hjemmeside:"
 
-#: ../calendar/gui/dialogs/task-editor.c:137
-#: ../calendar/gui/tasks-component.c:1171
-msgid "_Task"
-msgstr "_Opgave"
-
-#: ../calendar/gui/dialogs/task-editor.c:146
-msgid "_Status"
-msgstr "_Status"
+#: ../calendar/gui/dialogs/task-editor.c:137 ../calendar/gui/print.c:2309
+msgid "Task"
+msgstr "Opgave"
 
 #: ../calendar/gui/dialogs/task-editor.c:161
 #: ../calendar/gui/dialogs/task-editor.c:223
 #: ../calendar/gui/dialogs/task-editor.c:380
-msgid "Assig_nment"
+#, fuzzy
+msgid "Assignment"
 msgstr "_Tildeling"
 
 #: ../calendar/gui/dialogs/task-page.c:529
@@ -6472,10 +6443,6 @@ msgstr "Forfaldsdatoen er forkert"
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan ikke åbne opgaver i \"%s\"."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:5
-msgid "Categor_ies..."
-msgstr "Ka_tegorier ..."
-
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "D_escription:"
 msgstr "_Beskrivelse:"
@@ -6683,7 +6650,7 @@ msgstr "Ledig"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
 #: ../calendar/gui/e-calendar-table.c:437
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Busy"
 msgstr "Optaget"
 
@@ -6722,7 +6689,7 @@ msgstr "Nej"
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1652
 #: ../plugins/plugin-manager/plugin-manager.c:72
-#: ../widgets/misc/e-attachment-bar.c:665
+#: ../widgets/misc/e-attachment-bar.c:659
 #: ../widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "Ukendt"
@@ -6794,7 +6761,7 @@ msgid "Updating objects"
 msgstr "Opdaterer objekter"
 
 #: ../calendar/gui/e-calendar-table.c:1025
-#: ../calendar/gui/e-calendar-view.c:1126 ../composer/e-msg-composer.c:1243
+#: ../calendar/gui/e-calendar-view.c:1122 ../composer/e-msg-composer.c:1243
 msgid "Save as..."
 msgstr "Gem som..."
 
@@ -6803,39 +6770,39 @@ msgid "Open _Web Page"
 msgstr "Åbn hjemmeside"
 
 #: ../calendar/gui/e-calendar-table.c:1169
-#: ../calendar/gui/e-calendar-view.c:1550 ../mail/em-folder-view.c:1045
+#: ../calendar/gui/e-calendar-view.c:1546 ../mail/em-folder-view.c:1045
 #: ../mail/em-popup.c:541 ../mail/em-popup.c:552
 msgid "_Save As..."
 msgstr "Gem _som..."
 
 #: ../calendar/gui/e-calendar-table.c:1170
-#: ../calendar/gui/e-calendar-view.c:1530
-#: ../calendar/gui/e-calendar-view.c:1551 ../mail/em-folder-view.c:1046
+#: ../calendar/gui/e-calendar-view.c:1526
+#: ../calendar/gui/e-calendar-view.c:1547 ../mail/em-folder-view.c:1046
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:120 ../ui/evolution-tasks.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:120 ../ui/evolution-tasks.xml.h:27
 msgid "_Print..."
 msgstr "S_kriv ud..."
 
 #: ../calendar/gui/e-calendar-table.c:1174
-#: ../calendar/gui/e-calendar-view.c:1555 ../ui/evolution-addressbook.xml.h:1
+#: ../calendar/gui/e-calendar-view.c:1551 ../ui/evolution-addressbook.xml.h:1
 #: ../ui/evolution-calendar.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Klip _ud"
 
 #: ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:1533
-#: ../calendar/gui/e-calendar-view.c:1557 ../ui/evolution-addressbook.xml.h:39
+#: ../calendar/gui/e-calendar-view.c:1529
+#: ../calendar/gui/e-calendar-view.c:1553 ../ui/evolution-addressbook.xml.h:38
 #: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
-#: ../ui/evolution-tasks.xml.h:28
+#: ../ui/evolution-tasks.xml.h:26
 msgid "_Paste"
 msgstr "_Indsæt"
 
-#: ../calendar/gui/e-calendar-table.c:1180 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1180 ../ui/evolution-tasks.xml.h:20
 msgid "_Assign Task"
 msgstr "_Tildel opgave"
 
-#: ../calendar/gui/e-calendar-table.c:1181 ../ui/evolution-tasks.xml.h:26
+#: ../calendar/gui/e-calendar-table.c:1181 ../ui/evolution-tasks.xml.h:24
 msgid "_Forward as iCalendar"
 msgstr "_Videresend som iCalendar"
 
@@ -6847,11 +6814,20 @@ msgstr "_Markér som fuldført"
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Markér valgte opgaver som komplette"
 
+#. FIXME: need to disable for undeletable folders
+#: ../calendar/gui/e-calendar-table.c:1187
+#: ../calendar/gui/e-calendar-view.c:1565 ../mail/em-folder-tree.c:2048
+#: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:33
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
+#: ../ui/evolution-tasks.xml.h:22
+msgid "_Delete"
+msgstr "_Slet"
+
 #: ../calendar/gui/e-calendar-table.c:1188
 msgid "_Delete Selected Tasks"
 msgstr "Sle_t valgte opgaver"
 
-#: ../calendar/gui/e-calendar-table.c:1421
+#: ../calendar/gui/e-calendar-table.c:1407
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Klik for at tilføje en opgave"
@@ -6886,78 +6862,74 @@ msgstr "Startdato"
 msgid "Task sort"
 msgstr "Opgavesortering"
 
-#: ../calendar/gui/e-calendar-view.c:1252
+#: ../calendar/gui/e-calendar-view.c:1248
 msgid "Moving items"
 msgstr "Flytter elementer"
 
-#: ../calendar/gui/e-calendar-view.c:1254
+#: ../calendar/gui/e-calendar-view.c:1250
 msgid "Copying items"
 msgstr "Kopierer elementer"
 
-#: ../calendar/gui/e-calendar-view.c:1524
+#: ../calendar/gui/e-calendar-view.c:1520
 msgid "New _Appointment..."
 msgstr "Ny _aftale..."
 
-#: ../calendar/gui/e-calendar-view.c:1525
+#: ../calendar/gui/e-calendar-view.c:1521
 msgid "New All Day _Event"
 msgstr "Ny heldags_begivenhed"
 
-#: ../calendar/gui/e-calendar-view.c:1526
-msgid "New _Meeting"
-msgstr "_Nyt møde"
-
-#: ../calendar/gui/e-calendar-view.c:1527
-msgid "New _Task"
+#: ../calendar/gui/e-calendar-view.c:1523
+#, fuzzy
+msgid "New Task"
 msgstr "_Ny opgave"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1537
-#: ../widgets/menus/gal-view-menus.c:291
-msgid "_Current View"
-msgstr "_Aktuel visning"
+#: ../calendar/gui/e-calendar-view.c:1533
+msgid "Current View"
+msgstr "Aktuel oversigt"
 
-#: ../calendar/gui/e-calendar-view.c:1539
-msgid "Select T_oday"
+#: ../calendar/gui/e-calendar-view.c:1535 ../ui/evolution-calendar.xml.h:26
+msgid "Select _Today"
 msgstr "Vælg _dagen i dag"
 
-#: ../calendar/gui/e-calendar-view.c:1540
+#: ../calendar/gui/e-calendar-view.c:1536
 msgid "_Select Date..."
 msgstr "_Vælg dato..."
 
 #. TODO: Why is this in a context menu when it applies globally?
-#: ../calendar/gui/e-calendar-view.c:1545 ../ui/evolution-calendar.xml.h:45
+#: ../calendar/gui/e-calendar-view.c:1541 ../ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Udgiv ledig/optaget-information"
 
-#: ../calendar/gui/e-calendar-view.c:1561
+#: ../calendar/gui/e-calendar-view.c:1557
 msgid "Cop_y to Calendar..."
 msgstr "_Kopiér til kalender..."
 
-#: ../calendar/gui/e-calendar-view.c:1562
+#: ../calendar/gui/e-calendar-view.c:1558
 msgid "Mo_ve to Calendar..."
 msgstr "Fl_yt til mappe..."
 
-#: ../calendar/gui/e-calendar-view.c:1563
+#: ../calendar/gui/e-calendar-view.c:1559
 msgid "_Delegate Meeting..."
 msgstr "De_legér møde..."
 
-#: ../calendar/gui/e-calendar-view.c:1564
+#: ../calendar/gui/e-calendar-view.c:1560
 msgid "_Schedule Meeting..."
 msgstr "_Book møde..."
 
-#: ../calendar/gui/e-calendar-view.c:1565
+#: ../calendar/gui/e-calendar-view.c:1561
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1570
+#: ../calendar/gui/e-calendar-view.c:1566
 msgid "Make this Occurrence _Movable"
 msgstr "Gør denne begivenhed _flytbar"
 
-#: ../calendar/gui/e-calendar-view.c:1571
+#: ../calendar/gui/e-calendar-view.c:1567
 msgid "Delete this _Occurrence"
 msgstr "Slet denne _begivenhed"
 
-#: ../calendar/gui/e-calendar-view.c:1572
+#: ../calendar/gui/e-calendar-view.c:1568
 msgid "Delete _All Occurrences"
 msgstr "Slet _alle begivenheder"
 
@@ -7522,7 +7494,7 @@ msgstr "Behøver handling"
 
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Tentative"
 msgstr "Forsøgsvis"
 
@@ -7533,11 +7505,6 @@ msgstr "Forsøgsvis"
 msgid "Delegated"
 msgstr "Delegeret"
 
-#. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:361
-msgid "Attendee                          "
-msgstr ""
-
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
 msgid "In Process"
 msgstr "I gang"
@@ -7545,7 +7512,7 @@ msgstr "I gang"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:444
-#: ../calendar/gui/e-meeting-time-sel.c:2105
+#: ../calendar/gui/e-meeting-time-sel.c:2102
 msgid "%A, %B %d, %Y"
 msgstr "%A den %d %B, %Y"
 
@@ -7556,7 +7523,7 @@ msgstr "%A den %d %B, %Y"
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
 #: ../calendar/gui/e-meeting-time-sel-item.c:448
-#: ../calendar/gui/e-meeting-time-sel.c:2138 ../e-util/e-time-utils.c:203
+#: ../calendar/gui/e-meeting-time-sel.c:2135 ../e-util/e-time-utils.c:203
 #: ../e-util/e-time-utils.c:296 ../e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m-%Y"
@@ -7572,59 +7539,55 @@ msgstr "%a %d/%m-%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m-%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:416 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Fraværende"
 
-#: ../calendar/gui/e-meeting-time-sel.c:417
+#: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "No Information"
 msgstr "Ingen information"
 
-#: ../calendar/gui/e-meeting-time-sel.c:431
-msgid "Con_tacts..."
-msgstr "_Kontakter..."
-
-#: ../calendar/gui/e-meeting-time-sel.c:448
+#: ../calendar/gui/e-meeting-time-sel.c:445
 msgid "O_ptions"
 msgstr "_Valgmuligheder"
 
-#: ../calendar/gui/e-meeting-time-sel.c:465
+#: ../calendar/gui/e-meeting-time-sel.c:462
 msgid "Show _only working hours"
 msgstr "Vis _kun arbejdstid"
 
-#: ../calendar/gui/e-meeting-time-sel.c:475
+#: ../calendar/gui/e-meeting-time-sel.c:472
 msgid "Show _zoomed out"
 msgstr "Vis _zoomet ud"
 
-#: ../calendar/gui/e-meeting-time-sel.c:490
+#: ../calendar/gui/e-meeting-time-sel.c:487
 msgid "_Update free/busy"
 msgstr "_Opdatér ledig/optaget"
 
-#: ../calendar/gui/e-meeting-time-sel.c:505
+#: ../calendar/gui/e-meeting-time-sel.c:502
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:523
+#: ../calendar/gui/e-meeting-time-sel.c:520
 msgid "_Autopick"
 msgstr "_Autovælg"
 
-#: ../calendar/gui/e-meeting-time-sel.c:538
+#: ../calendar/gui/e-meeting-time-sel.c:535
 msgid ">_>"
 msgstr "_>>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:555
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "_All people and resources"
 msgstr "_Alle mennesker og ressourcer"
 
-#: ../calendar/gui/e-meeting-time-sel.c:564
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "All _people and one resource"
 msgstr "Alle _mennesker og en ressource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:573
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "_Required people"
 msgstr "_Obligatoriske mennesker"
 
-#: ../calendar/gui/e-meeting-time-sel.c:582
+#: ../calendar/gui/e-meeting-time-sel.c:579
 msgid "Required people and _one resource"
 msgstr "Obligatoriske mennesker og _en ressource"
 
@@ -7633,7 +7596,7 @@ msgstr "Obligatoriske mennesker og _en ressource"
 msgid "Enter the password for %s"
 msgstr "Indtast adgangskode for %s"
 
-#: ../calendar/gui/e-tasks.c:824 ../calendar/gui/gnome-cal.c:2551
+#: ../calendar/gui/e-tasks.c:820 ../calendar/gui/gnome-cal.c:2551
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7642,24 +7605,24 @@ msgstr ""
 "Fejl ved %s:\n"
 " %s"
 
-#: ../calendar/gui/e-tasks.c:872
+#: ../calendar/gui/e-tasks.c:868
 msgid "Loading tasks"
 msgstr "Indlæser opgaver"
 
-#: ../calendar/gui/e-tasks.c:956
+#: ../calendar/gui/e-tasks.c:952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Åbner lager %s"
 
-#: ../calendar/gui/e-tasks.c:1201
+#: ../calendar/gui/e-tasks.c:1151
 msgid "Completing tasks..."
 msgstr "Færdiggør opgaver..."
 
-#: ../calendar/gui/e-tasks.c:1224
+#: ../calendar/gui/e-tasks.c:1174
 msgid "Deleting selected objects..."
 msgstr "Fjerner markerede objekter..."
 
-#: ../calendar/gui/e-tasks.c:1251
+#: ../calendar/gui/e-tasks.c:1201
 msgid "Expunging"
 msgstr "Fjerner"
 
@@ -7678,17 +7641,20 @@ msgstr "%d %B"
 msgid "Updating query"
 msgstr "Opdaterer forespørgsel"
 
-#: ../calendar/gui/gnome-cal.c:2228
-msgid "_Custom View"
-msgstr "_Brugertilpasset oversigt"
+#. bonobo displays this string so it must be in locale
+#: ../calendar/gui/gnome-cal.c:2228 ../widgets/menus/gal-view-instance.c:585
+#: ../widgets/menus/gal-view-menus.c:350
+msgid "Custom View"
+msgstr "Brugertilpasset oversigt"
 
-#: ../calendar/gui/gnome-cal.c:2229
-msgid "_Save Custom View"
-msgstr "_Gem brugertilpasset oversigt"
+#: ../calendar/gui/gnome-cal.c:2229 ../widgets/menus/gal-view-instance.c:586
+msgid "Save Custom View"
+msgstr "Gem brugertilpasset oversigt"
 
-#: ../calendar/gui/gnome-cal.c:2234
-msgid "_Define Views..."
-msgstr "_Definér oversigter ..."
+#: ../calendar/gui/gnome-cal.c:2234 ../widgets/menus/gal-view-instance.c:590
+#: ../widgets/menus/gal-view-menus.c:372
+msgid "Define Views..."
+msgstr "Definér oversigter..."
 
 #: ../calendar/gui/gnome-cal.c:2397
 #, c-format
@@ -8045,14 +8011,6 @@ msgstr "Valgt måned (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Valgt år (%Y)"
 
-#: ../calendar/gui/print.c:2307
-msgid "Appointment"
-msgstr "Aftale"
-
-#: ../calendar/gui/print.c:2309
-msgid "Task"
-msgstr "Opgave"
-
 #: ../calendar/gui/print.c:2329
 #, c-format
 msgid "Summary: %s"
@@ -8102,7 +8060,8 @@ msgid "Print Item"
 msgstr "Udskriv element"
 
 #: ../calendar/gui/tasks-component.c:439
-msgid "_New Task List"
+#, fuzzy
+msgid "New Task List"
 msgstr "_Ny opgaveliste"
 
 #: ../calendar/gui/tasks-component.c:515
@@ -8141,6 +8100,10 @@ msgstr "Opgavekilde-vælger"
 msgid "New task"
 msgstr "Nyt gøremål"
 
+#: ../calendar/gui/tasks-component.c:1171
+msgid "_Task"
+msgstr "_Opgave"
+
 #: ../calendar/gui/tasks-component.c:1172
 msgid "Create a new task"
 msgstr "Opret en ny opgave"
@@ -8169,7 +8132,7 @@ msgstr "_Opgaveliste"
 msgid "Create a new task list"
 msgstr "Opret en ny opgaveliste"
 
-#: ../calendar/gui/tasks-control.c:429
+#: ../calendar/gui/tasks-control.c:419
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8181,11 +8144,11 @@ msgstr ""
 "\n"
 "Vil du virkelig fjerne disse opgaver?"
 
-#: ../calendar/gui/tasks-control.c:432
+#: ../calendar/gui/tasks-control.c:422
 msgid "Do not ask me again."
 msgstr "Spørg mig ikke igen."
 
-#: ../calendar/gui/tasks-control.c:466
+#: ../calendar/gui/tasks-control.c:456
 msgid "Print Tasks"
 msgstr "Udskriv opgaver"
 
@@ -9899,7 +9862,7 @@ msgstr "Skriv en besked"
 msgid "_Attachment Bar"
 msgstr "_Bilagslinje"
 
-#: ../composer/e-msg-composer.c:4722
+#: ../composer/e-msg-composer.c:4720
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10043,6 +10006,10 @@ msgstr "Du kan ikke vedlægge filen \"{0}\" til denne besked."
 msgid "You need to configure an account before you can compose mail."
 msgstr "Du skal konfigurere en konto inden du kan skrive e-post."
 
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Discard Changes"
+msgstr "_Forkast ændringer"
+
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Save Message"
 msgstr "_Gem besked"
@@ -10715,11 +10682,11 @@ msgstr "Modtagelsesmuligheder"
 msgid "Checking for New Mail"
 msgstr "Kontrollerer om der er ny e-post"
 
-#: ../mail/em-account-editor.c:2662 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2661 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Kontoredigeringsværktøj"
 
-#: ../mail/em-account-editor.c:2662 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2661 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
@@ -11120,12 +11087,12 @@ msgstr "Flytter mappen %s"
 msgid "Copying folder %s"
 msgstr "Kopierer mappen %s"
 
-#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1623
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1613
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter beskeder til mappen %s"
 
-#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1625
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1615
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer beskeder til mappen %s"
@@ -11147,39 +11114,34 @@ msgstr "_Flyt til mappe"
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i \"%s\""
 
-#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:44
+#: ../mail/em-folder-tree.c:2036 ../ui/evolution-addressbook.xml.h:44
 #: ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:48
 msgid "_View"
 msgstr "_Vis"
 
-#: ../mail/em-folder-tree.c:2043
+#: ../mail/em-folder-tree.c:2037
 msgid "Open in _New Window"
 msgstr "Åbn i _nyt vindue"
 
-#: ../mail/em-folder-tree.c:2047
+#: ../mail/em-folder-tree.c:2041
 msgid "_Copy..."
 msgstr "_Kopiér..."
 
-#: ../mail/em-folder-tree.c:2048
+#: ../mail/em-folder-tree.c:2042
 msgid "_Move..."
 msgstr "_Flyt..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2052
+#: ../mail/em-folder-tree.c:2046
 msgid "_New Folder..."
 msgstr "_Ny mappe..."
 
-#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:30
+#: ../mail/em-folder-tree.c:2049 ../ui/evolution-mail-list.xml.h:30
 msgid "_Rename..."
 msgstr "_Omdøb..."
 
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:119
-msgid "_Empty Trash"
-msgstr "_Tøm affaldskurven"
-
 #: ../mail/em-folder-utils.c:104
 #, c-format
 msgid "Copying `%s' to `%s'"
@@ -11247,11 +11209,11 @@ msgstr "R_edigér som ny besked..."
 msgid "U_ndelete"
 msgstr "_Fortryd sletning"
 
-#: ../mail/em-folder-view.c:1051 ../ui/evolution-addressbook.xml.h:37
+#: ../mail/em-folder-view.c:1051 ../ui/evolution-addressbook.xml.h:36
 msgid "_Move to Folder..."
 msgstr "Fl_yt til mappe..."
 
-#: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:33
+#: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "K_opiér til mappe..."
 
@@ -11364,16 +11326,16 @@ msgid "Click to mail %s"
 msgstr "Klik for at skrive til %s"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:455
+#: ../mail/em-format-html-display.c:445
 #, c-format
 msgid "Matches: %d"
 msgstr "Matcher: %d"
 
-#: ../mail/em-format-html-display.c:706 ../mail/em-format-html.c:597
+#: ../mail/em-format-html-display.c:696 ../mail/em-format-html.c:597
 msgid "Unsigned"
 msgstr "Ikke signeret"
 
-#: ../mail/em-format-html-display.c:706
+#: ../mail/em-format-html-display.c:696
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11381,11 +11343,11 @@ msgstr ""
 "Denne besked er ikke signeret. Der er ingen garanti for at denne besked er "
 "autentisk."
 
-#: ../mail/em-format-html-display.c:707 ../mail/em-format-html.c:598
+#: ../mail/em-format-html-display.c:697 ../mail/em-format-html.c:598
 msgid "Valid signature"
 msgstr "Gyldig signatur"
 
-#: ../mail/em-format-html-display.c:707
+#: ../mail/em-format-html-display.c:697
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11393,11 +11355,11 @@ msgstr ""
 "Denne besked er signeret og er gyldig, hvilket sandsynligvis betyder at "
 "denne besked er autentisk."
 
-#: ../mail/em-format-html-display.c:708 ../mail/em-format-html.c:599
+#: ../mail/em-format-html-display.c:698 ../mail/em-format-html.c:599
 msgid "Invalid signature"
 msgstr "Ugyldig signatur"
 
-#: ../mail/em-format-html-display.c:708
+#: ../mail/em-format-html-display.c:698
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11405,11 +11367,11 @@ msgstr ""
 "Signaturen for denne besked kan ikke verificeres. Den kan være ændret under "
 "overføringen."
 
-#: ../mail/em-format-html-display.c:709
+#: ../mail/em-format-html-display.c:699
 msgid "Valid signature, cannot verify sender"
 msgstr "Gyldig signatur. Kan ikke verificere afsenderen"
 
-#: ../mail/em-format-html-display.c:709
+#: ../mail/em-format-html-display.c:699
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11417,11 +11379,11 @@ msgstr ""
 "Denne besked er signeret med en gyldig signatur, men afsenderen af beskeden "
 "kan ikke verificeres."
 
-#: ../mail/em-format-html-display.c:715 ../mail/em-format-html.c:606
+#: ../mail/em-format-html-display.c:705 ../mail/em-format-html.c:606
 msgid "Unencrypted"
 msgstr "Ikke krypteret"
 
-#: ../mail/em-format-html-display.c:715
+#: ../mail/em-format-html-display.c:705
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -11429,11 +11391,11 @@ msgstr ""
 "Denne besked er ikke krypteret. Indholdet af beskeden bliver måske set ved "
 "overføring over internettet."
 
-#: ../mail/em-format-html-display.c:716 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:706 ../mail/em-format-html.c:607
 msgid "Encrypted, weak"
 msgstr "Krypteret, svag"
 
-#: ../mail/em-format-html-display.c:716
+#: ../mail/em-format-html-display.c:706
 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 "
@@ -11443,11 +11405,11 @@ msgstr ""
 "vanskeligt, men ikke umuligt i praksis for en udenforstående at se indholdet "
 "i beskeden."
 
-#: ../mail/em-format-html-display.c:717 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:707 ../mail/em-format-html.c:608
 msgid "Encrypted"
 msgstr "Krypteret"
 
-#: ../mail/em-format-html-display.c:717
+#: ../mail/em-format-html-display.c:707
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11455,11 +11417,11 @@ msgstr ""
 "Denne besked er krypteret. Det vil være vanskeligt for en udenforstående at "
 "se indholdet i beskeden."
 
-#: ../mail/em-format-html-display.c:718 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:708 ../mail/em-format-html.c:609
 msgid "Encrypted, strong"
 msgstr "Krypteret, stærk"
 
-#: ../mail/em-format-html-display.c:718
+#: ../mail/em-format-html-display.c:708
 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 "
@@ -11468,71 +11430,71 @@ msgstr ""
 "Denne besked er krypteret med en stærk algoritme. Det vil være meget "
 "vanskeligt for en udenforstående at se indholdet i beskeden i praksis."
 
-#: ../mail/em-format-html-display.c:819 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:809 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Vis certifikatet"
 
-#: ../mail/em-format-html-display.c:834
+#: ../mail/em-format-html-display.c:824
 msgid "This certificate is not viewable"
 msgstr "Dette certifikat kan ikke vises"
 
-#: ../mail/em-format-html-display.c:1116
+#: ../mail/em-format-html-display.c:1106
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Færdig den %d. %B %Y %H:%M"
 
-#: ../mail/em-format-html-display.c:1124
+#: ../mail/em-format-html-display.c:1114
 msgid "Overdue:"
 msgstr "Overskredet:"
 
-#: ../mail/em-format-html-display.c:1127
+#: ../mail/em-format-html-display.c:1117
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "den %d. %B %Y %H:%M"
 
-#: ../mail/em-format-html-display.c:1187
+#: ../mail/em-format-html-display.c:1177
 msgid "_View Inline"
 msgstr "_Vis integreret"
 
-#: ../mail/em-format-html-display.c:1188
+#: ../mail/em-format-html-display.c:1178
 msgid "_Hide"
 msgstr "_Skjul"
 
-#: ../mail/em-format-html-display.c:1189
+#: ../mail/em-format-html-display.c:1179
 msgid "_Fit to Width"
 msgstr "Tilpas til _bredde"
 
-#: ../mail/em-format-html-display.c:1190
+#: ../mail/em-format-html-display.c:1180
 msgid "Show _Original Size"
 msgstr "Vis _oprindelig størrelse"
 
-#: ../mail/em-format-html-display.c:1560
+#: ../mail/em-format-html-display.c:1550
 msgid "Attachment Button"
 msgstr "Bilagsknap"
 
-#: ../mail/em-format-html-display.c:1767
+#: ../mail/em-format-html-display.c:1757
 msgid "Select folder to save all attachments..."
 msgstr "Vælg mappe for at gemme alle bilag ..."
 
-#: ../mail/em-format-html-display.c:1806
+#: ../mail/em-format-html-display.c:1796
 msgid "Select folder to save selected attachments..."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1814
+#: ../mail/em-format-html-display.c:1804
 msgid "Save Selected..."
 msgstr "Gem det markerede ..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1881
+#: ../mail/em-format-html-display.c:1871
 #, c-format
 msgid "%d attachment"
 msgid_plural "%d attachments"
 msgstr[0] "%d-bilag"
 msgstr[1] "%d-bilag"
 
-#: ../mail/em-format-html-display.c:1945
+#: ../mail/em-format-html-display.c:1935
 msgid "No Attachment"
 msgstr "Intet bilag"
 
-#: ../mail/em-format-html-display.c:1948
+#: ../mail/em-format-html-display.c:1938
 msgid "Save All"
 msgstr "Gem alt"
 
@@ -12161,6 +12123,14 @@ msgstr "Vis slettede beskeder i beskedlisten (gennemstreget)."
 msgid "Show deleted messages in the message-list"
 msgstr "Vis slettede beskeder i beskedlisten"
 
+#: ../mail/evolution-mail.schemas.in.in.h:73
+msgid "Show the \"Preview\" pane"
+msgstr "Vis forhåndsvisningsruden"
+
+#: ../mail/evolution-mail.schemas.in.in.h:74
+msgid "Show the \"Preview\" pane."
+msgstr "Vis forhåndsvisningsruden."
+
 #: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Lydfilen der skal afspilles når ny e-post ankommer."
@@ -13512,7 +13482,6 @@ msgid "Checking for new mail"
 msgstr "Kontrollerer om der er ny e-post"
 
 #: ../mail/mail-session.c:207
-#: ../plugins/exchange-operations/exchange-config-listener.c:601
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Indtast adgangskode for %s"
@@ -13538,7 +13507,7 @@ msgstr "Indtast et navn for denne signatur."
 msgid "Name:"
 msgstr "Navn:"
 
-#: ../mail/mail-tools.c:115
+#: ../mail/mail-tools.c:116
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Kunne ikke oprette køkatalog \"%s\": %s"
@@ -13548,16 +13517,16 @@ msgstr "Kunne ikke oprette køkatalog \"%s\": %s"
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "Prøver at bruge movemail på en kilde som ikke er i mbox-format \"%s\""
 
-#: ../mail/mail-tools.c:249
+#: ../mail/mail-tools.c:242
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Videresendt besked - %s"
 
-#: ../mail/mail-tools.c:251
+#: ../mail/mail-tools.c:244
 msgid "Forwarded message"
 msgstr "Videresendt besked"
 
-#: ../mail/mail-tools.c:291
+#: ../mail/mail-tools.c:284
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Ugyldig mappe: \"%s\""
@@ -14107,6 +14076,10 @@ msgstr "_Tilføj"
 msgid "_Discard changes"
 msgstr "_Forkast ændringer"
 
+#: ../mail/mail.error.xml.h:119
+msgid "_Empty Trash"
+msgstr "_Tøm affaldskurven"
+
 #: ../mail/mail.error.xml.h:120
 msgid "_Expunge"
 msgstr "_Tøm"
@@ -14115,74 +14088,74 @@ msgstr "_Tøm"
 msgid "_Open Messages"
 msgstr "_Åbn beskeder"
 
-#: ../mail/message-list.c:1006
+#: ../mail/message-list.c:996
 msgid "Unseen"
 msgstr "Ulæst"
 
-#: ../mail/message-list.c:1007
+#: ../mail/message-list.c:997
 msgid "Seen"
 msgstr "Læst"
 
-#: ../mail/message-list.c:1008
+#: ../mail/message-list.c:998
 msgid "Answered"
 msgstr "Besvaret"
 
-#: ../mail/message-list.c:1009
+#: ../mail/message-list.c:999
 msgid "Multiple Unseen Messages"
 msgstr "Flere ulæste beskeder"
 
-#: ../mail/message-list.c:1010
+#: ../mail/message-list.c:1000
 msgid "Multiple Messages"
 msgstr "Flere beskeder"
 
-#: ../mail/message-list.c:1014
+#: ../mail/message-list.c:1004
 msgid "Lowest"
 msgstr "Lavest"
 
-#: ../mail/message-list.c:1015
+#: ../mail/message-list.c:1005
 msgid "Lower"
 msgstr "Lavere"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1009
 msgid "Higher"
 msgstr "Højere"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1010
 msgid "Highest"
 msgstr "Højest"
 
-#: ../mail/message-list.c:1348 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1338 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1355 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1345 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "I dag %H:%M"
 
-#: ../mail/message-list.c:1364 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1354 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "I går %H:%M"
 
-#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1366 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: ../mail/message-list.c:1384 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1374 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H:%M"
 
-#: ../mail/message-list.c:1386 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2052
+#: ../mail/message-list.c:2042
 msgid "Message List"
 msgstr "Beskedliste"
 
-#: ../mail/message-list.c:3397
+#: ../mail/message-list.c:3387
 msgid "Generating message list"
 msgstr "Genererer beskedliste"
 
@@ -14341,26 +14314,26 @@ msgstr "Tag en sikkerhedskopi og genopret Evolutions data og indstillinger"
 msgid "Restore Settings..."
 msgstr "Genopret indstillinger..."
 
-#: ../plugins/bbdb/bbdb.c:410
+#: ../plugins/bbdb/bbdb.c:404
 msgid "Automatic Contacts"
 msgstr "Automatiske kontakter"
 
-#: ../plugins/bbdb/bbdb.c:419
+#: ../plugins/bbdb/bbdb.c:413
 msgid "<span weight=\"bold\">Automatic Contacts</span>"
 msgstr "<span weight=\"bold\">Automatiske Kontakter</span>"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:432
+#: ../plugins/bbdb/bbdb.c:426
 msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
 msgstr "Opretter automatisk poster i adressebogen ved besvarelse af e-post"
 
-#: ../plugins/bbdb/bbdb.c:450
+#: ../plugins/bbdb/bbdb.c:444
 msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
 msgstr "<span weight=\"bold\">Kvikbesked-kontakter</span>"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:463
+#: ../plugins/bbdb/bbdb.c:457
 msgid ""
 "Periodically synchronize contact information and images from my _instant "
 "messenger"
@@ -14369,7 +14342,7 @@ msgstr ""
 "program"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:470
+#: ../plugins/bbdb/bbdb.c:464
 msgid "Synchronize with _buddy list now"
 msgstr "Synkronisér med venneliste nu"
 
@@ -14618,13 +14591,6 @@ msgstr "Godkendelsestype"
 msgid "Ch_eck for Supported Types"
 msgstr "_Søg efter understøttede typer"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:192
-#: ../plugins/exchange-operations/exchange-contacts.c:162
-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.
 #.
@@ -14785,31 +14751,26 @@ msgstr "_Mappenavn:"
 msgid "Folder Size"
 msgstr "Mappe"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:180
-#, fuzzy
-msgid "Subscribe to Other User's"
-msgstr "Åbn en anden brugers mappe"
-
 #: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
 #, fuzzy
 msgid "Exchange Folder Tree"
 msgstr "E-post-mappe-træ"
 
-#: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:227
-#: ../plugins/exchange-operations/exchange-folder.c:237
+#: ../plugins/exchange-operations/exchange-folder.c:62
+#: ../plugins/exchange-operations/exchange-folder.c:223
+#: ../plugins/exchange-operations/exchange-folder.c:233
 #, fuzzy
 msgid "Unsubscribe Folder..."
 msgstr "Afmeld mapper..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:464
-#: ../plugins/exchange-operations/exchange-folder.c:524
+#: ../plugins/exchange-operations/exchange-folder.c:460
+#: ../plugins/exchange-operations/exchange-folder.c:520
 #, fuzzy, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Opsiger abonnement på mappe \"%s\""
 
-#: ../plugins/exchange-operations/exchange-folder.c:476
-#: ../plugins/exchange-operations/exchange-folder.c:536
+#: ../plugins/exchange-operations/exchange-folder.c:472
+#: ../plugins/exchange-operations/exchange-folder.c:532
 #, fuzzy, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Opsiger abonnement på mappe \"%s\""
@@ -15424,7 +15385,7 @@ msgstr "Indlogning"
 
 #: ../plugins/groupwise-features/proxy-login.c:219
 #: ../plugins/groupwise-features/proxy-login.c:261
-#: ../plugins/groupwise-features/proxy.c:497
+#: ../plugins/groupwise-features/proxy.c:499
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -15435,7 +15396,7 @@ msgstr "%sIndtast adgangskode for %s (bruger %s)"
 msgid "_Proxy Login..."
 msgstr "S_kriv ud..."
 
-#: ../plugins/groupwise-features/proxy.c:679
+#: ../plugins/groupwise-features/proxy.c:680
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 
@@ -16276,7 +16237,7 @@ msgid "Gives an option to print mail from composer"
 msgstr "Giver mulighed for at udskrive e-post fra skrivevinduet"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:18 ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
 #: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Vis _udskrift"
@@ -16757,28 +16718,28 @@ msgstr "Mappenavn kan ikke indeholde følgende tegn \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' og '..' er reserverede mappenavne."
 
-#: ../shell/e-shell-window-commands.c:71
+#: ../shell/e-shell-window-commands.c:70
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "GNOME pilotværktøjerne ser ikke ud til at være installeret på dette system."
 
-#: ../shell/e-shell-window-commands.c:79
+#: ../shell/e-shell-window-commands.c:78
 #, c-format
 msgid "Error executing %s."
 msgstr "Fejl ved kørsel af %s."
 
-#: ../shell/e-shell-window-commands.c:128
+#: ../shell/e-shell-window-commands.c:127
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy er ikke installeret."
 
-#: ../shell/e-shell-window-commands.c:136
+#: ../shell/e-shell-window-commands.c:135
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy kunne ikke køres."
 
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
 #. * about box
-#: ../shell/e-shell-window-commands.c:533
+#: ../shell/e-shell-window-commands.c:532
 msgid "translator-credits"
 msgstr ""
 "Anna Jonna Armannsdottir\n"
@@ -16793,19 +16754,19 @@ msgstr ""
 "Dansk-gruppen <dansk@dansk-gruppen.dk>\n"
 "Mere info: http://www.dansk-gruppen.dk"
 
-#: ../shell/e-shell-window-commands.c:547
+#: ../shell/e-shell-window-commands.c:546
 msgid "Groupware Suite"
 msgstr "Samarbejdsprogrammelsuite"
 
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:774
 msgid "_Work Online"
 msgstr "_Arbejd tilkoblet"
 
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:52
+#: ../shell/e-shell-window-commands.c:787 ../ui/evolution.xml.h:50
 msgid "_Work Offline"
 msgstr "Ar_bejd afkoblet"
 
-#: ../shell/e-shell-window-commands.c:801
+#: ../shell/e-shell-window-commands.c:800
 msgid "Work Offline"
 msgstr "Arbejd afkoblet"
 
@@ -16821,7 +16782,7 @@ msgstr "Evolution er i færd med at koble fra."
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr "Evolution er afkoblet. Klik på denne knap for at arbejde tilkoblet."
 
-#: ../shell/e-shell-window.c:735
+#: ../shell/e-shell-window.c:724
 #, c-format
 msgid "Switch to %s"
 msgstr "Skift til %s"
@@ -17670,102 +17631,101 @@ msgstr "Kunne ikke udføre '%s': %s\n"
 msgid "Shutting down %s (%s)\n"
 msgstr "Lukker %s (%s) ned\n"
 
-#: ../ui/evolution-addressbook.xml.h:2
-#, fuzzy
-msgid "Contact _Preview"
-msgstr "Test af udskrivning af kontakt"
-
-#: ../ui/evolution-addressbook.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:3
 #, fuzzy
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "Kopiér kontakter til en anden mappe..."
 
-#: ../ui/evolution-addressbook.xml.h:5 ../ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:4 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Kopier udvalget"
 
-#: ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-addressbook.xml.h:5
 msgid "Copy to Folder..."
 msgstr "Kopiér til mappe..."
 
-#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Klip udvalget ud"
 
-#: ../ui/evolution-addressbook.xml.h:10
+#: ../ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Slet valgte kontakter"
 
-#: ../ui/evolution-addressbook.xml.h:12
+#: ../ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Move Selected Contacts to Another Folder..."
 msgstr "Flyt kontakter til en anden mappe..."
 
-#: ../ui/evolution-addressbook.xml.h:13
+#: ../ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr "Flyt til mappe..."
 
-#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
 msgstr "Indsæt fra klippebordet"
 
-#: ../ui/evolution-addressbook.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Forhåndsviser kontakterne som skal skrives ud"
 
-#: ../ui/evolution-addressbook.xml.h:19
+#: ../ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Udskriv valgte kontakter"
 
-#: ../ui/evolution-addressbook.xml.h:21
+#: ../ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Gem valgte kontakter som et VCard."
 
-#: ../ui/evolution-addressbook.xml.h:22 ../widgets/text/e-text.c:2684
+#: ../ui/evolution-addressbook.xml.h:21 ../widgets/text/e-text.c:2684
 msgid "Select All"
 msgstr "Vælg alt"
 
-#: ../ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Vælg alle kontakter"
 
-#: ../ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-addressbook.xml.h:23
 msgid "Send a message to the selected contacts."
 msgstr "Send en besked til de valgte kontakter."
 
-#: ../ui/evolution-addressbook.xml.h:25
+#: ../ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Send besked til kontakt"
 
-#: ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Send valgte kontakter til en anden person."
 
-#: ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-addressbook.xml.h:26
 msgid "Show contact preview window"
 msgstr "Vis vinduet for forhåndsvisning af kontakt"
 
-#: ../ui/evolution-addressbook.xml.h:28
+#: ../ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Stop"
 
-#: ../ui/evolution-addressbook.xml.h:29
+#: ../ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Stop indlæsning"
 
-#: ../ui/evolution-addressbook.xml.h:30
+#: ../ui/evolution-addressbook.xml.h:29
 msgid "View the current contact"
 msgstr "Vis den aktuelle kontakt"
 
-#: ../ui/evolution-addressbook.xml.h:31 ../ui/evolution-calendar.xml.h:38
-#: ../ui/evolution-tasks.xml.h:21
+#: ../ui/evolution-addressbook.xml.h:30 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-tasks.xml.h:19
 msgid "_Actions"
 msgstr "H_andlinger"
 
-#: ../ui/evolution-addressbook.xml.h:36
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "_Forward Contact..."
 msgstr "_Videresend kontakt..."
 
+#: ../ui/evolution-addressbook.xml.h:39
+msgid "_Preview Pane"
+msgstr "_Forhåndsvisningsvindue"
+
 #: ../ui/evolution-addressbook.xml.h:41
 msgid "_Save as VCard..."
 msgstr "_Gem som VCard..."
@@ -17850,10 +17810,6 @@ msgstr "Fjern gamle aftaler og møder"
 msgid "Select _Date"
 msgstr "Vælg _dato"
 
-#: ../ui/evolution-calendar.xml.h:26
-msgid "Select _Today"
-msgstr "Vælg _dagen i dag"
-
 #: ../ui/evolution-calendar.xml.h:27
 msgid "Select a specific date"
 msgstr "Vælg en specifik dato"
@@ -18049,7 +18005,7 @@ msgstr "Skjul slettede beskeder i stedet for at vise dem gennemstreget"
 
 #: ../ui/evolution-mail-list.xml.h:13
 #, fuzzy
-msgid "Mar_k Messages as Read"
+msgid "Mark Me_ssages as Read"
 msgstr "Markér _beskeder som værende læst"
 
 #: ../ui/evolution-mail-list.xml.h:14 ../ui/evolution-mail-message.xml.h:69
@@ -18555,7 +18511,7 @@ msgstr "L_uk"
 #: ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:45
 #: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:37
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Fil"
 
@@ -18838,20 +18794,10 @@ msgid "Print the list of tasks"
 msgstr "Udskriv listen med opgaver"
 
 #: ../ui/evolution-tasks.xml.h:18
-#, fuzzy
-msgid "Show task preview window"
-msgstr "Vis vinduet for forhåndsvisning af kontakt"
-
-#: ../ui/evolution-tasks.xml.h:19
-#, fuzzy
-msgid "Task _Preview"
-msgstr "Forhåndsvisning af besked"
-
-#: ../ui/evolution-tasks.xml.h:20
 msgid "View the selected task"
 msgstr "Vis den valgte opgave"
 
-#: ../ui/evolution-tasks.xml.h:27
+#: ../ui/evolution-tasks.xml.h:25
 msgid "_Open Task"
 msgstr "_Åbn opgave"
 
@@ -18965,67 +18911,58 @@ msgid "Tool_bar style"
 msgstr "Værktøjs_linje-stil"
 
 #: ../ui/evolution.xml.h:33
-msgid "View/Hide the Status Bar"
-msgstr ""
-
-#: ../ui/evolution.xml.h:34
 msgid "_About Evolution..."
 msgstr "_Om Evolution..."
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:34
 msgid "_Close Window"
 msgstr "_Luk vindue"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:37
 msgid "_Help"
 msgstr "_Hjælp"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:38
 msgid "_Hide buttons"
 msgstr "_Skjul knapper"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:39
 msgid "_Icons only"
 msgstr "Kun _ikoner"
 
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:40
 msgid "_Import..."
 msgstr "_Importér..."
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:41
 msgid "_New"
 msgstr "_Ny"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:42
 msgid "_Quick Reference"
 msgstr "_Kvikreference"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:43
 msgid "_Quit"
 msgstr "_Afslut"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:44
 msgid "_Send / Receive"
 msgstr "_Send / modtag"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:45
 msgid "_Switcher Appearance"
 msgstr "_Vælger-udseende"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:46
 msgid "_Synchronization Options..."
 msgstr "_Synkroniserings-indstillinger..."
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:47
 msgid "_Text only"
 msgstr "Kun _tekst"
 
-#: ../ui/evolution.xml.h:50
-#, fuzzy
-msgid "_View Status Bar"
-msgstr "Sæt status"
-
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:49
 msgid "_Window"
 msgstr "_Vindue"
 
@@ -19178,20 +19115,9 @@ msgstr "Opret et nyt testelement"
 msgid "_Replace existing view"
 msgstr ""
 
-#. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:585
-#: ../widgets/menus/gal-view-menus.c:350
-msgid "Custom View"
-msgstr "Brugertilpasset oversigt"
-
-#: ../widgets/menus/gal-view-instance.c:586
-msgid "Save Custom View"
-msgstr "Gem brugertilpasset oversigt"
-
-#: ../widgets/menus/gal-view-instance.c:590
-#: ../widgets/menus/gal-view-menus.c:372
-msgid "Define Views..."
-msgstr "Definér oversigter..."
+#: ../widgets/menus/gal-view-menus.c:291
+msgid "_Current View"
+msgstr "_Aktuel visning"
 
 #: ../widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View..."
@@ -19555,41 +19481,41 @@ msgstr "Kolonnebredde"
 
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:346
+#: ../widgets/misc/e-search-bar.c:345
 msgid "Search Text Entry"
 msgstr "Indtastningsfelt for søgetekst"
 
-#: ../widgets/misc/e-search-bar.c:550
+#: ../widgets/misc/e-search-bar.c:549
 msgid "_Search"
 msgstr "_Søg"
 
-#: ../widgets/misc/e-search-bar.c:556
+#: ../widgets/misc/e-search-bar.c:555
 msgid "_Find Now"
 msgstr "_Søg nu"
 
-#: ../widgets/misc/e-search-bar.c:557 ../widgets/misc/e-search-bar.c:944
+#: ../widgets/misc/e-search-bar.c:556 ../widgets/misc/e-search-bar.c:943
 msgid "_Clear"
 msgstr "_Tøm"
 
-#: ../widgets/misc/e-search-bar.c:648
+#: ../widgets/misc/e-search-bar.c:647
 msgid "Search Type"
 msgstr "Søgetype"
 
-#: ../widgets/misc/e-search-bar.c:852
+#: ../widgets/misc/e-search-bar.c:851
 msgid "Item ID"
 msgstr "Objekt-ID"
 
-#: ../widgets/misc/e-search-bar.c:859
+#: ../widgets/misc/e-search-bar.c:858
 msgid "Subitem ID"
 msgstr "Underobjekt-ID"
 
-#: ../widgets/misc/e-search-bar.c:866 ../widgets/text/e-entry.c:1249
+#: ../widgets/misc/e-search-bar.c:865 ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3462
 #: ../widgets/text/e-text.c:3463
 msgid "Text"
 msgstr "Tekst"
 
-#: ../widgets/misc/e-search-bar.c:946
+#: ../widgets/misc/e-search-bar.c:945
 msgid "Find _Now"
 msgstr "Find _nu"
 
@@ -20315,20 +20241,67 @@ msgstr "IM-kontekst"
 msgid "Handle Popup"
 msgstr "Håndtagspopop"
 
-#~ msgid "Discard Changes"
-#~ msgstr "Forkast ændringer"
+#~ msgid "_New Calendar"
+#~ msgstr "_Ny kalender"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Egenskaber ..."
+
+#~ msgid "Hide Attachment _Bar"
+#~ msgstr "_Skjlu bilagslinje"
+
+#~ msgid "Show Attachment _Bar"
+#~ msgstr "_Vis bilagslinje"
 
-#~ msgid "_Attachment Bar (drop attachments here)"
-#~ msgstr " _Bilagslinje (læg bilag her)"
+#~ msgid "Appoint_ment"
+#~ msgstr "_Aftale"
 
-#~ msgid "_Alarm"
+#~ msgid "Ala_rm"
 #~ msgstr "_Alarm"
 
-#~ msgid "_Delegate To..."
-#~ msgstr "_Deleger til..."
+#~ msgid "_Add "
+#~ msgstr "_Tilføj"
+
+#~ msgid "Co_ntacts..."
+#~ msgstr "_Kontakter ..."
+
+#~ msgid "Stat_us:"
+#~ msgstr "_Status:"
+
+#~ msgid "Categor_ies..."
+#~ msgstr "Ka_tegorier ..."
 
-#~ msgid "Current View"
-#~ msgstr "Aktuel oversigt"
+#~ msgid "New _Meeting"
+#~ msgstr "_Nyt møde"
 
-#~ msgid "_Preview Pane"
-#~ msgstr "_Forhåndsvisningsvindue"
+#~ msgid "Select T_oday"
+#~ msgstr "Vælg _dagen i dag"
+
+#~ msgid "_Custom View"
+#~ msgstr "_Brugertilpasset oversigt"
+
+#~ msgid "_Save Custom View"
+#~ msgstr "_Gem brugertilpasset oversigt"
+
+#~ msgid "_Define Views..."
+#~ msgstr "_Definér oversigter ..."
+
+#, fuzzy
+#~ msgid "Subscribe to Other User's"
+#~ msgstr "Åbn en anden brugers mappe"
+
+#, fuzzy
+#~ msgid "Contact _Preview"
+#~ msgstr "Test af udskrivning af kontakt"
+
+#, fuzzy
+#~ msgid "Show task preview window"
+#~ msgstr "Vis vinduet for forhåndsvisning af kontakt"
+
+#, fuzzy
+#~ msgid "Task _Preview"
+#~ msgstr "Forhåndsvisning af besked"
+
+#, fuzzy
+#~ msgid "_View Status Bar"
+#~ msgstr "Sæt status"
diff --git a/po/es.po b/po/es.po
index 4f2bd11a43..f27c1d1984 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,5 +1,7 @@
 # Spanish translation of es
-# Translation of Evolution to Spanish language
+#
+# translation of es.po to
+# Translation of Evolution to Spanish languaje
 # Copyright © 2000-2002 Free Software Foundation, Inc.
 # This file is distributed under the same license as the evolution package.
 # Carlos Perelló Marín <carlos@gnome-db.org>, 2000-2001.
@@ -13,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-24 23:05+0100\n"
-"PO-Revision-Date: 2005-11-27 02:24+0100\n"
+"POT-Creation-Date: 2005-11-25 21:53+0100\n"
+"PO-Revision-Date: 2005-11-25 22:05+0100\n"
 "Last-Translator: Francisco Javier F. Serrador <serrador@cvs.gnome.org>\n"
 "Language-Team: Spanish <traductores@es.gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -47,6 +49,7 @@ msgstr[0] "la carpeta de libretas de direcciones actual tiene %d tarjeta"
 msgstr[1] "la carpeta de libretas de direcciones actual tiene %d tarjetas"
 
 #: ../a11y/addressbook/ea-minicard.c:31
+#: ../calendar/gui/alarm-notify/alarm-queue.c:965
 #: ../ui/evolution-message-composer.xml.h:11
 msgid "Open"
 msgstr "Abrir"
@@ -100,7 +103,7 @@ msgstr "Cita nueva"
 msgid "New All Day Event"
 msgstr "Acontecimiento nuevo para todo el día"
 
-#: ../a11y/calendar/ea-cal-view.c:308
+#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1522
 msgid "New Meeting"
 msgstr "Reunión nueva"
 
@@ -362,58 +365,47 @@ msgid "Could not remove addressbook."
 msgstr "No se pudo eliminar la libreta de direcciones."
 
 #: ../addressbook/addressbook.error.xml.h:8
-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 "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"
-
-#: ../addressbook/addressbook.error.xml.h:9
 msgid "Delete address book '{0}'?"
 msgstr "¿Quiere borrar la libreta de direcciones «{0}»?"
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Error loading addressbook."
 msgstr "Error al cargar la libreta de direcciones."
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:10
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Error al guardar {0} a {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:11
 msgid "Failed to authenticate with LDAP server."
 msgstr "Falló al autenticarse con el servidor LDAP."
 
-#: ../addressbook/addressbook.error.xml.h:13
-msgid "GroupWise Address book creation:"
-msgstr "Creación de libreta de direcciones GroupWise:"
-
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "LDAP server did not respond with valid schema information."
 msgstr "El servidor LDAP no respondió con una información del esquema válida."
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:13
 msgid "Server Version"
 msgstr "Versión del servidor"
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:14
 #: ../calendar/calendar.error.xml.h:44
 msgid "Some features may not work properly with your current server"
 msgstr ""
 "Algunas características quizá no funcionen apropiadamente con su servidor "
 "actual"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "La libreta de direcciones de Evolution ha terminado inesperadamente."
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "La imagen que ha seleccionado es grande. ¿quiere redimensionarla y "
 "almacenarla?"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:17
 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 "
@@ -423,21 +415,21 @@ msgstr ""
 "soporta esta funcionalidad o quizá esté mal configurado. Pida a su "
 "administrador de sistema las bases de búsqueda soportadas."
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "This address book will be removed permanently."
 msgstr "Esta libreta de direcciones se eliminará para siempre."
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "This addressbook could not be opened."
 msgstr "Esta libreta de direcciones no se pudo abrir."
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "This addressbook server does not have any suggested search bases."
 msgstr ""
 "Este servidor de libretas de direcciones no tiene ninguna de las bases de "
 "búsqueda sugeridas."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:21
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -446,27 +438,27 @@ msgstr ""
 "nombre del servidor podría estar mal escrito o su conexión de red quizá esté "
 "caída."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Este servidor no soporta el esquema de información LDAPv3."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "Unable to open addressbook"
 msgstr "Es imposible abrir la libreta de direcciones"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "Unable to perform search."
 msgstr "Es imposible efectuar la búsqueda."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "Unable to save {0}."
 msgstr "Es imposible guardar {0}."
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "Would you like to save your changes?"
 msgstr "¿Desea guardar los cambios?"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:27
 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?"
@@ -474,8 +466,8 @@ msgstr ""
 "Está moviendo un contacto desde una libreta a otra, pero no puede ser "
 "eliminado de la de origen. ¿Quiere guardar una copia en vez de mover?"
 
-#: ../addressbook/addressbook.error.xml.h:30
-#: ../calendar/calendar.error.xml.h:61
+#: ../addressbook/addressbook.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:59
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -485,35 +477,35 @@ msgstr ""
 "problemas usando Evolution. Para los mejores resultados el servidor debería "
 "actualizarse a una versión soportada"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:29
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "Ha hecho modificaciones a este contacto. ¿Desea guardar estos cambios?"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Sus contactos para {0} no estarán disponibles hasta que Evolution sea "
 "reiniciado."
 
-#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:495
+#: ../addressbook/addressbook.error.xml.h:31 ../mail/em-vfolder-rule.c:495
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
 msgid "_Add"
 msgstr "_Añadir"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:33
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "{0}"
 msgstr "{0}"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "{1}"
 msgstr "{1}"
 
@@ -549,7 +541,7 @@ msgstr "Configure el autocompletado aquí"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1180
+#: ../addressbook/gui/component/addressbook-view.c:1133
 #: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:388
 msgid "Contacts"
 msgstr "Contactos"
@@ -590,12 +582,10 @@ msgstr "Gestione sus certificados S/MIME aquí"
 #. On This Computer is always first and Search Folders is always last
 #: ../addressbook/gui/component/addressbook-component.c:137
 #: ../addressbook/gui/component/addressbook-migrate.c:502
-#: ../calendar/gui/calendar-component.c:208
-#: ../calendar/gui/memos-component.c:192 ../calendar/gui/migration.c:462
-#: ../calendar/gui/migration.c:555 ../calendar/gui/migration.c:1057
-#: ../calendar/gui/tasks-component.c:188 ../mail/em-folder-tree-model.c:197
-#: ../mail/em-folder-tree-model.c:199 ../mail/mail-component.c:292
-#: ../mail/mail-vfolder.c:223
+#: ../calendar/gui/calendar-component.c:208 ../calendar/gui/migration.c:462
+#: ../calendar/gui/migration.c:555 ../calendar/gui/tasks-component.c:188
+#: ../mail/em-folder-tree-model.c:197 ../mail/em-folder-tree-model.c:199
+#: ../mail/mail-component.c:292 ../mail/mail-vfolder.c:223
 msgid "On This Computer"
 msgstr "En este equipo"
 
@@ -607,12 +597,10 @@ msgstr "En este equipo"
 #: ../addressbook/gui/component/addressbook-component.c:145
 #: ../addressbook/gui/component/addressbook-migrate.c:510
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../calendar/gui/calendar-component.c:216
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:470
-#: ../calendar/gui/migration.c:563 ../calendar/gui/migration.c:1065
-#: ../calendar/gui/tasks-component.c:196 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1043 ../mail/mail-config.c:78
-#: ../mail/mail-config.glade.h:104
+#: ../calendar/gui/calendar-component.c:216 ../calendar/gui/migration.c:470
+#: ../calendar/gui/migration.c:563 ../calendar/gui/tasks-component.c:196
+#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1043
+#: ../mail/mail-config.c:78 ../mail/mail-config.glade.h:104
 msgid "Personal"
 msgstr "Privado"
 
@@ -639,7 +627,8 @@ msgid "Create a new contact list"
 msgstr "Crea una lista de contactos nueva"
 
 #: ../addressbook/gui/component/addressbook-component.c:241
-#: ../addressbook/gui/component/addressbook-config.c:1149
+#: ../addressbook/gui/component/addressbook-config.c:1118
+#: ../addressbook/gui/component/addressbook-view.c:763
 msgid "New Address Book"
 msgstr "Libreta de direcciones nueva"
 
@@ -655,67 +644,66 @@ msgstr "Crea una libreta de direcciones nueva"
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "Falló al actualizar la configuración de la libreta o las carpetas."
 
-#: ../addressbook/gui/component/addressbook-config.c:316
+#: ../addressbook/gui/component/addressbook-config.c:313
 msgid "Base"
 msgstr "Base"
 
-#: ../addressbook/gui/component/addressbook-config.c:511
+#: ../addressbook/gui/component/addressbook-config.c:508
 #: ../calendar/gui/dialogs/calendar-setup.c:192
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../addressbook/gui/component/addressbook-config.c:610
+#: ../addressbook/gui/component/addressbook-config.c:607
 msgid "Copy book content locally for offline operation"
 msgstr "Copiar el contenido del libro localmente para operación desconectada"
 
-#: ../addressbook/gui/component/addressbook-config.c:933
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/addressbook-config.c:902
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:366
+#: ../calendar/gui/dialogs/calendar-setup.c:377
 #: ../mail/em-folder-properties.c:215 ../mail/mail-config.glade.h:85
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "General"
 
-#: ../addressbook/gui/component/addressbook-config.c:934
+#: ../addressbook/gui/component/addressbook-config.c:903
 #: ../mail/importers/pine-importer.c:393
 msgid "Addressbook"
 msgstr "Libreta de direcciones"
 
-#: ../addressbook/gui/component/addressbook-config.c:938
+#: ../addressbook/gui/component/addressbook-config.c:907
 msgid "Server Information"
 msgstr "Información del servidor"
 
-#: ../addressbook/gui/component/addressbook-config.c:940
+#: ../addressbook/gui/component/addressbook-config.c:909
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: ../addressbook/gui/component/addressbook-config.c:943
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/addressbook-config.c:912
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 #: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detalles"
 
-#: ../addressbook/gui/component/addressbook-config.c:944
+#: ../addressbook/gui/component/addressbook-config.c:913
 msgid "Searching"
 msgstr "Búsqueda"
 
-#: ../addressbook/gui/component/addressbook-config.c:946
+#: ../addressbook/gui/component/addressbook-config.c:915
 msgid "Downloading"
 msgstr "Descargando"
 
-#: ../addressbook/gui/component/addressbook-config.c:1147
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/addressbook-config.c:1116
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Propiedades de la libreta de direcciones"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:72
 #: ../calendar/gui/migration.c:142 ../mail/em-migrate.c:1190
 msgid "Migrating..."
-msgstr "Migrando..."
+msgstr "Migrando…"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:124
 #: ../calendar/gui/migration.c:189 ../mail/em-migrate.c:1231
@@ -741,7 +729,7 @@ msgstr ""
 "El lugar y jerarquía de las carpetas de contactos de Evolution ha cambiado "
 "desde Evolution 1.x.\n"
 "\n"
-"Tenga paciencia mientras Evolution migra sus carpetas..."
+"Tenga paciencia mientras Evolution migra sus carpetas…"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1148
 msgid ""
@@ -751,7 +739,7 @@ msgid ""
 msgstr ""
 "El formato de los contactos de listas de correo ha cambiado.\n"
 "\n"
-"Tenga paciencia mientras Evolution migra sus carpetas..."
+"Tenga paciencia mientras Evolution migra sus carpetas…"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1157
 msgid ""
@@ -761,7 +749,7 @@ msgid ""
 msgstr ""
 "La forma en que Evolution almacena algunos números de teléfono ha cambiado.\n"
 "\n"
-"Tenga paciencia mientras Evolution migra sus carpetas..."
+"Tenga paciencia mientras Evolution migra sus carpetas…"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1167
 msgid ""
@@ -772,32 +760,24 @@ msgstr ""
 "El registro de cambios y los archivos de mapas de Palm de Evolution han "
 "cambiado.\n"
 "\n"
-"Tenga paciencia mientras Evolution migra sus datos Pilot Sync..."
+"Tenga paciencia mientras Evolution migra sus datos Pilot Sync…"
 
-#: ../addressbook/gui/component/addressbook-view.c:763
-msgid "_New Address Book"
-msgstr "Libreta de direcciones _nueva"
-
-#. FIXME: need to disable for undeletable folders
 #: ../addressbook/gui/component/addressbook-view.c:764
 #: ../addressbook/gui/widgets/e-addressbook-view.c:952
 #: ../calendar/gui/calendar-component.c:537
-#: ../calendar/gui/e-calendar-table.c:1187
-#: ../calendar/gui/e-calendar-view.c:1575 ../calendar/gui/e-memo-table.c:862
-#: ../calendar/gui/tasks-component.c:441 ../mail/em-folder-tree.c:2054
-#: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:34
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
-#: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
-msgid "_Delete"
-msgstr "_Borrar"
+#: ../calendar/gui/tasks-component.c:441 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:26 ../ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Borrar"
 
 #: ../addressbook/gui/component/addressbook-view.c:766
 #: ../calendar/gui/calendar-component.c:538
 #: ../calendar/gui/tasks-component.c:442
-msgid "_Properties..."
-msgstr "_Propiedades..."
+msgid "Properties..."
+msgstr "Propiedades…"
 
-#: ../addressbook/gui/component/addressbook-view.c:1191
+#: ../addressbook/gui/component/addressbook-view.c:1144
 msgid "Contact Source Selector"
 msgstr "Selector de origen de contactos"
 
@@ -806,12 +786,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Accediendo al servidor LDAP anónimamente"
 
 #: ../addressbook/gui/component/addressbook.c:191
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:490
 msgid "Failed to authenticate.\n"
 msgstr "Falló al autenticar.\n"
 
 #: ../addressbook/gui/component/addressbook.c:198
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:469
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Introduzca la contraseña para %s (usuario %s)"
@@ -861,7 +841,7 @@ msgstr ""
 "nombres."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 msgid "Vertical pane position"
 msgstr "Posición vertical del panel"
 
@@ -870,123 +850,126 @@ msgid "Whether to show the preview pane."
 msgstr "Indica si se muestra el panel de vista previa."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:1
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/event-page.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../mail/message-tags.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:1
+msgid "*"
+msgstr "*"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr "1"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:2
+#: ../addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:3
+#: ../addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:5
+#: ../addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:6
+#: ../addressbook/gui/component/ldap-config.glade.h:7
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Autenticación</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:7
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Display</b>"
 msgstr "<b>Pantalla</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:8
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Downloading</b>"
 msgstr "<b>Descarga</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Searching</b>"
 msgstr "<b>Búsqueda</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Server Information</b>"
 msgstr "<b>Información del servidor</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:12
 msgid "<b>Type:</b>"
 msgstr "<b>Tipo:</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add Address Book"
 msgstr "Añade una libreta de direcciones"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 #: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:759
 msgid "Always"
 msgstr "Siempre"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anónimamente"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 msgid "Basic"
 msgstr "Básico"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr "Nombre distintivo"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid "Email address"
 msgstr "Dirección de correo-e"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 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:21
+#: ../addressbook/gui/component/ldap-config.glade.h:22
 msgid "Find Possible Search Bases"
 msgstr "Buscar bases de búsqueda posibles"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "Lo_gin:"
 msgstr "_Inicio de sesión:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 #: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:758
 msgid "Never"
 msgstr "Nunca"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "Uno"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
-msgid "Search Filter"
-msgstr "Filtro de búsqueda"
-
 #: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid "Search _base:"
 msgstr "_Base de búsqueda:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:28
-msgid "Search _filter:"
-msgstr "_Filtro de búsqueda:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:29
-msgid "Search filter"
-msgstr "Filtro búsqueda"
-
-#: ../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 ""
-"Filtro de búsqueda es el tipo de los objetos buscados, mientras se realiza "
-"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
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL or TLS."
@@ -994,7 +977,7 @@ msgstr ""
 "Seleccionar esta opción significa que Evolution sólo conectará con su "
 "servidor LDAP si su servidor LDAP soporta SSL o TLS."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a insecure environment. For example, if you and your LDAP server "
@@ -1006,7 +989,7 @@ msgstr ""
 "están tras un cortafuegos en el trabajo, entonces Evolution no necesita usar "
 "SSL/TLS porque su conexión ya es segura."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 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 "
@@ -1016,15 +999,15 @@ msgstr ""
 "TLS. Esto significa que su conexión será insegura y que usted será "
 "vulnerable a fallos de seguridad. "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Sub"
 msgstr "Sub"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid "Supported Search Bases"
 msgstr "Bases de búsqueda soportadas"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 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 "
@@ -1034,7 +1017,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:37
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 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 "
@@ -1046,7 +1029,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:38
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -1054,7 +1037,7 @@ msgstr ""
 "Este es el nombre completo del servidor LDAP. Por ejemplo, «ldap.micompañia."
 "com»."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1062,7 +1045,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:40
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1072,7 +1055,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:41
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1080,7 +1063,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:42
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 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 "
@@ -1090,36 +1073,36 @@ 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:43
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid "Using distinguished name (DN)"
 msgstr "Usando «Nombre Distintivo» (ND)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid "Using email address"
 msgstr "Usando dirección de correo-e"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 #: ../mail/em-account-editor.c:301
 msgid "Whenever Possible"
 msgstr "Cuando sea posible"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid "_Add Address Book"
 msgstr "_Añadir libreta de direcciones"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "_Download limit:"
 msgstr "Límite de _descarga:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid "_Find Possible Search Bases"
 msgstr "_Buscar bases de búsqueda posibles"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "_Login method:"
 msgstr "Método de _inicio de sesión:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 #: ../calendar/gui/dialogs/calendar-setup.c:244
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:8
 #: ../mail/mail-config.glade.h:164
@@ -1127,35 +1110,33 @@ msgstr "Método de _inicio de sesión:"
 msgid "_Name:"
 msgstr "_Nombre:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Port:"
 msgstr "_Puerto:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Search scope:"
 msgstr "_Ámbito de búsqueda:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 #: ../mail/mail-config.glade.h:171
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Timeout:"
 msgstr "_Tiempo de expiración:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Use secure connection:"
 msgstr "_Usar conexión segura:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 msgid "cards"
 msgstr "tarjetas"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
-#: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/alarm-notify/util.c:66
+#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
 #: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1951
@@ -1164,30 +1145,6 @@ msgstr "tarjetas"
 msgid "minutes"
 msgstr "minutos"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../mail/message-tags.glade.h:1
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
-#: ../plugins/groupwise-features/properties.glade.h:1
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>Correo-e</b>"
@@ -1241,13 +1198,13 @@ msgstr "Contacto"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:525
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:540
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2372
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2353
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
-msgstr "_Nombre completo..."
+msgstr "_Nombre completo…"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
@@ -1306,12 +1263,11 @@ msgid "_Birthday:"
 msgstr "_Cumpleaños:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../plugins/itip-formatter/itip-view.c:1661
+#: ../plugins/itip-formatter/itip-view.c:1662
 msgid "_Calendar:"
 msgstr "_Calendario:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: ../ui/evolution-event-editor.xml.h:26 ../ui/evolution-task-editor.xml.h:18
 msgid "_Categories"
 msgstr "_Categorías"
 
@@ -2485,20 +2441,20 @@ msgid "Changed"
 msgstr "Modificados"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:535
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2367
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2348
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de contactos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2680
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2661
 msgid "Please select an image for this contact"
 msgstr "Seleccione una imagen para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2681
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2662
 msgid "No image"
 msgstr "Sin imagen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2960
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2941
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2506,7 +2462,7 @@ msgstr ""
 "Los datos del contacto son inválidos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3012
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2993
 msgid "Invalid contact."
 msgstr "Contacto inválido."
 
@@ -2659,8 +2615,8 @@ msgstr "Servicio de _MI:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:234
-#: ../plugins/exchange-operations/exchange-contacts.c:214
+#: ../plugins/exchange-operations/exchange-calendar.c:224
+#: ../plugins/exchange-operations/exchange-contacts.c:203
 msgid "_Location:"
 msgstr "_Lugar:"
 
@@ -2828,7 +2784,7 @@ msgstr "Cualquier campo contiene"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:173
 #: ../addressbook/gui/widgets/e-addressbook-view.c:178
 msgid "Advanced..."
-msgstr "Avanzado..."
+msgstr "Avanzado…"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
@@ -2837,9 +2793,8 @@ msgstr "Fuente"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:377
+#: ../calendar/gui/e-meeting-list-view.c:370
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Tipo"
 
@@ -2848,86 +2803,78 @@ msgid "Address Book"
 msgstr "Libreta de direcciones"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:807
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2018
-#: ../ui/evolution-addressbook.xml.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2016
+#: ../ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
-msgstr "Guardar como VCard..."
+msgstr "Guardar como VCard…"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:930
-#: ../calendar/gui/dialogs/comp-editor.c:1054
 #: ../calendar/gui/e-calendar-table.c:1167
-#: ../calendar/gui/e-calendar-view.c:1555 ../calendar/gui/e-memo-table.c:845
-#: ../ui/evolution-addressbook.xml.h:38
+#: ../calendar/gui/e-calendar-view.c:1545 ../ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Abrir"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:932
-msgid "_New Contact..."
-msgstr "Contacto _nuevo..."
+msgid "New Contact..."
+msgstr "Contacto nuevo…"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:933
-msgid "New Contact _List..."
-msgstr "_Lista de contactos nueva..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
-#: ../ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard..."
-msgstr "G_uardar como vCard..."
+msgid "New Contact List..."
+msgstr "Lista de contactos nueva…"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:937
-msgid "_Forward Contact"
-msgstr "_Reenviar contacto"
+#: ../ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "Reenviar contacto"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:938
-msgid "_Forward Contacts"
-msgstr "_Reenviar contactos"
+msgid "Forward Contacts"
+msgstr "Reenviar contactos"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:939
-msgid "Send _Message to Contact"
-msgstr "Enviar un _mensaje al contacto"
+msgid "Send Message to Contact"
+msgstr "Enviar un mensaje al contacto"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:940
-msgid "Send _Message to List"
-msgstr "Enviar un _mensaje a la lista"
+msgid "Send Message to List"
+msgstr "Enviar un mensaje a la lista"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:941
-msgid "Send _Message to Contacts"
-msgstr "Enviar un _mensaje a los contactos"
+msgid "Send Message to Contacts"
+msgstr "Enviar un mensaje a los contactos"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:942
-msgid "_Print"
-msgstr "Im_primir"
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2510
+#: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "Imprimir"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:945
-msgid "Cop_y to Address Book..."
-msgstr "_Copiar a la libreta de direcciones..."
+msgid "Copy to Address Book..."
+msgstr "Copiar a la libreta de direcciones…"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:946
-msgid "Mo_ve to Address Book..."
-msgstr "Mo_ver a la libreta de direcciones..."
+msgid "Move to Address Book..."
+msgstr "Mover a la libreta de direcciones…"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:949
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:8
-msgid "Cu_t"
-msgstr "Cor_tar"
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Cortar"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:950
 #: ../calendar/gui/calendar-component.c:536
-#: ../calendar/gui/dialogs/comp-editor.c:431
-#: ../calendar/gui/e-calendar-table.c:1175
-#: ../calendar/gui/e-calendar-view.c:1562 ../calendar/gui/e-memo-table.c:853
-#: ../calendar/gui/tasks-component.c:440 ../composer/e-msg-composer.c:3049
-#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1035
-#: ../mail/message-list.c:1718 ../ui/evolution-addressbook.xml.h:32
-#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
-#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
-msgid "_Copy"
-msgstr "_Copiar"
+#: ../calendar/gui/tasks-component.c:440 ../ui/evolution-addressbook.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:12 ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Copiar"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:951
-msgid "P_aste"
-msgstr "_Pegar"
+#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "Pegar"
 
 #. All, unmatched, separator
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1565
@@ -2935,8 +2882,7 @@ msgstr "_Pegar"
 msgid "Any Category"
 msgstr "Cualquier categoría"
 
-#. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1767
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1766
 msgid "Print cards"
 msgstr "Imprimir tarjetas"
 
@@ -2969,10 +2915,9 @@ msgid "Car Phone"
 msgstr "Teléfono del coche"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/task-page.glade.h:6
 #: ../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 "Categorías"
 
@@ -3077,7 +3022,7 @@ msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:388
+#: ../calendar/gui/e-meeting-list-view.c:378
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
 msgid "Role"
@@ -3338,7 +3283,7 @@ msgstr "Ya existe el ID del contacto"
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
 #: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Protocol not supported"
-msgstr "Protocolo no implementado"
+msgstr "Protocolo no soportado"
 
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:61
@@ -3346,7 +3291,7 @@ msgstr "Protocolo no implementado"
 #: ../calendar/gui/e-cal-component-preview.c:232
 #: ../calendar/gui/e-cal-model-tasks.c:348
 #: ../calendar/gui/e-cal-model-tasks.c:661
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2375
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2373
 msgid "Cancelled"
 msgstr "Cancelado"
 
@@ -3578,16 +3523,6 @@ msgstr "VCards múltiples"
 msgid "VCard for %s"
 msgstr "VCard para %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1031
-#: ../addressbook/gui/widgets/eab-gui-util.c:1049
-msgid "Contact information"
-msgstr "Información de contacto"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:1051
-#, c-format
-msgid "Contact information for %s"
-msgstr "Información de contacto de %s"
-
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -3617,7 +3552,7 @@ msgstr "Añadir dirección al contacto existente «%s»"
 
 #: ../addressbook/gui/widgets/eab-popup-control.c:869
 msgid "Querying Address Book..."
-msgstr "Consultando la libreta de direcciones..."
+msgstr "Consultando la libreta de direcciones…"
 
 #: ../addressbook/gui/widgets/eab-popup-control.c:968
 msgid "Merge E-Mail Address"
@@ -3656,7 +3591,7 @@ msgstr "Vista de árbol GTK"
 #: ../calendar/importers/icalendar-importer.c:311
 #: ../calendar/importers/icalendar-importer.c:643 ../shell/shell.error.xml.h:6
 msgid "Importing ..."
-msgstr "Importando..."
+msgstr "Importando…"
 
 #: ../addressbook/importers/evolution-ldif-importer.c:748
 msgid "LDAP Data Interchange Format (.ldif)"
@@ -3683,8 +3618,8 @@ msgstr "Imprimir sobre"
 msgid "Print contacts"
 msgstr "Imprimir contactos"
 
-#: ../addressbook/printing/e-contact-print.c:1117
-#: ../addressbook/printing/e-contact-print.c:1145
+#: ../addressbook/printing/e-contact-print.c:1116
+#: ../addressbook/printing/e-contact-print.c:1144
 msgid "Print contact"
 msgstr "Imprimir contacto"
 
@@ -3714,7 +3649,7 @@ msgstr "Dimensiones:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:7
 msgid "F_ont..."
-msgstr "_Tipografía..."
+msgstr "_Tipografía…"
 
 #: ../addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
@@ -3838,8 +3773,8 @@ msgstr "Escala de grises"
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
 #: ../plugins/exchange-operations/exchange-account-setup.c:940
-#: ../plugins/exchange-operations/exchange-calendar.c:224
-#: ../plugins/exchange-operations/exchange-contacts.c:197
+#: ../plugins/exchange-operations/exchange-calendar.c:214
+#: ../plugins/exchange-operations/exchange-contacts.c:186
 msgid "Size:"
 msgstr "Tamaño:"
 
@@ -3866,7 +3801,7 @@ msgstr "Anchura:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:42
 msgid "_Font..."
-msgstr "_Tipografía..."
+msgstr "_Tipografía…"
 
 #: ../addressbook/printing/test-contact-print-style-editor.c:53
 msgid "Contact Print Style Editor Test"
@@ -4095,20 +4030,20 @@ msgstr "¿Seguro que quiere enviar la cita sin un resumen?"
 
 #: ../calendar/calendar.error.xml.h:24
 msgid "Are you sure you want to send the task without a summary?"
-msgstr "¿Seguro que quiere enviar la tarea mensaje sin un resumen?"
+msgstr "¿Seguro que quiere enviar la tarea sin un resumen?"
 
 #: ../calendar/calendar.error.xml.h:25
 msgid "Delete calendar '{0}'?"
 msgstr "¿Desea borrar el calendario «{0}»?"
 
 #: ../calendar/calendar.error.xml.h:26
-msgid "Delete memo list '{0}'?"
-msgstr "¿Desea borrar la lista de memorándum «{0}»?"
-
-#: ../calendar/calendar.error.xml.h:27
 msgid "Delete task list '{0}'?"
 msgstr "¿Desea borrar la lista de tareas «{0}»?"
 
+#: ../calendar/calendar.error.xml.h:27
+msgid "Discard Changes"
+msgstr "Descartar los cambios"
+
 #: ../calendar/calendar.error.xml.h:28
 msgid "Don't Send"
 msgstr "No enviar"
@@ -4128,8 +4063,8 @@ msgstr "No se pudo cargar el editor."
 #: ../calendar/calendar.error.xml.h:32
 msgid "Email invitations will be sent to all participants and allow them to RSVP."
 msgstr ""
-"Se enviarán invitaciones por correo-e a todos los participantes y les "
-"permitirá confirmarlas."
+"Las invitaciones se enviarán por correo-e a todos los participantes y se les "
+"permitirá responder."
 
 #: ../calendar/calendar.error.xml.h:33
 msgid ""
@@ -4144,14 +4079,10 @@ msgid "Error loading calendar"
 msgstr "Error al cargar el calendario"
 
 #: ../calendar/calendar.error.xml.h:35
-msgid "Error loading memo list"
-msgstr "Error al cargar la lista de notas"
-
-#: ../calendar/calendar.error.xml.h:36
 msgid "Error loading task list"
 msgstr "Error al cargar la lista de tareas"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:36
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the journal has been deleted."
@@ -4159,7 +4090,7 @@ msgstr ""
 "Si no envía una notificación de cancelación, los otros participantes quizá "
 "no sepan que el diario ha sido borrado."
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:37
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the meeting is canceled."
@@ -4167,7 +4098,7 @@ msgstr ""
 "Si no envía una notificación de cancelación, los otros participantes quizá "
 "no sepan que la reunión se ha cancelado."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the task has been deleted."
@@ -4175,6 +4106,10 @@ msgstr ""
 "Si no envía una notificación de cancelación, los otros participantes quizá "
 "no sepan que la tarea ha sido borrada."
 
+#: ../calendar/calendar.error.xml.h:39
+msgid "Save Changes"
+msgstr "Guardar cambios"
+
 #: ../calendar/calendar.error.xml.h:40
 #: ../ui/evolution-message-composer.xml.h:28
 msgid "Send"
@@ -4213,103 +4148,83 @@ 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:48
-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:49
 msgid "The task list is not marked for offline usage"
 msgstr "La lista de tareas no está marcada para usarse sin conexión"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:49
 msgid "This calendar will be removed permanently."
 msgstr "Este calendario se eliminará permanentemente."
 
-#: ../calendar/calendar.error.xml.h:51
-msgid "This memo list will be removed permanently."
-msgstr "Esta lista de notas será eliminada permanentemente."
-
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:50
 msgid "This task list will be removed permanently."
-msgstr "Esta lista de tareas será eliminada permanentemente."
+msgstr "Esta lista de tareas se eliminará permanentemente."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:51
 msgid "Would you like to save your changes to this appointment?"
 msgstr "¿Desea guardar los cambios a esta cita?"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:52
 msgid "Would you like to save your changes to this task?"
 msgstr "¿Desea guardar los cambios a esta tarea?"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:53
 msgid "Would you like to send a cancellation notice for this journal entry?"
-msgstr ""
-"¿Seguro que quiere enviar una notificación de cancelación para esta entrada "
-"de diario?"
+msgstr "¿Desea enviar una notificación de cancelación para esta entrada de diario?"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:54
 msgid "Would you like to send all the participants a cancellation notice?"
-msgstr "¿Quiere enviar a todos los participantes una notificación de cancelación?"
+msgstr "¿Desea enviar a todos los participantes una notificación de cancelación?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:55
 msgid "Would you like to send meeting invitations to participants?"
-msgstr "¿Quiere enviar invitaciones a los participantes?"
+msgstr "¿Desea enviar invitaciones a la reunión a los participantes?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:56
 msgid "Would you like to send this task to participants?"
-msgstr "¿Quiere enviar esta tarea a los participantes?"
+msgstr "¿Desea enviar esta tarea a los participantes?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to send updated meeting information to participants?"
-msgstr "¿Quiere enviar información de la reunión actualizada a los participantes?"
+msgstr "¿Desea enviar información actualizada de la reunión a los participantes?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send updated task information to participants?"
-msgstr "¿Quiere enviar información de tareas actualizada a los participantes?"
+msgstr "¿Desea enviar la información actualizada de la tarea a los participantes?"
 
-#: ../calendar/calendar.error.xml.h:62
-msgid "You have changed this appointment, but not yet saved them."
-msgstr "Ha cambiado esta cita, pero no la ha guardado aún."
+#: ../calendar/calendar.error.xml.h:60
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "Ha realizado cambios a esta cita, pero no los ha guardado."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:61
 msgid "You have made changes to this task, but not yet saved them."
 msgstr "Ha realizado cambios a esta tarea, pero no los ha guardado aún."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:62
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Sus calendarios no estarán disponibles hasta que Evolution sea reiniciado."
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:63
 msgid "Your tasks will not be available until Evolution is restarted."
-msgstr "Sus tareas no estarán disponibles hasta que Evolution sea iniciado de nuevo."
-
-#: ../calendar/calendar.error.xml.h:66
-#: ../composer/mail-composer.error.xml.h:29
-msgid "_Discard Changes"
-msgstr "_Descartar cambios"
+msgstr "Sus tareas no estarán disponibles hasta que Evolution sea reiniciado."
 
-#: ../calendar/calendar.error.xml.h:67 ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:64
 #: ../ui/evolution-message-composer.xml.h:51
-#: ../ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Guardar"
 
-#: ../calendar/calendar.error.xml.h:68
-msgid "_Save Changes"
-msgstr "_Guardar cambios"
-
-#: ../calendar/calendar.error.xml.h:69
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:129
+#: ../calendar/calendar.error.xml.h:65
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:123
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:66
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:323
+#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:322
 #: ../smime/gui/component.c:48
 msgid "Enter password"
-msgstr "Introduzca contraseña"
+msgstr "Introduzca su contraseña"
 
 #: ../calendar/conduits/calendar/calendar-conduit.c:246
 msgid "Split Multi-Day Events:"
@@ -4317,44 +4232,26 @@ msgstr "Dividir acontecimientos de días múltiples:"
 
 #: ../calendar/conduits/calendar/calendar-conduit.c:1377
 #: ../calendar/conduits/calendar/calendar-conduit.c:1378
-#: ../calendar/conduits/memo/memo-conduit.c:854
-#: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:988
-#: ../calendar/conduits/todo/todo-conduit.c:989
+#: ../calendar/conduits/todo/todo-conduit.c:879
+#: ../calendar/conduits/todo/todo-conduit.c:880
 msgid "Could not start evolution-data-server"
-msgstr "No se ha podido iniciar el servidor evolution-data-server"
+msgstr "No se ha podido iniciar evolution-data-server"
 
 #: ../calendar/conduits/calendar/calendar-conduit.c:1486
 #: ../calendar/conduits/calendar/calendar-conduit.c:1489
 msgid "Could not read pilot's Calendar application block"
 msgstr "No se pudo leer información de la aplicación de calendario del Pilot"
 
-#: ../calendar/conduits/memo/memo-conduit.c:937
-#: ../calendar/conduits/memo/memo-conduit.c:940
-msgid "Could not read pilot's Memo application block"
-msgstr "No se pudo leer los datos de la aplicación Memo del Pilot"
-
-#: ../calendar/conduits/memo/memo-conduit.c:976
-#: ../calendar/conduits/memo/memo-conduit.c:979
-msgid "Could not write pilot's Memo application block"
-msgstr "No se pudo escribir los datos de la aplicación Memo del Pilot"
-
-#: ../calendar/conduits/todo/todo-conduit.c:237
+#: ../calendar/conduits/todo/todo-conduit.c:234
 msgid "Default Priority:"
 msgstr "Prioridad predeterminada:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1071
-#: ../calendar/conduits/todo/todo-conduit.c:1074
+#: ../calendar/conduits/todo/todo-conduit.c:959
+#: ../calendar/conduits/todo/todo-conduit.c:962
 msgid "Could not read pilot's ToDo application block"
 msgstr "No se pudo leer los datos de la aplicación ToDo del Pilot"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1110
-#: ../calendar/conduits/todo/todo-conduit.c:1113
-msgid "Could not write pilot's ToDo application block"
-msgstr "No se pudo 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:1968
 msgid "Calendar and Tasks"
 msgstr "Calendario y tareas"
 
@@ -4388,40 +4285,26 @@ msgid "Evolution's Calendar component"
 msgstr "Componente de Calendario de Evolution"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution's Memos component"
-msgstr "Componente de Notas de Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Tasks component"
 msgstr "Componente de Tareas de Evolution"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Memo_s"
-msgstr "_Notas"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memos.c:1091 ../calendar/gui/memos-component.c:528
-#: ../calendar/gui/memos-component.c:998 ../calendar/gui/memos-control.c:334
-msgid "Memos"
-msgstr "Notas"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-tasks.c:1333 ../calendar/gui/print.c:1831
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#: ../calendar/gui/e-tasks.c:1282 ../calendar/gui/print.c:1831
 #: ../calendar/gui/tasks-component.c:519
-#: ../calendar/gui/tasks-component.c:1013 ../calendar/gui/tasks-control.c:466
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:456
 #: ../calendar/importers/icalendar-importer.c:79
 #: ../calendar/importers/icalendar-importer.c:707
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:589
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Tareas"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 msgid "_Calendars"
 msgstr "_Calendarios"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
 #: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tareas"
@@ -4430,15 +4313,13 @@ msgstr "_Tareas"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Servicio de notificación por alarma del Calendario de Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
-#: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/alarm-notify/util.c:66
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:251
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:250
 msgid "Start time"
 msgstr "Hora de inicio"
 
@@ -4458,10 +4339,8 @@ msgstr "Citas"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1419
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1425
-#: ../calendar/gui/e-itip-control.c:1117
-#: ../plugins/itip-formatter/itip-view.c:883
+#: ../calendar/gui/e-itip-control.c:1120
+#: ../plugins/itip-formatter/itip-view.c:884
 msgid "Location:"
 msgstr "Lugar:"
 
@@ -4474,13 +4353,13 @@ msgstr "_Posponer el aviso:"
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:6
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:13
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-editor.xml.h:17
-#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-addressbook.xml.h:34 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-composer-entries.xml.h:8
+#: ../ui/evolution-mail-messagedisplay.xml.h:5
 #: ../ui/evolution-message-composer.xml.h:44
-#: ../ui/evolution-signature-editor.xml.h:12
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution-signature-editor.xml.h:23
+#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution.xml.h:35
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -4489,51 +4368,53 @@ msgid "_Snooze"
 msgstr "_Posponer"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+msgid "description of appointment"
+msgstr "descripción de la cita"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 msgid "location of appointment"
 msgstr "lugar de la cita"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1097
-msgid "<b>Calendars</b>"
-msgstr "<b>Calendarios</b>"
+#: ../calendar/gui/alarm-notify/alarm-queue.c:966
+msgid "Dismiss"
+msgstr "Rechazar"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1163
-msgid "Preferences"
-msgstr "Preferencias"
+#: ../calendar/gui/alarm-notify/alarm-queue.c:967
+msgid "Dismiss All"
+msgstr "Rechazar todas"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1176
-msgid "_Configure Alarms"
-msgstr "_Configurar alarmas"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1178 ../ui/evolution.xml.h:41
-msgid "_Quit"
-msgstr "_Salir"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1284
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1401
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1049
 msgid "No summary available."
 msgstr "No hay resumen disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1293
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1295
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1058
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1060
 msgid "No description available."
 msgstr "No hay descripción disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1303
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1068
 msgid "No location information available."
 msgstr "No hay información del lugar disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1339
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1084
 #, c-format
-msgid "You have %d alarms"
-msgstr "Tiene %d alarmas."
-
-#. FIXME
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1502
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1526
+msgid ""
+"Alarm on %s\n"
+"%s\n"
+"Starting at %s\n"
+"Ending at %s"
+msgstr ""
+"Alarma el %s\n"
+"%s\n"
+"Empieza a las %s\n"
+"Termina a las %s"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1187
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1211
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1506
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1191
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4545,7 +4426,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:1532
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1217
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4560,9 +4441,9 @@ msgstr ""
 "\n"
 "        %s\n"
 "\n"
-"¿Está seguro que quiere ejecutar este programa?"
+"¿Seguro que quiere ejecutar este programa?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1546
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1231
 msgid "Do not ask me about this program again."
 msgstr "No preguntar otra vez sobre este programa."
 
@@ -4578,62 +4459,6 @@ msgstr "No se pudo crear la fábrica del servicio de la alarma de notificación"
 msgid "invalid time"
 msgstr "hora inválida"
 
-#. Can't be zero
-#: ../calendar/gui/alarm-notify/util.c:58
-#, c-format
-msgid "(%d seconds)"
-msgstr "(%d segundo)"
-
-#: ../calendar/gui/alarm-notify/util.c:64
-#, c-format
-msgid "(%d %s %d %s)"
-msgstr "(%d %s %d %s)"
-
-#: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/dialogs/recurrence-page.c:990
-msgid "second"
-msgstr "segundo"
-
-#: ../calendar/gui/alarm-notify/util.c:64 ../filter/filter.glade.h:18
-#: ../mail/mail-config.glade.h:177
-msgid "seconds"
-msgstr "segundos"
-
-#: ../calendar/gui/alarm-notify/util.c:66
-#, c-format
-msgid "(%d %s)"
-msgstr "(%d %s)"
-
-#: ../calendar/gui/alarm-notify/util.c:77
-#, c-format
-msgid " %u second"
-msgstr "%u segundo"
-
-#: ../calendar/gui/alarm-notify/util.c:77
-#, c-format
-msgid " %u seconds"
-msgstr "%u segundos"
-
-#: ../calendar/gui/alarm-notify/util.c:79
-#, c-format
-msgid " %u minute"
-msgstr "%u minuto"
-
-#: ../calendar/gui/alarm-notify/util.c:79
-#, c-format
-msgid " %u minutes"
-msgstr "%u minutos"
-
-#: ../calendar/gui/alarm-notify/util.c:81
-#, c-format
-msgid "%u hour"
-msgstr "%u hora"
-
-#: ../calendar/gui/alarm-notify/util.c:81
-#, c-format
-msgid "%u hours"
-msgstr "%u horas"
-
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 msgid "Alarm programs"
 msgstr "Programas de alarma"
@@ -4652,7 +4477,7 @@ msgstr "Color de fondo para las tareas que están retrasadas, en formato «#rrgg
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
 msgid "Calendars to run alarms for"
-msgstr "Los calendarios ejecutarán alarmas durante"
+msgstr "Calendarios para disparar alarmas de"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
 msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
@@ -4776,7 +4601,7 @@ msgstr "Número de unidades para determinar cuándo ocultar tareas."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
-msgstr "Color para las tareas fuera de plazo"
+msgstr "Color para las tareas atrasadas"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid ""
@@ -4821,134 +4646,98 @@ msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
-msgstr "Programas que se permite que sean ejecutados por las alarmas."
+msgstr "Programas que se permiten ejecutar a las alarmas."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
-msgid "Show RSVP field in the event/task/meeting editor"
-msgstr "Mostrar el campo «Confirmar» en el editor de acontecimientos/tareas/reuniones"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
-msgid "Show Role field in the event/task/meeting editor"
-msgstr "Mostrar el campo «Rol» en el editor de acontecimientos/tareas/reuniones"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr ""
-"Mostrar las horas de finalización de las citas en las vistas semanales y "
+"Mostrar la hora de terminación de las citas en las vistas semanales y "
 "mensuales"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
-msgid "Show categories field in the event/meeting/task editor"
-msgstr ""
-"Mostrar el campo de categorías en el editor de acontecimientos/reuniones/"
-"tareas"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show display alarms in notification tray"
-msgstr "Mostrar el visor de la alarma en una bandeja de notificación"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
-msgid "Show status field in the event/task/meeting editor"
-msgstr "Mostrar el campo de estado en el editor de acontecimientos/tareas/reuniones"
+msgstr "Mostrar la visualización de la alarma en la bandeja de notificación"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
-#: ../mail/evolution-mail.schemas.in.in.h:73
-msgid "Show the \"Preview\" pane"
-msgstr "Mostrar el panel de vista previa"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
-#: ../mail/evolution-mail.schemas.in.in.h:74
-msgid "Show the \"Preview\" pane."
-msgstr "Mostrar el panel de vista previa."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
-msgid "Show timezone field in the event/meeting editor"
-msgstr "Mostrar el campo de zona horaria en el editor de acontecimientos/reuniones"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
-msgid "Show type field in the event/task/meeting editor"
-msgstr "Mostrar el campo de tipo en el editor de acontecimientos/tareas/reuniones"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show week numbers in date navigator"
 msgstr "Mostrar los números de las semanas en el navegador de fechas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Tasks due today color"
 msgstr "Color para las tareas que vencen hoy"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Tasks vertical pane position"
 msgstr "Posición del panel vertical de tareas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 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 ""
 "La zona horaria predeterminada que se usará en las fechas y horas en el "
 "calendario, como una localización sin traslación de la base de datos de "
-"franjas horarias Olsen, como en \"América/New York\"."
+"franjas horarias Olsen, como en \"America/New York\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
 #, 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 ""
-"La plantilla url para usar como datos de resguardo de disponibilidad, %u se "
-"reemplaza por la pare de usuario de la dirección de correo y %d se reemplaza "
-"por el dominio."
+"La plantilla del URL que se usa como resguardo de los datos de "
+"disponibilidad, %u se reemplaza por la parte del usuario de la dirección de "
+"correo y %d se reemplaza por el dominio."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Time divisions"
-msgstr "Divisiones de hora"
+msgstr "Divisiones de las horas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Time the last alarm ran, in time_t."
 msgstr "La hora en que la última alarma sonó, en time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Timezone"
-msgstr "Zona horaria "
+msgstr "Zona horaria"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Twenty four hour time format"
 msgstr "Formato de hora de veinticuatro horas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unidades para el recordatorio predeterminado, \"minutes\", \"hours\" o \"days"
 "\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
 msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unidades para determinar cuándo ocultar tareas, \"minutes\", \"hours\" o "
 "\"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid "Week start"
 msgstr "Comienzo de la semana"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "El día en que empieza la semana, desde el domingo (0) hasta el sábado (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Indica si se debe usar o no la bandeja de notificación para mostrar alarmas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Indica si debe pedir confirmación al borrar una cita o tarea."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Indica si debe pedir confirmación al compactar citas y tareas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -4956,89 +4745,53 @@ msgstr ""
 "Indica si se deben comprimir los fines de semana, lo cual pone al sábado y "
 "al domingo en el mismo espacio que un día laborable."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Indica si debe mostrar la hora de finalización de los acontecimientos en las "
 "vistas semanales y mensuales."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Indica si debe dibujar la línea Marcus Bains (línea a la hora actual) en el "
 "calendario."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Indica si debe ocultar las tareas terminadas en la vista de tareas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Whether to set a default reminder for appointments."
 msgstr "Indica si debe establecer un recordatorio predeterminado para las citas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
-msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr ""
-"Indica si debe mostrar el campo «Confirmar» en el editor de acontecimiento/"
-"tareas/reuniones"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
-msgid "Whether to show categories field in the event/meeting editor"
-msgstr ""
-"Indica si debe mostrar el campo «Categorías» en el editor de acontecimientos/"
-"reuniones"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
-msgid "Whether to show role field in the event/task/meeting editor"
-msgstr ""
-"Indica si debe mostrar el campo «Rol» en el editor de acontecimientos/tareas/"
-"reuniones"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
-msgid "Whether to show status field in the event/task/meeting editor"
-msgstr ""
-"Indica si debe mostrar el campo «Estado» en el editor de acontecimientos/"
-"tareas/reuniones"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
 "Indica si debe mostrar las horas en formato de veinticuatro horas en vez de "
 "usar am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
-msgid "Whether to show timezone field in the event/meeting editor"
-msgstr ""
-"Indica si debe mostrar el campo «Zona horaria» en el editor de "
-"acontecimientos/reuniones"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
-msgid "Whether to show type field in the event/task/meeting editor"
-msgstr ""
-"Indica si debe mostrar el campo «Tipo» en el editor de acontecimientos/"
-"tareas/reuniones"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Indica si debe mostrar los números de la semana en el navegador de fechas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Work days"
 msgstr "Días laborables"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid "Workday end hour"
 msgstr "Hora de finalización de la jornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Workday end minute"
 msgstr "Minuto de finalización de la jornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid "Workday start hour"
 msgstr "Hora de comienzo de la jornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Workday start minute"
 msgstr "Minuto de comienzo de la jornada laboral"
 
@@ -5062,22 +4815,13 @@ msgstr "El lugar contiene"
 msgid "Unmatched"
 msgstr "No coincidente"
 
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2512
-#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-memos.xml.h:11
-#: ../ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "Imprimir"
-
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:367
 #: ../calendar/gui/gnome-cal.c:2116
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:590
-#: ../plugins/hula-account-setup/camel-hula-listener.c:374
-#: ../plugins/hula-account-setup/camel-hula-listener.c:403
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:588
 msgid "Calendar"
 msgstr "Calendario"
 
@@ -5105,13 +4849,10 @@ msgid "days"
 msgstr "días"
 
 #. 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:234
-#: ../calendar/gui/memos-component.c:219 ../calendar/gui/migration.c:489
-#: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1084
-#: ../calendar/gui/tasks-component.c:215
+#: ../calendar/gui/calendar-component.c:234 ../calendar/gui/migration.c:489
+#: ../calendar/gui/migration.c:582 ../calendar/gui/tasks-component.c:215
 msgid "On The Web"
 msgstr "En la web"
 
@@ -5126,14 +4867,15 @@ msgid "Weather"
 msgstr "Meteorología"
 
 #: ../calendar/gui/calendar-component.c:535
-msgid "_New Calendar"
-msgstr "Calendario _nuevo"
+#: ../calendar/gui/dialogs/calendar-setup.c:449
+msgid "New Calendar"
+msgstr "Calendario nuevo"
 
 #: ../calendar/gui/calendar-component.c:858
 msgid "Failed upgrading calendars."
 msgstr "Fallo al actualizar calendarios."
 
-#: ../calendar/gui/calendar-component.c:1157
+#: ../calendar/gui/calendar-component.c:1154
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "no se pudo abrir el calendario «%s» para crear acontecimientos y reuniones"
@@ -5187,7 +4929,6 @@ msgid "New calendar"
 msgstr "Calendario nuevo"
 
 #: ../calendar/gui/calendar-component.c:1500
-#: ../calendar/gui/dialogs/event-page.c:828
 msgid "Cale_ndar"
 msgstr "Cale_ndario"
 
@@ -5322,8 +5063,7 @@ msgstr "hora(s)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/calendar-http/calendar-http.c:264
+#: ../filter/filter.glade.h:15 ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:564
 msgid "hours"
 msgstr "horas"
@@ -5345,8 +5085,6 @@ msgid "A_dd"
 msgstr "Aña_dir"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Alarmas"
 
@@ -5373,20 +5111,17 @@ msgstr "%.0fGib"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:311
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
-#: ../calendar/gui/dialogs/comp-editor.c:2575
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:138
-#: ../mail/em-utils.c:483 ../mail/em-utils.c:520
-#: ../widgets/misc/e-attachment-bar.c:341
+#: ../calendar/gui/dialogs/comp-editor.c:2440
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:444
+#: ../mail/em-utils.c:481 ../widgets/misc/e-attachment-bar.c:341
 msgid "attachment"
 msgstr "adjunto"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:473
-#: ../calendar/gui/dialogs/comp-editor.c:1055
-#: ../calendar/gui/dialogs/event-page.c:1733
-#: ../calendar/gui/dialogs/meeting-page.c:908
-#: ../calendar/gui/dialogs/task-page.c:1182
+#: ../calendar/gui/dialogs/comp-editor.c:1083
+#: ../calendar/gui/dialogs/meeting-page.c:887
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3545
+#: ../composer/e-msg-composer.c:3400
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
@@ -5394,23 +5129,23 @@ msgid "_Remove"
 msgstr "_Quitar"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:474
-#: ../calendar/gui/dialogs/comp-editor.c:1056
+#: ../calendar/gui/dialogs/comp-editor.c:1084
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3546 ../mail/em-folder-tree.c:2058
+#: ../composer/e-msg-composer.c:3401 ../mail/em-folder-tree.c:2052
 #: ../ui/evolution-mail-list.xml.h:29
 msgid "_Properties"
 msgstr "_Propiedades"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:476
-#: ../calendar/gui/dialogs/comp-editor.c:1058
+#: ../calendar/gui/dialogs/comp-editor.c:1086
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3548
+#: ../composer/e-msg-composer.c:3403
 msgid "_Add attachment..."
-msgstr "_Añadir adjunto..."
+msgstr "_Añadir adjunto…"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:736
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:994
+#: ../widgets/misc/e-attachment-bar.c:963
 msgid "Attachment Bar"
 msgstr "Barra de adjuntos"
 
@@ -5425,7 +5160,7 @@ msgid "Suggest automatic display of attachment"
 msgstr "Sugerir mostrar adjuntos automáticamente"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
-#: ../composer/e-msg-composer-select-file.c:239
+#: ../composer/e-msg-composer-select-file.c:241
 msgid "Attach file(s)"
 msgstr "Adjuntar archivo(s)"
 
@@ -5460,7 +5195,7 @@ msgstr "Propiedades de adjuntos"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:267
-#: ../calendar/gui/e-itip-control.c:1163
+#: ../calendar/gui/e-itip-control.c:1166
 #: ../calendar/gui/e-itip-control.glade.h:6
 #: ../composer/e-msg-composer-attachment.glade.h:3
 #: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
@@ -5481,7 +5216,7 @@ msgstr "Tipo MIME:"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:576
-#: ../mail/em-account-prefs.c:504 ../mail/em-composer-prefs.c:919
+#: ../mail/em-account-prefs.c:504 ../mail/em-composer-prefs.c:891
 #: ../plugins/plugin-manager/plugin-manager.c:213
 msgid "Enabled"
 msgstr "Activado"
@@ -5599,14 +5334,12 @@ msgid "E_nable"
 msgstr "_Activar"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: ../calendar/gui/dialogs/event-editor.c:549
-#: ../ui/evolution-event-editor.xml.h:6
 msgid "Free/Busy"
 msgstr "Disponibilidad"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: ../calendar/gui/dialogs/recurrence-page.c:1049
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Friday"
 msgstr "Viernes"
 
@@ -5620,7 +5353,7 @@ msgstr "minutos"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: ../calendar/gui/dialogs/recurrence-page.c:1045
-#: ../calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Monday"
 msgstr "Lunes"
 
@@ -5634,7 +5367,7 @@ msgstr "_Dom"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ../calendar/gui/dialogs/recurrence-page.c:1050
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -5648,7 +5381,7 @@ msgstr "Mostrar los _números de las semanas en el navegador de fechas"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: ../calendar/gui/dialogs/recurrence-page.c:1051
-#: ../calendar/gui/e-itip-control.c:726
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -5666,12 +5399,11 @@ msgstr "Plantilla:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 #: ../calendar/gui/dialogs/recurrence-page.c:1048
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Thursday"
 msgstr "Jueves"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "Time _zone:"
 msgstr "_Zona horaria:"
 
@@ -5681,7 +5413,7 @@ msgstr "Formato de la hora:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/dialogs/recurrence-page.c:1046
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Tuesday"
 msgstr "Martes"
 
@@ -5691,7 +5423,7 @@ msgstr "La _semana empieza en:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #: ../calendar/gui/dialogs/recurrence-page.c:1047
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Wednesday"
 msgstr "Miércoles"
 
@@ -5721,7 +5453,7 @@ msgstr "_Comprimir fines de semana en la vista mensual"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Day begins:"
-msgstr "La jornada laboral _comienza a las:"
+msgstr "La jornada _comienza a las:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Fri"
@@ -5737,7 +5469,7 @@ msgstr "_Lun"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Overdue tasks:"
-msgstr "Tareas fuera de pla_zo:"
+msgstr "Tareas _atrasadas:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Sat"
@@ -5745,7 +5477,9 @@ msgstr "_Sáb"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Show appointment end times in week and month views"
-msgstr "Mostrar la hora del final de las citas en las vistas s_emanales y mensuales"
+msgstr ""
+"_Mostrar la hora de terminación de las citas en las vistas semanales y "
+"mensuales"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Time divisions:"
@@ -5781,40 +5515,23 @@ msgstr ""
 "Copiar el contenido del la lista de tareas localmente para operación "
 "desconectada"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-msgid "Copy memo list contents locally for offline operation"
-msgstr "Copiar el contenido de la nota localmente para operación desconectada"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:341
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "C_olor:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:378
 msgid "Tasks List"
 msgstr "Lista de tareas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-msgid "Memos List"
-msgstr "Lista de notas"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:460
+#: ../calendar/gui/dialogs/calendar-setup.c:447
 msgid "Calendar Properties"
 msgstr "Propiedades del calendario"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:462
-msgid "New Calendar"
-msgstr "Calendario nuevo"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:528
+#: ../calendar/gui/dialogs/calendar-setup.c:515
 msgid "Task List Properties"
 msgstr "Propiedades de lista de tareas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:594
-#: ../calendar/gui/memos-component.c:448
-msgid "New Memo List"
-msgstr "Lista de notas nueva"
-
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
 msgstr "Añadir calendario"
@@ -5922,107 +5639,106 @@ msgstr " (Vence "
 msgid "Due "
 msgstr "Vence "
 
-#: ../calendar/gui/dialogs/comp-editor.c:193 ../composer/e-msg-composer.c:2800
+#: ../calendar/gui/dialogs/comp-editor.c:190 ../composer/e-msg-composer.c:2664
 #, c-format
 msgid "Attached message - %s"
 msgstr "Mensaje adjunto - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:198
-#: ../calendar/gui/dialogs/comp-editor.c:368 ../composer/e-msg-composer.c:2805
-#: ../composer/e-msg-composer.c:2984
+#: ../calendar/gui/dialogs/comp-editor.c:195
+#: ../calendar/gui/dialogs/comp-editor.c:365 ../composer/e-msg-composer.c:2669
+#: ../composer/e-msg-composer.c:2846
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Mensaje adjunto"
 msgstr[1] "%d mensajes adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:432 ../composer/e-msg-composer.c:3050
+#: ../calendar/gui/dialogs/comp-editor.c:428
+#: ../calendar/gui/e-calendar-table.c:1175
+#: ../calendar/gui/e-calendar-view.c:1552 ../composer/e-msg-composer.c:2911
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1035
+#: ../mail/message-list.c:1708 ../ui/evolution-addressbook.xml.h:31
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-tasks.xml.h:21
+msgid "_Copy"
+msgstr "_Copiar"
+
+#: ../calendar/gui/dialogs/comp-editor.c:429 ../composer/e-msg-composer.c:2912
 #: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1719
+#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1709
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../calendar/gui/dialogs/comp-editor.c:434 ../composer/e-msg-composer.c:3052
-#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1721
+#: ../calendar/gui/dialogs/comp-editor.c:431 ../composer/e-msg-composer.c:2914
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1711
 msgid "Cancel _Drag"
 msgstr "Cancelar _arrastre"
 
-#: ../calendar/gui/dialogs/comp-editor.c:777
+#: ../calendar/gui/dialogs/comp-editor.c:774
 msgid "Could not update object"
 msgstr "No se pudo actualizar el objeto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:913 ../composer/e-msg-composer.c:2443
+#: ../calendar/gui/dialogs/comp-editor.c:977 ../composer/e-msg-composer.c:2318
 #, 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:943
-msgid "Hide Attachment _Bar"
-msgstr "Ocultar _barra de adjuntos"
-
-#: ../calendar/gui/dialogs/comp-editor.c:946
-#: ../calendar/gui/dialogs/comp-editor.c:1363
-msgid "Show Attachment _Bar"
-msgstr "Mostrar _barra de adjuntos"
+#: ../calendar/gui/dialogs/comp-editor.c:1249
+msgid "_Attachment Bar (drop attachments here)"
+msgstr "Barra de _adjuntos (soltar adjuntos aquí)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
-msgid "Attachment Button: Press space key to toggle attachment bar"
-msgstr ""
-"Botón de adjuntos: Pulse la tecla de espacio para cambiar la barra de "
-"adjuntos"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1984
-#: ../calendar/gui/dialogs/comp-editor.c:2027
+#: ../calendar/gui/dialogs/comp-editor.c:1850
+#: ../calendar/gui/dialogs/comp-editor.c:1893
 msgid "Edit Appointment"
 msgstr "Editar cita"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1990
-#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/dialogs/comp-editor.c:1856
+#: ../calendar/gui/dialogs/comp-editor.c:1899
 #, c-format
 msgid "Meeting - %s"
 msgstr "Reunión - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1992
-#: ../calendar/gui/dialogs/comp-editor.c:2035
+#: ../calendar/gui/dialogs/comp-editor.c:1858
+#: ../calendar/gui/dialogs/comp-editor.c:1901
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1996
-#: ../calendar/gui/dialogs/comp-editor.c:2039
+#: ../calendar/gui/dialogs/comp-editor.c:1862
+#: ../calendar/gui/dialogs/comp-editor.c:1905
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tarea asignada - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1998
-#: ../calendar/gui/dialogs/comp-editor.c:2041
+#: ../calendar/gui/dialogs/comp-editor.c:1864
+#: ../calendar/gui/dialogs/comp-editor.c:1907
 #, c-format
 msgid "Task - %s"
 msgstr "Tarea - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2001
-#: ../calendar/gui/dialogs/comp-editor.c:2044
+#: ../calendar/gui/dialogs/comp-editor.c:1867
+#: ../calendar/gui/dialogs/comp-editor.c:1910
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada del diario - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2012
-#: ../calendar/gui/dialogs/comp-editor.c:2054
+#: ../calendar/gui/dialogs/comp-editor.c:1878
+#: ../calendar/gui/dialogs/comp-editor.c:1920
 msgid "No summary"
 msgstr "Sin resumen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2668
-#: ../calendar/gui/dialogs/comp-editor.c:2701
-#: ../calendar/gui/dialogs/comp-editor.c:2725
+#: ../calendar/gui/dialogs/comp-editor.c:2532
+#: ../calendar/gui/dialogs/comp-editor.c:2565
+#: ../calendar/gui/dialogs/comp-editor.c:2589
 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:2749
+#: ../calendar/gui/dialogs/comp-editor.c:2613
 msgid "Unable to use current version!"
 msgstr "Imposible obtener versión actual."
 
@@ -6088,7 +5804,7 @@ msgstr "El elemento no se pudo borrar debido a un error"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Contacts..."
-msgstr "Contactos..."
+msgstr "Contactos…"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 #: ../plugins/exchange-operations/exchange-delegates.c:421
@@ -6099,178 +5815,203 @@ msgstr "Delegar en:"
 msgid "Enter Delegate"
 msgstr "Introducir un delegado"
 
-#: ../calendar/gui/dialogs/event-editor.c:525
-msgid "Appoint_ment"
-msgstr "_Cita"
+#: ../calendar/gui/dialogs/event-editor.c:141 ../calendar/gui/print.c:2307
+msgid "Appointment"
+msgstr "Cita"
 
-#: ../calendar/gui/dialogs/event-editor.c:529
-#: ../ui/evolution-event-editor.xml.h:12
+#: ../calendar/gui/dialogs/event-editor.c:150
 msgid "Recurrence"
 msgstr "Repetición"
 
-#: ../calendar/gui/dialogs/event-page.c:834
-#: ../calendar/gui/dialogs/task-page.c:443
-msgid "Or_ganizer"
-msgstr "Or_ganizador"
+#: ../calendar/gui/dialogs/event-editor.c:164
+#: ../calendar/gui/dialogs/event-editor.c:248
+#: ../calendar/gui/dialogs/event-editor.c:422
+msgid "Scheduling"
+msgstr "Planificación"
+
+#: ../calendar/gui/dialogs/event-editor.c:174
+msgid "Delegatees"
+msgstr "Delegados"
 
-#: ../calendar/gui/dialogs/event-page.c:872
-msgid "_Delegatees"
-msgstr "_Delegados"
+#: ../calendar/gui/dialogs/event-editor.c:178
+msgid "Attendees"
+msgstr "Participantes"
 
-#: ../calendar/gui/dialogs/event-page.c:874
-msgid "Atte_ndees"
-msgstr "_Participantes"
+#: ../calendar/gui/dialogs/event-editor.c:251
+#: ../calendar/gui/dialogs/event-editor.c:425
+msgid "Invitations"
+msgstr "Invitaciones"
 
-#: ../calendar/gui/dialogs/event-page.c:1033
+#: ../calendar/gui/dialogs/event-page.c:731
 msgid "Event with no start date"
 msgstr "Acontecimiento sin fecha de inicio"
 
-#: ../calendar/gui/dialogs/event-page.c:1036
+#: ../calendar/gui/dialogs/event-page.c:734
 msgid "Event with no end date"
 msgstr "Acontecimiento sin fecha de finalización"
 
-#: ../calendar/gui/dialogs/event-page.c:1201
-#: ../calendar/gui/dialogs/task-page.c:847
+#: ../calendar/gui/dialogs/event-page.c:900
+#: ../calendar/gui/dialogs/task-page.c:556
 msgid "Start date is wrong"
 msgstr "La fecha de inicio está equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1211
+#: ../calendar/gui/dialogs/event-page.c:910
 msgid "End date is wrong"
 msgstr "La fecha de finalización  está equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1234
+#: ../calendar/gui/dialogs/event-page.c:933
 msgid "Start time is wrong"
 msgstr "La hora de inicio está equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1241
+#: ../calendar/gui/dialogs/event-page.c:940
 msgid "End time is wrong"
 msgstr "La  hora de finalización  está equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1396
-#: ../calendar/gui/dialogs/meeting-page.c:463
-#: ../calendar/gui/dialogs/task-page.c:904
-msgid "The organizer selected no longer has an account."
-msgstr "El organizador seleccionado ya no tiene una cuenta."
-
-#: ../calendar/gui/dialogs/event-page.c:1402
-#: ../calendar/gui/dialogs/meeting-page.c:469
-#: ../calendar/gui/dialogs/task-page.c:910
-msgid "An organizer is required."
-msgstr "Se requiere un organizador."
-
-#: ../calendar/gui/dialogs/event-page.c:1417
-#: ../calendar/gui/dialogs/meeting-page.c:484
-#: ../calendar/gui/dialogs/task-page.c:925
-msgid "At least one attendee is required."
-msgstr "Es necesario por lo menos un participante."
-
-#: ../calendar/gui/dialogs/event-page.c:1734
-#: ../calendar/gui/dialogs/meeting-page.c:909
-#: ../calendar/gui/dialogs/task-page.c:1183
-msgid "_Add "
-msgstr "_Añadir"
-
-#: ../calendar/gui/dialogs/event-page.c:2421
+#: ../calendar/gui/dialogs/event-page.c:1686
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "No se pudo abrir el calendario «%s»."
 
-#: ../calendar/gui/dialogs/event-page.c:2661
+#: ../calendar/gui/dialogs/event-page.c:1892
 #, 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:2669
+#: ../calendar/gui/dialogs/event-page.c:1900
 #, 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:2677
+#: ../calendar/gui/dialogs/event-page.c:1908
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuto antes de la cita"
 msgstr[1] "%d minutos antes de cada cita"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:1
+#: ../calendar/gui/dialogs/event-page.glade.h:2
+msgid "1 day before appointment"
+msgstr "1 día antes de la cita"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:3
 msgid "1 hour before appointment"
 msgstr "1 hora antes de la cita"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "15 minutes before appointment"
 msgstr "15 minutos antes de la cita"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:3
-msgid "1day before appointment"
-msgstr "1 día antes de la cita"
-
 #: ../calendar/gui/dialogs/event-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "Atte_ndees..."
-msgstr "Participantes..."
+msgid "<b>Basics</b>"
+msgstr "<b>Básico</b>"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
-msgid "C_ustomize"
-msgstr "_Personalizar"
+#: ../calendar/gui/dialogs/task-page.glade.h:2
+msgid "<b>Date and Time</b>"
+msgstr "<b>Fecha y hora</b>"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
-msgid "Ca_tegories..."
-msgstr "Ca_tegorías..."
+#: ../calendar/gui/dialogs/task-page.glade.h:3
+msgid "<b>Send Options</b>"
+msgstr "<b>Opciones de envío</b>"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:8
-msgid "Cale_ndar:"
-msgstr "Cale_ndario:"
+msgid "A_ll day event"
+msgstr "Acontecimiento para _todo el día"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ad_vanced send options"
+msgstr "Opciones de envío a_vanzadas"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:10
-msgid "Event Description"
-msgstr "Descripción del acontecimiento"
+msgid "C_ustomize..."
+msgstr "_Personalizar…"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:11
-msgid "Locat_ion:"
-msgstr "_Lugar:"
+#: ../calendar/gui/dialogs/task-page.glade.h:5
+msgid "Ca_tegories..."
+msgstr "Ca_tegorías…"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:12
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "Or_ganizer:"
-msgstr "Or_ganizador:"
+msgid "Cale_ndar:"
+msgstr "Cale_ndario:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:13
-#: ../calendar/gui/dialogs/task-page.glade.h:6
-msgid "Su_mmary:"
-msgstr "Resu_men:"
+#: ../calendar/gui/dialogs/task-page.glade.h:7
+msgid "Classi_fication:"
+msgstr "Clasi_ficación:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:364
+msgid "Confidential"
+msgstr "Confidencial"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:15
-msgid "_Description:"
-msgstr "_Descripción:"
+msgid "Event Description"
+msgstr "Descripción del acontecimiento"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:16
-msgid "_Set alarm\t"
-msgstr "_Poner alarma\t"
+msgid "Locat_ion:"
+msgstr "_Lugar:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:17
-msgid "_Time:"
-msgstr "_Hora:"
+#: ../calendar/gui/dialogs/task-page.glade.h:10
+#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:323
+#: ../calendar/gui/e-calendar-table.c:363
+msgid "Private"
+msgstr "Privado"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
-msgid "for"
-msgstr "para"
+#: ../calendar/gui/dialogs/task-page.glade.h:11
+#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:314
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:362
+msgid "Public"
+msgstr "Público"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:19
+msgid "Show time as _busy"
+msgstr "Mostrar hora como _ocupada"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:20
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "until"
-msgstr "hasta"
+#: ../calendar/gui/dialogs/task-page.glade.h:13
+msgid "Su_mmary:"
+msgstr "Resu_men:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:21
+msgid "This appointment has customized alarms"
+msgstr "Esta cita tiene alarmas personalizadas"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:22
+msgid "_Alarm"
+msgstr "_Alarma"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:23
+msgid "_Description:"
+msgstr "_Descripción:"
 
-#: ../calendar/gui/dialogs/meeting-page.c:305
+#: ../calendar/gui/dialogs/event-page.glade.h:24
+#: ../calendar/gui/e-meeting-time-sel.c:642
+msgid "_End time:"
+msgstr "Hora de _fin:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:25
+#: ../calendar/gui/e-meeting-time-sel.c:615
+msgid "_Start time:"
+msgstr "Hora de _inicio:"
+
+#: ../calendar/gui/dialogs/meeting-page.c:303
 msgid "<b>Dele_gatees</b>"
 msgstr "<b>_Delegados</b>"
 
-#: ../calendar/gui/dialogs/meeting-page.c:309
+#: ../calendar/gui/dialogs/meeting-page.c:307
 msgid "<b>From:</b>"
 msgstr "<b>De:</b>"
 
@@ -6279,10 +6020,10 @@ msgstr "<b>De:</b>"
 #. When "None" is selected we want the field to be cleared.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../calendar/gui/dialogs/meeting-page.c:315
+#: ../calendar/gui/dialogs/meeting-page.c:313
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:653
-#: ../calendar/gui/e-itip-control.c:1103 ../composer/e-msg-composer.c:2246
+#: ../calendar/gui/e-itip-control.c:1106 ../composer/e-msg-composer.c:2122
 #: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
 #: ../mail/em-account-editor.c:1348 ../mail/em-account-prefs.c:464
 #: ../mail/em-folder-view.c:1064 ../mail/em-junk-hook.c:78
@@ -6291,12 +6032,29 @@ msgstr "<b>De:</b>"
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:7
 #: ../plugins/itip-formatter/itip-formatter.c:1627
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
-#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:474
-#: ../widgets/misc/e-dateedit.c:1513 ../widgets/misc/e-dateedit.c:1727
+#: ../widgets/misc/e-cell-date-edit.c:248 ../widgets/misc/e-dateedit.c:465
+#: ../widgets/misc/e-dateedit.c:1504 ../widgets/misc/e-dateedit.c:1673
 msgid "None"
 msgstr "Ninguno"
 
+#: ../calendar/gui/dialogs/meeting-page.c:461
+msgid "The organizer selected no longer has an account."
+msgstr "El organizador seleccionado ya no tiene una cuenta."
+
+#: ../calendar/gui/dialogs/meeting-page.c:467
+msgid "An organizer is required."
+msgstr "Se requiere un organizador."
+
+#: ../calendar/gui/dialogs/meeting-page.c:482
+msgid "At least one attendee is required."
+msgstr "Es necesario por lo menos un participante."
+
+#: ../calendar/gui/dialogs/meeting-page.c:884
+msgid "_Delegate To..."
+msgstr "_Delegado a…"
+
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
+#: ../calendar/gui/e-meeting-list-view.c:358
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Participante"
@@ -6332,14 +6090,15 @@ msgid "Member"
 msgstr "Miembro"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:399
+#: ../calendar/gui/e-meeting-list-view.c:386
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Confirmar"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
+#: ../calendar/gui/dialogs/task-editor.c:146
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:410
+#: ../calendar/gui/e-meeting-list-view.c:394
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
 #: ../mail/message-list.etspec.h:12
 msgid "Status"
@@ -6354,8 +6113,13 @@ msgid "C_hange Organizer"
 msgstr "Cambiar or_ganizador"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Co_ntacts..."
-msgstr "_Contactos..."
+#: ../calendar/gui/e-meeting-time-sel.c:428
+msgid "Con_tacts..."
+msgstr "Con_tactos…"
+
+#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+msgid "Or_ganizer:"
+msgstr "Or_ganizador:"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "Organizer"
@@ -6366,50 +6130,6 @@ msgstr "Organizador"
 msgid "Organizer:"
 msgstr "Organizador:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:130 ../calendar/gui/print.c:2311
-msgid "Memo"
-msgstr "Nota"
-
-#: ../calendar/gui/dialogs/memo-page.c:489
-#, c-format
-msgid "Unable to open memos in '%s'."
-msgstr "No es posible abrir las notas en «%s»."
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:2
-msgid "<span weight=\"bold\">Basics</span>"
-msgstr "<span weight=\"bold\">Básicas</span>"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-msgid "Classi_fication:"
-msgstr "Clasi_ficación:"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
-#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:364
-msgid "Confidential"
-msgstr "Confidencial"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:363
-msgid "Private"
-msgstr "Privado"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:362
-msgid "Public"
-msgstr "Público"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:8
-#: ../calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Group:"
-msgstr "_Grupo:"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:9
-msgid "_Memo Content:"
-msgstr "Contenido de la _nota:"
-
 #: ../calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Opciones del calendario</b>"
@@ -6494,6 +6214,10 @@ msgstr "en"
 msgid "first"
 msgstr "primero"
 
+#: ../calendar/gui/dialogs/recurrence-page.c:990
+msgid "second"
+msgstr "segundo"
+
 #: ../calendar/gui/dialogs/recurrence-page.c:991
 msgid "third"
 msgstr "tercero"
@@ -6547,6 +6271,10 @@ msgstr "Cada"
 msgid "This appointment rec_urs"
 msgstr "Esta cita se _repite"
 
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "for"
+msgstr "para"
+
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "siempre"
@@ -6555,6 +6283,10 @@ msgstr "siempre"
 msgid "month(s)"
 msgstr "mes(es)"
 
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid "until"
+msgstr "hasta"
+
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "semana(s)"
@@ -6586,15 +6318,15 @@ msgstr "<span weight=\"bold\">Estado</span>"
 #: ../calendar/gui/e-cal-component-preview.c:229
 #: ../calendar/gui/e-cal-model-tasks.c:346
 #: ../calendar/gui/e-cal-model-tasks.c:659
-#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/e-itip-control.c:895
+#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/e-itip-control.c:898
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../calendar/gui/print.c:2372 ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/print.c:2370 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Terminado"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-calendar-table.c:384 ../mail/message-list.c:1018
+#: ../calendar/gui/e-calendar-table.c:384 ../mail/message-list.c:1008
 msgid "High"
 msgstr "Alta"
 
@@ -6603,20 +6335,20 @@ msgstr "Alta"
 #: ../calendar/gui/e-cal-model-tasks.c:344
 #: ../calendar/gui/e-cal-model-tasks.c:657
 #: ../calendar/gui/e-cal-model-tasks.c:732
-#: ../calendar/gui/e-calendar-table.c:458 ../calendar/gui/print.c:2369
+#: ../calendar/gui/e-calendar-table.c:458 ../calendar/gui/print.c:2367
 msgid "In Progress"
 msgstr "En proceso"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1016
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1006
 msgid "Low"
 msgstr "Baja"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-cal-model.c:920 ../calendar/gui/e-calendar-table.c:385
-#: ../mail/message-list.c:1017
+#: ../mail/message-list.c:1007
 msgid "Normal"
 msgstr "Normal"
 
@@ -6624,7 +6356,7 @@ msgstr "Normal"
 #: ../calendar/gui/e-cal-component-preview.c:236
 #: ../calendar/gui/e-cal-model-tasks.c:342
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:457 ../calendar/gui/print.c:2366
+#: ../calendar/gui/e-calendar-table.c:457 ../calendar/gui/print.c:2364
 msgid "Not Started"
 msgstr "Sin comenzar"
 
@@ -6633,73 +6365,66 @@ msgid "P_ercent complete:"
 msgstr "_Porcentaje completado:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:11
-msgid "Stat_us:"
-msgstr "_Estado:"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 #: ../calendar/gui/e-calendar-table.c:387
 msgid "Undefined"
 msgstr "Sin definir"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "_Date completed:"
 msgstr "_Fecha de terminación:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:14
+#: ../calendar/gui/dialogs/task-details-page.glade.h:13
 #: ../widgets/misc/e-send-options.glade.h:31
 msgid "_Priority:"
 msgstr "_Prioridad:"
 
+#: ../calendar/gui/dialogs/task-details-page.glade.h:14
+msgid "_Status:"
+msgstr "E_stado:"
+
 #: ../calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Web Page:"
 msgstr "Página _web:"
 
-#: ../calendar/gui/dialogs/task-editor.c:419
-#: ../calendar/gui/tasks-component.c:1172
-msgid "_Task"
-msgstr "_Tarea"
-
-#: ../calendar/gui/dialogs/task-editor.c:423
-msgid "Task Details"
-msgstr "Detalles"
+#: ../calendar/gui/dialogs/task-editor.c:137 ../calendar/gui/print.c:2309
+msgid "Task"
+msgstr "Tarea"
 
-#: ../calendar/gui/dialogs/task-page.c:436
-msgid "_Group"
-msgstr "_Grupo"
+#: ../calendar/gui/dialogs/task-editor.c:161
+#: ../calendar/gui/dialogs/task-editor.c:223
+#: ../calendar/gui/dialogs/task-editor.c:380
+msgid "Assignment"
+msgstr "Asignación"
 
-#: ../calendar/gui/dialogs/task-page.c:820
+#: ../calendar/gui/dialogs/task-page.c:529
 msgid "Due date is wrong"
 msgstr "La fecha de vencimiento es errónea"
 
-#: ../calendar/gui/dialogs/task-page.c:1613
+#: ../calendar/gui/dialogs/task-page.c:873
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "No es posible abrir las tareas en «%s»."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:2
-msgid "Categor_ies..."
-msgstr "_Categorías..."
-
-#: ../calendar/gui/dialogs/task-page.glade.h:3
+#: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "D_escription:"
 msgstr "_Descripción:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:4
-msgid "Or_ganiser:"
-msgstr "Or_ganizador:"
-
-#: ../calendar/gui/dialogs/task-page.glade.h:5
+#: ../calendar/gui/dialogs/task-page.glade.h:12
 msgid "Sta_rt date:"
 msgstr "Fecha de ini_cio:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:7
-msgid "Time zone:"
-msgstr "Zona horaria:"
+#: ../calendar/gui/dialogs/task-page.glade.h:14
+msgid "Task Description"
+msgstr "Descripción de la tarea"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../calendar/gui/dialogs/task-page.glade.h:15
 msgid "_Due date:"
 msgstr "Fecha de _vencimiento:"
 
+#: ../calendar/gui/dialogs/task-page.glade.h:16
+msgid "_Group:"
+msgstr "_Grupo:"
+
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Free/Busy C_alendars</b>"
 msgstr "<b>Calendarios de _disponibilidad</b>"
@@ -6825,27 +6550,17 @@ msgstr "%s a %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de disparador desconocido"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2704
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2703
 #, c-format
 msgid "Click to open %s"
 msgstr "Pulse para abrir %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:199
-msgid "Memo:"
-msgstr "Notas:"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:232
-#: ../calendar/gui/e-cal-component-preview.c:299
-msgid "Web Page:"
-msgstr "Página web:"
-
 #: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:796
 msgid "Untitled"
 msgstr "Sin título"
 
 #: ../calendar/gui/e-cal-component-preview.c:186
-#: ../calendar/gui/e-itip-control.c:1107
+#: ../calendar/gui/e-itip-control.c:1110
 #: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumen:"
@@ -6862,9 +6577,9 @@ msgstr "Fecha de vencimiento:"
 #. write status
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:222
-#: ../calendar/gui/e-itip-control.c:1131
+#: ../calendar/gui/e-itip-control.c:1134
 #: ../plugins/exchange-operations/exchange-account-setup.c:265
-#: ../plugins/itip-formatter/itip-view.c:908
+#: ../plugins/itip-formatter/itip-view.c:909
 msgid "Status:"
 msgstr "Estado:"
 
@@ -6872,6 +6587,10 @@ msgstr "Estado:"
 msgid "Priority:"
 msgstr "Prioridad:"
 
+#: ../calendar/gui/e-cal-component-preview.c:299
+msgid "Web Page:"
+msgstr "Página web:"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Fecha de terminación"
@@ -6882,8 +6601,7 @@ msgstr "Fecha 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:16
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../mail/mail-dialogs.glade.h:16 ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "Resumen"
 
@@ -6894,7 +6612,7 @@ msgstr "Libre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
 #: ../calendar/gui/e-calendar-table.c:437
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Busy"
 msgstr "Ocupada"
 
@@ -6925,17 +6643,15 @@ msgstr "No"
 
 #. This is the default filename used for temporary file creation
 #: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-model.c:330
-#: ../calendar/gui/e-cal-popup.c:106 ../calendar/gui/e-cal-popup.c:121
-#: ../calendar/gui/e-cal-popup.c:165 ../calendar/gui/e-itip-control.c:1148
-#: ../calendar/gui/e-itip-control.c:1289
+#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.c:1292
 #: ../calendar/gui/e-meeting-list-view.c:168
 #: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1283
+#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1244
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1652
 #: ../plugins/plugin-manager/plugin-manager.c:72
-#: ../widgets/misc/e-attachment-bar.c:690
+#: ../widgets/misc/e-attachment-bar.c:659
 #: ../widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "Desconocido"
@@ -6948,39 +6664,6 @@ msgstr "Repetición"
 msgid "Assigned"
 msgstr "Asignado"
 
-#: ../calendar/gui/e-cal-popup.c:171 ../mail/em-popup.c:411
-msgid "Save As..."
-msgstr "Guardar como..."
-
-#: ../calendar/gui/e-cal-popup.c:187 ../mail/em-format-html-display.c:1812
-msgid "Select folder to save selected attachments..."
-msgstr "Seleccione la carpeta donde guardar los adjuntos seleccionados..."
-
-#: ../calendar/gui/e-cal-popup.c:216 ../mail/em-popup.c:436
-#, c-format
-msgid "untitled_image.%s"
-msgstr "imagen-_sin-título.%s"
-
-#: ../calendar/gui/e-cal-popup.c:270 ../calendar/gui/e-calendar-table.c:1169
-#: ../calendar/gui/e-calendar-view.c:1556 ../calendar/gui/e-memo-table.c:847
-#: ../mail/em-folder-view.c:1045 ../mail/em-popup.c:553 ../mail/em-popup.c:564
-msgid "_Save As..."
-msgstr "Guardar _como..."
-
-#: ../calendar/gui/e-cal-popup.c:271 ../mail/em-popup.c:554
-#: ../mail/em-popup.c:565
-msgid "Set as _Background"
-msgstr "Establecer como _fondo"
-
-#: ../calendar/gui/e-cal-popup.c:272
-msgid "_Save Selected"
-msgstr "_Guardar seleccionados"
-
-#: ../calendar/gui/e-cal-popup.c:394 ../mail/em-popup.c:774
-#, c-format
-msgid "Open in %s..."
-msgstr "Abrir en %s..."
-
 #: ../calendar/gui/e-calendar-table.c:406
 msgid "0%"
 msgstr "0%"
@@ -7030,58 +6713,58 @@ msgid "Task Table"
 msgstr "Tabla de tareas"
 
 #: ../calendar/gui/e-calendar-table.c:696
-#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:426
+#: ../calendar/gui/e-calendar-view.c:671
 msgid "Deleting selected objects"
 msgstr "Borrando los objetos seleccionados"
 
 #: ../calendar/gui/e-calendar-table.c:875
-#: ../calendar/gui/e-calendar-view.c:805 ../calendar/gui/e-memo-table.c:603
+#: ../calendar/gui/e-calendar-view.c:799
 msgid "Updating objects"
 msgstr "Actualizando objetos"
 
 #: ../calendar/gui/e-calendar-table.c:1025
-#: ../calendar/gui/e-calendar-view.c:1132 ../calendar/gui/e-memo-table.c:735
-#: ../composer/e-msg-composer.c:1341
+#: ../calendar/gui/e-calendar-view.c:1122 ../composer/e-msg-composer.c:1243
 msgid "Save as..."
-msgstr "Guardar como..."
+msgstr "Guardar como…"
 
-#: ../calendar/gui/e-calendar-table.c:1168 ../calendar/gui/e-memo-table.c:846
+#: ../calendar/gui/e-calendar-table.c:1168
 msgid "Open _Web Page"
 msgstr "Abrir página _web"
 
+#: ../calendar/gui/e-calendar-table.c:1169
+#: ../calendar/gui/e-calendar-view.c:1546 ../mail/em-folder-view.c:1045
+#: ../mail/em-popup.c:541 ../mail/em-popup.c:552
+msgid "_Save As..."
+msgstr "Guardar _como…"
+
 #: ../calendar/gui/e-calendar-table.c:1170
-#: ../calendar/gui/e-calendar-view.c:1536
-#: ../calendar/gui/e-calendar-view.c:1557 ../calendar/gui/e-memo-table.c:848
-#: ../mail/em-folder-view.c:1046
+#: ../calendar/gui/e-calendar-view.c:1526
+#: ../calendar/gui/e-calendar-view.c:1547 ../mail/em-folder-view.c:1046
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:122 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:120 ../ui/evolution-tasks.xml.h:27
 msgid "_Print..."
-msgstr "Im_primir..."
+msgstr "Im_primir…"
 
 #: ../calendar/gui/e-calendar-table.c:1174
-#: ../calendar/gui/e-calendar-view.c:1561 ../calendar/gui/e-memo-table.c:852
-#: ../ui/evolution-addressbook.xml.h:1 ../ui/evolution-calendar.xml.h:1
-#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-view.c:1551 ../ui/evolution-addressbook.xml.h:1
+#: ../ui/evolution-calendar.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "C_ortar"
 
 #: ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:1539
-#: ../calendar/gui/e-calendar-view.c:1563 ../calendar/gui/e-memo-table.c:854
-#: ../ui/evolution-addressbook.xml.h:39 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-composer-entries.xml.h:9 ../ui/evolution-editor.xml.h:22
-#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
+#: ../calendar/gui/e-calendar-view.c:1529
+#: ../calendar/gui/e-calendar-view.c:1553 ../ui/evolution-addressbook.xml.h:38
+#: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
+#: ../ui/evolution-tasks.xml.h:26
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: ../calendar/gui/e-calendar-table.c:1180 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1180 ../ui/evolution-tasks.xml.h:20
 msgid "_Assign Task"
 msgstr "_Asignar tarea"
 
-#: ../calendar/gui/e-calendar-table.c:1181 ../calendar/gui/e-memo-table.c:858
-#: ../ui/evolution-tasks.xml.h:26
+#: ../calendar/gui/e-calendar-table.c:1181 ../ui/evolution-tasks.xml.h:24
 msgid "_Forward as iCalendar"
 msgstr "_Reenviar como iCalendar"
 
@@ -7093,11 +6776,20 @@ msgstr "_Marcar como terminado"
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar tareas seleccionadas como terminadas"
 
+#. FIXME: need to disable for undeletable folders
+#: ../calendar/gui/e-calendar-table.c:1187
+#: ../calendar/gui/e-calendar-view.c:1565 ../mail/em-folder-tree.c:2048
+#: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:33
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
+#: ../ui/evolution-tasks.xml.h:22
+msgid "_Delete"
+msgstr "_Borrar"
+
 #: ../calendar/gui/e-calendar-table.c:1188
 msgid "_Delete Selected Tasks"
 msgstr "_Borrar las tareas seleccionadas"
 
-#: ../calendar/gui/e-calendar-table.c:1421
+#: ../calendar/gui/e-calendar-table.c:1407
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Pulse para añadir una tarea"
@@ -7132,78 +6824,73 @@ msgstr "Fecha de inicio"
 msgid "Task sort"
 msgstr "Ordenar tareas"
 
-#: ../calendar/gui/e-calendar-view.c:1258
+#: ../calendar/gui/e-calendar-view.c:1248
 msgid "Moving items"
 msgstr "Moviendo elementos"
 
-#: ../calendar/gui/e-calendar-view.c:1260
+#: ../calendar/gui/e-calendar-view.c:1250
 msgid "Copying items"
 msgstr "Copiando elementos"
 
-#: ../calendar/gui/e-calendar-view.c:1530
+#: ../calendar/gui/e-calendar-view.c:1520
 msgid "New _Appointment..."
-msgstr "_Cita nueva..."
+msgstr "_Cita nueva…"
 
-#: ../calendar/gui/e-calendar-view.c:1531
+#: ../calendar/gui/e-calendar-view.c:1521
 msgid "New All Day _Event"
 msgstr "Acont_ecimiento nuevo para todo el día"
 
-#: ../calendar/gui/e-calendar-view.c:1532
-msgid "New _Meeting"
-msgstr "_Reunión nueva"
-
-#: ../calendar/gui/e-calendar-view.c:1533
-msgid "New _Task"
-msgstr "_Tarea nueva"
+#: ../calendar/gui/e-calendar-view.c:1523
+msgid "New Task"
+msgstr "Tarea nueva"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1543
-#: ../widgets/menus/gal-view-menus.c:291
-msgid "_Current View"
-msgstr "Vista _actual"
+#: ../calendar/gui/e-calendar-view.c:1533
+msgid "Current View"
+msgstr "Vista actual"
 
-#: ../calendar/gui/e-calendar-view.c:1545
-msgid "Select T_oday"
+#: ../calendar/gui/e-calendar-view.c:1535 ../ui/evolution-calendar.xml.h:26
+msgid "Select _Today"
 msgstr "Seleccionar _hoy"
 
-#: ../calendar/gui/e-calendar-view.c:1546
+#: ../calendar/gui/e-calendar-view.c:1536
 msgid "_Select Date..."
-msgstr "_Seleccionar fecha..."
+msgstr "_Seleccionar fecha…"
 
 #. TODO: Why is this in a context menu when it applies globally?
-#: ../calendar/gui/e-calendar-view.c:1551 ../ui/evolution-calendar.xml.h:45
+#: ../calendar/gui/e-calendar-view.c:1541 ../ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar la información de disponibilidad"
 
-#: ../calendar/gui/e-calendar-view.c:1567
+#: ../calendar/gui/e-calendar-view.c:1557
 msgid "Cop_y to Calendar..."
-msgstr "Cop_ia al calendario..."
+msgstr "Cop_ia al calendario…"
 
-#: ../calendar/gui/e-calendar-view.c:1568
+#: ../calendar/gui/e-calendar-view.c:1558
 msgid "Mo_ve to Calendar..."
-msgstr "Mo_ver al calendario..."
+msgstr "Mo_ver al calendario…"
 
-#: ../calendar/gui/e-calendar-view.c:1569
+#: ../calendar/gui/e-calendar-view.c:1559
 msgid "_Delegate Meeting..."
-msgstr "_Delegar reunión..."
+msgstr "_Delegar reunión…"
 
-#: ../calendar/gui/e-calendar-view.c:1570
+#: ../calendar/gui/e-calendar-view.c:1560
 msgid "_Schedule Meeting..."
-msgstr "Concertar una _reunión..."
+msgstr "Concertar una _reunión…"
 
-#: ../calendar/gui/e-calendar-view.c:1571
+#: ../calendar/gui/e-calendar-view.c:1561
 msgid "_Forward as iCalendar..."
-msgstr "Reenviar como i_Calendar..."
+msgstr "Reenviar como i_Calendar…"
 
-#: ../calendar/gui/e-calendar-view.c:1576
+#: ../calendar/gui/e-calendar-view.c:1566
 msgid "Make this Occurrence _Movable"
 msgstr "Hacer esta repetición _movible"
 
-#: ../calendar/gui/e-calendar-view.c:1577
+#: ../calendar/gui/e-calendar-view.c:1567
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _repetición"
 
-#: ../calendar/gui/e-calendar-view.c:1578
+#: ../calendar/gui/e-calendar-view.c:1568
 msgid "Delete _All Occurrences"
 msgstr "Borrar tod_as las repeticiones"
 
@@ -7266,103 +6953,103 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:760
+#: ../calendar/gui/e-itip-control.c:763
 msgid "Yes. (Complex Recurrence)"
 msgstr "Sí. (Repetición compuesta)"
 
-#: ../calendar/gui/e-itip-control.c:771
+#: ../calendar/gui/e-itip-control.c:774
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Cada día"
 msgstr[1] "Cada %d días"
 
-#: ../calendar/gui/e-itip-control.c:776
+#: ../calendar/gui/e-itip-control.c:779
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Cada semana"
 msgstr[1] "Cada %d semanas"
 
-#: ../calendar/gui/e-itip-control.c:778
+#: ../calendar/gui/e-itip-control.c:781
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Cada semana en"
 msgstr[1] "Cada %d semanas el"
 
-#: ../calendar/gui/e-itip-control.c:786
+#: ../calendar/gui/e-itip-control.c:789
 msgid " and "
 msgstr " y "
 
-#: ../calendar/gui/e-itip-control.c:793
+#: ../calendar/gui/e-itip-control.c:796
 #, c-format
 msgid "The %s day of "
 msgstr "El %s día de "
 
-#: ../calendar/gui/e-itip-control.c:806
+#: ../calendar/gui/e-itip-control.c:809
 #, c-format
 msgid "The %s %s of "
 msgstr "El %s %s de"
 
-#: ../calendar/gui/e-itip-control.c:813
+#: ../calendar/gui/e-itip-control.c:816
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "cada mes"
 msgstr[1] "cada %d meses"
 
-#: ../calendar/gui/e-itip-control.c:817
+#: ../calendar/gui/e-itip-control.c:820
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Cada año"
 msgstr[1] "Cada %d años"
 
-#: ../calendar/gui/e-itip-control.c:828
+#: ../calendar/gui/e-itip-control.c:831
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] "un total de %d vez"
 msgstr[1] " un total de %d veces"
 
-#: ../calendar/gui/e-itip-control.c:837
+#: ../calendar/gui/e-itip-control.c:840
 msgid ", ending on "
 msgstr ", terminando en "
 
-#: ../calendar/gui/e-itip-control.c:861
+#: ../calendar/gui/e-itip-control.c:864
 msgid "Starts"
 msgstr "Empieza"
 
-#: ../calendar/gui/e-itip-control.c:874
+#: ../calendar/gui/e-itip-control.c:877
 msgid "Ends"
 msgstr "Termina"
 
-#: ../calendar/gui/e-itip-control.c:908
+#: ../calendar/gui/e-itip-control.c:911
 #: ../plugins/save-calendar/csv-format.c:395
 msgid "Due"
 msgstr "Vence "
 
-#: ../calendar/gui/e-itip-control.c:948 ../calendar/gui/e-itip-control.c:1005
+#: ../calendar/gui/e-itip-control.c:951 ../calendar/gui/e-itip-control.c:1008
 msgid "iCalendar Information"
 msgstr "Información de iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:965
+#: ../calendar/gui/e-itip-control.c:968
 msgid "iCalendar Error"
 msgstr "Error de iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1037 ../calendar/gui/e-itip-control.c:1053
-#: ../calendar/gui/e-itip-control.c:1064 ../calendar/gui/e-itip-control.c:1081
-#: ../plugins/itip-formatter/itip-view.c:337
+#: ../calendar/gui/e-itip-control.c:1040 ../calendar/gui/e-itip-control.c:1056
+#: ../calendar/gui/e-itip-control.c:1067 ../calendar/gui/e-itip-control.c:1084
 #: ../plugins/itip-formatter/itip-view.c:338
-#: ../plugins/itip-formatter/itip-view.c:405
+#: ../plugins/itip-formatter/itip-view.c:339
 #: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:407
 msgid "An unknown person"
 msgstr "Una persona desconocida"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1088
+#: ../calendar/gui/e-itip-control.c:1091
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7370,28 +7057,28 @@ msgstr ""
 "<br> Revise la siguiente información y seleccione una acción del menú de "
 "abajo."
 
-#: ../calendar/gui/e-itip-control.c:1136
+#: ../calendar/gui/e-itip-control.c:1139
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:546
+#: ../calendar/gui/itip-utils.c:548
 #: ../plugins/itip-formatter/itip-formatter.c:1640
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: ../calendar/gui/e-itip-control.c:1140 ../calendar/gui/itip-utils.c:549
+#: ../calendar/gui/e-itip-control.c:1143 ../calendar/gui/itip-utils.c:551
 #: ../plugins/itip-formatter/itip-formatter.c:1643
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
-#: ../calendar/gui/e-itip-control.c:1144
+#: ../calendar/gui/e-itip-control.c:1147
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/itip-utils.c:552 ../calendar/gui/itip-utils.c:581
+#: ../calendar/gui/itip-utils.c:554 ../calendar/gui/itip-utils.c:583
 #: ../plugins/itip-formatter/itip-formatter.c:1646
 msgid "Declined"
 msgstr "Rechazado"
 
-#: ../calendar/gui/e-itip-control.c:1228
+#: ../calendar/gui/e-itip-control.c:1231
 msgid ""
 "The meeting has been cancelled, however it could not be found in your "
 "calendars"
@@ -7399,269 +7086,269 @@ msgstr ""
 "La reunión ha sido cancelada, sin embargo no pudo encontrarse en sus "
 "calendarios"
 
-#: ../calendar/gui/e-itip-control.c:1230
+#: ../calendar/gui/e-itip-control.c:1233
 msgid "The task has been cancelled, however it could not be found in your task lists"
 msgstr ""
 "La tarea ha sido cancelada, sin embargo no pudo encontrarse en sus listas de "
 "tareas"
 
-#: ../calendar/gui/e-itip-control.c:1309
+#: ../calendar/gui/e-itip-control.c:1312
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ha publicado información de reunión."
 
-#: ../calendar/gui/e-itip-control.c:1310
+#: ../calendar/gui/e-itip-control.c:1313
 msgid "Meeting Information"
 msgstr "Información de reunió"
 
-#: ../calendar/gui/e-itip-control.c:1316
+#: ../calendar/gui/e-itip-control.c:1319
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> solicita la presencia de %s en una reunión."
 
-#: ../calendar/gui/e-itip-control.c:1318
+#: ../calendar/gui/e-itip-control.c:1321
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> solicita su presencia en una reunión."
 
-#: ../calendar/gui/e-itip-control.c:1319
+#: ../calendar/gui/e-itip-control.c:1322
 msgid "Meeting Proposal"
 msgstr "Propuesta de reunión"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1325
+#: ../calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> desea apuntarse a una reunión existente."
 
-#: ../calendar/gui/e-itip-control.c:1326
+#: ../calendar/gui/e-itip-control.c:1329
 msgid "Meeting Update"
 msgstr "Actualización de reunión"
 
-#: ../calendar/gui/e-itip-control.c:1330
+#: ../calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> desea recibir la última información de la reunión."
 
-#: ../calendar/gui/e-itip-control.c:1331
+#: ../calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update Request"
 msgstr "Solicitud de actualización de la reunión"
 
-#: ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-itip-control.c:1341
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> ha contestado a la solicitud de reunión."
 
-#: ../calendar/gui/e-itip-control.c:1339
+#: ../calendar/gui/e-itip-control.c:1342
 msgid "Meeting Reply"
 msgstr "Respuesta de reunión"
 
-#: ../calendar/gui/e-itip-control.c:1346
+#: ../calendar/gui/e-itip-control.c:1349
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> ha cancelado una reunión."
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1350
 msgid "Meeting Cancellation"
 msgstr "Cancelación de reunión"
 
-#: ../calendar/gui/e-itip-control.c:1357 ../calendar/gui/e-itip-control.c:1434
-#: ../calendar/gui/e-itip-control.c:1474
+#: ../calendar/gui/e-itip-control.c:1360 ../calendar/gui/e-itip-control.c:1437
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> ha enviado un mensaje ininteligible."
 
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1361
 msgid "Bad Meeting Message"
 msgstr "Mensaje de reunión erróneo"
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1388
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> ha publicado la información de la tarea."
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1389
 msgid "Task Information"
 msgstr "Información de la tarea"
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1396
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> pide a %s que realice una tarea."
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1398
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> le pide que realice una tarea."
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1399
 msgid "Task Proposal"
 msgstr "Propuesta de tarea"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1402
+#: ../calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> desea añadirse a una tarea existente."
 
-#: ../calendar/gui/e-itip-control.c:1403
+#: ../calendar/gui/e-itip-control.c:1406
 msgid "Task Update"
 msgstr "Actualización de tarea"
 
-#: ../calendar/gui/e-itip-control.c:1407
+#: ../calendar/gui/e-itip-control.c:1410
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> quiere recibir la última información de la tarea."
 
-#: ../calendar/gui/e-itip-control.c:1408
+#: ../calendar/gui/e-itip-control.c:1411
 msgid "Task Update Request"
 msgstr "Solicitud de actualización de tarea"
 
-#: ../calendar/gui/e-itip-control.c:1415
+#: ../calendar/gui/e-itip-control.c:1418
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> ha contestado a una asignación de tarea."
 
-#: ../calendar/gui/e-itip-control.c:1416
+#: ../calendar/gui/e-itip-control.c:1419
 msgid "Task Reply"
 msgstr "Respuesta a una tarea"
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1426
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> ha cancelado una tarea."
 
-#: ../calendar/gui/e-itip-control.c:1424
+#: ../calendar/gui/e-itip-control.c:1427
 msgid "Task Cancellation"
 msgstr "Cancelación de tarea"
 
-#: ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1438
 msgid "Bad Task Message"
 msgstr "Mensaje de tarea erróneo"
 
-#: ../calendar/gui/e-itip-control.c:1459
+#: ../calendar/gui/e-itip-control.c:1462
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> ha publicado la información de disponibilidad."
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Free/Busy Information"
 msgstr "Información de disponibilidad"
 
-#: ../calendar/gui/e-itip-control.c:1464
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> pide su información de disponibilidad."
 
-#: ../calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Free/Busy Request"
 msgstr "Solicitud de disponibilidad"
 
-#: ../calendar/gui/e-itip-control.c:1469
+#: ../calendar/gui/e-itip-control.c:1472
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> ha contestado a una solicitud de disponibilidad."
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1473
 msgid "Free/Busy Reply"
 msgstr "Respuesta sobre disponibilidad"
 
-#: ../calendar/gui/e-itip-control.c:1475
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Bad Free/Busy Message"
 msgstr "Mensaje de disponibilidad erróneo"
 
-#: ../calendar/gui/e-itip-control.c:1550
+#: ../calendar/gui/e-itip-control.c:1553
 msgid "The message does not appear to be properly formed"
 msgstr "El mensaje no parece estar formado correctamente"
 
-#: ../calendar/gui/e-itip-control.c:1609
+#: ../calendar/gui/e-itip-control.c:1612
 msgid "The message contains only unsupported requests."
 msgstr "Este mensaje sólo contiene solicitudes no soportadas."
 
-#: ../calendar/gui/e-itip-control.c:1642
+#: ../calendar/gui/e-itip-control.c:1645
 msgid "The attachment does not contain a valid calendar message"
 msgstr "El adjunto no contiene un mensaje de calendario válido"
 
-#: ../calendar/gui/e-itip-control.c:1674
+#: ../calendar/gui/e-itip-control.c:1677
 msgid "The attachment has no viewable calendar items"
 msgstr "El adjunto no tiene elementos de calendario visibles"
 
-#: ../calendar/gui/e-itip-control.c:1908
+#: ../calendar/gui/e-itip-control.c:1911
 msgid "Update complete\n"
 msgstr "Actualización terminada\n"
 
-#: ../calendar/gui/e-itip-control.c:1936
+#: ../calendar/gui/e-itip-control.c:1939
 msgid "Object is invalid and cannot be updated\n"
 msgstr "El objeto es inválido y no puede ser actualizado\n"
 
-#: ../calendar/gui/e-itip-control.c:1946
+#: ../calendar/gui/e-itip-control.c:1949
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Esta respuesta no es de un participante. ¿Desea añadirlo como participante?"
 
-#: ../calendar/gui/e-itip-control.c:1958
+#: ../calendar/gui/e-itip-control.c:1961
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "El estado del participante no se pudo actualizar debido a un estado "
 "inválido\n"
 
-#: ../calendar/gui/e-itip-control.c:1975
+#: ../calendar/gui/e-itip-control.c:1978
 msgid "Attendee status updated\n"
 msgstr "Estado del participante actualizado\n"
 
-#: ../calendar/gui/e-itip-control.c:1978
+#: ../calendar/gui/e-itip-control.c:1981
 #: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "El estado del participante no se pudo actualizar porque ya no existe el "
 "elemento"
 
-#: ../calendar/gui/e-itip-control.c:2008
+#: ../calendar/gui/e-itip-control.c:2011
 msgid "Removal Complete"
 msgstr "Eliminación terminada"
 
-#: ../calendar/gui/e-itip-control.c:2031 ../calendar/gui/e-itip-control.c:2079
+#: ../calendar/gui/e-itip-control.c:2034 ../calendar/gui/e-itip-control.c:2082
 msgid "Item sent!\n"
 msgstr "Elemento enviado.\n"
 
-#: ../calendar/gui/e-itip-control.c:2033 ../calendar/gui/e-itip-control.c:2083
+#: ../calendar/gui/e-itip-control.c:2036 ../calendar/gui/e-itip-control.c:2086
 msgid "The item could not be sent!\n"
 msgstr "El elemento no pudo enviarse.\n"
 
-#: ../calendar/gui/e-itip-control.c:2163
+#: ../calendar/gui/e-itip-control.c:2166
 msgid "Choose an action:"
 msgstr "Elija una acción:"
 
-#: ../calendar/gui/e-itip-control.c:2234
+#: ../calendar/gui/e-itip-control.c:2237
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../calendar/gui/e-itip-control.c:2262
+#: ../calendar/gui/e-itip-control.c:2265
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Aceptar"
 
-#: ../calendar/gui/e-itip-control.c:2263
+#: ../calendar/gui/e-itip-control.c:2266
 msgid "Tentatively accept"
 msgstr "Aceptar provisionalmente"
 
-#: ../calendar/gui/e-itip-control.c:2264
+#: ../calendar/gui/e-itip-control.c:2267
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Declinar"
 
-#: ../calendar/gui/e-itip-control.c:2293
+#: ../calendar/gui/e-itip-control.c:2296
 msgid "Send Free/Busy Information"
 msgstr "Enviar información de disponibilidad"
 
-#: ../calendar/gui/e-itip-control.c:2321
+#: ../calendar/gui/e-itip-control.c:2324
 msgid "Update respondent status"
 msgstr "Actualizar el estado del remitente"
 
-#: ../calendar/gui/e-itip-control.c:2349
+#: ../calendar/gui/e-itip-control.c:2352
 msgid "Send Latest Information"
 msgstr "Enviar la última información"
 
-#: ../calendar/gui/e-itip-control.c:2377 ../calendar/gui/itip-utils.c:569
+#: ../calendar/gui/e-itip-control.c:2380 ../calendar/gui/itip-utils.c:571
 #: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
@@ -7690,7 +7377,7 @@ msgstr "Cargando calendario"
 
 #: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
-msgstr "Cargando calendario..."
+msgstr "Cargando calendario…"
 
 #: ../calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
@@ -7773,22 +7460,17 @@ msgstr "Necesita acción"
 
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Tentative"
 msgstr "Provisional"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
 #: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/itip-utils.c:555
+#: ../calendar/gui/itip-utils.c:557
 #: ../plugins/itip-formatter/itip-formatter.c:1649
 msgid "Delegated"
 msgstr "Delegado"
 
-#. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:361
-msgid "Attendee                          "
-msgstr "Participante                          "
-
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
 msgid "In Process"
 msgstr "En proceso"
@@ -7796,7 +7478,7 @@ msgstr "En proceso"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:444
-#: ../calendar/gui/e-meeting-time-sel.c:2105
+#: ../calendar/gui/e-meeting-time-sel.c:2102
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B, %Y"
 
@@ -7807,7 +7489,7 @@ msgstr "%A, %d de %B, %Y"
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
 #: ../calendar/gui/e-meeting-time-sel-item.c:448
-#: ../calendar/gui/e-meeting-time-sel.c:2138 ../e-util/e-time-utils.c:203
+#: ../calendar/gui/e-meeting-time-sel.c:2135 ../e-util/e-time-utils.c:203
 #: ../e-util/e-time-utils.c:296 ../e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
@@ -7819,92 +7501,68 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format for a short date. %m = month,
 #. %d = day of month, %Y = year (all digits).
 #: ../calendar/gui/e-meeting-time-sel-item.c:452 ../e-util/e-time-utils.c:238
-#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1736
+#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1682
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:416 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Fuera de la oficina"
 
-#: ../calendar/gui/e-meeting-time-sel.c:417
+#: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "No Information"
 msgstr "Sin información"
 
-#: ../calendar/gui/e-meeting-time-sel.c:431
-msgid "Con_tacts..."
-msgstr "Con_tactos..."
-
-#: ../calendar/gui/e-meeting-time-sel.c:448
+#: ../calendar/gui/e-meeting-time-sel.c:445
 msgid "O_ptions"
 msgstr "O_pciones"
 
-#: ../calendar/gui/e-meeting-time-sel.c:465
+#: ../calendar/gui/e-meeting-time-sel.c:462
 msgid "Show _only working hours"
 msgstr "Mostrar _sólo las horas de trabajo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:475
+#: ../calendar/gui/e-meeting-time-sel.c:472
 msgid "Show _zoomed out"
 msgstr "Mostrar quitando _ampliación"
 
-#: ../calendar/gui/e-meeting-time-sel.c:490
+#: ../calendar/gui/e-meeting-time-sel.c:487
 msgid "_Update free/busy"
 msgstr "_Actualizar disponibilidad"
 
-#: ../calendar/gui/e-meeting-time-sel.c:505
+#: ../calendar/gui/e-meeting-time-sel.c:502
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:523
+#: ../calendar/gui/e-meeting-time-sel.c:520
 msgid "_Autopick"
 msgstr "_Auto-seleccionar"
 
-#: ../calendar/gui/e-meeting-time-sel.c:538
+#: ../calendar/gui/e-meeting-time-sel.c:535
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:555
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "_All people and resources"
 msgstr "_Todas las personas y los recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:564
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "All _people and one resource"
 msgstr "Todas las _personas y un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:573
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "_Required people"
 msgstr "Personas _requeridas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:582
+#: ../calendar/gui/e-meeting-time-sel.c:579
 msgid "Required people and _one resource"
 msgstr "Personas requeridas y _un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:618
-msgid "_Start time:"
-msgstr "Hora de _inicio:"
-
-#: ../calendar/gui/e-meeting-time-sel.c:645
-msgid "_End time:"
-msgstr "Hora de _fin:"
-
-#: ../calendar/gui/e-memo-table.c:267
-msgid "Memo Table"
-msgstr "Tabla de notas"
-
-#: ../calendar/gui/e-memo-table.c:863
-msgid "_Delete Selected Memos"
-msgstr "_Borrar las notas seleccionadas"
-
-#: ../calendar/gui/e-memo-table.c:986 ../calendar/gui/e-memo-table.etspec.h:2
-msgid "Click to add a memo"
-msgstr "Pulse para añadir una nota"
-
-#: ../calendar/gui/e-memo-table.etspec.h:3
-msgid "Memo sort"
-msgstr "Ordenar nota"
+#: ../calendar/gui/e-pub-utils.c:321
+#, c-format
+msgid "Enter the password for %s"
+msgstr "Introduzca su contraseña para %s"
 
-#: ../calendar/gui/e-memos.c:727 ../calendar/gui/e-tasks.c:822
-#: ../calendar/gui/gnome-cal.c:2556
+#: ../calendar/gui/e-tasks.c:820 ../calendar/gui/gnome-cal.c:2554
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7913,38 +7571,24 @@ msgstr ""
 "Error en %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:775
-msgid "Loading memos"
-msgstr "Cargando notas"
-
-#: ../calendar/gui/e-memos.c:860
-#, c-format
-msgid "Opening memos at %s"
-msgstr "Abriendo notas en %s"
-
-#: ../calendar/gui/e-memos.c:1033 ../calendar/gui/e-tasks.c:1225
-msgid "Deleting selected objects..."
-msgstr "Borrando los objetos seleccionados..."
-
-#: ../calendar/gui/e-pub-utils.c:322
-#, c-format
-msgid "Enter the password for %s"
-msgstr "Introduzca su contraseña para %s"
-
-#: ../calendar/gui/e-tasks.c:870
+#: ../calendar/gui/e-tasks.c:868
 msgid "Loading tasks"
 msgstr "Cargando tareas"
 
-#: ../calendar/gui/e-tasks.c:957
+#: ../calendar/gui/e-tasks.c:952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abriendo tareas en %s"
 
-#: ../calendar/gui/e-tasks.c:1202
+#: ../calendar/gui/e-tasks.c:1151
 msgid "Completing tasks..."
-msgstr "Terminando tareas..."
+msgstr "Terminando tareas…"
 
-#: ../calendar/gui/e-tasks.c:1252
+#: ../calendar/gui/e-tasks.c:1174
+msgid "Deleting selected objects..."
+msgstr "Borrando los objetos seleccionados…"
+
+#: ../calendar/gui/e-tasks.c:1201
 msgid "Expunging"
 msgstr "Compactando"
 
@@ -7963,36 +7607,39 @@ msgstr "%d de %B"
 msgid "Updating query"
 msgstr "Actualizando consulta"
 
-#: ../calendar/gui/gnome-cal.c:2231
-msgid "_Custom View"
-msgstr "Vista _personalizada"
+#. bonobo displays this string so it must be in locale
+#: ../calendar/gui/gnome-cal.c:2231 ../widgets/menus/gal-view-instance.c:585
+#: ../widgets/menus/gal-view-menus.c:350
+msgid "Custom View"
+msgstr "Vista personalizada"
 
-#: ../calendar/gui/gnome-cal.c:2232
-msgid "_Save Custom View"
-msgstr "_Guardar vista personalizada"
+#: ../calendar/gui/gnome-cal.c:2232 ../widgets/menus/gal-view-instance.c:586
+msgid "Save Custom View"
+msgstr "Guardar vista personalizada"
 
-#: ../calendar/gui/gnome-cal.c:2237
-msgid "_Define Views..."
-msgstr "_Definir vistas..."
+#: ../calendar/gui/gnome-cal.c:2237 ../widgets/menus/gal-view-instance.c:590
+#: ../widgets/menus/gal-view-menus.c:372
+msgid "Define Views..."
+msgstr "Definir vistas…"
 
-#: ../calendar/gui/gnome-cal.c:2399
+#: ../calendar/gui/gnome-cal.c:2400
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Cargando citas de %s"
 
-#: ../calendar/gui/gnome-cal.c:2418
+#: ../calendar/gui/gnome-cal.c:2419
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Cargando tareas de %s"
 
-#: ../calendar/gui/gnome-cal.c:2522
+#: ../calendar/gui/gnome-cal.c:2520
 #, c-format
 msgid "Opening %s"
 msgstr "Abriendo %s"
 
-#: ../calendar/gui/gnome-cal.c:3440
+#: ../calendar/gui/gnome-cal.c:3437
 msgid "Purging"
-msgstr "Compactando"
+msgstr "Purgando"
 
 #: ../calendar/gui/goto-dialog.glade.h:1
 msgid "April"
@@ -8050,139 +7697,60 @@ msgstr "Septiembre"
 msgid "_Select Today"
 msgstr "_Seleccionar hoy"
 
-#: ../calendar/gui/itip-utils.c:351 ../calendar/gui/itip-utils.c:400
-#: ../calendar/gui/itip-utils.c:440
+#: ../calendar/gui/itip-utils.c:353 ../calendar/gui/itip-utils.c:402
+#: ../calendar/gui/itip-utils.c:442
 msgid "An organizer must be set."
 msgstr "Debe especificar un organizador."
 
-#: ../calendar/gui/itip-utils.c:387
+#: ../calendar/gui/itip-utils.c:389
 msgid "At least one attendee is necessary"
 msgstr "Es necesario por lo menos un participante"
 
-#: ../calendar/gui/itip-utils.c:508 ../calendar/gui/itip-utils.c:630
+#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:632
 msgid "Event information"
 msgstr "Información del acontecimiento"
 
-#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:632
+#: ../calendar/gui/itip-utils.c:512 ../calendar/gui/itip-utils.c:634
 msgid "Task information"
 msgstr "Información de la tarea"
 
-#: ../calendar/gui/itip-utils.c:512 ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:514 ../calendar/gui/itip-utils.c:636
 msgid "Journal information"
 msgstr "Información de la entrada de diario"
 
-#: ../calendar/gui/itip-utils.c:514 ../calendar/gui/itip-utils.c:652
+#: ../calendar/gui/itip-utils.c:516 ../calendar/gui/itip-utils.c:654
 msgid "Free/Busy information"
 msgstr "Información de disponibilidad"
 
-#: ../calendar/gui/itip-utils.c:516
+#: ../calendar/gui/itip-utils.c:518
 msgid "Calendar information"
 msgstr "Información de calendario"
 
-#: ../calendar/gui/itip-utils.c:565
+#: ../calendar/gui/itip-utils.c:567
 msgid "Updated"
 msgstr "Actualizado"
 
-#: ../calendar/gui/itip-utils.c:573
+#: ../calendar/gui/itip-utils.c:575
 msgid "Refresh"
 msgstr "Regenerar"
 
-#: ../calendar/gui/itip-utils.c:577
+#: ../calendar/gui/itip-utils.c:579
 msgid "Counter-proposal"
 msgstr "Contra-propuesta"
 
-#: ../calendar/gui/itip-utils.c:648
+#: ../calendar/gui/itip-utils.c:650
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Información de disponibilidad (de %s a %s)"
 
-#: ../calendar/gui/itip-utils.c:658
+#: ../calendar/gui/itip-utils.c:660
 msgid "iCalendar information"
 msgstr "Información de iCalendar"
 
-#: ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:815
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un participante en el acontecimiento."
 
-#: ../calendar/gui/memos-component.c:449 ../ui/evolution-addressbook.xml.h:3
-#: ../ui/evolution-mail-message.xml.h:11 ../ui/evolution-memos.xml.h:2
-#: ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Copiar"
-
-#: ../calendar/gui/memos-component.c:450 ../mail/em-filter-i18n.h:11
-#: ../ui/evolution-addressbook.xml.h:9 ../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 "Borrar"
-
-#: ../calendar/gui/memos-component.c:451
-msgid "Properties..."
-msgstr "Propiedades..."
-
-#: ../calendar/gui/memos-component.c:524
-#, c-format
-msgid "%d memo"
-msgid_plural "%d memos"
-msgstr[0] "%d nota"
-msgstr[1] "%d notas"
-
-#: ../calendar/gui/memos-component.c:526 ../calendar/gui/tasks-component.c:517
-#: ../mail/mail-component.c:548
-#, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] ",%d seleccionado"
-msgstr[1] ",%d seleccionados"
-
-#: ../calendar/gui/memos-component.c:573
-msgid "Failed upgrading memos."
-msgstr "Fallo al actualizar las notas."
-
-#: ../calendar/gui/memos-component.c:869
-#, c-format
-msgid "Unable to open the memo list '%s' for creating events and meetings"
-msgstr ""
-"No es posible abrir la lista de notas «%s» para crear acontecimientos y "
-"reuniones"
-
-#: ../calendar/gui/memos-component.c:882
-msgid "There is no calendar available for creating memos"
-msgstr "No hay un calendario disponible para crear notas"
-
-#: ../calendar/gui/memos-component.c:973
-msgid "Memo Source Selector"
-msgstr "Selector de origen de notas"
-
-#: ../calendar/gui/memos-component.c:1156
-msgid "New memo"
-msgstr "Nota nueva"
-
-#: ../calendar/gui/memos-component.c:1157
-msgid "_Memo"
-msgstr "_Nota"
-
-#: ../calendar/gui/memos-component.c:1158
-msgid "Create a new memo"
-msgstr "Crea una nota nueva"
-
-#: ../calendar/gui/memos-component.c:1164
-msgid "New memo list"
-msgstr "Lista de notas nueva"
-
-#: ../calendar/gui/memos-component.c:1165
-msgid "Memo l_ist"
-msgstr "_Lista de notas"
-
-#: ../calendar/gui/memos-component.c:1166
-msgid "Create a new memo list"
-msgstr "Crea una lista de notas nueva"
-
-#: ../calendar/gui/memos-control.c:334
-msgid "Print Memos"
-msgstr "Imprimir notas"
-
 #: ../calendar/gui/migration.c:151
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
@@ -8193,7 +7761,7 @@ msgstr ""
 "El lugar y jerarquía de las carpetas de tareas de Evolution ha cambiado "
 "desde Evolution 1.x.\n"
 "\n"
-"Tenga paciencia mientras Evolution migra sus carpetas..."
+"Tenga paciencia mientras Evolution migra sus carpetas…"
 
 #: ../calendar/gui/migration.c:155
 msgid ""
@@ -8205,7 +7773,7 @@ msgstr ""
 "El lugar y jerarquía de las carpetas de calendario de Evolution ha cambiado "
 "desde Evolution 1.x.\n"
 "\n"
-"Tenga paciencia mientras Evolution migra sus carpetas..."
+"Tenga paciencia mientras Evolution migra sus carpetas…"
 
 #. FIXME: set proper domain/code
 #: ../calendar/gui/migration.c:748 ../calendar/gui/migration.c:915
@@ -8409,65 +7977,57 @@ msgstr "Mes seleccionado (%b de %Y)"
 msgid "Selected year (%Y)"
 msgstr "Año seleccionado (%Y)"
 
-#: ../calendar/gui/print.c:2307
-msgid "Appointment"
-msgstr "Cita"
-
-#: ../calendar/gui/print.c:2309
-msgid "Task"
-msgstr "Tarea"
-
-#: ../calendar/gui/print.c:2331
+#: ../calendar/gui/print.c:2329
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumen: %s"
 
-#: ../calendar/gui/print.c:2339
+#: ../calendar/gui/print.c:2337
 #, c-format
 msgid "Location: %s"
 msgstr "Lugar: %s"
 
-#: ../calendar/gui/print.c:2382
+#: ../calendar/gui/print.c:2380
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:2399
+#: ../calendar/gui/print.c:2397
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridad: %s"
 
-#: ../calendar/gui/print.c:2411
+#: ../calendar/gui/print.c:2409
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaje completado: %i"
 
-#: ../calendar/gui/print.c:2423
+#: ../calendar/gui/print.c:2421
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2437
+#: ../calendar/gui/print.c:2435
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorías: %s"
 
-#: ../calendar/gui/print.c:2448
+#: ../calendar/gui/print.c:2446
 msgid "Contacts: "
 msgstr "Contactos: "
 
-#: ../calendar/gui/print.c:2588 ../calendar/gui/print.c:2676
-#: ../calendar/gui/print.c:2802 ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2586 ../calendar/gui/print.c:2674
+#: ../calendar/gui/print.c:2800 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Vista previa"
 
-#: ../calendar/gui/print.c:2623
+#: ../calendar/gui/print.c:2621
 msgid "Print Item"
 msgstr "Imprimir elemento"
 
 #: ../calendar/gui/tasks-component.c:439
-msgid "_New Task List"
-msgstr "_Lista de tareas nueva"
+msgid "New Task List"
+msgstr "Lista de tareas nueva"
 
 #: ../calendar/gui/tasks-component.c:515
 #, c-format
@@ -8476,58 +8036,69 @@ msgid_plural "%d tasks"
 msgstr[0] "%d tarea"
 msgstr[1] "%d tareas"
 
+#: ../calendar/gui/tasks-component.c:517 ../mail/mail-component.c:548
+#, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] ",%d seleccionado"
+msgstr[1] ",%d seleccionados"
+
 #: ../calendar/gui/tasks-component.c:564
 msgid "Failed upgrading tasks."
 msgstr "Fallo al actualizar las tareas."
 
-#: ../calendar/gui/tasks-component.c:875
+#: ../calendar/gui/tasks-component.c:872
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "No es posible abrir la lista de tareas «%s» para crear acontecimientos y "
 "reuniones"
 
-#: ../calendar/gui/tasks-component.c:888
+#: ../calendar/gui/tasks-component.c:887
 msgid "There is no calendar available for creating tasks"
 msgstr "No hay un calendario disponible para crear tareas"
 
-#: ../calendar/gui/tasks-component.c:988
+#: ../calendar/gui/tasks-component.c:987
 msgid "Task Source Selector"
 msgstr "Selector de origen de tareas"
 
-#: ../calendar/gui/tasks-component.c:1171
+#: ../calendar/gui/tasks-component.c:1170
 msgid "New task"
 msgstr "Tarea nueva"
 
-#: ../calendar/gui/tasks-component.c:1173
+#: ../calendar/gui/tasks-component.c:1171
+msgid "_Task"
+msgstr "_Tarea"
+
+#: ../calendar/gui/tasks-component.c:1172
 msgid "Create a new task"
 msgstr "Crea una tarea nueva"
 
-#: ../calendar/gui/tasks-component.c:1179
+#: ../calendar/gui/tasks-component.c:1178
 msgid "New assigned task"
 msgstr "Nueva tarea asignada"
 
-#: ../calendar/gui/tasks-component.c:1180
+#: ../calendar/gui/tasks-component.c:1179
 msgid "Assigne_d Task"
 msgstr "Tarea _asignada"
 
-#: ../calendar/gui/tasks-component.c:1181
+#: ../calendar/gui/tasks-component.c:1180
 msgid "Create a new assigned task"
 msgstr "Crea una tarea nueva asignada"
 
-#: ../calendar/gui/tasks-component.c:1187
+#: ../calendar/gui/tasks-component.c:1186
 msgid "New task list"
 msgstr "Lista de tareas nueva"
 
-#: ../calendar/gui/tasks-component.c:1188
+#: ../calendar/gui/tasks-component.c:1187
 msgid "Task l_ist"
 msgstr "_Lista de tareas"
 
-#: ../calendar/gui/tasks-component.c:1189
+#: ../calendar/gui/tasks-component.c:1188
 msgid "Create a new task list"
 msgstr "Crea una lista de tareas nueva"
 
-#: ../calendar/gui/tasks-control.c:429
+#: ../calendar/gui/tasks-control.c:419
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8539,11 +8110,11 @@ msgstr ""
 "\n"
 "¿Borrar realmente esas tareas?"
 
-#: ../calendar/gui/tasks-control.c:432
+#: ../calendar/gui/tasks-control.c:422
 msgid "Do not ask me again."
 msgstr "No me preguntes otra vez."
 
-#: ../calendar/gui/tasks-control.c:466
+#: ../calendar/gui/tasks-control.c:456
 msgid "Print Tasks"
 msgstr "Imprimir tareas"
 
@@ -10203,13 +9774,13 @@ msgstr "Publicar en:"
 msgid "A_ttach"
 msgstr "_Adjuntar"
 
-#: ../composer/e-msg-composer.c:832
+#: ../composer/e-msg-composer.c:738
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "No se puede firmar el mensaje saliente: No hay establecido un certificado de "
 "firma para esta cuenta"
 
-#: ../composer/e-msg-composer.c:839
+#: ../composer/e-msg-composer.c:745
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10217,47 +9788,47 @@ msgstr ""
 "No se puede cifrar el mensaje saliente: no hay establecido un certificado de "
 "cifrado para esta cuenta"
 
-#: ../composer/e-msg-composer.c:1322 ../composer/e-msg-composer.c:1356
+#: ../composer/e-msg-composer.c:1224 ../composer/e-msg-composer.c:1257
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Razón desconocida"
 
-#: ../composer/e-msg-composer.c:1394
+#: ../composer/e-msg-composer.c:1294
 msgid "Could not open file"
 msgstr "No se pudo abrir el archivo"
 
-#: ../composer/e-msg-composer.c:1402
+#: ../composer/e-msg-composer.c:1302
 msgid "Unable to retrieve message from editor"
 msgstr "No se pudo obtener el mensaje del editor"
 
-#: ../composer/e-msg-composer.c:1677
+#: ../composer/e-msg-composer.c:1572
 msgid "Untitled Message"
 msgstr "Mensaje sin título"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1712
+#: ../composer/e-msg-composer.c:1606
 msgid "Open File"
 msgstr "Abrir archivo"
 
-#: ../composer/e-msg-composer.c:2126 ../mail/em-account-editor.c:588
+#: ../composer/e-msg-composer.c:2006 ../mail/em-account-editor.c:588
 #: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:700
 msgid "Autogenerated"
 msgstr "Auto-generado"
 
-#: ../composer/e-msg-composer.c:2229
+#: ../composer/e-msg-composer.c:2105
 msgid "Si_gnature:"
 msgstr "_Firma:"
 
-#: ../composer/e-msg-composer.c:2472 ../composer/e-msg-composer.c:3673
-#: ../composer/e-msg-composer.c:3676
+#: ../composer/e-msg-composer.c:2347 ../composer/e-msg-composer.c:3527
+#: ../composer/e-msg-composer.c:3528
 msgid "Compose a message"
 msgstr "Redactar un mensaje"
 
-#: ../composer/e-msg-composer.c:3791
+#: ../composer/e-msg-composer.c:3643
 msgid "_Attachment Bar"
 msgstr "Barra de _adjuntos"
 
-#: ../composer/e-msg-composer.c:4881
+#: ../composer/e-msg-composer.c:4720
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10286,7 +9857,7 @@ msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "Debido a «{0}», quizá necesite seleccionar diferentes opciones de correo."
 
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:17
 msgid "Because &quot;{1}&quot;."
 msgstr "Porque «{1}»."
 
@@ -10334,7 +9905,7 @@ msgstr "No recuperar"
 
 #: ../composer/mail-composer.error.xml.h:15
 msgid "Download in progress. Do you want to send the mail?"
-msgstr "Descarga en progreso. ¿Quiere enviar el correo?"
+msgstr "Descarga en progreso. ¿Desea enviar el correo?"
 
 #: ../composer/mail-composer.error.xml.h:16
 msgid "Error saving to autosave because &quot;{1}&quot;."
@@ -10395,6 +9966,10 @@ 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:29
+msgid "_Discard Changes"
+msgstr "_Descartar cambios"
+
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Save Message"
 msgstr "_Guardar mensaje"
@@ -10522,7 +10097,7 @@ msgstr ""
 "Cuando reciba un correo con una solicitud de notificación de lectura, ¿qué "
 "debería hacer Evolution?"
 
-#: ../e-util/e-dialog-utils.c:270
+#: ../e-util/e-dialog-utils.c:267
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10530,7 +10105,7 @@ msgstr ""
 "Ya existe una archivo con ese nombre.\n"
 "¿Quiere sobreescribirlo?"
 
-#: ../e-util/e-dialog-utils.c:272 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:269 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "¿Sobreescribir archivo?"
 
@@ -10574,7 +10149,7 @@ msgstr "¿Quiere sobreescribirlo?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "El archivo existe «{0}»."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:128
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:122
 msgid "_Overwrite"
 msgstr "_Sobreescribir"
 
@@ -10658,7 +10233,7 @@ msgstr "%H:%M:%S"
 #. without seconds.
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: ../e-util/e-time-utils.c:348 ../e-util/e-time-utils.c:435
-#: ../widgets/misc/e-dateedit.c:1447 ../widgets/misc/e-dateedit.c:1774
+#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1720
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -10667,7 +10242,7 @@ msgstr "%I:%M %p"
 #. without seconds.
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: ../e-util/e-time-utils.c:352 ../e-util/e-time-utils.c:427
-#: ../widgets/misc/e-dateedit.c:1444 ../widgets/misc/e-dateedit.c:1771
+#: ../widgets/misc/e-dateedit.c:1435 ../widgets/misc/e-dateedit.c:1717
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -10790,7 +10365,7 @@ msgstr "si se cumple algún criterio"
 
 #: ../filter/filter-rule.c:860
 msgid "Execute actions"
-msgstr "Ejecutar acciones"
+msgstr "Ejecutar las acciones"
 
 #: ../filter/filter-rule.c:881
 msgid "All related"
@@ -10809,11 +10384,11 @@ msgid "Include threads"
 msgstr "Incluir conversaciones"
 
 #: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:330
+#: ../mail/em-utils.c:291
 msgid "Incoming"
 msgstr "Entrante"
 
-#: ../filter/filter-rule.c:978 ../mail/em-utils.c:331
+#: ../filter/filter-rule.c:978 ../mail/em-utils.c:292
 msgid "Outgoing"
 msgstr "Saliente"
 
@@ -10837,7 +10412,7 @@ msgstr "Falta la fecha."
 msgid "Missing file name."
 msgstr "Falta el nombre de archivo."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:67
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:65
 msgid "Missing name."
 msgstr "Falta el nombre."
 
@@ -10909,6 +10484,10 @@ msgstr "Hace"
 msgid "months"
 msgstr "meses"
 
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:177
+msgid "seconds"
+msgstr "segundos"
+
 #: ../filter/filter.glade.h:19
 msgid "the current time"
 msgstr "la fecha actual"
@@ -11059,11 +10638,11 @@ msgstr "Opciones de recepción"
 msgid "Checking for New Mail"
 msgstr "Comprobación de correo nuevo"
 
-#: ../mail/em-account-editor.c:2662 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2661 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Editor de cuentas"
 
-#: ../mail/em-account-editor.c:2662 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2661 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Asistente de cuentas de Evolution"
 
@@ -11084,40 +10663,40 @@ msgstr "Protocolo"
 msgid "Mail Accounts Table"
 msgstr "Tabla de cuentas de correo"
 
-#: ../mail/em-composer-prefs.c:309 ../mail/em-composer-prefs.c:435
+#: ../mail/em-composer-prefs.c:307 ../mail/em-composer-prefs.c:430
 #: ../mail/mail-config.c:958
 msgid "Unnamed"
 msgstr "Sin nombre"
 
-#: ../mail/em-composer-prefs.c:925
+#: ../mail/em-composer-prefs.c:897
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
-#: ../mail/em-composer-prefs.c:968
+#: ../mail/em-composer-prefs.c:940
 msgid "Add signature script"
 msgstr "Añadir firma"
 
-#: ../mail/em-composer-prefs.c:988
+#: ../mail/em-composer-prefs.c:960
 msgid "Signature(s)"
 msgstr "Firma(s)"
 
-#: ../mail/em-composer-utils.c:862 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:853 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr "--------- Mensaje reenviado --------"
 
-#: ../mail/em-composer-utils.c:1657
+#: ../mail/em-composer-utils.c:1648
 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:1704
+#: ../mail/em-composer-utils.c:1695
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 msgstr ""
-"El ${AbbrevWeekdayName}, ${Day}-${Monta}-${Year} a las ${24Hour}:${Minute} "
+"El ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} a las ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escribió:"
 
 #: ../mail/em-filter-editor.c:147
@@ -11137,7 +10716,7 @@ msgstr "Asignar color"
 msgid "Assign Score"
 msgstr "Asignar puntuación"
 
-#: ../mail/em-filter-i18n.h:5 ../ui/evolution-editor.xml.h:1
+#: ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "Adjuntos"
 
@@ -11269,7 +10848,7 @@ msgstr "Lista de correo"
 
 #: ../mail/em-filter-i18n.h:39
 msgid "Match All"
-msgstr "Coincidir con todo"
+msgstr "Coincide con todo"
 
 #: ../mail/em-filter-i18n.h:40
 msgid "Message Body"
@@ -11293,11 +10872,11 @@ msgstr "Mover a la carpeta"
 
 #: ../mail/em-filter-i18n.h:45
 msgid "Pipe to Program"
-msgstr "Encauzar al programa"
+msgstr "Redirigir al programa"
 
 #: ../mail/em-filter-i18n.h:46
 msgid "Play Sound"
-msgstr "Reproducir un sonido"
+msgstr "Reproducir sonido"
 
 #: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:80
 msgid "Read"
@@ -11329,7 +10908,7 @@ msgstr "devuelve menor que"
 
 #: ../mail/em-filter-i18n.h:54
 msgid "Run Program"
-msgstr "Ejecutar programa"
+msgstr "Ejecutar el programa"
 
 #: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
 msgid "Score"
@@ -11387,7 +10966,7 @@ msgstr "<b>Entonces</b>"
 
 #: ../mail/em-folder-browser.c:134
 msgid "C_reate Search Folder From Search..."
-msgstr "C_rear una carpeta de búsqueda desde la búsqueda..."
+msgstr "C_rear una carpeta de búsqueda desde la búsqueda…"
 
 #. TODO: can this be done in a loop?
 #: ../mail/em-folder-properties.c:144
@@ -11399,7 +10978,7 @@ msgstr[1] "Mensajes en total:"
 #: ../mail/em-folder-properties.c:156
 msgid "Unread message:"
 msgid_plural "Unread messages:"
-msgstr[0] "Mensaje no leído:"
+msgstr[0] "Mensajes no leído:"
 msgstr[1] "Mensajes no leídos:"
 
 #: ../mail/em-folder-properties.c:278
@@ -11448,7 +11027,7 @@ msgstr "Correo enviado"
 
 #: ../mail/em-folder-tree-model.c:499 ../mail/em-folder-tree-model.c:803
 msgid "Loading..."
-msgstr "Cargando..."
+msgstr "Cargando…"
 
 #: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
@@ -11464,12 +11043,12 @@ msgstr "Moviendo la carpeta %s"
 msgid "Copying folder %s"
 msgstr "Copiando la carpeta %s"
 
-#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1623
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1613
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moviendo los mensajes a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1625
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1615
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando los mensajes a la carpeta %s"
@@ -11478,11 +11057,11 @@ msgstr "Copiando los mensajes a la carpeta %s"
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "No se pudo dejar el(los) mensaje(s) en el almacén de nivel superior"
 
-#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:104
 msgid "_Copy to Folder"
 msgstr "_Copiar a la carpeta"
 
-#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:116
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:114
 msgid "_Move to Folder"
 msgstr "_Mover a la carpeta"
 
@@ -11491,38 +11070,33 @@ msgstr "_Mover a la carpeta"
 msgid "Scanning folders in \"%s\""
 msgstr "Analizando carpetas en «%s»"
 
-#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:44
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:22
+#: ../mail/em-folder-tree.c:2036 ../ui/evolution-addressbook.xml.h:44
+#: ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:48
 msgid "_View"
 msgstr "_Ver"
 
-#: ../mail/em-folder-tree.c:2043
+#: ../mail/em-folder-tree.c:2037
 msgid "Open in _New Window"
 msgstr "Abrir en una ventana _nueva"
 
-#: ../mail/em-folder-tree.c:2047
+#: ../mail/em-folder-tree.c:2041
 msgid "_Copy..."
-msgstr "_Copiar..."
+msgstr "_Copiar…"
 
-#: ../mail/em-folder-tree.c:2048
+#: ../mail/em-folder-tree.c:2042
 msgid "_Move..."
-msgstr "_Mover..."
+msgstr "_Mover…"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2052
+#: ../mail/em-folder-tree.c:2046
 msgid "_New Folder..."
-msgstr "Carpeta _nueva..."
+msgstr "Carpeta _nueva…"
 
-#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:30
+#: ../mail/em-folder-tree.c:2049 ../ui/evolution-mail-list.xml.h:30
 msgid "_Rename..."
-msgstr "_Renombrar..."
-
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:125
-msgid "_Empty Trash"
-msgstr "_Vaciar papelera"
+msgstr "_Renombrar…"
 
 #: ../mail/em-folder-utils.c:104
 #, c-format
@@ -11570,34 +11144,34 @@ msgstr "Crear carpeta"
 msgid "Specify where to create the folder:"
 msgstr "Especifique donde crear la carpeta:"
 
-#: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:558 ../mail/em-popup.c:569
+#: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:546 ../mail/em-popup.c:557
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: ../mail/em-folder-view.c:1040 ../ui/evolution-mail-message.xml.h:125
+#: ../mail/em-folder-view.c:1040 ../ui/evolution-mail-message.xml.h:122
 msgid "_Reply to Sender"
 msgstr "Responder al _remitente"
 
-#: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:560 ../mail/em-popup.c:571
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:548 ../mail/em-popup.c:559
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Forward"
 msgstr "Reen_viar"
 
-#: ../mail/em-folder-view.c:1044 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1044 ../ui/evolution-mail-message.xml.h:106
 msgid "_Edit as New Message..."
-msgstr "_Editar como un mensaje nuevo..."
+msgstr "_Editar como un mensaje nuevo…"
 
 #: ../mail/em-folder-view.c:1050
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: ../mail/em-folder-view.c:1051 ../ui/evolution-addressbook.xml.h:37
+#: ../mail/em-folder-view.c:1051 ../ui/evolution-addressbook.xml.h:36
 msgid "_Move to Folder..."
-msgstr "_Mover a la carpeta..."
+msgstr "_Mover a la carpeta…"
 
-#: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:33
+#: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
-msgstr "_Copiar a la carpeta..."
+msgstr "_Copiar a la carpeta…"
 
 #: ../mail/em-folder-view.c:1055
 msgid "Mar_k as Read"
@@ -11625,7 +11199,7 @@ msgstr "Marcar como _no spam"
 
 #: ../mail/em-folder-view.c:1061
 msgid "Mark for Follo_w Up..."
-msgstr "Marcar para se_guimiento..."
+msgstr "Marcar para se_guimiento…"
 
 #: ../mail/em-folder-view.c:1069
 msgid "Fla_g Completed"
@@ -11672,52 +11246,52 @@ msgid "Filter on _Mailing List"
 msgstr "Filtro según la lista de _correo"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1922 ../mail/em-folder-view.c:1966
+#: ../mail/em-folder-view.c:1921 ../mail/em-folder-view.c:1965
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../mail/em-folder-view.c:2065
+#: ../mail/em-folder-view.c:2064
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
-#: ../mail/em-folder-view.c:2221
+#: ../mail/em-folder-view.c:2220
 msgid "Unable to retrieve message"
 msgstr "No se pudo obtener el mensaje"
 
-#: ../mail/em-folder-view.c:2414
+#: ../mail/em-folder-view.c:2413
 msgid "_Copy Link Location"
 msgstr "_Copiar dirección del enlace"
 
-#: ../mail/em-folder-view.c:2416
+#: ../mail/em-folder-view.c:2415
 msgid "Create _Search Folder"
 msgstr "Crear carpeta de _búsqueda"
 
-#: ../mail/em-folder-view.c:2417
+#: ../mail/em-folder-view.c:2416
 msgid "_From this Address"
 msgstr "_Desde esta dirección"
 
-#: ../mail/em-folder-view.c:2418
+#: ../mail/em-folder-view.c:2417
 msgid "_To this Address"
 msgstr "_A esta dirección"
 
-#: ../mail/em-folder-view.c:2699
+#: ../mail/em-folder-view.c:2698
 #, c-format
 msgid "Click to mail %s"
 msgstr "Pulse para enviar correo a %s"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:461
+#: ../mail/em-format-html-display.c:445
 #, c-format
 msgid "Matches: %d"
 msgstr "Coincide con: %d"
 
-#: ../mail/em-format-html-display.c:712 ../mail/em-format-html.c:597
+#: ../mail/em-format-html-display.c:696 ../mail/em-format-html.c:597
 msgid "Unsigned"
 msgstr "No firmado"
 
-#: ../mail/em-format-html-display.c:712
+#: ../mail/em-format-html-display.c:696
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11725,11 +11299,11 @@ msgstr ""
 "Este mensaje no está firmado. No hay garantía de que el mensaje sea "
 "auténtico."
 
-#: ../mail/em-format-html-display.c:713 ../mail/em-format-html.c:598
+#: ../mail/em-format-html-display.c:697 ../mail/em-format-html.c:598
 msgid "Valid signature"
 msgstr "Firma válida"
 
-#: ../mail/em-format-html-display.c:713
+#: ../mail/em-format-html-display.c:697
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11737,11 +11311,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:714 ../mail/em-format-html.c:599
+#: ../mail/em-format-html-display.c:698 ../mail/em-format-html.c:599
 msgid "Invalid signature"
 msgstr "Firma no válida"
 
-#: ../mail/em-format-html-display.c:714
+#: ../mail/em-format-html-display.c:698
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11749,11 +11323,11 @@ msgstr ""
 "La firma de este mensaje no se puede verificar, pudo haber sido alterada en "
 "tránsito."
 
-#: ../mail/em-format-html-display.c:715
+#: ../mail/em-format-html-display.c:699
 msgid "Valid signature, cannot verify sender"
 msgstr "Firma válida, no se puede verificar el remitente"
 
-#: ../mail/em-format-html-display.c:715
+#: ../mail/em-format-html-display.c:699
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11761,11 +11335,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:721 ../mail/em-format-html.c:606
+#: ../mail/em-format-html-display.c:705 ../mail/em-format-html.c:606
 msgid "Unencrypted"
 msgstr "Descifrado"
 
-#: ../mail/em-format-html-display.c:721
+#: ../mail/em-format-html-display.c:705
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -11773,11 +11347,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:722 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:706 ../mail/em-format-html.c:607
 msgid "Encrypted, weak"
 msgstr "Cifrado, débil"
 
-#: ../mail/em-format-html-display.c:722
+#: ../mail/em-format-html-display.c:706
 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 "
@@ -11787,11 +11361,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:723 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:707 ../mail/em-format-html.c:608
 msgid "Encrypted"
 msgstr "Cifrado"
 
-#: ../mail/em-format-html-display.c:723
+#: ../mail/em-format-html-display.c:707
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11799,11 +11373,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:724 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:708 ../mail/em-format-html.c:609
 msgid "Encrypted, strong"
 msgstr "Cifrado, fuerte"
 
-#: ../mail/em-format-html-display.c:724
+#: ../mail/em-format-html-display.c:708
 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 "
@@ -11813,67 +11387,71 @@ msgstr ""
 "difícil que un espía vea el contenido de este mensaje en empleando un tiempo "
 "razonable."
 
-#: ../mail/em-format-html-display.c:825 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:809 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Ver certificado"
 
-#: ../mail/em-format-html-display.c:840
+#: ../mail/em-format-html-display.c:824
 msgid "This certificate is not viewable"
 msgstr "Certificado no es visible"
 
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1106
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Terminado el %d de %B de %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1130
+#: ../mail/em-format-html-display.c:1114
 msgid "Overdue:"
 msgstr "Atrasado:"
 
-#: ../mail/em-format-html-display.c:1133
+#: ../mail/em-format-html-display.c:1117
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "antes del %d de %B de %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1193
+#: ../mail/em-format-html-display.c:1177
 msgid "_View Inline"
 msgstr "_Ver incluido"
 
-#: ../mail/em-format-html-display.c:1194
+#: ../mail/em-format-html-display.c:1178
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: ../mail/em-format-html-display.c:1195
+#: ../mail/em-format-html-display.c:1179
 msgid "_Fit to Width"
 msgstr "_Ajustar al ancho"
 
-#: ../mail/em-format-html-display.c:1196
+#: ../mail/em-format-html-display.c:1180
 msgid "Show _Original Size"
 msgstr "Mostrar tamaño _original"
 
-#: ../mail/em-format-html-display.c:1566
+#: ../mail/em-format-html-display.c:1550
 msgid "Attachment Button"
 msgstr "Botón de adjunto"
 
-#: ../mail/em-format-html-display.c:1773
+#: ../mail/em-format-html-display.c:1757
 msgid "Select folder to save all attachments..."
-msgstr "Seleccione la carpeta donde guardar todos los adjuntos..."
+msgstr "Seleccione la carpeta donde guardar todos los adjuntos…"
+
+#: ../mail/em-format-html-display.c:1796
+msgid "Select folder to save selected attachments..."
+msgstr "Seleccione la carpeta donde guardar los adjuntos seleccionados…"
 
-#: ../mail/em-format-html-display.c:1820
+#: ../mail/em-format-html-display.c:1804
 msgid "Save Selected..."
-msgstr "Guardar seleccionados..."
+msgstr "Guardar seleccionados…"
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1887
+#: ../mail/em-format-html-display.c:1871
 #, c-format
 msgid "%d attachment"
 msgid_plural "%d attachments"
 msgstr[0] "%d adjunto"
 msgstr[1] "%d adjuntos"
 
-#: ../mail/em-format-html-display.c:1951
+#: ../mail/em-format-html-display.c:1935
 msgid "No Attachment"
 msgstr "Sin adjunto"
 
-#: ../mail/em-format-html-display.c:1954
+#: ../mail/em-format-html-display.c:1938
 msgid "Save All"
 msgstr "Guardar todo"
 
@@ -12033,7 +11611,7 @@ 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..."
+"Tenga paciencia mientras Evolution migra sus carpetas…"
 
 #: ../mail/em-migrate.c:1632
 #, c-format
@@ -12083,27 +11661,45 @@ msgstr ""
 "No se pudo leer la configuración de la instalación anterior de Evolution, "
 "«evolution/config.xmldb» no existe o está corrompido."
 
-#: ../mail/em-popup.c:556 ../mail/em-popup.c:567
+#: ../mail/em-popup.c:399
+msgid "Save As..."
+msgstr "Guardar como…"
+
+#: ../mail/em-popup.c:424
+#, c-format
+msgid "untitled_image.%s"
+msgstr "imagen-_sin-título.%s"
+
+#: ../mail/em-popup.c:542 ../mail/em-popup.c:553
+msgid "Set as _Background"
+msgstr "Establecer como _fondo"
+
+#: ../mail/em-popup.c:544 ../mail/em-popup.c:555
 msgid "_Reply to sender"
 msgstr "_Responder al remitente"
 
-#: ../mail/em-popup.c:557 ../mail/em-popup.c:568
+#: ../mail/em-popup.c:545 ../mail/em-popup.c:556
 #: ../ui/evolution-mail-message.xml.h:84
 msgid "Reply to _List"
 msgstr "Responder a la _lista"
 
-#: ../mail/em-popup.c:619
+#: ../mail/em-popup.c:607
 msgid "_Open Link in Browser"
 msgstr "_Abrir enlace en el navegador"
 
-#: ../mail/em-popup.c:620
+#: ../mail/em-popup.c:608
 msgid "_Send New Message To..."
-msgstr "_Enviar un mensaje nuevo a..."
+msgstr "_Enviar un mensaje nuevo a…"
 
-#: ../mail/em-popup.c:621
+#: ../mail/em-popup.c:609
 msgid "_Add to Addressbook"
 msgstr "_Añadir a la libreta de direcciones"
 
+#: ../mail/em-popup.c:762
+#, c-format
+msgid "Open in %s..."
+msgstr "Abrir en %s…"
+
 #: ../mail/em-subscribe-editor.c:614
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Este almacén no soporta suscripciones, o no están activadas."
@@ -12125,28 +11721,28 @@ msgstr "Seleccione un servidor."
 msgid "No server has been selected"
 msgstr "No se ha seleccionado ningún servidor"
 
-#: ../mail/em-utils.c:106
+#: ../mail/em-utils.c:105
 msgid "Don't show this message again."
 msgstr "No mostrar otra vez este mensaje."
 
-#: ../mail/em-utils.c:338
+#: ../mail/em-utils.c:299
 msgid "Filters"
 msgstr "Filtros"
 
-#: ../mail/em-utils.c:481 ../mail/em-utils.c:518
+#: ../mail/em-utils.c:442 ../mail/em-utils.c:479
 msgid "message"
 msgstr "mensaje"
 
-#: ../mail/em-utils.c:653
+#: ../mail/em-utils.c:614
 msgid "Save Message..."
-msgstr "Guardar mensaje..."
+msgstr "Guardar mensaje…"
 
-#: ../mail/em-utils.c:702
+#: ../mail/em-utils.c:663
 msgid "Add address"
 msgstr "Añadir dirección"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1181
+#: ../mail/em-utils.c:1142
 #, c-format
 msgid "Messages from %s"
 msgstr "Correos de %s"
@@ -12410,11 +12006,11 @@ msgstr "Preguntar si el asunto está en blanco"
 
 #: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
-msgstr "Preguntar al usuario cuando intenta compactar una carpeta."
+msgstr "Preguntar al usuario cuando intente compactar una carpeta."
 
 #: ../mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt the user when he or she tries to send a message without a Subject."
-msgstr "Preguntar al usuario cuando intenta enviar un mensaje sin un asunto."
+msgstr "Preguntar al usuario cuando intente enviar un mensaje sin un asunto."
 
 #: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
@@ -12480,6 +12076,14 @@ msgstr "Mostrar mensajes borrados (tachados) en la lista de mensajes."
 msgid "Show deleted messages in the message-list"
 msgstr "Mostrar mensajes borrados en la lista de mensajes"
 
+#: ../mail/evolution-mail.schemas.in.in.h:73
+msgid "Show the \"Preview\" pane"
+msgstr "Mostrar el panel de vista previa"
+
+#: ../mail/evolution-mail.schemas.in.in.h:74
+msgid "Show the \"Preview\" pane."
+msgstr "Mostrar el panel de vista previa."
+
 #: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Reproducir un archivo de sonido cuando llegue correo nuevo."
@@ -12667,7 +12271,7 @@ msgstr "Importando «%s»"
 #: ../mail/importers/evolution-outlook-importer.c:259
 #: ../mail/importers/netscape-importer.c:1251
 msgid "Importing..."
-msgstr "Importando..."
+msgstr "Importando…"
 
 #: ../mail/importers/evolution-outlook-importer.c:261
 #: ../mail/importers/netscape-importer.c:1253
@@ -12850,8 +12454,8 @@ msgstr[1] "%d en total"
 #, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
-msgstr[0] ", %d no leído"
-msgstr[1] ", %d no leídos"
+msgstr[0] ", %d sin leer"
+msgstr[1] ", %d sin leer"
 
 #: ../mail/mail-component.c:765
 msgid "New Mail Message"
@@ -12889,7 +12493,7 @@ msgstr "    "
 
 #: ../mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
-msgstr "_Comprobar tipos soportados "
+msgstr "_Comprobar los tipos soportados "
 
 #: ../mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
@@ -12937,7 +12541,7 @@ msgstr "<span weight=\"bold\">Comportamiento predeterminado</span>"
 
 #: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
-msgstr "<span weight=\"bold\">Borrar correo</span>"
+msgstr "<span weight=\"bold\">Borrado del correo</span>"
 
 #: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
@@ -12962,7 +12566,7 @@ msgstr "<span weight=\"bold\">Carga de imágenes</span>"
 
 #: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Display</span>"
-msgstr "<span weight=\"bold\">Vista de mensaje</span>"
+msgstr "<span weight=\"bold\">Visor de mensajes</span>"
 
 #: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Fonts</span>"
@@ -13018,7 +12622,7 @@ msgstr "Administración de la cuenta"
 
 #: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
-msgstr "Añadir firma _nueva..."
+msgstr "Añadir firma _nueva…"
 
 #: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
@@ -13174,7 +12778,7 @@ msgstr "_Cifrar mensajes salientes (por omisión)"
 
 #: ../mail/mail-config.glade.h:81
 msgid "Execute Command..."
-msgstr "Ejecutar comando..."
+msgstr "Ejecutar comando…"
 
 #: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
@@ -13304,7 +12908,7 @@ msgstr "Recordar _contraseña"
 
 #: ../mail/mail-config.glade.h:119
 msgid "S_elect..."
-msgstr "_Seleccione..."
+msgstr "_Seleccione…"
 
 #: ../mail/mail-config.glade.h:120
 msgid "S_tandard Font:"
@@ -13312,7 +12916,7 @@ msgstr "Tipografía _estándar:"
 
 #: ../mail/mail-config.glade.h:121
 msgid "Se_lect..."
-msgstr "_Seleccione..."
+msgstr "_Seleccione…"
 
 #: ../mail/mail-config.glade.h:123
 msgid "Select HTML fixed width font"
@@ -13476,7 +13080,7 @@ msgstr "_Preguntar al enviar mensajes en HTML a contactos que no los quieren"
 
 #: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
-msgstr "Pr_eguntar al enviar mensajes con el asunto vacío"
+msgstr "_Preguntar al enviar mensajes con el asunto vacío"
 
 #: ../mail/mail-config.glade.h:169
 msgid "_Reply style:"
@@ -13796,7 +13400,7 @@ msgstr "Comprobando el servicio"
 
 #: ../mail/mail-send-recv.c:158
 msgid "Cancelling..."
-msgstr "Cancelando..."
+msgstr "Cancelando…"
 
 #: ../mail/mail-send-recv.c:265
 #, c-format
@@ -13823,18 +13427,17 @@ msgstr "Cancelar _todo"
 
 #: ../mail/mail-send-recv.c:416
 msgid "Updating..."
-msgstr "Actualizando..."
+msgstr "Actualizando…"
 
 #: ../mail/mail-send-recv.c:416 ../mail/mail-send-recv.c:468
 msgid "Waiting..."
-msgstr "Esperando..."
+msgstr "Esperando…"
 
 #: ../mail/mail-send-recv.c:699
 msgid "Checking for new mail"
 msgstr "Comprobando correo nuevo"
 
 #: ../mail/mail-session.c:207
-#: ../plugins/exchange-operations/exchange-config-listener.c:601
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduzca su contraseña para %s"
@@ -13847,20 +13450,20 @@ msgstr "Introduzca contraseña"
 msgid "User canceled operation."
 msgstr "Operación cancelada por el usuario."
 
-#: ../mail/mail-signature-editor.c:381
+#: ../mail/mail-signature-editor.c:372
 msgid "Edit signature"
 msgstr "Editar firma"
 
-#: ../mail/mail-signature-editor.c:423
+#: ../mail/mail-signature-editor.c:412
 msgid "Enter a name for this signature."
 msgstr "Introduzca un nombre para esta firma."
 
-#: ../mail/mail-signature-editor.c:426
+#: ../mail/mail-signature-editor.c:415
 #: ../plugins/groupwise-features/properties.glade.h:5
 msgid "Name:"
 msgstr "Nombre:"
 
-#: ../mail/mail-tools.c:115
+#: ../mail/mail-tools.c:116
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "No se pudo crear el directorio spool «%s»: %s"
@@ -13870,16 +13473,16 @@ msgstr "No se pudo crear el directorio spool «%s»: %s"
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "Intentando mover correo desde un origen que no es un buzón «%s»"
 
-#: ../mail/mail-tools.c:249
+#: ../mail/mail-tools.c:242
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensaje reenviado - %s"
 
-#: ../mail/mail-tools.c:251
+#: ../mail/mail-tools.c:244
 msgid "Forwarded message"
 msgstr "Mensaje reenviado"
 
-#: ../mail/mail-tools.c:291
+#: ../mail/mail-tools.c:284
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Carpeta inválida: «%s»"
@@ -13928,36 +13531,30 @@ msgid ""
 "A read receipt notification has been requested for &quot;{1}&quot;.  Send "
 "the reciept notification to {0}?"
 msgstr ""
-"Se ha solicitado una notificación de recepción para «{1}». ¿Quiere enviar "
-"una notificación de recepción a {0}?"
+"Se ha solicitado una notificación de recepción para «{1}». ¿Desea enviar una "
+"notificación de recepción a {0}?"
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
-"A signature already exists with the name &quot;{0}&quot;. Please specify a "
-"different name."
-msgstr "Ya existe una firma con el nombre «{0}». Por favor, use un nombre diferente."
-
-#: ../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 ""
 "Añadir una línea de Asunto con significado al mensaje dará a sus "
 "destinatarios una idea de qué trata su correo."
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:8
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "¿Seguro que quiere borrar esta cuenta y todos sus proxies?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account?"
 msgstr "¿Seguro que quiere borrar esta cuenta?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:10
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr "¿Seguro que quiere abrir {0} mensajes a la vez?"
 
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:11
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -13965,7 +13562,7 @@ msgstr ""
 "¿Seguro que quiere eliminar todos los mensajes borrados en todas las "
 "carpetas?"
 
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:12
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
@@ -13973,79 +13570,75 @@ msgstr ""
 "¿Seguro que quiere eliminar permanentemente todos los mensajes borrados en "
 "la carpeta «{0}»?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:13
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "¿Seguro que quiere enviar un mensaje en formato HTML?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:14
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "¿Seguro que quiere enviar un mensaje con sólo destinatarios Cco?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "¿Seguro que quiere enviar un mensaje sin un asunto?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:16
 msgid "Because &quot;{0}&quot;."
 msgstr "Porque «{0}»."
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{2}&quot;."
 msgstr "Porque «{2}»"
 
-#: ../mail/mail.error.xml.h:20
-msgid "Blank Signature"
-msgstr "Firma en blanco"
-
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:19
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "No se puede añadir la carpeta de búsqueda «{0}»."
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:20
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "No se pudo copiar la carpeta: «{0}» a «{1}»."
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:21
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "No se pudo crear la carpeta: «{0}»."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot create temporary save directory."
 msgstr "No se pudo crear el directorio de guardado temporal."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "No se pudo crear el directorio de guardado, debido a «{1}»"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "No se puede borrar la carpeta «{0}»."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "No se pudo borrar la carpeta de sistema «{0}»."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr "No se puede editar la carpeta de búsqueda «{0}» porque no existe."
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "No se puede mover la carpeta «{0}» a «{1}»."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "No se pudo abrir el origen «{1}»"
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "No se pudo abrir el origen «{2}»."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "No se pudo abrir el destino «{2}»."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:31
 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 "
@@ -14055,31 +13648,31 @@ msgstr ""
 "instalación. No será posible usar este proveedor hasta que pueda aceptar "
 "esta licencia."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "No se puede renombrar «{0}» a «{1}»."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr "No se pudo renombrar o mover la carpeta de sistema «{0}»."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot save changes to account."
 msgstr "No se puede guardar los cambios en la cuenta."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "No se pudo guardar al directorio «{0}»."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "No se pudo guardar al archivo «{0}»."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "No se puede establecer el script de firma «{0}»."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:38
 msgid ""
 "Check to make sure your password is spelled correctly.  Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14088,63 +13681,63 @@ msgstr ""
 "contraseñas distinguen las mayúsculas, su tecla de bloqueo de mayúsculas "
 "puede estar activada."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:39
 msgid "Could not save signature file."
 msgstr "No se pudo guardar el archivo de firma."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:40
 msgid "Delete &quot;{0}&quot;?"
 msgstr "¿Desea borrar «{0}»?"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:41
 msgid "Delete account?"
 msgstr "¿Desea borrar la cuenta?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
 msgid "Discard changed?"
 msgstr "¿Desea descartar los cambios?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr "¿Desea realizar esta operación en las subcarpetas?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid "Do you wish to save your changes?"
 msgstr "¿Desea guardar los cambios?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:45
 msgid "Don't delete"
 msgstr "No borrar"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:46
 msgid "Enter password."
 msgstr "Introduzca la contraseña."
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:47
 msgid "Error loading filter definitions."
 msgstr "Error al cargar las definiciones de filtros."
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid "Error while performing operation."
 msgstr "Error al efectuar operación."
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Error while {0}."
-msgstr "Error mientras «{0}»."
+msgstr "Se ha producido un error al «{0}»."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:50
 msgid "File exists but cannot overwrite it."
 msgstr "El archivo existe pero no se puede sobreescribir."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "File exists but is not a regular file."
 msgstr "El archivo existe pero no es un archivo regular."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Si continua, no podrá recuperar estos mensajes."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:53
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -14152,7 +13745,7 @@ msgstr ""
 "Si borra la carpeta, todo su contenido y el de sus subcarpetas se borrará "
 "permanentemente."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:54
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14160,11 +13753,11 @@ msgstr ""
 "Si continúa, la información de la cuenta y toda la\n"
 "información del proxy se borrará permanentemente."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:56
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Si continúa, la información de la cuenta se borrará permanentemente."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:57
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -14172,19 +13765,19 @@ msgstr ""
 "Si sale, estos mensajes no se enviarán hasta que Evolution sea iniciado de "
 "nuevo."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:58
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:59
 msgid "Invalid authentication"
 msgstr "Autenticación inválida"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:60
 msgid "Mail filters automatically updated."
 msgstr "Filtros de correo actualizados automáticamente."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:61
 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 "
@@ -14196,35 +13789,31 @@ msgstr ""
 "listará todos los destinatarios de su mensaje de todas formas. Para evitar "
 "esto debería añadir al menos un destinatario «Para:» o «CC:»."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:62
 msgid "Mark all messages as read"
 msgstr "Marca todos los mensajes como leídos"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:63
 msgid "Mark all messages as read in the selected folder"
 msgstr "Marca todos los mensajes como leídos en la carpeta seleccionada"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:64
 msgid "Missing folder."
 msgstr "Falta la carpeta."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:66
 msgid "No sources selected."
 msgstr "No se ha seleccionado ningún origen."
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:67
 msgid "Opening too many messages at once may take a long time."
 msgstr "Abrir demasiados mensajes a la vez puede llevar mucho tiempo."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:68
 msgid "Please check your account settings and try again."
 msgstr "Compruebe su configuración de la cuenta e inténtelo otra vez."
 
-#: ../mail/mail.error.xml.h:71
-msgid "Please enable the account or send using another account."
-msgstr "Active la cuenta o envíe usando otra cuenta."
-
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:69
 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."
@@ -14233,7 +13822,7 @@ msgstr ""
 "Puede buscar direcciones de correo pulsando en el botón «Para:» al lado de "
 "la caja de entrada."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:70
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14245,49 +13834,41 @@ msgstr ""
 "{0}\n"
 "¿Enviar de todas formas?"
 
-#: ../mail/mail.error.xml.h:76
-msgid "Please provide an unique name to identify this signature."
-msgstr "Introduzca un nombre único para identificar esta firma."
-
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:73
 msgid "Please wait."
 msgstr "Por favor espere."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:74
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Problema al migrar la carpeta antigua de correo «{0}»."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:75
 msgid "Querying server"
 msgstr "Consultando al servidor"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:76
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Se está consultando al servidor por una lista de mecanismos de autenticación "
 "soportados."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:77
 msgid "Read receipt requested."
 msgstr "Se solicitó una notificación de lectura."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:78
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "¿Seguro que quiere borrar la carpeta «{0}» y todas sus subcarpetas?"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:79
 msgid "Search Folders automatically updated."
 msgstr "Carpetas de búsqueda autoactualizadas."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:80
 msgid "Send Receipt"
 msgstr "Enviar confirmación"
 
-#: ../mail/mail.error.xml.h:85
-msgid "Signature Already Exists"
-msgstr "La firma ya existe"
-
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -14295,7 +13876,7 @@ msgstr ""
 "Ximian Evolution requiere las carpetas de sistema para funcionar "
 "correctamente y no pueden renombrarse, moverse o borrarse."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:82
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14311,7 +13892,7 @@ msgstr ""
 "destinatarios en su mensaje. Para evitar esto, debería añadir al menos un "
 "destinatario a Para: o Cc:"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:85
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14325,7 +13906,7 @@ msgstr ""
 "   «{1}» \n"
 "y se han actualizado."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14339,7 +13920,7 @@ msgstr ""
 "      «{1}»\n"
 "Y se han actualizado."
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "The message was sent via the &quot;sendmail&quot; external application.  "
 "Sendmail reports the following error: status 67: mail not sent.\n"
@@ -14351,11 +13932,11 @@ msgstr ""
 "El mensaje está almacenado en la carpeta de Salida. Compruebe si el mensaje "
 "tiene errores y reenvíe."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:97
 msgid "The script file must exist and be executable."
 msgstr "El archivo de script debe existir y ser ejecutable."
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14364,19 +13945,11 @@ msgstr ""
 "vaya al editor de carpetas de búsqueda para añadirla explícitamente, si es "
 "necesario."
 
-#: ../mail/mail.error.xml.h:105
-msgid ""
-"This message cannot be sent because the account you chose to send with is "
-"not enabled"
-msgstr ""
-"El mensaje no puede enviarse porque la cuenta con la que eligió enviar no "
-"está activada"
-
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:100
 msgid "This message cannot be sent because you have not specified any Recipients"
 msgstr "El mensaje no puede enviarse porque no ha especificado ningún destinatario"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:101
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14384,15 +13957,15 @@ msgstr ""
 "Este servidor no soporta este tipo de autenticación requerido y quizá no "
 "soporte ningún tipo de autenticación."
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:102
 msgid "This signature has been changed, but has not been saved."
 msgstr "Esta firma ha cambiado, pero no ha sido guardada."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:103
 msgid "Unable to connect to the GroupWise server."
 msgstr "No es posible conectarse con el servidor GroupWise."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "Unable to open the drafts folder for this account.  Use the system drafts "
 "folder instead?"
@@ -14400,39 +13973,39 @@ msgstr ""
 "No se pudo abrir la carpeta de borradores para esta cuenta. ¿Quiere usar la "
 "carpeta de borradores del sistema?"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:105
 msgid "Unable to read license file."
 msgstr "No se pudo leer el archivo de licencia."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:106
 msgid "Use _Default"
 msgstr "Usar _predeterminada"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:107
 msgid "Use default drafts folder?"
 msgstr "¿Desea usar la carpeta de borradores predeterminada?"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:108
 msgid "You have not filled in all of the required information."
 msgstr "No ha rellenado toda la información requerida."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:109
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Tiene mensajes no enviados, ¿quiere salir de todas formas?"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:110
 msgid "You may not create two accounts with the same name."
 msgstr "No puede crear dos cuentas con el mismo nombre."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:111
 msgid "You must name this Search Folder."
 msgstr "Debe dar un nombre a esta carpeta de búsqueda."
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:112
 msgid "You must specify a folder."
 msgstr "Debe especificar una carpeta."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14442,98 +14015,102 @@ msgstr ""
 "Hágalo seleccionando las carpetas individualmente, y/o seleccionando todas "
 "las carpetas locales, todas las carpetas remotas, o ambas."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:115
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "Su inicio de sesión en su servidor «{0}» como «{0}» falló."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:116
 msgid "Your message with the subject &quot;{0}&quot; was not delivered."
 msgstr "Su mensaje, con el asunto «{0}» no fue entregado."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:117
 msgid "_Append"
 msgstr "_Agregar"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:118
 msgid "_Discard changes"
 msgstr "_Descartar los cambios"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:119
+msgid "_Empty Trash"
+msgstr "_Vaciar papelera"
+
+#: ../mail/mail.error.xml.h:120
 msgid "_Expunge"
 msgstr "C_ompactar"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:121
 msgid "_Open Messages"
 msgstr "_Abrir mensajes"
 
-#: ../mail/message-list.c:1006
+#: ../mail/message-list.c:996
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: ../mail/message-list.c:1007
+#: ../mail/message-list.c:997
 msgid "Seen"
 msgstr "Visto"
 
-#: ../mail/message-list.c:1008
+#: ../mail/message-list.c:998
 msgid "Answered"
 msgstr "Contestado"
 
-#: ../mail/message-list.c:1009
+#: ../mail/message-list.c:999
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples mensajes sin leer"
 
-#: ../mail/message-list.c:1010
+#: ../mail/message-list.c:1000
 msgid "Multiple Messages"
 msgstr "Múltiples mensajes"
 
-#: ../mail/message-list.c:1014
+#: ../mail/message-list.c:1004
 msgid "Lowest"
 msgstr "La más baja"
 
-#: ../mail/message-list.c:1015
+#: ../mail/message-list.c:1005
 msgid "Lower"
 msgstr "Más baja"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1009
 msgid "Higher"
 msgstr "Más alta"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1010
 msgid "Highest"
 msgstr "La más alta"
 
-#: ../mail/message-list.c:1348 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1338 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1355 ../plugins/itip-formatter/itip-view.c:197
+#: ../mail/message-list.c:1345 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: ../mail/message-list.c:1364 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1354 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1366 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1384 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1374 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1386 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2052
+#: ../mail/message-list.c:2042
 msgid "Message List"
 msgstr "Lista de mensajes"
 
-#: ../mail/message-list.c:3397
+#: ../mail/message-list.c:3387
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
@@ -14675,13 +14252,14 @@ msgstr ""
 "Un complemento para respaldar y restaurar los datos de Evolution y la "
 "configuración."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
+#. the path to the shared library
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
 msgid "Backup and restore plugin"
 msgstr "Complemento para respaldar y restaurar"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup Settings..."
-msgstr "Configuración del respaldo..."
+msgstr "Configuración del respaldo…"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
 msgid "Backup and restore Evolution data and settings"
@@ -14689,29 +14267,29 @@ msgstr "Respaldar y restaurar los datos de Evolution y la configuración"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
 msgid "Restore Settings..."
-msgstr "Configuración de la restauración..."
+msgstr "Configuración de la restauración…"
 
-#: ../plugins/bbdb/bbdb.c:410
+#: ../plugins/bbdb/bbdb.c:404
 msgid "Automatic Contacts"
 msgstr "Contactos automáticos"
 
-#: ../plugins/bbdb/bbdb.c:419
+#: ../plugins/bbdb/bbdb.c:413
 msgid "<span weight=\"bold\">Automatic Contacts</span>"
 msgstr "<span weight=\"bold\">Contactos automáticos</span>"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:432
+#: ../plugins/bbdb/bbdb.c:426
 msgid "_Automatically create entries in the addressbook when responding to mail"
 msgstr ""
 "Crear entradas _automáticamente en la libreta de direcciones cuando se "
 "responda al correo"
 
-#: ../plugins/bbdb/bbdb.c:450
+#: ../plugins/bbdb/bbdb.c:444
 msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
 msgstr "<span weight=\"bold\">Contactos de mensajería instantánea</span>"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:463
+#: ../plugins/bbdb/bbdb.c:457
 msgid ""
 "Periodically synchronize contact information and images from my _instant "
 "messenger"
@@ -14720,7 +14298,7 @@ msgstr ""
 "mi mensajería _instantánea"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:470
+#: ../plugins/bbdb/bbdb.c:464
 msgid "Synchronize with _buddy list now"
 msgstr "Sincronizar con la lista de _compañeros ahora"
 
@@ -14970,16 +14548,6 @@ msgstr "Tipo de autenticación"
 msgid "Ch_eck for Supported Types"
 msgstr "_Comprobar tipos soportados "
 
-#: ../plugins/exchange-operations/exchange-calendar.c:192
-#: ../plugins/exchange-operations/exchange-contacts.c:162
-msgid ""
-"Evolution is in offline mode. You cannot create or modify folders now.\n"
-"Please switch to online mode for such operations."
-msgstr ""
-"Evolution está en modo desconectado. No puede crear o modificar carpetas "
-"ahora.\n"
-"Cambie a modo conectado para dichas operaciones."
-
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
@@ -15119,7 +14687,7 @@ msgstr "_Tareas:"
 #: ../plugins/exchange-operations/exchange-folder-permission.c:58
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
-msgstr "Permisos..."
+msgstr "Permisos…"
 
 #: ../plugins/exchange-operations/exchange-folder-size-display.c:136
 msgid "Folder Name"
@@ -15129,28 +14697,24 @@ msgstr "Nombre de la carpeta"
 msgid "Folder Size"
 msgstr "Tamaño de la carpeta"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:180
-msgid "Subscribe to Other User's"
-msgstr "Subscribirse a otros usuarios"
-
 #: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
 msgid "Exchange Folder Tree"
 msgstr "Árbol de carpetas de Exchange"
 
-#: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:227
-#: ../plugins/exchange-operations/exchange-folder.c:237
+#: ../plugins/exchange-operations/exchange-folder.c:62
+#: ../plugins/exchange-operations/exchange-folder.c:223
+#: ../plugins/exchange-operations/exchange-folder.c:233
 msgid "Unsubscribe Folder..."
-msgstr "Desuscribirse de la carpeta..."
+msgstr "Desuscribirse de la carpeta…"
 
-#: ../plugins/exchange-operations/exchange-folder.c:464
-#: ../plugins/exchange-operations/exchange-folder.c:524
+#: ../plugins/exchange-operations/exchange-folder.c:460
+#: ../plugins/exchange-operations/exchange-folder.c:520
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "¿Seguro que desea desuscribirse de la carpeta «%s»?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:476
-#: ../plugins/exchange-operations/exchange-folder.c:536
+#: ../plugins/exchange-operations/exchange-folder.c:472
+#: ../plugins/exchange-operations/exchange-folder.c:532
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Desuscribirse de «%s»"
@@ -15229,7 +14793,7 @@ msgstr "Seleccionar usuario"
 
 #: ../plugins/exchange-operations/exchange-user-dialog.c:182
 msgid "Addressbook..."
-msgstr "Libreta de direcciones..."
+msgstr "Libreta de direcciones…"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
 msgid "Subscribe to Other User's Contacts"
@@ -15566,7 +15130,7 @@ msgstr ""
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
-msgstr "_Desuscribirse de carpetas"
+msgstr "Desuscribirse de carpetas"
 
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
 msgid "Checklist"
@@ -15586,7 +15150,7 @@ msgstr "<b>Opciones de spam</b>"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:112
 msgid "Junk Mail Settings..."
-msgstr "Opciones de spam..."
+msgstr "Opciones de spam…"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:1
 msgid "<b>Junk List :</b>"
@@ -15618,7 +15182,6 @@ 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:13 ../ui/evolution-task-editor.xml.h:8
 #: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "Opciones de envío"
@@ -15654,7 +15217,7 @@ msgstr "Los participantes recibirán la notificación siguiente.\n"
 
 #: ../plugins/groupwise-features/properties.glade.h:11
 msgid "_Contacts..."
-msgstr "_Contactos..."
+msgstr "_Contactos…"
 
 #: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Cutomize notification message"
@@ -15666,7 +15229,7 @@ msgstr "_Sin compartir"
 
 #: ../plugins/groupwise-features/properties.glade.h:15
 msgid "_Shared With ..."
-msgstr "_Compartir con..."
+msgstr "_Compartir con…"
 
 #: ../plugins/groupwise-features/properties.glade.h:16
 msgid "_Sharing"
@@ -15706,10 +15269,10 @@ msgstr "Suscribirse a _mis alarmas"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
 msgid "Subscribe to my _notifications"
-msgstr "Suscribirse a mis notificaciones"
+msgstr "Suscribirse a mis _notificaciones"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Read"
 msgstr "_Leído"
 
@@ -15738,7 +15301,7 @@ msgstr "Sesión proxy"
 
 #: ../plugins/groupwise-features/proxy-login.c:219
 #: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:501
+#: ../plugins/groupwise-features/proxy.c:499
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -15746,13 +15309,9 @@ msgstr "%s Introduzca la contraseña para %s (usuario %s)"
 
 #: ../plugins/groupwise-features/proxy-login.c:497
 msgid "_Proxy Login..."
-msgstr "Sesión _proxy..."
+msgstr "Sesión _proxy…"
 
-#: ../plugins/groupwise-features/proxy.c:690
-msgid "The Proxy tab will be available only when the account is online."
-msgstr "La solapa del Proxy estará disponible sólo cuando la cuenta esté conectada."
-
-#: ../plugins/groupwise-features/proxy.c:695
+#: ../plugins/groupwise-features/proxy.c:680
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "La solapa del Proxy estará disponible sólo cuando la cuenta esté activada."
 
@@ -15766,7 +15325,7 @@ msgstr "Introduzca los usuarios y establezca permisos"
 
 #: ../plugins/groupwise-features/share-folder-common.c:338
 msgid "New _Shared Folder..."
-msgstr "Carpeta compartida _nueva..."
+msgstr "Carpeta compartida _nueva…"
 
 #: ../plugins/groupwise-features/share-folder-common.c:446
 msgid "Sharing"
@@ -15774,66 +15333,7 @@ msgstr "Compartir"
 
 #: ../plugins/groupwise-features/status-track.c:235
 msgid "Track Message Status..."
-msgstr "Seguir el estado del mensaje..."
-
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "Hula Account Setup"
-msgstr "Configuración de la cuenta Hula"
-
-#: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:137
-msgid "iCalendar format (.ics)"
-msgstr "Formato iCalendar (.ics)"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
-msgstr "Sincronizar la tarea/calendario/libreta de direcciones con Apple iPod"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
-msgid "Synchronize to iPod"
-msgstr "Sincronizar con iPod"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
-msgid "iPod Synchronization"
-msgstr "Sincronización con iPod"
-
-#: ../plugins/ipod-sync/sync.c:158
-msgid "No output directory!"
-msgstr "Sin directorio de salida"
-
-#: ../plugins/ipod-sync/sync.c:159
-msgid ""
-"The output directory was not found on iPod! Please ensure that iPod has been "
-"correctly set up and try again."
-msgstr ""
-"El directorio de salida no se encontró en el iPod. Asegúrese de que el iPod "
-"se ha configurado correctamente e inténtelo de nuevo."
-
-#: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
-msgid "Could not export data!"
-msgstr "No se pudo exportar datos"
-
-#: ../plugins/ipod-sync/sync.c:203
-msgid "Exporting data failed."
-msgstr "Falló la exportación de los datos."
-
-#: ../plugins/ipod-sync/sync.c:231
-msgid "Could not open addressbook!"
-msgstr "No se pudo abrir la libreta de direcciones"
-
-#: ../plugins/ipod-sync/sync.c:232
-msgid "Could not open the Evolution addressbook to export data."
-msgstr "No se puedo abrir la libreta de direcciones de Evolution para exportar datos."
-
-#: ../plugins/ipod-sync/sync.c:291
-msgid "Could not open calendar/todo!"
-msgstr "No se pudo abrir el calendario/tareas"
-
-#: ../plugins/ipod-sync/sync.c:292
-msgid "Could not open the Evolution calendar/todo list to export data."
-msgstr ""
-"No s epudo abrir la lista de calendario /tareas de Evolution para exportar "
-"datos."
+msgstr "Seguir el estado del mensaje…"
 
 #: ../plugins/itip-formatter/itip-formatter.c:724
 msgid "Unable to parse item"
@@ -15880,17 +15380,17 @@ msgstr "No se pudo enviar una notificación de cancelación al delegado"
 #: ../plugins/itip-formatter/itip-formatter.c:991
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
-"El estado de asistencia no se pudo actualizar debido a que el estado es "
+"El estado de participación no se pudo actualizar debido a que el estado es "
 "inválido"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1017
 #, c-format
 msgid "Unable to update attendee. %s"
-msgstr "No se pudo actualizar la asistencia. %s"
+msgstr "No se pudo actualizar la participación. %s"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1021
 msgid "Attendee status updated"
-msgstr "Estado de asistencia actualizado"
+msgstr "Estado de participación actualizado"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1148
 msgid "The calendar attached is not valid"
@@ -15932,6 +15432,10 @@ msgstr ""
 "Para procesar todos estos elementos, el archivo debería guardarse y el "
 "calendario importarse"
 
+#: ../plugins/itip-formatter/itip-formatter.c:1968
+msgid "Meetings and Tasks"
+msgstr "Reuniones y tareas"
+
 #. Delete message after acting
 #. FIXME Need a schema for this
 #: ../plugins/itip-formatter/itip-formatter.c:1991
@@ -15940,266 +15444,266 @@ msgstr "_Borrar el mensaje después de actuar"
 
 #: ../plugins/itip-formatter/itip-formatter.c:2001
 msgid "<span weight=\"bold\">Conflict Search</span>"
-msgstr "<span weight=\"bold\">Buscar conflicto</span>"
+msgstr "<span weight=\"bold\">Búsqueda de conflictos</span>"
 
 #. Source selector
 #: ../plugins/itip-formatter/itip-formatter.c:2014
 msgid "Select the calendars to search for meeting conflicts"
-msgstr "Seleccione los calendario en los que buscar conflictos entre reuniones"
+msgstr "Seleccione los calendarios en los que buscar conflictos entre reuniones"
 
 #: ../plugins/itip-formatter/itip-formatter.c:2031
 msgid "Conflict Search Table"
 msgstr "Tabla de búsquedas de conflictos"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:183 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:466
+#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:240 ../widgets/misc/e-dateedit.c:457
 msgid "Today"
 msgstr "Hoy"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:188
+#: ../plugins/itip-formatter/itip-view.c:189
 msgid "Today %H:%M"
 msgstr "Hoy a las %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:192
+#: ../plugins/itip-formatter/itip-view.c:193
 msgid "Today %H:%M:%S"
 msgstr "Hoy a las %H:%M %S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:202
 msgid "Today %l:%M:%S %p"
 msgstr "Hoy a las %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:211
+#: ../plugins/itip-formatter/itip-view.c:212
 msgid "Tomorrow"
 msgstr "Mañana"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:216
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow %H:%M"
 msgstr "Mañana a las %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:221
 msgid "Tomorrow %H:%M:%S"
 msgstr "Mañana a las %H:%M %S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %l:%M %p"
 msgstr "Mañana a las %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:230
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Mañana a las %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:248
+#: ../plugins/itip-formatter/itip-view.c:249
 #, 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:253
+#: ../plugins/itip-formatter/itip-view.c:254
 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:257
+#: ../plugins/itip-formatter/itip-view.c:258
 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:262
+#: ../plugins/itip-formatter/itip-view.c:263
 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:266
+#: ../plugins/itip-formatter/itip-view.c:267
 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:275
+#: ../plugins/itip-formatter/itip-view.c:276
 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:281
+#: ../plugins/itip-formatter/itip-view.c:282
 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:285
+#: ../plugins/itip-formatter/itip-view.c:286
 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:290
+#: ../plugins/itip-formatter/itip-view.c:291
 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:294
+#: ../plugins/itip-formatter/itip-view.c:295
 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:300
+#: ../plugins/itip-formatter/itip-view.c:301
 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:305
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e de %B de %Y a las %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:310
 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:314
+#: ../plugins/itip-formatter/itip-view.c:315
 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:318
+#: ../plugins/itip-formatter/itip-view.c:319
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A %e de %B de %Y, %l:%M %p"
 
-#: ../plugins/itip-formatter/itip-view.c:343
+#: ../plugins/itip-formatter/itip-view.c:344
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> ha publicado información de reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:345
+#: ../plugins/itip-formatter/itip-view.c:346
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> ha publicado la siguiente información de reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:350
+#: ../plugins/itip-formatter/itip-view.c:351
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> ha delegado la reunión siguiente en usted:"
 
-#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:354
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> solicita su presencia en la siguiente reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:355
+#: ../plugins/itip-formatter/itip-view.c:356
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> solicita su presencia en la siguiente reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:362
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> desea apuntarse a una reunión existente a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> desea apuntarse a una reunión existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> desea recibir la última información de la reunión siguiente:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> ha devuelto la siguiente respuesta a la reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:373
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> through %s has cancelled the following meeting:"
 msgstr "<b>%s</b> ha cancelado la siguiente reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:375
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> has cancelled the following meeting."
 msgstr "<b>%s</b> ha cancelado la reunión siguiente."
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:379
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> ha propuesto los cambios siguientes para la reunión."
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> ha declinado los siguientes cambios para la reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:384
+#: ../plugins/itip-formatter/itip-view.c:385
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> ha declinado los cambios siguientes para la reunión."
 
-#: ../plugins/itip-formatter/itip-view.c:411
+#: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> ha publicado la siguiente tarea a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:413
+#: ../plugins/itip-formatter/itip-view.c:414
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> ha publicado la tarea siguiente:"
 
-#: ../plugins/itip-formatter/itip-view.c:418
+#: ../plugins/itip-formatter/itip-view.c:419
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> solicita la asignación de %s para la siguiente tarea:"
 
-#: ../plugins/itip-formatter/itip-view.c:421
+#: ../plugins/itip-formatter/itip-view.c:422
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> a través de %s le ha asignado una tarea:"
 
-#: ../plugins/itip-formatter/itip-view.c:423
+#: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> le ha asignado a usted una tarea:"
 
-#: ../plugins/itip-formatter/itip-view.c:429
+#: ../plugins/itip-formatter/itip-view.c:430
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> a través de %s desea añadirse a una tarea existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:431
+#: ../plugins/itip-formatter/itip-view.c:432
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> desea añadirse a una tarea existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:435
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -16208,57 +15712,57 @@ msgstr ""
 "<b>%s</b> quiere recibir la última información para la siguiente tarea "
 "asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:438
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> ha devuelto la siguiente respuesta a la tarea:"
 
-#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:442
 #, c-format
 msgid "<b>%s</b> through %s has cancelled the following assigned task:"
 msgstr "<b>%s</b> ha cancelado la siguiente asignación de tarea a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:443
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> has cancelled the following assigned task:"
 msgstr "<b>%s</b> ha cancelado la siguiente tarea asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> ha propuesto los siguientes cambios en la asignación de tareas:"
 
-#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:451
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> has declinado la siguiente tarea asignada a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> ha declinado la siguiente tarea asignada:"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:891
+#: ../plugins/itip-formatter/itip-view.c:892
 msgid "Start time:"
 msgstr "Hora de inicio:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:900
+#: ../plugins/itip-formatter/itip-view.c:901
 msgid "End time:"
 msgstr "Hora de fin:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:916
-#: ../plugins/itip-formatter/itip-view.c:966
+#: ../plugins/itip-formatter/itip-view.c:917
+#: ../plugins/itip-formatter/itip-view.c:967
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: ../plugins/itip-formatter/itip-view.c:980
+#: ../plugins/itip-formatter/itip-view.c:981
 msgid "Send u_pdates to attendees"
 msgstr "Mandar _actualizaciones a los participantes"
 
-#: ../plugins/itip-formatter/itip-view.c:989
+#: ../plugins/itip-formatter/itip-view.c:990
 msgid "A_pply to all instances"
 msgstr "_Aplicar a todas las instancias"
 
@@ -16284,7 +15788,9 @@ msgstr "Esta reunión se ha delegado"
 
 #: ../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 "Esta respuesta no es de un asistente. ¿Desea añadirlo como asistente?"
+msgstr ""
+"Esta respuesta no es de un participante actual. ¿Desea añadir al remitente "
+"como un participante?"
 
 #: ../plugins/mail-account-disable/mail-account-disable.c:47
 msgid "Proxy _Logout"
@@ -16388,7 +15894,7 @@ msgid ""
 "unsubscribe, ...)."
 msgstr ""
 "Proporciona acciones para comandos comunes de listas de correo (suscribirse, "
-"desuscribirse, ...)."
+"desuscribirse, …)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
@@ -16510,7 +16016,7 @@ msgstr "Suscribirse a la lista de correo a la que pertenece este mensaje"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
 msgid "Unsubscribe to the mailing list this message belongs to"
-msgstr "Desuscribirse de la lista de correo a la que pertenece este mensaje"
+msgstr "Desubscribirse de la lista de correo a la que pertenece este mensaje"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
 msgid "Mark calendar offline"
@@ -16640,9 +16146,8 @@ msgid "Gives an option to print mail from composer"
 msgstr "Da una opción para imprimir el correo desde el editor"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:18 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-memos.xml.h:12
-#: ../ui/evolution-tasks.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "_Vista preliminar de impresión"
 
@@ -16668,13 +16173,14 @@ msgstr ""
 "Un complemento para guardar todos los adjuntos o partes de un mensaje a la "
 "vez."
 
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:2
+#. the path to the shared library
+#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
 msgid "Save attachments"
 msgstr "Guardar adjuntos"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
 msgid "Save Attachments ..."
-msgstr "Guardar adjuntos..."
+msgstr "Guardar adjuntos…"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
 msgid "Save all attachments"
@@ -16689,8 +16195,7 @@ msgid "MIME Type"
 msgstr "Tipo MIME"
 
 #: ../plugins/save-attachments/save-attachments.c:359
-#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:18
-#: ../ui/evolution-signature-editor.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:18
 msgid "Save"
 msgstr "Guardar"
 
@@ -16774,6 +16279,10 @@ msgstr "Encapsular valores con:"
 msgid "Comma separated value format (.csv)"
 msgstr "Formato de valores separados por comas (.csv)"
 
+#: ../plugins/save-calendar/ical-format.c:137
+msgid "iCalendar format (.ics)"
+msgstr "Formato iCalendar (.ics)"
+
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
 msgstr "Guardar seleccionados"
@@ -16867,7 +16376,7 @@ msgstr "Indica si la agrupación de mensajes debe hacerse respecto al asunto."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
-msgstr "_Agrupar según el asunto"
+msgstr "Agrupar según el asunto"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
 msgid "Thread messages by subject"
@@ -16876,7 +16385,7 @@ msgstr "Agrupar mensajes según el asunto"
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
 #: ../plugins/subject-thread/subject-thread.c:54
 msgid "Fall back to threading messages by sub_ject"
-msgstr "Volver a conversaciones por _asunto"
+msgstr "Agrupar conversaciones por _asunto"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
@@ -17106,43 +16615,43 @@ msgstr "El nombre de la carpeta no puede contener el carácter «#»."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' y '..' son nombres reservados de carpetas."
 
-#: ../shell/e-shell-window-commands.c:71
+#: ../shell/e-shell-window-commands.c:70
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Las utilidades GNOME Pilot no parecen estar instaladas en este sistema."
 
-#: ../shell/e-shell-window-commands.c:79
+#: ../shell/e-shell-window-commands.c:78
 #, c-format
 msgid "Error executing %s."
 msgstr "Error ejecutando %s."
 
-#: ../shell/e-shell-window-commands.c:128
+#: ../shell/e-shell-window-commands.c:127
 msgid "Bug buddy is not installed."
 msgstr "Bug Buddy no está instalado."
 
-#: ../shell/e-shell-window-commands.c:136
+#: ../shell/e-shell-window-commands.c:135
 msgid "Bug buddy could not be run."
 msgstr "No se ha podido ejecutar Bug Buddy."
 
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
 #. * about box
-#: ../shell/e-shell-window-commands.c:533
+#: ../shell/e-shell-window-commands.c:532
 msgid "translator-credits"
 msgstr "Francisco Javier F. Serrador"
 
-#: ../shell/e-shell-window-commands.c:547
+#: ../shell/e-shell-window-commands.c:546
 msgid "Groupware Suite"
 msgstr "Suite de trabajo en grupo"
 
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:774
 msgid "_Work Online"
 msgstr "_Trabajar conectado"
 
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:49
+#: ../shell/e-shell-window-commands.c:787 ../ui/evolution.xml.h:50
 msgid "_Work Offline"
 msgstr "_Trabajar desconectado"
 
-#: ../shell/e-shell-window-commands.c:801
+#: ../shell/e-shell-window-commands.c:800
 msgid "Work Offline"
 msgstr "Trabajar desconectado"
 
@@ -17158,7 +16667,7 @@ msgstr "Evolution está en proceso de desconectarse."
 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:735
+#: ../shell/e-shell-window.c:724
 #, c-format
 msgid "Switch to %s"
 msgstr "Cambiar a %s"
@@ -17172,7 +16681,7 @@ msgstr "Error de sistema desconocido."
 msgid "%ld KB"
 msgstr "%ld KiB"
 
-#: ../shell/e-shell.c:1257 ../widgets/misc/e-cell-date-edit.c:257
+#: ../shell/e-shell.c:1257 ../widgets/misc/e-cell-date-edit.c:256
 msgid "OK"
 msgstr "Aceptar"
 
@@ -17255,7 +16764,7 @@ msgid ""
 "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"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
 "This product comes with no warranty and is not intended for\n"
 "individuals prone to violent fits of anger.\n"
 "\n"
@@ -17263,7 +16772,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 "Hola.  Gracias por tomarse el tiempo en descargar esta versión \n"
-"preliminar de lanzamiento de la suite para trabajo en grupo Evolution.\n"
+"liberación preliminar de la suite para trabajo en grupo Evolution.\n"
 "\n"
 "Esta versión de Evolution todavía no está terminada. Está cerca de\n"
 "terminarse pero algunas características están incompletas o no\n"
@@ -17272,12 +16781,11 @@ msgstr ""
 "Si quiere una versión estable de Evolution, es mejor que desinstale\n"
 "esta versión e instale la versión %s en su lugar.\n"
 "\n"
-"Si encuentra fallos, por favor infórmenos de ellos en bugzilla.gnome.org.\n"
-"Este producto viene sin garantía alguna y no está dirigido a personas \n"
+"Si encuentra fallos, por favor infórmenos de ellos en bugzilla.ximian.com.\n"
+"Este producto viene sin garantía alguna y no está dirigido a personas "
 "proclives a violentos accesos de ira.\n"
 "\n"
-"Esperamos que disfrute del resultado de nuestro duro trabajo y \n"
-"esperamos su contribución.\n"
+"Esperamos que disfrute de nuestro duro trabajo y esperamos su contribución.\n"
 
 #: ../shell/main.c:254
 msgid ""
@@ -17497,7 +17005,7 @@ msgstr ""
 #: ../smime/gui/certificate-manager.c:597
 #: ../smime/gui/certificate-manager.c:605
 msgid "Select a certificate to import..."
-msgstr "Seleccione un certificado para importar..."
+msgstr "Seleccione un certificado para importar…"
 
 #: ../smime/gui/certificate-manager.c:265
 #: ../smime/gui/certificate-manager.c:474
@@ -17508,7 +17016,7 @@ msgstr "Nombre del certificado"
 #: ../smime/gui/certificate-manager.c:274
 #: ../smime/gui/certificate-manager.c:492
 msgid "Purposes"
-msgstr "Propósito"
+msgstr "Propósitos"
 
 #: ../smime/gui/certificate-manager.c:283 ../smime/gui/smime-ui.glade.h:37
 #: ../smime/lib/e-cert.c:569
@@ -18004,112 +17512,102 @@ msgstr "No se pudo ejecutar: «%s»: %s\n"
 msgid "Shutting down %s (%s)\n"
 msgstr "Cerrando %s (%s)\n"
 
-#: ../ui/evolution-addressbook.xml.h:2
-msgid "Contact _Preview"
-msgstr "Vista _previa de contactos"
-
-#: ../ui/evolution-addressbook.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:3
 msgid "Copy Selected Contacts to Another Folder..."
-msgstr "Copia los contactos seleccionados a otra carpeta..."
+msgstr "Copia los contactos seleccionados a otra carpeta…"
 
-#: ../ui/evolution-addressbook.xml.h:5 ../ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:4 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Copia la selección"
 
-#: ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-addressbook.xml.h:5
 msgid "Copy to Folder..."
-msgstr "Copia a la carpeta..."
-
-#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-memos.xml.h:4
-#: ../ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Cortar"
+msgstr "Copia a la carpeta…"
 
-#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Corta la selección"
 
-#: ../ui/evolution-addressbook.xml.h:10
+#: ../ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Borra los contactos seleccionados"
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Forward Contact"
-msgstr "Reenviar contacto"
-
-#: ../ui/evolution-addressbook.xml.h:12
 msgid "Move Selected Contacts to Another Folder..."
-msgstr "Mueve los contactos seleccionados a otra carpeta..."
+msgstr "Mueve los contactos seleccionados a otra carpeta…"
 
-#: ../ui/evolution-addressbook.xml.h:13
+#: ../ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
-msgstr "Mover a la carpeta..."
+msgstr "Mover a la carpeta…"
 
-#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-memos.xml.h:8
-#: ../ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Pegar"
-
-#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
 msgstr "Pega el contenido del porta papeles"
 
-#: ../ui/evolution-addressbook.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Previsualiza los contactos a imprimir"
 
-#: ../ui/evolution-addressbook.xml.h:19
+#: ../ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Imprime los contactos seleccionados"
 
-#: ../ui/evolution-addressbook.xml.h:21
+#: ../ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Guarda los contactos seleccionados en una VCard."
 
-#: ../ui/evolution-addressbook.xml.h:22 ../widgets/text/e-text.c:2684
+#: ../ui/evolution-addressbook.xml.h:21 ../widgets/text/e-text.c:2684
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: ../ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Seleccionar todos los contactos"
 
-#: ../ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-addressbook.xml.h:23
 msgid "Send a message to the selected contacts."
 msgstr "Envía un mensaje a los contactos seleccionados."
 
-#: ../ui/evolution-addressbook.xml.h:25
+#: ../ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Enviar un mensaje al contacto"
 
-#: ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Envía los contactos seleccionados a otra persona."
 
-#: ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-addressbook.xml.h:26
 msgid "Show contact preview window"
 msgstr "Muestra una ventana de vista previa de contactos"
 
-#: ../ui/evolution-addressbook.xml.h:28
+#: ../ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Parar"
 
-#: ../ui/evolution-addressbook.xml.h:29
+#: ../ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Parar la carga"
 
-#: ../ui/evolution-addressbook.xml.h:30
+#: ../ui/evolution-addressbook.xml.h:29
 msgid "View the current contact"
 msgstr "Ver el contacto actual"
 
-#: ../ui/evolution-addressbook.xml.h:31 ../ui/evolution-calendar.xml.h:38
-#: ../ui/evolution-mail-list.xml.h:26 ../ui/evolution-tasks.xml.h:21
+#: ../ui/evolution-addressbook.xml.h:30 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-tasks.xml.h:19
 msgid "_Actions"
 msgstr "A_cciones"
 
-#: ../ui/evolution-addressbook.xml.h:36
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "_Forward Contact..."
-msgstr "_Reenviar contacto..."
+msgstr "_Reenviar contacto…"
+
+#: ../ui/evolution-addressbook.xml.h:39
+msgid "_Preview Pane"
+msgstr "Panel de vista _previa"
+
+#: ../ui/evolution-addressbook.xml.h:41
+msgid "_Save as VCard..."
+msgstr "G_uardar como vCard…"
 
 #: ../ui/evolution-addressbook.xml.h:42
 msgid "_Select All"
@@ -18117,7 +17615,7 @@ msgstr "_Seleccionar todo"
 
 #: ../ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
-msgstr "Enviar _mensaje al contacto..."
+msgstr "Enviar _mensaje al contacto…"
 
 #: ../ui/evolution-calendar.xml.h:4
 msgid "Day"
@@ -18185,16 +17683,12 @@ msgstr "Purg_ar"
 
 #: ../ui/evolution-calendar.xml.h:24
 msgid "Purge old appointments and meetings"
-msgstr "Purgar reuniones y acontecimientos antiguos"
+msgstr "Purgar reuniones y citas antiguas"
 
 #: ../ui/evolution-calendar.xml.h:25
 msgid "Select _Date"
 msgstr "Seleccionar _fecha"
 
-#: ../ui/evolution-calendar.xml.h:26
-msgid "Select _Today"
-msgstr "Seleccionar _hoy"
-
 #: ../ui/evolution-calendar.xml.h:27
 msgid "Select a specific date"
 msgstr "Seleccionar una fecha específica"
@@ -18239,186 +17733,30 @@ msgstr "Semana laboral"
 msgid "_Open Appointment"
 msgstr "_Abrir cita"
 
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-editor.xml.h:7
+#: ../ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
 msgstr "Copia el texto seleccionado al portapapeles"
 
-#: ../ui/evolution-composer-entries.xml.h:3 ../ui/evolution-editor.xml.h:9
+#: ../ui/evolution-composer-entries.xml.h:2
+msgid "Cu_t"
+msgstr "Cor_tar"
+
+#: ../ui/evolution-composer-entries.xml.h:3
 msgid "Cut selected text to the clipboard"
 msgstr "Corta el texto seleccionado al portapapeles"
 
-#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:10
+#: ../ui/evolution-composer-entries.xml.h:4
 msgid "Paste text from the clipboard"
 msgstr "Pega texto desde el portapapeles"
 
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-editor.xml.h:12
-#: ../ui/evolution-subscribe.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Seleccionar _todo"
 
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:6
 msgid "Select all text"
 msgstr "Selecciona todo el texto"
 
-#: ../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 availabe"
-msgstr "Pulse aquí para ver la ayuda disponible"
-
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:2
-msgid "Close"
-msgstr "Cerrar"
-
-#: ../ui/evolution-editor.xml.h:14
-msgid "_Attachments"
-msgstr "_Adjuntos"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:42 ../ui/evolution-subscribe.xml.h:9
-msgid "_Close"
-msgstr "_Cerrar"
-
-#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:45
-#: ../ui/evolution-signature-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:34
-msgid "_File"
-msgstr "_Archivo"
-
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:35
-msgid "_Help"
-msgstr "A_yuda"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-message-composer.xml.h:47
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "_Insert"
-msgstr "_Insertar"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "_Opciones"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All day Event"
-msgstr "Acontecimiento para todo el día"
-
-#: ../ui/evolution-event-editor.xml.h:3 ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "Clasificar como confidencial"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "Clasificar como privado"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "Clasificar como público"
-
-#: ../ui/evolution-event-editor.xml.h:7 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "Opciones de envío avanzadas"
-
-#: ../ui/evolution-event-editor.xml.h:8
-msgid "Make this a recurring event"
-msgstr "Convertir en acontecimiento repetitivo"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "Pú_blico"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Query free / busy information for the attendees"
-msgstr "Consultar información de disponibilidad para los participantes"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "Campo «_Rol»"
-
-#: ../ui/evolution-event-editor.xml.h:14 ../ui/evolution-task-editor.xml.h:9
-msgid "Show Time _Zone"
-msgstr "Mostrar _zona horaria"
-
-#: ../ui/evolution-event-editor.xml.h:15
-msgid "Show time as b_usy"
-msgstr "Mostrar hora como _ocupada"
-
-#: ../ui/evolution-event-editor.xml.h:16 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "Conmuta cuando se muestra el campo «Tipo de participante»"
-
-#: ../ui/evolution-event-editor.xml.h:17 ../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:18 ../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:19 ../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:20 ../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:21 ../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:22
-msgid "Toggles whether to have All day Event"
-msgstr "Conmuta cuando se tiene un «Acontecimiento para todo el día»"
-
-#: ../ui/evolution-event-editor.xml.h:23
-msgid "Toggles whether to show time as busy"
-msgstr "Conmuta cuando se deben mostrar las horas como ocupadas"
-
-#: ../ui/evolution-event-editor.xml.h:24
-msgid "_Alarms"
-msgstr "_Alarmas"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "_All day Event"
-msgstr "Acontecimiento para _todo el día"
-
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "_Clasificación"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "_Confidencial"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "_Privado"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_Confirmar"
-
-#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Field"
-msgstr "Campo de _estado"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:25
-msgid "_Type Field"
-msgstr "Campo de _tipo"
-
 #: ../ui/evolution-executive-summary.xml.h:1
 msgid "Customize My Evolution"
 msgstr "Personaliza Mi Evolution"
@@ -18447,27 +17785,24 @@ msgstr "Crea o edita reglas para el filtrado de mensajes nuevos"
 msgid "Empty _Trash"
 msgstr "_Vaciar papelera"
 
-#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:6
+#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:7
 #: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Carpeta"
 
 #: ../ui/evolution-mail-global.xml.h:9
 msgid "Message F_ilters"
-msgstr "_Filtros del mensaje"
+msgstr "_Filtros de mensajes"
 
 #: ../ui/evolution-mail-global.xml.h:10
-msgid "Message _List As"
-msgstr "_Lista de mensajes como"
-
-#: ../ui/evolution-mail-global.xml.h:11
 msgid "Message _Preview"
-msgstr "_Vista previa del mensaje"
+msgstr "Vista _previa del mensaje"
 
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:11
 msgid "Move the selected folder into another folder"
 msgstr "Mueve la carpeta seleccionada a otra carpeta"
 
+#. Alphabetical by name, yo
 #: ../ui/evolution-mail-global.xml.h:13
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Elimina permanentemente todos los mensajes borrados de todas las carpetas"
@@ -18486,21 +17821,20 @@ msgstr "Suscribirse o desuscribirse de carpetas alojadas en servidores remotos"
 
 #: ../ui/evolution-mail-global.xml.h:17
 msgid "_Copy Folder To..."
-msgstr "_Copiar carpeta a..."
+msgstr "_Copiar carpeta a…"
 
 #: ../ui/evolution-mail-global.xml.h:18
 msgid "_Move Folder To..."
-msgstr "_Mover carpeta a..."
+msgstr "_Mover carpeta a…"
 
 #: ../ui/evolution-mail-global.xml.h:19
-msgid "_New Search _Folder (FIXME)"
-msgstr "_Carpeta de búsqueda nueva"
-
-#: ../ui/evolution-mail-global.xml.h:20
 msgid "_New..."
-msgstr "_Nueva..."
+msgstr "_Nueva…"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#.
+#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
+#.
+#: ../ui/evolution-mail-global.xml.h:23
 msgid "_Subscriptions"
 msgstr "_Suscripciones"
 
@@ -18512,97 +17846,98 @@ msgstr "Cambiar el nombre de esta carpeta"
 msgid "Change the properties of this folder"
 msgstr "Cambia las propiedades de esta carpeta"
 
-#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:13
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Copiar mensaje(s) seleccionado(s) al portapapeles"
 
-#: ../ui/evolution-mail-list.xml.h:4 ../ui/evolution-mail-message.xml.h:23
+#. Alphabetical by name, yo
+#: ../ui/evolution-mail-list.xml.h:5 ../ui/evolution-mail-message.xml.h:24
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Corta el(los) mensaje(s) seleccionado(s) al portapapeles"
 
-#: ../ui/evolution-mail-list.xml.h:5
+#: ../ui/evolution-mail-list.xml.h:6
 msgid "E_xpunge"
 msgstr "C_ompactar"
 
-#: ../ui/evolution-mail-list.xml.h:7
+#: ../ui/evolution-mail-list.xml.h:8
 msgid "Group By _Threads"
-msgstr "Agrupar por conversaciones"
+msgstr "Agrupar por _conversaciones"
 
-#: ../ui/evolution-mail-list.xml.h:8
+#: ../ui/evolution-mail-list.xml.h:9
 msgid "Hide S_elected Messages"
 msgstr "Ocultar mensajes _seleccionados"
 
-#: ../ui/evolution-mail-list.xml.h:9
+#: ../ui/evolution-mail-list.xml.h:10
 msgid "Hide _Deleted Messages"
 msgstr "Ocultar mensajes _borrados"
 
-#: ../ui/evolution-mail-list.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:11
 msgid "Hide _Read Messages"
 msgstr "Ocultar mensajes _leídos"
 
-#: ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-list.xml.h:12
 msgid "Hide deleted messages rather than displaying them with a line through them"
 msgstr "Oculta los mensajes borrados en lugar de mostrarlos tachados por una línea"
 
-#: ../ui/evolution-mail-list.xml.h:12
-msgid "Mar_k Messages as Read"
+#: ../ui/evolution-mail-list.xml.h:13
+msgid "Mark Me_ssages as Read"
 msgstr "Marcar _mensajes como leídos"
 
-#: ../ui/evolution-mail-list.xml.h:13 ../ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-list.xml.h:14 ../ui/evolution-mail-message.xml.h:69
 msgid "Paste message(s) from the clipboard"
 msgstr "Pegar mensaje(s) desde el portapapeles"
 
-#: ../ui/evolution-mail-list.xml.h:14
+#: ../ui/evolution-mail-list.xml.h:15
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Elimina permanentemente todos los mensajes borrados de esta carpeta"
 
-#: ../ui/evolution-mail-list.xml.h:15
+#: ../ui/evolution-mail-list.xml.h:16
 msgid "Permanently remove this folder"
 msgstr "Elimina permanentemente esta carpeta"
 
-#: ../ui/evolution-mail-list.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:17
 msgid "Select Message _Thread"
 msgstr "Seleccionar _conversación del mensaje"
 
-#: ../ui/evolution-mail-list.xml.h:17
+#: ../ui/evolution-mail-list.xml.h:18
 msgid "Select _All Messages"
 msgstr "Seleccionar _todos los mensajes"
 
-#: ../ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:19
 msgid "Select all and only the messages that are not currently selected"
 msgstr "Selecciona todos los mensajes que no están seleccionados actualmente"
 
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:20
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 "Selecciona todos los mensajes en la misma conversación que el mensaje "
 "seleccionado"
 
-#: ../ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:21
 msgid "Select all visible messages"
 msgstr "Selecciona todos los mensajes visibles"
 
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:22
 msgid "Sh_ow Hidden Messages"
 msgstr "_Mostrar mensajes ocultos"
 
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:23
 msgid "Show messages that have been temporarily hidden"
 msgstr "Muestra los mensajes que han estado ocultos temporalmente"
 
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:24
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Oculta temporalmente todos los mensajes que han sido leídos"
 
-#: ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "Temporarily hide the selected messages"
 msgstr "Oculta temporalmente los mensajes seleccionados"
 
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:26
 msgid "Threaded Message list"
 msgstr "Lista de mensajes por conversaciones"
 
-#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:113
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Mensaje"
@@ -18615,129 +17950,126 @@ msgstr "_Añadir remitente a la libreta"
 msgid "A_pply Filters"
 msgstr "A_plicar filtros"
 
-#: ../ui/evolution-mail-message.xml.h:3
+#. Alphabetical by name, yo
+#: ../ui/evolution-mail-message.xml.h:4
 msgid "Add Sender to Address Book"
 msgstr "Añadir remitente a la libreta de direcciones"
 
-#: ../ui/evolution-mail-message.xml.h:4
+#: ../ui/evolution-mail-message.xml.h:5
 msgid "All Message _Headers"
 msgstr "_Todas las cabeceras del mensaje"
 
-#: ../ui/evolution-mail-message.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:6
 msgid "Apply filter rules to the selected messages"
 msgstr "Aplica filtros a los mensajes seleccionados"
 
-#: ../ui/evolution-mail-message.xml.h:6
+#: ../ui/evolution-mail-message.xml.h:7
 msgid "Check for _Junk"
 msgstr "Buscar _spam"
 
-#: ../ui/evolution-mail-message.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:8
 msgid "Compose _New Message"
 msgstr "Redactar un _mensaje nuevo"
 
-#: ../ui/evolution-mail-message.xml.h:8
+#: ../ui/evolution-mail-message.xml.h:9
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Responde a todos los destinatarios del mensaje seleccionado"
 
-#: ../ui/evolution-mail-message.xml.h:9
+#: ../ui/evolution-mail-message.xml.h:10
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Responde a la lista de correo remitente del mensaje seleccionado"
 
-#: ../ui/evolution-mail-message.xml.h:10
+#: ../ui/evolution-mail-message.xml.h:11
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Responde al remitente del mensaje seleccionado"
 
-#: ../ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-message.xml.h:14
 msgid "Copy selected messages to another folder"
 msgstr "Copia mensajes seleccionados a otra carpeta"
 
-#: ../ui/evolution-mail-message.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:15
 msgid "Create R_ule"
 msgstr "Crear _regla"
 
-#: ../ui/evolution-mail-message.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:16
 msgid "Create a Search Folder for these recipients"
 msgstr "Crea una carpeta de búsqueda para estos destinatarios"
 
-#: ../ui/evolution-mail-message.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:17
 msgid "Create a Search Folder for this mailing list"
 msgstr "Crea una carpeta de búsqueda para esta lista de correo"
 
-#: ../ui/evolution-mail-message.xml.h:17
+#: ../ui/evolution-mail-message.xml.h:18
 msgid "Create a Search Folder for this sender"
 msgstr "Crea una carpeta de búsqueda para este remitente"
 
-#: ../ui/evolution-mail-message.xml.h:18
+#: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a Search Folder for this subject"
 msgstr "Crea una carpeta de búsqueda para este asunto"
 
-#: ../ui/evolution-mail-message.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a rule to filter messages from this sender"
 msgstr "Crea una regla para filtrar los mensajes de este remitente"
 
-#: ../ui/evolution-mail-message.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:21
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Crea una regla para filtrar los mensajes de estos destinatarios"
 
-#: ../ui/evolution-mail-message.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:22
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Crea una regla para filtrar los mensajes de esta lista de correo"
 
-#: ../ui/evolution-mail-message.xml.h:22
+#: ../ui/evolution-mail-message.xml.h:23
 msgid "Create a rule to filter messages with this subject"
 msgstr "Crea una regla para filtrar los mensajes con este asunto"
 
-#: ../ui/evolution-mail-message.xml.h:24
+#: ../ui/evolution-mail-message.xml.h:25
 msgid "Decrease the text size"
 msgstr "Reduce el tamaño del texto"
 
-#: ../ui/evolution-mail-message.xml.h:26
+#: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next important message"
 msgstr "Muestra el mensaje siguiente importante"
 
-#: ../ui/evolution-mail-message.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:28
 msgid "Display the next message"
 msgstr "Muestra el mensaje siguiente"
 
-#: ../ui/evolution-mail-message.xml.h:28
+#: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the next unread message"
 msgstr "Muestra el siguiente mensaje no leído"
 
-#: ../ui/evolution-mail-message.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:30
 msgid "Display the next unread thread"
 msgstr "Muestra la siguiente conversación no leída"
 
-#: ../ui/evolution-mail-message.xml.h:30
+#: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous important message"
 msgstr "Muestra el anterior mensaje importante"
 
-#: ../ui/evolution-mail-message.xml.h:31
+#: ../ui/evolution-mail-message.xml.h:32
 msgid "Display the previous message"
 msgstr "Muestra el mensaje anterior"
 
-#: ../ui/evolution-mail-message.xml.h:32
+#: ../ui/evolution-mail-message.xml.h:33
 msgid "Display the previous unread message"
 msgstr "Muestra el anterior mensaje no leído"
 
-#: ../ui/evolution-mail-message.xml.h:33
-msgid "F_orward As..."
-msgstr "Reenviar _como..."
-
 #: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
-msgstr "Filtro según la _lista de correo..."
+msgstr "Filtro según la _lista de correo…"
 
 #: ../ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
-msgstr "Filtro según el _remitente..."
+msgstr "Filtro según el _remitente…"
 
 #: ../ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
-msgstr "Filtro según los _destinatarios..."
+msgstr "Filtro según los _destinatarios…"
 
 #: ../ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
-msgstr "Filtro según el _asunto..."
+msgstr "Filtro según el _asunto…"
 
 #: ../ui/evolution-mail-message.xml.h:38
 msgid "Filter the selected messages for junk status"
@@ -18749,7 +18081,7 @@ msgstr "Marca los mensajes seleccionados para seguimiento"
 
 #: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
-msgstr "Se_guimiento..."
+msgstr "Se_guimiento…"
 
 #: ../ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
@@ -18897,19 +18229,19 @@ msgstr "Guarda el mensaje como un archivo de texto"
 
 #: ../ui/evolution-mail-message.xml.h:87
 msgid "Search Folder from Mailing _List..."
-msgstr "Carpeta de búsqueda según la _lista de correo..."
+msgstr "Carpeta de búsqueda según la _lista de correo…"
 
 #: ../ui/evolution-mail-message.xml.h:88
 msgid "Search Folder from Recipients..."
-msgstr "Carpeta de búsqueda según los destinatarios..."
+msgstr "Carpeta de búsqueda según los destinatarios…"
 
 #: ../ui/evolution-mail-message.xml.h:89
 msgid "Search Folder from S_ubject..."
-msgstr "Carpeta de búsqueda según el a_sunto..."
+msgstr "Carpeta de búsqueda según el a_sunto…"
 
 #: ../ui/evolution-mail-message.xml.h:90
 msgid "Search Folder from Sen_der..."
-msgstr "Carpeta de búsqueda según el remite_nte..."
+msgstr "Carpeta de búsqueda según el remite_nte…"
 
 #: ../ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
@@ -18917,7 +18249,7 @@ msgstr "Busca un texto en el cuerpo del mensaje mostrado"
 
 #: ../ui/evolution-mail-message.xml.h:92
 msgid "Select _All Text"
-msgstr "Seleccionar todo el texto"
+msgstr "Seleccionar _todo el texto"
 
 #: ../ui/evolution-mail-message.xml.h:93
 msgid "Select all the text in a message"
@@ -18949,127 +18281,106 @@ msgstr "Recuperar los mensajes seleccionados"
 
 #: ../ui/evolution-mail-message.xml.h:100
 msgid "Uni_mportant"
-msgstr "No importante"
+msgstr "_No importante"
 
 #: ../ui/evolution-mail-message.xml.h:101
 msgid "Zoom _Out"
-msgstr "Reducir"
+msgstr "_Reducir"
 
 #: ../ui/evolution-mail-message.xml.h:102
-msgid "_Attached"
-msgstr "_Adjunto"
-
-#: ../ui/evolution-mail-message.xml.h:103
 msgid "_Caret Mode"
 msgstr "Activar _cursor"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "_Borrar el mensaje"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
-msgstr "B_uscar en el mensaje..."
+msgstr "B_uscar en el mensaje…"
 
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Go To"
 msgstr "_Ir a"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Important"
 msgstr "_Importante"
 
-#: ../ui/evolution-mail-message.xml.h:112
-msgid "_Inline"
-msgstr "_Incluido en línea"
-
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Junk"
 msgstr "_Spam"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Load Images"
 msgstr "Cargar _imágenes"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Next Message"
 msgstr "Mensaje _siguiente"
 
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Normal Size"
 msgstr "Tamaño _normal"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Not Junk"
 msgstr "_No es spam"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Open in New Window"
 msgstr "_Abrir en una ventana nueva"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Previous Message"
 msgstr "Mensaje a_nterior"
 
 #: ../ui/evolution-mail-message.xml.h:123
-msgid "_Quoted"
-msgstr "_Citado"
-
-#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Save Message..."
-msgstr "_Guardar mensaje..."
+msgstr "_Guardar mensaje…"
 
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Undelete Message"
-msgstr "_Recuperar mensaje"
+msgstr "_Recuperar el mensaje"
 
-#: ../ui/evolution-mail-message.xml.h:128
+#: ../ui/evolution-mail-message.xml.h:125
 msgid "_Unread"
 msgstr "_No leído"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Zoom In"
 msgstr "_Ampliar"
 
+#.
+#. <cmd name="FileSave" _label="Save"
+#. _tip="Save the current file" pixtype="stock" pixname="Save"
+#. accel="*Ctrl*s"/>
+#.
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+#: ../ui/evolution-message-composer.xml.h:4
+#: ../ui/evolution-signature-editor.xml.h:7
+msgid "Close"
+msgstr "Cerrar"
+
 #: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Cierra esta ventana"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Barra de herramientas principal"
 
-#: ../ui/evolution-memos.xml.h:3
-msgid "Copy selected memo"
-msgstr "Copia la nota seleccionada"
-
-#: ../ui/evolution-memos.xml.h:5
-msgid "Cut selected memo"
-msgstr "Corta la nota seleccionada"
-
-#: ../ui/evolution-memos.xml.h:7
-msgid "Delete selected memos"
-msgstr "Borra las notas seleccionadas"
-
-#: ../ui/evolution-memos.xml.h:9
-msgid "Paste memo from the clipboard"
-msgstr "Pegar notas desde el portapapeles"
-
-#: ../ui/evolution-memos.xml.h:10
-msgid "Previews the list of memos to be printed"
-msgstr "Vista previa de la lista de notas a imprimir"
-
-#: ../ui/evolution-memos.xml.h:13
-msgid "Print the list of memos"
-msgstr "Imprime la lista de notas"
-
-#: ../ui/evolution-memos.xml.h:14
-msgid "View the selected memo"
-msgstr "Ver la nota seleccionada"
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:42 ../ui/evolution-subscribe.xml.h:9
+msgid "_Close"
+msgstr "_Cerrar"
 
-#: ../ui/evolution-memos.xml.h:18
-msgid "_Open Memo"
-msgstr "_Abrir nota"
+#: ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:45
+#: ../ui/evolution-signature-editor.xml.h:24
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:36
+msgid "_File"
+msgstr "_Archivo"
 
 #: ../ui/evolution-message-composer.xml.h:1
 msgid "Attach"
@@ -19083,8 +18394,13 @@ msgstr "Adjuntar un archivo"
 msgid "Check to get delivery notification when your message is read"
 msgstr "Marcar para obtener una notificación de entrega cuando se lea su mensaje"
 
+#.
+#. <cmd name="FileSave" _label="Save"
+#. _tip="Save the current file" pixtype="stock" pixname="Save"
+#. accel="*Ctrl*s"/>
+#.
 #: ../ui/evolution-message-composer.xml.h:5
-#: ../ui/evolution-signature-editor.xml.h:3
+#: ../ui/evolution-signature-editor.xml.h:13
 msgid "Close the current file"
 msgstr "Cierra el archivo actual"
 
@@ -19101,7 +18417,7 @@ msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Encriptar este mensaje con su certificado de encriptación S/MIME"
 
 #: ../ui/evolution-message-composer.xml.h:9
-#: ../ui/evolution-signature-editor.xml.h:4
+#: ../ui/evolution-signature-editor.xml.h:14
 msgid "For_mat"
 msgstr "For_mato"
 
@@ -19143,7 +18459,7 @@ msgstr "Guardar borrador"
 
 #: ../ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
-msgstr "Guardar _como..."
+msgstr "Guardar _como…"
 
 #: ../ui/evolution-message-composer.xml.h:22
 msgid "Save _Draft"
@@ -19155,10 +18471,9 @@ msgstr "Guardar como borrador"
 
 #: ../ui/evolution-message-composer.xml.h:24
 msgid "Save in folder..."
-msgstr "Guardar en carpeta..."
+msgstr "Guardar en carpeta…"
 
 #: ../ui/evolution-message-composer.xml.h:25
-#: ../ui/evolution-signature-editor.xml.h:9
 msgid "Save the current file"
 msgstr "Guardar archivo actual"
 
@@ -19171,7 +18486,7 @@ msgid "Save the message in a specified folder"
 msgstr "Guardar el mensaje en una carpeta específica"
 
 #: ../ui/evolution-message-composer.xml.h:29
-#: ../ui/evolution-signature-editor.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:22
 msgid "Send the mail in HTML format"
 msgstr "Enviar el correo en formato HTML"
 
@@ -19213,7 +18528,7 @@ msgstr "Conmutador que indica si se muestra el campo «Para»"
 
 #: ../ui/evolution-message-composer.xml.h:39
 msgid "_Attachment..."
-msgstr "_Adjunto..."
+msgstr "_Adjunto…"
 
 #: ../ui/evolution-message-composer.xml.h:40
 msgid "_Bcc Field"
@@ -19231,9 +18546,14 @@ msgstr "_Borrar todo"
 msgid "_From Field"
 msgstr "Campo «_De»"
 
+#: ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-signature-editor.xml.h:25
+msgid "_Insert"
+msgstr "_Insertar"
+
 #: ../ui/evolution-message-composer.xml.h:48
 msgid "_Open..."
-msgstr "_Abrir..."
+msgstr "_Abrir…"
 
 #: ../ui/evolution-message-composer.xml.h:49
 msgid "_Post-To Field"
@@ -19255,19 +18575,22 @@ msgstr "Campo «_Para»"
 msgid "C_lose"
 msgstr "_Cerrar"
 
-#: ../ui/evolution-signature-editor.xml.h:5
+#: ../ui/evolution-signature-editor.xml.h:15
 msgid "H_TML"
 msgstr "H_TML"
 
-#: ../ui/evolution-signature-editor.xml.h:7
+#: ../ui/evolution-signature-editor.xml.h:16
 msgid "Save and Close"
 msgstr "Guardar y cerrar"
 
-#: ../ui/evolution-signature-editor.xml.h:8
+#.
+#. <menuitem name="FileSave" verb="" _label="_Save"/>
+#.
+#: ../ui/evolution-signature-editor.xml.h:20
 msgid "Save and _Close"
 msgstr "Guardar y _cerrar"
 
-#: ../ui/evolution-signature-editor.xml.h:10
+#: ../ui/evolution-signature-editor.xml.h:21
 msgid "Save the current file and close the window"
 msgstr "Guardar el archivo y cerrar la ventana de diálogo"
 
@@ -19299,22 +18622,6 @@ msgstr "Dar de baja"
 msgid "_Invert Selection"
 msgstr "_Invertir selección"
 
-#: ../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:10
-msgid "Status Details"
-msgstr "Detalles del estado"
-
-#: ../ui/evolution-task-editor.xml.h:11
-msgid "Time Zone"
-msgstr "Zona horaria"
-
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Status Details"
-msgstr "Detalles de _estado"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Copia las tareas seleccionadas"
@@ -19352,24 +18659,16 @@ msgid "Print the list of tasks"
 msgstr "Imprime la lista de tareas"
 
 #: ../ui/evolution-tasks.xml.h:18
-msgid "Show task preview window"
-msgstr "Muestra una ventana de vista previa de tarea"
-
-#: ../ui/evolution-tasks.xml.h:19
-msgid "Task _Preview"
-msgstr "_Vista previa de tarea"
-
-#: ../ui/evolution-tasks.xml.h:20
 msgid "View the selected task"
 msgstr "Ver la tarea seleccionada"
 
-#: ../ui/evolution-tasks.xml.h:27
+#: ../ui/evolution-tasks.xml.h:25
 msgid "_Open Task"
 msgstr "_Abrir tarea"
 
 #: ../ui/evolution.xml.h:1
 msgid "About Evolution..."
-msgstr "Acerca de Evolution..."
+msgstr "Acerca de Evolution…"
 
 #: ../ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
@@ -19402,134 +18701,134 @@ msgid "Display window buttons with text only"
 msgstr "Mostrar los botones de la ventana sólo con texto"
 
 #: ../ui/evolution.xml.h:10
-msgid "Evolution _FAQ"
-msgstr "_Dudas frecuentes de Evolution "
-
-#: ../ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Sale del programa"
 
-#: ../ui/evolution.xml.h:12
+#: ../ui/evolution.xml.h:11
 msgid "Forget _Passwords"
 msgstr "O_lvidar contraseñas"
 
-#: ../ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:12
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Olvida las contraseñas almacenadas así que se le preguntarán de nuevo"
 
-#: ../ui/evolution.xml.h:14
+#: ../ui/evolution.xml.h:13
 msgid "Hide window buttons"
 msgstr "Ocultar los botones de la ventana"
 
-#: ../ui/evolution.xml.h:15
+#: ../ui/evolution.xml.h:14
 msgid "Icons _and text"
 msgstr "Iconos _y texto"
 
-#: ../ui/evolution.xml.h:16
+#: ../ui/evolution.xml.h:15
 msgid "Import data from other programs"
 msgstr "Importa datos de otros programas"
 
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:17
 msgid "New _Window"
 msgstr "_Ventana nueva"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:18
 msgid "Prefere_nces"
 msgstr "_Preferencias"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:19
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:20
 msgid "Send queued items and retrieve new items"
 msgstr "Envía el correo en la cola y obtiene el nuevo"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:21
 msgid "Set up Pilot configuration"
 msgstr "Configuración del Pilot"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:22
 msgid "Show information about Evolution"
 msgstr "Muestra información acerca de Evolution"
 
-#: ../ui/evolution.xml.h:24
+#: ../ui/evolution.xml.h:23
 msgid "Submit Bug Report"
 msgstr "Envía un informe de fallos"
 
-#: ../ui/evolution.xml.h:25
+#. <menuitem name="HelpFAQ" verb=""
+#. _label="Evolution _FAQ"/>
+#.
+#. <separator/>
+#: ../ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "Enviar informe de _fallos"
 
-#: ../ui/evolution.xml.h:26
+#: ../ui/evolution.xml.h:29
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar un informe de fallos usando Bug Buddy"
 
-#: ../ui/evolution.xml.h:27
+#: ../ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "Cambiar si se está trabajando desconectado."
 
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:31
 msgid "Tool_bar"
 msgstr "Barra de _herramientas"
 
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:32
 msgid "Tool_bar style"
 msgstr "_Estilo de la barra de herramientas"
 
-#: ../ui/evolution.xml.h:30
-msgid "View/Hide the Status Bar"
-msgstr "Ver/Ocultar la barra de estado"
-
-#: ../ui/evolution.xml.h:31
+#: ../ui/evolution.xml.h:33
 msgid "_About Evolution..."
-msgstr "A_cerca de Evolution..."
+msgstr "A_cerca de Evolution…"
 
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:34
 msgid "_Close Window"
 msgstr "_Cerrar ventana"
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:37
+msgid "_Help"
+msgstr "A_yuda"
+
+#: ../ui/evolution.xml.h:38
 msgid "_Hide buttons"
 msgstr "_Ocultar botones"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:39
 msgid "_Icons only"
 msgstr "Sólo _iconos"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:40
 msgid "_Import..."
-msgstr "_Importar..."
+msgstr "_Importar…"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:41
 msgid "_New"
 msgstr "_Nuevo"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:42
 msgid "_Quick Reference"
 msgstr "_Referencia rápida"
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:43
+msgid "_Quit"
+msgstr "_Salir"
+
+#: ../ui/evolution.xml.h:44
 msgid "_Send / Receive"
 msgstr "_Enviar / Recibir"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:45
 msgid "_Switcher Appearance"
 msgstr "Apariencia del _conmutador"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:46
 msgid "_Synchronization Options..."
-msgstr "Opciones de _sincronización..."
+msgstr "Opciones de _sincronización…"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:47
 msgid "_Text only"
 msgstr "Sólo _texto"
 
-#: ../ui/evolution.xml.h:47
-msgid "_View Status Bar"
-msgstr "_Ver barra de estado"
-
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:49
 msgid "_Window"
 msgstr "_Ventana"
 
@@ -19539,15 +18838,15 @@ msgstr "Por _compañía"
 
 #: ../views/addressbook/galview.xml.h:2
 msgid "_Address Cards"
-msgstr "_Tarjetas de visita"
+msgstr "T_arjetas de visita"
 
 #: ../views/addressbook/galview.xml.h:3
 msgid "_Phone List"
-msgstr "Lista de _teléfonos"
+msgstr "Lista de t_eléfonos"
 
 #: ../views/calendar/galview.xml.h:1
 msgid "W_eek View"
-msgstr "Vista _semanal"
+msgstr "Vista s_emanal"
 
 #: ../views/calendar/galview.xml.h:2
 msgid "_Day View"
@@ -19589,10 +18888,6 @@ msgstr "Por marca de _seguimiento"
 msgid "_Messages"
 msgstr "_Mensajes"
 
-#: ../views/memos/galview.xml.h:1
-msgid "_Memos"
-msgstr "_Notas"
-
 #: ../views/tasks/galview.xml.h:1
 msgid "With _Due Date"
 msgstr "Con fecha de _vencimiento"
@@ -19655,7 +18950,7 @@ msgstr "Definir vistas para «%s»"
 
 #: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit..."
-msgstr "_Editar..."
+msgstr "_Editar…"
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
 #: ../widgets/table/e-table-header-item.c:1845
@@ -19680,24 +18975,13 @@ msgstr "_Crear vista nueva"
 msgid "_Replace existing view"
 msgstr "_Reemplazar vista existente"
 
-#. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:585
-#: ../widgets/menus/gal-view-menus.c:350
-msgid "Custom View"
-msgstr "Vista personalizada"
-
-#: ../widgets/menus/gal-view-instance.c:586
-msgid "Save Custom View"
-msgstr "Guardar vista personalizada"
-
-#: ../widgets/menus/gal-view-instance.c:590
-#: ../widgets/menus/gal-view-menus.c:372
-msgid "Define Views..."
-msgstr "Definir vistas..."
+#: ../widgets/menus/gal-view-menus.c:291
+msgid "_Current View"
+msgstr "Vista _actual"
 
 #: ../widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View..."
-msgstr "Guardar vista personalizada..."
+msgstr "Guardar vista personalizada…"
 
 #: ../widgets/menus/gal-view-new-dialog.c:80
 msgid "Factory"
@@ -19802,11 +19086,11 @@ msgstr "Ancho mínimo"
 msgid "Spacing"
 msgstr "Espaciado"
 
-#: ../widgets/misc/e-cell-date-edit.c:233 ../widgets/misc/e-dateedit.c:460
+#: ../widgets/misc/e-cell-date-edit.c:232 ../widgets/misc/e-dateedit.c:451
 msgid "Now"
 msgstr "Ahora"
 
-#: ../widgets/misc/e-cell-date-edit.c:802
+#: ../widgets/misc/e-cell-date-edit.c:801
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "La fecha debe estar en el formato: %s"
@@ -19897,37 +19181,37 @@ msgstr "Introduzca conjunto de caracteres a usar"
 
 #: ../widgets/misc/e-charset-picker.c:338
 msgid "Other..."
-msgstr "Otro..."
+msgstr "Otro…"
 
 #: ../widgets/misc/e-clipped-label.c:111
 msgid "..."
-msgstr "..."
+msgstr "…"
 
-#: ../widgets/misc/e-dateedit.c:320
+#: ../widgets/misc/e-dateedit.c:316
 msgid "Date and Time Entry"
 msgstr "Entrada para la fecha y hora"
 
-#: ../widgets/misc/e-dateedit.c:339
+#: ../widgets/misc/e-dateedit.c:335
 msgid "Text entry to input date"
 msgstr "Entrada de texto para introducir la fecha"
 
-#: ../widgets/misc/e-dateedit.c:340
+#: ../widgets/misc/e-dateedit.c:336
 msgid "Text Date Entry"
 msgstr "Entrada de texto para la fecha "
 
-#: ../widgets/misc/e-dateedit.c:361
+#: ../widgets/misc/e-dateedit.c:353
 msgid "Click this button to show a calendar"
 msgstr "Pulse este botón para mostrar un calendario"
 
-#: ../widgets/misc/e-dateedit.c:362
+#: ../widgets/misc/e-dateedit.c:354
 msgid "Date Button"
 msgstr "Botón de fecha"
 
-#: ../widgets/misc/e-dateedit.c:383
+#: ../widgets/misc/e-dateedit.c:374
 msgid "Combo box to select time"
 msgstr "Caja combo para seleccionar la hora"
 
-#: ../widgets/misc/e-dateedit.c:384
+#: ../widgets/misc/e-dateedit.c:375
 msgid "Time Combo Box"
 msgstr "Caja combo de la hora"
 
@@ -19998,15 +19282,15 @@ msgstr "Guardar búsqueda"
 
 #: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
-msgstr "_Guardar búsqueda..."
+msgstr "_Guardar búsqueda…"
 
 #: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
-msgstr "_Editar búsquedas guardadas..."
+msgstr "_Editar búsquedas guardadas…"
 
 #: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
 msgid "_Advanced Search..."
-msgstr "Búsqueda _avanzada..."
+msgstr "Búsqueda _avanzada…"
 
 #: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
@@ -20051,41 +19335,41 @@ msgstr "Anchura de columna"
 
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:346
+#: ../widgets/misc/e-search-bar.c:345
 msgid "Search Text Entry"
 msgstr "Entrada de búsqueda de texto"
 
-#: ../widgets/misc/e-search-bar.c:550
+#: ../widgets/misc/e-search-bar.c:549
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../widgets/misc/e-search-bar.c:556
+#: ../widgets/misc/e-search-bar.c:555
 msgid "_Find Now"
 msgstr "_Buscar ahora"
 
-#: ../widgets/misc/e-search-bar.c:557 ../widgets/misc/e-search-bar.c:944
+#: ../widgets/misc/e-search-bar.c:556 ../widgets/misc/e-search-bar.c:943
 msgid "_Clear"
 msgstr "_Vaciar"
 
-#: ../widgets/misc/e-search-bar.c:648
+#: ../widgets/misc/e-search-bar.c:647
 msgid "Search Type"
 msgstr "Tipo de búsqueda"
 
-#: ../widgets/misc/e-search-bar.c:852
+#: ../widgets/misc/e-search-bar.c:851
 msgid "Item ID"
 msgstr "ID de elemento"
 
-#: ../widgets/misc/e-search-bar.c:859
+#: ../widgets/misc/e-search-bar.c:858
 msgid "Subitem ID"
 msgstr "ID de subelemento"
 
-#: ../widgets/misc/e-search-bar.c:866 ../widgets/text/e-entry.c:1249
+#: ../widgets/misc/e-search-bar.c:865 ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3462
 #: ../widgets/text/e-text.c:3463
 msgid "Text"
 msgstr "Texto"
 
-#: ../widgets/misc/e-search-bar.c:946
+#: ../widgets/misc/e-search-bar.c:945
 msgid "Find _Now"
 msgstr "Buscar _ahora"
 
@@ -20240,7 +19524,7 @@ msgstr "_Al abrir:"
 #: ../widgets/misc/e-task-widget.c:208
 #, c-format
 msgid "%s (...)"
-msgstr "%s (...)"
+msgstr "%s (…)"
 
 #: ../widgets/misc/e-task-widget.c:213
 #, c-format
@@ -20253,7 +19537,7 @@ msgstr "pulse aquí para ir a la url"
 
 #: ../widgets/misc/gal-categories.glade.h:2
 msgid "Edit Master Category List..."
-msgstr "Editar lista de categorías maestra..."
+msgstr "Editar lista de categorías maestra…"
 
 #: ../widgets/misc/gal-categories.glade.h:3
 msgid "Item(s) belong to these _categories:"
@@ -20383,12 +19667,12 @@ msgstr "_Añadir ⇨"
 #: ../widgets/table/e-table-config-no-group.glade.h:18
 #: ../widgets/table/e-table-config.glade.h:16
 msgid "_Fields Shown..."
-msgstr "_Campos mostrados..."
+msgstr "_Campos mostrados…"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:19
 #: ../widgets/table/e-table-config.glade.h:20
 msgid "_Sort..."
-msgstr "_Ordenar..."
+msgstr "_Ordenar…"
 
 #: ../widgets/table/e-table-config.c:150
 msgid "State"
@@ -20416,7 +19700,7 @@ msgstr "Campos disponibles"
 
 #: ../widgets/table/e-table-config.glade.h:17
 msgid "_Group By..."
-msgstr "_Agrupar por..."
+msgstr "_Agrupar por…"
 
 #: ../widgets/table/e-table-config.glade.h:19
 msgid "_Show these fields in order:"
@@ -20438,7 +19722,7 @@ msgstr "Encabezado completo"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:126
 msgid "Add a column..."
-msgstr "Añadir una columna..."
+msgstr "Añadir una columna…"
 
 #: ../widgets/table/e-table-field-chooser.glade.h:1
 msgid "Field Chooser"
@@ -20580,7 +19864,7 @@ msgstr "Quitar esta columna"
 
 #: ../widgets/table/e-table-header-item.c:1500
 msgid "Add a Column..."
-msgstr "Añadir una columna..."
+msgstr "Añadir una columna…"
 
 #: ../widgets/table/e-table-header-item.c:1502
 msgid "Alignment"
@@ -20592,11 +19876,11 @@ msgstr "Ajuste automático"
 
 #: ../widgets/table/e-table-header-item.c:1504
 msgid "Format Columns..."
-msgstr "Formatear columnas..."
+msgstr "Formatear columnas…"
 
 #: ../widgets/table/e-table-header-item.c:1506
 msgid "Customize Current View..."
-msgstr "Personalizar vista actual..."
+msgstr "Personalizar vista actual…"
 
 #: ../widgets/table/e-table-header-item.c:1817 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
@@ -20790,20 +20074,24 @@ msgstr "Contexto IM"
 msgid "Handle Popup"
 msgstr "Tirador emergente"
 
-#~ msgid "Dismiss"
-#~ msgstr "Rechazar"
-
-#~ msgid "Dismiss All"
-#~ msgstr "Rechazar todas"
+#~ msgid "The Proxy tab will be available only when the account is online."
+#~ msgstr ""
+#~ "La solapa del Proxy estará disponible sólo cuando la cuenta esté "
+#~ "conectada."
 
 #~ msgid ""
-#~ "Alarm on %s\n"
-#~ "%s\n"
-#~ "Starting at %s\n"
-#~ "Ending at %s"
+#~ "The suggested filename extension of this filetype (%s) is unused in the "
+#~ "chosen filename. Do you want to continue?"
 #~ msgstr ""
-#~ "Alarma el %s\n"
-#~ "%s\n"
-#~ "Empieza a las %s\n"
-#~ "Termina a las %s"
+#~ "La extensión del nombre de archivo sugerida de este tipo de archivo (%s) "
+#~ "no está usada en el nombre de archivo elegido. ¿Quiere continuar?"
+
+#~ msgid "Message _List As"
+#~ msgstr "_Lista de mensajes como"
+
+#~ msgid "_New Search _Folder (FIXME)"
+#~ msgstr "Carpeta de búsqueda _nueva"
+
+#~ msgid "Evolution _FAQ"
+#~ msgstr "PR_F de Evolution"
 
diff --git a/po/et.po b/po/et.po
index a560a6152d..afc46b59bf 100644
--- a/po/et.po
+++ b/po/et.po
@@ -13,9 +13,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Evolution HEAD\n"
+"Project-Id-Version: Evolution 2.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-22 13:39+0100\n"
+"POT-Creation-Date: 2005-08-30 13:59+0000\n"
 "PO-Revision-Date: 2005-11-24 01:32+0200\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
@@ -48,7 +48,7 @@ msgstr[0] "käesolev aadressiraamatu kaust sisaldab %d kaardi"
 msgstr[1] "käesolev aadressiraamatu kaust sisaldab %d kaarti"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../calendar/gui/alarm-notify/alarm-queue.c:969
+#: ../calendar/gui/alarm-notify/alarm-queue.c:953
 #: ../ui/evolution-message-composer.xml.h:11
 msgid "Open"
 msgstr "Ava"
@@ -103,6 +103,7 @@ msgid "New All Day Event"
 msgstr "Uus kogu päeva hõlmav sündmus"
 
 #: ../a11y/calendar/ea-cal-view.c:308
+#: ../calendar/gui/e-calendar-view.c:1505
 msgid "New Meeting"
 msgstr "Uus koosolek"
 
@@ -119,14 +120,16 @@ msgstr "Mine kuupäevale"
 msgid "a table to view and select the current time range"
 msgstr "tabel praeguse ajavahemiku kuvamiseks ja valimiseks"
 
-#: ../a11y/calendar/ea-day-view.c:146 ../a11y/calendar/ea-week-view.c:148
+#: ../a11y/calendar/ea-day-view.c:146
+#: ../a11y/calendar/ea-week-view.c:148
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "Sellel on %d sündmus."
 msgstr[1] "Sellel on %d sündmust."
 
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:148
+#: ../a11y/calendar/ea-week-view.c:150
 msgid "It has no events."
 msgstr "Sellel pole sündmusi."
 
@@ -161,7 +164,8 @@ msgstr "%A, %d. %b %Y"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:190
 #: ../calendar/gui/calendar-component.c:663
-#: ../calendar/gui/e-day-view-top-item.c:719 ../calendar/gui/e-day-view.c:1510
+#: ../calendar/gui/e-day-view-top-item.c:719
+#: ../calendar/gui/e-day-view.c:1510
 #: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
@@ -193,7 +197,8 @@ msgstr "%d. %B %Y"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:220
 #: ../calendar/gui/calendar-component.c:689
-#: ../calendar/gui/e-day-view-top-item.c:723 ../calendar/gui/e-day-view.c:1526
+#: ../calendar/gui/e-day-view-top-item.c:723
+#: ../calendar/gui/e-day-view.c:1526
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d. %b"
@@ -325,9 +330,7 @@ msgid "Popup Menu"
 msgstr "Hüpikmenüü"
 
 #: ../addressbook/addressbook.error.xml.h:1
-msgid ""
-"A contact already exists with this address. Would you like to add a new card "
-"with the same address anyway?"
+msgid "A contact already exists with this address. Would you like to add a new card with the same address anyway?"
 msgstr ""
 "Sellise aadressiga kontakt on juba olemas. Kas sa soovid lisada uut kaarti "
 "koos sama aadressiga?"
@@ -345,10 +348,7 @@ msgid "Category editor not available."
 msgstr "Kategooriaredaktor ei ole saadaval."
 
 #: ../addressbook/addressbook.error.xml.h:5
-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."
+msgid "Check to make sure your password is spelled correctly and that you are using a supported login method. Remember that many passwords are case sensitive; your caps lock might be on."
 msgstr ""
 "Kontrolli, kas parool on õigesti kirjutatud ja kas sa kasutad toetatud "
 "logimismeetodit. Kuna paroolid on üldiselt tõstutundlikud, siis veendu, et "
@@ -397,15 +397,11 @@ msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Evolutioni aadressiraamat lõpetas ootamatult."
 
 #: ../addressbook/addressbook.error.xml.h:16
-msgid ""
-"The image you have selected is large. Do you want to resize and store it?"
+msgid "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:17
-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."
+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 ""
 "See LDAP server võib kasutada vanemat LDAP versiooni, mis ei toeta seda "
 "funktsionaalsust. Samas võib see LDAP server olla halvasti seadistatud. Küsi "
@@ -424,9 +420,7 @@ msgid "This addressbook server does not have any suggested search bases."
 msgstr "See aadressiraamatuserver ei oma ühtegi soovituslikku otsingubaasi."
 
 #: ../addressbook/addressbook.error.xml.h:21
-msgid ""
-"This addressbook server might be unreachable or the server name may be "
-"misspelled or your network connection could be down."
+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:22
@@ -450,36 +444,29 @@ msgid "Would you like to save your changes?"
 msgstr "Kas soovid tehtud muudatusi salvestada?"
 
 #: ../addressbook/addressbook.error.xml.h:27
-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?"
+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 ""
 "Sa proovid tõsta kontakti ühest aadressiraamatust teise kuid lähteraamatust "
 "pole seda võimalik kustutada. Kas sa soovid ümbertõstmise asemel salvestada "
 "koopiat?"
 
 #: ../addressbook/addressbook.error.xml.h:28
-#: ../calendar/calendar.error.xml.h:61
-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"
+#: ../calendar/calendar.error.xml.h:59
+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:29
-msgid ""
-"You have made modifications to this contact. Do you want to save these "
-"changes?"
+msgid "You have made modifications to this contact. Do you want to save these changes?"
 msgstr ""
 "Sa oled seda kontakti muutnud. Kas sa soovid neid muutuseid salvestada?"
 
 #: ../addressbook/addressbook.error.xml.h:30
-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 ""
 "Sinu {0} kontakte pole enne Evolutioni taaskäivitamist võimalik kasutada."
 
-#: ../addressbook/addressbook.error.xml.h:31 ../mail/em-vfolder-rule.c:495
+#: ../addressbook/addressbook.error.xml.h:31
+#: ../mail/em-vfolder-rule.c:494
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
@@ -531,8 +518,9 @@ msgstr "Seadista automaatlõpetamist siit"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1180
-#: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:388
+#: ../addressbook/gui/component/addressbook-view.c:1133
+#: ../calendar/gui/calendar-component.c:246
+#: ../calendar/gui/migration.c:388
 msgid "Contacts"
 msgstr "Kontaktid"
 
@@ -573,10 +561,12 @@ msgstr "Siin saad hallata oma S/MIME sertifikaate"
 #: ../addressbook/gui/component/addressbook-component.c:137
 #: ../addressbook/gui/component/addressbook-migrate.c:502
 #: ../calendar/gui/calendar-component.c:208
-#: ../calendar/gui/memos-component.c:192 ../calendar/gui/migration.c:462
-#: ../calendar/gui/migration.c:555 ../calendar/gui/migration.c:1057
-#: ../calendar/gui/tasks-component.c:188 ../mail/em-folder-tree-model.c:197
-#: ../mail/em-folder-tree-model.c:199 ../mail/mail-component.c:292
+#: ../calendar/gui/migration.c:462
+#: ../calendar/gui/migration.c:555
+#: ../calendar/gui/tasks-component.c:188
+#: ../mail/em-folder-tree-model.c:197
+#: ../mail/em-folder-tree-model.c:199
+#: ../mail/mail-component.c:292
 #: ../mail/mail-vfolder.c:223
 msgid "On This Computer"
 msgstr "Kohalikus arvutis"
@@ -590,10 +580,12 @@ msgstr "Kohalikus arvutis"
 #: ../addressbook/gui/component/addressbook-migrate.c:510
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../calendar/gui/calendar-component.c:216
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:470
-#: ../calendar/gui/migration.c:563 ../calendar/gui/migration.c:1065
-#: ../calendar/gui/tasks-component.c:196 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1043 ../mail/mail-config.c:78
+#: ../calendar/gui/migration.c:470
+#: ../calendar/gui/migration.c:563
+#: ../calendar/gui/tasks-component.c:196
+#: ../filter/filter-label.c:123
+#: ../mail/em-migrate.c:1043
+#: ../mail/mail-config.c:78
 #: ../mail/mail-config.glade.h:104
 msgid "Personal"
 msgstr "Isiklik"
@@ -621,7 +613,8 @@ msgid "Create a new contact list"
 msgstr "Uue kontaktide nimekirja loomine"
 
 #: ../addressbook/gui/component/addressbook-component.c:241
-#: ../addressbook/gui/component/addressbook-config.c:1149
+#: ../addressbook/gui/component/addressbook-config.c:1118
+#: ../addressbook/gui/component/addressbook-view.c:763
 msgid "New Address Book"
 msgstr "Uus aadressiraamat"
 
@@ -637,70 +630,73 @@ msgstr "Uue aadressiraamatu loomine"
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "Tõrge aadressiraamatu kataloogide või seadistuste uuendamisel."
 
-#: ../addressbook/gui/component/addressbook-config.c:316
+#: ../addressbook/gui/component/addressbook-config.c:313
 msgid "Base"
 msgstr "Baas"
 
-#: ../addressbook/gui/component/addressbook-config.c:511
+#: ../addressbook/gui/component/addressbook-config.c:508
 #: ../calendar/gui/dialogs/calendar-setup.c:192
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Tüüp:"
 
-#: ../addressbook/gui/component/addressbook-config.c:610
+#: ../addressbook/gui/component/addressbook-config.c:607
 msgid "Copy book content locally for offline operation"
 msgstr "Raamatu sisu kopeerimine kohapeale tarvitamiseks võrguvabas keskkonnas"
 
-#: ../addressbook/gui/component/addressbook-config.c:933
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/addressbook-config.c:902
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
-#: ../mail/em-folder-properties.c:215 ../mail/mail-config.glade.h:85
+#: ../calendar/gui/dialogs/calendar-setup.c:366
+#: ../calendar/gui/dialogs/calendar-setup.c:377
+#: ../mail/em-folder-properties.c:215
+#: ../mail/mail-config.glade.h:85
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Üldine"
 
-#: ../addressbook/gui/component/addressbook-config.c:934
+#: ../addressbook/gui/component/addressbook-config.c:903
 #: ../mail/importers/pine-importer.c:393
 msgid "Addressbook"
 msgstr "Aadressiraamat"
 
-#: ../addressbook/gui/component/addressbook-config.c:938
+#: ../addressbook/gui/component/addressbook-config.c:907
 msgid "Server Information"
 msgstr "Serveri andmed"
 
-#: ../addressbook/gui/component/addressbook-config.c:940
+#: ../addressbook/gui/component/addressbook-config.c:909
 msgid "Authentication"
 msgstr "Autentimine"
 
-#: ../addressbook/gui/component/addressbook-config.c:943
-#: ../addressbook/gui/component/ldap-config.glade.h:17
-#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
+#: ../addressbook/gui/component/addressbook-config.c:912
+#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../mail/mail-dialogs.glade.h:7
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Üksikasjad"
 
-#: ../addressbook/gui/component/addressbook-config.c:944
+#: ../addressbook/gui/component/addressbook-config.c:913
 msgid "Searching"
 msgstr "Otsing"
 
-#: ../addressbook/gui/component/addressbook-config.c:946
+#: ../addressbook/gui/component/addressbook-config.c:915
 msgid "Downloading"
 msgstr "Allalaadimine"
 
-#: ../addressbook/gui/component/addressbook-config.c:1147
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/addressbook-config.c:1116
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Aadressiraamatu omadused"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:72
-#: ../calendar/gui/migration.c:142 ../mail/em-migrate.c:1190
+#: ../calendar/gui/migration.c:142
+#: ../mail/em-migrate.c:1190
 msgid "Migrating..."
 msgstr "Siirdamine..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:124
-#: ../calendar/gui/migration.c:189 ../mail/em-migrate.c:1231
+#: ../calendar/gui/migration.c:189
+#: ../mail/em-migrate.c:1231
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Siirdamine `%s':"
@@ -715,8 +711,7 @@ msgstr "Automaatlõpetamise sätted"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1134
 msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution contact folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
@@ -752,30 +747,25 @@ msgid ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-view.c:763
-msgid "_New Address Book"
-msgstr "_Uus aadressiraamat"
-
-#. FIXME: need to disable for undeletable folders
 #: ../addressbook/gui/component/addressbook-view.c:764
 #: ../addressbook/gui/widgets/e-addressbook-view.c:952
 #: ../calendar/gui/calendar-component.c:537
-#: ../calendar/gui/e-calendar-table.c:1187
-#: ../calendar/gui/e-calendar-view.c:1569 ../calendar/gui/e-memo-table.c:862
-#: ../calendar/gui/tasks-component.c:441 ../mail/em-folder-tree.c:2054
-#: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:34
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
-#: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
-msgid "_Delete"
-msgstr "_Kustuta"
+#: ../calendar/gui/tasks-component.c:441
+#: ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:8
+#: ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Kustuta"
 
 #: ../addressbook/gui/component/addressbook-view.c:766
 #: ../calendar/gui/calendar-component.c:538
 #: ../calendar/gui/tasks-component.c:442
-msgid "_Properties..."
-msgstr "_Omadused..."
+msgid "Properties..."
+msgstr "Omadused..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1191
+#: ../addressbook/gui/component/addressbook-view.c:1144
 msgid "Contact Source Selector"
 msgstr "Kontaktide allika valimine"
 
@@ -784,12 +774,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Ühendan uuesti LDAP serveriga anonüümselt"
 
 #: ../addressbook/gui/component/addressbook.c:191
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:485
 msgid "Failed to authenticate.\n"
 msgstr "Tõrge autentimisel.\n"
 
 #: ../addressbook/gui/component/addressbook.c:198
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:464
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Sisesta %s parool (kasutaja %s)"
@@ -807,9 +797,7 @@ msgid "EFolderList XML for the list of completion URIs."
 msgstr ""
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
-msgid ""
-"Position of the vertical pane, between the card and list views and the "
-"preview pane, in pixels."
+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.in.h:5
@@ -817,9 +805,7 @@ msgid "Show preview pane"
 msgstr "Eelvaatluspaani kuvamine"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
-msgid ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
+msgid "The number of characters that must be typed before Evolution will attempt to autocomplete."
 msgstr ""
 "Tähtede arv, mis tuleb sisestada enne kui Evolution üritab "
 "automaatlõpetamist."
@@ -833,7 +819,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "Nimedevaliku dialoogis viimatikasutatud kausta URI."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 msgid "Vertical pane position"
 msgstr "Püstpaani asukoht"
 
@@ -842,241 +828,220 @@ msgid "Whether to show the preview pane."
 msgstr "Millal kuvada eelvaatluspaani."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:1
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/event-page.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../mail/message-tags.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:1
+msgid "*"
+msgstr "*"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr "1"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:2
+#: ../addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:3
+#: ../addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:5
+#: ../addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:6
+#: ../addressbook/gui/component/ldap-config.glade.h:7
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Autentimine</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:7
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Display</b>"
 msgstr "<b>Kuva</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:8
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Downloading</b>"
 msgstr "<b>Allalaadimine</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Searching</b>"
 msgstr "<b>Otsimine</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Server Information</b>"
 msgstr "<b>Serveri info</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:12
 msgid "<b>Type:</b>"
 msgstr "<b>Tüüp:</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add Address Book"
 msgstr "Lisa aadressiraamat"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
-#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:759
+#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../mail/em-account-editor.c:302
+#: ../mail/em-account-editor.c:759
 msgid "Always"
 msgstr "Alati"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonüümselt"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 msgid "Basic"
 msgstr "Peamine"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr "Eraldusnimi"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid "Email address"
 msgstr "E-posti aadress:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:20
-msgid ""
-"Evolution will use this email address to authenticate you with the server."
+#: ../addressbook/gui/component/ldap-config.glade.h:21
+msgid "Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution kasutab seda e-posti aadressi serverile sinu identuse tõendamiseks."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:22
 msgid "Find Possible Search Bases"
 msgstr "Leia võimalikud otsingubaasid"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "Lo_gin:"
 msgstr "_Kasutajanimi:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:758
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:300
+#: ../mail/em-account-editor.c:758
 msgid "Never"
 msgstr "Mitte kunagi"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "Üks tase alla (One)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
-msgid "Search Filter"
-msgstr "Otsingufilter"
-
 #: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid "Search _base:"
 msgstr "_Otsingubaas:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:28
-msgid "Search _filter:"
-msgstr "Otsingu_filter:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:29
-msgid "Search filter"
-msgstr "Otsingufilter"
-
-#: ../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 or TLS."
+msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL or TLS."
 msgstr ""
 "See valik tähendab seda, et Evolution ühendub sinu LDAP serverisse ainult "
 "juhul, kui LDAP server toetab SSL või TLS protokolli."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
-msgid ""
-"Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a insecure environment. For example, if you and your LDAP server "
-"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
-"because your connection is already secure."
+#: ../addressbook/gui/component/ldap-config.glade.h:29
+msgid "Selecting this option means that Evolution will only try to use SSL/TLS if you are in a insecure environment. For example, if you and your LDAP server are behind a firewall at work, then Evolution doesn't need to use SSL/TLS because your connection is already secure."
 msgstr ""
 "See valik tähendab seda, et Evolution üritab kasutada SSL/TLS protokolli "
 "ainult siis kui sa oled ebaturvalises keskkonnas. Näiteks kui sina ja sinu "
 "LDAP server asuvad mõlemad tulemüüriga kaitstud võrgus, siis Evolution ei "
 "pea kasutama SSL/TLS protokolli, kuna sinu ühendus on juba turvaline."
 
-#: ../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. "
+#: ../addressbook/gui/component/ldap-config.glade.h:30
+msgid "Selecting this option means that your server does not support either SSL or TLS.  This means that your connection will be insecure, and that you will be vulnerable to security exploits. "
 msgstr ""
 "See valik tähendab seda, et sinu server ei toeta SSL ega TLS protokolle. "
 "Seega ei ole sinu ühendus turvaline ja võib-olla ohustatud turvaaukudest."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Sub"
 msgstr "Kogu alampuu (Sub)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid "Supported Search Bases"
 msgstr "Toetatud otsingubaasid"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
-msgid ""
-"The search base is the distinguished name (DN)  of the entry where your "
-"searches will begin. If you leave this blank, the search will begin at the "
-"root of the directory tree."
+#: ../addressbook/gui/component/ldap-config.glade.h:33
+msgid "The search base is the distinguished name (DN)  of the entry where your searches will begin. If you leave this blank, the search will begin at the root of the directory tree."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
-msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
+#: ../addressbook/gui/component/ldap-config.glade.h:34
+msgid "The search scope defines how deep you would like the search to extend down the directory tree. A search scope of \"sub\" will include all entries below your search base. A search scope of \"one\" will only include the entries one level beneath your base."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:38
-msgid ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
-"\"."
+#: ../addressbook/gui/component/ldap-config.glade.h:35
+msgid "This is the full name of your ldap server. For example, \"ldap.mycompany.com\"."
 msgstr "See on LDAP serveri täispikk nimi. Näiteks: \"ldap.minufirma.ee\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
-msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"too large will slow down your address book."
+#: ../addressbook/gui/component/ldap-config.glade.h:36
+msgid "This is the maximum number of entries to download. Setting this number to be too large will slow down your address book."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
-"server."
+#: ../addressbook/gui/component/ldap-config.glade.h:37
+msgid "This is the method Evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your ldap server."
 msgstr ""
 "Siin määrataks, mil viisil Evolution tõendab serverile kasutajat.  Märkus: "
 "seades selle väärtuseks \"E-posti aadress\", peab valitud LDAP serveri "
 "toetama anonüümset ligipääsu."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
-msgid ""
-"This is the name for this server that will appear in your Evolution folder "
-"list. It is for display purposes only. "
+#: ../addressbook/gui/component/ldap-config.glade.h:38
+msgid "This is the name for this server that will appear in your Evolution folder list. It is for display purposes only. "
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
-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."
+#: ../addressbook/gui/component/ldap-config.glade.h:39
+msgid "This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify."
 msgstr ""
 "See on LDAP serveri port, kuhu Evolution üritab ühendust luua. Nimekiri "
 "standardportidest on välja toodud. Küsi oma süsteemiülemalt millise pordi sa "
 "peaksid määrama."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid "Using distinguished name (DN)"
 msgstr "Eraldusnime (DN) kasutamine"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid "Using email address"
 msgstr "E-posti aadressi kasutamine"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 #: ../mail/em-account-editor.c:301
 msgid "Whenever Possible"
 msgstr "Kui võimalik"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid "_Add Address Book"
 msgstr "Lisa _aadressiraamat"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "_Download limit:"
 msgstr "_Allalaadimise piirang:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid "_Find Possible Search Bases"
 msgstr "_Leia võimalikud otsingubaasid"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "_Login method:"
 msgstr "_Sisselogimismeetod:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 #: ../calendar/gui/dialogs/calendar-setup.c:244
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:8
 #: ../mail/mail-config.glade.h:164
@@ -1084,65 +1049,42 @@ msgstr "_Sisselogimismeetod:"
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Search scope:"
 msgstr "_Otsingu ulatus"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 #: ../mail/mail-config.glade.h:171
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Timeout:"
 msgstr "_Ajapiirang:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Use secure connection:"
 msgstr "_Turvalist ühendust kasutatakse:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 msgid "cards"
 msgstr "kaardid"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1951
+#: ../filter/filter.glade.h:16
+#: ../mail/em-account-editor.c:1951
 #: ../plugins/calendar-http/calendar-http.c:263
 #: ../plugins/calendar-weather/calendar-weather.c:563
 msgid "minutes"
 msgstr "minutit"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../mail/message-tags.glade.h:1
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
-#: ../plugins/groupwise-features/properties.glade.h:1
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>E-post</b>"
@@ -1196,7 +1138,7 @@ msgstr "Kontakt"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:525
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:540
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2372
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2353
 msgid "Contact Editor"
 msgstr "Kontaktiredaktor"
 
@@ -1238,8 +1180,10 @@ msgstr "Telefon"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:235
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:201
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1042
-#: ../mail/mail-config.c:77 ../mail/mail-config.glade.h:153
+#: ../filter/filter-label.c:122
+#: ../mail/em-migrate.c:1042
+#: ../mail/mail-config.c:77
+#: ../mail/mail-config.glade.h:153
 msgid "Work"
 msgstr "Töö"
 
@@ -1266,7 +1210,6 @@ msgid "_Calendar:"
 msgstr "_Kalender:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: ../ui/evolution-event-editor.xml.h:26 ../ui/evolution-task-editor.xml.h:18
 msgid "_Categories"
 msgstr "_Kategooriad"
 
@@ -1372,8 +1315,10 @@ msgstr "Aadress"
 #: ../addressbook/gui/widgets/e-minicard-view.c:520
 #: ../addressbook/gui/widgets/e-minicard.c:175
 #: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1768 ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3584
+#: ../widgets/table/e-cell-text.c:1768
+#: ../widgets/text/e-entry.c:1312
+#: ../widgets/text/e-entry.c:1313
+#: ../widgets/text/e-text.c:3584
 #: ../widgets/text/e-text.c:3585
 msgid "Editable"
 msgstr "Redigeeritav"
@@ -2440,20 +2385,20 @@ msgid "Changed"
 msgstr "Muudetud"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:535
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2367
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2348
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktiredaktor - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2680
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2661
 msgid "Please select an image for this contact"
 msgstr "Palun vali selle kontakti jaoks pilt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2681
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2662
 msgid "No image"
 msgstr "Puuduv pilt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2960
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2941
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2461,7 +2406,7 @@ msgstr ""
 "Kontaktandmed on vigased:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3012
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2993
 msgid "Invalid contact."
 msgstr "Vigane kontakt."
 
@@ -2614,8 +2559,8 @@ msgstr "_KS teenus:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:234
-#: ../plugins/exchange-operations/exchange-contacts.c:214
+#: ../plugins/exchange-operations/exchange-calendar.c:215
+#: ../plugins/exchange-operations/exchange-contacts.c:193
 msgid "_Location:"
 msgstr "_Asukoht:"
 
@@ -2752,8 +2697,10 @@ msgstr ""
 #: ../widgets/table/e-table-selection-model.c:311
 #: ../widgets/table/e-table.c:3344
 #: ../widgets/table/e-tree-selection-model.c:825
-#: ../widgets/text/e-entry.c:1235 ../widgets/text/e-entry.c:1236
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
+#: ../widgets/text/e-entry.c:1235
+#: ../widgets/text/e-entry.c:1236
+#: ../widgets/text/e-text.c:3448
+#: ../widgets/text/e-text.c:3449
 msgid "Model"
 msgstr "Mudel"
 
@@ -2792,9 +2739,8 @@ msgstr "Allikas"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:377
+#: ../calendar/gui/e-meeting-list-view.c:370
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Tüüp"
 
@@ -2803,101 +2749,94 @@ msgid "Address Book"
 msgstr "Aadressiraamat"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:807
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2018
-#: ../ui/evolution-addressbook.xml.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2011
+#: ../ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Salvesta vKaardina..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:930
-#: ../calendar/gui/dialogs/comp-editor.c:1054
-#: ../calendar/gui/e-calendar-table.c:1167
-#: ../calendar/gui/e-calendar-view.c:1549 ../calendar/gui/e-memo-table.c:845
-#: ../ui/evolution-addressbook.xml.h:38
+#: ../calendar/gui/e-calendar-table.c:1154
+#: ../calendar/gui/e-calendar-view.c:1528
+#: ../ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "A_va"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:932
-msgid "_New Contact..."
-msgstr "_Uus kontakt..."
+msgid "New Contact..."
+msgstr "Uus kontakt..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:933
-msgid "New Contact _List..."
-msgstr "Uus kontaktide _loend..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
-#: ../ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard..."
-msgstr "_Salvesta VKaardina"
+msgid "New Contact List..."
+msgstr "Uus kontaktide loend..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:937
-msgid "_Forward Contact"
-msgstr "_Edasta kontakt"
+#: ../ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "Edasta kontakt"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:938
-msgid "_Forward Contacts"
-msgstr "_Edasta kontaktid"
+msgid "Forward Contacts"
+msgstr "Edasta kontaktid"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:939
-#, fuzzy
-msgid "Send _Message to Contact"
+msgid "Send Message to Contact"
 msgstr "Saada kontaktile sõnum"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:940
-#, fuzzy
-msgid "Send _Message to List"
+msgid "Send Message to List"
 msgstr "Saada sõnum postiloendisse"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:941
-#, fuzzy
-msgid "Send _Message to Contacts"
+msgid "Send Message to Contacts"
 msgstr "Saada kontaktidele sõnum"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:942
-msgid "_Print"
-msgstr "_Prindi"
+#: ../calendar/gui/calendar-commands.c:119
+#: ../calendar/gui/print.c:2501
+#: ../ui/evolution-addressbook.xml.h:16
+#: ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "Trüki"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:945
-#, fuzzy
-msgid "Cop_y to Address Book..."
+msgid "Copy to Address Book..."
 msgstr "Kopeeri aadressiraamatusse..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:946
-#, fuzzy
-msgid "Mo_ve to Address Book..."
+msgid "Move to Address Book..."
 msgstr "Tõsta aadressiraamatusse..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:949
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:8
-msgid "Cu_t"
-msgstr "Lõ_ika"
+#: ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Lõika"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:950
 #: ../calendar/gui/calendar-component.c:536
-#: ../calendar/gui/dialogs/comp-editor.c:431
-#: ../calendar/gui/e-calendar-table.c:1175
-#: ../calendar/gui/e-calendar-view.c:1556 ../calendar/gui/e-memo-table.c:853
-#: ../calendar/gui/tasks-component.c:440 ../composer/e-msg-composer.c:3049
-#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1035
-#: ../mail/message-list.c:1718 ../ui/evolution-addressbook.xml.h:32
-#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:103
-#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
-msgid "_Copy"
-msgstr "_Kopeeri"
+#: ../calendar/gui/tasks-component.c:440
+#: ../ui/evolution-addressbook.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:11
+#: ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Kopeeri"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:951
-#, fuzzy
-msgid "P_aste"
+#: ../ui/evolution-addressbook.xml.h:13
+#: ../ui/evolution-tasks.xml.h:11
+msgid "Paste"
 msgstr "Aseta"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1565
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1562
 #: ../calendar/gui/cal-search-bar.c:346
 msgid "Any Category"
 msgstr "Suvaline kategooria"
 
-#. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1767
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1761
 msgid "Print cards"
 msgstr "Trüki kaardid"
 
@@ -2930,10 +2869,9 @@ msgid "Car Phone"
 msgstr "Autotelefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/task-page.glade.h:6
 #: ../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 "Kategooriad"
 
@@ -2942,7 +2880,7 @@ msgid "Company Phone"
 msgstr "Firma telefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:567
+#: ../addressbook/gui/widgets/eab-contact-display.c:564
 #: ../smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "E-post"
@@ -3038,7 +2976,7 @@ msgstr "Raadio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:388
+#: ../calendar/gui/e-meeting-list-view.c:378
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
 msgid "Role"
@@ -3076,8 +3014,10 @@ msgstr "Koduleht"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:138
-#: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1437 ../widgets/misc/e-reflow.c:1438
+#: ../widgets/misc/e-canvas-vbox.c:96
+#: ../widgets/misc/e-canvas-vbox.c:97
+#: ../widgets/misc/e-reflow.c:1437
+#: ../widgets/misc/e-reflow.c:1438
 #: ../widgets/table/e-table-click-to-add.c:517
 #: ../widgets/table/e-table-col.c:98
 #: ../widgets/table/e-table-field-chooser-item.c:667
@@ -3085,23 +3025,29 @@ msgstr "Koduleht"
 #: ../widgets/table/e-table-group-container.c:972
 #: ../widgets/table/e-table-group-leaf.c:629
 #: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3012 ../widgets/table/e-table-item.c:3013
-#: ../widgets/text/e-text.c:3626 ../widgets/text/e-text.c:3627
+#: ../widgets/table/e-table-item.c:3012
+#: ../widgets/table/e-table-item.c:3013
+#: ../widgets/text/e-text.c:3626
+#: ../widgets/text/e-text.c:3627
 msgid "Width"
 msgstr "Laius"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:145
-#: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1445 ../widgets/misc/e-reflow.c:1446
+#: ../widgets/misc/e-canvas-vbox.c:108
+#: ../widgets/misc/e-canvas-vbox.c:109
+#: ../widgets/misc/e-reflow.c:1445
+#: ../widgets/misc/e-reflow.c:1446
 #: ../widgets/table/e-table-click-to-add.c:524
 #: ../widgets/table/e-table-field-chooser-item.c:674
 #: ../widgets/table/e-table-group-container.c:964
 #: ../widgets/table/e-table-group-container.c:965
 #: ../widgets/table/e-table-group-leaf.c:622
 #: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
-#: ../widgets/text/e-text.c:3634 ../widgets/text/e-text.c:3635
+#: ../widgets/table/e-table-item.c:3018
+#: ../widgets/table/e-table-item.c:3019
+#: ../widgets/text/e-text.c:3634
+#: ../widgets/text/e-text.c:3635
 msgid "Height"
 msgstr "Kõrgus"
 
@@ -3236,7 +3182,7 @@ msgid "WWW"
 msgstr "WWW"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:378
-#: ../addressbook/gui/widgets/eab-contact-display.c:602
+#: ../addressbook/gui/widgets/eab-contact-display.c:599
 msgid "Blog"
 msgstr "Blog"
 
@@ -3244,11 +3190,11 @@ msgstr "Blog"
 msgid "personal"
 msgstr "isiklik"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:563
+#: ../addressbook/gui/widgets/eab-contact-display.c:560
 msgid "Job Title"
 msgstr "Ametinimetus"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:594
+#: ../addressbook/gui/widgets/eab-contact-display.c:591
 msgid "Home page"
 msgstr "Koduleht"
 
@@ -3307,7 +3253,8 @@ msgstr "Mitte toetatud protokoll"
 #: ../calendar/gui/e-cal-component-preview.c:232
 #: ../calendar/gui/e-cal-model-tasks.c:348
 #: ../calendar/gui/e-cal-model-tasks.c:661
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2375
+#: ../calendar/gui/e-calendar-table.c:456
+#: ../calendar/gui/print.c:2364
 msgid "Cancelled"
 msgstr "Katkestatud"
 
@@ -3354,10 +3301,7 @@ msgid "Invalid server version"
 msgstr "Vigane serveri versioon"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:93
-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"
+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 ""
 "Seda aadressiraamatut pole võimalik avada. See võib tähendada, et see raamat "
 "pole märgitud kasutamiseks autonoomses olekus või pole selle raamatu sisu "
@@ -3366,35 +3310,26 @@ msgstr ""
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:102
 #, 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."
+msgid "We were unable to open this addressbook.  Please check that the path %s exists and that you have permission to access it."
 msgstr ""
 "Aadressiraamatut pole võimalik avada.  Palun kontrolli, kas rada %s on "
 "olemas ja kas sul on sellele vajalikud pääsuõigused."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:110
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
+msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the LDAP server is unreachable."
 msgstr ""
 "Aadressiraamatu avamine nurjus. Põhjuseks võib olla see, et sisestasid "
 "vigase URI või kasutatav LDAP server ei ole kättesaadav."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:115
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
+msgid "This version of Evolution does not have LDAP support compiled in to it.  If you want to use LDAP in Evolution, you must install an LDAP-enabled Evolution package."
 msgstr ""
 "Käesolev Evolutioni versioon ei ole kompileeritud LDAP'i toega. Kui sa "
 "soovid kasutada Evolutioni koos LDAP'i toega, pead paigaldama omale vastava "
 "Evolutioni paki."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:122
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
+msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the server is unreachable."
 msgstr ""
 "Aadressiraamatu avamine nurjus.  Põhjuseks võib olla see, et sisestasid "
 "vigase URI või kasutatav server ei ole kättesaadav."
@@ -3529,17 +3464,6 @@ msgstr "Mitu VKaarti"
 msgid "VCard for %s"
 msgstr "VKaart %s kohta"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1031
-#: ../addressbook/gui/widgets/eab-gui-util.c:1049
-#, fuzzy
-msgid "Contact information"
-msgstr "Päevaraamatu teave"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:1051
-#, fuzzy, c-format
-msgid "Contact information for %s"
-msgstr "Päevaraamatu teave"
-
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -3603,18 +3527,19 @@ msgstr "Kaardi vaade"
 msgid "GTK Tree View"
 msgstr "GTK Puuvaade"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:582
+#: ../addressbook/importers/evolution-ldif-importer.c:486
 #: ../addressbook/importers/evolution-vcard-importer.c:249
 #: ../calendar/importers/icalendar-importer.c:311
-#: ../calendar/importers/icalendar-importer.c:643 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:643
+#: ../shell/shell.error.xml.h:6
 msgid "Importing ..."
 msgstr "Importimine ..."
 
-#: ../addressbook/importers/evolution-ldif-importer.c:748
+#: ../addressbook/importers/evolution-ldif-importer.c:652
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP andmevahetusvorming (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:749
+#: ../addressbook/importers/evolution-ldif-importer.c:653
 msgid "Evolution LDIF importer"
 msgstr "Evolutioni LDIF importija"
 
@@ -3631,12 +3556,12 @@ msgstr "Evolutioni VKaardi importija"
 msgid "Print envelope"
 msgstr "Trüki ümbrik"
 
-#: ../addressbook/printing/e-contact-print.c:1026
+#: ../addressbook/printing/e-contact-print.c:1001
 msgid "Print contacts"
 msgstr "Kontaktide trükkimine"
 
-#: ../addressbook/printing/e-contact-print.c:1117
-#: ../addressbook/printing/e-contact-print.c:1145
+#: ../addressbook/printing/e-contact-print.c:1066
+#: ../addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "Kontakti trükkimine"
 
@@ -3789,9 +3714,9 @@ msgstr "Varjutamine"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:940
-#: ../plugins/exchange-operations/exchange-calendar.c:224
-#: ../plugins/exchange-operations/exchange-contacts.c:197
+#: ../plugins/exchange-operations/exchange-account-setup.c:917
+#: ../plugins/exchange-operations/exchange-calendar.c:205
+#: ../plugins/exchange-operations/exchange-contacts.c:176
 msgid "Size:"
 msgstr "Suurus:"
 
@@ -3880,8 +3805,7 @@ msgid "Export in asynchronous mode"
 msgstr "Eksportimine asünkroonses režiimis"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode, default size 100."
+msgid "The number of cards in one output file in asychronous mode, default size 100."
 msgstr ""
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
@@ -3889,8 +3813,7 @@ msgid "NUMBER"
 msgstr "NUMBER"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
+msgid "Command line arguments error, please use --help option to see the usage."
 msgstr "Käsureaargumentide viga, kasutusspikri saamiseks kasuta --help võtit."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:105
@@ -3922,48 +3845,35 @@ msgid "No filename provided."
 msgstr "Failinime ei esitatud."
 
 #: ../calendar/calendar.error.xml.h:1
-msgid ""
-" There are few attachments getting downloaded. Saving the appointment will "
-"cause the appointment to be saved without those pending attachments "
+msgid " There are few attachments getting downloaded. Saving the appointment will cause the appointment to be saved without those pending attachments "
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:2
-msgid ""
-" There are few attachments getting downloaded. Saving the task will cause "
-"the task to be saved without those pending attachments "
+msgid " There are few attachments getting downloaded. Saving the task will cause the task to be saved without those pending attachments "
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:3
-msgid ""
-"Adding a meaningful Summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
+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:4
-msgid ""
-"Adding a meaningful Summary to your task will give your recipients an idea "
-"of what your task is about."
+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:5
-msgid ""
-"All information in these journal entries will be deleted and can not be "
-"restored."
+msgid "All information in these journal entries will be deleted and can not be restored."
 msgstr ""
 "Kõik nende päevikukirjete kohta käivad andmed kustutatakse ja neid pole "
 "võimalik enam taastada."
 
 #: ../calendar/calendar.error.xml.h:6
-msgid ""
-"All information in this journal will be deleted and can not be restored."
+msgid "All information in this journal will be deleted and can not be restored."
 msgstr ""
 "Kõik selle päeviku kohta käivad andmed kustutatakse ja neid pole võimalik "
 "enam taastada."
 
 #: ../calendar/calendar.error.xml.h:7
-msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
+msgid "All information on these appointments will be deleted and can not be restored."
 msgstr ""
 "Kõik nende sündmuste kohta käivad andmed kustutatakse ja neid pole võimalik "
 "enam taastada."
@@ -3975,23 +3885,19 @@ msgstr ""
 "enam taastada."
 
 #: ../calendar/calendar.error.xml.h:9
-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 ""
 "Kõik selle sündmuse kohta käivad andmed kustutatakse ja neid pole võimalik "
 "enam taastada."
 
 #: ../calendar/calendar.error.xml.h:10
-msgid ""
-"All information on this journal entry will be deleted and can not be "
-"restored."
+msgid "All information on this journal entry will be deleted and can not be restored."
 msgstr ""
 "Kõik selle päevikukirje kohta käivad andmed kustutatakse ja neid pole "
 "võimalik enam taastada."
 
 #: ../calendar/calendar.error.xml.h:11
-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 ""
 "Kõik selle koosoleku kohta käivad andmed kustutatakse ja neid pole võimalik "
 "enam taastada."
@@ -4055,13 +3961,12 @@ msgid "Delete calendar '{0}'?"
 msgstr "Kustutada kalender '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:26
-#, fuzzy
-msgid "Delete memo list '{0}'?"
+msgid "Delete task list '{0}'?"
 msgstr "Kas kustutata ülesandeloend '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:27
-msgid "Delete task list '{0}'?"
-msgstr "Kas kustutata ülesandeloend '{0}'?"
+msgid "Discard Changes"
+msgstr "Loobu muudatustest"
 
 #: ../calendar/calendar.error.xml.h:28
 msgid "Don't Send"
@@ -4080,16 +3985,13 @@ msgid "Editor could not be loaded."
 msgstr "Redaktorit pole võimalik laadida."
 
 #: ../calendar/calendar.error.xml.h:32
-msgid ""
-"Email invitations will be sent to all participants and allow them to RSVP."
+msgid "Email invitations will be sent to all participants and allow them to RSVP."
 msgstr ""
 "E-posti teel edastatud kutsed saadetakse kõikidele osalejatele, see lubab "
 "neil oma osalemisest teada anda (RSVP)."
 
 #: ../calendar/calendar.error.xml.h:33
-msgid ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
+msgid "Email invitations will be sent to all participants and allow them to accept this task."
 msgstr ""
 "E-posti teel edastatud kutsed saadetakse kõikidele osalejatele, see lubab "
 "neil ülesandele nõusolekut anda."
@@ -4099,38 +4001,31 @@ msgid "Error loading calendar"
 msgstr "Viga kalendri laadimisel"
 
 #: ../calendar/calendar.error.xml.h:35
-#, fuzzy
-msgid "Error loading memo list"
-msgstr "Viga ülesandeloendi laadimisel"
-
-#: ../calendar/calendar.error.xml.h:36
 msgid "Error loading task list"
 msgstr "Viga ülesandeloendi laadimisel"
 
-#: ../calendar/calendar.error.xml.h:37
-msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the journal has been deleted."
+#: ../calendar/calendar.error.xml.h:36
+msgid "If you don't send a cancellation notice, the other participants may not know the journal has been deleted."
 msgstr ""
 "Kui sa ei saada katkestamisteadet, siis ülejäänud osalised võivad selle "
 "päeviku kustutamisest mitte teada saada."
 
-#: ../calendar/calendar.error.xml.h:38
-msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the meeting is canceled."
+#: ../calendar/calendar.error.xml.h:37
+msgid "If you don't send a cancellation notice, the other participants may not know the meeting is canceled."
 msgstr ""
 "Kui sa ei saada katkestamisteadet, siis ülejäänud osalised võivad "
 "katkestamisest mitte teada saada."
 
-#: ../calendar/calendar.error.xml.h:39
-msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the task has been deleted."
+#: ../calendar/calendar.error.xml.h:38
+msgid "If you don't send a cancellation notice, the other participants may not know the task has been deleted."
 msgstr ""
 "Kui sa ei saada kustutamisteadet, siis ülejäänud osalised võivad selle "
 "ülesande kustutamisest mitte teada saada."
 
+#: ../calendar/calendar.error.xml.h:39
+msgid "Save Changes"
+msgstr "Salvesta muudatused"
+
 #: ../calendar/calendar.error.xml.h:40
 #: ../ui/evolution-message-composer.xml.h:28
 msgid "Send"
@@ -4141,17 +4036,13 @@ msgid "Send Notice"
 msgstr "Teavita"
 
 #: ../calendar/calendar.error.xml.h:42
-msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
+msgid "Sending updated information allows other participants to keep their calendars up to date."
 msgstr ""
 "Värskendatud andmete saatmine aitab teistel osalejatel nende kalendreid "
 "ajakohasena hoida"
 
 #: ../calendar/calendar.error.xml.h:43
-msgid ""
-"Sending updated information allows other participants to keep their task "
-"lists up to date."
+msgid "Sending updated information allows other participants to keep their task lists up to date."
 msgstr ""
 "Värskendatud andmete saatmine aitab teistel osalejatel nende ülesannete "
 "nimekirja ajakohasena hoida"
@@ -4169,103 +4060,86 @@ msgid "The calendar is not marked for offline usage"
 msgstr "Kalender pole märgitud autonoomses režiimis kasutamiseks"
 
 #: ../calendar/calendar.error.xml.h:48
-#, fuzzy
-msgid "The memo list is not marked for offline usage"
-msgstr "Ülesandeloend pole märgitud autonoomses režiimis kasutamiseks"
-
-#: ../calendar/calendar.error.xml.h:49
 msgid "The task list is not marked for offline usage"
 msgstr "Ülesandeloend pole märgitud autonoomses režiimis kasutamiseks"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:49
 msgid "This calendar will be removed permanently."
 msgstr "See kalender eemaldatakse jäädavalt."
 
-#: ../calendar/calendar.error.xml.h:51
-#, fuzzy
-msgid "This memo list will be removed permanently."
-msgstr "See ülesandeloend eemaldatakse jäädavalt."
-
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:50
 msgid "This task list will be removed permanently."
 msgstr "See ülesandeloend eemaldatakse jäädavalt."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:51
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Kas soovid selle sündmuse muudatusi salvestada?"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:52
 msgid "Would you like to save your changes to this task?"
 msgstr "Kas soovid selle ülesande muudatusi salvestada?"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:53
 msgid "Would you like to send a cancellation notice for this journal entry?"
 msgstr ""
 "Kas soovid teisi osalejaid selle päevikukirje katkestamisest teavitada?"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:54
 msgid "Would you like to send all the participants a cancellation notice?"
 msgstr "Kas soovid teisi osalejaid katkestamisest teavitada?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:55
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Kas soovid saata osalejatele osalemiskutsed?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:56
 msgid "Would you like to send this task to participants?"
 msgstr "Kas soovid osalejaid teavitada sellest ülesandest?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Kas soovid osalejaid teavitada koosoleku muutusest?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send updated task information to participants?"
 msgstr "Kas soovid saata osalejatele värskemaid andmeid ülesande kohta?"
 
-#: ../calendar/calendar.error.xml.h:62
-#, fuzzy
-msgid "You have changed this appointment, but not yet saved them."
+#: ../calendar/calendar.error.xml.h:60
+msgid "You have made changes to this appointment, but not yet saved them."
 msgstr "Sa oled muutnud seda sündmust, kuid muudatused ei ole salvestatud."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:61
 msgid "You have made changes to this task, but not yet saved them."
 msgstr "Sa oled seda ülesannet muutnud aga muudatused on salvestamata."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:62
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Sinu kalendreid pole enne Evolutioni taaskäivitamist võimalik kasutada."
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:63
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 "Sinu ülesandeid pole enne Evolutioni taaskäivitamist võimalik kasutada."
 
-#: ../calendar/calendar.error.xml.h:66
-#: ../composer/mail-composer.error.xml.h:29
-msgid "_Discard Changes"
-msgstr "_Loobu muudatustest"
-
-#: ../calendar/calendar.error.xml.h:67 ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:64
 #: ../ui/evolution-message-composer.xml.h:51
+#: ../ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Salvesta"
 
-#: ../calendar/calendar.error.xml.h:68
-msgid "_Save Changes"
-msgstr "_Salvesta muudatused"
-
-#: ../calendar/calendar.error.xml.h:69
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:127
+#: ../calendar/calendar.error.xml.h:65
+#: ../composer/mail-composer.error.xml.h:31
+#: ../mail/mail.error.xml.h:123
 msgid "_Send"
 msgstr "_Saada"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:66
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:323
+#: ../calendar/common/authentication.c:49
+#: ../calendar/gui/e-pub-utils.c:301
 #: ../smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Sisesta parool"
@@ -4274,54 +4148,33 @@ msgstr "Sisesta parool"
 msgid "Split Multi-Day Events:"
 msgstr "Mitmepäevaste sündmuste osadeks jagamine:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1377
-#: ../calendar/conduits/calendar/calendar-conduit.c:1378
-#: ../calendar/conduits/memo/memo-conduit.c:854
-#: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:988
-#: ../calendar/conduits/todo/todo-conduit.c:989
+#: ../calendar/conduits/calendar/calendar-conduit.c:1365
+#: ../calendar/conduits/calendar/calendar-conduit.c:1366
+#: ../calendar/conduits/todo/todo-conduit.c:879
+#: ../calendar/conduits/todo/todo-conduit.c:880
 msgid "Could not start evolution-data-server"
 msgstr "Andmeserverit pole võimalik käivitada (evolution-data-server)"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1486
-#: ../calendar/conduits/calendar/calendar-conduit.c:1489
+#: ../calendar/conduits/calendar/calendar-conduit.c:1474
+#: ../calendar/conduits/calendar/calendar-conduit.c:1477
 msgid "Could not read pilot's Calendar application block"
 msgstr "Pilot'i kalendrirakenduse blokki ei suudetud lugeda"
 
-#: ../calendar/conduits/memo/memo-conduit.c:937
-#: ../calendar/conduits/memo/memo-conduit.c:940
-#, fuzzy
-msgid "Could not read pilot's Memo application block"
-msgstr "Pilot'i ülesanderakenduse blokki ei suudetud lugeda"
-
-#: ../calendar/conduits/memo/memo-conduit.c:976
-#: ../calendar/conduits/memo/memo-conduit.c:979
-#, fuzzy
-msgid "Could not write pilot's Memo application block"
-msgstr "Pilot'i ülesanderakenduse blokki ei suudetud lugeda"
-
-#: ../calendar/conduits/todo/todo-conduit.c:237
+#: ../calendar/conduits/todo/todo-conduit.c:234
 msgid "Default Priority:"
 msgstr "Vaikimisi tähtsus:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1071
-#: ../calendar/conduits/todo/todo-conduit.c:1074
+#: ../calendar/conduits/todo/todo-conduit.c:959
+#: ../calendar/conduits/todo/todo-conduit.c:962
 msgid "Could not read pilot's ToDo application block"
 msgstr "Pilot'i ülesanderakenduse blokki ei suudetud lugeda"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1110
-#: ../calendar/conduits/todo/todo-conduit.c:1113
-#, fuzzy
-msgid "Could not write pilot's ToDo application block"
-msgstr "Pilot'i ülesanderakenduse blokki ei suudetud lugeda"
-
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:1968
 msgid "Calendar and Tasks"
 msgstr "Kalender ja ülesanded"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1309
+#: ../calendar/gui/calendar-component.c:1307
 msgid "Calendars"
 msgstr "Kalendrid"
 
@@ -4350,43 +4203,28 @@ msgid "Evolution's Calendar component"
 msgstr "Evolutioni kalendrikomponent"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution's Memos component"
-msgstr "Evolutioni testkomponent"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Tasks component"
 msgstr "Evolutioni ülesannetekomponent"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Memo_s"
-msgstr "Liikmed"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memos.c:1091 ../calendar/gui/memos-component.c:528
-#: ../calendar/gui/memos-component.c:998 ../calendar/gui/memos-control.c:334
-#, fuzzy
-msgid "Memos"
-msgstr "Liikmed"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-tasks.c:1333 ../calendar/gui/print.c:1831
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#: ../calendar/gui/e-tasks.c:1257
+#: ../calendar/gui/print.c:1822
 #: ../calendar/gui/tasks-component.c:519
-#: ../calendar/gui/tasks-component.c:1013 ../calendar/gui/tasks-control.c:466
+#: ../calendar/gui/tasks-component.c:1006
+#: ../calendar/gui/tasks-control.c:457
 #: ../calendar/importers/icalendar-importer.c:79
 #: ../calendar/importers/icalendar-importer.c:707
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:582
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Ülesanded"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 msgid "_Calendars"
 msgstr "_Kalendrid"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
 #: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Ülesanded"
@@ -4395,17 +4233,17 @@ msgstr "_Ülesanded"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolutioni kalendri alarmteadete teenus"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minutit"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:251
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:248
 msgid "Start time"
 msgstr "Algusaeg"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:349
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:347
 #, c-format
 msgid ""
 "<big><b>%s</b></big>\n"
@@ -4421,7 +4259,7 @@ msgstr "Sündmused"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/e-itip-control.c:1117
+#: ../calendar/gui/e-itip-control.c:1120
 #: ../plugins/itip-formatter/itip-view.c:884
 msgid "Location:"
 msgstr "Asukoht:"
@@ -4433,15 +4271,18 @@ msgstr "_Edasilükkamise aeg:"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:6
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
+#: ../filter/filter.glade.h:11
+#: ../mail/mail-config.glade.h:158
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:13
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-editor.xml.h:17
-#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-addressbook.xml.h:34
+#: ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-composer-entries.xml.h:8
+#: ../ui/evolution-mail-messagedisplay.xml.h:5
 #: ../ui/evolution-message-composer.xml.h:44
-#: ../ui/evolution-signature-editor.xml.h:23
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution-signature-editor.xml.h:12
+#: ../ui/evolution-subscribe.xml.h:10
+#: ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution.xml.h:32
 msgid "_Edit"
 msgstr "_Redigeeri"
 
@@ -4450,31 +4291,35 @@ msgid "_Snooze"
 msgstr "_Lükka edasi"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+msgid "description of appointment"
+msgstr "sündmuse kirjeldus"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 msgid "location of appointment"
 msgstr "sündmuse asukoht"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:970
+#: ../calendar/gui/alarm-notify/alarm-queue.c:954
 msgid "Dismiss"
 msgstr "Katkesta"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:971
+#: ../calendar/gui/alarm-notify/alarm-queue.c:955
 msgid "Dismiss All"
 msgstr "Tühista kõik"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1053
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1037
 msgid "No summary available."
 msgstr "Kokkuvõte puudub."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1062
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1064
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1046
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1048
 msgid "No description available."
 msgstr "Kirjeldus puudub."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1072
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1056
 msgid "No location information available."
 msgstr "Asukoha kohta puuduvad andmed."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1088
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1072
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -4487,12 +4332,12 @@ msgstr ""
 "Algus: %s\n"
 "Lõpp: %s"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1191
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1215
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1175
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1199
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1195
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1179
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4504,11 +4349,10 @@ msgstr ""
 "saatmist e-posti teel.  Evolution kuvab selle asemel\n"
 "hariliku meeldetuletusdialoogi."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1221
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1205
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
@@ -4520,15 +4364,15 @@ msgstr ""
 "\n"
 "Oled sa kindel, et soovid seda programmi käivitada?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1235
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1219
 msgid "Do not ask me about this program again."
 msgstr "Selle programmi kohta enam mitte küsida."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:147
+#: ../calendar/gui/alarm-notify/notify-main.c:140
 msgid "Could not initialize Bonobo"
 msgstr "Bonobot pole võimalik lähtestada"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:158
+#: ../calendar/gui/alarm-notify/notify-main.c:151
 msgid "Could not create the alarm notify service factory"
 msgstr "Alarmteavituse teenuse factory't pole võimalik luua"
 
@@ -4557,8 +4401,7 @@ msgid "Calendars to run alarms for"
 msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.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 "Marcus Bains'i joone värvus ajaribal (vaikimisi tühi)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
@@ -4674,34 +4517,24 @@ msgid "Overdue tasks color"
 msgstr "Tähtaja ületanud ülesannete värvus"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
-msgid ""
-"Position of the horizontal pane, between the date navigator calendar and the "
-"task list when not in the month view, in pixels."
+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.in.h:36
-msgid ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
+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.in.h:37
-msgid ""
-"Position of the vertical pane, between the task list and the task preview "
-"pane, in pixels."
+msgid "Position of the vertical pane, between the task list and the task preview pane, in pixels."
 msgstr ""
 "Vertikaalpaani asukoht pikslites ülesande- ja ülesande eelvaatepaanide vahel."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
+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.in.h:39
-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."
+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.in.h:40
@@ -4709,197 +4542,124 @@ msgid "Programs that are allowed to be run by alarms."
 msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
-msgid "Show RSVP field in the event/task/meeting editor"
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
-msgid "Show Role field in the event/task/meeting editor"
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr "Sündmuste lõpuaegade näitamine nädala ja kuu vaadetel"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
-msgid "Show categories field in the event/meeting/task editor"
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show display alarms in notification tray"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
-msgid "Show status field in the event/task/meeting editor"
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
-#: ../mail/evolution-mail.schemas.in.in.h:73
-msgid "Show the \"Preview\" pane"
-msgstr "\"Eelvaatlus\" paani kuvamine"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
-#: ../mail/evolution-mail.schemas.in.in.h:74
-msgid "Show the \"Preview\" pane."
-msgstr "\"Eelvaatlus\" paani kuvamine."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
-msgid "Show timezone field in the event/meeting editor"
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
-msgid "Show type field in the event/task/meeting editor"
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show week numbers in date navigator"
 msgstr "Nädalanumbrite näitamine kuupäevavalikus"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Tasks due today color"
 msgstr "Tänase tähtajaga ülesannete värvus"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Tasks vertical pane position"
 msgstr "Ülesannete püstpaani asukoht"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
-msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+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.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
 #, 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."
+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.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Time divisions"
 msgstr "Ajajaotised:"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Time the last alarm ran, in time_t."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Timezone"
 msgstr "Ajavöönd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Twenty four hour time format"
 msgstr "Kahekümneneljatunnine ajavorming"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid "Week start"
 msgstr "Nädala algus"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Nädalapäev, millal nädal algab, pühapäevast (0) esmaspäevani (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Kas sündmuste või ülesannete kustutamisel küsitakse nõusolekut."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Kas sündmuste või ülesannete puhastamisel küsitakse nõusolekut."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
-msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+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.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "Kas sündmuste lõpuaegu kuvatakse nädala ja kuu vaadetel."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Kas kalendris kuvatakse Marcus Bains'i joont (joon praeguse aja kohal)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Kas lõpetatud ülesanded peidetakse ülesandevaates."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Whether to set a default reminder for appointments."
 msgstr "Kas sündmustele seatakse vaikimisi meeldetuletaja."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
-#, fuzzy
-msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr "Kas nädalate numbreid näidatakse kuupäevasirvijas."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
-#, fuzzy
-msgid "Whether to show categories field in the event/meeting editor"
-msgstr "Kas nädalate numbreid näidatakse kuupäevasirvijas."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
-#, fuzzy
-msgid "Whether to show role field in the event/task/meeting editor"
-msgstr "Kas nädalate numbreid näidatakse kuupäevasirvijas."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
-#, fuzzy
-msgid "Whether to show status field in the event/task/meeting editor"
-msgstr "Kas nädalate numbreid näidatakse kuupäevasirvijas."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Kas kellaaegu kuvatakse 24-tunnises või EL/PL vormingus."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
-#, fuzzy
-msgid "Whether to show timezone field in the event/meeting editor"
-msgstr "Kas nädalate numbreid näidatakse kuupäevasirvijas."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
-#, fuzzy
-msgid "Whether to show type field in the event/task/meeting editor"
-msgstr "Kas nädalate numbreid näidatakse kuupäevasirvijas."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Kas nädalate numbreid näidatakse kuupäevasirvijas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Work days"
 msgstr "Tööpäevad"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid "Workday end hour"
 msgstr "Tund, millal tööpäev lõpeb"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Workday end minute"
 msgstr "Minut, millal tööpäev lõpeb"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid "Workday start hour"
 msgstr "Tund, millal tööpäev algab"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Workday start minute"
 msgstr "Minut, millal tööpäev algab"
 
@@ -4923,30 +4683,18 @@ msgstr "Asukoht sisaldab"
 msgid "Unmatched"
 msgstr "Puudub"
 
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2512
-#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-memos.xml.h:11
-#: ../ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "Trüki"
-
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2116
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/gnome-cal.c:2094
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:590
-#: ../plugins/hula-account-setup/camel-hula-listener.c:374
-#: ../plugins/hula-account-setup/camel-hula-listener.c:403
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:581
 msgid "Calendar"
 msgstr "Kalender"
 
 #: ../calendar/gui/calendar-commands.c:354
-msgid ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
+msgid "This operation will permanently erase all events older than the selected amount of time. If you continue, you will not be able to recover these events."
 msgstr ""
 "See tegevus eemaldab lõplikult kõik sündmused, mis on vanemad kui valitud "
 "päevade arv. Eemaldatud sõnumeid ei ole hiljem enam võimalik taastada."
@@ -4958,24 +4706,25 @@ msgstr "Puhasta sündmustest, mis on vanemad kui"
 #: ../calendar/gui/calendar-commands.c:365
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:12
-#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:265
+#: ../filter/filter.glade.h:14
+#: ../plugins/calendar-http/calendar-http.c:265
 #: ../plugins/calendar-weather/calendar-weather.c:565
 #: ../widgets/misc/e-send-options.glade.h:36
 msgid "days"
 msgstr "päeva"
 
 #. 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:234
-#: ../calendar/gui/memos-component.c:219 ../calendar/gui/migration.c:489
-#: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1084
+#: ../calendar/gui/migration.c:489
+#: ../calendar/gui/migration.c:582
 #: ../calendar/gui/tasks-component.c:215
 msgid "On The Web"
 msgstr "Veebis"
 
-#: ../calendar/gui/calendar-component.c:252 ../calendar/gui/migration.c:391
+#: ../calendar/gui/calendar-component.c:252
+#: ../calendar/gui/migration.c:391
 msgid "Birthdays & Anniversaries"
 msgstr "Sünnipäevad ja aastapäevad"
 
@@ -4986,14 +4735,15 @@ msgid "Weather"
 msgstr "Ilm"
 
 #: ../calendar/gui/calendar-component.c:535
-msgid "_New Calendar"
-msgstr "_Uus kalender"
+#: ../calendar/gui/dialogs/calendar-setup.c:449
+msgid "New Calendar"
+msgstr "Uus kalender"
 
 #: ../calendar/gui/calendar-component.c:858
 msgid "Failed upgrading calendars."
 msgstr "Tõrge kalendrite uuendamisel."
 
-#: ../calendar/gui/calendar-component.c:1157
+#: ../calendar/gui/calendar-component.c:1154
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
@@ -5002,56 +4752,55 @@ msgstr ""
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: ../calendar/gui/calendar-component.c:1284
+#: ../calendar/gui/calendar-component.c:1282
 msgid "Calendar Source Selector"
 msgstr "Kalendri allika valimine"
 
-#: ../calendar/gui/calendar-component.c:1475
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New appointment"
 msgstr "Uus sündmus"
 
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1474
 msgid "_Appointment"
 msgstr "_Sündmus"
 
-#: ../calendar/gui/calendar-component.c:1477
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new appointment"
 msgstr "Uue sündmuse lisamine"
 
-#: ../calendar/gui/calendar-component.c:1483
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New meeting"
 msgstr "Uus koosolek"
 
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1482
 msgid "M_eeting"
 msgstr "K_oosolek"
 
-#: ../calendar/gui/calendar-component.c:1485
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new meeting request"
 msgstr "Uue koosolekukutse loomine"
 
-#: ../calendar/gui/calendar-component.c:1491
+#: ../calendar/gui/calendar-component.c:1489
 msgid "New all day appointment"
 msgstr "Uus, kogu päeva hõlmav sündmus"
 
-#: ../calendar/gui/calendar-component.c:1492
+#: ../calendar/gui/calendar-component.c:1490
 msgid "All Day A_ppointment"
 msgstr "Kogu _päeva hõlmav sündmus"
 
-#: ../calendar/gui/calendar-component.c:1493
+#: ../calendar/gui/calendar-component.c:1491
 msgid "Create a new all-day appointment"
 msgstr "Uue kogu päeva hõlmava sündmuse lisamine"
 
-#: ../calendar/gui/calendar-component.c:1499
+#: ../calendar/gui/calendar-component.c:1497
 msgid "New calendar"
 msgstr "Uus kalender"
 
-#: ../calendar/gui/calendar-component.c:1500
-#: ../calendar/gui/dialogs/event-page.c:828
+#: ../calendar/gui/calendar-component.c:1498
 msgid "Cale_ndar"
 msgstr "_Kalender"
 
-#: ../calendar/gui/calendar-component.c:1501
+#: ../calendar/gui/calendar-component.c:1499
 msgid "Create a new calendar"
 msgstr "Uue kalendri loomine"
 
@@ -5083,7 +4832,8 @@ msgstr ""
 msgid "Permission denied to open the calendar"
 msgstr "Puuduvad õigused kalendri avamiseks"
 
-#: ../calendar/gui/comp-editor-factory.c:444 ../shell/e-shell.c:1267
+#: ../calendar/gui/comp-editor-factory.c:444
+#: ../shell/e-shell.c:1267
 msgid "Unknown error"
 msgstr "Tundmatu viga"
 
@@ -5182,7 +4932,7 @@ msgstr "tund(i)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
+#: ../filter/filter.glade.h:15
 #: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:564
 msgid "hours"
@@ -5205,8 +4955,6 @@ msgid "A_dd"
 msgstr "L_isa"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Alarmid"
 
@@ -5233,20 +4981,19 @@ msgstr "%.0fG"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:311
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
-#: ../calendar/gui/dialogs/comp-editor.c:2575
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:138
-#: ../mail/em-utils.c:483 ../mail/em-utils.c:520
+#: ../calendar/gui/dialogs/comp-editor.c:2440
+#: ../composer/e-msg-composer-attachment-bar.c:307
+#: ../mail/em-utils.c:444
+#: ../mail/em-utils.c:481
 #: ../widgets/misc/e-attachment-bar.c:341
 msgid "attachment"
 msgstr "manus"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:473
-#: ../calendar/gui/dialogs/comp-editor.c:1055
-#: ../calendar/gui/dialogs/event-page.c:1733
-#: ../calendar/gui/dialogs/meeting-page.c:908
-#: ../calendar/gui/dialogs/task-page.c:1182
+#: ../calendar/gui/dialogs/comp-editor.c:1083
+#: ../calendar/gui/dialogs/meeting-page.c:887
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3545
+#: ../composer/e-msg-composer.c:3400
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
@@ -5254,23 +5001,24 @@ msgid "_Remove"
 msgstr "_Eemalda"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:474
-#: ../calendar/gui/dialogs/comp-editor.c:1056
+#: ../calendar/gui/dialogs/comp-editor.c:1084
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3546 ../mail/em-folder-tree.c:2058
+#: ../composer/e-msg-composer.c:3401
+#: ../mail/em-folder-tree.c:2047
 #: ../ui/evolution-mail-list.xml.h:29
 msgid "_Properties"
 msgstr "_Omadused"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:476
-#: ../calendar/gui/dialogs/comp-editor.c:1058
+#: ../calendar/gui/dialogs/comp-editor.c:1086
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3548
+#: ../composer/e-msg-composer.c:3403
 msgid "_Add attachment..."
 msgstr "_Lisa manus..."
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:736
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:994
+#: ../widgets/misc/e-attachment-bar.c:963
 msgid "Attachment Bar"
 msgstr "Manuseriba"
 
@@ -5285,7 +5033,7 @@ msgid "Suggest automatic display of attachment"
 msgstr "Manuse automaatkuvamise soovitamine"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
-#: ../composer/e-msg-composer-select-file.c:239
+#: ../composer/e-msg-composer-select-file.c:241
 msgid "Attach file(s)"
 msgstr "Faili(de) manustamine"
 
@@ -5297,8 +5045,10 @@ msgstr "Faili(de) manustamine"
 #: ../composer/e-msg-composer-attachment.c:203
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:221 ../widgets/misc/e-attachment.c:237
-#: ../widgets/misc/e-attachment.c:425 ../widgets/misc/e-attachment.c:441
+#: ../widgets/misc/e-attachment.c:221
+#: ../widgets/misc/e-attachment.c:237
+#: ../widgets/misc/e-attachment.c:425
+#: ../widgets/misc/e-attachment.c:441
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Faili pole võimalik manusesse lisada: %s: %s"
@@ -5307,7 +5057,8 @@ msgstr "Faili pole võimalik manusesse lisada: %s: %s"
 #: ../calendar/gui/dialogs/cal-attachment.c:327
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:229 ../widgets/misc/e-attachment.c:433
+#: ../widgets/misc/e-attachment.c:229
+#: ../widgets/misc/e-attachment.c:433
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Faili %s pole võimalik manusesse lisada: see ei ole tavaline fail"
@@ -5320,10 +5071,11 @@ msgstr "Manuse omadused"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:267
-#: ../calendar/gui/e-itip-control.c:1163
+#: ../calendar/gui/e-itip-control.c:1166
 #: ../calendar/gui/e-itip-control.glade.h:6
 #: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
+#: ../mail/mail-config.glade.h:69
+#: ../widgets/misc/e-attachment.glade.h:3
 msgid "Description:"
 msgstr "Kirjeldus:"
 
@@ -5341,35 +5093,38 @@ msgstr "MIME tüüp:"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:576
-#: ../mail/em-account-prefs.c:504 ../mail/em-composer-prefs.c:919
+#: ../mail/em-account-prefs.c:504
+#: ../mail/em-composer-prefs.c:891
 #: ../plugins/plugin-manager/plugin-manager.c:213
 msgid "Enabled"
 msgstr "Lubatud"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:730
 msgid "Are you sure you want to remove this URL?"
 msgstr "Oled sa kindel, et soovid eemaldada seda URL'i?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:736
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:733
 msgid "Remove"
 msgstr "Eemalda"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:741
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:738
 msgid "Don't Remove"
 msgstr "Ära eemalda"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:823
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:856
-#: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:853
+#: ../mail/em-account-prefs.c:330
+#: ../mail/em-account-prefs.c:375
 #: ../mail/em-account-prefs.c:406
 msgid "Disable"
 msgstr "Keela"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:823
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:858
-#: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:855
+#: ../mail/em-account-prefs.c:330
+#: ../mail/em-account-prefs.c:375
 #: ../mail/em-account-prefs.c:408
 msgid "Enable"
 msgstr "Luba"
@@ -5424,8 +5179,7 @@ msgstr "<b>Töönädal</b>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #, 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 ja %d asendatakse kasutajanime ja domeeniga, mis võetakse e-post "
 "aadressist.</i>"
@@ -5460,14 +5214,12 @@ msgid "E_nable"
 msgstr "_Lubamine"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: ../calendar/gui/dialogs/event-editor.c:549
-#: ../ui/evolution-event-editor.xml.h:6
 msgid "Free/Busy"
 msgstr "Vaba/hõivatud"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Friday"
 msgstr "Reede"
 
@@ -5480,8 +5232,8 @@ msgid "Minutes"
 msgstr "Minut(it)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
-#: ../calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Monday"
 msgstr "Esmaspäev"
 
@@ -5494,8 +5246,8 @@ msgid "S_un"
 msgstr "_P"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/recurrence-page.c:1049
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Saturday"
 msgstr "Laupäev"
 
@@ -5508,8 +5260,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "_Kuupäeva valikul kuvatakse nädalate numbreid"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1051
-#: ../calendar/gui/e-itip-control.c:726
+#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Sunday"
 msgstr "Pühapäev"
 
@@ -5526,13 +5278,12 @@ msgid "Template:"
 msgstr "Mall:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Thursday"
 msgstr "Neljapäev"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "Time _zone:"
 msgstr "Aja_vöönd:"
 
@@ -5541,8 +5292,8 @@ msgid "Time format:"
 msgstr "Ajavorming:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Tuesday"
 msgstr "Teisipäev"
 
@@ -5551,8 +5302,8 @@ msgid "W_eek starts:"
 msgstr "Nä_dala algus:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Wednesday"
 msgstr "Kolmapäev"
 
@@ -5642,44 +5393,23 @@ msgid "Copy task list contents locally for offline operation"
 msgstr ""
 "Ülesandeloendi sisu kopeerimine kohapeale tarvitamiseks võrguvabas keskkonnas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-#, fuzzy
-msgid "Copy memo list contents locally for offline operation"
-msgstr ""
-"Ülesandeloendi sisu kopeerimine kohapeale tarvitamiseks võrguvabas keskkonnas"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:341
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "Vä_rvus:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:378
 msgid "Tasks List"
 msgstr "Ülesannete loend"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-#, fuzzy
-msgid "Memos List"
-msgstr "Sõnumiloend"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:460
+#: ../calendar/gui/dialogs/calendar-setup.c:447
 msgid "Calendar Properties"
 msgstr "Kalendri omadused"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:462
-msgid "New Calendar"
-msgstr "Uus kalender"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:528
+#: ../calendar/gui/dialogs/calendar-setup.c:515
 msgid "Task List Properties"
 msgstr "Ülesandeloendi omadused"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:594
-#: ../calendar/gui/memos-component.c:448
-#, fuzzy
-msgid "New Memo List"
-msgstr "Uus kontaktide nimekiri"
-
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
 msgstr "Kalendri lisamine"
@@ -5713,7 +5443,8 @@ msgid "_URL:"
 msgstr "_URL:"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:15
-#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:266
+#: ../filter/filter.glade.h:21
+#: ../plugins/calendar-http/calendar-http.c:266
 #: ../plugins/calendar-weather/calendar-weather.c:566
 msgid "weeks"
 msgstr "nädalat"
@@ -5770,125 +5501,142 @@ msgstr "%s  Muudatusi ei ole tehtud. Kas värskendada redaktorit?"
 msgid "Validation error: %s"
 msgstr "Valideerimisviga: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2270
+#: ../calendar/gui/dialogs/comp-editor-util.c:187
+#: ../calendar/gui/print.c:2261
 msgid " to "
 msgstr " kuni "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2274
+#: ../calendar/gui/dialogs/comp-editor-util.c:191
+#: ../calendar/gui/print.c:2265
 msgid " (Completed "
 msgstr " (Valmis "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2276
+#: ../calendar/gui/dialogs/comp-editor-util.c:193
+#: ../calendar/gui/print.c:2267
 msgid "Completed "
 msgstr "Lõpetatud "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2281
+#: ../calendar/gui/dialogs/comp-editor-util.c:198
+#: ../calendar/gui/print.c:2272
 msgid " (Due "
 msgstr " (Tähtaeg "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2283
+#: ../calendar/gui/dialogs/comp-editor-util.c:200
+#: ../calendar/gui/print.c:2274
 msgid "Due "
 msgstr "Tähtaeg "
 
-#: ../calendar/gui/dialogs/comp-editor.c:193 ../composer/e-msg-composer.c:2800
+#: ../calendar/gui/dialogs/comp-editor.c:190
+#: ../composer/e-msg-composer.c:2664
 #, c-format
 msgid "Attached message - %s"
 msgstr "Manustatud sõnum - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:198
-#: ../calendar/gui/dialogs/comp-editor.c:368 ../composer/e-msg-composer.c:2805
-#: ../composer/e-msg-composer.c:2984
+#: ../calendar/gui/dialogs/comp-editor.c:195
+#: ../calendar/gui/dialogs/comp-editor.c:365
+#: ../composer/e-msg-composer.c:2669
+#: ../composer/e-msg-composer.c:2846
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Manustatud sõnum"
 msgstr[1] "%d manustatud sõnumit"
 
-#: ../calendar/gui/dialogs/comp-editor.c:432 ../composer/e-msg-composer.c:3050
-#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1719
+#: ../calendar/gui/dialogs/comp-editor.c:428
+#: ../calendar/gui/e-calendar-table.c:1162
+#: ../calendar/gui/e-calendar-view.c:1535
+#: ../composer/e-msg-composer.c:2911
+#: ../mail/em-folder-tree.c:974
+#: ../mail/em-folder-view.c:1035
+#: ../mail/message-list.c:1708
+#: ../ui/evolution-addressbook.xml.h:31
+#: ../ui/evolution-calendar.xml.h:39
+#: ../ui/evolution-composer-entries.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-tasks.xml.h:21
+msgid "_Copy"
+msgstr "_Kopeeri"
+
+#: ../calendar/gui/dialogs/comp-editor.c:429
+#: ../composer/e-msg-composer.c:2912
+#: ../mail/em-folder-tree.c:975
+#: ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:931
+#: ../mail/message-list.c:1709
 msgid "_Move"
 msgstr "_Tõsta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:434 ../composer/e-msg-composer.c:3052
-#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1721
+#: ../calendar/gui/dialogs/comp-editor.c:431
+#: ../composer/e-msg-composer.c:2914
+#: ../mail/em-folder-tree.c:977
+#: ../mail/message-list.c:1711
 msgid "Cancel _Drag"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:777
+#: ../calendar/gui/dialogs/comp-editor.c:774
 msgid "Could not update object"
 msgstr "Objekti pole võimalik uuendada!"
 
-#: ../calendar/gui/dialogs/comp-editor.c:913 ../composer/e-msg-composer.c:2443
+#: ../calendar/gui/dialogs/comp-editor.c:977
+#: ../composer/e-msg-composer.c:2318
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> fail manusena"
 msgstr[1] "<b>%d</b> faili manusena"
 
-#: ../calendar/gui/dialogs/comp-editor.c:943
-#, fuzzy
-msgid "Hide Attachment _Bar"
-msgstr "Manuseriba"
-
-#: ../calendar/gui/dialogs/comp-editor.c:946
-#: ../calendar/gui/dialogs/comp-editor.c:1363
-#, fuzzy
-msgid "Show Attachment _Bar"
-msgstr "Manuseriba"
+#: ../calendar/gui/dialogs/comp-editor.c:1249
+msgid "_Attachment Bar (drop attachments here)"
+msgstr "_Manuseriba (tõsta manused siia)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
-msgid "Attachment Button: Press space key to toggle attachment bar"
-msgstr ""
-
-#: ../calendar/gui/dialogs/comp-editor.c:1984
-#: ../calendar/gui/dialogs/comp-editor.c:2027
+#: ../calendar/gui/dialogs/comp-editor.c:1850
+#: ../calendar/gui/dialogs/comp-editor.c:1893
 msgid "Edit Appointment"
 msgstr "Muuda sündmust"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1990
-#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/dialogs/comp-editor.c:1856
+#: ../calendar/gui/dialogs/comp-editor.c:1899
 #, c-format
 msgid "Meeting - %s"
 msgstr "Koosolek - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1992
-#: ../calendar/gui/dialogs/comp-editor.c:2035
+#: ../calendar/gui/dialogs/comp-editor.c:1858
+#: ../calendar/gui/dialogs/comp-editor.c:1901
 #, c-format
 msgid "Appointment - %s"
 msgstr "Sündmus - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1996
-#: ../calendar/gui/dialogs/comp-editor.c:2039
+#: ../calendar/gui/dialogs/comp-editor.c:1862
+#: ../calendar/gui/dialogs/comp-editor.c:1905
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Omistatud ülesanne - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1998
-#: ../calendar/gui/dialogs/comp-editor.c:2041
+#: ../calendar/gui/dialogs/comp-editor.c:1864
+#: ../calendar/gui/dialogs/comp-editor.c:1907
 #, c-format
 msgid "Task - %s"
 msgstr "Ülesanne - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2001
-#: ../calendar/gui/dialogs/comp-editor.c:2044
+#: ../calendar/gui/dialogs/comp-editor.c:1867
+#: ../calendar/gui/dialogs/comp-editor.c:1910
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Päeviku sissekanne - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2012
-#: ../calendar/gui/dialogs/comp-editor.c:2054
+#: ../calendar/gui/dialogs/comp-editor.c:1878
+#: ../calendar/gui/dialogs/comp-editor.c:1920
 msgid "No summary"
 msgstr "Kokkuvõte puudub"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2668
-#: ../calendar/gui/dialogs/comp-editor.c:2701
-#: ../calendar/gui/dialogs/comp-editor.c:2725
+#: ../calendar/gui/dialogs/comp-editor.c:2528
+#: ../calendar/gui/dialogs/comp-editor.c:2561
+#: ../calendar/gui/dialogs/comp-editor.c:2585
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:2749
+#: ../calendar/gui/dialogs/comp-editor.c:2609
 msgid "Unable to use current version!"
 msgstr "Praegust versiooni pole võimalik kasutada!"
 
@@ -5965,178 +5713,208 @@ msgstr "Delegeerida:"
 msgid "Enter Delegate"
 msgstr "Sisesta Delegaat"
 
-#: ../calendar/gui/dialogs/event-editor.c:525
-msgid "Appoint_ment"
-msgstr "Sünd_mus"
+#: ../calendar/gui/dialogs/event-editor.c:141
+#: ../calendar/gui/print.c:2298
+msgid "Appointment"
+msgstr "Sündmus"
 
-#: ../calendar/gui/dialogs/event-editor.c:529
-#: ../ui/evolution-event-editor.xml.h:12
+#: ../calendar/gui/dialogs/event-editor.c:150
 msgid "Recurrence"
 msgstr "Kordumine"
 
-#: ../calendar/gui/dialogs/event-page.c:834
-#: ../calendar/gui/dialogs/task-page.c:443
-msgid "Or_ganizer"
-msgstr "Ko_rraldaja"
+#: ../calendar/gui/dialogs/event-editor.c:164
+#: ../calendar/gui/dialogs/event-editor.c:248
+#: ../calendar/gui/dialogs/event-editor.c:422
+msgid "Scheduling"
+msgstr "Plaanimine"
 
-#: ../calendar/gui/dialogs/event-page.c:872
-msgid "_Delegatees"
-msgstr "_Delegaadid"
+#: ../calendar/gui/dialogs/event-editor.c:174
+msgid "Delegatees"
+msgstr "Delegaadid"
+
+#: ../calendar/gui/dialogs/event-editor.c:178
+msgid "Attendees"
+msgstr "Osalejad"
 
-#: ../calendar/gui/dialogs/event-page.c:874
-msgid "Atte_ndees"
-msgstr "_Osalejad"
+#: ../calendar/gui/dialogs/event-editor.c:251
+#: ../calendar/gui/dialogs/event-editor.c:425
+msgid "Invitations"
+msgstr "Kutsed"
 
-#: ../calendar/gui/dialogs/event-page.c:1033
+#: ../calendar/gui/dialogs/event-page.c:731
 msgid "Event with no start date"
 msgstr "Sündmus ilma alguskuupäevata"
 
-#: ../calendar/gui/dialogs/event-page.c:1036
+#: ../calendar/gui/dialogs/event-page.c:734
 msgid "Event with no end date"
 msgstr "Sündmis ilma lõppkuupäevata"
 
-#: ../calendar/gui/dialogs/event-page.c:1201
-#: ../calendar/gui/dialogs/task-page.c:847
+#: ../calendar/gui/dialogs/event-page.c:900
+#: ../calendar/gui/dialogs/task-page.c:556
 msgid "Start date is wrong"
 msgstr "Alguskuupäev on vale"
 
-#: ../calendar/gui/dialogs/event-page.c:1211
+#: ../calendar/gui/dialogs/event-page.c:910
 msgid "End date is wrong"
 msgstr "Lõppemise päev on vale"
 
-#: ../calendar/gui/dialogs/event-page.c:1234
+#: ../calendar/gui/dialogs/event-page.c:933
 msgid "Start time is wrong"
 msgstr "Algusaeg on vale"
 
-#: ../calendar/gui/dialogs/event-page.c:1241
+#: ../calendar/gui/dialogs/event-page.c:940
 msgid "End time is wrong"
 msgstr "Lõppemise aeg on vale"
 
-#: ../calendar/gui/dialogs/event-page.c:1396
-#: ../calendar/gui/dialogs/meeting-page.c:463
-#: ../calendar/gui/dialogs/task-page.c:904
-msgid "The organizer selected no longer has an account."
-msgstr ""
-
-#: ../calendar/gui/dialogs/event-page.c:1402
-#: ../calendar/gui/dialogs/meeting-page.c:469
-#: ../calendar/gui/dialogs/task-page.c:910
-msgid "An organizer is required."
-msgstr "Korraldaja peab olema määrtud."
-
-#: ../calendar/gui/dialogs/event-page.c:1417
-#: ../calendar/gui/dialogs/meeting-page.c:484
-#: ../calendar/gui/dialogs/task-page.c:925
-msgid "At least one attendee is required."
-msgstr "Vähemalt üks osaleja peab olema märgitud."
-
-#: ../calendar/gui/dialogs/event-page.c:1734
-#: ../calendar/gui/dialogs/meeting-page.c:909
-#: ../calendar/gui/dialogs/task-page.c:1183
-msgid "_Add "
-msgstr "_Lisa "
-
-#: ../calendar/gui/dialogs/event-page.c:2421
+#: ../calendar/gui/dialogs/event-page.c:1686
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kalendrit '%s' pole võimalik avada."
 
-#: ../calendar/gui/dialogs/event-page.c:2661
+#: ../calendar/gui/dialogs/event-page.c:1892
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d päev enne sündmust"
 msgstr[1] "%d päeva enne sündmust"
 
-#: ../calendar/gui/dialogs/event-page.c:2669
+#: ../calendar/gui/dialogs/event-page.c:1900
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d tund enne sündmust"
 msgstr[1] "%d tundi enne sündmust"
 
-#: ../calendar/gui/dialogs/event-page.c:2677
+#: ../calendar/gui/dialogs/event-page.c:1908
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minut enne sündmust"
 msgstr[1] "%d minutit enne sündmust"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:1
+#: ../calendar/gui/dialogs/event-page.glade.h:2
+msgid "1 day before appointment"
+msgstr "1 päev enne sündmust"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:3
 msgid "1 hour before appointment"
 msgstr "1 tund enne sündmust"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "15 minutes before appointment"
 msgstr "15 minutit enne sündmust"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:3
-msgid "1day before appointment"
-msgstr "1 päev enne sündmust"
-
 #: ../calendar/gui/dialogs/event-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "Atte_ndees..."
-msgstr "_Osalejad..."
+msgid "<b>Basics</b>"
+msgstr "<b>Sisu</b>"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
-msgid "C_ustomize"
-msgstr "_Kohanda"
+#: ../calendar/gui/dialogs/task-page.glade.h:2
+msgid "<b>Date and Time</b>"
+msgstr "<b>Kuupäev ja kellaaeg</b>"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
-msgid "Ca_tegories..."
-msgstr "Kate_gooriad..."
+#: ../calendar/gui/dialogs/task-page.glade.h:3
+msgid "<b>Send Options</b>"
+msgstr "<b>Saatmise valikud</b>"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:8
-msgid "Cale_ndar:"
-msgstr "Kale_nder:"
+msgid "A_ll day event"
+msgstr "Kestab kogu _päeva"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ad_vanced send options"
+msgstr ""
 
 #: ../calendar/gui/dialogs/event-page.glade.h:10
-msgid "Event Description"
-msgstr "Sündmuse kirjeldus"
+msgid "C_ustomize..."
+msgstr "_Kohanda..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:11
-msgid "Locat_ion:"
-msgstr "_Asukoht:"
+#: ../calendar/gui/dialogs/task-page.glade.h:5
+msgid "Ca_tegories..."
+msgstr "Kate_gooriad..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:12
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "Or_ganizer:"
-msgstr "Ko_rraldaja:"
+msgid "Cale_ndar:"
+msgstr "Kale_nder:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:13
-#: ../calendar/gui/dialogs/task-page.glade.h:6
-msgid "Su_mmary:"
-msgstr "K_okkuvõte:"
+#: ../calendar/gui/dialogs/task-page.glade.h:7
+msgid "Classi_fication:"
+msgstr "_Liigitamine"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../calendar/gui/e-cal-list-view.c:254
+#: ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:360
+msgid "Confidential"
+msgstr "Salajane"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:15
-msgid "_Description:"
-msgstr "_Kirjeldus:"
+msgid "Event Description"
+msgstr "Sündmuse kirjeldus"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:16
-msgid "_Set alarm\t"
-msgstr "_Määra alarm\t"
+msgid "Locat_ion:"
+msgstr "_Asukoht:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:17
-msgid "_Time:"
-msgstr "_Aeg:"
+#: ../calendar/gui/dialogs/task-page.glade.h:10
+#: ../calendar/gui/e-cal-list-view.c:253
+#: ../calendar/gui/e-cal-model.c:323
+#: ../calendar/gui/e-calendar-table.c:359
+msgid "Private"
+msgstr "Isiklik"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
-msgid "for"
-msgstr "kuni"
+#: ../calendar/gui/dialogs/task-page.glade.h:11
+#: ../calendar/gui/e-cal-list-view.c:252
+#: ../calendar/gui/e-cal-model.c:314
+#: ../calendar/gui/e-cal-model.c:321
+#: ../calendar/gui/e-calendar-table.c:358
+msgid "Public"
+msgstr "Avalik"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:19
+msgid "Show time as _busy"
+msgstr "Näita aega kui _hõivatut"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:20
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "until"
-msgstr "kuupäevani"
+#: ../calendar/gui/dialogs/task-page.glade.h:13
+msgid "Su_mmary:"
+msgstr "K_okkuvõte:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:21
+msgid "This appointment has customized alarms"
+msgstr "Sellel sündmusel on kohandatud alarmid"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:22
+msgid "_Alarm"
+msgstr "_Alarm"
 
-#: ../calendar/gui/dialogs/meeting-page.c:305
+#: ../calendar/gui/dialogs/event-page.glade.h:23
+msgid "_Description:"
+msgstr "_Kirjeldus:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:24
+#: ../calendar/gui/e-meeting-time-sel.c:642
+msgid "_End time:"
+msgstr "_Lõpp:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:25
+#: ../calendar/gui/e-meeting-time-sel.c:615
+msgid "_Start time:"
+msgstr "_Algus:"
+
+#: ../calendar/gui/dialogs/meeting-page.c:303
 msgid "<b>Dele_gatees</b>"
 msgstr "<b>Dele_gaadid</b>"
 
-#: ../calendar/gui/dialogs/meeting-page.c:309
+#: ../calendar/gui/dialogs/meeting-page.c:307
 msgid "<b>From:</b>"
 msgstr "<b>Saatja:</b>"
 
@@ -6145,24 +5923,47 @@ msgstr "<b>Saatja:</b>"
 #. When "None" is selected we want the field to be cleared.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../calendar/gui/dialogs/meeting-page.c:315
+#: ../calendar/gui/dialogs/meeting-page.c:313
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:653
-#: ../calendar/gui/e-itip-control.c:1103 ../composer/e-msg-composer.c:2246
-#: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
-#: ../mail/em-account-editor.c:1348 ../mail/em-account-prefs.c:464
-#: ../mail/em-folder-view.c:1064 ../mail/em-junk-hook.c:78
+#: ../calendar/gui/e-itip-control.c:1106
+#: ../composer/e-msg-composer.c:2122
+#: ../filter/filter-rule.c:881
+#: ../mail/em-account-editor.c:683
+#: ../mail/em-account-editor.c:1348
+#: ../mail/em-account-prefs.c:464
+#: ../mail/em-folder-view.c:1064
+#: ../mail/em-junk-hook.c:78
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:7
 #: ../plugins/itip-formatter/itip-formatter.c:1627
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
-#: ../widgets/misc/e-cell-date-edit.c:248 ../widgets/misc/e-dateedit.c:467
-#: ../widgets/misc/e-dateedit.c:1506 ../widgets/misc/e-dateedit.c:1675
+#: ../widgets/misc/e-cell-date-edit.c:248
+#: ../widgets/misc/e-dateedit.c:465
+#: ../widgets/misc/e-dateedit.c:1504
+#: ../widgets/misc/e-dateedit.c:1673
 msgid "None"
 msgstr "Puudub"
 
+#: ../calendar/gui/dialogs/meeting-page.c:461
+msgid "The organizer selected no longer has an account."
+msgstr ""
+
+#: ../calendar/gui/dialogs/meeting-page.c:467
+msgid "An organizer is required."
+msgstr "Korraldaja peab olema määrtud."
+
+#: ../calendar/gui/dialogs/meeting-page.c:482
+msgid "At least one attendee is required."
+msgstr "Vähemalt üks osaleja peab olema märgitud."
+
+#: ../calendar/gui/dialogs/meeting-page.c:884
+msgid "_Delegate To..."
+msgstr "_Delegeerida..."
+
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
+#: ../calendar/gui/e-meeting-list-view.c:358
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Osaleja"
@@ -6198,15 +5999,17 @@ msgid "Member"
 msgstr "Liige"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:399
+#: ../calendar/gui/e-meeting-list-view.c:386
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
+#: ../calendar/gui/dialogs/task-editor.c:147
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:410
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
+#: ../calendar/gui/e-meeting-list-view.c:394
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../mail/em-filter-i18n.h:63
 #: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Olek"
@@ -6220,8 +6023,13 @@ msgid "C_hange Organizer"
 msgstr "_Muuda korraldajat"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Co_ntacts..."
-msgstr "Ko_ntaktid..."
+#: ../calendar/gui/e-meeting-time-sel.c:428
+msgid "Con_tacts..."
+msgstr "_Kontaktid..."
+
+#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+msgid "Or_ganizer:"
+msgstr "Ko_rraldaja:"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "Organizer"
@@ -6232,53 +6040,6 @@ msgstr "Korraldaja"
 msgid "Organizer:"
 msgstr "Korraldaja:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:130 ../calendar/gui/print.c:2311
-#, fuzzy
-msgid "Memo"
-msgstr "E"
-
-#: ../calendar/gui/dialogs/memo-page.c:489
-#, fuzzy, c-format
-msgid "Unable to open memos in '%s'."
-msgstr "Ülesandeid pole võimalik '%s'-s avada."
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:2
-#, fuzzy
-msgid "<span weight=\"bold\">Basics</span>"
-msgstr "<span weight=\"bold\">Olek</span>"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-msgid "Classi_fication:"
-msgstr "_Liigitamine"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
-#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:364
-msgid "Confidential"
-msgstr "Salajane"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:363
-msgid "Private"
-msgstr "Isiklik"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:362
-msgid "Public"
-msgstr "Avalik"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:8
-#: ../calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Group:"
-msgstr "_Grupp:"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:9
-#, fuzzy
-msgid "_Memo Content:"
-msgstr "Uus kontakt:"
-
 #: ../calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Kalendri valikud</b>"
@@ -6328,8 +6089,7 @@ msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
 #: ../calendar/gui/dialogs/recur-comp.c:62
-msgid ""
-"You are modifying a recurring journal entry, what would you like to modify?"
+msgid "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
 #: ../calendar/gui/dialogs/recur-comp.c:90
@@ -6348,51 +6108,51 @@ msgstr "See ja tulevad juhtumid"
 msgid "All Instances"
 msgstr "Kõik juhtumid"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:497
+#: ../calendar/gui/dialogs/recurrence-page.c:496
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "See sündmus sisaldab ressursse, mida Evolution ei saa muuta."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:818
+#: ../calendar/gui/dialogs/recurrence-page.c:817
 msgid "Recurrence date is invalid"
 msgstr "Kordumiskuupäev on vigane"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:929
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "järgnevatel nädalapäevadel:"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:989
+#: ../calendar/gui/dialogs/recurrence-page.c:988
 msgid "first"
 msgstr "esimene"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:990
+#: ../calendar/gui/dialogs/recurrence-page.c:989
 msgid "second"
 msgstr "teine"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:991
+#: ../calendar/gui/dialogs/recurrence-page.c:990
 msgid "third"
 msgstr "kolmas"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#: ../calendar/gui/dialogs/recurrence-page.c:991
 msgid "fourth"
 msgstr "neljas"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:993
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "last"
 msgstr "viimane"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1016
+#: ../calendar/gui/dialogs/recurrence-page.c:1015
 msgid "Other Date"
 msgstr "Muu kuupäev"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
 msgid "day"
 msgstr "päev"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1181
+#: ../calendar/gui/dialogs/recurrence-page.c:1180
 msgid "on the"
 msgstr "iga"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1370
+#: ../calendar/gui/dialogs/recurrence-page.c:1369
 msgid "occurrences"
 msgstr "kord(a)"
 
@@ -6421,6 +6181,10 @@ msgstr "Vahemikuga"
 msgid "This appointment rec_urs"
 msgstr "See sündmus _kordub"
 
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "for"
+msgstr "kuni"
+
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "igavesti"
@@ -6429,6 +6193,10 @@ msgstr "igavesti"
 msgid "month(s)"
 msgstr "kuu(d)"
 
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid "until"
+msgstr "kuupäevani"
+
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "nädal(at)"
@@ -6460,15 +6228,19 @@ msgstr "<span weight=\"bold\">Olek</span>"
 #: ../calendar/gui/e-cal-component-preview.c:229
 #: ../calendar/gui/e-cal-model-tasks.c:346
 #: ../calendar/gui/e-cal-model-tasks.c:659
-#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/e-itip-control.c:895
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../calendar/gui/print.c:2372 ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/e-calendar-table.c:455
+#: ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-meeting-store.c:196
+#: ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/print.c:2361
+#: ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Lõpetatud"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-calendar-table.c:384 ../mail/message-list.c:1018
+#: ../calendar/gui/e-calendar-table.c:380
+#: ../mail/message-list.c:1008
 msgid "High"
 msgstr "Kõrge"
 
@@ -6477,20 +6249,23 @@ msgstr "Kõrge"
 #: ../calendar/gui/e-cal-model-tasks.c:344
 #: ../calendar/gui/e-cal-model-tasks.c:657
 #: ../calendar/gui/e-cal-model-tasks.c:732
-#: ../calendar/gui/e-calendar-table.c:458 ../calendar/gui/print.c:2369
+#: ../calendar/gui/e-calendar-table.c:454
+#: ../calendar/gui/print.c:2358
 msgid "In Progress"
 msgstr "Töös"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1016
+#: ../calendar/gui/e-calendar-table.c:382
+#: ../mail/message-list.c:1006
 msgid "Low"
 msgstr "Madal"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model.c:920 ../calendar/gui/e-calendar-table.c:385
-#: ../mail/message-list.c:1017
+#: ../calendar/gui/e-cal-model.c:919
+#: ../calendar/gui/e-calendar-table.c:381
+#: ../mail/message-list.c:1007
 msgid "Normal"
 msgstr "Keskmine"
 
@@ -6498,7 +6273,8 @@ msgstr "Keskmine"
 #: ../calendar/gui/e-cal-component-preview.c:236
 #: ../calendar/gui/e-cal-model-tasks.c:342
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:457 ../calendar/gui/print.c:2366
+#: ../calendar/gui/e-calendar-table.c:453
+#: ../calendar/gui/print.c:2355
 msgid "Not Started"
 msgstr "Pole alanud"
 
@@ -6507,77 +6283,67 @@ msgid "P_ercent complete:"
 msgstr "Täitmis_protsent"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:11
-msgid "Stat_us:"
-msgstr "_Olek:"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:383
 msgid "Undefined"
 msgstr "Määramata"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "_Date completed:"
 msgstr "_Lõpetamise kuupäev:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:14
+#: ../calendar/gui/dialogs/task-details-page.glade.h:13
 #: ../widgets/misc/e-send-options.glade.h:31
 msgid "_Priority:"
 msgstr "Tä_htsus:"
 
+#: ../calendar/gui/dialogs/task-details-page.glade.h:14
+msgid "_Status:"
+msgstr "_Olek:"
+
 #: ../calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Web Page:"
 msgstr "_Koduleht:"
 
-#: ../calendar/gui/dialogs/task-editor.c:419
-#: ../calendar/gui/tasks-component.c:1172
-msgid "_Task"
-msgstr "_Ülesanne"
-
-#: ../calendar/gui/dialogs/task-editor.c:423
-#, fuzzy
-msgid "Task Details"
-msgstr "Üksikasjad"
+#: ../calendar/gui/dialogs/task-editor.c:138
+#: ../calendar/gui/print.c:2300
+msgid "Task"
+msgstr "Ülesanne"
 
-#: ../calendar/gui/dialogs/task-page.c:436
-#, fuzzy
-msgid "_Group"
-msgstr "_Grupp:"
+#: ../calendar/gui/dialogs/task-editor.c:162
+#: ../calendar/gui/dialogs/task-editor.c:224
+#: ../calendar/gui/dialogs/task-editor.c:378
+msgid "Assignment"
+msgstr "Täitjad"
 
-#: ../calendar/gui/dialogs/task-page.c:820
+#: ../calendar/gui/dialogs/task-page.c:529
 msgid "Due date is wrong"
 msgstr "Tähtaja kuupäev on vale"
 
-#: ../calendar/gui/dialogs/task-page.c:1613
+#: ../calendar/gui/dialogs/task-page.c:873
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ülesandeid pole võimalik '%s'-s avada."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:2
-msgid "Categor_ies..."
-msgstr "Kate_gooriad..."
-
-#: ../calendar/gui/dialogs/task-page.glade.h:3
+#: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "D_escription:"
 msgstr "_Kirjeldus:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:4
-#, fuzzy
-msgid "Or_ganiser:"
-msgstr "Ko_rraldaja:"
-
-#: ../calendar/gui/dialogs/task-page.glade.h:5
+#: ../calendar/gui/dialogs/task-page.glade.h:12
 msgid "Sta_rt date:"
 msgstr "_Algusaeg:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:7
-#, fuzzy
-msgid "Time zone:"
-msgstr "Aja_vöönd:"
+#: ../calendar/gui/dialogs/task-page.glade.h:14
+msgid "Task Description"
+msgstr "Ülesande kirjeldus"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../calendar/gui/dialogs/task-page.glade.h:15
 msgid "_Due date:"
 msgstr "_Tähtaeg:"
 
+#: ../calendar/gui/dialogs/task-page.glade.h:16
+msgid "_Group:"
+msgstr "_Grupp:"
+
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Free/Busy C_alendars</b>"
 msgstr "<b>Vaba/hõivatud kal_endrid</b>"
@@ -6703,27 +6469,19 @@ msgstr "%s @ %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s tundmatule trigeri tüübile"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2704
+#: ../calendar/gui/e-cal-component-preview.c:70
+#: ../mail/em-folder-view.c:2703
 #, c-format
 msgid "Click to open %s"
 msgstr "Kliki, et avada aadressi %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:199
-msgid "Memo:"
-msgstr ""
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:232
-#: ../calendar/gui/e-cal-component-preview.c:299
-msgid "Web Page:"
-msgstr "Veebileht:"
-
-#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:796
+#: ../calendar/gui/e-cal-component-preview.c:155
+#: ../filter/filter-rule.c:796
 msgid "Untitled"
 msgstr "Nimetu"
 
 #: ../calendar/gui/e-cal-component-preview.c:186
-#: ../calendar/gui/e-itip-control.c:1107
+#: ../calendar/gui/e-itip-control.c:1110
 #: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kokkuvõte:"
@@ -6740,8 +6498,8 @@ msgstr "Tähtaeg:"
 #. write status
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:222
-#: ../calendar/gui/e-itip-control.c:1131
-#: ../plugins/exchange-operations/exchange-account-setup.c:265
+#: ../calendar/gui/e-itip-control.c:1134
+#: ../plugins/exchange-operations/exchange-account-setup.c:263
 #: ../plugins/itip-formatter/itip-view.c:909
 msgid "Status:"
 msgstr "Olek:"
@@ -6750,6 +6508,10 @@ msgstr "Olek:"
 msgid "Priority:"
 msgstr "Tähtsus:"
 
+#: ../calendar/gui/e-cal-component-preview.c:299
+msgid "Web Page:"
+msgstr "Veebileht:"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Lõppemise kuupäev"
@@ -6760,19 +6522,19 @@ msgstr "Alguskuupäev"
 
 #: ../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:16
+#: ../mail/mail-dialogs.glade.h:16
 #: ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "Kokkuvõte"
 
 #: ../calendar/gui/e-cal-model-calendar.c:180
-#: ../calendar/gui/e-calendar-table.c:436
+#: ../calendar/gui/e-calendar-table.c:432
 msgid "Free"
 msgstr "Vaba"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:437
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-calendar-table.c:433
+#: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Busy"
 msgstr "Hõivatud"
 
@@ -6786,15 +6548,18 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model-tasks.c:1018
+#: ../calendar/gui/e-cal-model.c:925
 #: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:168 ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-meeting-store.c:178
 #: ../calendar/gui/e-meeting-store.c:808
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Jah"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model-tasks.c:1018
+#: ../calendar/gui/e-cal-model.c:925
 #: ../calendar/gui/e-meeting-list-view.c:193
 #: ../calendar/gui/e-meeting-store.c:180
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
@@ -6802,181 +6567,173 @@ msgid "No"
 msgstr "Ei"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-model.c:330
-#: ../calendar/gui/e-cal-popup.c:106 ../calendar/gui/e-cal-popup.c:121
-#: ../calendar/gui/e-cal-popup.c:165 ../calendar/gui/e-itip-control.c:1148
-#: ../calendar/gui/e-itip-control.c:1289
+#: ../calendar/gui/e-cal-model.c:327
+#: ../calendar/gui/e-cal-model.c:330
+#: ../calendar/gui/e-itip-control.c:1151
+#: ../calendar/gui/e-itip-control.c:1292
 #: ../calendar/gui/e-meeting-list-view.c:168
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1283
+#: ../calendar/gui/e-meeting-store.c:124
+#: ../calendar/gui/e-meeting-store.c:159
+#: ../calendar/gui/e-meeting-store.c:224
+#: ../mail/em-utils.c:1244
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1652
 #: ../plugins/plugin-manager/plugin-manager.c:72
-#: ../widgets/misc/e-attachment-bar.c:690
+#: ../widgets/misc/e-attachment-bar.c:659
 #: ../widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: ../calendar/gui/e-cal-model.c:922
+#: ../calendar/gui/e-cal-model.c:921
 msgid "Recurring"
 msgstr "Korduv"
 
-#: ../calendar/gui/e-cal-model.c:924
+#: ../calendar/gui/e-cal-model.c:923
 msgid "Assigned"
 msgstr "Määratud"
 
-#: ../calendar/gui/e-cal-popup.c:171 ../mail/em-popup.c:411
-msgid "Save As..."
-msgstr "Salvestamine kui..."
-
-#: ../calendar/gui/e-cal-popup.c:187 ../mail/em-format-html-display.c:1812
-msgid "Select folder to save selected attachments..."
-msgstr "Valitud manuste salvestamiseks kataloogi valimine..."
-
-#: ../calendar/gui/e-cal-popup.c:216 ../mail/em-popup.c:436
-#, c-format
-msgid "untitled_image.%s"
-msgstr "nimetu_pilt.%s"
-
-#: ../calendar/gui/e-cal-popup.c:270 ../calendar/gui/e-calendar-table.c:1169
-#: ../calendar/gui/e-calendar-view.c:1550 ../calendar/gui/e-memo-table.c:847
-#: ../mail/em-folder-view.c:1045 ../mail/em-popup.c:553 ../mail/em-popup.c:564
-msgid "_Save As..."
-msgstr "_Salvesta kui..."
-
-#: ../calendar/gui/e-cal-popup.c:271 ../mail/em-popup.c:554
-#: ../mail/em-popup.c:565
-msgid "Set as _Background"
-msgstr "Säti _taustapildiks"
-
-#: ../calendar/gui/e-cal-popup.c:272
-#, fuzzy
-msgid "_Save Selected"
-msgstr "Valitu salvestamine"
-
-#: ../calendar/gui/e-cal-popup.c:394 ../mail/em-popup.c:774
-#, c-format
-msgid "Open in %s..."
-msgstr "Ava programmiga %s..."
-
-#: ../calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:402
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:407
+#: ../calendar/gui/e-calendar-table.c:403
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:404
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:405
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:406
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:407
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:518
+#: ../calendar/gui/e-calendar-table.c:514
 msgid "Task Table"
 msgstr "Ülesannete tabel"
 
-#: ../calendar/gui/e-calendar-table.c:696
-#: ../calendar/gui/e-calendar-view.c:671 ../calendar/gui/e-memo-table.c:426
+#: ../calendar/gui/e-calendar-table.c:692
+#: ../calendar/gui/e-calendar-view.c:661
 msgid "Deleting selected objects"
 msgstr "Kustutan valitud objektid"
 
-#: ../calendar/gui/e-calendar-table.c:875
-#: ../calendar/gui/e-calendar-view.c:799 ../calendar/gui/e-memo-table.c:603
+#: ../calendar/gui/e-calendar-table.c:871
+#: ../calendar/gui/e-calendar-view.c:789
 msgid "Updating objects"
 msgstr "Objektide uuendamine"
 
-#: ../calendar/gui/e-calendar-table.c:1025
-#: ../calendar/gui/e-calendar-view.c:1126 ../calendar/gui/e-memo-table.c:735
-#: ../composer/e-msg-composer.c:1341
+#: ../calendar/gui/e-calendar-table.c:1012
+#: ../calendar/gui/e-calendar-view.c:1105
+#: ../composer/e-msg-composer.c:1243
 msgid "Save as..."
 msgstr "Salvestamine kui..."
 
-#: ../calendar/gui/e-calendar-table.c:1168 ../calendar/gui/e-memo-table.c:846
+#: ../calendar/gui/e-calendar-table.c:1155
 msgid "Open _Web Page"
 msgstr "_Ava veebileht"
 
-#: ../calendar/gui/e-calendar-table.c:1170
+#: ../calendar/gui/e-calendar-table.c:1156
+#: ../calendar/gui/e-calendar-view.c:1529
+#: ../mail/em-folder-view.c:1045
+#: ../mail/em-popup.c:541
+#: ../mail/em-popup.c:552
+msgid "_Save As..."
+msgstr "_Salvesta kui..."
+
+#: ../calendar/gui/e-calendar-table.c:1157
+#: ../calendar/gui/e-calendar-view.c:1509
 #: ../calendar/gui/e-calendar-view.c:1530
-#: ../calendar/gui/e-calendar-view.c:1551 ../calendar/gui/e-memo-table.c:848
 #: ../mail/em-folder-view.c:1046
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:120 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
+#: ../ui/evolution-addressbook.xml.h:40
+#: ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-tasks.xml.h:27
 msgid "_Print..."
 msgstr "_Trüki..."
 
-#: ../calendar/gui/e-calendar-table.c:1174
-#: ../calendar/gui/e-calendar-view.c:1555 ../calendar/gui/e-memo-table.c:852
-#: ../ui/evolution-addressbook.xml.h:1 ../ui/evolution-calendar.xml.h:1
-#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-table.c:1161
+#: ../calendar/gui/e-calendar-view.c:1534
+#: ../ui/evolution-addressbook.xml.h:1
+#: ../ui/evolution-calendar.xml.h:1
+#: ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Lõika"
 
-#: ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:1533
-#: ../calendar/gui/e-calendar-view.c:1557 ../calendar/gui/e-memo-table.c:854
-#: ../ui/evolution-addressbook.xml.h:39 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-composer-entries.xml.h:9 ../ui/evolution-editor.xml.h:22
-#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:1512
+#: ../calendar/gui/e-calendar-view.c:1536
+#: ../ui/evolution-addressbook.xml.h:38
+#: ../ui/evolution-calendar.xml.h:43
+#: ../ui/evolution-composer-entries.xml.h:9
+#: ../ui/evolution-tasks.xml.h:26
 msgid "_Paste"
 msgstr "_Aseta"
 
-#: ../calendar/gui/e-calendar-table.c:1180 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1167
+#: ../ui/evolution-tasks.xml.h:20
 msgid "_Assign Task"
 msgstr "_Määra ülesanne"
 
-#: ../calendar/gui/e-calendar-table.c:1181 ../calendar/gui/e-memo-table.c:858
-#: ../ui/evolution-tasks.xml.h:26
+#: ../calendar/gui/e-calendar-table.c:1168
+#: ../ui/evolution-tasks.xml.h:24
 msgid "_Forward as iCalendar"
 msgstr "_Edasta iKalendrina"
 
-#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-table.c:1169
 msgid "_Mark as Complete"
 msgstr "_Märgi lõpetatuks"
 
-#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-table.c:1170
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Märgi valitud ülesanne lõpetatuks"
 
-#: ../calendar/gui/e-calendar-table.c:1188
+#. FIXME: need to disable for undeletable folders
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1548
+#: ../mail/em-folder-tree.c:2043
+#: ../mail/em-folder-view.c:1049
+#: ../ui/evolution-addressbook.xml.h:33
+#: ../ui/evolution-calendar.xml.h:40
+#: ../ui/evolution-mail-list.xml.h:27
+#: ../ui/evolution-tasks.xml.h:22
+msgid "_Delete"
+msgstr "_Kustuta"
+
+#: ../calendar/gui/e-calendar-table.c:1175
 msgid "_Delete Selected Tasks"
 msgstr "_Kustuta valitud ülesanded"
 
-#: ../calendar/gui/e-calendar-table.c:1421
+#: ../calendar/gui/e-calendar-table.c:1326
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Ülesande lisamiseks vajuta siia"
@@ -6986,7 +6743,8 @@ msgstr "Ülesande lisamiseks vajuta siia"
 msgid "% Complete"
 msgstr "(%) valmis"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:617
+#: ../calendar/gui/e-calendar-table.etspec.h:5
+#: ../mail/mail-send-recv.c:617
 msgid "Complete"
 msgstr "Lõpetatud"
 
@@ -7011,78 +6769,75 @@ msgstr "Alguskuupäev"
 msgid "Task sort"
 msgstr "Ülesannete sortimine"
 
-#: ../calendar/gui/e-calendar-view.c:1252
+#: ../calendar/gui/e-calendar-view.c:1231
 msgid "Moving items"
 msgstr "Kirjete tõstmine"
 
-#: ../calendar/gui/e-calendar-view.c:1254
+#: ../calendar/gui/e-calendar-view.c:1233
 msgid "Copying items"
 msgstr "Kirjete kopeerimine"
 
-#: ../calendar/gui/e-calendar-view.c:1524
+#: ../calendar/gui/e-calendar-view.c:1503
 msgid "New _Appointment..."
 msgstr "Uus _sündmus..."
 
-#: ../calendar/gui/e-calendar-view.c:1525
+#: ../calendar/gui/e-calendar-view.c:1504
 msgid "New All Day _Event"
 msgstr "Uus kogu päeva _sündmus"
 
-#: ../calendar/gui/e-calendar-view.c:1526
-msgid "New _Meeting"
-msgstr "Uus _koosolek"
-
-#: ../calendar/gui/e-calendar-view.c:1527
-msgid "New _Task"
-msgstr "Uus ü_lesanne"
+#: ../calendar/gui/e-calendar-view.c:1506
+msgid "New Task"
+msgstr "Uus ülesanne"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1537
-#: ../widgets/menus/gal-view-menus.c:291
-msgid "_Current View"
-msgstr "_Käesolev vaade"
+#: ../calendar/gui/e-calendar-view.c:1516
+msgid "Current View"
+msgstr "Käesolev vaade"
 
-#: ../calendar/gui/e-calendar-view.c:1539
-msgid "Select T_oday"
+#: ../calendar/gui/e-calendar-view.c:1518
+#: ../ui/evolution-calendar.xml.h:26
+msgid "Select _Today"
 msgstr "Vali _tänane kuupäev"
 
-#: ../calendar/gui/e-calendar-view.c:1540
+#: ../calendar/gui/e-calendar-view.c:1519
 msgid "_Select Date..."
 msgstr "_Vali kuupäev..."
 
 #. TODO: Why is this in a context menu when it applies globally?
-#: ../calendar/gui/e-calendar-view.c:1545 ../ui/evolution-calendar.xml.h:45
+#: ../calendar/gui/e-calendar-view.c:1524
+#: ../ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Avalikusta vaba/hõivatud teave"
 
-#: ../calendar/gui/e-calendar-view.c:1561
+#: ../calendar/gui/e-calendar-view.c:1540
 msgid "Cop_y to Calendar..."
 msgstr "Kop_eeri kalendrisse..."
 
-#: ../calendar/gui/e-calendar-view.c:1562
+#: ../calendar/gui/e-calendar-view.c:1541
 msgid "Mo_ve to Calendar..."
 msgstr "_Tõsta kalendrisse..."
 
-#: ../calendar/gui/e-calendar-view.c:1563
+#: ../calendar/gui/e-calendar-view.c:1542
 msgid "_Delegate Meeting..."
 msgstr "_Delegeeri koosolek..."
 
-#: ../calendar/gui/e-calendar-view.c:1564
+#: ../calendar/gui/e-calendar-view.c:1543
 msgid "_Schedule Meeting..."
 msgstr "A_jasta koosolek..."
 
-#: ../calendar/gui/e-calendar-view.c:1565
+#: ../calendar/gui/e-calendar-view.c:1544
 msgid "_Forward as iCalendar..."
 msgstr "Edasta i_Kalendrina"
 
-#: ../calendar/gui/e-calendar-view.c:1570
+#: ../calendar/gui/e-calendar-view.c:1549
 msgid "Make this Occurrence _Movable"
 msgstr "Muuda seekordne sündmus _liigutatavaks"
 
-#: ../calendar/gui/e-calendar-view.c:1571
+#: ../calendar/gui/e-calendar-view.c:1550
 msgid "Delete this _Occurrence"
 msgstr "K_ustuta seekordne sündmus"
 
-#: ../calendar/gui/e-calendar-view.c:1572
+#: ../calendar/gui/e-calendar-view.c:1551
 msgid "Delete _All Occurrences"
 msgstr "Ku_stuta kõik sündmuse kordused"
 
@@ -7091,7 +6846,8 @@ msgstr "Ku_stuta kõik sündmuse kordused"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../calendar/gui/e-cell-date-edit-text.c:115 ../e-util/e-time-utils.c:180
+#: ../calendar/gui/e-cell-date-edit-text.c:115
+#: ../e-util/e-time-utils.c:180
 #: ../e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a, %d.%m.%Y %H:%M:%S"
@@ -7101,7 +6857,8 @@ msgstr "%a, %d.%m.%Y %H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../calendar/gui/e-cell-date-edit-text.c:118 ../e-util/e-time-utils.c:175
+#: ../calendar/gui/e-cell-date-edit-text.c:118
+#: ../e-util/e-time-utils.c:175
 #: ../e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
@@ -7128,111 +6885,118 @@ msgstr "%02i-minutiline jaotamine"
 #. 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:715 ../calendar/gui/e-day-view.c:1493
-#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1526
+#: ../calendar/gui/e-day-view-top-item.c:715
+#: ../calendar/gui/e-day-view.c:1493
+#: ../calendar/gui/e-week-view-main-item.c:312
+#: ../calendar/gui/print.c:1517
 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:748 ../calendar/gui/e-week-view.c:512
+#: ../calendar/gui/e-day-view.c:748
+#: ../calendar/gui/e-week-view.c:512
 #: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "el"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:751 ../calendar/gui/e-week-view.c:515
+#: ../calendar/gui/e-day-view.c:751
+#: ../calendar/gui/e-week-view.c:515
 #: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "pl"
 
-#: ../calendar/gui/e-itip-control.c:760
+#: ../calendar/gui/e-itip-control.c:763
 msgid "Yes. (Complex Recurrence)"
 msgstr "Jah. (Lihtne kordumine)"
 
-#: ../calendar/gui/e-itip-control.c:771
+#: ../calendar/gui/e-itip-control.c:774
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Iga päev"
 msgstr[1] "Iga %d päeva järel"
 
-#: ../calendar/gui/e-itip-control.c:776
+#: ../calendar/gui/e-itip-control.c:779
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Iga nädal"
 msgstr[1] "Iga %d nädala järel"
 
-#: ../calendar/gui/e-itip-control.c:778
+#: ../calendar/gui/e-itip-control.c:781
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../calendar/gui/e-itip-control.c:786
+#: ../calendar/gui/e-itip-control.c:789
 msgid " and "
 msgstr " ja "
 
-#: ../calendar/gui/e-itip-control.c:793
+#: ../calendar/gui/e-itip-control.c:796
 #, c-format
 msgid "The %s day of "
 msgstr "%s päev"
 
-#: ../calendar/gui/e-itip-control.c:806
+#: ../calendar/gui/e-itip-control.c:809
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:813
+#: ../calendar/gui/e-itip-control.c:816
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "iga kuu"
 msgstr[1] "iga %d kuu"
 
-#: ../calendar/gui/e-itip-control.c:817
+#: ../calendar/gui/e-itip-control.c:820
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Iga aasta"
 msgstr[1] "Iga %d aasta"
 
-#: ../calendar/gui/e-itip-control.c:828
+#: ../calendar/gui/e-itip-control.c:831
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] "kokku %d kord"
 msgstr[1] "kokku %d korda"
 
-#: ../calendar/gui/e-itip-control.c:837
+#: ../calendar/gui/e-itip-control.c:840
 msgid ", ending on "
 msgstr ", lõpeb"
 
-#: ../calendar/gui/e-itip-control.c:861
+#: ../calendar/gui/e-itip-control.c:864
 msgid "Starts"
 msgstr "Algab"
 
-#: ../calendar/gui/e-itip-control.c:874
+#: ../calendar/gui/e-itip-control.c:877
 msgid "Ends"
 msgstr "Lõpeb"
 
-#: ../calendar/gui/e-itip-control.c:908
+#: ../calendar/gui/e-itip-control.c:911
 #: ../plugins/save-calendar/csv-format.c:395
 msgid "Due"
 msgstr "Tähtaeg"
 
-#: ../calendar/gui/e-itip-control.c:948 ../calendar/gui/e-itip-control.c:1005
+#: ../calendar/gui/e-itip-control.c:951
+#: ../calendar/gui/e-itip-control.c:1008
 msgid "iCalendar Information"
 msgstr "iKalendri teave"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:965
+#: ../calendar/gui/e-itip-control.c:968
 msgid "iCalendar Error"
 msgstr "iKalendri viga"
 
-#: ../calendar/gui/e-itip-control.c:1037 ../calendar/gui/e-itip-control.c:1053
-#: ../calendar/gui/e-itip-control.c:1064 ../calendar/gui/e-itip-control.c:1081
+#: ../calendar/gui/e-itip-control.c:1040
+#: ../calendar/gui/e-itip-control.c:1056
+#: ../calendar/gui/e-itip-control.c:1067
+#: ../calendar/gui/e-itip-control.c:1084
 #: ../plugins/itip-formatter/itip-view.c:338
 #: ../plugins/itip-formatter/itip-view.c:339
 #: ../plugins/itip-formatter/itip-view.c:406
@@ -7241,301 +7005,305 @@ msgid "An unknown person"
 msgstr "Tundmatu isik"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1088
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
+#: ../calendar/gui/e-itip-control.c:1091
+msgid "<br> Please review the following information, and then select an action from the menu below."
 msgstr ""
 "<br> Palun vaata järgnev info üle ja vali allpool olevast menüüst  sobilik "
 "tegevus."
 
-#: ../calendar/gui/e-itip-control.c:1136
+#: ../calendar/gui/e-itip-control.c:1139
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:546
+#: ../calendar/gui/e-meeting-store.c:188
+#: ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/itip-utils.c:548
 #: ../plugins/itip-formatter/itip-formatter.c:1640
 msgid "Accepted"
 msgstr "Nõusolek antud"
 
-#: ../calendar/gui/e-itip-control.c:1140 ../calendar/gui/itip-utils.c:549
+#: ../calendar/gui/e-itip-control.c:1143
+#: ../calendar/gui/itip-utils.c:551
 #: ../plugins/itip-formatter/itip-formatter.c:1643
 msgid "Tentatively Accepted"
 msgstr "Proovinõusolek antud"
 
-#: ../calendar/gui/e-itip-control.c:1144
+#: ../calendar/gui/e-itip-control.c:1147
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/itip-utils.c:552 ../calendar/gui/itip-utils.c:581
+#: ../calendar/gui/e-meeting-store.c:190
+#: ../calendar/gui/e-meeting-store.c:213
+#: ../calendar/gui/itip-utils.c:554
+#: ../calendar/gui/itip-utils.c:583
 #: ../plugins/itip-formatter/itip-formatter.c:1646
 msgid "Declined"
 msgstr "Tagasi lükatud"
 
-#: ../calendar/gui/e-itip-control.c:1228
-msgid ""
-"The meeting has been cancelled, however it could not be found in your "
-"calendars"
+#: ../calendar/gui/e-itip-control.c:1231
+msgid "The meeting has been cancelled, however it could not be found in your calendars"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1230
-msgid ""
-"The task has been cancelled, however it could not be found in your task lists"
+#: ../calendar/gui/e-itip-control.c:1233
+msgid "The task has been cancelled, however it could not be found in your task lists"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1309
+#: ../calendar/gui/e-itip-control.c:1312
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> avalikustas koosoleku info."
 
-#: ../calendar/gui/e-itip-control.c:1310
+#: ../calendar/gui/e-itip-control.c:1313
 msgid "Meeting Information"
 msgstr "Koosoleku info"
 
-#: ../calendar/gui/e-itip-control.c:1316
+#: ../calendar/gui/e-itip-control.c:1319
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> soovib, et koosolekul osaleks ka %s."
 
-#: ../calendar/gui/e-itip-control.c:1318
+#: ../calendar/gui/e-itip-control.c:1321
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> soovib, et sa osaleksid koosolekul."
 
-#: ../calendar/gui/e-itip-control.c:1319
+#: ../calendar/gui/e-itip-control.c:1322
 msgid "Meeting Proposal"
 msgstr "Koosoleku ettepanek"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1325
+#: ../calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> soovib lisada olemasolevale koosolekule."
 
-#: ../calendar/gui/e-itip-control.c:1326
+#: ../calendar/gui/e-itip-control.c:1329
 msgid "Meeting Update"
 msgstr "Koosoleku info uuendus"
 
-#: ../calendar/gui/e-itip-control.c:1330
+#: ../calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> soovib saada värskeimat infot koosoleku kohta."
 
-#: ../calendar/gui/e-itip-control.c:1331
+#: ../calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update Request"
 msgstr "Soov muuta koosolekut"
 
-#: ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-itip-control.c:1341
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> vastas koosoleku soovile."
 
-#: ../calendar/gui/e-itip-control.c:1339
+#: ../calendar/gui/e-itip-control.c:1342
 msgid "Meeting Reply"
 msgstr "Koosoleku vastus"
 
-#: ../calendar/gui/e-itip-control.c:1346
+#: ../calendar/gui/e-itip-control.c:1349
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> tühistas koosoleku."
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1350
 msgid "Meeting Cancellation"
 msgstr "Koosoleku tühistamine"
 
-#: ../calendar/gui/e-itip-control.c:1357 ../calendar/gui/e-itip-control.c:1434
-#: ../calendar/gui/e-itip-control.c:1474
+#: ../calendar/gui/e-itip-control.c:1360
+#: ../calendar/gui/e-itip-control.c:1437
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1361
 msgid "Bad Meeting Message"
 msgstr "Vigane koosoleku sõnum"
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1388
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> avalikustas ülesande info."
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1389
 msgid "Task Information"
 msgstr "Ülesande info"
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1396
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> soovib, et %s täidaks ülesande."
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1398
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> soovib, et sa täidaksid ülesande."
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1399
 msgid "Task Proposal"
 msgstr "Ettepanek ülesandeks"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1402
+#: ../calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> soovib lisada olemasolevale ülesandele."
 
-#: ../calendar/gui/e-itip-control.c:1403
+#: ../calendar/gui/e-itip-control.c:1406
 msgid "Task Update"
 msgstr "Ülesande uuendus"
 
-#: ../calendar/gui/e-itip-control.c:1407
+#: ../calendar/gui/e-itip-control.c:1410
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> soovib saada värskeimat infot ülesande kohta."
 
-#: ../calendar/gui/e-itip-control.c:1408
+#: ../calendar/gui/e-itip-control.c:1411
 msgid "Task Update Request"
 msgstr "Soov muuta ülesannet"
 
-#: ../calendar/gui/e-itip-control.c:1415
+#: ../calendar/gui/e-itip-control.c:1418
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> vastas ülesande määramisele."
 
-#: ../calendar/gui/e-itip-control.c:1416
+#: ../calendar/gui/e-itip-control.c:1419
 msgid "Task Reply"
 msgstr "Ülesande vastus"
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1426
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> katkestas ülesande."
 
-#: ../calendar/gui/e-itip-control.c:1424
+#: ../calendar/gui/e-itip-control.c:1427
 msgid "Task Cancellation"
 msgstr "Ülesande tühistamine"
 
-#: ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1438
 msgid "Bad Task Message"
 msgstr "Vigane ülesande sõnum"
 
-#: ../calendar/gui/e-itip-control.c:1459
+#: ../calendar/gui/e-itip-control.c:1462
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> avalikustas vaba/hõivatud andmed."
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Free/Busy Information"
 msgstr "Vaba/hõivatud teave"
 
-#: ../calendar/gui/e-itip-control.c:1464
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> soovib saada sinu vaba/hõivatud andmeid."
 
-#: ../calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Free/Busy Request"
 msgstr "Soov saada vaba/hõivatud teavet"
 
-#: ../calendar/gui/e-itip-control.c:1469
+#: ../calendar/gui/e-itip-control.c:1472
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> vastas vaba/hõivatud päringule."
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1473
 msgid "Free/Busy Reply"
 msgstr "Vaba/hõivatud vastus"
 
-#: ../calendar/gui/e-itip-control.c:1475
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Bad Free/Busy Message"
 msgstr "Vigane vaba/hõivatud sõnum"
 
-#: ../calendar/gui/e-itip-control.c:1550
+#: ../calendar/gui/e-itip-control.c:1553
 msgid "The message does not appear to be properly formed"
 msgstr "Sõnum ei tundu olevalt õigesti vormistatud"
 
-#: ../calendar/gui/e-itip-control.c:1609
+#: ../calendar/gui/e-itip-control.c:1612
 msgid "The message contains only unsupported requests."
 msgstr "Sõnum sisaldab ainult toetamata päringuid."
 
-#: ../calendar/gui/e-itip-control.c:1642
+#: ../calendar/gui/e-itip-control.c:1645
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Manus ei sisalda arusaadavat kalendriteadet"
 
-#: ../calendar/gui/e-itip-control.c:1674
+#: ../calendar/gui/e-itip-control.c:1677
 msgid "The attachment has no viewable calendar items"
 msgstr "Manus ei sisalda vaadeldavaid kalendrikirjeid"
 
-#: ../calendar/gui/e-itip-control.c:1908
+#: ../calendar/gui/e-itip-control.c:1911
 msgid "Update complete\n"
 msgstr "Uuendamine lõpetatud\n"
 
-#: ../calendar/gui/e-itip-control.c:1936
+#: ../calendar/gui/e-itip-control.c:1939
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1946
+#: ../calendar/gui/e-itip-control.c:1949
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "See vastus pole praeguselt osalejalt. Kas lisame ta osalejaks?"
 
-#: ../calendar/gui/e-itip-control.c:1958
+#: ../calendar/gui/e-itip-control.c:1961
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Osavõtja olekut ei ole võimailk uuendada, kuna selle olek on vigane!\n"
 
-#: ../calendar/gui/e-itip-control.c:1975
+#: ../calendar/gui/e-itip-control.c:1978
 msgid "Attendee status updated\n"
 msgstr "Osavõtja olek värskendatud\n"
 
-#: ../calendar/gui/e-itip-control.c:1978
+#: ../calendar/gui/e-itip-control.c:1981
 #: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Osavõtja olekut ei olnud võimailk uuendada, kuna objekti pole enam olemas"
 
-#: ../calendar/gui/e-itip-control.c:2008
+#: ../calendar/gui/e-itip-control.c:2011
 msgid "Removal Complete"
 msgstr "Eemaldamine lõpetatud"
 
-#: ../calendar/gui/e-itip-control.c:2031 ../calendar/gui/e-itip-control.c:2079
+#: ../calendar/gui/e-itip-control.c:2034
+#: ../calendar/gui/e-itip-control.c:2082
 msgid "Item sent!\n"
 msgstr "Kirje saadetud!\n"
 
-#: ../calendar/gui/e-itip-control.c:2033 ../calendar/gui/e-itip-control.c:2083
+#: ../calendar/gui/e-itip-control.c:2036
+#: ../calendar/gui/e-itip-control.c:2086
 msgid "The item could not be sent!\n"
 msgstr "Seda kirjet pole võimalik saata!\n"
 
-#: ../calendar/gui/e-itip-control.c:2163
+#: ../calendar/gui/e-itip-control.c:2166
 msgid "Choose an action:"
 msgstr "Vali tegevus"
 
-#: ../calendar/gui/e-itip-control.c:2234
+#: ../calendar/gui/e-itip-control.c:2237
 msgid "Update"
 msgstr "Uuenda"
 
-#: ../calendar/gui/e-itip-control.c:2262
+#: ../calendar/gui/e-itip-control.c:2265
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Nõustun"
 
-#: ../calendar/gui/e-itip-control.c:2263
+#: ../calendar/gui/e-itip-control.c:2266
 msgid "Tentatively accept"
 msgstr "Nõustun, kuid pole hetkel kindel"
 
-#: ../calendar/gui/e-itip-control.c:2264
+#: ../calendar/gui/e-itip-control.c:2267
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Lükkan tagasi"
 
-#: ../calendar/gui/e-itip-control.c:2293
+#: ../calendar/gui/e-itip-control.c:2296
 msgid "Send Free/Busy Information"
 msgstr "Vaba/hõivatud teabe saatmine"
 
-#: ../calendar/gui/e-itip-control.c:2321
+#: ../calendar/gui/e-itip-control.c:2324
 msgid "Update respondent status"
 msgstr "Värskenda vastaja olekut"
 
-#: ../calendar/gui/e-itip-control.c:2349
+#: ../calendar/gui/e-itip-control.c:2352
 msgid "Send Latest Information"
 msgstr "Saadab värskeima teabe"
 
-#: ../calendar/gui/e-itip-control.c:2377 ../calendar/gui/itip-utils.c:569
-#: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
+#: ../calendar/gui/e-itip-control.c:2380
+#: ../calendar/gui/itip-utils.c:571
+#: ../mail/mail-send-recv.c:414
+#: ../mail/mail-send-recv.c:466
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Tühista"
@@ -7595,81 +7363,88 @@ msgid "Resources"
 msgstr "Ressursid"
 
 #: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:99
+#: ../calendar/gui/e-meeting-store.c:116
 #: ../calendar/gui/e-meeting-store.c:802
 msgid "Individual"
 msgstr "Isik"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:101
+#: ../calendar/gui/e-meeting-store.c:118
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Grupp"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/e-meeting-store.c:120
 msgid "Resource"
 msgstr "Ressurss"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:105
+#: ../calendar/gui/e-meeting-store.c:122
 msgid "Room"
 msgstr "Ruum"
 
 #: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:134
+#: ../calendar/gui/e-meeting-store.c:151
 msgid "Chair"
 msgstr "Juht"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:136
+#: ../calendar/gui/e-meeting-store.c:153
 #: ../calendar/gui/e-meeting-store.c:805
 msgid "Required Participant"
 msgstr "Nõutav osaleja"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/e-meeting-store.c:155
 msgid "Optional Participant"
 msgstr "Võimalik osavõtja"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/e-meeting-store.c:157
 msgid "Non-Participant"
 msgstr "Mitteosaleja"
 
 #: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:186
+#: ../calendar/gui/e-meeting-store.c:209
 #: ../calendar/gui/e-meeting-store.c:815
 msgid "Needs Action"
 msgstr "Vajab tegevust"
 
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-store.c:192
+#: ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Tentative"
 msgstr "Katseline"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/itip-utils.c:555
+#: ../calendar/gui/e-meeting-store.c:194
+#: ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/itip-utils.c:557
 #: ../plugins/itip-formatter/itip-formatter.c:1649
 msgid "Delegated"
 msgstr "Delegeeritud"
 
-#. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:361
-msgid "Attendee                          "
-msgstr ""
-
-#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/e-meeting-store.c:221
 msgid "In Process"
 msgstr "Töös"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:444
-#: ../calendar/gui/e-meeting-time-sel.c:2105
+#: ../calendar/gui/e-meeting-time-sel.c:2102
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d. %B %Y"
 
@@ -7680,8 +7455,10 @@ msgstr "%A, %d. %B %Y"
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
 #: ../calendar/gui/e-meeting-time-sel-item.c:448
-#: ../calendar/gui/e-meeting-time-sel.c:2138 ../e-util/e-time-utils.c:203
-#: ../e-util/e-time-utils.c:296 ../e-util/e-time-utils.c:384
+#: ../calendar/gui/e-meeting-time-sel.c:2135
+#: ../e-util/e-time-utils.c:203
+#: ../e-util/e-time-utils.c:296
+#: ../e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y"
 msgstr "%a, %d.%m.%Y"
 
@@ -7691,97 +7468,73 @@ msgstr "%a, %d.%m.%Y"
 #. This is the preferred date format for the locale.
 #. This is a strftime() format for a short date. %m = month,
 #. %d = day of month, %Y = year (all digits).
-#: ../calendar/gui/e-meeting-time-sel-item.c:452 ../e-util/e-time-utils.c:238
-#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1684
+#: ../calendar/gui/e-meeting-time-sel-item.c:452
+#: ../e-util/e-time-utils.c:238
+#: ../e-util/e-time-utils.c:299
+#: ../widgets/misc/e-dateedit.c:1682
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:416 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Kontorist väljas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:417
+#: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "No Information"
 msgstr "Teave puudub"
 
-#: ../calendar/gui/e-meeting-time-sel.c:431
-msgid "Con_tacts..."
-msgstr "_Kontaktid..."
-
-#: ../calendar/gui/e-meeting-time-sel.c:448
+#: ../calendar/gui/e-meeting-time-sel.c:445
 msgid "O_ptions"
 msgstr "_Valikud"
 
-#: ../calendar/gui/e-meeting-time-sel.c:465
+#: ../calendar/gui/e-meeting-time-sel.c:462
 msgid "Show _only working hours"
 msgstr "Näita tunde _tööaja piires"
 
-#: ../calendar/gui/e-meeting-time-sel.c:475
+#: ../calendar/gui/e-meeting-time-sel.c:472
 msgid "Show _zoomed out"
 msgstr "Näita _väikeses plaanis"
 
-#: ../calendar/gui/e-meeting-time-sel.c:490
+#: ../calendar/gui/e-meeting-time-sel.c:487
 msgid "_Update free/busy"
 msgstr "_Värskenda vaba/hõivatud"
 
-#: ../calendar/gui/e-meeting-time-sel.c:505
+#: ../calendar/gui/e-meeting-time-sel.c:502
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:523
+#: ../calendar/gui/e-meeting-time-sel.c:520
 msgid "_Autopick"
 msgstr "_Automaatne valik"
 
-#: ../calendar/gui/e-meeting-time-sel.c:538
+#: ../calendar/gui/e-meeting-time-sel.c:535
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:555
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "_All people and resources"
 msgstr "_Kõik inimesed ja ressursid"
 
-#: ../calendar/gui/e-meeting-time-sel.c:564
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "All _people and one resource"
 msgstr "Kõik _inimesed ja üks ressurss"
 
-#: ../calendar/gui/e-meeting-time-sel.c:573
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "_Required people"
 msgstr "_Vajalikud inimesed"
 
-#: ../calendar/gui/e-meeting-time-sel.c:582
+#: ../calendar/gui/e-meeting-time-sel.c:579
 msgid "Required people and _one resource"
 msgstr "Vajalikud inimesed ja _üks ressurss"
 
-#: ../calendar/gui/e-meeting-time-sel.c:618
-msgid "_Start time:"
-msgstr "_Algus:"
-
-#: ../calendar/gui/e-meeting-time-sel.c:645
-msgid "_End time:"
-msgstr "_Lõpp:"
-
-#: ../calendar/gui/e-memo-table.c:267
-#, fuzzy
-msgid "Memo Table"
-msgstr "Tabel"
-
-#: ../calendar/gui/e-memo-table.c:863
-#, fuzzy
-msgid "_Delete Selected Memos"
-msgstr "_Kustuta valitud ülesanded"
-
-#: ../calendar/gui/e-memo-table.c:986 ../calendar/gui/e-memo-table.etspec.h:2
-#, fuzzy
-msgid "Click to add a memo"
-msgstr "Ülesande lisamiseks vajuta siia"
-
-#: ../calendar/gui/e-memo-table.etspec.h:3
-#, fuzzy
-msgid "Memo sort"
-msgstr "Sortimata"
+#: ../calendar/gui/e-pub-utils.c:300
+#, c-format
+msgid "Enter the password for %s"
+msgstr "Sisesta parool %s jaoks"
 
-#: ../calendar/gui/e-memos.c:727 ../calendar/gui/e-tasks.c:822
-#: ../calendar/gui/gnome-cal.c:2556
+#: ../calendar/gui/e-tasks.c:798
+#: ../calendar/gui/gnome-cal.c:2532
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7790,39 +7543,24 @@ msgstr ""
 "Viga tegevusel %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:775
-#, fuzzy
-msgid "Loading memos"
-msgstr "Ülesannete laadimine"
-
-#: ../calendar/gui/e-memos.c:860
-#, fuzzy, c-format
-msgid "Opening memos at %s"
-msgstr "Avan ülesanded asukohast %s"
-
-#: ../calendar/gui/e-memos.c:1033 ../calendar/gui/e-tasks.c:1225
-msgid "Deleting selected objects..."
-msgstr "Valitud objektide kustutamine..."
-
-#: ../calendar/gui/e-pub-utils.c:322
-#, c-format
-msgid "Enter the password for %s"
-msgstr "Sisesta parool %s jaoks"
-
-#: ../calendar/gui/e-tasks.c:870
+#: ../calendar/gui/e-tasks.c:846
 msgid "Loading tasks"
 msgstr "Ülesannete laadimine"
 
-#: ../calendar/gui/e-tasks.c:957
+#: ../calendar/gui/e-tasks.c:930
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Avan ülesanded asukohast %s"
 
-#: ../calendar/gui/e-tasks.c:1202
+#: ../calendar/gui/e-tasks.c:1126
 msgid "Completing tasks..."
 msgstr "Ülesannete lõpetamine..."
 
-#: ../calendar/gui/e-tasks.c:1252
+#: ../calendar/gui/e-tasks.c:1149
+msgid "Deleting selected objects..."
+msgstr "Valitud objektide kustutamine..."
+
+#: ../calendar/gui/e-tasks.c:1176
 msgid "Expunging"
 msgstr "Puhastamine"
 
@@ -7833,42 +7571,49 @@ msgstr "Ajavööndi nupp"
 #. 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:329 ../calendar/gui/print.c:1510
+#: ../calendar/gui/e-week-view-main-item.c:329
+#: ../calendar/gui/print.c:1501
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: ../calendar/gui/gnome-cal.c:791
+#: ../calendar/gui/gnome-cal.c:789
 msgid "Updating query"
 msgstr "Päringu uuendamine"
 
-#: ../calendar/gui/gnome-cal.c:2231
-msgid "_Custom View"
-msgstr "_Kohandatud vaade"
+#. bonobo displays this string so it must be in locale
+#: ../calendar/gui/gnome-cal.c:2209
+#: ../widgets/menus/gal-view-instance.c:585
+#: ../widgets/menus/gal-view-menus.c:350
+msgid "Custom View"
+msgstr "Kohandatud vaade"
 
-#: ../calendar/gui/gnome-cal.c:2232
-msgid "_Save Custom View"
-msgstr "_Salvesta kohandatud vaade"
+#: ../calendar/gui/gnome-cal.c:2210
+#: ../widgets/menus/gal-view-instance.c:586
+msgid "Save Custom View"
+msgstr "Salvesta kohandatud vaade"
 
-#: ../calendar/gui/gnome-cal.c:2237
-msgid "_Define Views..."
-msgstr "_Kirjelda vaateid..."
+#: ../calendar/gui/gnome-cal.c:2215
+#: ../widgets/menus/gal-view-instance.c:590
+#: ../widgets/menus/gal-view-menus.c:372
+msgid "Define Views..."
+msgstr "Kirjelda vaateid..."
 
-#: ../calendar/gui/gnome-cal.c:2399
+#: ../calendar/gui/gnome-cal.c:2378
 #, c-format
 msgid "Loading appointments at %s"
 msgstr ""
 
-#: ../calendar/gui/gnome-cal.c:2418
+#: ../calendar/gui/gnome-cal.c:2397
 #, c-format
 msgid "Loading tasks at %s"
 msgstr ""
 
-#: ../calendar/gui/gnome-cal.c:2522
+#: ../calendar/gui/gnome-cal.c:2498
 #, c-format
 msgid "Opening %s"
 msgstr "%s avamine"
 
-#: ../calendar/gui/gnome-cal.c:3440
+#: ../calendar/gui/gnome-cal.c:3388
 msgid "Purging"
 msgstr "Puhastamine"
 
@@ -7928,153 +7673,68 @@ msgstr "September"
 msgid "_Select Today"
 msgstr "_Vali tänane kuupäev"
 
-#: ../calendar/gui/itip-utils.c:351 ../calendar/gui/itip-utils.c:400
-#: ../calendar/gui/itip-utils.c:440
+#: ../calendar/gui/itip-utils.c:353
+#: ../calendar/gui/itip-utils.c:402
+#: ../calendar/gui/itip-utils.c:442
 msgid "An organizer must be set."
 msgstr "Korraldaja peab olema määrtud."
 
-#: ../calendar/gui/itip-utils.c:387
+#: ../calendar/gui/itip-utils.c:389
 msgid "At least one attendee is necessary"
 msgstr "Vaja on vähemalt ühte osavõtjat"
 
-#: ../calendar/gui/itip-utils.c:508 ../calendar/gui/itip-utils.c:630
+#: ../calendar/gui/itip-utils.c:510
+#: ../calendar/gui/itip-utils.c:632
 msgid "Event information"
 msgstr "Teave sündmuse kohta"
 
-#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:632
+#: ../calendar/gui/itip-utils.c:512
+#: ../calendar/gui/itip-utils.c:634
 msgid "Task information"
 msgstr "Teave ülesande kohta"
 
-#: ../calendar/gui/itip-utils.c:512 ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:514
+#: ../calendar/gui/itip-utils.c:636
 msgid "Journal information"
 msgstr "Päevaraamatu teave"
 
-#: ../calendar/gui/itip-utils.c:514 ../calendar/gui/itip-utils.c:652
+#: ../calendar/gui/itip-utils.c:516
+#: ../calendar/gui/itip-utils.c:654
 msgid "Free/Busy information"
 msgstr "Vaba/Hõivatud teave"
 
-#: ../calendar/gui/itip-utils.c:516
+#: ../calendar/gui/itip-utils.c:518
 msgid "Calendar information"
 msgstr "Kalendri teave"
 
-#: ../calendar/gui/itip-utils.c:565
+#: ../calendar/gui/itip-utils.c:567
 msgid "Updated"
 msgstr "Uuendatud"
 
-#: ../calendar/gui/itip-utils.c:573
+#: ../calendar/gui/itip-utils.c:575
 msgid "Refresh"
 msgstr "Värskenda"
 
-#: ../calendar/gui/itip-utils.c:577
+#: ../calendar/gui/itip-utils.c:579
 msgid "Counter-proposal"
 msgstr "Loenduri esitus"
 
-#: ../calendar/gui/itip-utils.c:648
+#: ../calendar/gui/itip-utils.c:650
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Vaba/hõivatud teave (%s -> %s)"
 
-#: ../calendar/gui/itip-utils.c:658
+#: ../calendar/gui/itip-utils.c:660
 msgid "iCalendar information"
 msgstr "iKalendri info"
 
-#: ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:815
 msgid "You must be an attendee of the event."
 msgstr "Sa pead ise olema sündmusest osavõtja."
 
-#: ../calendar/gui/memos-component.c:449 ../ui/evolution-addressbook.xml.h:3
-#: ../ui/evolution-mail-message.xml.h:12 ../ui/evolution-memos.xml.h:2
-#: ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Kopeeri"
-
-#: ../calendar/gui/memos-component.c:450 ../mail/em-filter-i18n.h:11
-#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:26 ../ui/evolution-memos.xml.h:6
-#: ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Kustuta"
-
-#: ../calendar/gui/memos-component.c:451
-msgid "Properties..."
-msgstr "Omadused..."
-
-#: ../calendar/gui/memos-component.c:524
-#, fuzzy, c-format
-msgid "%d memo"
-msgid_plural "%d memos"
-msgstr[0] "%d minuti"
-msgstr[1] "%d minutit"
-
-#: ../calendar/gui/memos-component.c:526 ../calendar/gui/tasks-component.c:517
-#: ../mail/mail-component.c:548
-#, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] ", %d valitud"
-msgstr[1] ", %d valitud"
-
-#: ../calendar/gui/memos-component.c:573
-#, fuzzy
-msgid "Failed upgrading memos."
-msgstr "Tõrge ülesannete uuendamisel."
-
-#: ../calendar/gui/memos-component.c:869
-#, fuzzy, c-format
-msgid "Unable to open the memo list '%s' for creating events and meetings"
-msgstr ""
-"Ülesannete loendit '%s' pole võimalik sündmuste ja koosolekute loomiseks "
-"avada"
-
-#: ../calendar/gui/memos-component.c:882
-#, fuzzy
-msgid "There is no calendar available for creating memos"
-msgstr "Ülesannete loomiseks pole ühtegi kalendrit saadaval"
-
-#: ../calendar/gui/memos-component.c:973
-#, fuzzy
-msgid "Memo Source Selector"
-msgstr "Ülesannete allika valija"
-
-#: ../calendar/gui/memos-component.c:1156
-#, fuzzy
-msgid "New memo"
-msgstr "Uus koosolek"
-
-#: ../calendar/gui/memos-component.c:1157
-#, fuzzy
-msgid "_Memo"
-msgstr "_E"
-
-#: ../calendar/gui/memos-component.c:1158
-#, fuzzy
-msgid "Create a new memo"
-msgstr "Uue testikirje loomine"
-
-#: ../calendar/gui/memos-component.c:1164
-#, fuzzy
-msgid "New memo list"
-msgstr "Uus ülesandeloend"
-
-#: ../calendar/gui/memos-component.c:1165
-#, fuzzy
-msgid "Memo l_ist"
-msgstr "Ü_lesannete nimekiri"
-
-#: ../calendar/gui/memos-component.c:1166
-#, fuzzy
-msgid "Create a new memo list"
-msgstr "Uue ülesandeloendi loomine"
-
-#: ../calendar/gui/memos-control.c:334
-#, fuzzy
-msgid "Print Memos"
-msgstr "Trüki kirje"
-
 #: ../calendar/gui/migration.c:151
 msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
+"The location and hierarchy of the Evolution task folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
@@ -8085,8 +7745,7 @@ msgstr ""
 
 #: ../calendar/gui/migration.c:155
 msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution calendar folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
@@ -8096,7 +7755,8 @@ msgstr ""
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:748 ../calendar/gui/migration.c:915
+#: ../calendar/gui/migration.c:748
+#: ../calendar/gui/migration.c:915
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -8265,97 +7925,93 @@ msgid "Sa"
 msgstr "L"
 
 #. Day
-#: ../calendar/gui/print.c:1926
+#: ../calendar/gui/print.c:1917
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Valitud päev (%a, %d. %b %Y)"
 
-#: ../calendar/gui/print.c:1951 ../calendar/gui/print.c:1955
+#: ../calendar/gui/print.c:1942
+#: ../calendar/gui/print.c:1946
 msgid "%a %b %d"
 msgstr "%a, %d. %b"
 
-#: ../calendar/gui/print.c:1952
+#: ../calendar/gui/print.c:1943
 msgid "%a %d %Y"
 msgstr "%a, %d. %Y"
 
-#: ../calendar/gui/print.c:1956 ../calendar/gui/print.c:1958
-#: ../calendar/gui/print.c:1959
+#: ../calendar/gui/print.c:1947
+#: ../calendar/gui/print.c:1949
+#: ../calendar/gui/print.c:1950
 msgid "%a %b %d %Y"
 msgstr "%a, %d. %b %Y"
 
-#: ../calendar/gui/print.c:1963
+#: ../calendar/gui/print.c:1954
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Valitud nädal (%s - %s)"
 
 #. Month
-#: ../calendar/gui/print.c:1971
+#: ../calendar/gui/print.c:1962
 msgid "Selected month (%b %Y)"
 msgstr "Valitud kuu (%b %Y)"
 
 #. Year
-#: ../calendar/gui/print.c:1978
+#: ../calendar/gui/print.c:1969
 msgid "Selected year (%Y)"
 msgstr "Valitud aasta (%Y)"
 
-#: ../calendar/gui/print.c:2307
-msgid "Appointment"
-msgstr "Sündmus"
-
-#: ../calendar/gui/print.c:2309
-msgid "Task"
-msgstr "Ülesanne"
-
-#: ../calendar/gui/print.c:2331
+#: ../calendar/gui/print.c:2320
 #, c-format
 msgid "Summary: %s"
 msgstr "Kokkuvõte: %s"
 
-#: ../calendar/gui/print.c:2339
+#: ../calendar/gui/print.c:2328
 #, c-format
 msgid "Location: %s"
 msgstr "Asukoht: %s"
 
-#: ../calendar/gui/print.c:2382
+#: ../calendar/gui/print.c:2371
 #, c-format
 msgid "Status: %s"
 msgstr "Olek: %s"
 
-#: ../calendar/gui/print.c:2399
+#: ../calendar/gui/print.c:2388
 #, c-format
 msgid "Priority: %s"
 msgstr "Tähtsus: %s"
 
-#: ../calendar/gui/print.c:2411
+#: ../calendar/gui/print.c:2400
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Valmis (%%): %i"
 
-#: ../calendar/gui/print.c:2423
+#: ../calendar/gui/print.c:2412
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2437
+#: ../calendar/gui/print.c:2426
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategooriad: %s"
 
-#: ../calendar/gui/print.c:2448
+#: ../calendar/gui/print.c:2437
 msgid "Contacts: "
 msgstr "Kontaktid:"
 
-#: ../calendar/gui/print.c:2588 ../calendar/gui/print.c:2676
-#: ../calendar/gui/print.c:2802 ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2577
+#: ../calendar/gui/print.c:2665
+#: ../calendar/gui/print.c:2791
+#: ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Väljatrüki eelvaade"
 
-#: ../calendar/gui/print.c:2623
+#: ../calendar/gui/print.c:2612
 msgid "Print Item"
 msgstr "Trüki kirje"
 
 #: ../calendar/gui/tasks-component.c:439
-msgid "_New Task List"
-msgstr "Uus ü_lesandeloend"
+msgid "New Task List"
+msgstr "Uus ülesandeloend"
 
 #: ../calendar/gui/tasks-component.c:515
 #, c-format
@@ -8364,61 +8020,72 @@ msgid_plural "%d tasks"
 msgstr[0] "%d ülesanne"
 msgstr[1] "%d ülesannet"
 
+#: ../calendar/gui/tasks-component.c:517
+#: ../mail/mail-component.c:548
+#, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] ", %d valitud"
+msgstr[1] ", %d valitud"
+
 #: ../calendar/gui/tasks-component.c:564
 msgid "Failed upgrading tasks."
 msgstr "Tõrge ülesannete uuendamisel."
 
-#: ../calendar/gui/tasks-component.c:875
+#: ../calendar/gui/tasks-component.c:872
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Ülesannete loendit '%s' pole võimalik sündmuste ja koosolekute loomiseks "
 "avada"
 
-#: ../calendar/gui/tasks-component.c:888
+#: ../calendar/gui/tasks-component.c:887
 msgid "There is no calendar available for creating tasks"
 msgstr "Ülesannete loomiseks pole ühtegi kalendrit saadaval"
 
-#: ../calendar/gui/tasks-component.c:988
+#: ../calendar/gui/tasks-component.c:981
 msgid "Task Source Selector"
 msgstr "Ülesannete allika valija"
 
-#: ../calendar/gui/tasks-component.c:1171
+#: ../calendar/gui/tasks-component.c:1164
 msgid "New task"
 msgstr "Uus ülesanne"
 
-#: ../calendar/gui/tasks-component.c:1173
+#: ../calendar/gui/tasks-component.c:1165
+msgid "_Task"
+msgstr "_Ülesanne"
+
+#: ../calendar/gui/tasks-component.c:1166
 msgid "Create a new task"
 msgstr "Uue ülesande loomine"
 
-#: ../calendar/gui/tasks-component.c:1179
+#: ../calendar/gui/tasks-component.c:1172
 msgid "New assigned task"
 msgstr "Uus omistatud ülesanne"
 
-#: ../calendar/gui/tasks-component.c:1180
+#: ../calendar/gui/tasks-component.c:1173
 msgid "Assigne_d Task"
 msgstr "_Omistatud ülesanne"
 
-#: ../calendar/gui/tasks-component.c:1181
+#: ../calendar/gui/tasks-component.c:1174
 msgid "Create a new assigned task"
 msgstr "Uue omistatud ülesande loomine"
 
-#: ../calendar/gui/tasks-component.c:1187
+#: ../calendar/gui/tasks-component.c:1180
 msgid "New task list"
 msgstr "Uus ülesandeloend"
 
-#: ../calendar/gui/tasks-component.c:1188
+#: ../calendar/gui/tasks-component.c:1181
 msgid "Task l_ist"
 msgstr "Ü_lesannete nimekiri"
 
-#: ../calendar/gui/tasks-component.c:1189
+#: ../calendar/gui/tasks-component.c:1182
 msgid "Create a new task list"
 msgstr "Uue ülesandeloendi loomine"
 
-#: ../calendar/gui/tasks-control.c:429
+#: ../calendar/gui/tasks-control.c:419
 msgid ""
-"This operation will permanently erase all tasks marked as completed. If you "
-"continue, you will not be able to recover these tasks.\n"
+"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
@@ -8426,11 +8093,11 @@ msgstr ""
 "lõpetatud. Kui sa jätkad, siis neid ülesandeid ei ole võimalik taastada.\n"
 "Kas tõesti kustutada need ülesanded? "
 
-#: ../calendar/gui/tasks-control.c:432
+#: ../calendar/gui/tasks-control.c:422
 msgid "Do not ask me again."
 msgstr "Seda küsimust rohkem mitte esitada."
 
-#: ../calendar/gui/tasks-control.c:466
+#: ../calendar/gui/tasks-control.c:457
 msgid "Print Tasks"
 msgstr "Trüki ülesanded"
 
@@ -10064,9 +9731,7 @@ msgid "_Bcc:"
 msgstr "_Pimekoopia:"
 
 #: ../composer/e-msg-composer-hdrs.c:655
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
+msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message."
 msgstr "Sisesta aadressid, millele saadetakse sõnumi pimekoopiad."
 
 #.
@@ -10088,73 +9753,70 @@ msgstr "Postita kellele:"
 msgid "A_ttach"
 msgstr "_Manusta"
 
-#: ../composer/e-msg-composer.c:832
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
+#: ../composer/e-msg-composer.c:738
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Väljuvat sõnumit pole võimalik signeerida: selle konto jaoks ei ole "
 "signeerimissertifikaati määratud."
 
-#: ../composer/e-msg-composer.c:839
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
+#: ../composer/e-msg-composer.c:745
+msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
 msgstr ""
 "Väljuvat sõnumit pole võimalik krüptida: selle konto jaoks ei ole "
 "krüptimissertifikaati määratud."
 
-#: ../composer/e-msg-composer.c:1322 ../composer/e-msg-composer.c:1356
+#: ../composer/e-msg-composer.c:1224
+#: ../composer/e-msg-composer.c:1257
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Tundmatu põhjus"
 
-#: ../composer/e-msg-composer.c:1394
+#: ../composer/e-msg-composer.c:1294
 msgid "Could not open file"
 msgstr "Tõrge faili avamisel"
 
-#: ../composer/e-msg-composer.c:1402
+#: ../composer/e-msg-composer.c:1302
 msgid "Unable to retrieve message from editor"
 msgstr "Sõnumit pole võimalik redaktorist kätte saada"
 
-#: ../composer/e-msg-composer.c:1677
+#: ../composer/e-msg-composer.c:1572
 msgid "Untitled Message"
 msgstr "Pealkirjata sõnum"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1712
+#: ../composer/e-msg-composer.c:1606
 msgid "Open File"
 msgstr "Ava fail"
 
-#: ../composer/e-msg-composer.c:2126 ../mail/em-account-editor.c:588
-#: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:700
+#: ../composer/e-msg-composer.c:2006
+#: ../mail/em-account-editor.c:588
+#: ../mail/em-account-editor.c:633
+#: ../mail/em-account-editor.c:700
 msgid "Autogenerated"
 msgstr "Automaatselt koostatud"
 
-#: ../composer/e-msg-composer.c:2229
+#: ../composer/e-msg-composer.c:2105
 msgid "Si_gnature:"
 msgstr "_Signatuur:"
 
-#: ../composer/e-msg-composer.c:2472 ../composer/e-msg-composer.c:3673
-#: ../composer/e-msg-composer.c:3676
+#: ../composer/e-msg-composer.c:2347
+#: ../composer/e-msg-composer.c:3527
+#: ../composer/e-msg-composer.c:3528
 msgid "Compose a message"
 msgstr "Sõnumi koostamine"
 
-#: ../composer/e-msg-composer.c:3791
+#: ../composer/e-msg-composer.c:3643
 msgid "_Attachment Bar"
 msgstr "_Manuseriba"
 
-#: ../composer/e-msg-composer.c:4881
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
+#: ../composer/e-msg-composer.c:4718
+msgid "<b>(The composer contains a non-text message body, which cannot be edited.)<b>"
 msgstr ""
 "<b>(Redaktor sisaldab mittetekstilist sõnumit ja seda ei ole võimalik "
 "redigeerida.)<b>"
 
 #: ../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 "
+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
@@ -10162,9 +9824,7 @@ msgid "All accounts have been removed."
 msgstr "Kõik kontod on kustutatud."
 
 #: ../composer/mail-composer.error.xml.h:3
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
+msgid "Are you sure you want to discard the message, titled '{0}', you are composing?"
 msgstr ""
 "Kas sa tõesti soovid tühistada sõnumit '{0}', mille koostamine on pooleli?"
 
@@ -10172,16 +9832,14 @@ msgstr ""
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "Sa pead sõnumile valima teised sätted, põhjus: &quot;{0}&quot;."
 
-#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:18
+#: ../composer/mail-composer.error.xml.h:5
+#: ../e-util/e-system.error.xml.h:1
+#: ../mail/mail.error.xml.h:17
 msgid "Because &quot;{1}&quot;."
 msgstr "Kuna &quot;{1}&quot;."
 
 #: ../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."
+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 ""
 "Selle redaktoriakna sulgemine tühistab sõnumi lõplikult. Kui sa tahad sõnumi "
 "koostamist hiljem jätkata, siis salvesta see sõnum Mustandite kausta."
@@ -10227,9 +9885,7 @@ msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "Viga faili automaatsel salvestamisel, põhjus: &quot;{1}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:17
-msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+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:18
@@ -10241,17 +9897,14 @@ msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "Fail `{0}' ei ole tavafail ja seda pole võimalik sõnumis saata."
 
 #: ../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."
+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."
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml installed."
 msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:24
@@ -10274,6 +9927,10 @@ msgstr "Sa ei saa sellele sõnumile manustada faili `{0}'"
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Discard Changes"
+msgstr "_Loobu muudatustest"
+
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Save Message"
 msgstr "_Salvesta sõnum"
@@ -10313,8 +9970,7 @@ msgstr "<b>Olek:</b>"
 
 #: ../designs/OOA/ooa.glade.h:6
 msgid ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
+"<small>The message specified below will be automatically sent to each person who sends\n"
 "mail to you while you are out of the office.</small>"
 msgstr ""
 "<small>See allpool näidatud sõnum saadetakse automaatselt igale isikule,\n"
@@ -10354,10 +10010,8 @@ msgstr "<b>E-posti saatmine:</b>"
 
 #: ../designs/read_receipts/read.glade.h:4
 msgid ""
-"<small>This page allows you to choose if you want to be notified via a read "
-"receipt when a message you\n"
-"sent is read, and to specify what Evolution should do when someone requests "
-"a receipt from you.</small>"
+"<small>This page allows you to choose if you want to be notified via a read receipt when a message you\n"
+"sent is read, and to specify what Evolution should do when someone requests a receipt from you.</small>"
 msgstr ""
 
 #: ../designs/read_receipts/read.glade.h:6
@@ -10385,12 +10039,10 @@ msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr ""
 
 #: ../designs/read_receipts/read.glade.h:12
-msgid ""
-"When you receive an email with a read receipt request, what should Evolution "
-"do?"
+msgid "When you receive an email with a read receipt request, what should Evolution do?"
 msgstr ""
 
-#: ../e-util/e-dialog-utils.c:270
+#: ../e-util/e-dialog-utils.c:267
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10398,15 +10050,20 @@ msgstr ""
 "Selle nimega fail on juba olemas.\n"
 "Kirjutada üle?"
 
-#: ../e-util/e-dialog-utils.c:272 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:269
+#: ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Fail üle kirjutada?"
 
-#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:84
+#: ../e-util/e-error.c:85
+#: ../e-util/e-error.c:127
 msgid "Evolution Error"
 msgstr "Evolutioni viga"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
+#: ../e-util/e-error.c:86
+#: ../e-util/e-error.c:87
+#: ../e-util/e-error.c:125
 msgid "Evolution Warning"
 msgstr "Evolutioni hoiatus"
 
@@ -10421,8 +10078,7 @@ msgstr "Evolutioni küsimus"
 #. setup a dummy error
 #: ../e-util/e-error.c:438
 #, c-format
-msgid ""
-"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgid "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
 msgstr ""
 "<span weight=\"bold\">Sisemine viga, tundmatu viga '%s'  küsitud</span>"
 
@@ -10442,7 +10098,8 @@ msgstr "Kas sa soovid seda üle kirjutada?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "Fail &quot;{0}&quot; on juba olemas."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:126
+#: ../e-util/e-system.error.xml.h:7
+#: ../mail/mail.error.xml.h:122
 msgid "_Overwrite"
 msgstr "_Kirjuta üle"
 
@@ -10450,7 +10107,8 @@ msgstr "_Kirjuta üle"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../e-util/e-time-utils.c:185 ../e-util/e-time-utils.c:398
+#: ../e-util/e-time-utils.c:185
+#: ../e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
@@ -10458,7 +10116,8 @@ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../e-util/e-time-utils.c:190 ../e-util/e-time-utils.c:389
+#: ../e-util/e-time-utils.c:190
+#: ../e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a, %d.%m.%Y %H:%M:%S"
 
@@ -10510,13 +10169,15 @@ msgstr "%d.%m.%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../e-util/e-time-utils.c:339 ../e-util/e-time-utils.c:438
+#: ../e-util/e-time-utils.c:339
+#: ../e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../e-util/e-time-utils.c:343 ../e-util/e-time-utils.c:430
+#: ../e-util/e-time-utils.c:343
+#: ../e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -10525,8 +10186,10 @@ msgstr "%H:%M:%S"
 #. strftime format of a time in 12-hour format,
 #. without seconds.
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../e-util/e-time-utils.c:348 ../e-util/e-time-utils.c:435
-#: ../widgets/misc/e-dateedit.c:1440 ../widgets/misc/e-dateedit.c:1722
+#: ../e-util/e-time-utils.c:348
+#: ../e-util/e-time-utils.c:435
+#: ../widgets/misc/e-dateedit.c:1438
+#: ../widgets/misc/e-dateedit.c:1720
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -10534,8 +10197,10 @@ msgstr "%I:%M %p"
 #. strftime format of a time in 24-hour format,
 #. without seconds.
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../e-util/e-time-utils.c:352 ../e-util/e-time-utils.c:427
-#: ../widgets/misc/e-dateedit.c:1437 ../widgets/misc/e-dateedit.c:1719
+#: ../e-util/e-time-utils.c:352
+#: ../e-util/e-time-utils.c:427
+#: ../widgets/misc/e-dateedit.c:1435
+#: ../widgets/misc/e-dateedit.c:1717
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -10601,7 +10266,8 @@ msgstr[1] "%d aastat tagasi"
 msgid "<click here to select a date>"
 msgstr "<kuupäeva valimiseks kliki siia>"
 
-#: ../filter/filter-datespec.c:288 ../filter/filter-datespec.c:299
+#: ../filter/filter-datespec.c:288
+#: ../filter/filter-datespec.c:299
 msgid "now"
 msgstr "praegu"
 
@@ -10618,25 +10284,32 @@ msgstr "Võrdlusaja valimine"
 msgid "Choose a file"
 msgstr "Vali faili"
 
-#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1041 ../mail/mail-config.c:76
+#: ../filter/filter-label.c:121
+#: ../mail/em-filter-i18n.h:26
+#: ../mail/em-migrate.c:1041
+#: ../mail/mail-config.c:76
 #: ../mail/mail-config.glade.h:91
 msgid "Important"
 msgstr "Tähtis"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1044
-#: ../mail/mail-config.c:79 ../mail/mail-config.glade.h:145
+#: ../filter/filter-label.c:124
+#: ../mail/em-migrate.c:1044
+#: ../mail/mail-config.c:79
+#: ../mail/mail-config.glade.h:145
 msgid "To Do"
 msgstr "Ülesanne"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1045
-#: ../mail/mail-config.c:80 ../mail/mail-config.glade.h:95
+#: ../filter/filter-label.c:125
+#: ../mail/em-migrate.c:1045
+#: ../mail/mail-config.c:80
+#: ../mail/mail-config.glade.h:95
 msgid "Later"
 msgstr "Hiljem"
 
-#: ../filter/filter-part.c:532 ../shell/GNOME_Evolution_Test.server.in.in.h:3
+#: ../filter/filter-part.c:532
+#: ../shell/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Test"
 
@@ -10676,12 +10349,14 @@ msgstr "Vastused ja eelnenud"
 msgid "Include threads"
 msgstr "Lõimedest kaasatakse"
 
-#: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:330
+#: ../filter/filter-rule.c:978
+#: ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:291
 msgid "Incoming"
 msgstr "Sissetulev"
 
-#: ../filter/filter-rule.c:978 ../mail/em-utils.c:331
+#: ../filter/filter-rule.c:978
+#: ../mail/em-utils.c:292
 msgid "Outgoing"
 msgstr "Väljaminev"
 
@@ -10705,7 +10380,8 @@ msgstr "Puuduv kuupäev."
 msgid "Missing file name."
 msgstr "Puuduv faili nimi."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:67
+#: ../filter/filter.error.xml.h:6
+#: ../mail/mail.error.xml.h:65
 msgid "Missing name."
 msgstr "Puuduv nimi."
 
@@ -10777,7 +10453,8 @@ msgstr "tagasi"
 msgid "months"
 msgstr "kuud"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:177
+#: ../filter/filter.glade.h:18
+#: ../mail/mail-config.glade.h:177
 msgid "seconds"
 msgstr "sekundit"
 
@@ -10810,8 +10487,7 @@ msgid "Composer Preferences"
 msgstr "Sõnumikoostaja eelistused"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+msgid "Configure mail preferences, including security and message display, here"
 msgstr ""
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
@@ -10846,10 +10522,12 @@ msgstr ""
 msgid "Evolution Mail preferences control"
 msgstr ""
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:494
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: ../mail/em-folder-view.c:494
 #: ../mail/importers/elm-importer.c:342
 #: ../mail/importers/netscape-importer.c:1902
-#: ../mail/importers/pine-importer.c:388 ../mail/mail-component.c:561
+#: ../mail/importers/pine-importer.c:388
+#: ../mail/mail-component.c:561
 #: ../mail/mail-component.c:648
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
@@ -10882,8 +10560,9 @@ msgid ""
 "and tick the check box for accepting it\n"
 msgstr ""
 
-#: ../mail/em-account-editor.c:464 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:495
+#: ../mail/em-account-editor.c:464
+#: ../mail/em-filter-folder-element.c:237
+#: ../mail/em-vfolder-rule.c:494
 msgid "Select Folder"
 msgstr "Kausta valimine"
 
@@ -10891,11 +10570,13 @@ msgstr "Kausta valimine"
 msgid "Ask for each message"
 msgstr "Küsitakse iga sõnumi kohta"
 
-#: ../mail/em-account-editor.c:1724 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1724
+#: ../mail/mail-config.glade.h:90
 msgid "Identity"
 msgstr "Identiteet"
 
-#: ../mail/em-account-editor.c:1760 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1760
+#: ../mail/mail-config.glade.h:117
 msgid "Receiving Email"
 msgstr "E-posti vastuvõtmine"
 
@@ -10903,34 +10584,41 @@ msgstr "E-posti vastuvõtmine"
 msgid "Automatically check for _new mail every"
 msgstr "Uute sõnumite automaatne _kontroll vahemikuga"
 
-#: ../mail/em-account-editor.c:2111 ../mail/mail-config.glade.h:128
+#: ../mail/em-account-editor.c:2111
+#: ../mail/mail-config.glade.h:128
 msgid "Sending Email"
 msgstr "Kirjade saatmine"
 
-#: ../mail/em-account-editor.c:2165 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2162
+#: ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Vaikimisi"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2226 ../mail/mail-config.glade.h:122
-#: ../plugins/exchange-operations/exchange-account-setup.c:313
+#: ../mail/em-account-editor.c:2223
+#: ../mail/mail-config.glade.h:122
+#: ../plugins/exchange-operations/exchange-account-setup.c:311
 msgid "Security"
 msgstr "Turvalisus"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2263 ../mail/em-account-editor.c:2337
+#: ../mail/em-account-editor.c:2260
+#: ../mail/em-account-editor.c:2334
 msgid "Receiving Options"
 msgstr "Vastuvõtmise valikud"
 
-#: ../mail/em-account-editor.c:2264 ../mail/em-account-editor.c:2338
+#: ../mail/em-account-editor.c:2261
+#: ../mail/em-account-editor.c:2335
 msgid "Checking for New Mail"
 msgstr "Uute sõnumite kontroll"
 
-#: ../mail/em-account-editor.c:2662 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2659
+#: ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Kontoredaktor"
 
-#: ../mail/em-account-editor.c:2662 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2659
+#: ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolutioni kontoabiline"
 
@@ -10951,38 +10639,38 @@ msgstr "Protokoll"
 msgid "Mail Accounts Table"
 msgstr "Postikontode tabel"
 
-#: ../mail/em-composer-prefs.c:309 ../mail/em-composer-prefs.c:435
+#: ../mail/em-composer-prefs.c:307
+#: ../mail/em-composer-prefs.c:430
 #: ../mail/mail-config.c:958
 msgid "Unnamed"
 msgstr "Nimetu"
 
-#: ../mail/em-composer-prefs.c:925
+#: ../mail/em-composer-prefs.c:897
 msgid "Language(s)"
 msgstr "Keel(ed)"
 
-#: ../mail/em-composer-prefs.c:968
+#: ../mail/em-composer-prefs.c:940
 msgid "Add signature script"
 msgstr "Allkirjaskripti lisamine"
 
-#: ../mail/em-composer-prefs.c:988
+#: ../mail/em-composer-prefs.c:960
 msgid "Signature(s)"
 msgstr "Allkiri(jad)"
 
-#: ../mail/em-composer-utils.c:855 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:853
+#: ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Edastatud sõnum --------"
 
-#: ../mail/em-composer-utils.c:1650
+#: ../mail/em-composer-utils.c:1648
 msgid "an unknown sender"
 msgstr "tundmatu saatja"
 
 #. 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:1697
-msgid ""
-"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} wrote:"
+#: ../mail/em-composer-utils.c:1695
+msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
 msgstr ""
 "Ühel kenal päeval, ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} kell "
 "${24Hour}:${Minute}, kirjutas ${Sender}:"
@@ -11004,7 +10692,7 @@ msgstr "Omista värvus"
 msgid "Assign Score"
 msgstr "Määra punktid"
 
-#: ../mail/em-filter-i18n.h:5 ../ui/evolution-editor.xml.h:1
+#: ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "Manused"
 
@@ -11116,8 +10804,9 @@ msgstr "ei ole"
 msgid "is not Flagged"
 msgstr "ei ole tähistatud"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
-#: ../ui/evolution-mail-message.xml.h:48
+#: ../mail/em-filter-i18n.h:35
+#: ../mail/mail-config.glade.h:93
+#: ../ui/evolution-mail-message.xml.h:47
 msgid "Junk"
 msgstr "Rämpspost"
 
@@ -11125,7 +10814,8 @@ msgstr "Rämpspost"
 msgid "Junk Test"
 msgstr "Rämpsukontroll"
 
-#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1063
+#: ../mail/em-filter-i18n.h:37
+#: ../mail/em-folder-view.c:1063
 #: ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Silt"
@@ -11166,7 +10856,8 @@ msgstr "Suuna programmi"
 msgid "Play Sound"
 msgstr "Mängi heli"
 
-#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:80
+#: ../mail/em-filter-i18n.h:47
+#: ../mail/message-tag-followup.c:80
 msgid "Read"
 msgstr "Loetud"
 
@@ -11198,7 +10889,8 @@ msgstr "tagastab väiksema kui"
 msgid "Run Program"
 msgstr "Käivita programm"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
+#: ../mail/em-filter-i18n.h:55
+#: ../mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Hinne"
 
@@ -11234,9 +10926,12 @@ msgstr "algab stringiga"
 msgid "Stop Processing"
 msgstr "Seiska töötlus"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1572
-#: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:88 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-format-html.c:1572
+#: ../mail/em-format-quote.c:313
+#: ../mail/em-format.c:849
+#: ../mail/em-mailer-prefs.c:88
+#: ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:330
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1131
@@ -11286,123 +10981,137 @@ msgstr "Loo"
 msgid "Folder _name:"
 msgstr "_Kausta nimi:"
 
-#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
-#: ../mail/mail-vfolder.c:937 ../mail/mail-vfolder.c:1007
+#: ../mail/em-folder-tree-model.c:201
+#: ../mail/em-folder-tree-model.c:203
+#: ../mail/mail-vfolder.c:937
+#: ../mail/mail-vfolder.c:1007
 msgid "Search Folders"
 msgstr "Otsikaustad"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
+#: ../mail/em-folder-tree-model.c:207
+#: ../mail/em-folder-tree-model.c:209
 msgid "UNMATCHED"
 msgstr ""
 
-#: ../mail/em-folder-tree-model.c:469 ../mail/mail-component.c:144
+#: ../mail/em-folder-tree-model.c:469
+#: ../mail/mail-component.c:144
 msgid "Drafts"
 msgstr "Mustandid"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:472 ../mail/mail-component.c:143
+#: ../mail/em-folder-tree-model.c:472
+#: ../mail/mail-component.c:143
 msgid "Inbox"
 msgstr "Sisendkast"
 
-#: ../mail/em-folder-tree-model.c:475 ../mail/mail-component.c:145
+#: ../mail/em-folder-tree-model.c:475
+#: ../mail/mail-component.c:145
 msgid "Outbox"
 msgstr "Väljundkast"
 
-#: ../mail/em-folder-tree-model.c:477 ../mail/mail-component.c:146
+#: ../mail/em-folder-tree-model.c:477
+#: ../mail/mail-component.c:146
 msgid "Sent"
 msgstr "Saadetud"
 
-#: ../mail/em-folder-tree-model.c:499 ../mail/em-folder-tree-model.c:803
+#: ../mail/em-folder-tree-model.c:498
+#: ../mail/em-folder-tree-model.c:802
 msgid "Loading..."
 msgstr "Laadimine..."
 
-#: ../mail/em-folder-tree.c:694
+#: ../mail/em-folder-tree.c:689
 msgid "Mail Folder Tree"
 msgstr "Kirjakaustade puu"
 
-#: ../mail/em-folder-tree.c:854
+#: ../mail/em-folder-tree.c:849
 #, c-format
 msgid "Moving folder %s"
 msgstr "Kausta %s tõstmine"
 
-#: ../mail/em-folder-tree.c:856
+#: ../mail/em-folder-tree.c:851
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kausta %s kopeerimine"
 
-#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1623
+#: ../mail/em-folder-tree.c:858
+#: ../mail/message-list.c:1613
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Sõnumite tõstmine %s kausta"
 
-#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1625
+#: ../mail/em-folder-tree.c:860
+#: ../mail/message-list.c:1615
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Sõnumite kopeerimine %s kausta"
 
-#: ../mail/em-folder-tree.c:881
+#: ../mail/em-folder-tree.c:876
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:972
+#: ../ui/evolution-mail-message.xml.h:103
 msgid "_Copy to Folder"
 msgstr "_Kopeeri kausta"
 
-#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:114
+#: ../mail/em-folder-tree.c:973
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Move to Folder"
 msgstr "_Tõsta kausta"
 
-#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1057
+#: ../mail/em-folder-tree.c:1678
+#: ../mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" kaustade läbivaatamine"
 
-#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:44
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
+#: ../mail/em-folder-tree.c:2031
+#: ../ui/evolution-addressbook.xml.h:44
+#: ../ui/evolution-mail-global.xml.h:22
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:54
+#: ../ui/evolution.xml.h:45
 msgid "_View"
 msgstr "_Vaade"
 
-#: ../mail/em-folder-tree.c:2043
+#: ../mail/em-folder-tree.c:2032
 msgid "Open in _New Window"
 msgstr "Uues _aknas avamine"
 
-#: ../mail/em-folder-tree.c:2047
+#: ../mail/em-folder-tree.c:2036
 msgid "_Copy..."
 msgstr "_Kopeeri..."
 
-#: ../mail/em-folder-tree.c:2048
+#: ../mail/em-folder-tree.c:2037
 msgid "_Move..."
 msgstr "_Tõsta..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2052
+#: ../mail/em-folder-tree.c:2041
 msgid "_New Folder..."
 msgstr "_Uus kataloog..."
 
-#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:30
+#: ../mail/em-folder-tree.c:2044
+#: ../ui/evolution-mail-list.xml.h:30
 msgid "_Rename..."
 msgstr "_Nimeta ümber..."
 
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:123
-msgid "_Empty Trash"
-msgstr "_Tühjenda prügikast"
-
 #: ../mail/em-folder-utils.c:104
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Kopeerimine `%s' -> `%s'"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:931
-#: ../mail/em-folder-view.c:946 ../mail/importers/evolution-mbox-importer.c:85
+#: ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:931
+#: ../mail/em-folder-view.c:946
+#: ../mail/importers/evolution-mbox-importer.c:85
 #: ../mail/importers/evolution-outlook-importer.c:134
 msgid "Select folder"
 msgstr "Kausta valimine"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:946
+#: ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:946
 msgid "C_opy"
 msgstr "K_opeeri"
 
@@ -11427,30 +11136,36 @@ msgstr "Kataloogi `%s' loomine"
 
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:384
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "Kausta loomine"
 
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:384
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "Kirjelda, kuhu tuleb kaust luua:"
 
-#: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:558 ../mail/em-popup.c:569
+#: ../mail/em-folder-view.c:1039
+#: ../mail/em-popup.c:546
+#: ../mail/em-popup.c:557
 msgid "Reply to _All"
 msgstr "Vasta _kõigile"
 
-#: ../mail/em-folder-view.c:1040 ../ui/evolution-mail-message.xml.h:122
+#: ../mail/em-folder-view.c:1040
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Reply to Sender"
 msgstr "_Vasta saatjale"
 
-#: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:560 ../mail/em-popup.c:571
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../mail/em-folder-view.c:1041
+#: ../mail/em-popup.c:548
+#: ../mail/em-popup.c:559
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Forward"
 msgstr "_Edasta"
 
-#: ../mail/em-folder-view.c:1044 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1044
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Edit as New Message..."
 msgstr "_Redigeeri kui uut kirja..."
 
@@ -11458,11 +11173,13 @@ msgstr "_Redigeeri kui uut kirja..."
 msgid "U_ndelete"
 msgstr "T_aasta"
 
-#: ../mail/em-folder-view.c:1051 ../ui/evolution-addressbook.xml.h:37
+#: ../mail/em-folder-view.c:1051
+#: ../ui/evolution-addressbook.xml.h:36
 msgid "_Move to Folder..."
 msgstr "_Tõsta kausta..."
 
-#: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:33
+#: ../mail/em-folder-view.c:1052
+#: ../ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopeeri kausta..."
 
@@ -11539,204 +11256,199 @@ msgid "Filter on _Mailing List"
 msgstr "Filter  p_ostiloendi järgi"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1922 ../mail/em-folder-view.c:1966
+#: ../mail/em-folder-view.c:1921
+#: ../mail/em-folder-view.c:1965
 msgid "Default"
 msgstr "UTF-8"
 
-#: ../mail/em-folder-view.c:2065
+#: ../mail/em-folder-view.c:2064
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Sõnumi trükkimine"
 
-#: ../mail/em-folder-view.c:2221
+#: ../mail/em-folder-view.c:2220
 msgid "Unable to retrieve message"
 msgstr "Sõnumit pole võimalik vastu võtta"
 
-#: ../mail/em-folder-view.c:2414
+#: ../mail/em-folder-view.c:2413
 msgid "_Copy Link Location"
 msgstr "Kopeeri _lingi asukoht"
 
-#: ../mail/em-folder-view.c:2416
+#: ../mail/em-folder-view.c:2415
 msgid "Create _Search Folder"
 msgstr "Loo uus _otsikaust"
 
-#: ../mail/em-folder-view.c:2417
+#: ../mail/em-folder-view.c:2416
 msgid "_From this Address"
 msgstr "_Sellelt aadressilt"
 
-#: ../mail/em-folder-view.c:2418
+#: ../mail/em-folder-view.c:2417
 msgid "_To this Address"
 msgstr "S_ellele aadressile"
 
-#: ../mail/em-folder-view.c:2699
+#: ../mail/em-folder-view.c:2698
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliki, et saata sõnumit aadressile %s"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:461
+#: ../mail/em-format-html-display.c:445
 #, c-format
 msgid "Matches: %d"
 msgstr "Sobivaid: %d"
 
-#: ../mail/em-format-html-display.c:712 ../mail/em-format-html.c:597
+#: ../mail/em-format-html-display.c:696
+#: ../mail/em-format-html.c:597
 msgid "Unsigned"
 msgstr "Allkirjastamata"
 
-#: ../mail/em-format-html-display.c:712
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
+#: ../mail/em-format-html-display.c:696
+msgid "This message is not signed. There is no guarantee that this message is authentic."
 msgstr ""
 "See sõnum ei ole allkirjastatud. Selle sõnumi tõesust pole võimalik "
 "garanteerida."
 
-#: ../mail/em-format-html-display.c:713 ../mail/em-format-html.c:598
+#: ../mail/em-format-html-display.c:697
+#: ../mail/em-format-html.c:598
 msgid "Valid signature"
 msgstr "Kehtiv allkiri"
 
-#: ../mail/em-format-html-display.c:713
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
+#: ../mail/em-format-html-display.c:697
+msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
 msgstr ""
 "See sõnum on allkirjastatud ja kehtiv, seega on väga tõenäoline, et tegemist "
 "on tõese sõnumiga."
 
-#: ../mail/em-format-html-display.c:714 ../mail/em-format-html.c:599
+#: ../mail/em-format-html-display.c:698
+#: ../mail/em-format-html.c:599
 msgid "Invalid signature"
 msgstr "Vigane allkiri"
 
-#: ../mail/em-format-html-display.c:714
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
+#: ../mail/em-format-html-display.c:698
+msgid "The signature of this message cannot be verified, it may have been altered in transit."
 msgstr ""
 "Selle sõnumi signatuuri pole võimalik verifitseerida. See võib olla sõnumi "
 "kohaletoimetamise käigus asendatud."
 
-#: ../mail/em-format-html-display.c:715
+#: ../mail/em-format-html-display.c:699
 msgid "Valid signature, cannot verify sender"
 msgstr "Kehtiv allkiri, saatjat pole võimalik tuvastada"
 
-#: ../mail/em-format-html-display.c:715
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
+#: ../mail/em-format-html-display.c:699
+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:721 ../mail/em-format-html.c:606
+#: ../mail/em-format-html-display.c:705
+#: ../mail/em-format-html.c:606
 msgid "Unencrypted"
 msgstr "Krüptimata"
 
-#: ../mail/em-format-html-display.c:721
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"the Internet."
+#: ../mail/em-format-html-display.c:705
+msgid "This message is not encrypted.  Its content may be viewed in transit across the Internet."
 msgstr ""
 "See sõnum ei ole krüptitud. Sõnumi sisu edastati internetis kaudu lahtiselt "
 "ja see võis näha olla ka kolmandale osapoolele."
 
-#: ../mail/em-format-html-display.c:722 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:706
+#: ../mail/em-format-html.c:607
 msgid "Encrypted, weak"
 msgstr "Krüptitud, nõrgalt"
 
-#: ../mail/em-format-html-display.c:722
-msgid ""
-"This message is encrypted, but with a weak encryption algorithm.  It would "
-"be difficult, but not impossible for an outsider to view the content of this "
-"message in a practical amount of time."
+#: ../mail/em-format-html-display.c:706
+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 ""
 "See sõnum on krüptitud nõrga krüptoalgoritmiga.  Võimalikul ründajal peaks "
 "olema väga raske aga sugugi mitte võimatu mõistliku aja jooksul sõnumi "
 "krüpteering lahti murda."
 
-#: ../mail/em-format-html-display.c:723 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:707
+#: ../mail/em-format-html.c:608
 msgid "Encrypted"
 msgstr "Krüptitud"
 
-#: ../mail/em-format-html-display.c:723
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
+#: ../mail/em-format-html-display.c:707
+msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
 msgstr ""
 "See sõnum on krüptitud.  Sõnumi sisu ei tohiks olla teistele iskutele loetav."
 
-#: ../mail/em-format-html-display.c:724 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:708
+#: ../mail/em-format-html.c:609
 msgid "Encrypted, strong"
 msgstr "Krüptitud, tugevalt"
 
-#: ../mail/em-format-html-display.c:724
-msgid ""
-"This message is encrypted, with a strong encryption algorithm.  It would be "
-"very difficult for an outsider to view the content of this message in a "
-"practical amount of time."
+#: ../mail/em-format-html-display.c:708
+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 ""
 "See sõnum on krüptitud tugeva krüptoalgoritmiga.  Võimalikul ründajal peaks "
 "olema väga raske mõistliku aja jooksul sõnumi krüpteering lahti murda."
 
-#: ../mail/em-format-html-display.c:825 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:809
+#: ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Sertifikaadi kuvamine"
 
-#: ../mail/em-format-html-display.c:840
+#: ../mail/em-format-html-display.c:824
 msgid "This certificate is not viewable"
 msgstr "See sertifikaat ei ole kuvatav"
 
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1106
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Lõpetatud %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1130
+#: ../mail/em-format-html-display.c:1114
 msgid "Overdue:"
 msgstr "Tähtaja ületanud:"
 
-#: ../mail/em-format-html-display.c:1133
+#: ../mail/em-format-html-display.c:1117
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1193
+#: ../mail/em-format-html-display.c:1177
 msgid "_View Inline"
 msgstr "_Sisekuva"
 
-#: ../mail/em-format-html-display.c:1194
+#: ../mail/em-format-html-display.c:1178
 msgid "_Hide"
 msgstr "_Peida"
 
-#: ../mail/em-format-html-display.c:1195
+#: ../mail/em-format-html-display.c:1179
 msgid "_Fit to Width"
 msgstr "_Sobita laiusega"
 
-#: ../mail/em-format-html-display.c:1196
+#: ../mail/em-format-html-display.c:1180
 msgid "Show _Original Size"
 msgstr "Näita _algset suurust"
 
-#: ../mail/em-format-html-display.c:1566
+#: ../mail/em-format-html-display.c:1550
 msgid "Attachment Button"
 msgstr "Manuse nupp"
 
-#: ../mail/em-format-html-display.c:1773
+#: ../mail/em-format-html-display.c:1757
 msgid "Select folder to save all attachments..."
 msgstr "Kõikide manuste salvestamiseks kataloogi valimine..."
 
-#: ../mail/em-format-html-display.c:1820
+#: ../mail/em-format-html-display.c:1796
+msgid "Select folder to save selected attachments..."
+msgstr "Valitud manuste salvestamiseks kataloogi valimine..."
+
+#: ../mail/em-format-html-display.c:1804
 msgid "Save Selected..."
 msgstr "Valitu salvestamine..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1887
+#: ../mail/em-format-html-display.c:1871
 #, c-format
 msgid "%d attachment"
 msgid_plural "%d attachments"
 msgstr[0] "%d manus"
 msgstr[1] "%d manust"
 
-#: ../mail/em-format-html-display.c:1951
+#: ../mail/em-format-html-display.c:1935
 msgid "No Attachment"
 msgstr "Manus puudub"
 
-#: ../mail/em-format-html-display.c:1954
+#: ../mail/em-format-html-display.c:1938
 msgid "Save All"
 msgstr "Salvesta kõik"
 
@@ -11745,7 +11457,8 @@ msgstr "Salvesta kõik"
 msgid "Page %d of %d"
 msgstr "Lehekülg %d %d-st"
 
-#: ../mail/em-format-html.c:473 ../mail/em-format-html.c:475
+#: ../mail/em-format-html.c:473
+#: ../mail/em-format-html.c:475
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "`%s' tõmbamine"
@@ -11787,36 +11500,48 @@ msgstr "Viide tundmatutele välistele andmetele (tüüp \"%s\")"
 msgid "Formatting message"
 msgstr "Sõnumi vormindamine"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:83
-#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:326
+#: ../mail/em-format-html.c:1464
+#: ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:844
+#: ../mail/em-mailer-prefs.c:83
+#: ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:326
 msgid "From"
 msgstr "Saatja"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:84
+#: ../mail/em-format-html.c:1464
+#: ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:845
+#: ../mail/em-mailer-prefs.c:84
 msgid "Reply-To"
 msgstr "Vastus-Kuhu"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:85
+#: ../mail/em-format-html.c:1464
+#: ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:846
+#: ../mail/em-mailer-prefs.c:85
 #: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Kellele"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:86
+#: ../mail/em-format-html.c:1464
+#: ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:847
+#: ../mail/em-mailer-prefs.c:86
 msgid "Cc"
 msgstr "Koopia"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:87
+#: ../mail/em-format-html.c:1464
+#: ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:848
+#: ../mail/em-mailer-prefs.c:87
 msgid "Bcc"
 msgstr "Pimekoopia"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1576 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:992
+#: ../mail/em-format-html.c:1576
+#: ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:987
 msgid "Mailer"
 msgstr "Postiprogramm"
 
@@ -11830,13 +11555,16 @@ msgstr "<I> (%a, %R %Z)</I>"
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1616 ../mail/em-format-quote.c:329
-#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:89
+#: ../mail/em-format-html.c:1616
+#: ../mail/em-format-quote.c:329
+#: ../mail/em-format.c:850
+#: ../mail/em-mailer-prefs.c:89
 #: ../mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Kuupäev"
 
-#: ../mail/em-format-html.c:1639 ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1639
+#: ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:90
 msgid "Newsgroups"
 msgstr "Uudisegrupid"
@@ -11846,11 +11574,14 @@ msgstr "Uudisegrupid"
 msgid "%s attachment"
 msgstr "\"%s\" tüüpi manus"
 
-#: ../mail/em-format.c:1141 ../mail/em-format.c:1288 ../mail/em-format.c:1575
+#: ../mail/em-format.c:1141
+#: ../mail/em-format.c:1288
+#: ../mail/em-format.c:1575
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S/MIME sõnumit pole võimalik analüüsida: Tundmatu viga"
 
-#: ../mail/em-format.c:1270 ../mail/em-format.c:1426
+#: ../mail/em-format.c:1270
+#: ../mail/em-format.c:1426
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME sõnumit pole võimalik analüüsida. Kuvatakse lähtekoodina."
 
@@ -11862,11 +11593,13 @@ msgstr ""
 msgid "Unsupported signature format"
 msgstr "Toetamata allkirjavorming"
 
-#: ../mail/em-format.c:1453 ../mail/em-format.c:1517
+#: ../mail/em-format.c:1453
+#: ../mail/em-format.c:1517
 msgid "Error verifying signature"
 msgstr "Viga allkirja tõestamisel"
 
-#: ../mail/em-format.c:1453 ../mail/em-format.c:1517
+#: ../mail/em-format.c:1453
+#: ../mail/em-format.c:1517
 msgid "Unknown error verifying signature"
 msgstr "Tundmatu viga allkirja tõestamisel"
 
@@ -11888,8 +11621,7 @@ msgstr "Kord kuus"
 
 #: ../mail/em-migrate.c:1198
 msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution mailbox folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
@@ -11928,7 +11660,8 @@ msgstr ""
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2561 ../mail/em-migrate.c:2573
+#: ../mail/em-migrate.c:2561
+#: ../mail/em-migrate.c:2573
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Tõrge kohaliku postisalvesti `%s' loomisel: %s"
@@ -11939,32 +11672,51 @@ msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Kohalikku postikausta pole võimalik asukohas `%s' luua: %s"
 
 #: ../mail/em-migrate.c:2711
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
+msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: ../mail/em-popup.c:556 ../mail/em-popup.c:567
+#: ../mail/em-popup.c:399
+msgid "Save As..."
+msgstr "Salvestamine kui..."
+
+#: ../mail/em-popup.c:424
+#, c-format
+msgid "untitled_image.%s"
+msgstr "nimetu_pilt.%s"
+
+#: ../mail/em-popup.c:542
+#: ../mail/em-popup.c:553
+msgid "Set as _Background"
+msgstr "Säti _taustapildiks"
+
+#: ../mail/em-popup.c:544
+#: ../mail/em-popup.c:555
 msgid "_Reply to sender"
 msgstr "Saatjale _vastamine"
 
-#: ../mail/em-popup.c:557 ../mail/em-popup.c:568
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../mail/em-popup.c:545
+#: ../mail/em-popup.c:556
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Vasta _postiloendisse"
 
-#: ../mail/em-popup.c:619
+#: ../mail/em-popup.c:607
 msgid "_Open Link in Browser"
 msgstr "Ava _viit veebilehitsejas"
 
-#: ../mail/em-popup.c:620
+#: ../mail/em-popup.c:608
 msgid "_Send New Message To..."
 msgstr "_Saada uus sõnum aadressil..."
 
-#: ../mail/em-popup.c:621
+#: ../mail/em-popup.c:609
 msgid "_Add to Addressbook"
 msgstr "_Lisa aadressiraamatusse"
 
+#: ../mail/em-popup.c:762
+#, c-format
+msgid "Open in %s..."
+msgstr "Ava programmiga %s..."
+
 #: ../mail/em-subscribe-editor.c:614
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "See hoidla ei toeta tellimusi või pole tellimused lubatud."
@@ -11986,28 +11738,29 @@ msgstr "Palun vali server."
 msgid "No server has been selected"
 msgstr "Serverit ei ole valitud"
 
-#: ../mail/em-utils.c:106
+#: ../mail/em-utils.c:105
 msgid "Don't show this message again."
 msgstr "Seda teadet ära enam uuesti näita."
 
-#: ../mail/em-utils.c:338
+#: ../mail/em-utils.c:299
 msgid "Filters"
 msgstr "Filtrid"
 
-#: ../mail/em-utils.c:481 ../mail/em-utils.c:518
+#: ../mail/em-utils.c:442
+#: ../mail/em-utils.c:479
 msgid "message"
 msgstr "sõnum"
 
-#: ../mail/em-utils.c:653
+#: ../mail/em-utils.c:614
 msgid "Save Message..."
 msgstr "Sõnumi salvestamine..."
 
-#: ../mail/em-utils.c:702
+#: ../mail/em-utils.c:663
 msgid "Add address"
 msgstr "Aadressi lisamine"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1181
+#: ../mail/em-utils.c:1142
 #, c-format
 msgid "Messages from %s"
 msgstr "Andmed %s-st"
@@ -12016,7 +11769,7 @@ msgstr "Andmed %s-st"
 msgid "Search _Folders"
 msgstr "_Otsikaustad"
 
-#: ../mail/em-vfolder-rule.c:575
+#: ../mail/em-vfolder-rule.c:574
 msgid "Search Folder source"
 msgstr "Otsikausta allikas"
 
@@ -12126,18 +11879,13 @@ msgid "Height of the message-list pane."
 msgstr "Sõnumiloendi paani kõrgus."
 
 #: ../mail/evolution-mail.schemas.in.in.h:27
-msgid ""
-"If a user tries to open 10 or more messages at one time, ask the user if "
-"they really want to do it."
+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 ""
 "Kui kasutaja üritab avada rohkem kui 10 sõnumit ühel ajal, küsi temalt kas "
 "ta tõesti soovib seda teha."
 
 #: ../mail/evolution-mail.schemas.in.in.h:28
-msgid ""
-"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
-"any mime-types appearing in this list which map to a bonobo-component viewer "
-"in GNOME's mime-type database may be used for displaying content."
+msgid "If there isn't a builtin viewer for a particular mime-type inside Evolution, any mime-types appearing in this list which map to a bonobo-component viewer in GNOME's mime-type database may be used for displaying content."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:29
@@ -12157,9 +11905,7 @@ msgid "List of accounts"
 msgstr "Kontode nimekiri"
 
 #: ../mail/evolution-mail.schemas.in.in.h:33
-msgid ""
-"List of accounts known to the mail component of Evolution. The list contains "
-"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgid "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:34
@@ -12167,9 +11913,7 @@ msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:35
-msgid ""
-"List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:color where color uses the HTML hex encoding."
+msgid "List of labels known to the mail component of Evolution. The list contains strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:36
@@ -12185,10 +11929,7 @@ msgid "Load images for HTML messages over http"
 msgstr "Laadi HTML sõnumite pildid üle http"
 
 #: ../mail/evolution-mail.schemas.in.in.h:39
-msgid ""
-"Load images for HTML messages over http(s). Possible values are: 0 - Never "
-"load images off the net 1 - Load images in mail from contacts 2 - Always "
-"load images off the net"
+msgid "Load images for HTML messages over http(s). Possible values are: 0 - Never load images off the net 1 - Load images in mail from contacts 2 - Always load images off the net"
 msgstr ""
 "HTML sõnumite piltide laadimine üle http(s) protokolli. Võimalikud väärtused "
 "on: 0 - Pilte ei laadita mitte kunagi võrgust maha 1 - Pildid laaditakse "
@@ -12264,8 +12005,7 @@ msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Viipa kasutajale, kui ta proovib kausta puhastada."
 
 #: ../mail/evolution-mail.schemas.in.in.h:57
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Viipa kasutajale, kui ta proovib saata sõnumit ilma Teemata."
 
 #: ../mail/evolution-mail.schemas.in.in.h:58
@@ -12282,9 +12022,7 @@ msgstr ""
 "Kinnituse küsimine, kui korraga püütakse saata kümmet või enamat sõnumit"
 
 #: ../mail/evolution-mail.schemas.in.in.h:61
-msgid ""
-"Prompt when user tries to send HTML mail to recipients that may not want to "
-"receive HTML mail."
+msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
 msgstr ""
 "Täpsustus, kui püütakse saata HTML sõnumit isikule, kes ei soovi HTML sisuga "
 "sõnumeid vastu võtta."
@@ -12335,6 +12073,14 @@ msgstr "Kustutatud sõnumite kuvamine (läbikriipsutatult) sõnumiloendis."
 msgid "Show deleted messages in the message-list"
 msgstr "Kustutatud sõnumite näitamine sõnumiteloendis"
 
+#: ../mail/evolution-mail.schemas.in.in.h:73
+msgid "Show the \"Preview\" pane"
+msgstr "\"Eelvaatlus\" paani kuvamine"
+
+#: ../mail/evolution-mail.schemas.in.in.h:74
+msgid "Show the \"Preview\" pane."
+msgstr "\"Eelvaatlus\" paani kuvamine."
+
 #: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Helifail, mida mängitakse uute kirjade saabumisel."
@@ -12372,11 +12118,7 @@ msgid "The variable width font for mail display"
 msgstr "Muutuva laiusega kirjatüüp sõnumikuvas"
 
 #: ../mail/evolution-mail.schemas.in.in.h:84
-msgid ""
-"This key should contain a list of XML structures specifying custom headers, "
-"and whether they are to be displayed. The format of the XML structure is &lt;"
-"header enabled&gt; - set enabled if the header is to be displayed in the "
-"mail view."
+msgid "This key should contain a list of XML structures specifying custom headers, and whether they are to be displayed. The format of the XML structure is &lt;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:85
@@ -12472,9 +12214,7 @@ msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:108
-msgid ""
-"Whether or not to fall back on threading by subjects when the messages do "
-"not contain In-Reply-To or References headers."
+msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
 msgstr ""
 
 #: ../mail/importers/elm-importer.c:193
@@ -12508,7 +12248,8 @@ msgid "Importer Berkeley Mailbox format folders"
 msgstr "Berkeley postkasti vormingus kaustade importija"
 
 #: ../mail/importers/evolution-outlook-importer.c:257
-#: ../mail/importers/mail-importer.c:230 ../shell/e-shell-importer.c:516
+#: ../mail/importers/mail-importer.c:230
+#: ../shell/e-shell-importer.c:516
 #, c-format
 msgid "Importing `%s'"
 msgstr "'%s' importimine"
@@ -12613,7 +12354,8 @@ msgstr "Postkasti importimine programmist Pine."
 msgid "Mail to %s"
 msgstr "Sõnumi saaja: %s"
 
-#: ../mail/mail-autofilter.c:242 ../mail/mail-autofilter.c:281
+#: ../mail/mail-autofilter.c:242
+#: ../mail/mail-autofilter.c:281
 #, c-format
 msgid "Mail from %s"
 msgstr "Sõnumi saatja: %s"
@@ -12709,7 +12451,8 @@ msgstr "Uue postikausta loomine"
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Tõrge e-posti seadistuste või kaustade uuendamisel"
 
-#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
+#: ../mail/mail-config.glade.h:1
+#: ../mail/mail-dialogs.glade.h:1
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
 msgid "    "
@@ -12880,7 +12623,8 @@ msgstr "Krüptitud sõnumi saatmisel krüptida alati ka _enda jaoks"
 msgid "Attach original message"
 msgstr "Algupärase sõnumi manustamine"
 
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
+#: ../mail/mail-config.glade.h:45
+#: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Manus"
 
@@ -13057,9 +12801,7 @@ msgid "Message Composer"
 msgstr "Sõnumiredaktor"
 
 #: ../mail/mail-config.glade.h:101
-msgid ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
+msgid "Note: you will not be prompted for a password until you connect for the first time"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:102
@@ -13081,19 +12823,14 @@ msgid ""
 msgstr ""
 
 #: ../mail/mail-config.glade.h:109
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
+msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Palun sisesta andmed oma e-posti väljasaatmise kohta. Kui sa ei tea, mida "
 "siia sisestada, küsi oma lisateavet oma süsteemiülemalt või interneti "
 "teenusepakkujalt."
 
 #: ../mail/mail-config.glade.h:110
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+msgid "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send."
 msgstr ""
 "Palun sisesta allpool olevasse vormi oma nimi ja e-posti aadress. "
 "Mittekohustuslikud väljad võib täita siis, kui sa soovid nendes väljades "
@@ -13210,9 +12947,7 @@ msgid "T_ype: "
 msgstr "_Tüüp:"
 
 #: ../mail/mail-config.glade.h:141
-msgid ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
+msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
 msgstr ""
 
 #: ../mail/mail-config.glade.h:142
@@ -13346,7 +13081,8 @@ msgstr "<span weight=\"bold\">Krüptimine</span>"
 msgid "Case _Sensitive"
 msgstr "_Tõstutundlik"
 
-#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:6
+#: ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
 msgstr "_Lõpetatud"
 
@@ -13358,7 +13094,8 @@ msgstr "_Otsing:"
 msgid "Find in Message"
 msgstr "Otsing sõnumist"
 
-#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:295
+#: ../mail/mail-dialogs.glade.h:10
+#: ../mail/message-tag-followup.c:295
 #: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Märgi jälgimiseks"
@@ -13383,7 +13120,8 @@ msgstr "_Server:"
 msgid "Security Information"
 msgstr "Turvalisuse teave"
 
-#: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
+#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13393,11 +13131,13 @@ msgstr ""
 msgid "_Accept License"
 msgstr "_Nõustu kasutustingimustega"
 
-#: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:20
+#: ../mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "_Tähtaeg:"
 
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
+#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_Silt:"
 
@@ -13449,7 +13189,8 @@ msgstr "E-posti võtmine"
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Tõrge väljundfiltrite rakendamisel: %s"
 
-#: ../mail/mail-ops.c:575 ../mail/mail-ops.c:604
+#: ../mail/mail-ops.c:575
+#: ../mail/mail-ops.c:604
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13473,7 +13214,8 @@ msgstr "Sõnumi %d/%d saatmine"
 msgid "Failed to send %d of %d messages"
 msgstr "Tõrge sõnumi %d saatmisel (kokku %d)"
 
-#: ../mail/mail-ops.c:760 ../mail/mail-send-recv.c:613
+#: ../mail/mail-ops.c:760
+#: ../mail/mail-send-recv.c:613
 msgid "Cancelled."
 msgstr "Loobutud."
 
@@ -13533,7 +13275,8 @@ msgstr "Konto %s salvestamine"
 msgid "Refreshing folder"
 msgstr "Kausta värskendamine"
 
-#: ../mail/mail-ops.c:1611 ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1611
+#: ../mail/mail-ops.c:1662
 msgid "Expunging folder"
 msgstr "Kataloogi puhtastamine"
 
@@ -13646,7 +13389,8 @@ msgstr "Tühista _kõik"
 msgid "Updating..."
 msgstr "Uuendamine..."
 
-#: ../mail/mail-send-recv.c:416 ../mail/mail-send-recv.c:468
+#: ../mail/mail-send-recv.c:416
+#: ../mail/mail-send-recv.c:468
 msgid "Waiting..."
 msgstr "Ootamine..."
 
@@ -13655,7 +13399,6 @@ msgid "Checking for new mail"
 msgstr "Uute sõnumite kontroll"
 
 #: ../mail/mail-session.c:207
-#: ../plugins/exchange-operations/exchange-config-listener.c:601
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Parooli sisestamine %s jaoks"
@@ -13668,20 +13411,20 @@ msgstr "Parooli sisestamine"
 msgid "User canceled operation."
 msgstr "Kasutaja katkestas toimingu."
 
-#: ../mail/mail-signature-editor.c:381
+#: ../mail/mail-signature-editor.c:372
 msgid "Edit signature"
 msgstr "Allkirja redigeerimine"
 
-#: ../mail/mail-signature-editor.c:423
+#: ../mail/mail-signature-editor.c:412
 msgid "Enter a name for this signature."
 msgstr "Sisesta nimi sellele allkirja jaoks."
 
-#: ../mail/mail-signature-editor.c:426
+#: ../mail/mail-signature-editor.c:415
 #: ../plugins/groupwise-features/properties.glade.h:5
 msgid "Name:"
 msgstr "Nimi:"
 
-#: ../mail/mail-tools.c:115
+#: ../mail/mail-tools.c:116
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Puhverkataloogi `%s' pole võimalik luua: %s"
@@ -13691,16 +13434,16 @@ msgstr "Puhverkataloogi `%s' pole võimalik luua: %s"
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr ""
 
-#: ../mail/mail-tools.c:249
+#: ../mail/mail-tools.c:242
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Edastatud sõnum - %s"
 
-#: ../mail/mail-tools.c:251
+#: ../mail/mail-tools.c:244
 msgid "Forwarded message"
 msgstr "Edastatud sõnum"
 
-#: ../mail/mail-tools.c:291
+#: ../mail/mail-tools.c:284
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Vigane kaust: `%s'"
@@ -13729,8 +13472,7 @@ msgid "New Search Folder"
 msgstr "Uus otsikaust"
 
 #: ../mail/mail.error.xml.h:1
-msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgid "A folder named &quot;{1}&quot; already exists. Please use a different name."
 msgstr ""
 "Kaust nimega &quot;{1}&quot; on juba olemas. Palun kasuta teistsugust nime."
 
@@ -13738,240 +13480,211 @@ msgstr ""
 msgid ""
 "A non-empty folder at &quot;{1}&quot; already exists.\n"
 "\n"
-"You can choose to ignore this folder, overwrite or append its contents, or "
-"quit.\n"
+"You can choose to ignore this folder, overwrite or append its contents, or quit.\n"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:6
-msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;.  Send "
-"the reciept notification to {0}?"
+msgid "A read receipt notification has been requested for &quot;{1}&quot;.  Send the reciept notification to {0}?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:7
-#, fuzzy
-msgid ""
-"A signature already exists with the name &quot;{0}&quot;. Please specify a "
-"different name."
-msgstr ""
-"Kaust nimega &quot;{1}&quot; on juba olemas. Palun kasuta teistsugust nime."
-
-#: ../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."
+msgid "Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about."
 msgstr ""
 "Sõnumile mõtestatud teemarea lisamine annab sõnumi vastuvõtjatele aimu "
 "sõnumi sisu kohta."
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:8
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Kas sa tõesti soovid kustutada seda kontot ja kõiki selle proksisid?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account?"
 msgstr "Kas sa tõesti soovid kustutada seda kontot?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:10
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr "Oled sa kindel, et soovid korraga avada {0} sõnumit?"
 
-#: ../mail/mail.error.xml.h:12
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
+#: ../mail/mail.error.xml.h:11
+msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
 msgstr ""
 "Kas sa tõesti soovid jäädavalt eemaldada kõik kustutatud sõnumid kõikidest "
 "kaustadest?"
 
-#: ../mail/mail.error.xml.h:13
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in "
-"folder &quot;{0}&quot;?"
+#: ../mail/mail.error.xml.h:12
+msgid "Are you sure you want to permanently remove all the deleted messages in folder &quot;{0}&quot;?"
 msgstr ""
 "Kas sa tõesti soovid jäädavalt eemaldada kõik kustutatud sõnumid kaustast "
 "&quot;{0}&quot;?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:13
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Oled sa kindel, et soovid seda sõnumit saata HTML vormingus?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:14
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
 "Oled sa kindel, et soovid saata seda sõnumit pimekoopia adressaatidele?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Oled sa kindel, et soovid seda sõnumit saata ilma pealkirjata?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:16
 msgid "Because &quot;{0}&quot;."
 msgstr "Kuna &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{2}&quot;."
 msgstr "Kuna &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:20
-#, fuzzy
-msgid "Blank Signature"
-msgstr "Allkirjad"
-
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:19
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "Otsikausta &quot;{0}&quot; pole võimalik lisada."
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:20
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Kausta &quot;{0}&quot; pole võimalik kopeerida &quot;{1}&quot; kausta."
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:21
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "Kausta &quot;{0}&quot; pole võimalik luua."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot create temporary save directory."
 msgstr "Ajutist salvestuskataloogi pole võimalik luua."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "Salvestuskataloogi pole võimalik luua, sest &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "Kausta &quot;{0}&quot; pole võimalik kustutada."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "Süsteemikausta &quot;{0}&quot; pole võimalik kustutada."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr ""
 "Otsikausta &quot;{0}&quot; pole võimalik redigeerida, kuna seda pole olemas."
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Kausta &quot;{0}&quot; pole võimalik tõsta &quot;{1}&quot; kausta."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "Allikat &quot;{1}&quot; pole võimalik avada"
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "Allikat &quot;{2}&quot; pole võimalik avada."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "Sihtkohta &quot;{2}&quot; pole võimalik avada."
 
-#: ../mail/mail.error.xml.h:33
-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."
+#: ../mail/mail.error.xml.h:31
+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."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "&quot;{0}&quot; pole võimalik &quot;{1}&quot;-ks ümber nimetada."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr "Süsteemikausta &quot;{0}&quot; pole võimalik ümber nimetada ega tõsta."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot save changes to account."
 msgstr "Konto muudatusi pole võimalik salvestada."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "Kataloogi &quot;{0}&quot; alla pole võimalik salvestada."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "Faili &quot;{0}&quot; pole võimalik salvestada."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "Signatuuriskripti &quot;{0}&quot; pole võimalik määrata."
 
-#: ../mail/mail.error.xml.h:40
-msgid ""
-"Check to make sure your password is spelled correctly.  Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+#: ../mail/mail.error.xml.h:38
+msgid "Check to make sure your password is spelled correctly.  Remember that many passwords are case sensitive; your caps lock might be on."
 msgstr ""
 "Kontrolli, kas parool on õigesti sisestatud.  Kuna paroolid on üldiselt "
 "tõstutundlikud, siis veendu, et klaviatuuri caps lock klahv ei oleks sisse "
 "lülitatud."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:39
 msgid "Could not save signature file."
 msgstr "Signatuurifaili pole võimalik salvestada."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:40
 msgid "Delete &quot;{0}&quot;?"
 msgstr "Kustuta &quot;{0}&quot;?"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:41
 msgid "Delete account?"
 msgstr "Kustuta konto?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
 msgid "Discard changed?"
 msgstr "Loobuda muudatustest?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr "Kas sa soovid seda operatsiooni teostada ka alamkaustades?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid "Do you wish to save your changes?"
 msgstr "Kas soovid tehtud muudatused salvestada?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:45
 msgid "Don't delete"
 msgstr "Ära kustuta"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:46
 msgid "Enter password."
 msgstr "Sisesta parool."
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:47
 msgid "Error loading filter definitions."
 msgstr "Viga filtridefinitsioonide laadimisel."
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid "Error while performing operation."
 msgstr "Viga käsu täitmisel."
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Error while {0}."
 msgstr "Viga toimingul: {0}."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:50
 msgid "File exists but cannot overwrite it."
 msgstr "Fail on juba olemas, kuid seda pole võimalik üle kirjutada."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "File exists but is not a regular file."
 msgstr "Fail on juba olemas, aga see ei ole tavaline fail."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Kui sa jätkad, siis neid sõnumeid ei ole võimalik enam taastada."
 
-#: ../mail/mail.error.xml.h:55
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
+#: ../mail/mail.error.xml.h:53
+msgid "If you delete the folder, all of its contents and its subfolders contents will be deleted permanently."
 msgstr ""
 "Kui sa selle kausta kustutad, siis kustuvad jäädavalt ka kõik selles olevad "
 "sõnumid ja alamkaustad."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:54
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13979,139 +13692,115 @@ msgstr ""
 "Kui sa seda teed, siis konto ja kõik proksi\n"
 "andmed kustutatakse jäädavalt."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:56
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Kui sa seda teed, siis konto andmed kustutatakse jäädavalt."
 
-#: ../mail/mail.error.xml.h:59
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#: ../mail/mail.error.xml.h:57
+msgid "If you quit, these messages will not be sent until Evolution is started again."
 msgstr ""
 "Kui sa praegu lõpetad, siis ei saadeta saatmata sõnumeid enne, kui sa "
 "Evolutioni uuesti käivitad."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:58
 msgid "Ignore"
 msgstr "Eira"
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:59
 msgid "Invalid authentication"
 msgstr "Vigane autentimine"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:60
 msgid "Mail filters automatically updated."
 msgstr "Postifiltrid automaatselt uuendatud."
 
-#: ../mail/mail.error.xml.h:63
-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."
+#: ../mail/mail.error.xml.h:61
+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:64
+#: ../mail/mail.error.xml.h:62
 msgid "Mark all messages as read"
 msgstr "Kõigi sõnumite loetuksmärkimine"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:63
 msgid "Mark all messages as read in the selected folder"
 msgstr "Kõigi valitud kataloogis olevate sõnumite loetuksmärkimine"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:64
 msgid "Missing folder."
 msgstr "Puuduv kaust."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:66
 msgid "No sources selected."
 msgstr "Ühtegi allikat pole valitud."
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:67
 msgid "Opening too many messages at once may take a long time."
 msgstr "Ühekorraga paljude sõnumite avamisele võib kuluda kaua aega."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:68
 msgid "Please check your account settings and try again."
 msgstr "Palun kontrolli oma kontosätteid ja proovi uuesti."
 
-#: ../mail/mail.error.xml.h:71
-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."
+#: ../mail/mail.error.xml.h:69
+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 ""
 "Palun määra sõnumi saaja. Saajat saab kontaktide valida, kui sa vajutad "
 "nupule \"Kellele:\"."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:70
 msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email:\n"
+"Please make sure the following recipients are willing and able to receive HTML email:\n"
 "{0}\n"
 "Send anyway?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:75
-#, fuzzy
-msgid "Please provide an unique name to identify this signature."
-msgstr "Sisesta nimi sellele allkirja jaoks."
-
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:73
 msgid "Please wait."
 msgstr "Palun oota."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:74
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Probleem vana postikausta &quot;{0}&quot; migreerimisel."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:75
 msgid "Querying server"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:76
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Serverilt autentimismehhanismide loendi küsimine."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:77
 msgid "Read receipt requested."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:78
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Kas tõesti kustutada kaust &quot;{0}&quot; ja selle kõik alamkaustad?"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:79
 msgid "Search Folders automatically updated."
 msgstr "Otsikaustad automaatselt uuendatud."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:80
 msgid "Send Receipt"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:84
-#, fuzzy
-msgid "Signature Already Exists"
-msgstr "Sertifikaat on juba olemas."
-
-#: ../mail/mail.error.xml.h:85
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+#: ../mail/mail.error.xml.h:81
+msgid "System folders are required for Ximian Evolution to function correctly and cannot be renamed, moved, or deleted."
 msgstr ""
 "Süsteemsed kaustad on tarvilikud Evolutioni korrektseks toimimiseks ja neid "
 "pole võimalik ümber nimetada, ümber tõsta või kustutada."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:82
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient. "
+"Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient. "
 msgstr ""
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:85
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14120,7 +13809,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14129,184 +13818,186 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:95
 msgid ""
-"The message was sent via the &quot;sendmail&quot; external application.  "
-"Sendmail reports the following error: status 67: mail not sent.\n"
-"The message is stored in the Outbox folder.  Check the message for errors "
-"and resend."
+"The message was sent via the &quot;sendmail&quot; external application.  Sendmail reports the following error: status 67: mail not sent.\n"
+"The message is stored in the Outbox folder.  Check the message for errors and resend."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:97
 msgid "The script file must exist and be executable."
 msgstr "Skriptifail peab olemas olema ja peab olema käivitatav."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:98
 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:104
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+#: ../mail/mail.error.xml.h:100
+msgid "This message cannot be sent because you have not specified any Recipients"
 msgstr ""
 "Seda sõnumit pole võimalik saata kuna sa pole määranud ühtegi sõnumi saajat"
 
-#: ../mail/mail.error.xml.h:105
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
+#: ../mail/mail.error.xml.h:101
+msgid "This server does not support this type of authentication and may not support authentication at all."
 msgstr ""
 "See server ei toeta seda tüüpi autentimist ja arvatavasti ei toeta see "
 "autentimist üleüldse."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:102
 msgid "This signature has been changed, but has not been saved."
 msgstr "Seda allkirja on muudetud, kuid seda ei ole salvestatud."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:103
 msgid "Unable to connect to the GroupWise server."
 msgstr "GroupWise serveriga pole võimalik ühenduda."
 
-#: ../mail/mail.error.xml.h:108
-msgid ""
-"Unable to open the drafts folder for this account.  Use the system drafts "
-"folder instead?"
+#: ../mail/mail.error.xml.h:104
+msgid "Unable to open the drafts folder for this account.  Use the system drafts folder instead?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:105
 msgid "Unable to read license file."
 msgstr "Litsentsifaili pole võimalik lugeda"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:106
 msgid "Use _Default"
 msgstr "Kasuta _vaikekodeeringut"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:107
 msgid "Use default drafts folder?"
 msgstr "Vaikekausta kasutamine mustandite jaoks?"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:108
 msgid "You have not filled in all of the required information."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:109
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Sul on saatmata sõnumeid, kas tõesti soovid lõpetada?"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:110
 msgid "You may not create two accounts with the same name."
 msgstr "Sa ei saa luua kahte sama nimega kontot."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:111
 msgid "You must name this Search Folder."
 msgstr "Sa pead sellele otsikaustale nime andma."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:112
 msgid "You must specify a folder."
 msgstr "Kausta valimine on kohustuslik."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:113
 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."
+"Either by selecting the folders individually, and/or by selecting all local folders, all remote folders, or both."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:115
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr ""
 "Tõrge serverisse &quot;{0}&quot; sisselogimisel kasutajana &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:116
 msgid "Your message with the subject &quot;{0}&quot; was not delivered."
 msgstr "Sinu sõnumit teemaga &quot;{0}&quot; ei toimetatud kohale."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:117
 msgid "_Append"
 msgstr "_Lisa"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:118
 msgid "_Discard changes"
 msgstr "_Muudatustest loobumine"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:119
+msgid "_Empty Trash"
+msgstr "_Tühjenda prügikast"
+
+#: ../mail/mail.error.xml.h:120
 msgid "_Expunge"
 msgstr "_Puhasta"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:121
 msgid "_Open Messages"
 msgstr "_Ava sõnumid"
 
-#: ../mail/message-list.c:1006
+#: ../mail/message-list.c:996
 msgid "Unseen"
 msgstr "Nägemata"
 
-#: ../mail/message-list.c:1007
+#: ../mail/message-list.c:997
 msgid "Seen"
 msgstr "Nähtud"
 
-#: ../mail/message-list.c:1008
+#: ../mail/message-list.c:998
 msgid "Answered"
 msgstr "Vastatud"
 
-#: ../mail/message-list.c:1009
+#: ../mail/message-list.c:999
 msgid "Multiple Unseen Messages"
 msgstr "Mitu nägemata sõnumit"
 
-#: ../mail/message-list.c:1010
+#: ../mail/message-list.c:1000
 msgid "Multiple Messages"
 msgstr "Mitu sõnumit"
 
-#: ../mail/message-list.c:1014
+#: ../mail/message-list.c:1004
 msgid "Lowest"
 msgstr "Madalaim"
 
-#: ../mail/message-list.c:1015
+#: ../mail/message-list.c:1005
 msgid "Lower"
 msgstr "Alumine"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1009
 msgid "Higher"
 msgstr "Kõrge"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1010
 msgid "Highest"
 msgstr "Kõrgeim"
 
-#: ../mail/message-list.c:1348 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1338
+#: ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1355 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1345
+#: ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Täna %l:%M %p"
 
-#: ../mail/message-list.c:1364 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1354
+#: ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Eile %l:%M %p"
 
-#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1366
+#: ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a, %d. %b %Y"
 
-#: ../mail/message-list.c:1384 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1374
+#: ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#: ../mail/message-list.c:1386 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1376
+#: ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%a, %d. %Y"
 
-#: ../mail/message-list.c:2052
+#: ../mail/message-list.c:2042
 msgid "Message List"
 msgstr "Sõnumiloend"
 
-#: ../mail/message-list.c:3397
+#: ../mail/message-list.c:3387
 msgid "Generating message list"
 msgstr "Sõnumiloendi genereerimine"
 
@@ -14354,7 +14045,8 @@ msgstr "Jälgimine"
 msgid "For Your Information"
 msgstr "Teadmiseks"
 
-#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:78
+#: ../ui/evolution-mail-message.xml.h:41
 msgid "Forward"
 msgstr "Edasta"
 
@@ -14362,11 +14054,13 @@ msgstr "Edasta"
 msgid "No Response Necessary"
 msgstr "Vastus pole tarvilik"
 
-#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:82
+#: ../mail/message-tag-followup.c:81
+#: ../ui/evolution-mail-message.xml.h:81
 msgid "Reply"
 msgstr "Vasta"
 
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:83
+#: ../mail/message-tag-followup.c:82
+#: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to All"
 msgstr "Vasta kõigile"
 
@@ -14399,9 +14093,7 @@ msgid "Subject or Sender contains"
 msgstr "Teema või saatja sisaldab"
 
 #: ../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."
+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
@@ -14445,8 +14137,7 @@ msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr ""
 "Plugin Evolutioni andmete ja seadistuste varundamiseks ja taastamiseks."
 
-#. the path to the shared library
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
 msgid "Backup and restore plugin"
 msgstr "Varundamise ja taastamise plugin"
 
@@ -14462,33 +14153,30 @@ msgstr "Evolutioni andmete ja seadistuste varundamine"
 msgid "Restore Settings..."
 msgstr "Taastamise sätted..."
 
-#: ../plugins/bbdb/bbdb.c:410
+#: ../plugins/bbdb/bbdb.c:404
 msgid "Automatic Contacts"
 msgstr "Automaatsed kontaktid"
 
-#: ../plugins/bbdb/bbdb.c:419
+#: ../plugins/bbdb/bbdb.c:413
 msgid "<span weight=\"bold\">Automatic Contacts</span>"
 msgstr "<span weight=\"bold\">Automaatsed kontaktid</span>"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:432
-msgid ""
-"_Automatically create entries in the addressbook when responding to mail"
+#: ../plugins/bbdb/bbdb.c:426
+msgid "_Automatically create entries in the addressbook when responding to mail"
 msgstr "_Aadressiraamatu kirjete automaatne loomine sõnumile vastamisel"
 
-#: ../plugins/bbdb/bbdb.c:450
+#: ../plugins/bbdb/bbdb.c:444
 msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
 msgstr "<span weight=\"bold\">Kiirsuhtluse kontaktid</span>"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:463
-msgid ""
-"Periodically synchronize contact information and images from my _instant "
-"messenger"
+#: ../plugins/bbdb/bbdb.c:457
+msgid "Periodically synchronize contact information and images from my _instant messenger"
 msgstr "Kontaktandmete _perioodiline sünkroniseerimine välksõnumivahendiga"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:470
+#: ../plugins/bbdb/bbdb.c:464
 msgid "Synchronize with _buddy list now"
 msgstr ""
 
@@ -14497,9 +14185,7 @@ msgid "Automatic contacts"
 msgstr "Automaatsed kontaktid"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
-msgid ""
-"Automatically fills your addressbook with names and email addresses as you "
-"reply to mails. Also fills in IM contact information from your buddy lists."
+msgid "Automatically fills your addressbook with names and email addresses as you reply to mails. Also fills in IM contact information from your buddy lists."
 msgstr ""
 "Plugin, mis automaatselt täidab sinu aadressiraamatut sinu poolt vastatavate "
 "sõnumite adressaatide nimede ja e-posti aadressisega. Samuti täidetakse "
@@ -14579,9 +14265,7 @@ msgid "Weather Calendars"
 msgstr "Ilmakalendrid"
 
 #: ../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."
+msgid "A test plugin which demonstrates a popup menu plugin which lets you copy things to the clipboard."
 msgstr ""
 "Testplugin asjade lõikelauale kopeerimise hüpikmenüü plugina "
 "demonstreeriseks."
@@ -14599,8 +14283,7 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "Kontroll, kas Evolution on vaikimisi postiprogramm"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.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 ""
 "Evolutioni iga käivitamise ajal kontrollitakse, kas Evolution on vaikimisi "
 "postiprogramm või mitte."
@@ -14645,9 +14328,7 @@ msgstr "Turvaline parool"
 
 #. i18n: "NTLM" probably doesn't translate
 #: ../plugins/exchange-operations/exchange-account-setup.c:66
-msgid ""
-"This option will connect to the Exchange server using secure password (NTLM) "
-"authentication."
+msgid "This option will connect to the Exchange server using secure password (NTLM) authentication."
 msgstr ""
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:74
@@ -14655,18 +14336,16 @@ msgid "Plaintext Password"
 msgstr "Avatekstiline parool"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:76
-msgid ""
-"This option will connect to the Exchange server using standard plaintext "
-"password authentication."
+msgid "This option will connect to the Exchange server using standard plaintext password authentication."
 msgstr ""
 "See valik loob ühenduse Exchange serveriga kasutades avatekstilise parooliga "
 "autentimist."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:253
+#: ../plugins/exchange-operations/exchange-account-setup.c:251
 msgid "Out Of Office"
 msgstr "Kontorist väljas"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:260
+#: ../plugins/exchange-operations/exchange-account-setup.c:258
 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."
@@ -14674,83 +14353,74 @@ msgstr ""
 "Allpool näidatav sõnum saadetakse automaatselt igale isikule,\n"
 "kes saadab sulle sinu puhkusel olemise ajal sõnumi."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:272
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
+#: ../plugins/exchange-operations/exchange-account-setup.c:270
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
 msgid "I am out of the office"
 msgstr "Olen praegu puhkusel"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:273
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
+#: ../plugins/exchange-operations/exchange-account-setup.c:271
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
 msgid "I am in the office"
 msgstr "Olen praegu tööl"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:324
+#: ../plugins/exchange-operations/exchange-account-setup.c:321
 msgid "Change the password for Exchange account"
 msgstr "Exchange konto parooli muutmine"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:326
+#: ../plugins/exchange-operations/exchange-account-setup.c:323
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Change Password"
 msgstr "Parooli muutmine"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:331
+#: ../plugins/exchange-operations/exchange-account-setup.c:327
 msgid "Manage the delegate settings for Exchange account"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:333
+#: ../plugins/exchange-operations/exchange-account-setup.c:329
 msgid "Delegation Assitant"
 msgstr "Delegeerimisabiline"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:345
+#: ../plugins/exchange-operations/exchange-account-setup.c:339
 msgid "Miscelleneous"
 msgstr "Muu"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:355
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
 msgid "View the size of all Exchange folders"
 msgstr "Kõikide Exchange kaustade suuruse vaatamine"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:357
+#: ../plugins/exchange-operations/exchange-account-setup.c:351
 msgid "Folders Size"
 msgstr "Kausta suurus"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:364
+#: ../plugins/exchange-operations/exchange-account-setup.c:358
 msgid "Exchange Settings"
 msgstr "Exchange sätted"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:611
+#: ../plugins/exchange-operations/exchange-account-setup.c:601
 msgid "_OWA Url:"
 msgstr "_OWA Url:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:636
+#: ../plugins/exchange-operations/exchange-account-setup.c:626
 msgid "A_uthenticate"
 msgstr "A_utentimine"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:824
+#: ../plugins/exchange-operations/exchange-account-setup.c:814
 msgid "Authentication Type"
 msgstr "Autentimise tüüp"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:838
+#: ../plugins/exchange-operations/exchange-account-setup.c:828
 msgid "Ch_eck for Supported Types"
 msgstr "_Tuvasta toetatud tüübid"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:192
-#: ../plugins/exchange-operations/exchange-contacts.c:162
-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:115
-msgid ""
-"The current password does not match the existing password for your account. "
-"Please enter the correct password"
+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
@@ -14887,29 +14557,24 @@ msgstr "Kausta nimi"
 msgid "Folder Size"
 msgstr "Kausta suurus"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:180
-#, fuzzy
-msgid "Subscribe to Other User's"
-msgstr "Teiste kasutajate ülesannete tellimine"
-
 #: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
 msgid "Exchange Folder Tree"
 msgstr "Exchange kirjakaustade puu"
 
-#: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:227
-#: ../plugins/exchange-operations/exchange-folder.c:237
+#: ../plugins/exchange-operations/exchange-folder.c:62
+#: ../plugins/exchange-operations/exchange-folder.c:223
+#: ../plugins/exchange-operations/exchange-folder.c:233
 msgid "Unsubscribe Folder..."
 msgstr "Lõpeta kausta tellimus..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:464
-#: ../plugins/exchange-operations/exchange-folder.c:524
+#: ../plugins/exchange-operations/exchange-folder.c:460
+#: ../plugins/exchange-operations/exchange-folder.c:520
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Kas tõesti loobuda kausta \"%s\" tellimusest?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:476
-#: ../plugins/exchange-operations/exchange-folder.c:536
+#: ../plugins/exchange-operations/exchange-folder.c:472
+#: ../plugins/exchange-operations/exchange-folder.c:532
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "\"%s\" tellimusest loobumine"
@@ -15007,9 +14672,7 @@ msgid "Cannot display folders."
 msgstr "Kaustu pole võimalik kuvada"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid ""
-"Changes to Exchange account configuration will take place after you quit and "
-"restart Evolution."
+msgid "Changes to Exchange account configuration will take place after you quit and restart Evolution."
 msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
@@ -15087,8 +14750,7 @@ msgid ""
 "For information to provide to your Exchange \n"
 "administrator, please follow the link below:\n"
 "\n"
-"http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328."
-"html\n"
+"http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328.html\n"
 "  "
 msgstr ""
 
@@ -15114,9 +14776,7 @@ msgid "Generic error"
 msgstr "Üldine viga"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-msgid ""
-"If OWA is running on a different path, you must specify that in the account "
-"configuration dialog."
+msgid "If OWA is running on a different path, you must specify that in the account configuration dialog."
 msgstr ""
 "Kui OWA töötab teise raja peal, siis pead sa selle määrama kontosätete "
 "dialoogis."
@@ -15239,25 +14899,19 @@ msgid "You may only configure a single Exchange account."
 msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
-msgid ""
-"Your current usage is : {0}KB. Try to clear up some space by deleting some "
-"mails."
+msgid "Your current usage is : {0}KB. Try to clear up some space by deleting some mails."
 msgstr ""
 "Sinu praegune kasutatav maht on {0}KB. Proovi mõnede sõnumite kustutamise "
 "abil vaba ruumi juurde teha."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
-msgid ""
-"Your current usage is : {0}KB. You will not be able to either send or "
-"recieve mails now."
+msgid "Your current usage is : {0}KB. You will not be able to either send or recieve mails now."
 msgstr ""
 "Sinu praegune kasutatav maht on {0}KB. Hetkel ei ole sul võimalik sõnumeid "
 "saata ega vastu võtta."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
-msgid ""
-"Your current usage is : {0}KB. You will not be able to send mails till you "
-"clear up some space by deleting some mails."
+msgid "Your current usage is : {0}KB. You will not be able to send mails till you clear up some space by deleting some mails."
 msgstr ""
 "Sinu praegune kasutatav maht on {0}KB. Sul pole võimalik sõnumeid saata ega "
 "vastu võtta enne kui sa pole mõne sõnumi kustutamise abil omale vaba ruumi "
@@ -15354,7 +15008,6 @@ 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:13 ../ui/evolution-task-editor.xml.h:8
 #: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "Saatmise valikud"
@@ -15445,7 +15098,7 @@ msgid "Subscribe to my _notifications"
 msgstr ""
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Read"
 msgstr "_Loe"
 
@@ -15473,22 +15126,18 @@ msgid "Proxy Login"
 msgstr "Proksi sisselogimine"
 
 #: ../plugins/groupwise-features/proxy-login.c:219
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:501
+#: ../plugins/groupwise-features/proxy-login.c:261
+#: ../plugins/groupwise-features/proxy.c:490
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sPalun sisesta %s parool (kasutaja %s)"
 
-#: ../plugins/groupwise-features/proxy-login.c:497
+#: ../plugins/groupwise-features/proxy-login.c:484
 msgid "_Proxy Login..."
 msgstr "_Proksi sisselogimine..."
 
-#: ../plugins/groupwise-features/proxy.c:690
-msgid "The Proxy tab will be available only when the account is online."
-msgstr ""
-
-#: ../plugins/groupwise-features/proxy.c:695
+#: ../plugins/groupwise-features/proxy.c:672
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 
@@ -15504,7 +15153,7 @@ msgstr ""
 msgid "New _Shared Folder..."
 msgstr "Uus _jagatud kataloog..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:446
+#: ../plugins/groupwise-features/share-folder-common.c:453
 msgid "Sharing"
 msgstr "Jagamine"
 
@@ -15512,70 +15161,6 @@ msgstr "Jagamine"
 msgid "Track Message Status..."
 msgstr "Jälgi sõnumi olekut..."
 
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-#, fuzzy
-msgid "Hula Account Setup"
-msgstr "Groupwise konto sätted"
-
-#: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:137
-msgid "iCalendar format (.ics)"
-msgstr "iKalendri vorming (.ics)"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
-msgstr ""
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
-#, fuzzy
-msgid "Synchronize to iPod"
-msgstr "_Sünkroniseerimisvalikud..."
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
-#, fuzzy
-msgid "iPod Synchronization"
-msgstr "_Sünkroniseerimisvalikud..."
-
-#: ../plugins/ipod-sync/sync.c:158
-#, fuzzy
-msgid "No output directory!"
-msgstr "Evolutioni kataloogi taastamine"
-
-#: ../plugins/ipod-sync/sync.c:159
-msgid ""
-"The output directory was not found on iPod! Please ensure that iPod has been "
-"correctly set up and try again."
-msgstr ""
-
-#: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
-#, fuzzy
-msgid "Could not export data!"
-msgstr "Andmeid pole võimalik kirjutada: %s"
-
-#: ../plugins/ipod-sync/sync.c:203
-#, fuzzy
-msgid "Exporting data failed."
-msgstr "Andmete importimine."
-
-#: ../plugins/ipod-sync/sync.c:231
-#, fuzzy
-msgid "Could not open addressbook!"
-msgstr "Aadressiraamatut ei õnnestunud laadida"
-
-#: ../plugins/ipod-sync/sync.c:232
-#, fuzzy
-msgid "Could not open the Evolution addressbook to export data."
-msgstr "Evolutioni aadressiraamat lõpetas ootamatult."
-
-#: ../plugins/ipod-sync/sync.c:291
-#, fuzzy
-msgid "Could not open calendar/todo!"
-msgstr "Sihtkoha avamine nurjus"
-
-#: ../plugins/ipod-sync/sync.c:292
-msgid "Could not open the Evolution calendar/todo list to export data."
-msgstr ""
-
 #: ../plugins/itip-formatter/itip-formatter.c:724
 msgid "Unable to parse item"
 msgstr "Kirjet pole võimalik analüüsida"
@@ -15636,9 +15221,7 @@ msgid "The calendar attached is not valid"
 msgstr "Manuses olev kalender on vigane"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1149
-msgid ""
-"The message claims to contain a calendar, but the calendar is not valid "
-"iCalendar."
+msgid "The message claims to contain a calendar, but the calendar is not valid iCalendar."
 msgstr ""
 
 #: ../plugins/itip-formatter/itip-formatter.c:1183
@@ -15650,9 +15233,7 @@ msgstr ""
 #: ../plugins/itip-formatter/itip-formatter.c:1184
 #: ../plugins/itip-formatter/itip-formatter.c:1199
 #: ../plugins/itip-formatter/itip-formatter.c:1275
-msgid ""
-"The message does contain a calendar, but the calendar contains no events, "
-"tasks or free/busy information"
+msgid "The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"
 msgstr ""
 "Sõnum sisaldab kalendrit, kuid kalender ei sisalda sündmusi, ülesandeid ega "
 "vaba/hõivatud andmeid"
@@ -15662,11 +15243,13 @@ msgid "The calendar attached contains multiple items"
 msgstr "Manuseks olev kalender sisaldab mitut kirjet"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1210
-msgid ""
-"To process all of these items, the file should be saved and the calendar "
-"imported"
+msgid "To process all of these items, the file should be saved and the calendar imported"
 msgstr ""
 
+#: ../plugins/itip-formatter/itip-formatter.c:1968
+msgid "Meetings and Tasks"
+msgstr "Koosolekud ja ülesanded"
+
 #. Delete message after acting
 #. FIXME Need a schema for this
 #: ../plugins/itip-formatter/itip-formatter.c:1991
@@ -15687,8 +15270,10 @@ msgid "Conflict Search Table"
 msgstr "Konfliktide otsimise tabel"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:240 ../widgets/misc/e-dateedit.c:459
+#: ../plugins/itip-formatter/itip-view.c:184
+#: ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:240
+#: ../widgets/misc/e-dateedit.c:457
 msgid "Today"
 msgstr "Täna"
 
@@ -15866,8 +15451,7 @@ msgstr "<b>%s</b> soovib lisada olemasolevale koosolekule:"
 
 #: ../plugins/itip-formatter/itip-view.c:367
 #, 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> soovib saada värskeimat infot ülesande kohta järgneva koosoleku "
 "kohta:"
@@ -15939,9 +15523,7 @@ msgstr "<b>%s</b> soovib lisada olemasolevale ülesandele:"
 
 #: ../plugins/itip-formatter/itip-view.c:435
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following "
-"assigned task:"
+msgid "<b>%s</b> wishes to receive the latest information for the following assigned task:"
 msgstr "<b>%s</b> soovib saada värskeimat infot järgneva ülesande kohta:"
 
 #: ../plugins/itip-formatter/itip-view.c:438
@@ -16007,9 +15589,7 @@ msgid "Itip Formatter"
 msgstr "Itip vormindaja"
 
 #: ../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; ?"
+msgid "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate &quot;{1}&quot; ?"
 msgstr ""
 "&quot;{0}&quot; delegeeris koosoleku. Kas sa soovid lisada delegaati &quot;"
 "{1}&quot; ?"
@@ -16019,8 +15599,7 @@ msgid "This meeting has been delegated"
 msgstr "See kohtumine on kustutatud"
 
 #: ../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 "See vastus pole praeguselt osalejalt. Kas lisame ta osalejaks?"
 
 #: ../plugins/mail-account-disable/mail-account-disable.c:47
@@ -16054,8 +15633,7 @@ msgid "No store available"
 msgstr "Puudub salvestusmeedia"
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
-msgid ""
-"A plugin which implements a CORBA interface for accessing mail data remotely."
+msgid "A plugin which implements a CORBA interface for accessing mail data remotely."
 msgstr ""
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
@@ -16063,9 +15641,7 @@ msgid "Mail Remote"
 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."
+msgid "A plugin which allows the creation of meetings from the contents of a mail message."
 msgstr ""
 "Plugin, mille abil on võimalik e-posti sõnumite sisu põhjal luua uusi "
 "koosolekuid."
@@ -16079,9 +15655,7 @@ msgid "Mail to meeting"
 msgstr "Sõnumi teisendamine koosolekuks"
 
 #: ../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."
+msgid "A plugin which allows the creation of tasks from the contents of a mail message."
 msgstr ""
 "Plugin, mille abil on võimalik e-posti sõnumite sisu põhjal luua uusi "
 "ülesandeid."
@@ -16119,9 +15693,7 @@ msgid "Mailing _List"
 msgstr "_Postiloend"
 
 #: ../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 ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
@@ -16145,11 +15717,9 @@ msgstr "Toiming pole saadaval"
 
 #: ../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"
+"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."
+"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
@@ -16165,9 +15735,7 @@ msgid "Posting not allowed"
 msgstr "Postitamine ei ole lubatud"
 
 #: ../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."
+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
@@ -16176,8 +15744,7 @@ msgstr "Kas saadan sõnumi postiloendisse?"
 
 #: ../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"
+"The action could not be performed. This means the header for this action did not contain any action we could handle.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -16190,9 +15757,7 @@ msgid ""
 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."
+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
@@ -16313,8 +15878,7 @@ msgstr "Plugin"
 
 #: ../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 mails.\n"
+"A test plugin which demonstrates a formatter plugin which lets you choose to disable HTML mails.\n"
 "\n"
 "This plugin is unsupported demonstration code only.\n"
 msgstr ""
@@ -16349,8 +15913,9 @@ msgid "Gives an option to print mail from composer"
 msgstr "Võimalus sõnumikoostajast sõnumi printimiseks"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:18 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-memos.xml.h:12
+#: ../ui/evolution-addressbook.xml.h:17
+#: ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:77
 #: ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Printimise eel_vaade"
@@ -16359,7 +15924,7 @@ msgstr "Printimise eel_vaade"
 msgid "Prints the message"
 msgstr "Sõnumi printimine"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:99
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:98
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (sisseehitatud)"
 
@@ -16375,8 +15940,7 @@ msgstr ""
 msgid "A plugin for saving all attachments or parts of a message at once."
 msgstr "Plugin kõigi sõnumi manuste või osade ühekorraga salvestamiseks."
 
-#. the path to the shared library
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
+#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:2
 msgid "Save attachments"
 msgstr "Manuste salvestamine"
 
@@ -16397,7 +15961,8 @@ msgid "MIME Type"
 msgstr "MIME tüüp"
 
 #: ../plugins/save-attachments/save-attachments.c:359
-#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:18
+#: ../ui/evolution-message-composer.xml.h:18
+#: ../ui/evolution-signature-editor.xml.h:6
 msgid "Save"
 msgstr "Salvesta"
 
@@ -16481,6 +16046,10 @@ msgstr "Väärtuste kapseldamine:"
 msgid "Comma separated value format (.csv)"
 msgstr "Komaga eraldatud väärtuste vorming (.csv)"
 
+#: ../plugins/save-calendar/ical-format.c:137
+msgid "iCalendar format (.ics)"
+msgstr "iKalendri vorming (.ics)"
+
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
 msgstr "Valitu salvestamine"
@@ -16506,11 +16075,18 @@ msgstr "%FT%T"
 msgid "RDF format (.rdf)"
 msgstr "RDF vorming (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:170
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:171
+#: ../plugins/save-calendar/save-calendar.c:181
 msgid "Select destination file"
 msgstr "Sihtfaili valimine"
 
+#: ../plugins/save-calendar/save-calendar.c:216
+#, c-format
+msgid "The suggested filename extension of this filetype (%s) is unused in the chosen filename. Do you want to continue?"
+msgstr ""
+"Selle failitüübi (%s) jaoks soovitatud failinime laiendit pole kasutatud. "
+"Kas sa soovid jätkata?"
+
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
 msgid "Select one source"
 msgstr ""
@@ -16541,8 +16117,7 @@ msgstr "Tere tulemast"
 
 #: ../plugins/startup-wizard/startup-wizard.c:89
 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"
+"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 ""
@@ -16629,8 +16204,7 @@ msgid "Last upgraded configuration version"
 msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:8
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
+msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:9
@@ -16641,13 +16215,13 @@ msgstr "Printeri sätted..."
 msgid "Skip development warning dialog"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:468
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/main.c:468
 msgid "Start in offline mode"
 msgstr "Alustamine autonoomses režiimis"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:12
-msgid ""
-"The configuration version of Evolution, with major/minor/configuration level"
+msgid "The configuration version of Evolution, with major/minor/configuration level"
 msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:13
@@ -16663,16 +16237,11 @@ msgid "The default width for the sidebar, in pixels."
 msgstr "Külgpaani vaikimisi laius pikslites."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:16
-msgid ""
-"The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level"
+msgid "The last upgraded configuration version of Evolution, with major/minor/configuration level"
 msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:17
-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."
+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.in.h:18
@@ -16688,8 +16257,7 @@ msgid "Whether the toolbar should be visible."
 msgstr "Millal tööriistariba peaks olema nähtav."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:21
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
+msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:22
@@ -16729,11 +16297,9 @@ msgstr "Vali, millist tüüpi importerit sa soovid kasutada:"
 
 #: ../shell/e-shell-importer.c:136
 msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
+"Choose the file that you want to import into Evolution, and select what type of file it is from the list.\n"
 "\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+"You can select \"Automatic\" if you do not know, and Evolution will attempt to work it out."
 msgstr ""
 
 #: ../shell/e-shell-importer.c:142
@@ -16796,27 +16362,27 @@ msgstr "Kausta nimi ei tohi sisaldada \"#\" sümbolit."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' ja '..' on reserveeritud kaustanimed."
 
-#: ../shell/e-shell-window-commands.c:71
+#: ../shell/e-shell-window-commands.c:70
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot vahendid ei paista sellesse süsteemi paigaldatud olevat."
 
-#: ../shell/e-shell-window-commands.c:79
+#: ../shell/e-shell-window-commands.c:78
 #, c-format
 msgid "Error executing %s."
 msgstr "Viga %s käivitamisel."
 
-#: ../shell/e-shell-window-commands.c:128
+#: ../shell/e-shell-window-commands.c:127
 msgid "Bug buddy is not installed."
 msgstr "Veateatamisprogramm ei ole paigaldatud."
 
-#: ../shell/e-shell-window-commands.c:136
+#: ../shell/e-shell-window-commands.c:135
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy (veateatamisprogramm) ei saa käivitada."
 
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
 #. * about box
-#: ../shell/e-shell-window-commands.c:533
+#: ../shell/e-shell-window-commands.c:532
 msgid "translator-credits"
 msgstr ""
 "Ilmar Kerm <ikerm@hot.ee>, 2001\n"
@@ -16824,19 +16390,20 @@ msgstr ""
 "Kaarel Jõgi <kaarel@gg.ee>, 2002\n"
 "Priit Laes <amd@store20.com>, 2003, 2004, 2005"
 
-#: ../shell/e-shell-window-commands.c:547
+#: ../shell/e-shell-window-commands.c:546
 msgid "Groupware Suite"
 msgstr "Grupitöövahend"
 
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:774
 msgid "_Work Online"
 msgstr "Ühendu v_õrku"
 
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:52
+#: ../shell/e-shell-window-commands.c:787
+#: ../ui/evolution.xml.h:47
 msgid "_Work Offline"
 msgstr "Siirdu aut_onoomsesse olekusse"
 
-#: ../shell/e-shell-window-commands.c:801
+#: ../shell/e-shell-window-commands.c:800
 msgid "Work Offline"
 msgstr "Siirdu autonoomsesse olekusse"
 
@@ -16856,7 +16423,7 @@ msgstr ""
 "Evolution on hetkel autonoomses olekus.  Võrku ühendumiseks vajuta seda "
 "nuppu."
 
-#: ../shell/e-shell-window.c:735
+#: ../shell/e-shell-window.c:724
 #, c-format
 msgid "Switch to %s"
 msgstr "Ümberlülitumine %s peale"
@@ -16865,12 +16432,14 @@ msgstr "Ümberlülitumine %s peale"
 msgid "Uknown system error."
 msgstr "Tundmatu süsteemne viga."
 
-#: ../shell/e-shell.c:825 ../shell/e-shell.c:826
+#: ../shell/e-shell.c:825
+#: ../shell/e-shell.c:826
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1257 ../widgets/misc/e-cell-date-edit.c:256
+#: ../shell/e-shell.c:1257
+#: ../widgets/misc/e-cell-date-edit.c:256
 msgid "OK"
 msgstr "Olgu"
 
@@ -16950,7 +16519,7 @@ msgid ""
 "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"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
 "This product comes with no warranty and is not intended for\n"
 "individuals prone to violent fits of anger.\n"
 "\n"
@@ -17020,9 +16589,7 @@ msgid "Evolution can not start."
 msgstr "Evolution ei ole võimeline käivituma."
 
 #: ../shell/shell.error.xml.h:5
-msgid ""
-"Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed. "
+msgid "Forgetting your passwords will clear all remembered passwords. You will be reprompted next time they are needed. "
 msgstr ""
 "Meeldejäetud paroolide unustamine nullib ära kõik meeldejäetud paroolid. "
 "Paroolid küsitakse uuesti järgmisel korral, mil neid vaja läheb."
@@ -17037,25 +16604,18 @@ msgstr "Kas tõesti kustutada vanad andmed?"
 
 #: ../shell/shell.error.xml.h:9
 msgid ""
-"The entire contents of the &quot;evolution&quot; directory is about to be be "
-"permanently removed.\n"
+"The entire contents of the &quot;evolution&quot; directory is about to be 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"
+"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"
+"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"
+"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 ""
 "Evolutioni eelmine versioon hoidis andmeid teises kohas.\n"
 "\n"
@@ -17070,11 +16630,9 @@ msgstr "Tõrge eelmisest versioonist uuendamisel: {0}"
 
 #: ../shell/shell.error.xml.h:20
 msgid ""
-"Upgrading your data and settings will require upto {0} of disk space, but "
-"you only have {1} available.\n"
+"Upgrading your data and settings will require upto {0} of disk space, but you only have {1} available.\n"
 "\n"
-"You will need to make more space available in your home directory before you "
-"can continue."
+"You will need to make more space available in your home directory before you can continue."
 msgstr ""
 "Sinu andmete ja sätete uuendamine vajab kuni {0} kettaruumi, kuid sul on "
 "saadaval ainult {1}.\n"
@@ -17113,8 +16671,7 @@ msgstr "_Tuleta mulle hiljem meelde"
 msgid ""
 "{1}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
+"If you choose to continue, you may not have access to some of your old data.\n"
 msgstr ""
 "{1}\n"
 "\n"
@@ -17133,17 +16690,11 @@ msgstr ""
 "Muuda usaldussätteid:"
 
 #: ../smime/gui/cert-trust-dialog.c:145
-msgid ""
-"Because you trust the certificate authority that issued this certificate, "
-"then you trust the authenticity of this certificate unless otherwise "
-"indicated here"
+msgid "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
 msgstr ""
 
 #: ../smime/gui/cert-trust-dialog.c:149
-msgid ""
-"Because you do not trust the certificate authority that issued this "
-"certificate, then you do not trust the authenticity of this certificate "
-"unless otherwise indicated here"
+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:134
@@ -17166,7 +16717,8 @@ msgstr "Sertifikaadi nimi"
 msgid "Purposes"
 msgstr "Kasutusalad"
 
-#: ../smime/gui/certificate-manager.c:283 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/certificate-manager.c:283
+#: ../smime/gui/smime-ui.glade.h:37
 #: ../smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Seerianumber"
@@ -17271,15 +16823,14 @@ msgid "Backup All"
 msgstr "Varunda kõik"
 
 #: ../smime/gui/smime-ui.glade.h:13
-msgid ""
-"Before trusting this CA for any purpose, you should examine its certificate "
-"and its policy and procedures (if available)."
+msgid "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available)."
 msgstr ""
 "Enne selle sertifitseerimiskeskuse (SK) usaldamist ükskõik mis eesmärgil, "
 "peaksid sa selle SK kasutamisreeglitega ja protseduuridega (kui need on "
 "saadaval)."
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1076
+#: ../smime/gui/smime-ui.glade.h:14
+#: ../smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Sertifikaat"
 
@@ -17355,11 +16906,13 @@ msgstr "Organisatsiooniüksus (OU):"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 sõrmejälg"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:818
+#: ../smime/gui/smime-ui.glade.h:35
+#: ../smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "SSL-kliendi sertifikaat"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:822
+#: ../smime/gui/smime-ui.glade.h:36
+#: ../smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "SSL-serveri sertifikaat"
 
@@ -17388,8 +16941,7 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "Sinu sertifikaadid organisatsioonidelt, mis aitavad sind tuvastada:"
 
 #: ../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 "Sinu sertifikaadid, mis aitavad sul tuvastada sertifitseerimiskeskusi:"
 
 #: ../smime/gui/smime-ui.glade.h:45
@@ -17409,7 +16961,8 @@ msgstr ""
 msgid "Certificate already exists"
 msgstr "Sertifikaat on juba olemas."
 
-#: ../smime/lib/e-cert.c:238 ../smime/lib/e-cert.c:248
+#: ../smime/lib/e-cert.c:238
+#: ../smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
@@ -17531,11 +17084,13 @@ msgstr ""
 msgid "Subject's Public Key"
 msgstr "Teema avalik võti"
 
-#: ../smime/lib/e-cert.c:809 ../smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:809
+#: ../smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Viga: laiendit pole võimalik töödelda"
 
-#: ../smime/lib/e-cert.c:830 ../smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:830
+#: ../smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Objekti allkirjastaja"
 
@@ -17579,7 +17134,8 @@ msgstr "CRL allkirjastaja"
 msgid "Critical"
 msgstr "Kriitiline"
 
-#: ../smime/lib/e-cert.c:940 ../smime/lib/e-cert.c:943
+#: ../smime/lib/e-cert.c:940
+#: ../smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Mittekriitiline"
 
@@ -17592,7 +17148,8 @@ msgstr "Laiendused"
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1211
+#: ../smime/lib/e-cert.c:1091
+#: ../smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Sertifikaadi allkirja algoritm"
 
@@ -17661,113 +17218,109 @@ msgstr "'%s' käivitamine pole võimalik: %s\n"
 msgid "Shutting down %s (%s)\n"
 msgstr "Süsteemi %s sulgemine (%s)\n"
 
-#: ../ui/evolution-addressbook.xml.h:2
-msgid "Contact _Preview"
-msgstr "Kontakti _eelvaade"
-
-#: ../ui/evolution-addressbook.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:3
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "Kopeeri valitud kontaktid teise kausta..."
 
-#: ../ui/evolution-addressbook.xml.h:5 ../ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:4
+#: ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Valiku kopeerimine"
 
-#: ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-addressbook.xml.h:5
 msgid "Copy to Folder..."
 msgstr "Kopeeri kausta..."
 
-#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-memos.xml.h:4
-#: ../ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Lõika"
-
-#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:7
+#: ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Valiku lõikamine"
 
-#: ../ui/evolution-addressbook.xml.h:10
+#: ../ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Kustutab valitud kontaktid"
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Forward Contact"
-msgstr "Edasta kontakt"
-
-#: ../ui/evolution-addressbook.xml.h:12
 msgid "Move Selected Contacts to Another Folder..."
 msgstr "Tõsta valitud kontaktid teise kausta..."
 
-#: ../ui/evolution-addressbook.xml.h:13
+#: ../ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr "Tõsta kausta..."
 
-#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-memos.xml.h:8
-#: ../ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Aseta"
-
-#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:14
+#: ../ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
 msgstr "Lõikepuhvri asetamine"
 
-#: ../ui/evolution-addressbook.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Trükitavate kontaktide eelvaatlemine"
 
-#: ../ui/evolution-addressbook.xml.h:19
+#: ../ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Valitud kontaktide printimine"
 
-#: ../ui/evolution-addressbook.xml.h:21
+#: ../ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Salvesta valitud kontaktid VKaardina."
 
-#: ../ui/evolution-addressbook.xml.h:22 ../widgets/text/e-text.c:2684
+#: ../ui/evolution-addressbook.xml.h:21
+#: ../widgets/text/e-text.c:2684
 msgid "Select All"
 msgstr "Vali kõik"
 
-#: ../ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Vali kõik kontaktid"
 
-#: ../ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-addressbook.xml.h:23
 msgid "Send a message to the selected contacts."
 msgstr "Saada sõnum valitud kontaktidele."
 
-#: ../ui/evolution-addressbook.xml.h:25
+#: ../ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Saada kontaktile sõnum"
 
-#: ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Saadab valitud kontaktid teisele isikule."
 
-#: ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-addressbook.xml.h:26
 msgid "Show contact preview window"
 msgstr "Kuva kontakt eelvaateaknas"
 
-#: ../ui/evolution-addressbook.xml.h:28
+#: ../ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Peata"
 
-#: ../ui/evolution-addressbook.xml.h:29
+#: ../ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Peatab laadimise"
 
-#: ../ui/evolution-addressbook.xml.h:30
+#: ../ui/evolution-addressbook.xml.h:29
 msgid "View the current contact"
 msgstr "Kuva käesolev kontakt"
 
-#: ../ui/evolution-addressbook.xml.h:31 ../ui/evolution-calendar.xml.h:38
-#: ../ui/evolution-tasks.xml.h:21
+#: ../ui/evolution-addressbook.xml.h:30
+#: ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-tasks.xml.h:19
 msgid "_Actions"
 msgstr "_Tegevused"
 
-#: ../ui/evolution-addressbook.xml.h:36
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "_Forward Contact..."
 msgstr "_Edasta kontakt..."
 
+#: ../ui/evolution-addressbook.xml.h:39
+msgid "_Preview Pane"
+msgstr "_Eelvaatepaan"
+
+#: ../ui/evolution-addressbook.xml.h:41
+msgid "_Save as VCard..."
+msgstr "_Salvesta VKaardina"
+
 #: ../ui/evolution-addressbook.xml.h:42
 msgid "_Select All"
 msgstr "Vali _kõik"
@@ -17816,7 +17369,8 @@ msgstr "Loend"
 msgid "Month"
 msgstr "Kuu"
 
-#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-calendar.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:59
 msgid "Next"
 msgstr "Järgmine"
 
@@ -17824,7 +17378,8 @@ msgstr "Järgmine"
 msgid "Previews the calendar to be printed"
 msgstr "Trükitava kalendri eelvaatlemine"
 
-#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-calendar.xml.h:18
+#: ../ui/evolution-mail-message.xml.h:75
 msgid "Previous"
 msgstr "Eelmine"
 
@@ -17836,7 +17391,8 @@ msgstr "Kalendri printimine"
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Selle kalendri vaba/hõivatud teabe avalikustamine"
 
-#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
+#: ../ui/evolution-calendar.xml.h:23
+#: ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "_Puhasta"
 
@@ -17848,10 +17404,6 @@ msgstr "Vanadest sündmustest ja koosolekutest puhastamine"
 msgid "Select _Date"
 msgstr "Vali _kuupäev"
 
-#: ../ui/evolution-calendar.xml.h:26
-msgid "Select _Today"
-msgstr "Vali _tänane kuupäev"
-
 #: ../ui/evolution-calendar.xml.h:27
 msgid "Select a specific date"
 msgstr "Määratud kuupäeva valimine"
@@ -17896,215 +17448,31 @@ msgstr "Töönädal"
 msgid "_Open Appointment"
 msgstr "_Ava sündmus"
 
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-editor.xml.h:7
+#: ../ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
 msgstr ";ärgitud teksti lõikelauale kopeerimine"
 
-#: ../ui/evolution-composer-entries.xml.h:3 ../ui/evolution-editor.xml.h:9
+#: ../ui/evolution-composer-entries.xml.h:2
+msgid "Cu_t"
+msgstr "Lõ_ika"
+
+#: ../ui/evolution-composer-entries.xml.h:3
 msgid "Cut selected text to the clipboard"
 msgstr "Lõika valitud tekst lõikelauale"
 
-#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:10
+#: ../ui/evolution-composer-entries.xml.h:4
 msgid "Paste text from the clipboard"
 msgstr "Teksti asetamine lõikepuhvrist"
 
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-editor.xml.h:12
+#: ../ui/evolution-composer-entries.xml.h:5
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Vali _kõik"
 
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:6
 msgid "Select all text"
 msgstr "Vali kogu tekst"
 
-#: ../ui/evolution-editor.xml.h:2
-#, fuzzy
-msgid "Click here to attach a file"
-msgstr "<kausta valimiseks kliki siia>"
-
-#: ../ui/evolution-editor.xml.h:3
-#, fuzzy
-msgid "Click here to close the current window"
-msgstr "Sulge fail"
-
-#: ../ui/evolution-editor.xml.h:4
-#, fuzzy
-msgid "Click here to save the current window"
-msgstr "Sulge fail"
-
-#: ../ui/evolution-editor.xml.h:5
-#, fuzzy
-msgid "Click here to view help availabe"
-msgstr "<kuupäeva valimiseks kliki siia>"
-
-#.
-#. <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:4
-#: ../ui/evolution-signature-editor.xml.h:7
-msgid "Close"
-msgstr "Sulge"
-
-#: ../ui/evolution-editor.xml.h:14
-#, fuzzy
-msgid "_Attachments"
-msgstr "Manused"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:42 ../ui/evolution-subscribe.xml.h:9
-msgid "_Close"
-msgstr "Sul_ge"
-
-#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:45
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:37
-msgid "_File"
-msgstr "_Fail"
-
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:38
-msgid "_Help"
-msgstr "_Abi"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-message-composer.xml.h:47
-#: ../ui/evolution-signature-editor.xml.h:25
-msgid "_Insert"
-msgstr "_Lisa"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "_Valikud"
-
-#: ../ui/evolution-event-editor.xml.h:2
-#, fuzzy
-msgid "All day Event"
-msgstr "Kestab kogu _päeva"
-
-#: ../ui/evolution-event-editor.xml.h:3 ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "Salajaseks liigitamine"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "Isiklikuks liigitamine"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "Avalikuks liigitamine"
-
-#: ../ui/evolution-event-editor.xml.h:7 ../ui/evolution-task-editor.xml.h:5
-#, fuzzy
-msgid "Insert advanced send options"
-msgstr "Kasutaja katkestas toimingu."
-
-#: ../ui/evolution-event-editor.xml.h:8
-#, fuzzy
-msgid "Make this a recurring event"
-msgstr "Muuda seekordne sündmus _liigutatavaks"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:6
-#, fuzzy
-msgid "Pu_blic"
-msgstr "Avalik"
-
-#: ../ui/evolution-event-editor.xml.h:10
-#, fuzzy
-msgid "Query free / busy information for the attendees"
-msgstr "Selle kalendri vaba/hõivatud teabe avalikustamine"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-task-editor.xml.h:7
-#, fuzzy
-msgid "R_ole Field"
-msgstr "_Vasta-kellele (To) väli"
-
-#: ../ui/evolution-event-editor.xml.h:14 ../ui/evolution-task-editor.xml.h:9
-#, fuzzy
-msgid "Show Time _Zone"
-msgstr "Aja_vöönd:"
-
-#: ../ui/evolution-event-editor.xml.h:15
-#, fuzzy
-msgid "Show time as b_usy"
-msgstr "Näita aega kui _hõivatut"
-
-#: ../ui/evolution-event-editor.xml.h:16 ../ui/evolution-task-editor.xml.h:12
-#, fuzzy
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "Lülitab koopiavälja näitamise sisse või välja"
-
-#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:13
-#, fuzzy
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "Lülitab koopiavälja näitamise sisse või välja"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:14
-#, fuzzy
-msgid "Toggles whether the Role field is displayed"
-msgstr "Lülitab koopiavälja näitamise sisse või välja"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:15
-#, fuzzy
-msgid "Toggles whether the Status field is displayed"
-msgstr "Lülitab koopiavälja näitamise sisse või välja"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:16
-#, fuzzy
-msgid "Toggles whether the time zone is displayed"
-msgstr "Lülitab koopiavälja näitamise sisse või välja"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:17
-#, fuzzy
-msgid "Toggles whether to display categories"
-msgstr "Lülitab koopiavälja näitamise sisse või välja"
-
-#: ../ui/evolution-event-editor.xml.h:22
-#, fuzzy
-msgid "Toggles whether to have All day Event"
-msgstr "Lülitab koopiavälja näitamise sisse või välja"
-
-#: ../ui/evolution-event-editor.xml.h:23
-#, fuzzy
-msgid "Toggles whether to show time as busy"
-msgstr "Lülitab koopiavälja näitamise sisse või välja"
-
-#: ../ui/evolution-event-editor.xml.h:24
-msgid "_Alarms"
-msgstr "_Alarmid"
-
-#: ../ui/evolution-event-editor.xml.h:25
-#, fuzzy
-msgid "_All day Event"
-msgstr "Kestab kogu _päeva"
-
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "_Liigitamine"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "_Salajane"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "_Isiklik"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-task-editor.xml.h:24
-#, fuzzy
-msgid "_Status Field"
-msgstr "_Olek"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:25
-#, fuzzy
-msgid "_Type Field"
-msgstr "_Vasta-kellele (To) väli"
-
 #: ../ui/evolution-executive-summary.xml.h:1
 msgid "Customize My Evolution"
 msgstr "Minu Evolutioni kohandamine"
@@ -18133,7 +17501,8 @@ msgstr "Uute sõnumite filtreerimisreeglite loomine või muutmine"
 msgid "Empty _Trash"
 msgstr "Puhasta _prügist"
 
-#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:7
+#: ../ui/evolution-mail-global.xml.h:8
+#: ../ui/evolution-mail-list.xml.h:6
 #: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "Ka_ust"
@@ -18143,14 +17512,17 @@ msgid "Message F_ilters"
 msgstr "Sõnumif_iltrid"
 
 #: ../ui/evolution-mail-global.xml.h:10
+msgid "Message _List As"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:11
 msgid "Message _Preview"
 msgstr "Sõnumi _eelvaade"
 
-#: ../ui/evolution-mail-global.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:12
 msgid "Move the selected folder into another folder"
 msgstr "Valitud kausta tõstmine teise kausta alla"
 
-#. Alphabetical by name, yo
 #: ../ui/evolution-mail-global.xml.h:13
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Eemaldab lõplikult kõikidest kaustadest kõik kustutatud sõnumid"
@@ -18176,13 +17548,14 @@ msgid "_Move Folder To..."
 msgstr "_Tõsta kaustad asukohta..."
 
 #: ../ui/evolution-mail-global.xml.h:19
+msgid "_New Search _Folder (FIXME)"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:20
 msgid "_New..."
 msgstr "_Uus..."
 
-#.
-#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
-#.
-#: ../ui/evolution-mail-global.xml.h:23
+#: ../ui/evolution-mail-global.xml.h:21
 msgid "_Subscriptions"
 msgstr "_Tellimused"
 
@@ -18194,97 +17567,99 @@ msgstr "Kausta nime muutmine"
 msgid "Change the properties of this folder"
 msgstr "Kausta omaduste muutmine"
 
-#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-list.xml.h:3
+#: ../ui/evolution-mail-message.xml.h:12
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Kopeerib valitud sõnumi(d) lõikelauale"
 
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-list.xml.h:5 ../ui/evolution-mail-message.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:4
+#: ../ui/evolution-mail-message.xml.h:23
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Tõstab valitud sõnumi(d) lõikelauale"
 
-#: ../ui/evolution-mail-list.xml.h:6
+#: ../ui/evolution-mail-list.xml.h:5
 msgid "E_xpunge"
 msgstr "_Tühjenda"
 
-#: ../ui/evolution-mail-list.xml.h:8
+#: ../ui/evolution-mail-list.xml.h:7
 msgid "Group By _Threads"
 msgstr "Grupeeri _lõimedena"
 
-#: ../ui/evolution-mail-list.xml.h:9
+#: ../ui/evolution-mail-list.xml.h:8
 msgid "Hide S_elected Messages"
 msgstr "Peida _valitud sõnumid"
 
-#: ../ui/evolution-mail-list.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:9
 msgid "Hide _Deleted Messages"
 msgstr "Peida _kustutatud sõnumid"
 
-#: ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-list.xml.h:10
 msgid "Hide _Read Messages"
 msgstr "Peida _loetud sõnumid"
 
-#: ../ui/evolution-mail-list.xml.h:12
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
+#: ../ui/evolution-mail-list.xml.h:11
+msgid "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:13
-msgid "Mar_k Messages as Read"
+#: ../ui/evolution-mail-list.xml.h:12
+msgid "Mark Me_ssages as Read"
 msgstr "_Märgi sõnumid loetuks"
 
-#: ../ui/evolution-mail-list.xml.h:14 ../ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-list.xml.h:13
+#: ../ui/evolution-mail-message.xml.h:68
 msgid "Paste message(s) from the clipboard"
 msgstr "Asetab sõnumid lõikepuhvrist"
 
-#: ../ui/evolution-mail-list.xml.h:15
+#: ../ui/evolution-mail-list.xml.h:14
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Eemaldab lõplikult sellest kaustadest kõik kustutatud sõnumid"
 
-#: ../ui/evolution-mail-list.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:15
 msgid "Permanently remove this folder"
 msgstr "Kausta lõplik eemaldamine"
 
-#: ../ui/evolution-mail-list.xml.h:17
+#: ../ui/evolution-mail-list.xml.h:16
 msgid "Select Message _Thread"
 msgstr "Vali sõnumi _lõim"
 
-#: ../ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:17
 msgid "Select _All Messages"
 msgstr "Vali _kõik sõnumid"
 
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:18
 msgid "Select all and only the messages that are not currently selected"
 msgstr "Valib kõik sõnumid, mis hetkel ei ole valitud"
 
-#: ../ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:19
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Valib kõik valitud sõnumiga samas jutulõngas olevad sõnumid"
 
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:20
 msgid "Select all visible messages"
 msgstr "Valib kõik peitmata sõnumid"
 
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:21
 msgid "Sh_ow Hidden Messages"
 msgstr "_Näita peidetud sõnumeid"
 
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:22
 msgid "Show messages that have been temporarily hidden"
 msgstr "Toob ajutiselt peidetud sõnumid peidust välja"
 
-#: ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:23
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Viib kõik loetud sõnumid ajutiselt peitu"
 
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:24
 msgid "Temporarily hide the selected messages"
 msgstr "Viib valitud sõnumid ajutiselt peitu"
 
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "Threaded Message list"
 msgstr "Esitab sõnumeid jutulõngadena"
 
-#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-list.xml.h:28
+#: ../ui/evolution-mail-message.xml.h:112
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Sõnum"
@@ -18297,456 +17672,437 @@ msgstr "Lisa saatja _aadressiraamatusse"
 msgid "A_pply Filters"
 msgstr "_Rakenda filtreid"
 
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-message.xml.h:4
+#: ../ui/evolution-mail-message.xml.h:3
 msgid "Add Sender to Address Book"
 msgstr "Saatja lisamine aadressiraamatusse"
 
-#: ../ui/evolution-mail-message.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:4
 msgid "All Message _Headers"
 msgstr "Kõik sõnumi _päised"
 
-#: ../ui/evolution-mail-message.xml.h:6
+#: ../ui/evolution-mail-message.xml.h:5
 msgid "Apply filter rules to the selected messages"
 msgstr "Rakendab filtreerimisreeglid valitud sõnumitele"
 
-#: ../ui/evolution-mail-message.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:6
 msgid "Check for _Junk"
 msgstr "Kontrolli _rämpsu"
 
-#: ../ui/evolution-mail-message.xml.h:8
+#: ../ui/evolution-mail-message.xml.h:7
 msgid "Compose _New Message"
 msgstr "Koosta _uus sõnum"
 
-#: ../ui/evolution-mail-message.xml.h:9
+#: ../ui/evolution-mail-message.xml.h:8
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Koostab vastuse kõigile valitud sõnumi adressaatidele"
 
-#: ../ui/evolution-mail-message.xml.h:10
+#: ../ui/evolution-mail-message.xml.h:9
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Koostab vastuse valitud sõnumi postiloendisse"
 
-#: ../ui/evolution-mail-message.xml.h:11
+#: ../ui/evolution-mail-message.xml.h:10
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Koostab vastuse valitud sõnumi koostajale"
 
-#: ../ui/evolution-mail-message.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:13
 msgid "Copy selected messages to another folder"
 msgstr "Kopeerib valitud sõnumi teise kausta"
 
-#: ../ui/evolution-mail-message.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:14
 msgid "Create R_ule"
 msgstr "Loo _reegel"
 
-#: ../ui/evolution-mail-message.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:15
 msgid "Create a Search Folder for these recipients"
 msgstr "Otsikausta loomine nende adressaatide jaoks"
 
-#: ../ui/evolution-mail-message.xml.h:17
+#: ../ui/evolution-mail-message.xml.h:16
 msgid "Create a Search Folder for this mailing list"
 msgstr "Otsikausta loomine selle postiloendi jaoks"
 
-#: ../ui/evolution-mail-message.xml.h:18
+#: ../ui/evolution-mail-message.xml.h:17
 msgid "Create a Search Folder for this sender"
 msgstr "Otsikausta loomine selle saatja jaoks"
 
-#: ../ui/evolution-mail-message.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:18
 msgid "Create a Search Folder for this subject"
 msgstr "Otsikausta loomine selle teema jaoks"
 
-#: ../ui/evolution-mail-message.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a rule to filter messages from this sender"
 msgstr "Reegli loomine selle saatja poolt saadetud sõnumite filtreerimiseks"
 
-#: ../ui/evolution-mail-message.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 "Reegli loomine nendele adressaatidele saadetud sõnumite filtreerimiseks"
 
-#: ../ui/evolution-mail-message.xml.h:22
+#: ../ui/evolution-mail-message.xml.h:21
 msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 "Reegli loomine sellese postiloendisse saadetud sõnumite filtreerimiseks"
 
-#: ../ui/evolution-mail-message.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:22
 msgid "Create a rule to filter messages with this subject"
 msgstr "Reegli loomine selle teemaga sõnumite filtreerimiseks"
 
-#: ../ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-mail-message.xml.h:24
 msgid "Decrease the text size"
 msgstr "Teksti suuruse vähendamine"
 
-#: ../ui/evolution-mail-message.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:26
 msgid "Display the next important message"
 msgstr "Järgmise tähtsa sõnumi kuvamine"
 
-#: ../ui/evolution-mail-message.xml.h:28
+#: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next message"
 msgstr "Järgmise sõnumi kuvamine"
 
-#: ../ui/evolution-mail-message.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:28
 msgid "Display the next unread message"
 msgstr "Järgmise lugemata sõnumi kuvamine"
 
-#: ../ui/evolution-mail-message.xml.h:30
+#: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the next unread thread"
 msgstr "Järgmise lugemata jutulõnga kuvamine"
 
-#: ../ui/evolution-mail-message.xml.h:31
+#: ../ui/evolution-mail-message.xml.h:30
 msgid "Display the previous important message"
 msgstr "Eelmise tähtsa sõnumi kuvamine"
 
-#: ../ui/evolution-mail-message.xml.h:32
+#: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous message"
 msgstr "Eelmise sõnumi kuvamine"
 
-#: ../ui/evolution-mail-message.xml.h:33
+#: ../ui/evolution-mail-message.xml.h:32
 msgid "Display the previous unread message"
 msgstr "Eelmise lugemata sõnumi kuvamine"
 
-#: ../ui/evolution-mail-message.xml.h:34
+#: ../ui/evolution-mail-message.xml.h:33
 msgid "Filter on Mailing _List..."
 msgstr "Filter _postiloendi järgi"
 
-#: ../ui/evolution-mail-message.xml.h:35
+#: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Se_nder..."
 msgstr "Filter _saatja järgi"
 
-#: ../ui/evolution-mail-message.xml.h:36
+#: ../ui/evolution-mail-message.xml.h:35
 msgid "Filter on _Recipients..."
 msgstr "Filter _adressaatide järgi"
 
-#: ../ui/evolution-mail-message.xml.h:37
+#: ../ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Subject..."
 msgstr "Filter _teema järgi"
 
-#: ../ui/evolution-mail-message.xml.h:38
+#: ../ui/evolution-mail-message.xml.h:37
 msgid "Filter the selected messages for junk status"
 msgstr "Valitud sõnumitest rämpsu filtreerimine"
 
-#: ../ui/evolution-mail-message.xml.h:39
+#: ../ui/evolution-mail-message.xml.h:38
 msgid "Flag selected message(s) for follow-up"
 msgstr "Märgib valitud sõnumi(d) jälgimiseks"
 
-#: ../ui/evolution-mail-message.xml.h:40
+#: ../ui/evolution-mail-message.xml.h:39
 msgid "Follow _Up..."
 msgstr "_Jälgi..."
 
-#: ../ui/evolution-mail-message.xml.h:41
+#: ../ui/evolution-mail-message.xml.h:40
 msgid "Force images in HTML mail to be loaded"
 msgstr "Laeb HTML-vormingus sõnumi pildid"
 
-#: ../ui/evolution-mail-message.xml.h:43
+#: ../ui/evolution-mail-message.xml.h:42
 msgid "Forward the selected message in the body of a new message"
 msgstr "Saadab valitud sõnumi kellelegi edasi (saadetava sõnumi sees)"
 
-#: ../ui/evolution-mail-message.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message quoted like a reply"
 msgstr "Saadab valitud sõnumi kellelegi edasi (tsitaadina)"
 
-#: ../ui/evolution-mail-message.xml.h:45
+#: ../ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message to someone"
 msgstr "Saadab valitud sõnumi kellelegi edasi"
 
-#: ../ui/evolution-mail-message.xml.h:46
+#: ../ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Saadab valitud sõnumi kellelegi edasi (manusena)"
 
-#: ../ui/evolution-mail-message.xml.h:47
+#: ../ui/evolution-mail-message.xml.h:46
 msgid "Increase the text size"
 msgstr "Suurendab teksti suurust"
 
-#: ../ui/evolution-mail-message.xml.h:49
+#: ../ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as"
 msgstr "Märgi _kui"
 
-#: ../ui/evolution-mail-message.xml.h:50
+#: ../ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected message(s) as having been read"
 msgstr "Märgib valitud sõnum(id) loetuks"
 
-#: ../ui/evolution-mail-message.xml.h:51
+#: ../ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as important"
 msgstr "Märgib valitud sõnum(id) tähtsaks"
 
-#: ../ui/evolution-mail-message.xml.h:52
+#: ../ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected message(s) as junk"
 msgstr "Märgib valitud sõnumi(d) rämpsuks"
 
-#: ../ui/evolution-mail-message.xml.h:53
+#: ../ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected message(s) as not being junk"
 msgstr "Märgib valitud sõnumi(d) mitterämpsuks"
 
-#: ../ui/evolution-mail-message.xml.h:54
+#: ../ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Märgib valitud sõnumi(d) lugemata sõnumi(te)ks"
 
-#: ../ui/evolution-mail-message.xml.h:55
+#: ../ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Märgib valitud sõnumi(d) vähetähtsaks"
 
-#: ../ui/evolution-mail-message.xml.h:56
+#: ../ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected messages for deletion"
 msgstr "Märgib valitud sõnumid kustutatuks"
 
-#: ../ui/evolution-mail-message.xml.h:57
+#: ../ui/evolution-mail-message.xml.h:56
 msgid "Message Source"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:58
+#: ../ui/evolution-mail-message.xml.h:57
 msgid "Move"
 msgstr "Tõsta"
 
-#: ../ui/evolution-mail-message.xml.h:59
+#: ../ui/evolution-mail-message.xml.h:58
 msgid "Move selected message(s) to another folder"
 msgstr "Tõstab valitud sõnumi(d) teise kausta"
 
-#: ../ui/evolution-mail-message.xml.h:61
+#: ../ui/evolution-mail-message.xml.h:60
 msgid "Next _Important Message"
 msgstr "Jä_rgmine tähtis kiri"
 
-#: ../ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Thread"
 msgstr "Järgmine _lõim"
 
-#: ../ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:62
 msgid "Next _Unread Message"
 msgstr "Järgmine _lugemata sõnum"
 
-#: ../ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:63
 msgid "Not Junk"
 msgstr "Ei ole rämps"
 
-#: ../ui/evolution-mail-message.xml.h:65
+#: ../ui/evolution-mail-message.xml.h:64
 msgid "Open a window for composing a mail message"
 msgstr "Avab sõnumi koostamiseks uue akna"
 
-#: ../ui/evolution-mail-message.xml.h:66
+#: ../ui/evolution-mail-message.xml.h:65
 msgid "Open the selected message in a new window"
 msgstr "Avab valitud sõnumi uues aknas"
 
-#: ../ui/evolution-mail-message.xml.h:67
+#: ../ui/evolution-mail-message.xml.h:66
 msgid "Open the selected message in the composer for editing"
 msgstr "Avab valitud sõnumi sõnumiredaktoris"
 
-#: ../ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-message.xml.h:67
 msgid "P_revious Unread Message"
 msgstr "_Eelmine lugemata kiri"
 
-#: ../ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Pos_t New Message to Folder"
 msgstr "Pos_tita uus sõnum kausta"
 
-#: ../ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:70
 msgid "Post a Repl_y"
 msgstr "Postita _vastus"
 
-#: ../ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-mail-message.xml.h:71
 msgid "Post a message to a Public folder"
 msgstr "Sõnumi postitamine avalikku kausta"
 
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:72
 msgid "Post a reply to a message in a Public folder"
 msgstr "Vastuse postitamine avalikku kausta"
 
-#: ../ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Pr_evious Important Message"
 msgstr "_Eelmine tähtis sõnum"
 
-#: ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-mail-message.xml.h:74
 msgid "Preview the message to be printed"
 msgstr "Trükitava sõnumi eelvaatlemine"
 
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:78
 msgid "Print this message"
 msgstr "Valitud sõnumi printimine"
 
-#: ../ui/evolution-mail-message.xml.h:80
+#: ../ui/evolution-mail-message.xml.h:79
 msgid "Re_direct"
 msgstr "Ümber_suunamine"
 
-#: ../ui/evolution-mail-message.xml.h:81
+#: ../ui/evolution-mail-message.xml.h:80
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Valitud sõnumite edastamine kellelegi"
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Reset the text to its original size"
 msgstr "Taastab teksti algse suuruse"
 
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:85
 msgid "Save the message as a text file"
 msgstr "Salvestab sõnumi tekstifaili"
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Search Folder from Mailing _List..."
 msgstr "Otsikaust posti_loendi järgi..."
 
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Search Folder from Recipients..."
 msgstr "Otsikaust adressaatide järgi..."
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Search Folder from S_ubject..."
 msgstr "Otsikaust teema järgi..."
 
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:89
 msgid "Search Folder from Sen_der..."
 msgstr "Otsikaust saatja järgi..."
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Search for text in the body of the displayed message"
 msgstr "Otsib teksti kuvatud sõnumi sisust"
 
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Select _All Text"
 msgstr "V_ali kogu tekst"
 
-#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Select all the text in a message"
 msgstr "Sõnumi kogu teksti valimine"
 
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Set up the page settings for your current printer"
 msgstr "Lehekülje sätted aktiivse printeri jaoks"
 
-#: ../ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Näitab kuvatava sõnumi sisus vilkuvat kursorit"
 
-#: ../ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Show message in the normal style"
 msgstr "Näitab sõnumit tavalise stiiliga"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show message with all email headers"
 msgstr "Näitab sõnumit koos kõigi päistega"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Show the raw email source of the message"
 msgstr "Näitab sõnumit töötlemata kujul"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Un-delete the selected messages"
 msgstr "Taastab valitud sõnumi"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Uni_mportant"
 msgstr "_Vähetähtis"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "Zoom _Out"
 msgstr "_Vähenda"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
 msgstr "_Kursorirežiim"
 
-#: ../ui/evolution-mail-message.xml.h:105
+#: ../ui/evolution-mail-message.xml.h:104
 msgid "_Delete Message"
 msgstr "_Kustuta sõnum"
 
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Find in Message..."
 msgstr "_Otsi sõnumist..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Go To"
 msgstr "_Liigu"
 
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Important"
 msgstr "_Tähtis"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Junk"
 msgstr "_Rämps"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Load Images"
 msgstr "_Laadi pildid"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Next Message"
 msgstr "_Järgmine sõnum"
 
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Normal Size"
 msgstr "_Tavaline suurus"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Not Junk"
 msgstr "_Pole rämps"
 
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Open in New Window"
 msgstr "_Ava uues aknas"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Previous Message"
 msgstr "_Eelmine sõnum"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Save Message..."
 msgstr "_Salvesta sõnum..."
 
-#: ../ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:123
 msgid "_Undelete Message"
 msgstr "_Tühista kustutus"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Unread"
 msgstr "_Lugemata"
 
-#: ../ui/evolution-mail-message.xml.h:126
+#: ../ui/evolution-mail-message.xml.h:125
 msgid "_Zoom In"
 msgstr "_Suurenda"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+#: ../ui/evolution-message-composer.xml.h:4
+#: ../ui/evolution-signature-editor.xml.h:2
+msgid "Close"
+msgstr "Sulge"
+
+#: ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Akna sulgemine"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
+#: ../ui/evolution-mail-messagedisplay.xml.h:3
+#: ../ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "Peatööriistariba"
 
-#: ../ui/evolution-memos.xml.h:3
-#, fuzzy
-msgid "Copy selected memo"
-msgstr "Kopeerib valitud ülesande"
-
-#: ../ui/evolution-memos.xml.h:5
-#, fuzzy
-msgid "Cut selected memo"
-msgstr "Lõikab valitud ülesande"
-
-#: ../ui/evolution-memos.xml.h:7
-#, fuzzy
-msgid "Delete selected memos"
-msgstr "Kustutab valitud ülesanded"
-
-#: ../ui/evolution-memos.xml.h:9
-#, fuzzy
-msgid "Paste memo from the clipboard"
-msgstr "Teksti asetamine lõikepuhvrist"
-
-#: ../ui/evolution-memos.xml.h:10
-#, fuzzy
-msgid "Previews the list of memos to be printed"
-msgstr "Trükitavate kontaktide eelvaatlemine"
-
-#: ../ui/evolution-memos.xml.h:13
-#, fuzzy
-msgid "Print the list of memos"
-msgstr "Ülesannete nimekirja printimine"
-
-#: ../ui/evolution-memos.xml.h:14
-#, fuzzy
-msgid "View the selected memo"
-msgstr "Vaata valitud ülesannet"
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:42
+#: ../ui/evolution-subscribe.xml.h:9
+msgid "_Close"
+msgstr "Sul_ge"
 
-#: ../ui/evolution-memos.xml.h:18
-#, fuzzy
-msgid "_Open Memo"
-msgstr "_Ava sõnumid"
+#: ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:45
+#: ../ui/evolution-signature-editor.xml.h:13
+#: ../ui/evolution-subscribe.xml.h:11
+#: ../ui/evolution.xml.h:33
+msgid "_File"
+msgstr "_Fail"
 
 #: ../ui/evolution-message-composer.xml.h:1
 msgid "Attach"
@@ -18760,13 +18116,8 @@ msgstr "Lisab sõnumile faili"
 msgid "Check to get delivery notification when your message is read"
 msgstr ""
 
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
 #: ../ui/evolution-message-composer.xml.h:5
-#: ../ui/evolution-signature-editor.xml.h:13
+#: ../ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
 msgstr "Sulge fail"
 
@@ -18783,7 +18134,7 @@ msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Sõnumi krüptimine sinu S/MIME krüptimissertifikaadi abil"
 
 #: ../ui/evolution-message-composer.xml.h:9
-#: ../ui/evolution-signature-editor.xml.h:14
+#: ../ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
 msgstr "Vor_ming"
 
@@ -18840,6 +18191,7 @@ msgid "Save in folder..."
 msgstr "Salvesta kausta..."
 
 #: ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-signature-editor.xml.h:9
 msgid "Save the current file"
 msgstr "Käesoleva faili salvestamine"
 
@@ -18852,7 +18204,7 @@ msgid "Save the message in a specified folder"
 msgstr "Käesoleva faili salvestamine teise kausta"
 
 #: ../ui/evolution-message-composer.xml.h:29
-#: ../ui/evolution-signature-editor.xml.h:22
+#: ../ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
 msgstr "Saada sõnum HTML formaadis"
 
@@ -18912,6 +18264,11 @@ msgstr "_Kustuta kõik"
 msgid "_From Field"
 msgstr "_Kellelt (From) väli"
 
+#: ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-signature-editor.xml.h:14
+msgid "_Insert"
+msgstr "_Lisa"
+
 #: ../ui/evolution-message-composer.xml.h:48
 msgid "_Open..."
 msgstr "_Ava..."
@@ -18936,22 +18293,19 @@ msgstr "_Vasta-kellele (To) väli"
 msgid "C_lose"
 msgstr "_Sulge"
 
-#: ../ui/evolution-signature-editor.xml.h:15
+#: ../ui/evolution-signature-editor.xml.h:5
 msgid "H_TML"
 msgstr "H_TML"
 
-#: ../ui/evolution-signature-editor.xml.h:16
+#: ../ui/evolution-signature-editor.xml.h:7
 msgid "Save and Close"
 msgstr "Salvesta ja sulge"
 
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:20
+#: ../ui/evolution-signature-editor.xml.h:8
 msgid "Save and _Close"
 msgstr "Salvesta ja _sulge"
 
-#: ../ui/evolution-signature-editor.xml.h:21
+#: ../ui/evolution-signature-editor.xml.h:10
 msgid "Save the current file and close the window"
 msgstr "Aktiivse faili salvestamine ja akna sulgemine"
 
@@ -18983,22 +18337,6 @@ msgstr "Lõpeta tellimus"
 msgid "_Invert Selection"
 msgstr "_Inverdi valik"
 
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr ""
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Status Details"
-msgstr "Oleku üksikasjad"
-
-#: ../ui/evolution-task-editor.xml.h:11
-msgid "Time Zone"
-msgstr "Ajavöönd"
-
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Status Details"
-msgstr "_Oleku üksikasjad"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopeerib valitud ülesande"
@@ -19036,18 +18374,10 @@ msgid "Print the list of tasks"
 msgstr "Ülesannete nimekirja printimine"
 
 #: ../ui/evolution-tasks.xml.h:18
-msgid "Show task preview window"
-msgstr "Kuva ülesanne eelvaateaknas"
-
-#: ../ui/evolution-tasks.xml.h:19
-msgid "Task _Preview"
-msgstr "Ülesande _eelvaade"
-
-#: ../ui/evolution-tasks.xml.h:20
 msgid "View the selected task"
 msgstr "Vaata valitud ülesannet"
 
-#: ../ui/evolution-tasks.xml.h:27
+#: ../ui/evolution-tasks.xml.h:25
 msgid "_Open Task"
 msgstr "Ava _ülesanne"
 
@@ -19084,139 +18414,135 @@ msgid "Display window buttons with text only"
 msgstr "Aknanuppude kuvamine ainult tekstina"
 
 #: ../ui/evolution.xml.h:10
+msgid "Evolution _FAQ"
+msgstr "Evolutioni _KKK"
+
+#: ../ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Programmist väljumine"
 
-#: ../ui/evolution.xml.h:11
+#: ../ui/evolution.xml.h:12
 msgid "Forget _Passwords"
 msgstr "Unusta _paroolid"
 
-#: ../ui/evolution.xml.h:12
+#: ../ui/evolution.xml.h:13
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 "Meeldejäetud paroolide unustamine, vajadusel küsitakse paroolid uuesti."
 
-#: ../ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:14
 msgid "Hide window buttons"
 msgstr "Peida akna nupud"
 
-#: ../ui/evolution.xml.h:14
+#: ../ui/evolution.xml.h:15
 msgid "Icons _and text"
 msgstr "_Ikoonid ja tekst"
 
-#: ../ui/evolution.xml.h:15
+#: ../ui/evolution.xml.h:16
 msgid "Import data from other programs"
 msgstr "Andmete importimine teistest programmidest"
 
-#: ../ui/evolution.xml.h:17
+#: ../ui/evolution.xml.h:18
 msgid "New _Window"
 msgstr "Uus _aken"
 
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:19
 msgid "Prefere_nces"
 msgstr "_Eelistused"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:20
 msgid "Send / Receive"
 msgstr "Saada / võta vastu"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "Järjekorras olevate sõnumite ärasaatmine ja uute vastuvõtmine"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "Seab Pilot'i seadeid"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:23
 msgid "Show information about Evolution"
 msgstr "Näitab teavet Evolutioni kohta"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "Saada veateade"
 
-#. <menuitem name="HelpFAQ" verb=""
-#. _label="Evolution _FAQ"/>
-#.
-#. <separator/>
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "Saada _veateade"
 
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Saada veateade kasutades Bug Buddy't"
 
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:27
 msgid "Toggle whether we are working offline."
 msgstr "Lülitab autonoomse reziimi sisse või välja"
 
-#: ../ui/evolution.xml.h:31
+#: ../ui/evolution.xml.h:28
 msgid "Tool_bar"
 msgstr "_Tööriistariba"
 
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:29
 msgid "Tool_bar style"
 msgstr "Tööriistariba _stiil"
 
-#: ../ui/evolution.xml.h:33
-msgid "View/Hide the Status Bar"
-msgstr ""
-
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:30
 msgid "_About Evolution..."
 msgstr "_Evolutionist lähemalt..."
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:31
 msgid "_Close Window"
 msgstr "_Sulge aken"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:34
+msgid "_Help"
+msgstr "_Abi"
+
+#: ../ui/evolution.xml.h:35
 msgid "_Hide buttons"
 msgstr "_Peida nupud"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:36
 msgid "_Icons only"
 msgstr "Ainult _ikoonid"
 
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:37
 msgid "_Import..."
 msgstr "_Impordi..."
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:38
 msgid "_New"
 msgstr "_Uus"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:39
 msgid "_Quick Reference"
 msgstr "_Kiirviide"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:40
 msgid "_Quit"
 msgstr "_Välju"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:41
 msgid "_Send / Receive"
 msgstr "_Saada / võta vastu"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:42
 msgid "_Switcher Appearance"
 msgstr ""
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:43
 msgid "_Synchronization Options..."
 msgstr "_Sünkroniseerimisvalikud..."
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:44
 msgid "_Text only"
 msgstr "Ainult _tekst"
 
-#: ../ui/evolution.xml.h:50
-msgid "_View Status Bar"
-msgstr "_Vaata olekuriba"
-
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:46
 msgid "_Window"
 msgstr "_Aken"
 
@@ -19276,11 +18602,6 @@ msgstr "_Jälgimise sildi järgi"
 msgid "_Messages"
 msgstr "_Sõnumid"
 
-#: ../views/memos/galview.xml.h:1
-#, fuzzy
-msgid "_Memos"
-msgstr "_Liikmed"
-
 #: ../views/tasks/galview.xml.h:1
 msgid "With _Due Date"
 msgstr "_Tähtajaga"
@@ -19312,8 +18633,7 @@ msgstr "Ajavöönd valikukast"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
 msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
+"Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
 "Kasuta vasakut hiirenuppu, et kaarti suurendada ja ajavööndit valida.\n"
@@ -19367,20 +18687,9 @@ msgstr "_Loo uue vaade"
 msgid "_Replace existing view"
 msgstr "_Asenda olemasolev vaade"
 
-#. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:585
-#: ../widgets/menus/gal-view-menus.c:350
-msgid "Custom View"
-msgstr "Kohandatud vaade"
-
-#: ../widgets/menus/gal-view-instance.c:586
-msgid "Save Custom View"
-msgstr "Salvesta kohandatud vaade"
-
-#: ../widgets/menus/gal-view-instance.c:590
-#: ../widgets/menus/gal-view-menus.c:372
-msgid "Define Views..."
-msgstr "Kirjelda vaateid..."
+#: ../widgets/menus/gal-view-menus.c:291
+msgid "_Current View"
+msgstr "_Käesolev vaade"
 
 #: ../widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View..."
@@ -19417,7 +18726,8 @@ msgstr "ETKNRLP"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:201
 msgid "Previous Button"
 msgstr "Eelmine nupp"
 
@@ -19426,8 +18736,10 @@ msgid "Month Calendar"
 msgstr "Kuu kalender"
 
 #: ../widgets/misc/e-canvas-background.c:456
-#: ../widgets/misc/e-canvas-background.c:457 ../widgets/text/e-entry.c:1284
-#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3540
+#: ../widgets/misc/e-canvas-background.c:457
+#: ../widgets/text/e-entry.c:1284
+#: ../widgets/text/e-entry.c:1285
+#: ../widgets/text/e-text.c:3540
 #: ../widgets/text/e-text.c:3541
 msgid "Fill color"
 msgstr "Täitevärvus"
@@ -19435,17 +18747,23 @@ msgstr "Täitevärvus"
 #: ../widgets/misc/e-canvas-background.c:463
 #: ../widgets/misc/e-canvas-background.c:464
 #: ../widgets/misc/e-canvas-background.c:470
-#: ../widgets/misc/e-canvas-background.c:471 ../widgets/text/e-entry.c:1291
-#: ../widgets/text/e-entry.c:1292 ../widgets/text/e-entry.c:1298
-#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3547
-#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3555
+#: ../widgets/misc/e-canvas-background.c:471
+#: ../widgets/text/e-entry.c:1291
+#: ../widgets/text/e-entry.c:1292
+#: ../widgets/text/e-entry.c:1298
+#: ../widgets/text/e-entry.c:1299
+#: ../widgets/text/e-text.c:3547
+#: ../widgets/text/e-text.c:3548
+#: ../widgets/text/e-text.c:3555
 #: ../widgets/text/e-text.c:3556
 msgid "GDK fill color"
 msgstr "GDK täitevärvus"
 
 #: ../widgets/misc/e-canvas-background.c:477
-#: ../widgets/misc/e-canvas-background.c:478 ../widgets/text/e-entry.c:1305
-#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3562
+#: ../widgets/misc/e-canvas-background.c:478
+#: ../widgets/text/e-entry.c:1305
+#: ../widgets/text/e-entry.c:1306
+#: ../widgets/text/e-text.c:3562
 #: ../widgets/text/e-text.c:3563
 msgid "Fill stipple"
 msgstr ""
@@ -19470,26 +18788,30 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1430
+#: ../widgets/misc/e-canvas-vbox.c:102
+#: ../widgets/misc/e-reflow.c:1430
 #: ../widgets/table/e-table-group-container.c:978
 #: ../widgets/table/e-table-group-leaf.c:636
 #: ../widgets/table/e-table-item.c:3005
 msgid "Minimum width"
 msgstr "Vähim laius"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1431
+#: ../widgets/misc/e-canvas-vbox.c:103
+#: ../widgets/misc/e-reflow.c:1431
 #: ../widgets/table/e-table-group-container.c:979
 #: ../widgets/table/e-table-group-leaf.c:637
 #: ../widgets/table/e-table-item.c:3006
 msgid "Minimum Width"
 msgstr "Vähim laius"
 
-#: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
+#: ../widgets/misc/e-canvas-vbox.c:114
+#: ../widgets/misc/e-canvas-vbox.c:115
 #: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "Jaotus"
 
-#: ../widgets/misc/e-cell-date-edit.c:232 ../widgets/misc/e-dateedit.c:453
+#: ../widgets/misc/e-cell-date-edit.c:232
+#: ../widgets/misc/e-dateedit.c:451
 msgid "Now"
 msgstr "Praegu"
 
@@ -19550,13 +18872,16 @@ msgstr "Lääne-Euroopa"
 msgid "Western European, New"
 msgstr "Lääne-Euroopa, uust"
 
-#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:91
+#: ../widgets/misc/e-charset-picker.c:92
 #: ../widgets/misc/e-charset-picker.c:93
 msgid "Traditional"
 msgstr "Traditsiooniline"
 
-#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
-#: ../widgets/misc/e-charset-picker.c:96 ../widgets/misc/e-charset-picker.c:97
+#: ../widgets/misc/e-charset-picker.c:94
+#: ../widgets/misc/e-charset-picker.c:95
+#: ../widgets/misc/e-charset-picker.c:96
+#: ../widgets/misc/e-charset-picker.c:97
 msgid "Simplified"
 msgstr "Lihtsustatud"
 
@@ -19602,19 +18927,19 @@ msgstr "Tekstiväli kuupäeva sisestamiseks"
 msgid "Text Date Entry"
 msgstr "Tekstiline kuupäeva väli"
 
-#: ../widgets/misc/e-dateedit.c:354
+#: ../widgets/misc/e-dateedit.c:353
 msgid "Click this button to show a calendar"
 msgstr "Kalendri näitamiseks klõpsa sellel nupul"
 
-#: ../widgets/misc/e-dateedit.c:355
+#: ../widgets/misc/e-dateedit.c:354
 msgid "Date Button"
 msgstr "Kuupäeva nupp"
 
-#: ../widgets/misc/e-dateedit.c:376
+#: ../widgets/misc/e-dateedit.c:374
 msgid "Combo box to select time"
 msgstr "Valikukast aja valimiseks"
 
-#: ../widgets/misc/e-dateedit.c:377
+#: ../widgets/misc/e-dateedit.c:375
 msgid "Time Combo Box"
 msgstr "Aja valikukast"
 
@@ -19635,9 +18960,7 @@ msgid "Use underline"
 msgstr "Kasuta allakriipsutust"
 
 #: ../widgets/misc/e-expander.c:198
-msgid ""
-"If set, an underline in the text indicates the next character should be used "
-"for the mnemonic accelerator key"
+msgid "If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"
 msgstr ""
 
 #: ../widgets/misc/e-expander.c:206
@@ -19652,11 +18975,13 @@ msgstr "Sildividin"
 msgid "A widget to display in place of the usual expander label"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3318
+#: ../widgets/misc/e-expander.c:222
+#: ../widgets/table/e-tree.c:3318
 msgid "Expander Size"
 msgstr "Laiendaja suurus"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3319
+#: ../widgets/misc/e-expander.c:223
+#: ../widgets/table/e-tree.c:3319
 msgid "Size of the expander arrow"
 msgstr "Laienduse noole suurus"
 
@@ -19681,15 +19006,18 @@ msgstr "Otsinguredaktor"
 msgid "Save Search"
 msgstr "Salvesta otsing"
 
-#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
+#: ../widgets/misc/e-filter-bar.h:92
+#: ../widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "_Salvesta otsing..."
 
-#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
+#: ../widgets/misc/e-filter-bar.h:93
+#: ../widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr "_Redigeeri salvestatud otsinguid..."
 
-#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
+#: ../widgets/misc/e-filter-bar.h:94
+#: ../widgets/misc/e-filter-bar.h:101
 msgid "_Advanced Search..."
 msgstr "_Laiendatud otsing..."
 
@@ -19702,9 +19030,7 @@ msgid "World Map"
 msgstr "Maailmakaart"
 
 #: ../widgets/misc/e-map.c:649
-msgid ""
-"Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should select the timezone from the below combo box instead."
+msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should select the timezone from the below combo box instead."
 msgstr ""
 
 #: ../widgets/misc/e-pilot-settings.c:103
@@ -19719,55 +19045,61 @@ msgstr "Isiklike kirjete sünkroniseerimine"
 msgid "Sync Categories:"
 msgstr "Katekooriate sünkroniseerimine:"
 
-#: ../widgets/misc/e-reflow.c:1452 ../widgets/misc/e-reflow.c:1453
+#: ../widgets/misc/e-reflow.c:1452
+#: ../widgets/misc/e-reflow.c:1453
 msgid "Empty message"
 msgstr "Tühi sõnum"
 
-#: ../widgets/misc/e-reflow.c:1459 ../widgets/misc/e-reflow.c:1460
+#: ../widgets/misc/e-reflow.c:1459
+#: ../widgets/misc/e-reflow.c:1460
 msgid "Reflow model"
 msgstr ""
 
-#: ../widgets/misc/e-reflow.c:1466 ../widgets/misc/e-reflow.c:1467
+#: ../widgets/misc/e-reflow.c:1466
+#: ../widgets/misc/e-reflow.c:1467
 msgid "Column width"
 msgstr "Veeru laius"
 
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:346
+#: ../widgets/misc/e-search-bar.c:345
 msgid "Search Text Entry"
 msgstr ""
 
-#: ../widgets/misc/e-search-bar.c:550
+#: ../widgets/misc/e-search-bar.c:549
 msgid "_Search"
 msgstr "_Otsing"
 
-#: ../widgets/misc/e-search-bar.c:556
+#: ../widgets/misc/e-search-bar.c:555
 msgid "_Find Now"
 msgstr "_Otsing"
 
-#: ../widgets/misc/e-search-bar.c:557 ../widgets/misc/e-search-bar.c:944
+#: ../widgets/misc/e-search-bar.c:556
+#: ../widgets/misc/e-search-bar.c:943
 msgid "_Clear"
 msgstr "_Puhasta"
 
-#: ../widgets/misc/e-search-bar.c:648
+#: ../widgets/misc/e-search-bar.c:647
 msgid "Search Type"
 msgstr "Otsingu tüüp"
 
-#: ../widgets/misc/e-search-bar.c:852
+#: ../widgets/misc/e-search-bar.c:851
 msgid "Item ID"
 msgstr "Kirje ID"
 
-#: ../widgets/misc/e-search-bar.c:859
+#: ../widgets/misc/e-search-bar.c:858
 msgid "Subitem ID"
 msgstr "Alamkirje ID"
 
-#: ../widgets/misc/e-search-bar.c:866 ../widgets/text/e-entry.c:1249
-#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3462
+#: ../widgets/misc/e-search-bar.c:865
+#: ../widgets/text/e-entry.c:1249
+#: ../widgets/text/e-entry.c:1250
+#: ../widgets/text/e-text.c:3462
 #: ../widgets/text/e-text.c:3463
 msgid "Text"
 msgstr "Tekst"
 
-#: ../widgets/misc/e-search-bar.c:946
+#: ../widgets/misc/e-search-bar.c:945
 msgid "Find _Now"
 msgstr "_Otsing"
 
@@ -20074,11 +19406,13 @@ msgstr "_Sordi..."
 msgid "State"
 msgstr "Seisund"
 
-#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
+#: ../widgets/table/e-table-config.c:307
+#: ../widgets/table/e-table-config.c:349
 msgid "(Ascending)"
 msgstr "(Kasvav)"
 
-#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
+#: ../widgets/table/e-table-config.c:307
+#: ../widgets/table/e-table-config.c:349
 msgid "(Descending)"
 msgstr "(Kahanev)"
 
@@ -20156,7 +19490,8 @@ msgstr "%s (%d kirjet)"
 #: ../widgets/table/e-table-group-container.c:902
 #: ../widgets/table/e-table-group-leaf.c:573
 #: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2963 ../widgets/table/e-table-item.c:2964
+#: ../widgets/table/e-table-item.c:2963
+#: ../widgets/table/e-table-item.c:2964
 msgid "Alternating Row Colors"
 msgstr ""
 
@@ -20164,8 +19499,10 @@ msgstr ""
 #: ../widgets/table/e-table-group-container.c:909
 #: ../widgets/table/e-table-group-leaf.c:580
 #: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2970 ../widgets/table/e-table-item.c:2971
-#: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
+#: ../widgets/table/e-table-item.c:2970
+#: ../widgets/table/e-table-item.c:2971
+#: ../widgets/table/e-tree.c:3271
+#: ../widgets/table/e-tree.c:3272
 msgid "Horizontal Draw Grid"
 msgstr ""
 
@@ -20173,8 +19510,10 @@ msgstr ""
 #: ../widgets/table/e-table-group-container.c:916
 #: ../widgets/table/e-table-group-leaf.c:587
 #: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2977 ../widgets/table/e-table-item.c:2978
-#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
+#: ../widgets/table/e-table-item.c:2977
+#: ../widgets/table/e-table-item.c:2978
+#: ../widgets/table/e-tree.c:3277
+#: ../widgets/table/e-tree.c:3278
 msgid "Vertical Draw Grid"
 msgstr ""
 
@@ -20182,8 +19521,10 @@ msgstr ""
 #: ../widgets/table/e-table-group-container.c:923
 #: ../widgets/table/e-table-group-leaf.c:594
 #: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2984 ../widgets/table/e-table-item.c:2985
-#: ../widgets/table/e-tree.c:3283 ../widgets/table/e-tree.c:3284
+#: ../widgets/table/e-table-item.c:2984
+#: ../widgets/table/e-table-item.c:2985
+#: ../widgets/table/e-tree.c:3283
+#: ../widgets/table/e-tree.c:3284
 msgid "Draw focus"
 msgstr ""
 
@@ -20191,7 +19532,8 @@ msgstr ""
 #: ../widgets/table/e-table-group-container.c:930
 #: ../widgets/table/e-table-group-leaf.c:601
 #: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:2991 ../widgets/table/e-table-item.c:2992
+#: ../widgets/table/e-table-item.c:2991
+#: ../widgets/table/e-table-item.c:2992
 msgid "Cursor mode"
 msgstr "Kursorirežiim"
 
@@ -20199,7 +19541,8 @@ msgstr "Kursorirežiim"
 #: ../widgets/table/e-table-group-container.c:937
 #: ../widgets/table/e-table-group-leaf.c:615
 #: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2956 ../widgets/table/e-table-item.c:2957
+#: ../widgets/table/e-table-item.c:2956
+#: ../widgets/table/e-table-item.c:2957
 msgid "Selection model"
 msgstr "Valikumudel"
 
@@ -20207,8 +19550,10 @@ msgstr "Valikumudel"
 #: ../widgets/table/e-table-group-container.c:944
 #: ../widgets/table/e-table-group-leaf.c:608
 #: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:2998 ../widgets/table/e-table-item.c:2999
-#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3265
+#: ../widgets/table/e-table-item.c:2998
+#: ../widgets/table/e-table-item.c:2999
+#: ../widgets/table/e-table.c:3316
+#: ../widgets/table/e-tree.c:3265
 #: ../widgets/table/e-tree.c:3266
 msgid "Length Threshold"
 msgstr "Pikkuse lävi"
@@ -20217,8 +19562,10 @@ msgstr "Pikkuse lävi"
 #: ../widgets/table/e-table-group-container.c:951
 #: ../widgets/table/e-table-group-leaf.c:650
 #: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
-#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3297
+#: ../widgets/table/e-table-item.c:3032
+#: ../widgets/table/e-table-item.c:3033
+#: ../widgets/table/e-table.c:3323
+#: ../widgets/table/e-tree.c:3297
 #: ../widgets/table/e-tree.c:3298
 msgid "Uniform row height"
 msgstr ""
@@ -20278,7 +19625,8 @@ msgstr "Kohanda veerge..."
 msgid "Customize Current View..."
 msgstr "Kohanda käesolevat vaadet..."
 
-#: ../widgets/table/e-table-header-item.c:1817 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1817
+#: ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr ""
@@ -20294,15 +19642,18 @@ msgstr "Sortimisandmed"
 msgid "Tree"
 msgstr "Puu"
 
-#: ../widgets/table/e-table-item.c:2942 ../widgets/table/e-table-item.c:2943
+#: ../widgets/table/e-table-item.c:2942
+#: ../widgets/table/e-table-item.c:2943
 msgid "Table header"
 msgstr "Tabeli päis"
 
-#: ../widgets/table/e-table-item.c:2949 ../widgets/table/e-table-item.c:2950
+#: ../widgets/table/e-table-item.c:2949
+#: ../widgets/table/e-table-item.c:2950
 msgid "Table model"
 msgstr "Tabeli mudel"
 
-#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
+#: ../widgets/table/e-table-item.c:3025
+#: ../widgets/table/e-table-item.c:3026
 msgid "Cursor row"
 msgstr "Kursori rida"
 
@@ -20314,11 +19665,13 @@ msgstr ""
 msgid "Use click to add"
 msgstr ""
 
-#: ../widgets/table/e-tree.c:3290 ../widgets/table/e-tree.c:3291
+#: ../widgets/table/e-tree.c:3290
+#: ../widgets/table/e-tree.c:3291
 msgid "ETree table adapter"
 msgstr ""
 
-#: ../widgets/table/e-tree.c:3304 ../widgets/table/e-tree.c:3305
+#: ../widgets/table/e-tree.c:3304
+#: ../widgets/table/e-tree.c:3305
 msgid "Always search"
 msgstr ""
 
@@ -20342,75 +19695,102 @@ msgstr "Autoriõigused (C) 2000, Helix Code, Inc."
 msgid "This should test the minicard canvas item"
 msgstr ""
 
-#: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
+#: ../widgets/text/e-entry.c:1242
+#: ../widgets/text/e-entry.c:1243
+#: ../widgets/text/e-text.c:3455
+#: ../widgets/text/e-text.c:3456
 msgid "Event Processor"
 msgstr ""
 
-#: ../widgets/text/e-entry.c:1256 ../widgets/text/e-entry.c:1257
+#: ../widgets/text/e-entry.c:1256
+#: ../widgets/text/e-entry.c:1257
 msgid "Font"
 msgstr "Kirjatüüp"
 
-#: ../widgets/text/e-entry.c:1270 ../widgets/text/e-entry.c:1271
+#: ../widgets/text/e-entry.c:1270
+#: ../widgets/text/e-entry.c:1271
 msgid "GDKFont"
 msgstr ""
 
-#: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3491 ../widgets/text/e-text.c:3492
+#: ../widgets/text/e-entry.c:1277
+#: ../widgets/text/e-entry.c:1278
+#: ../widgets/text/e-text.c:3491
+#: ../widgets/text/e-text.c:3492
 msgid "Justification"
 msgstr "Joondamine"
 
-#: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3591 ../widgets/text/e-text.c:3592
+#: ../widgets/text/e-entry.c:1319
+#: ../widgets/text/e-entry.c:1320
+#: ../widgets/text/e-text.c:3591
+#: ../widgets/text/e-text.c:3592
 msgid "Use ellipsis"
 msgstr ""
 
-#: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3598 ../widgets/text/e-text.c:3599
+#: ../widgets/text/e-entry.c:1326
+#: ../widgets/text/e-entry.c:1327
+#: ../widgets/text/e-text.c:3598
+#: ../widgets/text/e-text.c:3599
 msgid "Ellipsis"
 msgstr ""
 
-#: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3605 ../widgets/text/e-text.c:3606
+#: ../widgets/text/e-entry.c:1333
+#: ../widgets/text/e-entry.c:1334
+#: ../widgets/text/e-text.c:3605
+#: ../widgets/text/e-text.c:3606
 msgid "Line wrap"
 msgstr "Reamurdmine"
 
-#: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3612 ../widgets/text/e-text.c:3613
+#: ../widgets/text/e-entry.c:1340
+#: ../widgets/text/e-entry.c:1341
+#: ../widgets/text/e-text.c:3612
+#: ../widgets/text/e-text.c:3613
 msgid "Break characters"
 msgstr ""
 
-#: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3619 ../widgets/text/e-text.c:3620
+#: ../widgets/text/e-entry.c:1347
+#: ../widgets/text/e-entry.c:1348
+#: ../widgets/text/e-text.c:3619
+#: ../widgets/text/e-text.c:3620
 msgid "Max lines"
 msgstr "Suurim ridade arv"
 
-#: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3648 ../widgets/text/e-text.c:3649
+#: ../widgets/text/e-entry.c:1354
+#: ../widgets/text/e-entry.c:1355
+#: ../widgets/text/e-text.c:3648
+#: ../widgets/text/e-text.c:3649
 msgid "Allow newlines"
 msgstr ""
 
-#: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3641 ../widgets/text/e-text.c:3642
+#: ../widgets/text/e-entry.c:1361
+#: ../widgets/text/e-entry.c:1362
+#: ../widgets/text/e-text.c:3641
+#: ../widgets/text/e-text.c:3642
 msgid "Draw borders"
 msgstr "Piirjoonte näitamine"
 
-#: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3655 ../widgets/text/e-text.c:3656
+#: ../widgets/text/e-entry.c:1368
+#: ../widgets/text/e-entry.c:1369
+#: ../widgets/text/e-text.c:3655
+#: ../widgets/text/e-text.c:3656
 msgid "Draw background"
 msgstr "Tausta joonistamine"
 
-#: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3662 ../widgets/text/e-text.c:3663
+#: ../widgets/text/e-entry.c:1375
+#: ../widgets/text/e-entry.c:1376
+#: ../widgets/text/e-text.c:3662
+#: ../widgets/text/e-text.c:3663
 msgid "Draw button"
 msgstr ""
 
-#: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3669 ../widgets/text/e-text.c:3670
+#: ../widgets/text/e-entry.c:1382
+#: ../widgets/text/e-entry.c:1383
+#: ../widgets/text/e-text.c:3669
+#: ../widgets/text/e-text.c:3670
 msgid "Cursor position"
 msgstr "Kursori asukoht"
 
-#: ../widgets/text/e-entry.c:1389 ../widgets/text/e-entry.c:1390
+#: ../widgets/text/e-entry.c:1389
+#: ../widgets/text/e-entry.c:1390
 msgid "Emulate label resize"
 msgstr ""
 
@@ -20418,112 +19798,67 @@ msgstr ""
 msgid "Input Methods"
 msgstr "Sisestusmeetodid"
 
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
+#: ../widgets/text/e-text.c:3469
+#: ../widgets/text/e-text.c:3470
 msgid "Bold"
 msgstr "Rasvane"
 
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
+#: ../widgets/text/e-text.c:3476
+#: ../widgets/text/e-text.c:3477
 msgid "Strikeout"
 msgstr "Läbikriipsutatud"
 
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
+#: ../widgets/text/e-text.c:3483
+#: ../widgets/text/e-text.c:3484
 msgid "Anchor"
 msgstr "Ankur"
 
-#: ../widgets/text/e-text.c:3498 ../widgets/text/e-text.c:3499
+#: ../widgets/text/e-text.c:3498
+#: ../widgets/text/e-text.c:3499
 msgid "Clip Width"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3505 ../widgets/text/e-text.c:3506
+#: ../widgets/text/e-text.c:3505
+#: ../widgets/text/e-text.c:3506
 msgid "Clip Height"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3512 ../widgets/text/e-text.c:3513
+#: ../widgets/text/e-text.c:3512
+#: ../widgets/text/e-text.c:3513
 msgid "Clip"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3519 ../widgets/text/e-text.c:3520
+#: ../widgets/text/e-text.c:3519
+#: ../widgets/text/e-text.c:3520
 msgid "Fill clip rectangle"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3526 ../widgets/text/e-text.c:3527
+#: ../widgets/text/e-text.c:3526
+#: ../widgets/text/e-text.c:3527
 msgid "X Offset"
 msgstr "X-nihe"
 
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3534
+#: ../widgets/text/e-text.c:3533
+#: ../widgets/text/e-text.c:3534
 msgid "Y Offset"
 msgstr "Y-nihe"
 
-#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3569
+#: ../widgets/text/e-text.c:3570
 msgid "Text width"
 msgstr "Teksti laius"
 
-#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
+#: ../widgets/text/e-text.c:3576
+#: ../widgets/text/e-text.c:3577
 msgid "Text height"
 msgstr "Teksti kõrgus"
 
-#: ../widgets/text/e-text.c:3676 ../widgets/text/e-text.c:3677
+#: ../widgets/text/e-text.c:3676
+#: ../widgets/text/e-text.c:3677
 msgid "IM Context"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3683 ../widgets/text/e-text.c:3684
+#: ../widgets/text/e-text.c:3683
+#: ../widgets/text/e-text.c:3684
 msgid "Handle Popup"
 msgstr ""
-
-#~ msgid "description of appointment"
-#~ msgstr "sündmuse kirjeldus"
-
-#~ msgid "Schedulin_g"
-#~ msgstr "_Plaanimine"
-
-#~ msgid "In_vitations"
-#~ msgstr "_Kutsed"
-
-#~ msgid "<b>Basics</b>"
-#~ msgstr "<b>Sisu</b>"
-
-#~ msgid "<b>Date and Time</b>"
-#~ msgstr "<b>Kuupäev ja kellaaeg</b>"
-
-#~ msgid "<b>Send Options</b>"
-#~ msgstr "<b>Saatmise valikud</b>"
-
-#~ msgid "Ala_rm"
-#~ msgstr "Ala_rmid"
-
-#~ msgid "This appointment has customized alarms"
-#~ msgstr "Sellel sündmusel on kohandatud alarmid"
-
-#~ msgid "Task Description"
-#~ msgstr "Ülesande kirjeldus"
-
-#~ msgid "Meetings and Tasks"
-#~ msgstr "Koosolekud ja ülesanded"
-
-#~ msgid ""
-#~ "The suggested filename extension of this filetype (%s) is unused in the "
-#~ "chosen filename. Do you want to continue?"
-#~ msgstr ""
-#~ "Selle failitüübi (%s) jaoks soovitatud failinime laiendit pole kasutatud. "
-#~ "Kas sa soovid jätkata?"
-
-#~ msgid "Discard Changes"
-#~ msgstr "Loobu muudatustest"
-
-#~ msgid "_Attachment Bar (drop attachments here)"
-#~ msgstr "_Manuseriba (tõsta manused siia)"
-
-#~ msgid "_Alarm"
-#~ msgstr "_Alarm"
-
-#~ msgid "_Delegate To..."
-#~ msgstr "_Delegeerida..."
-
-#~ msgid "Current View"
-#~ msgstr "Käesolev vaade"
-
-#~ msgid "_Preview Pane"
-#~ msgstr "_Eelvaatepaan"
-
-#~ msgid "Evolution _FAQ"
-#~ msgstr "Evolutioni _KKK"
diff --git a/po/eu.po b/po/eu.po
index dafde2bcdb..8cf7588114 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,13 +1,14 @@
 # translation of eu.po to basque
 # Copyright (C) 2001, 2004 Free Software Foundation, Inc.
 # Hizkuntza Politikarako Sailburuordetza <hizpol@ej-gv.es>, 2004.
+# Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>, 2005.
 msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-11 17:30+0200\n"
-"PO-Revision-Date: 2004-04-05 21:04+0200\n"
-"Last-Translator: Hizkuntza Politikarako Sailburuordetza <hizpol@ej-gv.es>\n"
+"POT-Creation-Date: 2005-10-19 19:44+0200\n"
+"PO-Revision-Date: 2005-10-19 19:44+0200\n"
+"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>, 2005.\n"
 "Language-Team: basque <itzulpena@euskalgnu.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,27 +33,25 @@ msgid "New Contact List"
 msgstr "Kontaktuen zerrenda berria"
 
 #: ../a11y/addressbook/ea-minicard-view.c:152
-#, fuzzy, c-format
+#, c-format
 msgid "current addressbook folder has %d card"
 msgid_plural "current addressbook folder has %d cards"
-msgstr[0] "uneko helbide-liburuaren karpeta"
-msgstr[1] "uneko helbide-liburuaren karpeta"
+msgstr[0] "uneko helbide-liburuaren karpetak txartel %d du"
+msgstr[1] "uneko helbide-liburuaren karpeta %d txartel ditu"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../calendar/gui/alarm-notify/alarm-queue.c:953
+#: ../calendar/gui/alarm-notify/alarm-queue.c:965
 #: ../ui/evolution-message-composer.xml.h:11
 msgid "Open"
 msgstr "Ireki"
 
 #: ../a11y/addressbook/ea-minicard.c:141
-#, fuzzy
 msgid "Contact List: "
-msgstr "K_ontaktuen zerrenda"
+msgstr "Kontaktuen zerrenda:"
 
 #: ../a11y/addressbook/ea-minicard.c:142
-#, fuzzy
 msgid "Contact: "
-msgstr "Kontaktuak: "
+msgstr "Kontaktua: "
 
 #: ../a11y/addressbook/ea-minicard.c:168
 msgid "evolution minicard"
@@ -60,102 +59,91 @@ msgstr "evolution-en txarteltxoa"
 
 #: ../a11y/calendar/ea-cal-view-event.c:235
 msgid "It has alarms."
-msgstr ""
+msgstr "Alarmak ditu."
 
 #: ../a11y/calendar/ea-cal-view-event.c:238
-#, fuzzy
 msgid "It has recurrences."
-msgstr "E_rrepikapenik ez"
+msgstr "Errepikapenak ditu."
 
 #: ../a11y/calendar/ea-cal-view-event.c:241
 msgid "It is a meeting."
-msgstr ""
+msgstr "Bilera bat da."
 
 #: ../a11y/calendar/ea-cal-view-event.c:247
-#, fuzzy, c-format
+#, c-format
 msgid "Calendar Event: Summary is %s."
-msgstr "Egutegi-gertaerak"
+msgstr "Egutegi-gertaera: laburpena %s da."
 
 #: ../a11y/calendar/ea-cal-view-event.c:249
-#, fuzzy
 msgid "Calendar Event: It has no summary."
-msgstr "Egutegi-gertaerak"
+msgstr "Egutegi-gertaera: ez du laburpenik."
 
 #: ../a11y/calendar/ea-cal-view-event.c:268
-#, fuzzy
 msgid "calendar view event"
-msgstr "Egutegi-gertaerak"
+msgstr "Egutegi-gertaeren ikuspegia"
 
 #: ../a11y/calendar/ea-cal-view-event.c:485
-#, fuzzy
 msgid "Grab Focus"
-msgstr "Fokua du"
+msgstr "Hartu fokua"
 
 #: ../a11y/calendar/ea-cal-view.c:306
-#, fuzzy
 msgid "New Appointment"
-msgstr "Hitz_ordu berria"
+msgstr "Hitzordu berria"
 
 #: ../a11y/calendar/ea-cal-view.c:307
-#, fuzzy
 msgid "New All Day Event"
-msgstr "Egun osoko gertaera _berria"
+msgstr "Egun osoko gertaera berria"
 
-#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1505
+#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1522
 msgid "New Meeting"
 msgstr "Bilera berria"
 
 #: ../a11y/calendar/ea-cal-view.c:309
-#, fuzzy
 msgid "Go to Today"
-msgstr "_Joan gaurko egunera"
+msgstr "Joan gaurko egunera"
 
 #: ../a11y/calendar/ea-cal-view.c:310
-#, fuzzy
 msgid "Go to Date"
-msgstr "Joan _data jakin batera"
+msgstr "Joan data jakin batera"
 
 #: ../a11y/calendar/ea-day-view-main-item.c:299
 #: ../a11y/calendar/ea-week-view-main-item.c:301
-#, fuzzy
 msgid "a table to view and select the current time range"
-msgstr "uneko orduarekiko erlatiboa den ordua"
+msgstr "taula uneko orduaren barrutia ikusteko eta hautatzeko"
 
 #: ../a11y/calendar/ea-day-view.c:146 ../a11y/calendar/ea-week-view.c:148
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Gertaera %d du."
+msgstr[1] "%d gertaera ditu."
 
 #: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:150
 msgid "It has no events."
-msgstr ""
+msgstr "Ez du gertaerarik."
 
 #: ../a11y/calendar/ea-day-view.c:152
-#, fuzzy, c-format
+#, c-format
 msgid "Work Week View: %s. %s"
-msgstr "Lan-asteko ikuspegia"
+msgstr "Lan-asteko ikuspegia: %s. %s"
 
 #: ../a11y/calendar/ea-day-view.c:155
-#, fuzzy, c-format
+#, c-format
 msgid "Day View: %s. %s"
-msgstr "Eguneko ikuspegia"
+msgstr "Eguneko ikuspegia: %s. %s"
 
 #: ../a11y/calendar/ea-day-view.c:186
-#, fuzzy
 msgid "calendar view for a work week"
-msgstr "egutegi-informazioa"
+msgstr "Lan-asteko egutegi-ikuspegia "
 
 #: ../a11y/calendar/ea-day-view.c:188
 msgid "calendar view for one or more days"
-msgstr ""
+msgstr "Egun baten edo gehiagoren egutegi-ikuspegia"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:187
 #: ../calendar/gui/calendar-component.c:660
-#, fuzzy
 msgid "%A %d %b %Y"
-msgstr "%a, %Y %b %d"
+msgstr "%A, %Y %b %d"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
@@ -187,9 +175,8 @@ msgstr "%a, %Y %b %d"
 #: ../calendar/gui/calendar-component.c:691
 #: ../calendar/gui/calendar-component.c:697
 #: ../calendar/gui/calendar-component.c:699
-#, fuzzy
 msgid "%d %b %Y"
-msgstr "%Y %B %d"
+msgstr "%Y %b %d"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
@@ -210,110 +197,98 @@ msgid "Gnome Calendar"
 msgstr "Gnome egutegia"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:290
-#, fuzzy
 msgid "search bar"
-msgstr "_Bilaketa-oinarria:"
+msgstr "Bilaketa-barra"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:291
-#, fuzzy
 msgid "evolution calendar search bar"
-msgstr "Evolution-en egutegi-ikustailea"
+msgstr "Evolution-en egutegiko bilaketa-barra"
 
 #: ../a11y/calendar/ea-jump-button.c:149
-#, fuzzy
 msgid "Jump button"
-msgstr "Marraztu botoia"
+msgstr "Joan botoia"
 
 #: ../a11y/calendar/ea-jump-button.c:158
-#, fuzzy
 msgid "Click here, you can find more events."
-msgstr "Egin klik partaidea gehitzeko"
+msgstr "Egin klik gertaera gehiago bilatzeko."
 
 #: ../a11y/calendar/ea-week-view.c:155
-#, fuzzy, c-format
+#, c-format
 msgid "Month View: %s. %s"
-msgstr "Hileko ikuspegia"
+msgstr "Hileko ikuspegia: %s. %s"
 
 #: ../a11y/calendar/ea-week-view.c:159
-#, fuzzy, c-format
+#, c-format
 msgid "Week View: %s. %s"
-msgstr "Asteko ikuspegia"
+msgstr "Asteko ikuspegia: %s. %s"
 
 #: ../a11y/calendar/ea-week-view.c:190
-#, fuzzy
 msgid "calendar view for a month"
-msgstr "egutegi-informazioa"
+msgstr "Hileko egutegi-ikuspegia"
 
 #: ../a11y/calendar/ea-week-view.c:192
 msgid "calendar view for one or more weeks"
-msgstr ""
+msgstr "Aste baten edo gehiagoren egutegi-ikuspegia"
 
 #: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
 msgid "popup"
-msgstr ""
+msgstr "laster-leihoa"
 
 #. action name
 #: ../a11y/e-table/gal-a11y-e-cell-popup.c:125
 msgid "popup a child"
-msgstr ""
+msgstr "ireki laster-leiho umea"
 
 #: ../a11y/e-table/gal-a11y-e-cell-text.c:612
-#, fuzzy
 msgid "edit"
-msgstr "E_ditatu"
+msgstr "editatu"
 
 #: ../a11y/e-table/gal-a11y-e-cell-text.c:613
 msgid "begin editing this cell"
-msgstr ""
+msgstr "hasi gelaxka hau editatzen"
 
 #: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
-#, fuzzy
 msgid "toggle"
-msgstr "Txandakatu"
+msgstr "txandakatu"
 
 #. action name
 #: ../a11y/e-table/gal-a11y-e-cell-toggle.c:152
 msgid "toggle the cell"
-msgstr ""
+msgstr "txandakatu gelaxka"
 
 #: ../a11y/e-table/gal-a11y-e-cell-tree.c:171
-#, fuzzy
 msgid "expand"
-msgstr "_Borratu betiko"
+msgstr "zabaldu"
 
 #: ../a11y/e-table/gal-a11y-e-cell-tree.c:172
 msgid "expands the row in the ETree containing this cell"
-msgstr ""
+msgstr "zabaldu errenkada gelaxka hau duen ETree-an"
 
 #: ../a11y/e-table/gal-a11y-e-cell-tree.c:177
 msgid "collapse"
-msgstr ""
+msgstr "tolestu"
 
 #: ../a11y/e-table/gal-a11y-e-cell-tree.c:178
 msgid "collapses the row in the ETree containing this cell"
-msgstr ""
+msgstr "tolestu errenkada gelaxka hau duen ETree-an"
 
 #: ../a11y/e-table/gal-a11y-e-cell.c:107
-#, fuzzy
 msgid "Table Cell"
-msgstr "Taula"
+msgstr "Taulako gelaxka"
 
 #: ../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:575
-#, fuzzy
 msgid "click to add"
-msgstr "Egin klik gehitzeko"
+msgstr "egin klik gehitzeko"
 
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:53
-#, fuzzy
 msgid "click"
-msgstr "Goit"
+msgstr "egin klik"
 
 #: ../a11y/e-table/gal-a11y-e-table-column-header.c:135
-#, fuzzy
 msgid "sort"
-msgstr "Desordenatu"
+msgstr "ordenatu"
 
 #: ../a11y/widgets/ea-calendar-item.c:296
 #: ../a11y/widgets/ea-calendar-item.c:302
@@ -321,47 +296,41 @@ msgid "%d %B %Y"
 msgstr "%Y %B %d"
 
 #: ../a11y/widgets/ea-calendar-item.c:304
-#, fuzzy, c-format
+#, c-format
 msgid "Calendar: from %s to %s"
-msgstr "Egutegi-informazioa"
+msgstr "Egutegia: %s - %s"
 
 #: ../a11y/widgets/ea-calendar-item.c:339
-#, fuzzy
 msgid "evolution calendar item"
-msgstr "Evolution-en egutegi-ikustailea"
+msgstr "Evolution-en egutegi-elementua"
 
 #: ../a11y/widgets/ea-combo-button.c:40
-#, fuzzy
 msgid "Combo Button"
-msgstr "Lehia"
+msgstr "Konbinazio-botoia"
 
 #: ../a11y/widgets/ea-combo-button.c:50
-#, fuzzy
 msgid "Activate Default"
-msgstr "Lehenetsia"
+msgstr "Aktibatu lehenetsia"
 
 #: ../a11y/widgets/ea-combo-button.c:52
 msgid "Popup Menu"
-msgstr ""
+msgstr "Bistaratu menua"
 
 #: ../addressbook/addressbook.error.xml.h:1
-#, fuzzy
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
 msgstr ""
-"Kontaktu honen izen edo helbide elektroniko aldatua lehendik ere \n"
-"badago karpeta honetan.  Hala ere gehitu nahi duzu?"
+"Kontaktu honen helbide elektronikoa lehendik ere badago. Helbide berdineko "
+"txartel berri bat gehitu nahi duzu?"
 
 #: ../addressbook/addressbook.error.xml.h:2
-#, fuzzy
 msgid "Address '{0}' already exists."
-msgstr "Txartelaren ID hori badago lehendik"
+msgstr "{0} helbidea  badago lehendik"
 
 #: ../addressbook/addressbook.error.xml.h:3
-#, fuzzy
 msgid "Cannot move contact."
-msgstr "eta beste txartel bat."
+msgstr "Ezin da kontaktua mugitu."
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid "Category editor not available."
@@ -373,61 +342,58 @@ msgid ""
 "a supported login method. Remember that many passwords are case sensitive; "
 "your caps lock might be on."
 msgstr ""
+"Egiaztatu pasahitza ongi idatzi duzula eta onartutako konexio metodoa "
+"erabiltzen ari zarela. Gogoratu pasahitz askok maiuskulak eta minuskulak "
+"ezberdintzen dituztela. Agian maiuskulak aktibatuta dituzu."
 
 #: ../addressbook/addressbook.error.xml.h:6
-#, fuzzy
 msgid "Could not get schema information for LDAP server."
-msgstr "Ezin izan da wombat zerbitzaria abiarazi"
+msgstr "Ezin izan da eskema-informazioa jaso LDAP zerbitzariarentzat."
 
 #: ../addressbook/addressbook.error.xml.h:7
-#, fuzzy
 msgid "Could not remove addressbook."
-msgstr "Ezin izan da helbide-liburua kargatu"
+msgstr "Ezin izan da helbide-liburua kendu."
 
 #: ../addressbook/addressbook.error.xml.h:8
-#, fuzzy
 msgid "Delete address book '{0}'?"
-msgstr "Hautatu kontaktuak helbide-liburutik"
+msgstr "Hautatu '{0}' helbide-liburua?"
 
 #: ../addressbook/addressbook.error.xml.h:9
-#, fuzzy
 msgid "Error loading addressbook."
-msgstr "Errorea helbide-liburu lehenetsia kargatzean."
+msgstr "Errorea helbide-liburua kargatzean."
 
 #: ../addressbook/addressbook.error.xml.h:10
-#, fuzzy
 msgid "Error saving {0} to {1}: {2}"
-msgstr "Errorea txartela gehitzean"
+msgstr "Errorea {0} {1}(e)n gordetzean: {2}"
 
 #: ../addressbook/addressbook.error.xml.h:11
-#, fuzzy
 msgid "Failed to authenticate with LDAP server."
 msgstr "Huts egin du LDAP zerbitzarian autentifikatzean"
 
 #: ../addressbook/addressbook.error.xml.h:12
-#, fuzzy
 msgid "LDAP server did not respond with valid schema information."
-msgstr "Zerbitzariak ez du erantzun baliozko eskema-informazioarekin"
+msgstr "LDAP zerbitzariak ez du erantzun baliozko eskema-informazioarekin"
 
 #: ../addressbook/addressbook.error.xml.h:13
-#, fuzzy
 msgid "Server Version"
-msgstr "Vermont"
+msgstr "Zerbitzariaren bertsioa"
 
 #: ../addressbook/addressbook.error.xml.h:14
 #: ../calendar/calendar.error.xml.h:44
 msgid "Some features may not work properly with your current server"
 msgstr ""
+"Zenbait funtzionalitate ez dute funztionatuko uneko zerbitzariaren "
+"bertsioarekin"
 
 #: ../addressbook/addressbook.error.xml.h:15
-#, fuzzy
 msgid "The Evolution addressbook has quit unexpectedly."
-msgstr "Evolution-en helbide-liburuko helbide-ikustailea"
+msgstr "Evolution-en helbide-liburua ustekabean itxi da."
 
 #: ../addressbook/addressbook.error.xml.h:16
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
+"Hautatutako irudia handiegia da. Tamainaz aldatzea eta gordetzea nahi duzu?"
 
 #: ../addressbook/addressbook.error.xml.h:17
 msgid ""
@@ -435,50 +401,49 @@ msgid ""
 "this functionality or it may be misconfigured. Ask your administrator for "
 "supported search bases."
 msgstr ""
+"LDAP zerbitzariak LDAPen bertsio zaharragoa duela dirudi (funtzionalitate "
+"hau onartzen ez duen bertsioa) edo gaizki konfiguratuta egon daiteke. "
+"Galdetu administratzaileari onartutako bilaketen oinarriei buruz."
 
 #: ../addressbook/addressbook.error.xml.h:18
-#, fuzzy
 msgid "This address book will be removed permanently."
-msgstr "Ezin izan da kurtsorea kargatu\n"
+msgstr "Helbide-liburua betiko ezabatu egingo da."
 
 #: ../addressbook/addressbook.error.xml.h:19
-#, fuzzy
 msgid "This addressbook could not be opened."
-msgstr "Ezin izan da kurtsorea kargatu\n"
+msgstr "Ezin izan da helbide-liburua ireki."
 
 #: ../addressbook/addressbook.error.xml.h:20
-#, fuzzy
 msgid "This addressbook server does not have any suggested search bases."
-msgstr "Onartzen ez diren bilaketa-oinarriekin erantzun du zerbitzariak"
+msgstr ""
+"Onartzen ez diren bilaketa-oinarriekin erantzun du helbide-liburuen "
+"zerbitzariak"
 
 #: ../addressbook/addressbook.error.xml.h:21
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
 msgstr ""
+"Helbide-liburuen zerbitzaria ezin da eskuratu edo zerbitzariaren izena oker "
+"idatzita dago edo sareko konexioa hautsi egin da."
 
 #: ../addressbook/addressbook.error.xml.h:22
-#, fuzzy
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Zerbitzari honek ez du onartzen LDAPv3 eskema-informazioa"
 
 #: ../addressbook/addressbook.error.xml.h:23
-#, fuzzy
 msgid "Unable to open addressbook"
-msgstr "Gorde helbide-liburuan"
+msgstr "Ezin da helbide-liburua ireki"
 
 #: ../addressbook/addressbook.error.xml.h:24
-#, fuzzy
 msgid "Unable to perform search."
-msgstr "Errorea bilaketa egitean"
+msgstr "Ezin da bilaketa landu."
 
 #: ../addressbook/addressbook.error.xml.h:25
-#, fuzzy
 msgid "Unable to save {0}."
-msgstr "Ezin da mezua eskuratu editoretik"
+msgstr "Ezin da {0} gorde."
 
 #: ../addressbook/addressbook.error.xml.h:26
-#, fuzzy
 msgid "Would you like to save your changes?"
 msgstr "Aldaketak gorde nahi dituzu?"
 
@@ -487,6 +452,9 @@ 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 ""
+"Kontaktu bat helbide-liburu batetik bestera eramaten saiatzen ari zarela "
+"dirudi, baina ezin da iturburutik ezabatu. Kopia bat gordetzea nahi duzu "
+"horren ordez?"
 
 #: ../addressbook/addressbook.error.xml.h:28
 #: ../calendar/calendar.error.xml.h:59
@@ -495,19 +463,23 @@ msgid ""
 "problems using Evolution. For best results the server should be upgraded to "
 "a supported version"
 msgstr ""
+"Onartu gabeko GroupWise zerbitzariarekin konektatzen ari zara eta Evolution "
+"erabiltzean arazoak egon daitezke. Egokiena zerbitzaria onartutako bertsio "
+"batera eguneratzea izango litzateke."
 
 #: ../addressbook/addressbook.error.xml.h:29
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
-msgstr ""
+msgstr "Kontaktuan aldaketak egin dituzu. Aldaketa hauek gordetzea nahi duzu?"
 
 #: ../addressbook/addressbook.error.xml.h:30
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
+"{0}(r)en kontaktuak ez dira eskuragarri egongo Evolution berriro abiatu arte."
 
-#: ../addressbook/addressbook.error.xml.h:31 ../mail/em-vfolder-rule.c:494
+#: ../addressbook/addressbook.error.xml.h:31 ../mail/em-vfolder-rule.c:495
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
@@ -521,11 +493,11 @@ msgstr "_Ez"
 #: ../addressbook/addressbook.error.xml.h:33
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "{0}"
-msgstr ""
+msgstr "{0}"
 
 #: ../addressbook/addressbook.error.xml.h:34
 msgid "{1}"
-msgstr ""
+msgstr "{1}"
 
 #: ../addressbook/conduit/address-conduit.c:298
 msgid "Default Sync Address:"
@@ -546,16 +518,14 @@ msgid "Autocompletion"
 msgstr "Osatze automatikoa"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-#, fuzzy
 msgid "C_ontacts"
-msgstr "Kontaktuak"
+msgstr "K_ontaktuak"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
 msgid "Certificates"
 msgstr "Ziurtagiria:"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#, fuzzy
 msgid "Configure autocomplete here"
 msgstr "Konfiguratu osatze automatikoa hemen"
 
@@ -596,7 +566,7 @@ msgstr "Evolution-en karpeta-ezarpenak konfiguratzeko kontrola"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 msgid "Manage your S/MIME certificates here"
-msgstr ""
+msgstr "Kudeatu zure S/MIME ziurtagiriak hemen"
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
@@ -607,7 +577,7 @@ msgstr ""
 #: ../mail/em-folder-tree-model.c:197 ../mail/em-folder-tree-model.c:199
 #: ../mail/mail-component.c:292 ../mail/mail-vfolder.c:223
 msgid "On This Computer"
-msgstr ""
+msgstr "Ordenagailu honetan"
 
 #. Create the default Person addressbook
 #. Create the default Person calendar
@@ -653,9 +623,8 @@ msgid "New Address Book"
 msgstr "Helbide-liburu berria"
 
 #: ../addressbook/gui/component/addressbook-component.c:242
-#, fuzzy
 msgid "Address _Book"
-msgstr "_2. helbidea:"
+msgstr "_Helbide-liburua"
 
 #: ../addressbook/gui/component/addressbook-component.c:243
 msgid "Create a new address book"
@@ -664,22 +633,21 @@ msgstr "Sortu helbide-liburu berria"
 #: ../addressbook/gui/component/addressbook-component.c:385
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
+"Huts egin du Helbide-liburuaren ezarpenak edo karpetak bertsio-berritzean."
 
 #: ../addressbook/gui/component/addressbook-config.c:313
-#, fuzzy
 msgid "Base"
-msgstr "Bage"
+msgstr "Oinarria"
 
 #: ../addressbook/gui/component/addressbook-config.c:508
 #: ../calendar/gui/dialogs/calendar-setup.c:192
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:10
-#, fuzzy
 msgid "_Type:"
-msgstr "Mota:"
+msgstr "_Mota:"
 
 #: ../addressbook/gui/component/addressbook-config.c:607
 msgid "Copy book content locally for offline operation"
-msgstr ""
+msgstr "Kopiatu liburuaren edukia lokalean lineaz kanpo lan egiteko"
 
 #: ../addressbook/gui/component/addressbook-config.c:902
 #: ../addressbook/gui/component/ldap-config.glade.h:23
@@ -697,14 +665,12 @@ msgid "Addressbook"
 msgstr "Helbide-liburua"
 
 #: ../addressbook/gui/component/addressbook-config.c:907
-#, fuzzy
 msgid "Server Information"
-msgstr "2. urratsa: zerbitzariaren datuak"
+msgstr "Zerbitzariaren datuak"
 
 #: ../addressbook/gui/component/addressbook-config.c:909
-#, fuzzy
 msgid "Authentication"
-msgstr "SMTP Autentifikazioa"
+msgstr "Autentifikazioa"
 
 #: ../addressbook/gui/component/addressbook-config.c:912
 #: ../addressbook/gui/component/ldap-config.glade.h:18
@@ -717,9 +683,8 @@ msgid "Searching"
 msgstr "Bilaketa"
 
 #: ../addressbook/gui/component/addressbook-config.c:915
-#, fuzzy
 msgid "Downloading"
-msgstr "<b>Mezuak bidali:</b>"
+msgstr "Deskargatzen"
 
 #: ../addressbook/gui/component/addressbook-config.c:1116
 #: ../addressbook/gui/component/ldap-config.glade.h:14
@@ -752,6 +717,10 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
+"Aldatu egin da Evolution-eko kontaktuen karpeten hierarkia Evolution 1.x "
+"bertsioaz geroztik.\n"
+"\n"
+"Itxaron Evolution-ek karpetak migratzen dituen bitartean..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1148
 msgid ""
@@ -759,6 +728,9 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
+"Posta-zerrendetako kontaktuen formatua aldatu egin da.\n"
+"\n"
+"Itxaron Evolution-ek karpetak migratzen dituen bitartean..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1157
 msgid ""
@@ -766,6 +738,9 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
+"Telefono-zenbaki batzuk gordetzeko modua aldatu egin da.\n"
+"\n"
+"Itxaron Evolution-ek karpetak migratzen dituen bitartean..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1167
 msgid ""
@@ -773,13 +748,16 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
+"Evolution-en Palm sinkronizazioaren egunkari eta mapatzeen fitxategiak \n"
+"aldatu egin dira.\n"
+"Itxaron Evolution-ek Pilot sinkronizazioaren datuak migratu bitartean..."
 
 #: ../addressbook/gui/component/addressbook-view.c:764
 #: ../addressbook/gui/widgets/e-addressbook-view.c:952
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/tasks-component.c:441 ../mail/em-filter-i18n.h:11
 #: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:26 ../ui/evolution-tasks.xml.h:6
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Ezabatu"
 
@@ -790,73 +768,74 @@ msgid "Properties..."
 msgstr "Propietateak..."
 
 #: ../addressbook/gui/component/addressbook-view.c:1144
-#, fuzzy
 msgid "Contact Source Selector"
-msgstr "Ez da zerbitzaririk hautatu"
+msgstr "Kontaktu-iturburuaren hautatzailea"
 
 #: ../addressbook/gui/component/addressbook.c:99
 msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP zerbitzarian anonimoki sartzea"
 
 #: ../addressbook/gui/component/addressbook.c:191
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:485
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:490
 msgid "Failed to authenticate.\n"
 msgstr "Huts egin du autentifikatzean.\n"
 
 #: ../addressbook/gui/component/addressbook.c:198
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:464
-#, fuzzy, c-format
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:469
+#, c-format
 msgid "Enter password for %s (user %s)"
-msgstr "%sIdatzi %s(r)en pasahitza (%s erabiltzailea)"
+msgstr "Idatzi %s(r)en pasahitza (%s erabiltzailea)"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
-#, fuzzy
 msgid "Autocomplete length"
-msgstr "Osatze automatikoa"
+msgstr "Osatu automatikoki luzera"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
 msgid "EFolderList XML for the list of completion URIs"
-msgstr ""
+msgstr "Osatzeko URIen zerrendaren EFolderList xml"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
 msgid "EFolderList XML for the list of completion URIs."
-msgstr ""
+msgstr "Osatzeko URIen zerrendaren EFolderList xml"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
 msgid ""
 "Position of the vertical pane, between the card and list views and the "
 "preview pane, in pixels."
 msgstr ""
+"Panel bertikalaren kokalekua pixeletan, txartelen eta  zerrenda-ikuspegien "
+"eta aurrebistaren panelaren artean."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
-#, fuzzy
 msgid "Show preview pane"
-msgstr "Au_rrebistako panela"
+msgstr "Erakutsi aurrebistako panela"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr ""
+"Evolution automatikoki osatzen hasi aurretik idatzi beharreko karaktere-"
+"kopurua"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
+"Izenak hautatzeko elkarrizketa-koadroan azkena erabilitako karpetaren URIa"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
 msgid "URI for the folder last used in the select names dialog."
 msgstr ""
+"Izenak hautatzeko elkarrizketa-koadroan azkena erabilitako karpetaren URIa."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
-#, fuzzy
 msgid "Vertical pane position"
-msgstr "Kokaleku geografikoa"
+msgstr "Panel bertikalaren kokapena"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
-#, fuzzy
 msgid "Whether to show the preview pane."
-msgstr "Erakutsi/ezkutatu karpeta-barra"
+msgstr "Erakutsi/ezkutatu aurrebistaren panela"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:1
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -885,7 +864,7 @@ msgstr "*"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
-msgstr ""
+msgstr "1"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
@@ -897,7 +876,7 @@ msgstr "389"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
-msgstr ""
+msgstr "5"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
@@ -905,39 +884,32 @@ msgstr "636"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:7
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
-#, fuzzy
 msgid "<b>Authentication</b>"
-msgstr "Autentifikazioa"
+msgstr "<b>Autentifikazioa</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:8
-#, fuzzy
 msgid "<b>Display</b>"
-msgstr "_Bistaratzea"
+msgstr "<b>Bistaratzea</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:9
-#, fuzzy
 msgid "<b>Downloading</b>"
-msgstr "<b>Mezuak bidali:</b>"
+msgstr "<b>Deskargatzea</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:10
-#, fuzzy
 msgid "<b>Searching</b>"
-msgstr "Bilaketa"
+msgstr "<b>Bilaketa</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:11
-#, fuzzy
 msgid "<b>Server Information</b>"
-msgstr "2. urratsa: zerbitzariaren datuak"
+msgstr "<b>Zerbitzariaren datuak</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:12
-#, fuzzy
 msgid "<b>Type:</b>"
-msgstr "<b>Falta:</b> "
+msgstr "<b>Mota:</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:13
-#, fuzzy
 msgid "Add Address Book"
-msgstr "Helbide-liburua"
+msgstr "Gehitu helbide-liburua"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:15
 #: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:759
@@ -953,17 +925,14 @@ msgid "Basic"
 msgstr "Oinarrizkoa"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:19
-#, fuzzy
 msgid "Distinguished name"
-msgstr "_Izen bereizia (DN):"
+msgstr "Izen bereizia"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:20
-#, fuzzy
 msgid "Email address"
-msgstr "Helbide elektronikoa:"
+msgstr "Helbide elektronikoa"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
-#, fuzzy
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr ""
@@ -971,14 +940,12 @@ msgstr ""
 "autentifikatzeko"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:22
-#, fuzzy
 msgid "Find Possible Search Bases"
-msgstr "Onartutako Bilaketa Oinarriak"
+msgstr "Bilatu bilaketa-oinarri posibleak"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#, fuzzy
 msgid "Lo_gin:"
-msgstr "Saio-hasiera"
+msgstr "_Saio-hasiera:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:25
 #: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:758
@@ -990,12 +957,10 @@ msgid "One"
 msgstr "Bat"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:27
-#, fuzzy
 msgid "Search _base:"
-msgstr "_Bilaketa-oinarria:"
+msgstr "Bilaketa-_oinarria:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:28
-#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL or TLS."
@@ -1004,7 +969,6 @@ msgstr ""
 "bakarrik konektatuko da Evolution LDAP zerbitzarira."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:29
-#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a insecure environment. For example, if you and your LDAP server "
@@ -1019,7 +983,6 @@ msgstr ""
 "zure konexioa dagoeneko segurua baita."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:30
-#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This means that your connection will be insecure, and that you will be "
@@ -1039,7 +1002,6 @@ msgid "Supported Search Bases"
 msgstr "Onartutako Bilaketa Oinarriak"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:33
-#, fuzzy
 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 "
@@ -1050,7 +1012,6 @@ msgstr ""
 " Hutsik uzten baduzu, bilaketa direktorio-zuhaitzaren erroan hasiko da."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:34
-#, fuzzy
 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 "
@@ -1061,7 +1022,7 @@ msgstr ""
 "direktorio-zuhaitzean behera. \"sub\" bilaketa-esparruak zure bilaketa-"
 "oinarritik beherako sarrera guztiak barne hartuko ditu.\n"
 "\"one\" bilaketa-esparruak oinarritik maila bat beherago arteko sarrerak "
-"bakarrik hartuko ditu.\n"
+"bakarrik hartuko ditu."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid ""
@@ -1072,7 +1033,6 @@ msgstr ""
 "\"."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:36
-#, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1082,7 +1042,6 @@ msgstr ""
 "helbide-liburua mantso ibiliko da."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:37
-#, fuzzy
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1093,7 +1052,6 @@ msgstr ""
 "LDAP zerbitzarian."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:38
-#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1102,7 +1060,6 @@ msgstr ""
 "Bistaratzeko bakarrik erabiliko da. "
 
 #: ../addressbook/gui/component/ldap-config.glade.h:39
-#, fuzzy
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -1127,21 +1084,18 @@ msgid "Whenever Possible"
 msgstr "Ahal den guztietan"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:43
-#, fuzzy
 msgid "_Add Address Book"
-msgstr "_Helbide-liburua"
+msgstr "Gehitu _helbide-liburua"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "_Download limit:"
 msgstr "Des_karga-muga:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:45
-#, fuzzy
 msgid "_Find Possible Search Bases"
-msgstr "Onartutako Bilaketa Oinarriak"
+msgstr "_Bilatu bilaketa-oinarri posibleak"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:46
-#, fuzzy
 msgid "_Login method:"
 msgstr "_Saioa hasteko metodoa:"
 
@@ -1154,30 +1108,25 @@ msgid "_Name:"
 msgstr "_Izena:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:48
-#, fuzzy
 msgid "_Port:"
-msgstr "_Lehentasuna:"
+msgstr "_Ataka:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:49
-#, fuzzy
 msgid "_Search scope:"
 msgstr "Bilaketa-_esparrua: "
 
 #: ../addressbook/gui/component/ldap-config.glade.h:50
 #: ../mail/mail-config.glade.h:171
-#, fuzzy
 msgid "_Server:"
 msgstr "_Zerbitzaria:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:51
-#, fuzzy
 msgid "_Timeout:"
-msgstr "Ordu-formatua:"
+msgstr "_Denbora-muga:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:52
-#, fuzzy
 msgid "_Use secure connection:"
-msgstr "E_rabili konexio segurua (SSL):"
+msgstr "E_rabili konexio segurua:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
 msgid "cards"
@@ -1194,54 +1143,46 @@ msgid "minutes"
 msgstr "minutu"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
-#, fuzzy
 msgid "<b>Email</b>"
-msgstr "<b>Mezuak bidali:</b>"
+msgstr "<b>Helb. el.</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
-#, fuzzy
 msgid "<b>Home</b>"
-msgstr "<b>Falta:</b> "
+msgstr "<b>Etxekoa</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
-#, fuzzy
 msgid "<b>Instant Messaging</b>"
-msgstr "Mezu izengabea"
+msgstr "<b>Berehalako mezularitza</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
-#, fuzzy
 msgid "<b>Job</b>"
-msgstr "<b>Falta:</b> "
+msgstr "<b>Lana</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
-#, fuzzy
 msgid "<b>Miscellaneous</b>"
-msgstr "<b>Mezuak bidali:</b>"
+msgstr "<b>Hainbat</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
-#, fuzzy
 msgid "<b>Other</b>"
-msgstr "<b>Falta:</b> "
+msgstr "<b>Bestelakoa</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
-#, fuzzy
 msgid "<b>Telephone</b>"
-msgstr "<b>Falta:</b> "
+msgstr "<b>Telefonoa</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
-msgstr ""
+msgstr "<b>Web helbideak</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#, fuzzy
 msgid "<b>Work</b>"
-msgstr "<b>Falta:</b> "
+msgstr "<b>Lanekoa</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:184
 #: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
-msgstr ""
+msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:272
@@ -1263,40 +1204,34 @@ msgid "Full _Name..."
 msgstr "_Izen-abizenak..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
-#, fuzzy
 msgid "Image"
-msgstr "Orrialdea"
+msgstr "Irudia"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#, fuzzy
 msgid "MSN Messenger"
-msgstr "_Mezua"
+msgstr "MSN Messenger"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
 msgid "Mailing Address"
-msgstr "Fusionatu helbide elektronikoa"
+msgstr "Posta-helbidea"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
-#, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Goitizena:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
-msgstr ""
+msgstr "Novell Groupwise"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
-#, fuzzy
 msgid "Personal Information"
-msgstr "Aukerako informazioa"
+msgstr "Datu pertsonalak"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
-#, fuzzy
 msgid "Telephone"
-msgstr "<b>Falta:</b> "
+msgstr "Telefonoa"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
@@ -1313,78 +1248,63 @@ msgid "_Address:"
 msgstr "Helbi_dea:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
-#, fuzzy
 msgid "_Anniversary:"
 msgstr "_Urteurrena:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
-#, fuzzy
 msgid "_Assistant:"
-msgstr "Laguntzailea"
+msgstr "_Laguntzailea"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
 msgid "_Birthday:"
 msgstr "U_rtebetetzea:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 #: ../plugins/itip-formatter/itip-view.c:1662
-#, fuzzy
 msgid "_Calendar:"
-msgstr "E_gutegia:"
+msgstr "_Egutegia:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-#, fuzzy
 msgid "_Categories"
-msgstr "Kategoriak"
+msgstr "_Kategoriak"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
-#, fuzzy
 msgid "_City:"
 msgstr "_Herria:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
-#, fuzzy
 msgid "_Company:"
-msgstr "Enpresakoa"
+msgstr "_Enpresa:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
-#, fuzzy
 msgid "_Country:"
 msgstr "Es_tatua:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
-#, fuzzy
 msgid "_Department:"
 msgstr "_Saila:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
-#, fuzzy
 msgid "_File under:"
-msgstr "Fitxategi-izena:"
+msgstr "_Artxibatu honela:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
-#, fuzzy
 msgid "_Free/Busy:"
-msgstr "_Libre/okupatuta URLa:"
+msgstr "_Libre/okupatuta informazioa:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
-#, fuzzy
 msgid "_Home Page:"
-msgstr "Etxeko faxa"
+msgstr "_Etxeko orria:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
-#, fuzzy
 msgid "_Manager:"
-msgstr "Zuzendaria"
+msgstr "_Kudeatzailea:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
-#, fuzzy
 msgid "_Notes:"
 msgstr "_Oharrak:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#, fuzzy
 msgid "_Office:"
 msgstr "_Bulegoa:"
 
@@ -1394,12 +1314,10 @@ msgid "_PO Box:"
 msgstr "_Posta-kutxa:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
-#, fuzzy
 msgid "_Profession:"
 msgstr "_Lanbidea:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
-#, fuzzy
 msgid "_Spouse:"
 msgstr "_Ezkontidea:"
 
@@ -1415,26 +1333,22 @@ msgstr "_Titulua:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
-msgstr ""
+msgstr "_Bideo-berriketa"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
-#, fuzzy
 msgid "_Wants to receive HTML mail"
 msgstr "Mezuak HT_ML formatuan jaso nahi ditu"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
-#, fuzzy
 msgid "_Web Log:"
-msgstr "_Web orriaren helbidea:"
+msgstr "_Web egunkaria:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
-#, fuzzy
 msgid "_Where:"
-msgstr "_Zerbitzaria:"
+msgstr "_Non:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
-#, fuzzy
 msgid "_Zip/Postal Code:"
 msgstr "Pos_ta-kodea:"
 
@@ -1663,9 +1577,8 @@ msgid "Congo"
 msgstr "Kongo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
-#, fuzzy
 msgid "Congo, The Democratic Republic Of The"
-msgstr "Koreako Herri Errepublika Demokratikoa"
+msgstr "Kongoko Errepublika Demokratikoa"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cook Islands"
@@ -1872,14 +1785,12 @@ msgid "Indonesia"
 msgstr "Indonesia"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
-#, fuzzy
 msgid "Iran"
-msgstr "Ilan"
+msgstr "Iran"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
-#, fuzzy
 msgid "Iraq"
-msgstr "Israel"
+msgstr "Irak"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Ireland"
@@ -1926,7 +1837,6 @@ msgid "Kiribati"
 msgstr "Kiribati"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
-#, fuzzy
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Koreako Herri Errepublika Demokratikoa"
 
@@ -1979,7 +1889,6 @@ msgid "Luxembourg"
 msgstr "Luxenburgo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
-#, fuzzy
 msgid "Macao"
 msgstr "Macau"
 
@@ -2204,7 +2113,6 @@ msgid "Saint Lucia"
 msgstr "Santa Luzia"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
-#, fuzzy
 msgid "Saint Vincent And The Grenadines"
 msgstr "Saint Vincent eta Grenadinak"
 
@@ -2230,7 +2138,7 @@ msgstr "Senegal"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Serbia And Montenegro"
-msgstr ""
+msgstr "Serbia eta Montenegro"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Seychelles"
@@ -2309,9 +2217,8 @@ msgid "Switzerland"
 msgstr "Suitza"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
-#, fuzzy
 msgid "Syria"
-msgstr "Smyrna"
+msgstr "Siria"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Taiwan"
@@ -2330,9 +2237,8 @@ msgid "Thailand"
 msgstr "Thailandia"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
-#, fuzzy
 msgid "Timor-Leste"
-msgstr "Trieste"
+msgstr "Timor-Leste"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Togo"
@@ -2449,41 +2355,38 @@ msgstr "Izena"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
-msgstr ""
+msgstr "AOL Instant Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:185
 #: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
-msgstr ""
+msgstr "Jabber"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
-msgstr ""
+msgstr "Yahoo Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
-msgstr ""
+msgstr "ICQ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
 msgid "Service"
-msgstr "Zerbitzua prest"
+msgstr "Zerbitzua"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:587
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../plugins/save-calendar/csv-format.c:400
-#, fuzzy
 msgid "Location"
-msgstr "Kokalekua:"
+msgstr "Kokalekua"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
 msgid "Username"
-msgstr "_Erabiltzaile-izena:"
+msgstr "Erabiltzaile-izena"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:231
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:202
@@ -2497,43 +2400,38 @@ msgstr "Bestelakoa"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
 #: ../addressbook/gui/widgets/eab-contact-display.c:353
-#, fuzzy
 msgid "Yahoo"
-msgstr "Yoro"
+msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
-msgstr ""
+msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:349
-#, fuzzy
 msgid "GroupWise"
-msgstr "Taldea"
+msgstr "GroupWise"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:258
-#, fuzzy
 msgid "Source Book"
-msgstr "Iturburua"
+msgstr "Iturburu-liburua"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
-msgstr ""
+msgstr "Helburu-liburua"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:279
-#, fuzzy
 msgid "Is New Contact"
-msgstr "Kontaktu berria"
+msgstr "Kontaktu berria da"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Eremu editagarriak"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:293
-#, fuzzy
 msgid "Required Fields"
-msgstr "_Beharrezko pertsonak"
+msgstr "Beharrezko eremuak"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:307
 msgid "Changed"
@@ -2541,31 +2439,29 @@ msgstr "Aldatuta"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:535
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:2348
-#, fuzzy, c-format
+#, c-format
 msgid "Contact Editor - %s"
-msgstr "Kontaktu-editorea"
+msgstr "Kontaktu-editorea - %s"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:2661
-#, fuzzy
 msgid "Please select an image for this contact"
-msgstr "Hautatu ondorengo aukeretako bat"
+msgstr "Hautatu irudi bat kontaktu honentzat"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:2662
-#, fuzzy
 msgid "No image"
-msgstr "Nome"
+msgstr "Irudirik ez"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:2941
-#, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
-msgstr "Errepikatze-data ez da baliozkoa"
+msgstr ""
+"Kontaktu-data ez da baliozkoa:\n"
+"\n"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:2993
-#, fuzzy
 msgid "Invalid contact."
-msgstr "Bilatu kontaktua hemen:"
+msgstr "kontaktua ez da balizkoa."
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:277
 msgid "Contact Quick-Add"
@@ -2584,30 +2480,29 @@ msgid "E-_mail:"
 msgstr "_Helb. el:"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:323
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Are you sure you want\n"
 "to delete contact list (%s) ?"
 msgstr ""
-"Ziur zaude kontaktu hauek\n"
-"ezabatu nahi dituzula?"
+"Ziur zaude kontaktu-zerrenda (%s) \n"
+"ezabatu nahi duzula?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:326
-#, fuzzy
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
 msgstr ""
-"Ziur zaude kontaktu hauek\n"
+"Ziur zaude kontaktu-zerrenda hauek\n"
 "ezabatu nahi dituzula?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:331
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Are you sure you want\n"
 "to delete contact (%s) ?"
 msgstr ""
-"Ziur zaude kontaktu hauek\n"
+"Ziur zaude kontaktua (%s)\n"
 "ezabatu nahi dituzula?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:334
@@ -2704,27 +2599,23 @@ msgid "_Suffix:"
 msgstr "_Atzizkia:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:2
-#, fuzzy
 msgid "Add IM Account"
-msgstr "Posta-kontuak"
+msgstr "Gehitu berehalako mezularitzako kontua"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:3
-#, fuzzy
 msgid "_Account name:"
-msgstr "Kontuaren izena"
+msgstr "_Kontu-izena:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:4
-#, fuzzy
 msgid "_IM Service:"
-msgstr "E_statua/Probintzia:"
+msgstr "_Berehalako mezularitzako zerbitzua:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:215
-#: ../plugins/exchange-operations/exchange-contacts.c:193
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-calendar.c:224
+#: ../plugins/exchange-operations/exchange-contacts.c:203
 msgid "_Location:"
-msgstr "Kokalekua:"
+msgstr "_Kokalekua:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 msgid "\n"
@@ -2732,7 +2623,7 @@ msgstr "\n"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Add an email to the List"
-msgstr ""
+msgstr "Gehitu helbidea zerrendan"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:834
@@ -2740,18 +2631,16 @@ msgid "Contact List Editor"
 msgstr "Kontaktu-zerrendaren editorea"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#, fuzzy
 msgid "Insert email addresses from Address Book"
-msgstr "Hautatu kontaktuak helbide-liburutik"
+msgstr "Txertatu helbide elektronikoa helbide-liburutik"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "Members"
 msgstr "Kideak"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
-#, fuzzy
 msgid "Remove an email address from the List"
-msgstr "Kendu hautatutako elementuak eranskin-zerrendatik"
+msgstr "Kendu helbide elektroniko bat zerrendatik"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
@@ -2762,9 +2651,8 @@ msgid "_List name:"
 msgstr "_Zerrenda-izena:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
-#, fuzzy
 msgid "_Select"
-msgstr "Hautatuta"
+msgstr "_Hautatu"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Type an email address or drag a contact into the list below:"
@@ -2785,14 +2673,12 @@ msgid "Is New List"
 msgstr "Zerrenda berria da"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:707
-#, fuzzy
 msgid "_Members"
-msgstr "Kideak"
+msgstr "_Kideak"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:710
-#, fuzzy
 msgid "Contact List Members"
-msgstr "Kideak"
+msgstr "Kontaktu-zerrendako kideak"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
@@ -2838,16 +2724,15 @@ msgid "Advanced Search"
 msgstr "Bilaketa aurreratua"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:148
-#, fuzzy
 msgid "No contacts"
-msgstr "Erakutsi kontaktuak"
+msgstr "Kontakturik ez"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:151
-#, fuzzy, c-format
+#, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
-msgstr[0] "Bilatu kontaktua hemen:"
-msgstr[1] "Bilatu kontaktua hemen:"
+msgstr[0] "Kontaktu 1"
+msgstr[1] "%d kontaktu"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:303
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
@@ -2912,21 +2797,19 @@ msgid "Type"
 msgstr "Mota"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:544
-#, fuzzy
 msgid "Address Book"
 msgstr "Helbide-liburua"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:807
 #: ../addressbook/gui/widgets/e-addressbook-view.c:936
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2011
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ../ui/evolution-addressbook.xml.h:19
-#, fuzzy
 msgid "Save as VCard..."
-msgstr "Gorde VCard gisa"
+msgstr "Gorde VCard gisa..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:930
-#: ../calendar/gui/e-calendar-table.c:1154
-#: ../calendar/gui/e-calendar-view.c:1528 ../ui/evolution-addressbook.xml.h:37
+#: ../calendar/gui/e-calendar-table.c:1167
+#: ../calendar/gui/e-calendar-view.c:1545 ../ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Ireki"
 
@@ -2944,40 +2827,35 @@ msgid "Forward Contact"
 msgstr "Birbidali kontaktua"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:938
-#, fuzzy
 msgid "Forward Contacts"
-msgstr "Birbidali kontaktua"
+msgstr "Birbidali kontaktuak"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "Send Message to Contact"
 msgstr "Bidali mezua kontaktuari"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:940
-#, fuzzy
 msgid "Send Message to List"
-msgstr "Bidali mezua kontaktuari"
+msgstr "Bidali mezua zerrendari"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:941
-#, fuzzy
 msgid "Send Message to Contacts"
-msgstr "Bidali mezua kontaktuari"
+msgstr "Bidali mezua kontaktuaei"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:942
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2501
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2510
 #: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-tasks.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Inprimatu"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:945
-#, fuzzy
 msgid "Copy to Address Book..."
-msgstr "Helbide-liburua..."
+msgstr "KPoiatu helbide-liburuan..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:946
-#, fuzzy
 msgid "Move to Address Book..."
-msgstr "Helbide-liburua..."
+msgstr "Eraman helbide-liburura..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:949
 #: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-tasks.xml.h:4
@@ -2987,7 +2865,7 @@ msgstr "Ebaki"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:950
 #: ../calendar/gui/calendar-component.c:536
 #: ../calendar/gui/tasks-component.c:440 ../ui/evolution-addressbook.xml.h:2
-#: ../ui/evolution-mail-message.xml.h:12 ../ui/evolution-tasks.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:11 ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopiatu"
 
@@ -2997,12 +2875,12 @@ msgid "Paste"
 msgstr "Itsatsi"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1562
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1565
 #: ../calendar/gui/cal-search-bar.c:346
 msgid "Any Category"
 msgstr "Edozein kategoria"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1761
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1766
 msgid "Print cards"
 msgstr "Inprimatu txartelak"
 
@@ -3046,7 +2924,7 @@ msgid "Company Phone"
 msgstr "Enpresako telefonoa"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:564
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 #: ../smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "Helb. el."
@@ -3070,9 +2948,8 @@ msgid "File As"
 msgstr "Gorde honela"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-#, fuzzy
 msgid "Given Name"
-msgstr "Eremu-izena"
+msgstr "Izena"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
@@ -3087,14 +2964,12 @@ msgid "Home Phone 2"
 msgstr "Etxeko 2. telefonoa"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-#, fuzzy
 msgid "ISDN Phone"
-msgstr "Telefonoa"
+msgstr "ISDN telefonoa"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
-#, fuzzy
 msgid "Journal"
-msgstr "Jordania"
+msgstr "Egunkaria"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
@@ -3162,7 +3037,6 @@ msgstr "Ezkontidea"
 #. 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
-#, fuzzy
 msgid "TTYTDD"
 msgstr "Teletipoa"
 
@@ -3175,9 +3049,8 @@ msgid "Title"
 msgstr "Titulua"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-#, fuzzy
 msgid "Unit"
-msgstr "Unst"
+msgstr "Unitatea"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Web Site"
@@ -3240,7 +3113,6 @@ msgid "Column Width"
 msgstr "Zutabe-zabalera"
 
 #: ../addressbook/gui/widgets/e-minicard-view.c:172
-#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -3250,9 +3122,9 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Ez dago ikuspegi honetan erakusteko elementurik.\n"
+"Bilatu kontaktua\n"
 "\n"
-"Egin klik bikoitza hemen kontaktu berria sortzeko."
+"edo egin klik bikoitza hemen kontaktu berria sortzeko."
 
 #: ../addressbook/gui/widgets/e-minicard-view.c:175
 msgid ""
@@ -3269,12 +3141,14 @@ msgstr ""
 "Egin klik bikoitza hemen kontaktu berria sortzeko."
 
 #: ../addressbook/gui/widgets/e-minicard-view.c:180
-#, fuzzy
 msgid ""
 "\n"
 "\n"
 "Search for the Contact."
-msgstr "Bilatu kontaktuak..."
+msgstr ""
+"\n"
+"\n"
+"Bilatu kontaktua."
 
 #: ../addressbook/gui/widgets/e-minicard-view.c:182
 msgid ""
@@ -3301,34 +3175,30 @@ msgstr "Kurtsorea du"
 #: ../addressbook/gui/widgets/eab-contact-display.c:135
 #: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
-msgstr ""
+msgstr "(mapa)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:145
 #: ../addressbook/gui/widgets/eab-contact-display.c:211
-#, fuzzy
 msgid "map"
-msgstr "Amapala"
+msgstr "mapa"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:276
 #: ../addressbook/gui/widgets/eab-contact-display.c:545
-#, fuzzy
 msgid "List Members"
-msgstr "Kideak"
+msgstr "Zerrendako kideak"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:339
 #: ../addressbook/gui/widgets/eab-contact-display.c:341
-#, fuzzy
 msgid "E-mail"
 msgstr "Helb. el."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:363
-#, fuzzy
 msgid "Position"
-msgstr "Boston"
+msgstr "Kokalekua"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Video Conferencing"
-msgstr ""
+msgstr "Bideo-konferentzia"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:365
 #: ../addressbook/gui/widgets/eab-contact-display.c:380
@@ -3336,39 +3206,33 @@ msgid "Phone"
 msgstr "Telefonoa"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:366
-#, fuzzy
 msgid "Fax"
-msgstr "Lan fax"
+msgstr "Faxa"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:370
-#, fuzzy
 msgid "work"
-msgstr "Lanekoa"
+msgstr "lanekoa"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:377
 msgid "WWW"
-msgstr ""
+msgstr "WWW"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:378
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
 msgid "Blog"
-msgstr "Bologna"
+msgstr "Blog-a"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:385
-#, fuzzy
 msgid "personal"
-msgstr "Pertsonala"
+msgstr "pertsonala"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
-msgstr "Kar_gua:"
+msgstr "Lanpostua"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
-msgstr "Etxeko faxa"
+msgstr "Etxeko orria"
 
 #. E_BOOK_ERROR_OK
 #: ../addressbook/gui/widgets/eab-gui-util.c:49
@@ -3379,7 +3243,7 @@ msgstr "Behar bezala egin da"
 #. E_BOOK_ERROR_BUSY
 #: ../addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Backend busy"
-msgstr ""
+msgstr "Modulua lanpetuta"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
 #: ../addressbook/gui/widgets/eab-gui-util.c:52
@@ -3388,15 +3252,13 @@ msgstr "Biltegia deskonektatuta"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
 #: ../addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
 msgid "Address Book does not exist"
 msgstr "Helbide-liburu hori ez dago"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
 #: ../addressbook/gui/widgets/eab-gui-util.c:54
-#, fuzzy
 msgid "No Self Contact defined"
-msgstr "Kontaktuen zerrenda berria"
+msgstr "Ez da auto-kontakturik definitu"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
@@ -3408,15 +3270,13 @@ msgstr "Baimena ukatuta"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
 #: ../addressbook/gui/widgets/eab-gui-util.c:58
-#, fuzzy
 msgid "Contact not found"
-msgstr "Ez da txartela aurkitu"
+msgstr "Ez da kontaktua aurkitu"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
 #: ../addressbook/gui/widgets/eab-gui-util.c:59
-#, fuzzy
 msgid "Contact ID already exists"
-msgstr "Txartelaren ID hori badago lehendik"
+msgstr "Kontaktuaren ID hori badago lehendik"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
 #: ../addressbook/gui/widgets/eab-gui-util.c:60
@@ -3429,15 +3289,14 @@ msgstr "Protokoloa ez da onartzen"
 #: ../calendar/gui/e-cal-component-preview.c:232
 #: ../calendar/gui/e-cal-model-tasks.c:348
 #: ../calendar/gui/e-cal-model-tasks.c:661
-#: ../calendar/gui/e-calendar-table.c:456 ../calendar/gui/print.c:2364
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2373
 msgid "Cancelled"
 msgstr "Bertan behera utzita"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
 #: ../addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
 msgid "Could not cancel"
-msgstr "Ezin izan da objektua eguneratu"
+msgstr "Ezin izan da bertan behera utzi"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:63
@@ -3458,15 +3317,13 @@ msgstr "TLS ez dago erabilgarri"
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
 #: ../addressbook/gui/widgets/eab-gui-util.c:67
-#, fuzzy
 msgid "No such source"
-msgstr "Ez dago horrelako mezurik"
+msgstr "Ez dago halako iturbururik"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
 #: ../addressbook/gui/widgets/eab-gui-util.c:68
-#, fuzzy
 msgid "Not available in offline mode"
-msgstr "Hasi lineaz kanpo"
+msgstr "Ez dago eskuragarri lineaz kanpo moduan"
 
 #. E_BOOK_ERROR_OTHER_ERROR
 #: ../addressbook/gui/widgets/eab-gui-util.c:69
@@ -3475,9 +3332,8 @@ msgstr "Beste errore bat"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
 #: ../addressbook/gui/widgets/eab-gui-util.c:70
-#, fuzzy
 msgid "Invalid server version"
-msgstr "Vermont"
+msgstr "Zerbitzariaren bertsioa baliogabea"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:93
 msgid ""
@@ -3485,15 +3341,19 @@ msgid ""
 "marked for offline usage or not yet downloaded for offline usage. Please "
 "load the addressbook once in online mode to download its contents"
 msgstr ""
+"Ezin izan da helbide-liburua ireki. Baliteke helbide-liburua lineaz kanpo "
+"lan egiteko markatuta ez egotea, edo lineaz kanpo erabiltzeko oraindik "
+"deskargatuta ez izatea. Kargatu behin helbide-liburua linean konektatuta "
+"zaudenean bere edukia deskargatzeko."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy, c-format
+#, 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 ""
-"Ezin izan da helbide-liburu hori ireki.  Egiaztatu bide-izena ondo dagoela "
-"eta sarbidea baduzula."
+"Ezin izan da helbide-liburu hori ireki.  Egiaztatu %s bide-izena ondo "
+"dagoela eta sarbidea baduzula."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:110
 msgid ""
@@ -3504,15 +3364,14 @@ msgstr ""
 "idatzi duzula, edo LDAP zerbitzaria ezin dela atzitu."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:115
-#, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
 "Evolution package."
 msgstr ""
 "Evolution-en bertsio honek ez dauka konpilatuta LDAP euskarria.  LDAP "
-"erabili nahi baduzu Evolution-en programa konpilatu behar duzu CVS "
-"iturburuetatik beheko estekatik OpenLDAP eskuratuz."
+"erabili nahi baduzu LDAP gaituta duen Evolution-en paketea instalatu behar "
+"duzu."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:122
 msgid ""
@@ -3565,18 +3424,16 @@ msgstr "Errorea zerrenda gehitzean"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:185
 #: ../addressbook/gui/widgets/eab-gui-util.c:693
-#, fuzzy
 msgid "Error adding contact"
-msgstr "Errorea txartela gehitzean"
+msgstr "Errorea kontaktua gehitzean"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:196
 msgid "Error modifying list"
 msgstr "Errorea zerrenda aldatzean"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:196
-#, fuzzy
 msgid "Error modifying contact"
-msgstr "Errorea txartela aldatzean"
+msgstr "Errorea kontaktua aldatzean"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:208
 msgid "Error removing list"
@@ -3584,12 +3441,11 @@ msgstr "Errorea zerrenda kentzean"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:208
 #: ../addressbook/gui/widgets/eab-gui-util.c:648
-#, fuzzy
 msgid "Error removing contact"
-msgstr "Errorea txartela kentzean"
+msgstr "Errorea kontaktua kentzean"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:290
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
 "Do you really want to display this contact?"
@@ -3597,11 +3453,11 @@ 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] ""
-"%d txartel irekitzen badituzu, %d leiho irekiko dira.\n"
-"Ziur zaude txartel horiek guztiak bistaratu nahi dituzula?"
+"Kontaktu %d irekitzen baduzu, leiho %d irekiko da.\n"
+"Ziur zaude kontaktu horiek guztiak bistaratu nahi dituzula?"
 msgstr[1] ""
-"%d txartel irekitzen badituzu, %d leiho irekiko dira.\n"
-"Ziur zaude txartel horiek guztiak bistaratu nahi dituzula?"
+"%d kontaktu irekitzen badituzu, %d leiho irekiko dira.\n"
+"Ziur zaude kontaktu horiek guztiak bistaratu nahi dituzula?"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:319
 #, c-format
@@ -3621,11 +3477,10 @@ msgstr "Gainidatzi"
 #.
 #: ../addressbook/gui/widgets/eab-gui-util.c:368
 #: ../addressbook/gui/widgets/eab-gui-util.c:371
-#, fuzzy
 msgid "contact"
 msgid_plural "contacts"
-msgstr[0] "Kontaktua"
-msgstr[1] "Kontaktua"
+msgstr[0] "kontaktua"
+msgstr[1] "kontaktuak"
 
 #. This is a filename. Translators take note.
 #: ../addressbook/gui/widgets/eab-gui-util.c:418
@@ -3637,29 +3492,24 @@ msgid "list"
 msgstr "zerrenda"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:754
-#, fuzzy
 msgid "Move contact to"
-msgstr "Eraman txartela hona:"
+msgstr "Eraman kontaktua hona"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:756
-#, fuzzy
 msgid "Copy contact to"
-msgstr "Kopiatu txartela hemen:"
+msgstr "Kopiatu kontaktua hemen"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:759
-#, fuzzy
 msgid "Move contacts to"
-msgstr "Eraman txartelak hona:"
+msgstr "Eraman kontaktuak hona"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:761
-#, fuzzy
 msgid "Copy contacts to"
-msgstr "Kopiatu txartelak hemen:"
+msgstr "Kopiatu kontaktuak hemen"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:764
-#, fuzzy
 msgid "Select target addressbook."
-msgstr "Hautatu kontaktuak helbide-liburutik"
+msgstr "Hautatu helburuko helbide-liburua."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:987
 msgid "Multiple VCards"
@@ -3698,7 +3548,6 @@ msgid "Add address to existing contact \"%s\""
 msgstr "Gehitu helbidea lehendik dagoen \"%s\" kontaktuari"
 
 #: ../addressbook/gui/widgets/eab-popup-control.c:869
-#, fuzzy
 msgid "Querying Address Book..."
 msgstr "Helbide-liburuan kontsulta egiten..."
 
@@ -3707,22 +3556,20 @@ msgid "Merge E-Mail Address"
 msgstr "Fusionatu helbide elektronikoa"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
+#, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
-msgstr[0] "eta beste txartel bat."
-msgstr[1] "eta beste txartel bat."
+msgstr[0] "eta beste kontaktu bat."
+msgstr[1] "eta beste %d kontaktu."
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:223
 #: ../addressbook/gui/widgets/eab-vcard-control.c:272
-#, fuzzy
 msgid "Show Full VCard"
-msgstr "Erakutsi _goiburu osoak"
+msgstr "Erakutsi VCard osoa"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:227
-#, fuzzy
 msgid "Show Compact VCard"
-msgstr "Gorde kontaktua VCard gisa"
+msgstr "Erakutsi VCard trinkoa"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:277
 msgid "Save in addressbook"
@@ -3736,19 +3583,18 @@ msgstr "Txartelen ikuspegia"
 msgid "GTK Tree View"
 msgstr "GTK zuhaitz-ikuspegia"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:486
+#: ../addressbook/importers/evolution-ldif-importer.c:582
 #: ../addressbook/importers/evolution-vcard-importer.c:249
 #: ../calendar/importers/icalendar-importer.c:311
 #: ../calendar/importers/icalendar-importer.c:643 ../shell/shell.error.xml.h:6
-#, fuzzy
 msgid "Importing ..."
 msgstr "Inportatzen..."
 
-#: ../addressbook/importers/evolution-ldif-importer.c:652
+#: ../addressbook/importers/evolution-ldif-importer.c:748
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP datuak trukatzeko formatua (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:653
+#: ../addressbook/importers/evolution-ldif-importer.c:749
 msgid "Evolution LDIF importer"
 msgstr "Evolution-en LDIF inportatzailea"
 
@@ -3765,16 +3611,14 @@ msgstr "Evolution-en Vcard inportatzailea"
 msgid "Print envelope"
 msgstr "Inprimatu gutun-azala"
 
-#: ../addressbook/printing/e-contact-print.c:1001
-#, fuzzy
+#: ../addressbook/printing/e-contact-print.c:1014
 msgid "Print contacts"
-msgstr "Inprimatu hautatutako kontaktuak"
+msgstr "Inprimatu kontaktuak"
 
-#: ../addressbook/printing/e-contact-print.c:1066
-#: ../addressbook/printing/e-contact-print.c:1093
-#, fuzzy
+#: ../addressbook/printing/e-contact-print.c:1104
+#: ../addressbook/printing/e-contact-print.c:1132
 msgid "Print contact"
-msgstr "Inprimatu hautatutako kontaktuak"
+msgstr "Inprimatu kontaktua"
 
 #: ../addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
@@ -3925,9 +3769,9 @@ msgstr "Itzaldura"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:917
-#: ../plugins/exchange-operations/exchange-calendar.c:205
-#: ../plugins/exchange-operations/exchange-contacts.c:176
+#: ../plugins/exchange-operations/exchange-account-setup.c:940
+#: ../plugins/exchange-operations/exchange-calendar.c:214
+#: ../plugins/exchange-operations/exchange-contacts.c:186
 msgid "Size:"
 msgstr "Tamaina:"
 
@@ -3957,101 +3801,95 @@ msgid "_Font..."
 msgstr "_Letra-tipoa..."
 
 #: ../addressbook/printing/test-contact-print-style-editor.c:53
-#, fuzzy
 msgid "Contact Print Style Editor Test"
-msgstr "Kontaktu-zerrendaren editorea"
+msgstr "Kontaktuak inprimatzeko estiloen editorearen proba"
 
 #: ../addressbook/printing/test-contact-print-style-editor.c:54
 #: ../addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr ""
+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 ""
+"Kontaktuak inprimatzeko estilo-editorearen trepeta probatu beharko luke honek"
 
 #: ../addressbook/printing/test-print.c:52
-#, fuzzy
 msgid "Contact Print Test"
-msgstr "K_ontaktuen zerrenda"
+msgstr "Kontaktuak inprimatzeko proba"
 
 #: ../addressbook/printing/test-print.c:55
 msgid "This should test the contact print code"
-msgstr ""
+msgstr "Kontaktuak inprimatzeko kodea probatu beharko luke honek"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:664
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:700
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:49
-#, fuzzy
 msgid "Can not open file"
-msgstr "Ezin da mezua ireki"
+msgstr "Ezin da fitxategia ireki"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
 msgid "Couldn't get list of addressbooks"
-msgstr "Ezin izan da helbide-liburua kargatu"
+msgstr "Ezin izan da helbide-liburuen zerrrenda lortu"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
 msgid "failed to open book"
-msgstr "Ezin da helbide-liburua ireki"
+msgstr "ezin da helbide-liburua ireki"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
-msgstr ""
+msgstr "Zehaztu irteerako fitxategia irteera estandarraren ordez"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:57
 msgid "OUTPUTFILE"
-msgstr ""
+msgstr "IRTEERA-FITXATEGIA"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:58
-#, fuzzy
 msgid "List local addressbook folders"
-msgstr "karpeta lokal eta urruneko karpeta aktibo guztiekin"
+msgstr "Zerrendatu helbide-liburuen karpeta lokalak"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Show cards as vcard or csv file"
-msgstr ""
+msgstr "Erakutsi txartelak vcard edo csv fitxategi gisa"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:60
-#, fuzzy
 msgid "[vcard|csv]"
-msgstr "txartel"
+msgstr "[vcard|csv]"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "Export in asynchronous mode"
-msgstr ""
+msgstr "Esportatu modu asinkronoan"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid ""
 "The number of cards in one output file in asychronous mode, default size 100."
 msgstr ""
+"Irteera-fitxategiko txartel-kopurua modu asinkronoan; tamaina lehenetsia: 100"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "NUMBER"
-msgstr ""
+msgstr "KOPURUA"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:91
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
-msgstr ""
+msgstr "Komando-lerroko argumentuen errorea, idatzi --help erabilera ikusteko."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:105
 msgid "Only support csv or vcard format."
-msgstr ""
+msgstr "Csv edo vcard formatuak bakarrik onartzen ditu."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:114
 msgid "In async mode, output must be file."
-msgstr ""
+msgstr "Modu asinkronoan, irteerak fitxategia izan behar du."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:122
 msgid "In normal mode, there is no need for the size option."
-msgstr ""
+msgstr "Modu normalean, ez dago tamaina-aukeraren beharrik."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:153
-#, fuzzy
 msgid "Unhandled error"
-msgstr "Errore ezezaguna"
+msgstr "Kudeatu gabeko errorea"
 
 #: ../addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -4070,204 +3908,216 @@ msgid ""
 " There are few attachments getting downloaded. Saving the appointment will "
 "cause the appointment to be saved without those pending attachments "
 msgstr ""
+"Eranskin gutxi batzu deskargatzen ari dira. Hitzordua gordetzean deskargatu "
+"gabeko eranskinik gabe gordetzea eragin dezake."
 
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
 " There are few attachments getting downloaded. Saving the task will cause "
 "the task to be saved without those pending attachments "
 msgstr ""
+"Eranskin gutxi batzu deskargatzen ari dira. Zeregina gordetzean deskargatu "
+"gabeko eranskinik gabe gordetzea eragin dezake."
 
 #: ../calendar/calendar.error.xml.h:3
 msgid ""
 "Adding a meaningful Summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
 msgstr ""
+"Hitzorduari laburpen esanguratsu bat jartzen badiozu, hitzordua zeri "
+"buruzkoa den jakingo dute hartzaileek."
 
 #: ../calendar/calendar.error.xml.h:4
 msgid ""
 "Adding a meaningful Summary to your task will give your recipients an idea "
 "of what your task is about."
 msgstr ""
+"Zereginari laburpen esanguratsu bat jartzen badiozu, zeregina zeri buruzkoa "
+"den jakingo dute hartzaileek."
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
 "All information in these journal entries will be deleted and can not be "
 "restored."
 msgstr ""
+"Egunkarien informazio guztiak ezabatu egingo dira eta ezin izango dira "
+"berreskuratu."
 
 #: ../calendar/calendar.error.xml.h:6
 msgid ""
 "All information in this journal will be deleted and can not be restored."
 msgstr ""
+"Egunkariaren informazio guztia ezabatu egingo da eta ezin izango da "
+"berreskuratu."
 
 #: ../calendar/calendar.error.xml.h:7
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
 msgstr ""
+"Hitzorduen informazio guztiak ezabatu egingo dira eta ezin izango dira "
+"berreskuratu."
 
 #: ../calendar/calendar.error.xml.h:8
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr ""
+"Zereginen informazio guztiak ezabatu egingo dira eta ezin izango dira "
+"berreskuratu."
 
 #: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
 msgstr ""
+"Hitzorduaren informazio guztia ezabatu egingo da eta ezin izango da "
+"berreskuratu."
 
 #: ../calendar/calendar.error.xml.h:10
 msgid ""
 "All information on this journal entry will be deleted and can not be "
 "restored."
 msgstr ""
+"Egunkari-sarreraren informazio guztia ezabatu egingo da eta ezin izango da "
+"berreskuratu."
 
 #: ../calendar/calendar.error.xml.h:11
 msgid ""
 "All information on this meeting will be deleted and can not be restored."
 msgstr ""
+"Bilera honen informazio guztia ezabatu egingo da eta ezin izango da "
+"berreskuratu."
 
 #: ../calendar/calendar.error.xml.h:12
 msgid "All information on this task will be deleted and can not be restored."
 msgstr ""
+"Zereginaren informazio guztia ezabatu egingo da eta ezin izango da "
+"berreskuratu."
 
 #: ../calendar/calendar.error.xml.h:13
-#, fuzzy
 msgid "Are you sure you want to delete the '{0}' task?"
-msgstr "Ziur zaude `%s' zeregina ezabatu nahi duzula?"
+msgstr "Ziur zaude '{0}' zeregina ezabatu nahi duzula?"
 
 #: ../calendar/calendar.error.xml.h:14
-#, fuzzy
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
-msgstr "Ziur zaude `%s' hitzordua ezabatu nahi duzula?"
+msgstr "Ziur zaude '{0}' izeneko hitzordua ezabatu nahi duzula?"
 
 #: ../calendar/calendar.error.xml.h:15
-#, fuzzy
 msgid "Are you sure you want to delete the journal entry '{0}'?"
-msgstr "Ziur zaude egunkariko `%s' sarrera ezabatu nahi duzula?"
+msgstr "Ziur zaude '{0}' egunkari-sarrera ezabatu nahi duzula?"
 
 #: ../calendar/calendar.error.xml.h:16
-#, fuzzy
 msgid "Are you sure you want to delete these {0} appointments?"
-msgstr "Ziur zaude `%s' hitzordua ezabatu nahi duzula?"
+msgstr "Ziur zaude {0} hitzordu hauek ezabatu nahi duzula?"
 
 #: ../calendar/calendar.error.xml.h:17
-#, fuzzy
 msgid "Are you sure you want to delete these {0} journal entries?"
-msgstr "Ziur zaude egunkariko `%s' sarrera ezabatu nahi duzula?"
+msgstr "Ziur zaude {0} egunkari-sarrerak ezabatu nahi dituzula?"
 
 #: ../calendar/calendar.error.xml.h:18
-#, fuzzy
 msgid "Are you sure you want to delete these {0} tasks?"
-msgstr "Ziur zaude `%s' zeregina ezabatu nahi duzula?"
+msgstr "Ziur zaude {0} zereginak ezabatu nahi dituzula?"
 
 #: ../calendar/calendar.error.xml.h:19
-#, fuzzy
 msgid "Are you sure you want to delete this appointment?"
-msgstr "Ziur zaude %d hitzordu ezabatu nahi dituzula?"
+msgstr "Ziur zaude hitzordua ezabatu nahi duzula?"
 
 #: ../calendar/calendar.error.xml.h:20
-#, fuzzy
 msgid "Are you sure you want to delete this journal entry?"
-msgstr "Ziur zaude %d egunkari-sarrera ezabatu nahi dituzula?"
+msgstr "Ziur zaude egunkari-sarrera ezabatu nahi duzula?"
 
 #: ../calendar/calendar.error.xml.h:21
-#, fuzzy
 msgid "Are you sure you want to delete this meeting?"
-msgstr "Ziur zaude bilera hau bertan behera utzi eta ezabatu nahi duzula?"
+msgstr "Ziur zaude bilera hau ezabatu nahi duzula?"
 
 #: ../calendar/calendar.error.xml.h:22
-#, fuzzy
 msgid "Are you sure you want to delete this task?"
-msgstr "Ziur zaude %d zeregin ezabatu nahi dituzula?"
+msgstr "Ziur zaude zeregina ezabatu nahi duzula?"
 
 #: ../calendar/calendar.error.xml.h:23
-#, fuzzy
 msgid "Are you sure you want to send the appointment without a summary?"
-msgstr "Ziur zaude %d mezuak berriro bidali nahi dituzula?"
+msgstr "Ziur zaude hitzordua laburpenik gabe bidaltzea nahi duzula?"
 
 #: ../calendar/calendar.error.xml.h:24
-#, fuzzy
 msgid "Are you sure you want to send the task without a summary?"
-msgstr "Ziur zaude %d mezuak berriro bidali nahi dituzula?"
+msgstr "Ziur zaude zeregina laburpenik gabe bidaltzea nahi duzula?"
 
 #: ../calendar/calendar.error.xml.h:25
-#, fuzzy
 msgid "Delete calendar '{0}'?"
-msgstr "Ezabatu \"%s\""
+msgstr "Ezabatu '{0}' egutegia?"
 
 #: ../calendar/calendar.error.xml.h:26
-#, fuzzy
 msgid "Delete task list '{0}'?"
-msgstr "Ezabatu zerrenda hau"
+msgstr "Ezabatu '{0}' zereginen zerrenda?"
 
 #: ../calendar/calendar.error.xml.h:27
-#, fuzzy
 msgid "Discard Changes"
-msgstr "_Ez gorde"
+msgstr "Ez gorde aldaketak"
 
 #: ../calendar/calendar.error.xml.h:28
-#, fuzzy
 msgid "Don't Send"
-msgstr "Ez ezabatu"
+msgstr "Ez bidali"
 
 #: ../calendar/calendar.error.xml.h:29
-#, fuzzy
 msgid "Download in progress. Do you want to save the appointment?"
-msgstr "Ziur zaude %d hitzordu ezabatu nahi dituzula?"
+msgstr "Deskargatzen ari da. Ziur zaude hitzordua ezabatu nahi duzula?"
 
 #: ../calendar/calendar.error.xml.h:30
-#, fuzzy
 msgid "Download in progress. Do you want to save the task?"
-msgstr "Aldaketak gorde nahi dituzu?"
+msgstr "Deskargatzen ari da. Zeregina gorde nahi duzu?"
 
 #: ../calendar/calendar.error.xml.h:31
-#, fuzzy
 msgid "Editor could not be loaded."
-msgstr "Objektua ezin izan da aurkitu\n"
+msgstr "Ezin izan da editorea kargatu."
 
 #: ../calendar/calendar.error.xml.h:32
 msgid ""
 "Email invitations will be sent to all participants and allow them to RSVP."
 msgstr ""
+"Gonbiteak posta elektronikoz bidaliko zaie parte-hartzeile guztiei eta RSVP "
+"baimenduko die."
 
 #: ../calendar/calendar.error.xml.h:33
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
 msgstr ""
+"Gonbiteak posta elektronikoz bidaliko zaie parte-hartzeile guztiei zeregina "
+"onartzeko aukera eskainiz."
 
 #: ../calendar/calendar.error.xml.h:34
-#, fuzzy
 msgid "Error loading calendar"
-msgstr "Errorea egutegia irekitzean"
+msgstr "Errorea egutegia kargatzean"
 
 #: ../calendar/calendar.error.xml.h:35
-#, fuzzy
 msgid "Error loading task list"
-msgstr "Errorea zerrenda gehitzean"
+msgstr "Errorea zereginen zerrenda kargatzean"
 
 #: ../calendar/calendar.error.xml.h:36
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the journal has been deleted."
 msgstr ""
+"Ez baduzu bertan behera uzteari buruzko jakinarazpena bidaltzen beste "
+"partaideek ez dute jakingo egunkaria ezabatua izan dela."
 
 #: ../calendar/calendar.error.xml.h:37
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the meeting is canceled."
 msgstr ""
+"Ez baduzu bertan behera uzteko jakinarazpenik bidaltzen beste partaide batek "
+"ez du jakingo bilera bertan behera utzi dela."
 
 #: ../calendar/calendar.error.xml.h:38
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the task has been deleted."
 msgstr ""
+"Ez baduzu bertan behera uzteari buruzko jakinarazpena bidaltzen beste "
+"partaideek ez dute jakingo zeregina ezabatua izan dela."
 
 #: ../calendar/calendar.error.xml.h:39
-#, fuzzy
 msgid "Save Changes"
-msgstr "Lake Charles"
+msgstr "Gorde aldaketak"
 
 #: ../calendar/calendar.error.xml.h:40
 #: ../ui/evolution-message-composer.xml.h:28
@@ -4275,59 +4125,58 @@ msgid "Send"
 msgstr "Bidali"
 
 #: ../calendar/calendar.error.xml.h:41
-#, fuzzy
 msgid "Send Notice"
-msgstr "Bidali honi:"
+msgstr "Bidali jakinarazpena"
 
 #: ../calendar/calendar.error.xml.h:42
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr ""
+"Eguneratutako informazioa bidaltzeak beste partaideek beraien egutegia "
+"eguneratuta mantentzea eskaintzen die."
 
 #: ../calendar/calendar.error.xml.h:43
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr ""
+"Eguneratutako informazioa bidaltzeak beste partaideek beraien zereginen "
+"zerrenda eguneratuta mantentzea eskaintzen die."
 
 #: ../calendar/calendar.error.xml.h:45
-#, fuzzy
 msgid "The Evolution calendar has quit unexpectedly."
-msgstr "Evolution-en egutegiaren fitxategi lokalaren modulua"
+msgstr "Evolution-en egutegia ustekabean itxi da."
 
 #: ../calendar/calendar.error.xml.h:46
 msgid "The Evolution tasks have quit unexpectedly."
-msgstr ""
+msgstr "Evolution-en zeregina ustekabean itxi da."
 
 #: ../calendar/calendar.error.xml.h:47
 msgid "The calendar is not marked for offline usage"
-msgstr ""
+msgstr "Egutegia ez dago markatuta lineaz kanpo erabiltzeko"
 
 #: ../calendar/calendar.error.xml.h:48
 msgid "The task list is not marked for offline usage"
-msgstr ""
+msgstr "Zeregina ez dago markatuta lineaz kanpo erabiltzeko"
 
 #: ../calendar/calendar.error.xml.h:49
 msgid "This calendar will be removed permanently."
-msgstr ""
+msgstr "Egutegi hau betiko ezabatu egingo da."
 
 #: ../calendar/calendar.error.xml.h:50
 msgid "This task list will be removed permanently."
-msgstr ""
+msgstr "Zereginen zerrenda hau betiko ezabatu egingo da."
 
 #: ../calendar/calendar.error.xml.h:51
-#, fuzzy
 msgid "Would you like to save your changes to this appointment?"
-msgstr "Aldaketak gorde nahi dituzu?"
+msgstr "Hiztorduko aldaketak gorde nahi dituzu?"
 
 #: ../calendar/calendar.error.xml.h:52
-#, fuzzy
 msgid "Would you like to save your changes to this task?"
-msgstr "Aldaketak gorde nahi dituzu?"
+msgstr "Zereginaren aldaketak gorde nahi dituzu?"
 
 #: ../calendar/calendar.error.xml.h:53
-#, fuzzy
 msgid "Would you like to send a cancellation notice for this journal entry?"
 msgstr ""
 "Ziur zaude egunkariko sarrera hau bertan behera utzi eta ezabatu nahi duzula?"
@@ -4335,59 +4184,57 @@ msgstr ""
 #: ../calendar/calendar.error.xml.h:54
 msgid "Would you like to send all the participants a cancellation notice?"
 msgstr ""
+"Partaide guztiei bertan behera uztearen jakinarazpena bidaltzea nahi duzu?"
 
 #: ../calendar/calendar.error.xml.h:55
 msgid "Would you like to send meeting invitations to participants?"
-msgstr ""
+msgstr "Bileraren gonbitea partaideei bidali nahi diezu?"
 
 #: ../calendar/calendar.error.xml.h:56
 msgid "Would you like to send this task to participants?"
-msgstr ""
+msgstr "Zeregina beste partaideei bildali nahi diezu?"
 
 #: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to send updated meeting information to participants?"
-msgstr ""
+msgstr "Bileraren informazio eguneratua partaideei bidali nahi diezu?"
 
 #: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send updated task information to participants?"
-msgstr ""
+msgstr "Zereginaren informazio eguneratua partaideei bidali nahi diezu?"
 
 #: ../calendar/calendar.error.xml.h:60
-#, fuzzy
 msgid "You have made changes to this appointment, but not yet saved them."
-msgstr "%s  Aldaketak egin dituzu. Aldaketak ahaztu eta editorea eguneratu?"
+msgstr "Hitzorduan aldaketak egin dituzu, baina ez dituzu gorde."
 
 #: ../calendar/calendar.error.xml.h:61
-#, fuzzy
 msgid "You have made changes to this task, but not yet saved them."
-msgstr "%s  Aldaketak egin dituzu. Aldaketak ahaztu eta editorea eguneratu?"
+msgstr "Zereginean aldaketak egin dituzu, baina ez dituzu gorde."
 
 #: ../calendar/calendar.error.xml.h:62
 msgid "Your calendars will not be available until Evolution is restarted."
-msgstr ""
+msgstr "Egutegiak ez dira erabilgarri egongo Evolution berriro abiatu arte."
 
 #: ../calendar/calendar.error.xml.h:63
 msgid "Your tasks will not be available until Evolution is restarted."
-msgstr ""
+msgstr "Zereginak ez dira erabilgarri egongo Evolution berriro abiatu arte."
 
 #: ../calendar/calendar.error.xml.h:64
 #: ../ui/evolution-message-composer.xml.h:51
+#: ../ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Gorde"
 
 #: ../calendar/calendar.error.xml.h:65
 #: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:123
-#, fuzzy
 msgid "_Send"
-msgstr "Bidali"
+msgstr "_Bidali"
 
 #: ../calendar/calendar.error.xml.h:66
 msgid "{0}."
-msgstr ""
+msgstr "{0}."
 
-#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:301
+#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:312
 #: ../smime/gui/component.c:48
-#, fuzzy
 msgid "Enter password"
 msgstr "Idatzi pasahitza"
 
@@ -4395,16 +4242,15 @@ msgstr "Idatzi pasahitza"
 msgid "Split Multi-Day Events:"
 msgstr "Zatitu egun anitzeko gertaerak:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1365
-#: ../calendar/conduits/calendar/calendar-conduit.c:1366
+#: ../calendar/conduits/calendar/calendar-conduit.c:1377
+#: ../calendar/conduits/calendar/calendar-conduit.c:1378
 #: ../calendar/conduits/todo/todo-conduit.c:879
 #: ../calendar/conduits/todo/todo-conduit.c:880
-#, fuzzy
 msgid "Could not start evolution-data-server"
-msgstr "Ezin izan da wombat zerbitzaria abiarazi"
+msgstr "Ezin izan da evolution-data-server abiarazi"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1474
-#: ../calendar/conduits/calendar/calendar-conduit.c:1477
+#: ../calendar/conduits/calendar/calendar-conduit.c:1486
+#: ../calendar/conduits/calendar/calendar-conduit.c:1489
 msgid "Could not read pilot's Calendar application block"
 msgstr "Ezin izan da pilot-aren egutegiaren aplikazio-blokea irakurri"
 
@@ -4423,9 +4269,8 @@ msgstr "Egutegia eta zereginak"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
 #: ../calendar/gui/calendar-component.c:1309
-#, fuzzy
 msgid "Calendars"
-msgstr "Egutegia"
+msgstr "Egutegiak"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Configure your timezone, Calendar and Task List here "
@@ -4448,31 +4293,28 @@ msgid "Evolution Calendar/Task editor"
 msgstr "Evolution-en egutegiaren/zereginen editorea"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
 msgid "Evolution's Calendar component"
-msgstr "Evolution-en egutegiaren eta zereginen osagaia"
+msgstr "Evolution-en egutegi-osagaia"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
 msgid "Evolution's Tasks component"
-msgstr "Evolution-en probaren osagaia"
+msgstr "Evolution-en zereginen osagaia"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#: ../calendar/gui/e-tasks.c:1257 ../calendar/gui/print.c:1822
+#: ../calendar/gui/e-tasks.c:1283 ../calendar/gui/print.c:1831
 #: ../calendar/gui/tasks-component.c:519
-#: ../calendar/gui/tasks-component.c:1006 ../calendar/gui/tasks-control.c:457
+#: ../calendar/gui/tasks-component.c:1013 ../calendar/gui/tasks-control.c:456
 #: ../calendar/importers/icalendar-importer.c:79
 #: ../calendar/importers/icalendar-importer.c:707
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:582
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:589
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Zereginak"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
 msgid "_Calendars"
-msgstr "Egutegia"
+msgstr "_Egutegiak"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
 #: ../views/tasks/galview.xml.h:3
@@ -4484,23 +4326,23 @@ msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution-en egutegiaren alarma bidezko jakinarazpen-zerbitzua"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
-#, fuzzy
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutu"
 msgstr[1] "minutu"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:248
-#, fuzzy
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:250
 msgid "Start time"
-msgstr "_Hasiera:"
+msgstr "Hasierako ordua"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:349
 #, c-format
 msgid ""
 "<big><b>%s</b></big>\n"
 "%s until %s"
 msgstr ""
+"<big><b>%s</b></big>\n"
+"%s - %s"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
@@ -4509,15 +4351,14 @@ msgstr "Hitzorduak"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/e-itip-control.c:1120
+#: ../calendar/gui/e-itip-control.c:1117
 #: ../plugins/itip-formatter/itip-view.c:884
 msgid "Location:"
 msgstr "Kokalekua:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#, fuzzy
 msgid "Snooze _time:"
-msgstr "Alarma-errepikaren denbora (minututan)"
+msgstr "Alarma-_errepikaren denbora:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
@@ -4528,51 +4369,46 @@ msgstr "Alarma-errepikaren denbora (minututan)"
 #: ../ui/evolution-composer-entries.xml.h:8
 #: ../ui/evolution-mail-messagedisplay.xml.h:5
 #: ../ui/evolution-message-composer.xml.h:44
-#: ../ui/evolution-signature-editor.xml.h:23
+#: ../ui/evolution-signature-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:23
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:32
 msgid "_Edit"
 msgstr "E_ditatu"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
-#, fuzzy
 msgid "_Snooze"
-msgstr "Alarma-er_repikapena"
+msgstr "_Utzi geroko"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#, fuzzy
 msgid "description of appointment"
-msgstr "hitzordu-hasiera baino"
+msgstr "hitzorduaren azalpena"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
-#, fuzzy
 msgid "location of appointment"
-msgstr "hitzordu-hasiera baino"
+msgstr "hitzorduaren helbidea"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:954
+#: ../calendar/gui/alarm-notify/alarm-queue.c:966
 msgid "Dismiss"
-msgstr ""
+msgstr "Itxi"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:955
+#: ../calendar/gui/alarm-notify/alarm-queue.c:967
 msgid "Dismiss All"
-msgstr ""
+msgstr "Itxi denak"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1037
-#, fuzzy
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1049
 msgid "No summary available."
-msgstr "Ez dago azalpen erabilgarririk."
+msgstr "Ez dago laburpen erabilgarririk."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1046
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1048
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1058
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1060
 msgid "No description available."
 msgstr "Ez dago azalpen erabilgarririk."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1056
-#, fuzzy
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1068
 msgid "No location information available."
-msgstr "Ez dago azalpen erabilgarririk."
+msgstr "Ez dago kokaleku-informazio erabilgarririk."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1072
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1084
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -4580,13 +4416,17 @@ msgid ""
 "Starting at %s\n"
 "Ending at %s"
 msgstr ""
+"Alarma - %s\n"
+"%s\n"
+"Hasiera: %s\n"
+"Amaiera: %s"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1175
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1199
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1187
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1211
 msgid "Warning"
 msgstr "Kontuz"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1179
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1191
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4598,7 +4438,7 @@ msgstr ""
 "oroigarri hau mezua bidaltzeko konfiguratuta dago.  \n"
 "dago. Oroigarri normala bistaratuko da."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1205
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1217
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4615,15 +4455,15 @@ msgstr ""
 "\n"
 "Ziur zaude programa hori exekutatu nahi duzula?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1219
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1231
 msgid "Do not ask me about this program again."
 msgstr "Ez galdetu programa horri buruz berriro."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:140
+#: ../calendar/gui/alarm-notify/notify-main.c:147
 msgid "Could not initialize Bonobo"
 msgstr "Ezin izan da Bonobo hasieratu"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:151
+#: ../calendar/gui/alarm-notify/notify-main.c:158
 msgid "Could not create the alarm notify service factory"
 msgstr "Ezin izan da sortu alarma bidezko jakinarazpen-zerbitzuaren fabrika"
 
@@ -4632,221 +4472,216 @@ msgid "invalid time"
 msgstr "baliogabeko ordua"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
-#, fuzzy
 msgid "Alarm programs"
-msgstr "Exekutatu programa"
+msgstr "Alarma-programak"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
-#, fuzzy
 msgid "Ask for confirmation when deleting items"
-msgstr "Eskatu _berrespena elementuak ezabatzeko"
+msgstr "Eskatu berrespena elementuak ezabatzean"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
-#, fuzzy
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr "Gaurko zereginen kolorea"
+msgstr "Gaurko zereginen atzeko planoko kolorea (\"#rrggbb\" formatuan)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
-#, fuzzy
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr "Gaurko zereginen kolorea"
+msgstr "Atzeratutako zereginen atzeko planoko kolorea (\"#rrggbb\" formatuan)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
-#, fuzzy
 msgid "Calendars to run alarms for"
-msgstr "iCalendar errorea"
+msgstr "Alarmak exekutatzeko egutegiak - "
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
+"Kolorea Marcus Bains-en linea ordu-barran marrazteko (hutsik lehenespenez)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
 msgid "Color to draw the Marcus Bains line in the Day View."
-msgstr ""
+msgstr "Kolorea Marcus Bains-en linea eguneko ikuspegian marrazteko."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
-#, fuzzy
 msgid "Compress weekends in month view"
-msgstr "_Konprimatu asteburuak hileko ikuspegian"
+msgstr "Konprimatu asteburuak hileko ikuspegian"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
-#, fuzzy
 msgid "Confirm expunge"
-msgstr "_Berretsi karpeta betiko borratu aurretik"
+msgstr "Berretsi borratzea"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
 msgid "Days on which the start and end of work hours should be indicated."
-msgstr ""
+msgstr "Hasierako eta amaierako lanorduak zehaztu behar diren egunak"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
-#, fuzzy
 msgid "Default appointment reminder"
-msgstr "Ezabatu hitzordu hau"
+msgstr "Hitzordu lehenetsiaren oroigarria"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
-#, fuzzy
 msgid "Default reminder units"
-msgstr "Lehentasun lehenetsia:"
+msgstr "Oroigarri lehenestiaren unitateak"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
-#, fuzzy
 msgid "Default reminder value"
-msgstr "Zerbitzari-egutegi lehenetsia"
+msgstr "Oroigarri lehenetsiaren balioa"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-#, fuzzy
 msgid "Free/busy server urls"
-msgstr "Libre/okupatuta eskaera"
+msgstr "'Libre/okupatuta' zerbitzarien URLak"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-#, fuzzy
 msgid "Free/busy template url"
-msgstr "Libre/okupatuta erantzuna"
+msgstr "'Libre/okupatuta' txantiloien URLak"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
-#, fuzzy
 msgid "Hide completed tasks"
-msgstr "Ezkutatu _burututako zereginak"
+msgstr "Ezkutatu burututako zereginak"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
-#, fuzzy
 msgid "Hide task units"
-msgstr "Zeregin berria"
+msgstr "Ezkutatu zereginaren unitateak"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
-msgstr ""
+msgstr "Ezkutatu zereginaren balioa"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
-#, fuzzy
 msgid "Horizontal pane position"
-msgstr "Marrazki-sareta horizontala"
+msgstr "Panel horizontalaren kokapena"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
-msgstr ""
+msgstr "Laneguna amaitzen den ordua (24 orduko formatuan: 0 - 23)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
-msgstr ""
+msgstr "Laneguna hasten den ordua (24 orduko formatuan: 0 - 23)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr ""
+"Ordu banaketak Eguneko eta Lan-asteko ikuspegietan erakutsitako tarteak, "
+"minututan."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
-msgstr ""
+msgstr "Azken alarma-ordua"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server urls for free/busy publishing."
-msgstr ""
+msgstr "URL zerbitzarien zerrenda 'libre/okupatuta' argitaratzeko."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
-msgstr ""
+msgstr "Marcus Bains-en linea"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
-msgstr ""
+msgstr "Marcus Bains-en linearen kolorea - Egutegi ikuspegia"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
-msgstr ""
+msgstr "Marcus Bains-en linearen kolorea - Ordu-barra"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
-msgstr ""
+msgstr "Laneguna amaitzen den minutua (0 - 59)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
-msgstr ""
+msgstr "Laneguna hasten den minutua (0 - 59)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
-msgstr ""
+msgstr "Panel horizontalaren kokalekua hileko ikuspegian"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
-msgstr ""
+msgstr "Panel bertikalaren kokalekua hileko ikuspegian"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining for a default reminder."
-msgstr ""
+msgstr "Oroigarri lehenetsiaren unitate-kopurua"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
-msgstr ""
+msgstr "Zereginak noiz ezkutatu zehazteko unitate-kopurua."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
-#, fuzzy
 msgid "Overdue tasks color"
-msgstr "_Atzeratutako zereginak:"
+msgstr "Atzeratutako zereginen kolorea"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr ""
+"Panel horizontalaren kokalekua pixeletan, data-nabigatzailearen egutegiaren "
+"eta zereginen zerrendaren artean (hileko ikuspegian ez dagoenean)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
+"Panel horizontalaren kokalekua pixeletan, ikuspegia eta  data-"
+"nabigatzailearen egutegiraren artean (hileko ikuspegian dagoenean)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
 msgstr ""
+"Panel bertikalaren kokalekua pixeletan, zereginen zerrendaren eta zereginen "
+"aurrebistaren panelaren artean, pixeletan."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
+"Panel bertikalaren kokalekua pixeletan, ikuspegia eta data-nabigatzaileren "
+"egutegiaren eta zereginen zerrendaren artean (hileko ikuspegian dagoenean)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 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 ""
+"Panel bertikalaren kokalekua pixeletan, ikuspegia eta  data-nabigatzailearen "
+"egutegiraren artean (hileko ikuspegian ez dagoenean)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
-msgstr ""
+msgstr "Alarmek exekutatuko dituzten programak"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
-#, fuzzy
 msgid "Show appointment end times in week and month views"
-msgstr "_Erakutsi hitzorduen amaiera-orduak asteko eta hileko ikuspegietan"
+msgstr "Erakutsi hitzorduen amaiera-orduak asteko eta hileko ikuspegietan"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show display alarms in notification tray"
-msgstr ""
+msgstr "Erakutsi alarmaren pantaila jakinarazpenen ontzian"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
-#, fuzzy
 msgid "Show week numbers in date navigator"
-msgstr "E_rakutsi aste-zenbakiak data-nabigatzailean"
+msgstr "Erakutsi aste-zenbakiak data-nabigatzailean"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
-#, fuzzy
 msgid "Tasks due today color"
-msgstr "_Gaurko zereginak:"
+msgstr "Gaurko zereginen kolorea"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
-#, fuzzy
 msgid "Tasks vertical pane position"
-msgstr "Prezipitazioak tarteka"
+msgstr "Zereginen panel bertikalaren kokapena"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 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 ""
+"Ordu-zona lehenetsia egutegiko data eta orduetan erabiltzeko, Olsen ordu-"
+"zonako datu-baseko itzuli gabeko kokaleku gisa (adib. \"America/New York\")."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
 #, no-c-format
@@ -4854,113 +4689,114 @@ 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 ""
+"URL txantiloia 'libre/okupatuta'ren babeseko-datu  bezala erabiltzeko. %u : "
+"helbide elektronikoaren erabiltzailearen zatiarekin ordeztuko da. %d : "
+"domeinuarekin ordeztuko da."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
-#, fuzzy
 msgid "Time divisions"
-msgstr "Or_duen zatiketa:"
+msgstr "Orduen zatiketa"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Time the last alarm ran, in time_t."
-msgstr ""
+msgstr "Azken alarma exekutatu zen ordua, 'time_t'-en "
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
-#, fuzzy
 msgid "Timezone"
 msgstr "Ordu-zona "
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Twenty four hour time format"
-msgstr ""
+msgstr "24 orduko formatua"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
+msgstr "Oroigarri lehenetsiaren unitateak (\"minutu\", \"ordu\" edo \"egun\")."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
+"Unitateak zereginak noiz ezkutatu zehazteko (\"minutu\", \"ordu\" edo \"egun"
+"\")."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
-#, fuzzy
 msgid "Week start"
-msgstr "Astearen _hasiera:"
+msgstr "Astearen hasiera"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-msgstr ""
+msgstr "Astearen hasierako laneguna, igandetik (0) larunbatera (6)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Whether or not to use the notification tray for display alarms."
-msgstr ""
+msgstr "Alarmak bistaratzeko jakinarazpenen ontzia erabiliko den edo ez"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
-#, fuzzy
 msgid "Whether to ask for confirmation when deleting an appointment or task."
-msgstr "Eskatu _berrespena elementuak ezabatzeko"
+msgstr "Hitzordua edo zeregina ezabatzean berrespena eskatuko den edo ez."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
-#, fuzzy
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr "Eskatu _berrespena elementuak ezabatzeko"
+msgstr ""
+"Hitzorduak eta zereginak betiko borratzean berrespena eskatuko den edo ez."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr ""
+"Astebukaerak hileko ikuspegian konprimituko den edo ez (larunbata eta "
+"igandea asteko lanegun baten lekua hartuko dute)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
-#, fuzzy
 msgid "Whether to display the end time of events in the week and month views."
-msgstr "_Erakutsi hitzorduen amaiera-orduak asteko eta hileko ikuspegietan"
+msgstr ""
+"Gertaeren amaiera-orduak asteko eta hileko ikuspegietan erakutsiko diren edo "
+"ez."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-msgstr ""
+msgstr "Marcus Bains-en linea (uneko orduan) egutegian marraztuko den edo ez."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
-#, fuzzy
 msgid "Whether to hide completed tasks in the tasks view."
-msgstr "Ezabatu osatutako zereginak"
+msgstr "Egindako zereginak zereginen ikuspegitik ezkutatuko diren edo ez"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
-#, fuzzy
 msgid "Whether to set a default reminder for appointments."
-msgstr "Eskatu _berrespena elementuak ezabatzeko"
+msgstr "Hitzorduen oroigarri lehenetsi bat ezarriko den edo ez"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
+"Am/pm erabili beharrean orduak 24 orduko formatuan bistaratuko diren edo ez."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
-#, fuzzy
 msgid "Whether to show week numbers in the date navigator."
-msgstr "E_rakutsi aste-zenbakiak data-nabigatzailean"
+msgstr "Data-nabigatzailean aste-zenbakiak erakutsiko diren edo ez."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
-#, fuzzy
 msgid "Work days"
-msgstr "Lanegunak:"
+msgstr "Lanegunak"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid "Workday end hour"
-msgstr ""
+msgstr "Lanegunaren amaierako ordua"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Workday end minute"
-msgstr ""
+msgstr "Lanegunaren amaierako minutua"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid "Workday start hour"
-msgstr ""
+msgstr "Lanegunaren hasierako ordua"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Workday start minute"
-msgstr ""
+msgstr "Lanegunaren hasierako minutua"
 
 #: ../calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
@@ -4975,9 +4811,8 @@ msgid "Comment contains"
 msgstr "Iruzkinak hau dauka"
 
 #: ../calendar/gui/cal-search-bar.c:52
-#, fuzzy
 msgid "Location contains"
-msgstr "Azalpenak hau dauka"
+msgstr "Kokalekuak hau dauka"
 
 #: ../calendar/gui/cal-search-bar.c:350
 msgid "Unmatched"
@@ -4986,29 +4821,29 @@ msgstr "Sailkatu gabeak"
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:708
 #: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/gnome-cal.c:2094
+#: ../calendar/gui/gnome-cal.c:2113
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:581
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:588
 msgid "Calendar"
 msgstr "Egutegia"
 
 #: ../calendar/gui/calendar-commands.c:354
-#, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
 "events."
 msgstr ""
-"Eragiketa honek betiko borratuko ditu egindakotzat markatutako zereginak. "
-"Jarraitzen baduzu, ezingo dituzu berreskuratu.\n"
+"Hautatutako denbora baino zaharragoak diren gertaera guztiak betiko "
+"ezabatuko ditu eragiketa honek. Jarraitzen baduzu, ezingo dituzu "
+"berreskuratu.Eragiketa honek betiko borratuko ditu egindakotzat markatutako "
+"gertaerak. Jarraitzen baduzu, ezingo dituzu berreskuratu.\n"
 "\n"
 "Benetan borratu nahi dituzu?"
 
 #: ../calendar/gui/calendar-commands.c:360
-#, fuzzy
 msgid "Purge events older than"
-msgstr "hau baino txikiagoa ematen du"
+msgstr "Borratu hau baino zaharragoak diren gertaerak"
 
 #: ../calendar/gui/calendar-commands.c:365
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
@@ -5025,11 +4860,11 @@ msgstr "egun"
 #: ../calendar/gui/calendar-component.c:234 ../calendar/gui/migration.c:489
 #: ../calendar/gui/migration.c:582 ../calendar/gui/tasks-component.c:215
 msgid "On The Web"
-msgstr ""
+msgstr "Web-ean"
 
 #: ../calendar/gui/calendar-component.c:252 ../calendar/gui/migration.c:391
 msgid "Birthdays & Anniversaries"
-msgstr ""
+msgstr "Urtebetetzeak eta urteurrenak"
 
 #. Create the weather group
 #: ../calendar/gui/calendar-component.c:258
@@ -5039,28 +4874,25 @@ msgstr "Eguraldia"
 
 #: ../calendar/gui/calendar-component.c:535
 #: ../calendar/gui/dialogs/calendar-setup.c:449
-#, fuzzy
 msgid "New Calendar"
-msgstr "Kaledonia Berria"
+msgstr "Egutegi berria"
 
 #: ../calendar/gui/calendar-component.c:858
-#, fuzzy
 msgid "Failed upgrading calendars."
-msgstr "Egutegia kargatzen ari da..."
+msgstr "Huts egin du egutegiak bertsio-berritzean."
 
-#: ../calendar/gui/calendar-component.c:1154
+#: ../calendar/gui/calendar-component.c:1157
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
-msgstr ""
+msgstr "Ezin izan da '%s' egutegia ireki gertaerak eta bilerak sortzeko"
 
 #: ../calendar/gui/calendar-component.c:1170
 msgid "There is no calendar available for creating events and meetings"
-msgstr ""
+msgstr "Ez dago egutegirik erabilgarri gertaerak eta bilerak sortzeko"
 
 #: ../calendar/gui/calendar-component.c:1284
-#, fuzzy
 msgid "Calendar Source Selector"
-msgstr "Egutegi-informazioa"
+msgstr "Egutegi-iturburuaren hautatzailea"
 
 #: ../calendar/gui/calendar-component.c:1475
 msgid "New appointment"
@@ -5087,12 +4919,10 @@ msgid "Create a new meeting request"
 msgstr "Sortu bilera-eskaera berria"
 
 #: ../calendar/gui/calendar-component.c:1491
-#, fuzzy
 msgid "New all day appointment"
 msgstr "Egun osoko hitzordu berria"
 
 #: ../calendar/gui/calendar-component.c:1492
-#, fuzzy
 msgid "All Day A_ppointment"
 msgstr "Egun _osoko hitzordua"
 
@@ -5101,19 +4931,16 @@ msgid "Create a new all-day appointment"
 msgstr "Sortu egun osoko hitzordu berria"
 
 #: ../calendar/gui/calendar-component.c:1499
-#, fuzzy
 msgid "New calendar"
-msgstr "Kaledonia Berria"
+msgstr "Egutegi berria"
 
 #: ../calendar/gui/calendar-component.c:1500
-#, fuzzy
 msgid "Cale_ndar"
-msgstr "Egutegia"
+msgstr "_Egutegia"
 
 #: ../calendar/gui/calendar-component.c:1501
-#, fuzzy
 msgid "Create a new calendar"
-msgstr "Sortu karpeta berria"
+msgstr "Egutegi berria sortzen du"
 
 #: ../calendar/gui/calendar-view-factory.c:109
 msgid "Day View"
@@ -5148,38 +4975,32 @@ msgid "Unknown error"
 msgstr "Errore ezezaguna"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
-#, fuzzy
 msgid "<b>Alarm</b>"
-msgstr "<b>Falta:</b> "
+msgstr "<b>Alarma</b>"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
-#, fuzzy
 msgid "<b>Options</b>"
-msgstr "Ordu-zonak"
+msgstr "<b>Aukerak</b>"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
-#, fuzzy
 msgid "<b>Repeat</b>"
-msgstr "<b>Falta:</b> "
+msgstr "<b>Errepikapena</b> "
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
-#, fuzzy
 msgid "Add Alarm"
-msgstr "Alarmak"
+msgstr "Gehitu alarma"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
-#, fuzzy
 msgid "Custom _message"
-msgstr "Prestatu mezua"
+msgstr "_Mezu pertsonalizatua"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
 msgid "Custom alarm sound"
-msgstr ""
+msgstr "Alarmaren soinu pertsonalizatua"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
-#, fuzzy
 msgid "Mes_sage:"
-msgstr "Mezuak"
+msgstr "M_ezua:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
 #: ../calendar/gui/e-alarm-list.c:444
@@ -5189,7 +5010,7 @@ msgstr "Jo soinua"
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
 #: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
-msgstr ""
+msgstr "Bistaratu pantailan abisu bat"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
 #: ../calendar/gui/e-alarm-list.c:456
@@ -5206,24 +5027,20 @@ msgid "Send an email"
 msgstr "Bidali mezua"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#, fuzzy
 msgid "_Arguments:"
-msgstr "K_ontua:"
+msgstr "_Argumentuak:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
-#, fuzzy
 msgid "_Program:"
-msgstr "Ireki programa:"
+msgstr "_Programa:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
-#, fuzzy
 msgid "_Repeat the alarm"
-msgstr "Errepikatu alarma"
+msgstr "_Errepikatu alarma"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
-#, fuzzy
 msgid "_Sound:"
-msgstr "Southend"
+msgstr "_Soinua:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
 msgid "after"
@@ -5267,7 +5084,7 @@ msgstr "hitzordu-hasiera baino"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.c:199
 msgid "Action/Trigger"
-msgstr ""
+msgstr "Ekintza/Abiarazlea"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
 msgid "A_dd"
@@ -5320,26 +5137,23 @@ msgstr "_Kendu"
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:474
 #: ../calendar/gui/dialogs/comp-editor.c:1084
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3401 ../mail/em-folder-tree.c:2047
+#: ../composer/e-msg-composer.c:3401 ../mail/em-folder-tree.c:2052
 #: ../ui/evolution-mail-list.xml.h:29
-#, fuzzy
 msgid "_Properties"
-msgstr "Propietateak"
+msgstr "_Propietateak"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:476
 #: ../calendar/gui/dialogs/comp-editor.c:1086
 #: ../composer/e-msg-composer-attachment-bar.c:473
 #: ../composer/e-msg-composer.c:3403
-#, fuzzy
 msgid "_Add attachment..."
-msgstr "Gehitu eranskina..."
+msgstr "_Gehitu eranskina..."
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:736
 #: ../composer/e-msg-composer-attachment-bar.c:740
 #: ../widgets/misc/e-attachment-bar.c:963
-#, fuzzy
 msgid "Attachment Bar"
-msgstr "Eranskina"
+msgstr "Eranskin-barra"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
@@ -5387,7 +5201,7 @@ msgstr "Eranskinaren propietateak"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:267
-#: ../calendar/gui/e-itip-control.c:1166
+#: ../calendar/gui/e-itip-control.c:1163
 #: ../calendar/gui/e-itip-control.glade.h:6
 #: ../composer/e-msg-composer-attachment.glade.h:3
 #: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
@@ -5413,31 +5227,29 @@ msgstr "MIME mota:"
 msgid "Enabled"
 msgstr "Gaituta"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:730
-#, fuzzy
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:733
 msgid "Are you sure you want to remove this URL?"
-msgstr "Ziur zaude kontu hau ezabatu nahi duzula?"
+msgstr "Ziur zaude URL hau kendu nahi duzula?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:736
 msgid "Remove"
 msgstr "Kendu"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:738
-#, fuzzy
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:741
 msgid "Don't Remove"
-msgstr "Ez inportatu"
+msgstr "Ez kendu"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:853
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:823
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:856
 #: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
 #: ../mail/em-account-prefs.c:406
 msgid "Disable"
 msgstr "Desgaitu"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:855
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:823
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:858
 #: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
 #: ../mail/em-account-prefs.c:408
 msgid "Enable"
@@ -5464,45 +5276,40 @@ msgid "60 minutes"
 msgstr "60 minutu"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-#, fuzzy
 msgid "<b>Alerts</b>"
-msgstr "<b>Falta:</b> "
+msgstr "<b>Abisusak</b> "
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#, fuzzy
 msgid "<b>Default Free/Busy Server</b>"
-msgstr "Egutegi-informazioa"
+msgstr "<b>'Libre/okupatuta' zerbitzari lehenetsia</b>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#, fuzzy
 msgid "<b>General</b>"
-msgstr "<b>Falta:</b> "
+msgstr "<b>Orokorra</b> "
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#, fuzzy
 msgid "<b>Publishing</b>"
-msgstr "Libre/okupatuta informazioa"
+msgstr "<b>Argitaratzea</b>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#, fuzzy
 msgid "<b>Task List</b>"
-msgstr "Zereginen zerrenda"
+msgstr "<b>Zereginen zerrenda</b>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#, fuzzy
 msgid "<b>Time</b>"
-msgstr "<b>Falta:</b> "
+msgstr "<b>Ordua</b> "
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#, fuzzy
 msgid "<b>Work Week</b>"
-msgstr "<b>Falta:</b> "
+msgstr "<b>Lan-astea</b> "
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #, no-c-format
 msgid ""
 "<i>%u and %d will be replaced by user and domain from the email address.</i>"
 msgstr ""
+"<i>%u eta %d aldagaiak helbide elektronikoko erabiltzaileagatik eta "
+"domeinugatik ordeztuko dira.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Calendar and Tasks Settings"
@@ -5525,9 +5332,8 @@ msgid "Days"
 msgstr "egun"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#, fuzzy
 msgid "Display"
-msgstr "_Bistaratzea"
+msgstr "Bistaratu"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 #: ../mail/mail-config.glade.h:74
@@ -5535,13 +5341,12 @@ msgid "E_nable"
 msgstr "_Gaitu"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#, fuzzy
 msgid "Free/Busy"
-msgstr "_Libre/okupatuta URLa:"
+msgstr "'Libre/okupatuta"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/recurrence-page.c:1049
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Friday"
 msgstr "Ostirala"
 
@@ -5554,23 +5359,22 @@ msgid "Minutes"
 msgstr "minutu"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Monday"
 msgstr "Astelehena"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#, fuzzy
 msgid "Publishing Table"
-msgstr "urdin morexka"
+msgstr "Argitaratze-taula"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "S_un"
 msgstr "_ig."
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Saturday"
 msgstr "Larunbata"
 
@@ -5583,8 +5387,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "E_rakutsi aste-zenbakiak data-nabigatzailean"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/recurrence-page.c:1051
+#: ../calendar/gui/e-itip-control.c:726
 msgid "Sunday"
 msgstr "Igandea"
 
@@ -5597,13 +5401,12 @@ msgid "T_hu"
 msgstr "o_g."
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#, fuzzy
 msgid "Template:"
-msgstr "Temple"
+msgstr "Txantiloia"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Thursday"
 msgstr "Osteguna"
 
@@ -5616,8 +5419,8 @@ msgid "Time format:"
 msgstr "Ordu-formatua:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Tuesday"
 msgstr "Asteartea"
 
@@ -5626,8 +5429,8 @@ msgid "W_eek starts:"
 msgstr "Astearen _hasiera:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Wednesday"
 msgstr "Asteazkena"
 
@@ -5644,9 +5447,8 @@ msgid "_24 hour"
 msgstr "_24 ordu"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#, fuzzy
 msgid "_Add URL"
-msgstr "_Gehitu"
+msgstr "_Gehitu URLa"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Ask for confirmation when deleting items"
@@ -5702,50 +5504,44 @@ msgstr "lehenago"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "option menu to choose reminder units"
-msgstr ""
+msgstr "menuaren aukera oroigarriaren unitateak aukeratzeko"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "option menu to choose time units"
-msgstr ""
+msgstr "menuaren aukera orduaren unitateak aukeratzeko "
 
 #: ../calendar/gui/dialogs/calendar-setup.c:287
 msgid "Copy calendar contents locally for offline operation"
-msgstr ""
+msgstr "Kopiatu egutegiaren edukia lokalean lineaz kanpoko eragiketak lantzeko"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:290
 msgid "Copy task list contents locally for offline operation"
-msgstr ""
+msgstr "Kopiatu liburuaren edukia lokalean lineaz kanpo lan egiteko"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:341
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
 msgid "C_olor:"
-msgstr "_Koloreak"
+msgstr "_Kolorea:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:378
-#, fuzzy
 msgid "Tasks List"
 msgstr "Zereginen zerrenda"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:447
-#, fuzzy
 msgid "Calendar Properties"
-msgstr "iCalendar errorea"
+msgstr "Egutegiaren propietateak"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:515
-#, fuzzy
 msgid "Task List Properties"
-msgstr "Letra-tipoen propietateak"
+msgstr "Zeregin-zerrendaren propietateak"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
 msgid "Add Calendar"
-msgstr "Kaledonia Berria"
+msgstr "Gehitu egutegia"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
 msgid "Add Task List"
-msgstr "Zereginen zerrenda"
+msgstr "Gehitu zereginen zerrenda"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:5
 #: ../mail/mail-config.glade.h:105
@@ -5753,21 +5549,18 @@ msgid "Pick a color"
 msgstr "Aukeratu kolorea"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
 msgid "_Add Calendar"
-msgstr "Kaledonia Berria"
+msgstr "Gehitu _egutegia"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:7
-#, fuzzy
 msgid "_Add Task List"
-msgstr "Zereginen zerrenda"
+msgstr "Gehitu _zereginen zerrenda"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:9
 #: ../plugins/calendar-http/calendar-http.c:248
 #: ../plugins/calendar-weather/calendar-weather.c:548
-#, fuzzy
 msgid "_Refresh:"
-msgstr "Freskatu"
+msgstr "_Freskatu:"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:11
 #: ../plugins/calendar-http/calendar-http.c:120
@@ -5829,78 +5622,76 @@ msgstr "%s  Ez duzu aldaketarik egin; editorea eguneratu?"
 msgid "Validation error: %s"
 msgstr "Balidazio-errorea: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2261
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2270
 msgid " to "
 msgstr " - "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2265
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2274
 msgid " (Completed "
 msgstr " (Eginda "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2267
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2276
 msgid "Completed "
 msgstr "Eginda "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2272
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2281
 msgid " (Due "
 msgstr " (Falta: "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2274
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2283
 msgid "Due "
 msgstr "Falta: "
 
 #: ../calendar/gui/dialogs/comp-editor.c:190 ../composer/e-msg-composer.c:2664
-#, fuzzy, c-format
+#, c-format
 msgid "Attached message - %s"
-msgstr "Birbidalitako mezua - %s"
+msgstr "Erantsitako mezua - %s"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:195
 #: ../calendar/gui/dialogs/comp-editor.c:365 ../composer/e-msg-composer.c:2669
 #: ../composer/e-msg-composer.c:2846
-#, fuzzy, c-format
+#, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
-msgstr[0] "Erantsi jatorrizko mezua"
-msgstr[1] "Erantsi jatorrizko mezua"
+msgstr[0] "Erantsitako mezu bat"
+msgstr[1] "Erantsitako %d mezu"
 
 #: ../calendar/gui/dialogs/comp-editor.c:428
-#: ../calendar/gui/e-calendar-table.c:1162
-#: ../calendar/gui/e-calendar-view.c:1535 ../composer/e-msg-composer.c:2911
-#: ../mail/em-folder-tree.c:974 ../mail/em-folder-view.c:1035
+#: ../calendar/gui/e-calendar-table.c:1175
+#: ../calendar/gui/e-calendar-view.c:1552 ../composer/e-msg-composer.c:2911
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1035
 #: ../mail/message-list.c:1708 ../ui/evolution-addressbook.xml.h:31
 #: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
-#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-tasks.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:102 ../ui/evolution-tasks.xml.h:21
 msgid "_Copy"
 msgstr "Ko_piatu"
 
 #: ../calendar/gui/dialogs/comp-editor.c:429 ../composer/e-msg-composer.c:2912
-#: ../mail/em-folder-tree.c:975 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
 #: ../mail/em-folder-view.c:931 ../mail/message-list.c:1709
-#, fuzzy
 msgid "_Move"
-msgstr "Eraman"
+msgstr "_Lekuz aldatu"
 
 #: ../calendar/gui/dialogs/comp-editor.c:431 ../composer/e-msg-composer.c:2914
-#: ../mail/em-folder-tree.c:977 ../mail/message-list.c:1711
-#, fuzzy
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1711
 msgid "Cancel _Drag"
-msgstr "Bertan behera utzi zeregina"
+msgstr "Bertan behera _utzi arrastatzea"
 
 #: ../calendar/gui/dialogs/comp-editor.c:774
 msgid "Could not update object"
 msgstr "Ezin izan da objektua eguneratu"
 
 #: ../calendar/gui/dialogs/comp-editor.c:977 ../composer/e-msg-composer.c:2318
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
-msgstr[0] "%s eranskina"
-msgstr[1] "%s eranskina"
+msgstr[0] "Eranskin <b>%d</b>"
+msgstr[1] "<b>%d</b> eranskin"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1249
 msgid "_Attachment Bar (drop attachments here)"
-msgstr ""
+msgstr "_Eranskinen Barra (ekarri eranskinak hona)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1850
 #: ../calendar/gui/dialogs/comp-editor.c:1893
@@ -5909,9 +5700,9 @@ msgstr "Editatu hitzordua"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1856
 #: ../calendar/gui/dialogs/comp-editor.c:1899
-#, fuzzy, c-format
+#, c-format
 msgid "Meeting - %s"
-msgstr "Bilera"
+msgstr "Bilera - %s"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1858
 #: ../calendar/gui/dialogs/comp-editor.c:1901
@@ -5921,9 +5712,9 @@ msgstr "Hitzordua - %s"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1862
 #: ../calendar/gui/dialogs/comp-editor.c:1905
-#, fuzzy, c-format
+#, c-format
 msgid "Assigned Task - %s"
-msgstr "Esleitu zeregina"
+msgstr "Esleitutako zeregina - %s "
 
 #: ../calendar/gui/dialogs/comp-editor.c:1864
 #: ../calendar/gui/dialogs/comp-editor.c:1907
@@ -5942,31 +5733,28 @@ msgstr "Egunkariko sarrera - %s"
 msgid "No summary"
 msgstr "Laburpenik ez"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2528
-#: ../calendar/gui/dialogs/comp-editor.c:2561
-#: ../calendar/gui/dialogs/comp-editor.c:2585
+#: ../calendar/gui/dialogs/comp-editor.c:2532
+#: ../calendar/gui/dialogs/comp-editor.c:2565
+#: ../calendar/gui/dialogs/comp-editor.c:2589
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Eguneratze bat heltzen bada, honi egindako aldaketak galdu egin litezke"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2609
-#, fuzzy
+#: ../calendar/gui/dialogs/comp-editor.c:2613
 msgid "Unable to use current version!"
-msgstr "Ezin da uneko bertsioa lortu!"
+msgstr "Ezin da uneko bertsioa erabili!"
 
 #: ../calendar/gui/dialogs/copy-source-dialog.c:61
-#, fuzzy
 msgid "Could not open source"
-msgstr "Ezin izan da objektua eguneratu"
+msgstr "Ezin izan da iturburua ireki"
 
 #: ../calendar/gui/dialogs/copy-source-dialog.c:69
-#, fuzzy
 msgid "Could not open destination"
-msgstr "Bidalketa-helburua"
+msgstr "Ezin izan da helburua ireki"
 
 #: ../calendar/gui/dialogs/copy-source-dialog.c:78
 msgid "Destination is read only"
-msgstr ""
+msgstr "Helburua irakurtzekoa soilik da"
 
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
@@ -6002,30 +5790,24 @@ msgid "The item could not be deleted because permission was denied"
 msgstr "Elementua ezin izan da ezabatu, baimena ukatu delako"
 
 #: ../calendar/gui/dialogs/delete-error.c:86
-#, fuzzy
 msgid "The event could not be deleted due to an error"
-msgstr "Gertaera ezin izan da ezabatu, corba errore bat gertatu delako"
+msgstr "Gertaera ezin izan da ezabatu, errore bat gertatu delako"
 
 #: ../calendar/gui/dialogs/delete-error.c:89
-#, fuzzy
 msgid "The task could not be deleted due to an error"
-msgstr "Zeregina ezin izan da ezabatu, corba errore bat gertatu delako"
+msgstr "Zeregina ezin izan da ezabatu, errore bat gertatu delako"
 
 #: ../calendar/gui/dialogs/delete-error.c:92
-#, fuzzy
 msgid "The journal entry could not be deleted due to an error"
-msgstr ""
-"Egunkariko sarrera ezin izan da ezabatu, corba errore bat gertatu delako"
+msgstr "Egunkariko sarrera ezin izan da ezabatu, errore bat gertatu delako"
 
 #: ../calendar/gui/dialogs/delete-error.c:95
-#, fuzzy
 msgid "The item could not be deleted due to an error"
-msgstr "Elementua ezin izan da ezabatu, corba errore bat gertatu delako"
+msgstr "Elementua ezin izan da ezabatu, errore bat gertatu delako"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-#, fuzzy
 msgid "Contacts..."
-msgstr "Kontaktuak"
+msgstr "Kontaktuak..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 #: ../plugins/exchange-operations/exchange-delegates.c:421
@@ -6036,7 +5818,7 @@ msgstr "Delegatu:"
 msgid "Enter Delegate"
 msgstr "Sartu delegatua"
 
-#: ../calendar/gui/dialogs/event-editor.c:141 ../calendar/gui/print.c:2298
+#: ../calendar/gui/dialogs/event-editor.c:141 ../calendar/gui/print.c:2307
 msgid "Appointment"
 msgstr "Hitzordua"
 
@@ -6051,29 +5833,25 @@ msgid "Scheduling"
 msgstr "Antolaketa"
 
 #: ../calendar/gui/dialogs/event-editor.c:174
-#, fuzzy
 msgid "Delegatees"
-msgstr "Delegatua"
+msgstr "Delegatuak"
 
 #: ../calendar/gui/dialogs/event-editor.c:178
-#, fuzzy
 msgid "Attendees"
-msgstr "Partaidea"
+msgstr "Partaideak"
 
 #: ../calendar/gui/dialogs/event-editor.c:251
 #: ../calendar/gui/dialogs/event-editor.c:425
-#, fuzzy
 msgid "Invitations"
-msgstr "Informazioa"
+msgstr "Gonbiteak"
 
 #: ../calendar/gui/dialogs/event-page.c:731
-#, fuzzy
 msgid "Event with no start date"
-msgstr "Mugaeguna hasiera-eguna baino lehenagokoa da!"
+msgstr "Hasiera-datarik gabeko gertaera"
 
 #: ../calendar/gui/dialogs/event-page.c:734
 msgid "Event with no end date"
-msgstr ""
+msgstr "Amaiera-datarik gabeko gertaera"
 
 #: ../calendar/gui/dialogs/event-page.c:900
 #: ../calendar/gui/dialogs/task-page.c:556
@@ -6092,64 +5870,58 @@ msgstr "Hasierako ordua gaizki dago"
 msgid "End time is wrong"
 msgstr "Amaierako ordua gaizki dago"
 
-#: ../calendar/gui/dialogs/event-page.c:1686
-#, fuzzy, c-format
+#: ../calendar/gui/dialogs/event-page.c:1693
+#, c-format
 msgid "Unable to open the calendar '%s'."
-msgstr "Egutegia irekitzeko baimena ukatu egin da"
+msgstr "Ezin da '%s' egutegia ireki."
 
-#: ../calendar/gui/dialogs/event-page.c:1892
-#, fuzzy, c-format
+#: ../calendar/gui/dialogs/event-page.c:1894
+#, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
-msgstr[0] "lehenago"
-msgstr[1] "lehenago"
+msgstr[0] "Hitzordua baino egun %d lehenago"
+msgstr[1] "Hitzordua baino %d egun lehenago"
 
-#: ../calendar/gui/dialogs/event-page.c:1900
-#, fuzzy, c-format
+#: ../calendar/gui/dialogs/event-page.c:1902
+#, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
-msgstr[0] "hitzordu-amaiera baino"
-msgstr[1] "hitzordu-amaiera baino"
+msgstr[0] "Hitzordua baino ordu %d lehenago"
+msgstr[1] "Hitzordua baino %d ordu lehenago"
 
-#: ../calendar/gui/dialogs/event-page.c:1908
-#, fuzzy, c-format
+#: ../calendar/gui/dialogs/event-page.c:1910
+#, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
-msgstr[0] "lehenago"
-msgstr[1] "lehenago"
+msgstr[0] "Hitzordua baino minutu %d lehenago"
+msgstr[1] "Hitzordua baino %d minutu lehenago"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:2
-#, fuzzy
 msgid "1 day before appointment"
-msgstr "lehenago"
+msgstr "Hitzordua baino egun 1 lehenago"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:3
-#, fuzzy
 msgid "1 hour before appointment"
-msgstr "lehenago"
+msgstr "Hitzordua baino egun 1 lehenago"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#, fuzzy
 msgid "15 minutes before appointment"
-msgstr "lehenago"
+msgstr "Hitzordua baino 15 minunut lehenago"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.glade.h:1
-#, fuzzy
 msgid "<b>Basics</b>"
-msgstr "Zereginen zerrenda"
+msgstr "<b>Oinarrizkoak</b>"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
 #: ../calendar/gui/dialogs/task-page.glade.h:2
-#, fuzzy
 msgid "<b>Date and Time</b>"
-msgstr "<b>Falta:</b> "
+msgstr "<b>Data eta ordua</b>"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:7
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-#, fuzzy
 msgid "<b>Send Options</b>"
-msgstr "Ordu-zonak"
+msgstr "<b>Bidaltzeko aukerak</b>"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:8
 msgid "A_ll day event"
@@ -6158,12 +5930,11 @@ msgstr "E_gun osoko gertaera"
 #: ../calendar/gui/dialogs/event-page.glade.h:9
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Ad_vanced send options"
-msgstr ""
+msgstr "Bidaltzeko aukera _aurreratuak"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:10
-#, fuzzy
 msgid "C_ustomize..."
-msgstr "Gorde ikuspegi pertsonalizatua..."
+msgstr "_Pertsonalizatu..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/task-page.glade.h:5
@@ -6171,51 +5942,46 @@ msgid "Ca_tegories..."
 msgstr "Ka_tegoriak..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:12
-#, fuzzy
 msgid "Cale_ndar:"
-msgstr "E_gutegia:"
+msgstr "_Egutegia:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/task-page.glade.h:7
-#, fuzzy
 msgid "Classi_fication:"
-msgstr "Sailkapena"
+msgstr "_Sailkapena:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:8
 #: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:360
+#: ../calendar/gui/e-calendar-table.c:364
 msgid "Confidential"
 msgstr "Konfidentziala"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:15
-#, fuzzy
 msgid "Event Description"
-msgstr "Azalpena"
+msgstr "Gertaeraren azalpena:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:16
-#, fuzzy
 msgid "Locat_ion:"
-msgstr "Kokalekua:"
+msgstr "_Kokalekua:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 #: ../calendar/gui/dialogs/task-page.glade.h:10
 #: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:359
+#: ../calendar/gui/e-calendar-table.c:363
 msgid "Private"
 msgstr "Pribatua"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:18
 #: ../calendar/gui/dialogs/task-page.glade.h:11
 #: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:358
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:362
 msgid "Public"
 msgstr "Publikoa"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:19
-#, fuzzy
 msgid "Show time as _busy"
-msgstr "Erakutsi ordua honela"
+msgstr "Erakutsi ordua lanpetuta gisa"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:20
 #: ../calendar/gui/dialogs/task-page.glade.h:13
@@ -6224,17 +5990,15 @@ msgstr "Labu_rpena:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:21
 msgid "This appointment has customized alarms"
-msgstr ""
+msgstr "Hitzorduak alarma pertsonalizatuak ditu"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:22
-#, fuzzy
 msgid "_Alarm"
-msgstr "Alarmak"
+msgstr "_Alarmak"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:23
-#, fuzzy
 msgid "_Description:"
-msgstr "Azalpena:"
+msgstr "_Azalpena:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:24
 #: ../calendar/gui/e-meeting-time-sel.c:642
@@ -6247,14 +6011,12 @@ msgid "_Start time:"
 msgstr "_Hasiera:"
 
 #: ../calendar/gui/dialogs/meeting-page.c:303
-#, fuzzy
 msgid "<b>Dele_gatees</b>"
-msgstr "<b>Egoera:</b>"
+msgstr "<b>De_legatuak</b>"
 
 #: ../calendar/gui/dialogs/meeting-page.c:307
-#, fuzzy
 msgid "<b>From:</b>"
-msgstr "<b>Falta:</b> "
+msgstr "<b>Nork:</b>"
 
 #. an empty string is the same as 'None'
 #. Put the "None" and "UTC" entries at the top of the combo's list.
@@ -6264,7 +6026,7 @@ msgstr "<b>Falta:</b> "
 #: ../calendar/gui/dialogs/meeting-page.c:313
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:653
-#: ../calendar/gui/e-itip-control.c:1106 ../composer/e-msg-composer.c:2122
+#: ../calendar/gui/e-itip-control.c:1103 ../composer/e-msg-composer.c:2122
 #: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
 #: ../mail/em-account-editor.c:1348 ../mail/em-account-prefs.c:464
 #: ../mail/em-folder-view.c:1064 ../mail/em-junk-hook.c:78
@@ -6337,7 +6099,7 @@ msgid "RSVP"
 msgstr "RSVP"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
-#: ../calendar/gui/dialogs/task-editor.c:147
+#: ../calendar/gui/dialogs/task-editor.c:146
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/e-meeting-list-view.c:394
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
@@ -6346,30 +6108,25 @@ msgid "Status"
 msgstr "Egoera"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:1
-#, fuzzy
 msgid "<b>Att_endees</b>"
-msgstr "<b>Falta:</b> "
+msgstr "<b>_Laguntzaileak</b> "
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:2
-#, fuzzy
 msgid "C_hange Organizer"
 msgstr "_Aldatu antolatzailea"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:3
 #: ../calendar/gui/e-meeting-time-sel.c:428
-#, fuzzy
 msgid "Con_tacts..."
-msgstr "Kontaktuak"
+msgstr "_Kontaktuak..."
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
-#, fuzzy
 msgid "Or_ganizer:"
-msgstr "Antolatzailea:"
+msgstr "_Antolatzailea:"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:6
-#, fuzzy
 msgid "Organizer"
-msgstr "Antolatzailea:"
+msgstr "Antolatzailea"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:9
@@ -6377,57 +6134,48 @@ msgid "Organizer:"
 msgstr "Antolatzailea:"
 
 #: ../calendar/gui/dialogs/new-calendar.glade.h:2
-#, fuzzy
 msgid "<b>Calendar options</b>"
-msgstr "Egutegi-informazioa"
+msgstr "<b>Egutegi-aukerak</b>"
 
 #: ../calendar/gui/dialogs/new-calendar.glade.h:3
-#, fuzzy
 msgid "Add New Calendar"
-msgstr "Kaledonia Berria"
+msgstr "Gehitu egutegi berria"
 
 #: ../calendar/gui/dialogs/new-calendar.glade.h:4
-#, fuzzy
 msgid "Calendar Group"
-msgstr "iCalendar errorea"
+msgstr "Egutegi-taldea"
 
 #: ../calendar/gui/dialogs/new-calendar.glade.h:5
-#, fuzzy
 msgid "Calendar Location"
-msgstr "Egutegi-informazioa"
+msgstr "Egutegiaren kokalekua"
 
 #: ../calendar/gui/dialogs/new-calendar.glade.h:6
-#, fuzzy
 msgid "Calendar Name"
-msgstr "Egutegia"
+msgstr "Egutegiaren izena"
 
 #: ../calendar/gui/dialogs/new-task-list.glade.h:2
 msgid "<b>Task List Options</b>"
-msgstr ""
+msgstr "<b>Zeregin-zerrendaren aukerak</b>"
 
 #: ../calendar/gui/dialogs/new-task-list.glade.h:3
-#, fuzzy
 msgid "Add New Task List"
-msgstr "Zereginen zerrenda"
+msgstr "Gehitu zeregin-zerrenda berria"
 
 #: ../calendar/gui/dialogs/new-task-list.glade.h:4
-#, fuzzy
 msgid "Task List Group"
-msgstr "Zereginen zerrenda"
+msgstr "Zeregin-zerrendaren taldea"
 
 #: ../calendar/gui/dialogs/new-task-list.glade.h:5
-#, fuzzy
 msgid "Task List Name"
-msgstr "Zereginen zerrenda"
+msgstr "Zeregin-zerrendaren izena"
 
 #: ../calendar/gui/dialogs/recur-comp.c:52
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr "Gertaera errepikatu bat aldatzen ari zara. Zer aldatu nahi duzu?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:54
-#, fuzzy
 msgid "You are delegating a recurring event, what would like to delegate?"
-msgstr "Gertaera errepikatu bat aldatzen ari zara. Zer aldatu nahi duzu?"
+msgstr "Gertaera errepikatu bat delegatzen ari zara. Zer delegatzea nahi duzu?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:58
 msgid "You are modifying a recurring task, what would you like to modify?"
@@ -6444,9 +6192,8 @@ msgid "This Instance Only"
 msgstr "Instantzia hau bakarrik"
 
 #: ../calendar/gui/dialogs/recur-comp.c:94
-#, fuzzy
 msgid "This and Prior Instances"
-msgstr "Instantzia hau eta ondorengoak"
+msgstr "Instantzia hau eta aurrekoak"
 
 #: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "This and Future Instances"
@@ -6456,83 +6203,78 @@ msgstr "Instantzia hau eta ondorengoak"
 msgid "All Instances"
 msgstr "Instantzia guztiak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:496
+#: ../calendar/gui/dialogs/recurrence-page.c:497
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution-ek editatu ezin dituen errepikapenak dauzka hitzordu honek."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:817
+#: ../calendar/gui/dialogs/recurrence-page.c:818
 msgid "Recurrence date is invalid"
 msgstr "Errepikatze-data ez da baliozkoa"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:928
+#: ../calendar/gui/dialogs/recurrence-page.c:929
 msgid "on"
 msgstr "-"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:988
+#: ../calendar/gui/dialogs/recurrence-page.c:989
 msgid "first"
 msgstr "lehen"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:989
+#: ../calendar/gui/dialogs/recurrence-page.c:990
 msgid "second"
 msgstr "bigarren"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:990
+#: ../calendar/gui/dialogs/recurrence-page.c:991
 msgid "third"
 msgstr "hirugarren"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:991
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "fourth"
 msgstr "laugarren"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#: ../calendar/gui/dialogs/recurrence-page.c:993
 msgid "last"
 msgstr "azken"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1015
+#: ../calendar/gui/dialogs/recurrence-page.c:1016
 msgid "Other Date"
 msgstr "Beste data bat"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "day"
 msgstr "eguna"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1180
+#: ../calendar/gui/dialogs/recurrence-page.c:1181
 msgid "on the"
 msgstr "-"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1369
+#: ../calendar/gui/dialogs/recurrence-page.c:1370
 msgid "occurrences"
 msgstr "aldiz"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:2325
-#, fuzzy
 msgid "Date/Time"
-msgstr "Data/Ordua:"
+msgstr "Data/Ordua"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:1
-#, fuzzy
 msgid "<b>Exceptions</b>"
-msgstr "Salbuespenak"
+msgstr "<b>Salbuespenak</b>"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
 #: ../mail/mail-config.glade.h:3
-#, fuzzy
 msgid "<b>Preview</b>"
-msgstr "Aurrebista"
+msgstr "<b>Aurrebista</b>"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:3
-#, fuzzy
 msgid "<b>Recurrence</b>"
-msgstr "Errepikapena"
+msgstr "<b>Errepikapena</b>"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Errepikatze-aldia"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:5
-#, fuzzy
 msgid "This appointment rec_urs"
-msgstr "_Editatu hitzordua"
+msgstr "Hitzorduaren _baliabideak"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
@@ -6564,19 +6306,16 @@ msgid "Completed date is wrong"
 msgstr "Osatze-data gaizki dago"
 
 #: ../calendar/gui/dialogs/task-details-page.c:522
-#, fuzzy
 msgid "Web Page"
-msgstr "_Web orriaren helbidea:"
+msgstr "Web orria"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:1
-#, fuzzy
 msgid "<span weight=\"bold\">Miscellaneous</span>"
-msgstr "Mezu berrien jakinarazpena"
+msgstr "<span weight=\"bold\">Hainbat</span>"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:2
-#, fuzzy
 msgid "<span weight=\"bold\">Status</span>"
-msgstr "Bidalitako mezuak eta zirriborroak"
+msgstr "<span weight=\"bold\">Egoera</span>"
 
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
@@ -6584,15 +6323,15 @@ msgstr "Bidalitako mezuak eta zirriborroak"
 #: ../calendar/gui/e-cal-component-preview.c:229
 #: ../calendar/gui/e-cal-model-tasks.c:346
 #: ../calendar/gui/e-cal-model-tasks.c:659
-#: ../calendar/gui/e-calendar-table.c:455 ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/e-itip-control.c:895
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../calendar/gui/print.c:2361 ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/print.c:2370 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Eginda"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-calendar-table.c:380 ../mail/message-list.c:1008
+#: ../calendar/gui/e-calendar-table.c:384 ../mail/message-list.c:1008
 msgid "High"
 msgstr "Handia"
 
@@ -6601,19 +6340,19 @@ msgstr "Handia"
 #: ../calendar/gui/e-cal-model-tasks.c:344
 #: ../calendar/gui/e-cal-model-tasks.c:657
 #: ../calendar/gui/e-cal-model-tasks.c:732
-#: ../calendar/gui/e-calendar-table.c:454 ../calendar/gui/print.c:2358
+#: ../calendar/gui/e-calendar-table.c:458 ../calendar/gui/print.c:2367
 msgid "In Progress"
 msgstr "Egiten ari da"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1006
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1006
 msgid "Low"
 msgstr "Txikia"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:381
+#: ../calendar/gui/e-cal-model.c:920 ../calendar/gui/e-calendar-table.c:385
 #: ../mail/message-list.c:1007
 msgid "Normal"
 msgstr "Normala"
@@ -6622,24 +6361,22 @@ msgstr "Normala"
 #: ../calendar/gui/e-cal-component-preview.c:236
 #: ../calendar/gui/e-cal-model-tasks.c:342
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:453 ../calendar/gui/print.c:2355
+#: ../calendar/gui/e-calendar-table.c:457 ../calendar/gui/print.c:2364
 msgid "Not Started"
 msgstr "Ez da hasi"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:10
-#, fuzzy
 msgid "P_ercent complete:"
-msgstr "Osatutako ehunekoa: %i"
+msgstr "Osatutako ehunekoa:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:11
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:387
 msgid "Undefined"
 msgstr "Definitu gabe"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#, fuzzy
 msgid "_Date completed:"
-msgstr "Osatze-data:"
+msgstr "_Osatze-data:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:13
 #: ../widgets/misc/e-send-options.glade.h:31
@@ -6651,17 +6388,16 @@ msgid "_Status:"
 msgstr "_Egoera:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:15
-#, fuzzy
 msgid "_Web Page:"
-msgstr "_Web orriaren helbidea:"
+msgstr "_Web orria:"
 
-#: ../calendar/gui/dialogs/task-editor.c:138 ../calendar/gui/print.c:2300
+#: ../calendar/gui/dialogs/task-editor.c:137 ../calendar/gui/print.c:2309
 msgid "Task"
 msgstr "Zeregina"
 
-#: ../calendar/gui/dialogs/task-editor.c:162
-#: ../calendar/gui/dialogs/task-editor.c:224
-#: ../calendar/gui/dialogs/task-editor.c:378
+#: ../calendar/gui/dialogs/task-editor.c:161
+#: ../calendar/gui/dialogs/task-editor.c:223
+#: ../calendar/gui/dialogs/task-editor.c:380
 msgid "Assignment"
 msgstr "Esleipena"
 
@@ -6669,118 +6405,104 @@ msgstr "Esleipena"
 msgid "Due date is wrong"
 msgstr "Mugaeguna gaizki dago"
 
-#: ../calendar/gui/dialogs/task-page.c:873
-#, fuzzy, c-format
+#: ../calendar/gui/dialogs/task-page.c:880
+#, c-format
 msgid "Unable to open tasks in '%s'."
-msgstr "Ezin da helbide-liburua ireki"
+msgstr "Ezin dira hemengo zereginak ireki: '%s'."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:9
-#, fuzzy
 msgid "D_escription:"
-msgstr "Azalpena:"
+msgstr "_Azalpena:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:12
-#, fuzzy
 msgid "Sta_rt date:"
 msgstr "Ha_siera-data:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:14
-#, fuzzy
 msgid "Task Description"
-msgstr "Azalpena"
+msgstr "Zereginaren azalpena:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:15
-#, fuzzy
 msgid "_Due date:"
 msgstr "_Mugaeguna:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:16
-#, fuzzy
 msgid "_Group:"
-msgstr "Taldea:"
+msgstr "_Taldea:"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
-#, fuzzy
 msgid "<b>Free/Busy C_alendars</b>"
-msgstr "Egutegi-informazioa"
+msgstr "<b>'Libre/okupatuta' _egutegiak</b>"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
 msgid "<b>Publishing Frequency</b>"
-msgstr ""
+msgstr "<b>Argitaratze-mahiztasuna</b>"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
-#, fuzzy
 msgid "<b>Publishing _Location</b>"
-msgstr "Libre/okupatuta informazioa"
+msgstr "<b>Argitaratze-kokalekua</b>"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
-#, fuzzy
 msgid "Free/Busy Publishing Settings"
-msgstr "Libre/okupatuta eskaera"
+msgstr "'Libre/okupatuta'ren argitaratze-ezarpenak"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
-#, fuzzy
 msgid "_Daily"
-msgstr "Eguna"
+msgstr "_Egunero"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
-#, fuzzy
 msgid "_Manual"
-msgstr "Managua"
+msgstr "_Eskuz"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
-#, fuzzy
 msgid "_Password:"
-msgstr "Pasahitza"
+msgstr "_Pasahitza"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
-#, fuzzy
 msgid "_Remember password"
-msgstr "Gogoratu pasahitz hau"
+msgstr "_Gogoratu pasahitza"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
-#, fuzzy
 msgid "_Username:"
 msgstr "_Erabiltzaile-izena:"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:12
-#, fuzzy
 msgid "_Weekly"
-msgstr "Astea"
+msgstr "_Astero"
 
 #: ../calendar/gui/e-alarm-list.c:395
-#, fuzzy, c-format
+#, c-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] "%d egun"
+msgstr[0] "egun %d"
 msgstr[1] "%d egun"
 
 #: ../calendar/gui/e-alarm-list.c:400
-#, fuzzy, c-format
+#, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
-msgstr[0] "%d aste"
+msgstr[0] "aste %d"
 msgstr[1] "%d aste"
 
 #: ../calendar/gui/e-alarm-list.c:405
-#, fuzzy, c-format
+#, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] "%d ordu"
+msgstr[0] "ordu %d"
 msgstr[1] "%d ordu"
 
 #: ../calendar/gui/e-alarm-list.c:410
-#, fuzzy, c-format
+#, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] "%d minutu"
+msgstr[0] "minutu %d"
 msgstr[1] "%d minutu"
 
 #: ../calendar/gui/e-alarm-list.c:415
-#, fuzzy, c-format
+#, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] "%d segundo"
+msgstr[0] "segundo %d"
 msgstr[1] "%d segundo"
 
 #: ../calendar/gui/e-alarm-list.c:462
@@ -6834,49 +6556,45 @@ msgid "%s for an unknown trigger type"
 msgstr "abiarazle-mota ezezagunaren %s"
 
 #: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2703
-#, fuzzy, c-format
+#, c-format
 msgid "Click to open %s"
-msgstr "Egin klik zeregina gehitzeko"
+msgstr "Egin klik %s irekitzeko"
 
 #: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:796
 msgid "Untitled"
 msgstr "Izengabea"
 
 #: ../calendar/gui/e-cal-component-preview.c:186
-#: ../calendar/gui/e-itip-control.c:1110
+#: ../calendar/gui/e-itip-control.c:1107
 #: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Laburpena:"
 
 #: ../calendar/gui/e-cal-component-preview.c:193
 #: ../calendar/gui/e-cal-component-preview.c:204
-#, fuzzy
 msgid "Start Date:"
-msgstr "Ha_siera-data:"
+msgstr "Hasiera-data:"
 
 #: ../calendar/gui/e-cal-component-preview.c:215
-#, fuzzy
 msgid "Due Date:"
-msgstr "_Mugaeguna:"
+msgstr "Mugaeguna:"
 
 #. write status
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:222
-#: ../calendar/gui/e-itip-control.c:1134
-#: ../plugins/exchange-operations/exchange-account-setup.c:263
+#: ../calendar/gui/e-itip-control.c:1131
+#: ../plugins/exchange-operations/exchange-account-setup.c:265
 #: ../plugins/itip-formatter/itip-view.c:909
 msgid "Status:"
 msgstr "Egoera:"
 
 #: ../calendar/gui/e-cal-component-preview.c:246
-#, fuzzy
 msgid "Priority:"
-msgstr "_Lehentasuna:"
+msgstr "Lehentasuna:"
 
 #: ../calendar/gui/e-cal-component-preview.c:299
-#, fuzzy
 msgid "Web Page:"
-msgstr "_Web orriaren helbidea:"
+msgstr "Web orria:"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
@@ -6893,12 +6611,12 @@ msgid "Summary"
 msgstr "Laburpena"
 
 #: ../calendar/gui/e-cal-model-calendar.c:180
-#: ../calendar/gui/e-calendar-table.c:432
+#: ../calendar/gui/e-calendar-table.c:436
 msgid "Free"
 msgstr "Libre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:433
+#: ../calendar/gui/e-calendar-table.c:437
 #: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Busy"
 msgstr "Okupatuta"
@@ -6913,7 +6631,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:926
 #: ../calendar/gui/e-meeting-list-view.c:192
 #: ../calendar/gui/e-meeting-store.c:168 ../calendar/gui/e-meeting-store.c:178
 #: ../calendar/gui/e-meeting-store.c:808
@@ -6921,7 +6639,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Bai"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:926
 #: ../calendar/gui/e-meeting-list-view.c:193
 #: ../calendar/gui/e-meeting-store.c:180
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
@@ -6930,7 +6648,7 @@ msgstr "Ez"
 
 #. This is the default filename used for temporary file creation
 #: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-model.c:330
-#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.c:1292
+#: ../calendar/gui/e-itip-control.c:1148 ../calendar/gui/e-itip-control.c:1289
 #: ../calendar/gui/e-meeting-list-view.c:168
 #: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
@@ -6943,142 +6661,140 @@ msgstr "Ez"
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Recurring"
 msgstr "Errepikatua"
 
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:924
 msgid "Assigned"
 msgstr "Esleitua"
 
-#: ../calendar/gui/e-calendar-table.c:402
+#: ../calendar/gui/e-calendar-table.c:406
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:403
+#: ../calendar/gui/e-calendar-table.c:407
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:404
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:405
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:407
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:514
-#, fuzzy
+#: ../calendar/gui/e-calendar-table.c:518
 msgid "Task Table"
-msgstr "Zeregin-eguneratzea"
+msgstr "Zereginen taula"
 
-#: ../calendar/gui/e-calendar-table.c:692
-#: ../calendar/gui/e-calendar-view.c:661
+#: ../calendar/gui/e-calendar-table.c:696
+#: ../calendar/gui/e-calendar-view.c:671
 msgid "Deleting selected objects"
 msgstr "Hautatutako objektuak ezabatzen"
 
-#: ../calendar/gui/e-calendar-table.c:871
-#: ../calendar/gui/e-calendar-view.c:789
+#: ../calendar/gui/e-calendar-table.c:875
+#: ../calendar/gui/e-calendar-view.c:799
 msgid "Updating objects"
 msgstr "Objektuak eguneratzen"
 
-#: ../calendar/gui/e-calendar-table.c:1012
-#: ../calendar/gui/e-calendar-view.c:1105 ../composer/e-msg-composer.c:1243
+#: ../calendar/gui/e-calendar-table.c:1025
+#: ../calendar/gui/e-calendar-view.c:1122 ../composer/e-msg-composer.c:1243
 msgid "Save as..."
 msgstr "Gorde honela..."
 
-#: ../calendar/gui/e-calendar-table.c:1155
-#, fuzzy
+#: ../calendar/gui/e-calendar-table.c:1168
 msgid "Open _Web Page"
-msgstr "_Ireki mezua"
+msgstr "Ireki _web orria"
 
-#: ../calendar/gui/e-calendar-table.c:1156
-#: ../calendar/gui/e-calendar-view.c:1529 ../mail/em-folder-view.c:1045
+#: ../calendar/gui/e-calendar-table.c:1169
+#: ../calendar/gui/e-calendar-view.c:1546 ../mail/em-folder-view.c:1045
 #: ../mail/em-popup.c:541 ../mail/em-popup.c:552
 msgid "_Save As..."
 msgstr "_Gorde honela..."
 
-#: ../calendar/gui/e-calendar-table.c:1157
-#: ../calendar/gui/e-calendar-view.c:1509
-#: ../calendar/gui/e-calendar-view.c:1530 ../mail/em-folder-view.c:1046
+#: ../calendar/gui/e-calendar-table.c:1170
+#: ../calendar/gui/e-calendar-view.c:1526
+#: ../calendar/gui/e-calendar-view.c:1547 ../mail/em-folder-view.c:1046
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:120 ../ui/evolution-tasks.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-tasks.xml.h:27
 msgid "_Print..."
 msgstr "I_nprimatu..."
 
-#: ../calendar/gui/e-calendar-table.c:1161
-#: ../calendar/gui/e-calendar-view.c:1534 ../ui/evolution-addressbook.xml.h:1
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1551 ../ui/evolution-addressbook.xml.h:1
 #: ../ui/evolution-calendar.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "E_baki"
 
-#: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:1512
-#: ../calendar/gui/e-calendar-view.c:1536 ../ui/evolution-addressbook.xml.h:38
+#: ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1529
+#: ../calendar/gui/e-calendar-view.c:1553 ../ui/evolution-addressbook.xml.h:38
 #: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Paste"
 msgstr "_Itsatsi"
 
-#: ../calendar/gui/e-calendar-table.c:1167 ../ui/evolution-tasks.xml.h:20
+#: ../calendar/gui/e-calendar-table.c:1180 ../ui/evolution-tasks.xml.h:20
 msgid "_Assign Task"
 msgstr "Esleitu _zeregina"
 
-#: ../calendar/gui/e-calendar-table.c:1168 ../ui/evolution-tasks.xml.h:24
+#: ../calendar/gui/e-calendar-table.c:1181 ../ui/evolution-tasks.xml.h:24
 msgid "_Forward as iCalendar"
 msgstr "_Birbidali iCalendar gisa"
 
-#: ../calendar/gui/e-calendar-table.c:1169
+#: ../calendar/gui/e-calendar-table.c:1182
 msgid "_Mark as Complete"
 msgstr "_Markatu 'Osatuta'"
 
-#: ../calendar/gui/e-calendar-table.c:1170
+#: ../calendar/gui/e-calendar-table.c:1183
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Ma_rkatu hautatutako zereginak 'Osatuta'"
 
 #. FIXME: need to disable for undeletable folders
-#: ../calendar/gui/e-calendar-table.c:1174
-#: ../calendar/gui/e-calendar-view.c:1548 ../mail/em-folder-tree.c:2043
+#: ../calendar/gui/e-calendar-table.c:1187
+#: ../calendar/gui/e-calendar-view.c:1565 ../mail/em-folder-tree.c:2048
 #: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:33
 #: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
 #: ../ui/evolution-tasks.xml.h:22
 msgid "_Delete"
 msgstr "E_zabatu"
 
-#: ../calendar/gui/e-calendar-table.c:1175
+#: ../calendar/gui/e-calendar-table.c:1188
 msgid "_Delete Selected Tasks"
 msgstr "_Ezabatu hautatutako zereginak"
 
-#: ../calendar/gui/e-calendar-table.c:1326
+#: ../calendar/gui/e-calendar-table.c:1407
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Egin klik zeregina gehitzeko"
@@ -7093,12 +6809,10 @@ msgid "Complete"
 msgstr "Eginda"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:6
-#, fuzzy
 msgid "Completion date"
-msgstr "Egite-data"
+msgstr "Osatze-data"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:7
-#, fuzzy
 msgid "Due date"
 msgstr "Mugaeguna"
 
@@ -7108,7 +6822,6 @@ msgid "Priority"
 msgstr "Lehentasuna"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:9
-#, fuzzy
 msgid "Start date"
 msgstr "Hasiera-data"
 
@@ -7116,80 +6829,73 @@ msgstr "Hasiera-data"
 msgid "Task sort"
 msgstr "Zereginen ordena"
 
-#: ../calendar/gui/e-calendar-view.c:1231
-#, fuzzy
+#: ../calendar/gui/e-calendar-view.c:1248
 msgid "Moving items"
-msgstr "Mezuak lekuz aldatzen"
+msgstr "elementuak lekuz aldatzen"
 
-#: ../calendar/gui/e-calendar-view.c:1233
-#, fuzzy
+#: ../calendar/gui/e-calendar-view.c:1250
 msgid "Copying items"
-msgstr "Mezuak kopiatzen"
+msgstr "elementuak kopiatzen"
 
-#: ../calendar/gui/e-calendar-view.c:1503
+#: ../calendar/gui/e-calendar-view.c:1520
 msgid "New _Appointment..."
 msgstr "Hitz_ordu berria..."
 
-#: ../calendar/gui/e-calendar-view.c:1504
+#: ../calendar/gui/e-calendar-view.c:1521
 msgid "New All Day _Event"
 msgstr "Egun osoko gertaera _berria"
 
-#: ../calendar/gui/e-calendar-view.c:1506
+#: ../calendar/gui/e-calendar-view.c:1523
 msgid "New Task"
 msgstr "Zeregin berria"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1516
+#: ../calendar/gui/e-calendar-view.c:1533
 msgid "Current View"
 msgstr "Uneko ikuspegia"
 
-#: ../calendar/gui/e-calendar-view.c:1518 ../ui/evolution-calendar.xml.h:26
-#, fuzzy
+#: ../calendar/gui/e-calendar-view.c:1535 ../ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
-msgstr "Hautatu _haria"
+msgstr "Hautatu _Gaur"
 
-#: ../calendar/gui/e-calendar-view.c:1519
-#, fuzzy
+#: ../calendar/gui/e-calendar-view.c:1536
 msgid "_Select Date..."
-msgstr "_Joan data jakin batera..."
+msgstr "_Hautatu data..."
 
 #. TODO: Why is this in a context menu when it applies globally?
-#: ../calendar/gui/e-calendar-view.c:1524 ../ui/evolution-calendar.xml.h:45
+#: ../calendar/gui/e-calendar-view.c:1541 ../ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Argitaratu libre/okupatuta informazioa"
 
-#: ../calendar/gui/e-calendar-view.c:1540
-#, fuzzy
+#: ../calendar/gui/e-calendar-view.c:1557
 msgid "Cop_y to Calendar..."
-msgstr "Kopiatu karpeta honetan..."
+msgstr "_Kopiatu egutegian..."
 
-#: ../calendar/gui/e-calendar-view.c:1541
-#, fuzzy
+#: ../calendar/gui/e-calendar-view.c:1558
 msgid "Mo_ve to Calendar..."
-msgstr "_Eraman karpeta honetara..."
+msgstr "_Eraman egutegira..."
 
-#: ../calendar/gui/e-calendar-view.c:1542
-#, fuzzy
+#: ../calendar/gui/e-calendar-view.c:1559
 msgid "_Delegate Meeting..."
-msgstr "_Antolatu Bilera..."
+msgstr "_Delegatu Bilera..."
 
-#: ../calendar/gui/e-calendar-view.c:1543
+#: ../calendar/gui/e-calendar-view.c:1560
 msgid "_Schedule Meeting..."
 msgstr "_Antolatu Bilera..."
 
-#: ../calendar/gui/e-calendar-view.c:1544
+#: ../calendar/gui/e-calendar-view.c:1561
 msgid "_Forward as iCalendar..."
 msgstr "_Birbidali iCalendar gisa..."
 
-#: ../calendar/gui/e-calendar-view.c:1549
+#: ../calendar/gui/e-calendar-view.c:1566
 msgid "Make this Occurrence _Movable"
 msgstr "Egin _agerraldi hau aldagarri"
 
-#: ../calendar/gui/e-calendar-view.c:1550
+#: ../calendar/gui/e-calendar-view.c:1567
 msgid "Delete this _Occurrence"
 msgstr "Ezabatu _agerraldi hau"
 
-#: ../calendar/gui/e-calendar-view.c:1551
+#: ../calendar/gui/e-calendar-view.c:1568
 msgid "Delete _All Occurrences"
 msgstr "Ezabatu agerraldi _guztiak"
 
@@ -7236,7 +6942,7 @@ msgstr "%02i minutu-zatiketa"
 #. order but don't change the specifiers or add
 #. anything.
 #: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1493
-#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1517
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1526
 msgid "%A %d %B"
 msgstr "%A, %B %d"
 
@@ -7252,97 +6958,94 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:763
+#: ../calendar/gui/e-itip-control.c:760
 msgid "Yes. (Complex Recurrence)"
 msgstr "Bai. (Errepikapen konplexua)"
 
-#: ../calendar/gui/e-itip-control.c:774
-#, fuzzy, c-format
+#: ../calendar/gui/e-itip-control.c:771
+#, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Egunero"
-msgstr[1] "Egunero"
+msgstr[1] "%d egunez behin"
 
-#: ../calendar/gui/e-itip-control.c:779
-#, fuzzy, c-format
+#: ../calendar/gui/e-itip-control.c:776
+#, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Astero"
-msgstr[1] "Astero"
+msgstr[1] "%d astez behin"
 
-#: ../calendar/gui/e-itip-control.c:781
-#, fuzzy, c-format
+#: ../calendar/gui/e-itip-control.c:778
+#, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Astero, eguna: "
-msgstr[1] "Astero, eguna: "
+msgstr[1] "%d astez behin, eguna: "
 
-#: ../calendar/gui/e-itip-control.c:789
+#: ../calendar/gui/e-itip-control.c:786
 msgid " and "
 msgstr " eta "
 
-#: ../calendar/gui/e-itip-control.c:796
+#: ../calendar/gui/e-itip-control.c:793
 #, c-format
 msgid "The %s day of "
 msgstr "%s. eguna - "
 
-#: ../calendar/gui/e-itip-control.c:809
+#: ../calendar/gui/e-itip-control.c:806
 #, c-format
 msgid "The %s %s of "
 msgstr "%s. %s - "
 
-#: ../calendar/gui/e-itip-control.c:816
-#, fuzzy, c-format
+#: ../calendar/gui/e-itip-control.c:813
+#, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "hilero"
-msgstr[1] "hilero"
+msgstr[1] "%d hilez behin"
 
-#: ../calendar/gui/e-itip-control.c:820
-#, fuzzy, c-format
+#: ../calendar/gui/e-itip-control.c:817
+#, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Urtero"
-msgstr[1] "Urtero"
+msgstr[1] "%d urtez behin"
 
-#: ../calendar/gui/e-itip-control.c:831
-#, fuzzy, c-format
+#: ../calendar/gui/e-itip-control.c:828
+#, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " guztira %d aldiz"
 msgstr[1] " guztira %d aldiz"
 
-#: ../calendar/gui/e-itip-control.c:840
+#: ../calendar/gui/e-itip-control.c:837
 msgid ", ending on "
 msgstr ", data honetan amaituta: "
 
-#: ../calendar/gui/e-itip-control.c:864
-#, fuzzy
+#: ../calendar/gui/e-itip-control.c:861
 msgid "Starts"
-msgstr "Egoera"
+msgstr "Hasi"
 
-#: ../calendar/gui/e-itip-control.c:877
-#, fuzzy
+#: ../calendar/gui/e-itip-control.c:874
 msgid "Ends"
-msgstr "Enid"
+msgstr "Amaitu"
 
-#: ../calendar/gui/e-itip-control.c:911
+#: ../calendar/gui/e-itip-control.c:908
 #: ../plugins/save-calendar/csv-format.c:395
-#, fuzzy
 msgid "Due"
-msgstr "Falta: "
+msgstr "Muga"
 
-#: ../calendar/gui/e-itip-control.c:951 ../calendar/gui/e-itip-control.c:1008
+#: ../calendar/gui/e-itip-control.c:948 ../calendar/gui/e-itip-control.c:1005
 msgid "iCalendar Information"
 msgstr "iCalendar informazioa"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:968
+#: ../calendar/gui/e-itip-control.c:965
 msgid "iCalendar Error"
 msgstr "iCalendar errorea"
 
-#: ../calendar/gui/e-itip-control.c:1040 ../calendar/gui/e-itip-control.c:1056
-#: ../calendar/gui/e-itip-control.c:1067 ../calendar/gui/e-itip-control.c:1084
+#: ../calendar/gui/e-itip-control.c:1037 ../calendar/gui/e-itip-control.c:1053
+#: ../calendar/gui/e-itip-control.c:1064 ../calendar/gui/e-itip-control.c:1081
 #: ../plugins/itip-formatter/itip-view.c:338
 #: ../plugins/itip-formatter/itip-view.c:339
 #: ../plugins/itip-formatter/itip-view.c:406
@@ -7351,14 +7054,14 @@ msgid "An unknown person"
 msgstr "Pertsona ezezaguna"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1091
+#: ../calendar/gui/e-itip-control.c:1088
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Aztertu ondorengo informazioa, eta hautatu ekintza bat beheko menuan."
 
-#: ../calendar/gui/e-itip-control.c:1139
+#: ../calendar/gui/e-itip-control.c:1136
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
 #: ../calendar/gui/itip-utils.c:548
@@ -7366,12 +7069,12 @@ msgstr ""
 msgid "Accepted"
 msgstr "Onartua"
 
-#: ../calendar/gui/e-itip-control.c:1143 ../calendar/gui/itip-utils.c:551
+#: ../calendar/gui/e-itip-control.c:1140 ../calendar/gui/itip-utils.c:551
 #: ../plugins/itip-formatter/itip-formatter.c:1643
 msgid "Tentatively Accepted"
 msgstr "Oraingoz onartua"
 
-#: ../calendar/gui/e-itip-control.c:1147
+#: ../calendar/gui/e-itip-control.c:1144
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
 #: ../calendar/gui/itip-utils.c:554 ../calendar/gui/itip-utils.c:583
@@ -7379,270 +7082,273 @@ msgstr "Oraingoz onartua"
 msgid "Declined"
 msgstr "Ukatua"
 
-#: ../calendar/gui/e-itip-control.c:1231
+#: ../calendar/gui/e-itip-control.c:1228
 msgid ""
 "The meeting has been cancelled, however it could not be found in your "
 "calendars"
 msgstr ""
+"Bilera bertan behera utzi da, hala ere ezin izan da zure egutegietan aurkitu"
 
-#: ../calendar/gui/e-itip-control.c:1233
+#: ../calendar/gui/e-itip-control.c:1230
 msgid ""
 "The task has been cancelled, however it could not be found in your task lists"
 msgstr ""
+"Bilera bertan behera utzi da, hala ere ezin izan da zure zereginen "
+"zerrendetan aurkitu"
 
-#: ../calendar/gui/e-itip-control.c:1312
+#: ../calendar/gui/e-itip-control.c:1309
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b>(e)k bilera-informazioa argitaratu du."
 
-#: ../calendar/gui/e-itip-control.c:1313
+#: ../calendar/gui/e-itip-control.c:1310
 msgid "Meeting Information"
 msgstr "Bileraren informazioa"
 
-#: ../calendar/gui/e-itip-control.c:1319
+#: ../calendar/gui/e-itip-control.c:1316
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b>(e)k bilerarako deia egiten dio %s(r)i."
 
-#: ../calendar/gui/e-itip-control.c:1321
+#: ../calendar/gui/e-itip-control.c:1318
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b>(e)k bilerarako deia egiten dizu."
 
-#: ../calendar/gui/e-itip-control.c:1322
+#: ../calendar/gui/e-itip-control.c:1319
 msgid "Meeting Proposal"
 msgstr "Bilera-proposamena"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1328
+#: ../calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b>(e)k bilera batean sartu nahi du."
 
-#: ../calendar/gui/e-itip-control.c:1329
+#: ../calendar/gui/e-itip-control.c:1326
 msgid "Meeting Update"
 msgstr "Bilera-eguneratzea"
 
-#: ../calendar/gui/e-itip-control.c:1333
+#: ../calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b>(e)k bilera-informazio berria jaso nahi du."
 
-#: ../calendar/gui/e-itip-control.c:1334
+#: ../calendar/gui/e-itip-control.c:1331
 msgid "Meeting Update Request"
 msgstr "Bilera eguneratzeko eskaera"
 
-#: ../calendar/gui/e-itip-control.c:1341
+#: ../calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b>(e)k bilera-eskaerari erantzun dio."
 
-#: ../calendar/gui/e-itip-control.c:1342
+#: ../calendar/gui/e-itip-control.c:1339
 msgid "Meeting Reply"
 msgstr "Bilera-erantzuna"
 
-#: ../calendar/gui/e-itip-control.c:1349
+#: ../calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b>(e)k bilera bertan behera utzi du."
 
-#: ../calendar/gui/e-itip-control.c:1350
+#: ../calendar/gui/e-itip-control.c:1347
 msgid "Meeting Cancellation"
 msgstr "Bilera bertan behera uztea"
 
-#: ../calendar/gui/e-itip-control.c:1360 ../calendar/gui/e-itip-control.c:1437
-#: ../calendar/gui/e-itip-control.c:1477
+#: ../calendar/gui/e-itip-control.c:1357 ../calendar/gui/e-itip-control.c:1434
+#: ../calendar/gui/e-itip-control.c:1474
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b>(e)k mezu ulertezina bidali du."
 
-#: ../calendar/gui/e-itip-control.c:1361
+#: ../calendar/gui/e-itip-control.c:1358
 msgid "Bad Meeting Message"
 msgstr "Bilera-mezu txarra"
 
-#: ../calendar/gui/e-itip-control.c:1388
+#: ../calendar/gui/e-itip-control.c:1385
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b>(e)k zeregin-informazioa argitaratu du."
 
-#: ../calendar/gui/e-itip-control.c:1389
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Task Information"
 msgstr "Zereginaren informazioa"
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b>(e)k zeregin bat egiteko eskatzen dio %s(r)i."
 
-#: ../calendar/gui/e-itip-control.c:1398
+#: ../calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b>(e)k zeregin bat egiteko eskatzen dizu."
 
-#: ../calendar/gui/e-itip-control.c:1399
+#: ../calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr "Zeregin-proposamena"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1402
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b>(e)k zeregin batean sartu nahi du."
 
-#: ../calendar/gui/e-itip-control.c:1406
+#: ../calendar/gui/e-itip-control.c:1403
 msgid "Task Update"
 msgstr "Zeregin-eguneratzea"
 
-#: ../calendar/gui/e-itip-control.c:1410
+#: ../calendar/gui/e-itip-control.c:1407
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b>(e)k zereginaren informazio berria jaso nahi du."
 
-#: ../calendar/gui/e-itip-control.c:1411
+#: ../calendar/gui/e-itip-control.c:1408
 msgid "Task Update Request"
 msgstr "Zeregina eguneratzeko eskaera"
 
-#: ../calendar/gui/e-itip-control.c:1418
+#: ../calendar/gui/e-itip-control.c:1415
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b>(e)k zeregin-esleipenari erantzun dio."
 
-#: ../calendar/gui/e-itip-control.c:1419
+#: ../calendar/gui/e-itip-control.c:1416
 msgid "Task Reply"
 msgstr "Zereginaren erantzuna"
 
-#: ../calendar/gui/e-itip-control.c:1426
+#: ../calendar/gui/e-itip-control.c:1423
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b>(e)k zeregina bertan behera utzi du."
 
-#: ../calendar/gui/e-itip-control.c:1427
+#: ../calendar/gui/e-itip-control.c:1424
 msgid "Task Cancellation"
 msgstr "Zeregina bertan behera uztea"
 
-#: ../calendar/gui/e-itip-control.c:1438
+#: ../calendar/gui/e-itip-control.c:1435
 msgid "Bad Task Message"
 msgstr "Zeregin-mezu txarra"
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1459
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b>(e)k libre/okupatuta informazioa argitaratu du."
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Information"
 msgstr "Libre/okupatuta informazioa"
 
-#: ../calendar/gui/e-itip-control.c:1467
+#: ../calendar/gui/e-itip-control.c:1464
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b>(e)k libre/okupatuta informazioa eskatzen dizu."
 
-#: ../calendar/gui/e-itip-control.c:1468
+#: ../calendar/gui/e-itip-control.c:1465
 msgid "Free/Busy Request"
 msgstr "Libre/okupatuta eskaera"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1469
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b>(e)k libre/okupatuta eskaerari erantzun dio."
 
-#: ../calendar/gui/e-itip-control.c:1473
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Free/Busy Reply"
 msgstr "Libre/okupatuta erantzuna"
 
-#: ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1475
 msgid "Bad Free/Busy Message"
 msgstr "Libre/okupatuta mezu txarra"
 
-#: ../calendar/gui/e-itip-control.c:1553
+#: ../calendar/gui/e-itip-control.c:1550
 msgid "The message does not appear to be properly formed"
 msgstr "Ez dirudi mezua behar bezala osatuta dagoenik"
 
-#: ../calendar/gui/e-itip-control.c:1612
+#: ../calendar/gui/e-itip-control.c:1609
 msgid "The message contains only unsupported requests."
 msgstr "Mezu honek onartzen ez diren eskaerak bakarrik ditu."
 
-#: ../calendar/gui/e-itip-control.c:1645
+#: ../calendar/gui/e-itip-control.c:1642
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Eranskinak ez du baliozko egutegi-mezurik"
 
-#: ../calendar/gui/e-itip-control.c:1677
+#: ../calendar/gui/e-itip-control.c:1674
 msgid "The attachment has no viewable calendar items"
 msgstr "Eranskinak ez du ikusteko moduko egutegi-elementurik"
 
-#: ../calendar/gui/e-itip-control.c:1911
+#: ../calendar/gui/e-itip-control.c:1908
 msgid "Update complete\n"
 msgstr "Eguneratzea osatu da\n"
 
-#: ../calendar/gui/e-itip-control.c:1939
+#: ../calendar/gui/e-itip-control.c:1936
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektua ez da baliozkoa eta ezin da eguneratu\n"
 
-#: ../calendar/gui/e-itip-control.c:1949
+#: ../calendar/gui/e-itip-control.c:1946
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Erantzun hau ez da uneko partaide batena.  Partaide gisa gehitu?"
 
-#: ../calendar/gui/e-itip-control.c:1961
+#: ../calendar/gui/e-itip-control.c:1958
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Partaidearen egoera ezin da eguneratu egoera baliogabea delako\n"
 
-#: ../calendar/gui/e-itip-control.c:1978
+#: ../calendar/gui/e-itip-control.c:1975
 msgid "Attendee status updated\n"
 msgstr "Partaidearen egoera eguneratu da\n"
 
-#: ../calendar/gui/e-itip-control.c:1981
+#: ../calendar/gui/e-itip-control.c:1978
 #: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Partaidearen egoera ezin da eguneratu elementua ez dagoelako"
 
-#: ../calendar/gui/e-itip-control.c:2011
+#: ../calendar/gui/e-itip-control.c:2008
 msgid "Removal Complete"
 msgstr "Kentzea osatu da"
 
-#: ../calendar/gui/e-itip-control.c:2034 ../calendar/gui/e-itip-control.c:2082
+#: ../calendar/gui/e-itip-control.c:2031 ../calendar/gui/e-itip-control.c:2079
 msgid "Item sent!\n"
 msgstr "Elementua bidali da!\n"
 
-#: ../calendar/gui/e-itip-control.c:2036 ../calendar/gui/e-itip-control.c:2086
+#: ../calendar/gui/e-itip-control.c:2033 ../calendar/gui/e-itip-control.c:2083
 msgid "The item could not be sent!\n"
 msgstr "Elementua ezin izan da bidali!\n"
 
-#: ../calendar/gui/e-itip-control.c:2166
+#: ../calendar/gui/e-itip-control.c:2163
 msgid "Choose an action:"
 msgstr "Aukeratu ekintza bat:"
 
-#: ../calendar/gui/e-itip-control.c:2237
+#: ../calendar/gui/e-itip-control.c:2234
 msgid "Update"
 msgstr "Eguneratu"
 
-#: ../calendar/gui/e-itip-control.c:2265
+#: ../calendar/gui/e-itip-control.c:2262
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Onartu"
 
-#: ../calendar/gui/e-itip-control.c:2266
+#: ../calendar/gui/e-itip-control.c:2263
 msgid "Tentatively accept"
 msgstr "Onartu oraingoz"
 
-#: ../calendar/gui/e-itip-control.c:2267
+#: ../calendar/gui/e-itip-control.c:2264
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Ukatu"
 
-#: ../calendar/gui/e-itip-control.c:2296
+#: ../calendar/gui/e-itip-control.c:2293
 msgid "Send Free/Busy Information"
 msgstr "Bidali libre/okupatuta informazioa"
 
-#: ../calendar/gui/e-itip-control.c:2324
+#: ../calendar/gui/e-itip-control.c:2321
 msgid "Update respondent status"
 msgstr "Eguneratu erantzun-emailearen egoera"
 
-#: ../calendar/gui/e-itip-control.c:2352
+#: ../calendar/gui/e-itip-control.c:2349
 msgid "Send Latest Information"
 msgstr "Bidali azken orduko informazioa"
 
-#: ../calendar/gui/e-itip-control.c:2380 ../calendar/gui/itip-utils.c:571
+#: ../calendar/gui/e-itip-control.c:2377 ../calendar/gui/itip-utils.c:571
 #: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
@@ -7808,22 +7514,18 @@ msgid "No Information"
 msgstr "Ez dago informaziorik"
 
 #: ../calendar/gui/e-meeting-time-sel.c:445
-#, fuzzy
 msgid "O_ptions"
-msgstr "Aukerak"
+msgstr "_Aukerak"
 
 #: ../calendar/gui/e-meeting-time-sel.c:462
-#, fuzzy
 msgid "Show _only working hours"
 msgstr "Erakutsi lan-orduak _bakarrik"
 
 #: ../calendar/gui/e-meeting-time-sel.c:472
-#, fuzzy
 msgid "Show _zoomed out"
 msgstr "Erakutsi _txikiagotuta"
 
 #: ../calendar/gui/e-meeting-time-sel.c:487
-#, fuzzy
 msgid "_Update free/busy"
 msgstr "_Eguneratu Libre/okupatuta"
 
@@ -7840,31 +7542,27 @@ msgid ">_>"
 msgstr ">_>"
 
 #: ../calendar/gui/e-meeting-time-sel.c:552
-#, fuzzy
 msgid "_All people and resources"
 msgstr "_Pertsona eta baliabide guztiak"
 
 #: ../calendar/gui/e-meeting-time-sel.c:561
-#, fuzzy
 msgid "All _people and one resource"
 msgstr "Pert_sona guztiak eta baliabide bat"
 
 #: ../calendar/gui/e-meeting-time-sel.c:570
-#, fuzzy
 msgid "_Required people"
 msgstr "_Beharrezko pertsonak"
 
 #: ../calendar/gui/e-meeting-time-sel.c:579
-#, fuzzy
 msgid "Required people and _one resource"
 msgstr "Beharrezko pertsonak eta ba_liabide bat"
 
-#: ../calendar/gui/e-pub-utils.c:300
-#, fuzzy, c-format
+#: ../calendar/gui/e-pub-utils.c:311
+#, c-format
 msgid "Enter the password for %s"
 msgstr "Idatzi %s(r)en pasahitza"
 
-#: ../calendar/gui/e-tasks.c:798 ../calendar/gui/gnome-cal.c:2532
+#: ../calendar/gui/e-tasks.c:818 ../calendar/gui/gnome-cal.c:2553
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7873,80 +7571,75 @@ msgstr ""
 "Errorea %s(e)n:\n"
 " %s"
 
-#: ../calendar/gui/e-tasks.c:846
-#, fuzzy
+#: ../calendar/gui/e-tasks.c:866
 msgid "Loading tasks"
-msgstr "Irudi-kargatzea"
+msgstr "Zereginak kargatzen"
 
-#: ../calendar/gui/e-tasks.c:930
+#: ../calendar/gui/e-tasks.c:953
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s - zereginak irekitzen"
 
-#: ../calendar/gui/e-tasks.c:1126
+#: ../calendar/gui/e-tasks.c:1152
 msgid "Completing tasks..."
 msgstr "Zereginak egiten..."
 
-#: ../calendar/gui/e-tasks.c:1149
+#: ../calendar/gui/e-tasks.c:1175
 msgid "Deleting selected objects..."
 msgstr "Hautatutako objektuak ezabatzen..."
 
-#: ../calendar/gui/e-tasks.c:1176
+#: ../calendar/gui/e-tasks.c:1202
 msgid "Expunging"
 msgstr "Betiko borratzen"
 
 #: ../calendar/gui/e-timezone-entry.c:133
-#, fuzzy
 msgid "Timezone Button"
-msgstr "Ordu-zona "
+msgstr "Ordu-zona botoia"
 
 #. 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:329 ../calendar/gui/print.c:1501
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1510
 msgid "%d %B"
 msgstr "%B %d"
 
-#: ../calendar/gui/gnome-cal.c:789
-#, fuzzy
+#: ../calendar/gui/gnome-cal.c:790
 msgid "Updating query"
-msgstr "Objektuak eguneratzen"
+msgstr "Kontsulta eguneratzen"
 
 #. bonobo displays this string so it must be in locale
-#: ../calendar/gui/gnome-cal.c:2209 ../widgets/menus/gal-view-instance.c:585
+#: ../calendar/gui/gnome-cal.c:2228 ../widgets/menus/gal-view-instance.c:585
 #: ../widgets/menus/gal-view-menus.c:350
 msgid "Custom View"
 msgstr "Ikuspegi pertsonalizatua"
 
-#
-#: ../calendar/gui/gnome-cal.c:2210 ../widgets/menus/gal-view-instance.c:586
+#: ../calendar/gui/gnome-cal.c:2229 ../widgets/menus/gal-view-instance.c:586
 msgid "Save Custom View"
 msgstr "Gorde ikuspegi pertsonalizatua"
 
-#: ../calendar/gui/gnome-cal.c:2215 ../widgets/menus/gal-view-instance.c:590
+#: ../calendar/gui/gnome-cal.c:2234 ../widgets/menus/gal-view-instance.c:590
 #: ../widgets/menus/gal-view-menus.c:372
 msgid "Define Views..."
 msgstr "Definitu ikuspegiak..."
 
-#: ../calendar/gui/gnome-cal.c:2378
-#, fuzzy, c-format
+#: ../calendar/gui/gnome-cal.c:2396
+#, c-format
 msgid "Loading appointments at %s"
-msgstr "Hitzordurik ez."
+msgstr "%s - hitzorduak kargatzen"
 
-#: ../calendar/gui/gnome-cal.c:2397
-#, fuzzy, c-format
+#: ../calendar/gui/gnome-cal.c:2415
+#, c-format
 msgid "Loading tasks at %s"
 msgstr "%s - zereginak irekitzen"
 
-#: ../calendar/gui/gnome-cal.c:2498
-#, fuzzy, c-format
+#: ../calendar/gui/gnome-cal.c:2519
+#, c-format
 msgid "Opening %s"
-msgstr "Ireki honekin: %s..."
+msgstr "%s irekitzen"
 
-#: ../calendar/gui/gnome-cal.c:3388
-#, fuzzy
+#: ../calendar/gui/gnome-cal.c:3411
 msgid "Purging"
-msgstr "Turin"
+msgstr "Purgatzen"
 
 #: ../calendar/gui/goto-dialog.glade.h:1
 msgid "April"
@@ -7993,18 +7686,16 @@ msgid "October"
 msgstr "urria"
 
 #: ../calendar/gui/goto-dialog.glade.h:12
-#, fuzzy
 msgid "Select Date"
-msgstr "Hautatu izenak"
+msgstr "Hautatu data"
 
 #: ../calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "iraila"
 
 #: ../calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
 msgid "_Select Today"
-msgstr "Hautatu karpeta"
+msgstr "_Hautatu Gaur"
 
 #: ../calendar/gui/itip-utils.c:353 ../calendar/gui/itip-utils.c:402
 #: ../calendar/gui/itip-utils.c:442
@@ -8058,7 +7749,7 @@ msgstr "iCalendar informazioa"
 
 #: ../calendar/gui/itip-utils.c:815
 msgid "You must be an attendee of the event."
-msgstr "Gertaerako partaidea izan behar duzu."
+msgstr "Gertaerako partaide izan behar duzu."
 
 #: ../calendar/gui/migration.c:151
 msgid ""
@@ -8067,6 +7758,9 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
+"Evolution-eko zereginen karpeten helbidea eta hierarkia aldatu egin da 1.x "
+"bertsiotik.\n"
+"Itxaron Evolution-ek zure karpetak migratzen dituen bitartean..."
 
 #: ../calendar/gui/migration.c:155
 msgid ""
@@ -8075,23 +7769,26 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
+"Evolution-eko egutegien karpeten helbidea eta hierarkia aldatu egin da 1.x "
+"bertsiotik.\n"
+"Itxaron Evolution-ek zure karpetak migratzen dituen bitartean..."
 
 #. FIXME: set proper domain/code
 #: ../calendar/gui/migration.c:748 ../calendar/gui/migration.c:915
 msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr ""
+msgstr "Ezin dira ezarpen zaharrak migratu evolution/config.xmldb fitxategitik"
 
 #. FIXME: domain/code
 #: ../calendar/gui/migration.c:777
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to migrate calendar `%s'"
-msgstr "Egutegia irekitzeko baimena ukatu egin da"
+msgstr "Ezin da `%s' egutegia migratu"
 
 #. FIXME: domain/code
 #: ../calendar/gui/migration.c:944
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to migrate tasks `%s'"
-msgstr "Ezin da helbide-liburua ireki"
+msgstr "Ezin dira `%s' zereginak migratu"
 
 #: ../calendar/gui/print.c:492
 msgid "1st"
@@ -8246,164 +7943,157 @@ msgid "Sa"
 msgstr "Lr"
 
 #. Day
-#: ../calendar/gui/print.c:1917
+#: ../calendar/gui/print.c:1926
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Hautatutako eguna (%a, %Y %b %d)"
 
-#: ../calendar/gui/print.c:1942 ../calendar/gui/print.c:1946
+#: ../calendar/gui/print.c:1951 ../calendar/gui/print.c:1955
 msgid "%a %b %d"
 msgstr "%a, %b %d"
 
-#: ../calendar/gui/print.c:1943
+#: ../calendar/gui/print.c:1952
 msgid "%a %d %Y"
 msgstr "%a, %Y %d"
 
-#: ../calendar/gui/print.c:1947 ../calendar/gui/print.c:1949
-#: ../calendar/gui/print.c:1950
+#: ../calendar/gui/print.c:1956 ../calendar/gui/print.c:1958
+#: ../calendar/gui/print.c:1959
 msgid "%a %b %d %Y"
 msgstr "%a, %Y %b %d"
 
-#: ../calendar/gui/print.c:1954
+#: ../calendar/gui/print.c:1963
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Hautatutako astea (%s - %s)"
 
 #. Month
-#: ../calendar/gui/print.c:1962
+#: ../calendar/gui/print.c:1971
 msgid "Selected month (%b %Y)"
 msgstr "Hautatutako hilabetea (%Y %b)"
 
 #. Year
-#: ../calendar/gui/print.c:1969
+#: ../calendar/gui/print.c:1978
 msgid "Selected year (%Y)"
 msgstr "Hautatutako urtea (%Y)"
 
-#: ../calendar/gui/print.c:2320
-#, fuzzy, c-format
+#: ../calendar/gui/print.c:2329
+#, c-format
 msgid "Summary: %s"
-msgstr "Laburpena:"
+msgstr "Laburpena: %s"
 
-#: ../calendar/gui/print.c:2328
-#, fuzzy, c-format
+#: ../calendar/gui/print.c:2337
+#, c-format
 msgid "Location: %s"
-msgstr "Kokalekua:"
+msgstr "Kokalekua: %s"
 
-#: ../calendar/gui/print.c:2371
+#: ../calendar/gui/print.c:2380
 #, c-format
 msgid "Status: %s"
 msgstr "Egoera: %s"
 
-#: ../calendar/gui/print.c:2388
+#: ../calendar/gui/print.c:2397
 #, c-format
 msgid "Priority: %s"
 msgstr "Lehentasuna: %s"
 
-#: ../calendar/gui/print.c:2400
+#: ../calendar/gui/print.c:2409
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Osatutako ehunekoa: %i"
 
-#: ../calendar/gui/print.c:2412
+#: ../calendar/gui/print.c:2421
 #, c-format
 msgid "URL: %s"
 msgstr "URLa: %s"
 
-#: ../calendar/gui/print.c:2426
+#: ../calendar/gui/print.c:2435
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategoriak: %s"
 
-#: ../calendar/gui/print.c:2437
+#: ../calendar/gui/print.c:2446
 msgid "Contacts: "
 msgstr "Kontaktuak: "
 
-#: ../calendar/gui/print.c:2577 ../calendar/gui/print.c:2665
-#: ../calendar/gui/print.c:2791 ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2586 ../calendar/gui/print.c:2674
+#: ../calendar/gui/print.c:2800 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Inprimatzeko aurrebista"
 
-#: ../calendar/gui/print.c:2612
+#: ../calendar/gui/print.c:2621
 msgid "Print Item"
 msgstr "Inprimatu elementua"
 
 #: ../calendar/gui/tasks-component.c:439
-#, fuzzy
 msgid "New Task List"
-msgstr "Zereginen zerrenda"
+msgstr "Zeregin-zerrenda berria"
 
 #: ../calendar/gui/tasks-component.c:515
-#, fuzzy, c-format
+#, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
-msgstr[0] "Zereginik ez"
-msgstr[1] "Zereginik ez"
+msgstr[0] "Zeregin %d"
+msgstr[1] "%d zeregin"
 
 #: ../calendar/gui/tasks-component.c:517 ../mail/mail-component.c:548
-#, fuzzy, c-format
+#, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "%d hautatuta"
 msgstr[1] "%d hautatuta"
 
 #: ../calendar/gui/tasks-component.c:564
-#, fuzzy
 msgid "Failed upgrading tasks."
-msgstr "Irudi-kargatzea"
+msgstr "Huts egin du zereginak bertsio-berritzean."
 
-#: ../calendar/gui/tasks-component.c:872
+#: ../calendar/gui/tasks-component.c:875
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
+"Ezin izan da '%s' zereginen zerrenda ireki gertaerak eta bilerak sortzeko"
 
-#: ../calendar/gui/tasks-component.c:887
+#: ../calendar/gui/tasks-component.c:888
 msgid "There is no calendar available for creating tasks"
-msgstr ""
+msgstr "Ez dago egutegirik erabilgarri zereginak sortzeko"
 
-#: ../calendar/gui/tasks-component.c:981
+#: ../calendar/gui/tasks-component.c:988
 msgid "Task Source Selector"
-msgstr ""
+msgstr "Zeregin-iturburu hautatzailea"
 
-#: ../calendar/gui/tasks-component.c:1164
+#: ../calendar/gui/tasks-component.c:1171
 msgid "New task"
 msgstr "Zeregin berria"
 
-#: ../calendar/gui/tasks-component.c:1165
+#: ../calendar/gui/tasks-component.c:1172
 msgid "_Task"
 msgstr "_Zeregina"
 
-#: ../calendar/gui/tasks-component.c:1166
+#: ../calendar/gui/tasks-component.c:1173
 msgid "Create a new task"
 msgstr "Sortu zeregin berria"
 
-#: ../calendar/gui/tasks-component.c:1172
-#, fuzzy
+#: ../calendar/gui/tasks-component.c:1179
 msgid "New assigned task"
-msgstr "Esleitu zeregina"
+msgstr "Esleitutako zeregin berria"
 
-#: ../calendar/gui/tasks-component.c:1173
-#, fuzzy
+#: ../calendar/gui/tasks-component.c:1180
 msgid "Assigne_d Task"
-msgstr "Esleitu zeregina"
+msgstr "E_sleitutako zeregina"
 
-#: ../calendar/gui/tasks-component.c:1174
-#, fuzzy
+#: ../calendar/gui/tasks-component.c:1181
 msgid "Create a new assigned task"
-msgstr "Sortu zeregin berria"
+msgstr "Sortu esleitutako zeregin berria"
 
-#: ../calendar/gui/tasks-component.c:1180
-#, fuzzy
+#: ../calendar/gui/tasks-component.c:1187
 msgid "New task list"
-msgstr "Zeregin berria"
+msgstr "Zereginen zerrenda berria"
 
-#: ../calendar/gui/tasks-component.c:1181
-#, fuzzy
+#: ../calendar/gui/tasks-component.c:1188
 msgid "Task l_ist"
-msgstr "Zereginen zerrenda"
+msgstr "Zereginen _zerrenda"
 
-#: ../calendar/gui/tasks-component.c:1182
-#, fuzzy
+#: ../calendar/gui/tasks-component.c:1189
 msgid "Create a new task list"
-msgstr "Sortu zeregin berria"
+msgstr "Sortu zereginen zerrenda berria"
 
 #: ../calendar/gui/tasks-control.c:419
 msgid ""
@@ -8421,7 +8111,7 @@ msgstr ""
 msgid "Do not ask me again."
 msgstr "Ez galdetu berriro."
 
-#: ../calendar/gui/tasks-control.c:457
+#: ../calendar/gui/tasks-control.c:456
 msgid "Print Tasks"
 msgstr "Inprimatu zereginak"
 
@@ -8431,15 +8121,13 @@ msgid "SMTWTFS"
 msgstr "SMTWTFS"
 
 #: ../calendar/importers/icalendar-importer.c:78
-#, fuzzy
 msgid "Appointments and Meetings"
-msgstr "Hitzordua - %s"
+msgstr "Hitzorduak eta bilerak"
 
 #: ../calendar/importers/icalendar-importer.c:336
 #: ../calendar/importers/icalendar-importer.c:586
-#, fuzzy
 msgid "Opening calendar"
-msgstr "%s - egutegia irekitzen"
+msgstr "Egutegia irekitzea"
 
 #: ../calendar/importers/icalendar-importer.c:429
 msgid "iCalendar files (.ics)"
@@ -10004,9 +9692,8 @@ msgid "Posting destination"
 msgstr "Bidalketa-helburua"
 
 #: ../composer/e-msg-composer-hdrs.c:559
-#, fuzzy
 msgid "Choose folders to post the message to."
-msgstr "Karpeta honek ezin du mezurik eduki."
+msgstr "Aukeratu talde-mezua bidaltzeko karpetak."
 
 #: ../composer/e-msg-composer-hdrs.c:593
 msgid "Click here for the address book"
@@ -10020,48 +9707,42 @@ msgstr "Egin klik hemen helbide-liburura joateko"
 #. * expects the reply_to fields to be initialized.
 #.
 #: ../composer/e-msg-composer-hdrs.c:623
-#, fuzzy
 msgid "_Reply-To:"
-msgstr "Erantzun honi:"
+msgstr "_Erantzun honi:"
 
 #.
 #. * From
 #.
 #: ../composer/e-msg-composer-hdrs.c:630
-#, fuzzy
 msgid "Fr_om:"
-msgstr "Nork:"
+msgstr "Nor_k:"
 
 #.
 #. * Subject
 #.
 #: ../composer/e-msg-composer-hdrs.c:637
-#, fuzzy
 msgid "S_ubject:"
-msgstr "Gaia:"
+msgstr "_Gaia:"
 
 #: ../composer/e-msg-composer-hdrs.c:646
-#, fuzzy
 msgid "_To:"
-msgstr "Nori:"
+msgstr "Nor_i:"
 
 #: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the recipients of the message"
 msgstr "Idatzi mezuaren hartzaileak"
 
 #: ../composer/e-msg-composer-hdrs.c:650
-#, fuzzy
 msgid "_Cc:"
-msgstr "Cc:"
+msgstr "_Cc:"
 
 #: ../composer/e-msg-composer-hdrs.c:651
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Idatzi mezuaren kopia jasoko dutenen helbideak"
 
 #: ../composer/e-msg-composer-hdrs.c:654
-#, fuzzy
 msgid "_Bcc:"
-msgstr "Bcc:"
+msgstr "_Bcc:"
 
 #: ../composer/e-msg-composer-hdrs.c:655
 msgid ""
@@ -10075,36 +9756,35 @@ msgstr ""
 #. * Post-To
 #.
 #: ../composer/e-msg-composer-hdrs.c:662
-#, fuzzy
 msgid "_Post To:"
-msgstr "Bidali hona:"
+msgstr "_Bidali hona:"
 
 #: ../composer/e-msg-composer-hdrs.c:667
-#, fuzzy
 msgid "Click here to select folders to post to"
-msgstr "<egin klik hemen karpeta hautatzeko>"
+msgstr "Egin klik hemen, talde-mezuak bidaltzeko karpetak hautatzeko"
 
 #: ../composer/e-msg-composer-hdrs.c:673
 msgid "Post To:"
 msgstr "Bidali hona:"
 
 #: ../composer/e-msg-composer-select-file.c:82
-#, fuzzy
 msgid "A_ttach"
-msgstr "Erantsi"
+msgstr "_Erantsi"
 
 #: ../composer/e-msg-composer.c:738
-#, fuzzy
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "_Beti sinatu kontu honetatik bidalitako mezuak"
+msgstr ""
+"Ezin da sinatu irteerako mezua: ez dago sinadura-ziurtagiririk kontu "
+"honentzat"
 
 #: ../composer/e-msg-composer.c:745
-#, fuzzy
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
-msgstr "_Beti sinatu kontu honetatik bidalitako mezuak"
+msgstr ""
+"Ezin da enkriptatu irteerako mezua: sinadura-ziurtagiririk ez dago ezarrita "
+"kontu honentzat"
 
 #: ../composer/e-msg-composer.c:1224 ../composer/e-msg-composer.c:1257
 #: ../plugins/mail-remote/e-corba-utils.c:135
@@ -10112,9 +9792,8 @@ msgid "Unknown reason"
 msgstr "Arrazoi ezezaguna"
 
 #: ../composer/e-msg-composer.c:1294
-#, fuzzy
 msgid "Could not open file"
-msgstr "Ezin da mezua ireki"
+msgstr "Ezin izan da fitxategia ireki"
 
 #: ../composer/e-msg-composer.c:1302
 msgid "Unable to retrieve message from editor"
@@ -10126,7 +9805,6 @@ msgstr "Mezu izengabea"
 
 #. NB: This function is never used anymore
 #: ../composer/e-msg-composer.c:1606
-#, fuzzy
 msgid "Open File"
 msgstr "Ireki fitxategia"
 
@@ -10136,9 +9814,8 @@ msgid "Autogenerated"
 msgstr "Automatikoki sortua"
 
 #: ../composer/e-msg-composer.c:2105
-#, fuzzy
 msgid "Si_gnature:"
-msgstr "Sinadura:"
+msgstr "Si_nadura:"
 
 #: ../composer/e-msg-composer.c:2347 ../composer/e-msg-composer.c:3527
 #: ../composer/e-msg-composer.c:3528
@@ -10146,11 +9823,10 @@ msgid "Compose a message"
 msgstr "Prestatu mezua"
 
 #: ../composer/e-msg-composer.c:3643
-#, fuzzy
 msgid "_Attachment Bar"
-msgstr "Eranskina"
+msgstr "_Eranskin-barra"
 
-#: ../composer/e-msg-composer.c:4718
+#: ../composer/e-msg-composer.c:4720
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10161,26 +9837,30 @@ msgid ""
 " There are few attachments getting downloaded. Sending the mail will cause "
 "the mail to be sent without those pending attachments "
 msgstr ""
+"Eranskin gutxi batzu deskargatzen ari dira. Posta bidaltzean deskargatu "
+"gabeko eranskinik gabe bidaltzea eragin dezake."
 
 #: ../composer/mail-composer.error.xml.h:2
 msgid "All accounts have been removed."
-msgstr ""
+msgstr "Kontu guztiak kendu dira."
 
 #: ../composer/mail-composer.error.xml.h:3
-#, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
-msgstr "Ziur zaude izenik gabeko hitzordu hau ezabatu nahi duzula?"
+msgstr ""
+"Ziur zaude idazten ari zaren '{0}' izenburuko mezua bertan behera utzi nahi "
+"duzula?"
 
 #: ../composer/mail-composer.error.xml.h:4
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr ""
+"&quot;{0}&quot; dela eta beste posta-aukera batzuk hautatu beharko dituzu"
 
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
 #: ../mail/mail.error.xml.h:17
 msgid "Because &quot;{1}&quot;."
-msgstr ""
+msgstr "Arrazoia: {1}."
 
 #: ../composer/mail-composer.error.xml.h:6
 msgid ""
@@ -10188,109 +9868,102 @@ msgid ""
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
+"Mezuak prestatzeko leihoa ixten baduzu mezua betiko galduko da, mezua "
+"Zirriborro karpetan gordetzen ez baduzu bederen. Zirriborro karpetan "
+"gordetako mezuak geroago osatzen joan zaitezke."
 
 #: ../composer/mail-composer.error.xml.h:7
-#, fuzzy
 msgid "Could not create composer window."
-msgstr "Ezin izan da kanalizaziorik sortu: %s"
+msgstr "Ezin izan da mezuak prestatzeko leihoa sortu."
 
 #: ../composer/mail-composer.error.xml.h:8
-#, fuzzy
 msgid "Could not create message."
-msgstr "Ezin izan da kanalizaziorik sortu: %s"
+msgstr "Ezin izan da mezua sortu."
 
 #: ../composer/mail-composer.error.xml.h:9
-#, fuzzy
 msgid "Could not read signature file &quot;{0}&quot;."
-msgstr "Ezin izan da sinadura-fitxategia gorde: %s"
+msgstr "Ezin izan da  &quot;{0}&quot; sinadura-fitxategia ireki."
 
 #: ../composer/mail-composer.error.xml.h:10
-#, fuzzy
 msgid "Could not retrieve messages to attach from {0}."
-msgstr "Ezin izan da kanalizaziorik sortu: %s"
+msgstr "Ezin izan da mezurik jaso {0}(e)tik  eransteko."
 
 #: ../composer/mail-composer.error.xml.h:11
-#, fuzzy
 msgid "Could not save to autosave file &quot;{0}&quot;."
-msgstr "Ezin izan da sinadura-fitxategia gorde: %s"
+msgstr "Ezin izan da gordetze automatikoko &quot;{0}&quot; fitxategia gorde"
 
 #: ../composer/mail-composer.error.xml.h:12
 msgid "Directories can not be attached to Messages."
-msgstr ""
+msgstr "Direktorioak ezin dira mezuei erantsi."
 
 #: ../composer/mail-composer.error.xml.h:13
-#, fuzzy
 msgid "Do you want to recover unfinished messages?"
-msgstr "Aldaketak gorde nahi dituzu?"
+msgstr "Amaitu gabeko mezuak berreskuratu nahi dituzu?"
 
 #: ../composer/mail-composer.error.xml.h:14
-#, fuzzy
 msgid "Don't Recover"
-msgstr "Ez inportatu"
+msgstr "Ez berreskuratu"
 
 #: ../composer/mail-composer.error.xml.h:15
 msgid "Download in progress. Do you want to send the mail?"
-msgstr ""
+msgstr "Dekargatzen ari da. Mezua bidaltzea nahi duzu?"
 
 #: ../composer/mail-composer.error.xml.h:16
-#, fuzzy
 msgid "Error saving to autosave because &quot;{1}&quot;."
-msgstr "Errorea lasterbideak gordetzean."
+msgstr "Errorea automatikoki gordetzean: &quot;{1}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
+"Ustekabean irten zara Evolution-etik, mezu berri bat idazten ari zinela. "
+"Mezua berreskuratzen baduzu, utzitako lekutik jarraitu ahal izango duzu."
 
 #: ../composer/mail-composer.error.xml.h:18
-#, fuzzy
 msgid "Recover"
-msgstr "Kendu"
+msgstr "Berreskuratu"
 
 #: ../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}' fitxategia ez da fitxategi arrunta eta ezin da mezu batean bidali."
 
 #: ../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 ""
+"Direktorio honen edukia eransteko, erantsi direktorioko fitxategiak banaka, "
+"edo sortu direktorioaren artxibo bat, eta erantsi."
 
 #: ../composer/mail-composer.error.xml.h:21
-#, fuzzy
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
 "Please make sure that you have the correct version of gtkhtml and libgtkhtml "
 "installed."
 msgstr ""
-"Ezin izan da mezua prestatzeko leihoa sortu:\n"
 "Ezin da HTML editorearen osagaia aktibatu.\n"
+"\n"
 "Egiazta ezazu gtkhtml eta libgtkhtml-ren\n"
-"bertsio zuzena duzula instalatuta.\n"
+"bertsio zuzena duzula instalatuta."
 
 #: ../composer/mail-composer.error.xml.h:24
-#, fuzzy
 msgid "Unable to activate the address selector control."
-msgstr ""
-"Ezin izan da mezua prestatzeko leihoa sortu:\n"
-"Ezin da helbidea hautatzeko kontrola aktibatu."
+msgstr "Ezin da helbidea hautatzeko kontrola aktibatu."
 
 #: ../composer/mail-composer.error.xml.h:25
-#, fuzzy
 msgid "Unfinished messages found"
-msgstr "Hurrengo _irakurri gabeko mezua"
+msgstr "Amaitu gabeko mezuak aurkitu dira"
 
 #: ../composer/mail-composer.error.xml.h:26
 msgid "Warning: Modified Message"
 msgstr "Kontuz: mezua aldatu egin da"
 
 #: ../composer/mail-composer.error.xml.h:27
-#, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
-msgstr "Erantsi fitxategi bat mezuari"
+msgstr "Ezin duzu erantsi '{0}' fitxategia mezuari"
 
 #: ../composer/mail-composer.error.xml.h:28
 msgid "You need to configure an account before you can compose mail."
@@ -10301,9 +9974,8 @@ msgid "_Discard Changes"
 msgstr "_Ez gorde"
 
 #: ../composer/mail-composer.error.xml.h:30
-#, fuzzy
 msgid "_Save Message"
-msgstr "Gorde mezua honela..."
+msgstr "_Gorde mezua"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
@@ -10312,7 +9984,6 @@ msgid "Evolution"
 msgstr "Evolution"
 
 #: ../data/evolution.desktop.in.in.h:2
-#, fuzzy
 msgid "The Evolution Groupware Suite"
 msgstr "Evolution-en talde-lanerako suitea"
 
@@ -10397,9 +10068,8 @@ msgstr ""
 "behar duen.</small>"
 
 #: ../designs/read_receipts/read.glade.h:6
-#, fuzzy
 msgid "Always send back a read receipt"
-msgstr "Beti bidali irakurragiria"
+msgstr "Beti itzuli irakurragiria"
 
 #: ../designs/read_receipts/read.glade.h:7
 msgid "Ask me if I want to send back a read receipt"
@@ -10446,56 +10116,44 @@ msgid "Evolution Error"
 msgstr "Evolution errorea"
 
 #: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
-#, fuzzy
 msgid "Evolution Warning"
-msgstr "Evolution-en posta"
+msgstr "Evolution-en abisua"
 
 #: ../e-util/e-error.c:124
-#, fuzzy
 msgid "Evolution Information"
-msgstr "Bileraren informazioa"
+msgstr "Evolution-en informazioa"
 
 #: ../e-util/e-error.c:126
-#, fuzzy
 msgid "Evolution Query"
-msgstr "Evolution"
+msgstr "Evolution-en kontsulta"
 
 #. setup a dummy error
 #: ../e-util/e-error.c:438
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
-msgstr "Bidalitako mezuak eta zirriborroak"
+msgstr ""
+"<span weight=\"bold\">Barne-errorea, '%s' errore ezezaguna eskatu da</span>"
 
 #: ../e-util/e-system.error.xml.h:2
-#, fuzzy
 msgid "Cannot open file &quot;{0}&quot;."
-msgstr ""
-"Ezin da gorde `%s'(e)n\n"
-" %s"
+msgstr "Ezin da  &quot;{0}&quot; fitxategia ireki."
 
 #: ../e-util/e-system.error.xml.h:3
-#, fuzzy
 msgid "Cannot save file &quot;{0}&quot;."
-msgstr ""
-"Ezin da gorde `%s'(e)n\n"
-" %s"
+msgstr "Ezin da &quot;{0}&quot; fitxategia gorde."
 
 #: ../e-util/e-system.error.xml.h:4
-#, fuzzy
 msgid "Do you wish to overwrite it?"
-msgstr ""
-"%s badago lehendik\n"
-"Gainidatzi nahi duzu?"
+msgstr "Gainidatzi nahi duzu?"
 
 #: ../e-util/e-system.error.xml.h:5
 msgid "File exists &quot;{0}&quot;."
-msgstr ""
+msgstr "&quot;{0}&quot; fitxategia badago lehendik."
 
 #: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:122
-#, fuzzy
 msgid "_Overwrite"
-msgstr "Gainidatzi"
+msgstr "_Gainidatzi"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
@@ -10596,58 +10254,57 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: ../e-util/eggtrayicon.c:119
-#, fuzzy
 msgid "The orientation of the tray."
-msgstr "Eranskinaren azalpena."
+msgstr "Erretiluaren orientazioa."
 
 #: ../filter/filter-datespec.c:78
-#, fuzzy, c-format
+#, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "orain dela segundo bat"
-msgstr[1] "orain dela segundo bat"
+msgstr[1] "orain dela %d segundo"
 
 #: ../filter/filter-datespec.c:79
-#, fuzzy, c-format
+#, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "orain dela minutu bat"
-msgstr[1] "orain dela minutu bat"
+msgstr[1] "orain dela %d minutu"
 
 #: ../filter/filter-datespec.c:80
-#, fuzzy, c-format
+#, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "orain dela ordubete"
-msgstr[1] "orain dela ordubete"
+msgstr[1] "orain dela %d ordu"
 
 #: ../filter/filter-datespec.c:81
-#, fuzzy, c-format
+#, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "orain dela egun bat"
-msgstr[1] "orain dela egun bat"
+msgstr[1] "orain dela %d egun"
 
 #: ../filter/filter-datespec.c:82
-#, fuzzy, c-format
+#, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "orain dela astebete"
-msgstr[1] "orain dela astebete"
+msgstr[1] "orain dela %d aste"
 
 #: ../filter/filter-datespec.c:83
-#, fuzzy, c-format
+#, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "orain dela hilabete"
-msgstr[1] "orain dela hilabete"
+msgstr[1] "orain dela %d hilabete"
 
 #: ../filter/filter-datespec.c:84
-#, fuzzy, c-format
+#, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "orain dela urtebete"
-msgstr[1] "orain dela urtebete"
+msgstr[1] "orain dela %d urte"
 
 #: ../filter/filter-datespec.c:285
 msgid "<click here to select a date>"
@@ -10693,13 +10350,12 @@ msgid "Test"
 msgstr "Proba"
 
 #: ../filter/filter-rule.c:791
-#, fuzzy
 msgid "_Rule name:"
-msgstr "Arauaren izena: "
+msgstr "_Arauaren izena:"
 
 #: ../filter/filter-rule.c:819
 msgid "If"
-msgstr "Baldintzak"
+msgstr "Baldin eta"
 
 #: ../filter/filter-rule.c:858
 msgid "if all criteria are met"
@@ -10714,24 +10370,20 @@ msgid "Execute actions"
 msgstr "Exekutatu ekintzak"
 
 #: ../filter/filter-rule.c:881
-#, fuzzy
 msgid "All related"
-msgstr "Delegatua"
+msgstr "Erlazionatutako guztiak"
 
 #: ../filter/filter-rule.c:881
-#, fuzzy
 msgid "Replies"
-msgstr "Hartzailea"
+msgstr "Erantzunak"
 
 #: ../filter/filter-rule.c:881
-#, fuzzy
 msgid "Replies and parents"
-msgstr "Erantzunda"
+msgstr "Erantzunak eta gurasoak"
 
 #: ../filter/filter-rule.c:883
-#, fuzzy
 msgid "Include threads"
-msgstr "Sartu:"
+msgstr "Hariak barne"
 
 #: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:291
@@ -10743,43 +10395,36 @@ msgid "Outgoing"
 msgstr "Irteerakoa"
 
 #: ../filter/filter.error.xml.h:1
-#, fuzzy
 msgid "Bad regular expression &quot;{0}&quot;."
-msgstr ""
-"Errorea '%s' adierazpen erregularrean:\n"
-"%s"
+msgstr "Okerreko adierazpen erregularra: &quot;{0}&quot;."
 
 #: ../filter/filter.error.xml.h:2
 msgid "Could not compile regular expression &quot;{1}&quot;."
-msgstr ""
+msgstr "Ezin da &quot;{1}&quot; adierazpen erregularra osatu."
 
 #: ../filter/filter.error.xml.h:3
-#, fuzzy
 msgid "File &quot;{0}&quot; does not exist or is not a regular file."
-msgstr "`%s' fitxategia ez dago edo ez da fitxategi erregularra."
+msgstr "&quot;{0}&quot; fitxategia ez dago, edo ez da fitxategi erregularra."
 
 #: ../filter/filter.error.xml.h:4
-#, fuzzy
 msgid "Missing date."
-msgstr "Bilera-eguneratzea"
+msgstr "Data falta da."
 
 #: ../filter/filter.error.xml.h:5
-#, fuzzy
 msgid "Missing file name."
-msgstr "_Izen bereizia (DN):"
+msgstr "Fitxategi-izena falta da."
 
 #: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:65
-#, fuzzy
 msgid "Missing name."
-msgstr "Esleipena"
+msgstr "Izena falta da."
 
 #: ../filter/filter.error.xml.h:7
 msgid "Name &quot;{0}&quot; already used."
-msgstr ""
+msgstr "&quot;{0}&quot; izena beste batek darabil."
 
 #: ../filter/filter.error.xml.h:8
 msgid "Please choose another name."
-msgstr ""
+msgstr "Aukeratu beste izen bat."
 
 #: ../filter/filter.error.xml.h:9
 msgid "You must choose a date."
@@ -10794,18 +10439,16 @@ msgid "You must specify a file name."
 msgstr "Fitxategi-izen bat zehaztu behar duzu."
 
 #: ../filter/filter.glade.h:1
-#, fuzzy
 msgid "<b>_Filter Rules</b>"
-msgstr "Iragazteko arauak"
+msgstr "<b>_Iragazteko arauak</b>"
 
 #: ../filter/filter.glade.h:2
 msgid "Compare against"
 msgstr "Konparazio-ordua:"
 
 #: ../filter/filter.glade.h:4
-#, fuzzy
 msgid "Show filters for mail:"
-msgstr "Kazkabar txikiko zaparradak"
+msgstr "Erakutsi postaren iragazkiak:"
 
 #: ../filter/filter.glade.h:5
 msgid ""
@@ -10934,14 +10577,13 @@ msgid "Mail Preferences"
 msgstr "Posta-hobespenak"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#, fuzzy
 msgid "_Mail"
-msgstr "_Posta:"
+msgstr "_Posta"
 
 #: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
-msgstr ""
+msgstr "%s Lizentzia-kontratua"
 
 #: ../mail/em-account-editor.c:394
 #, c-format
@@ -10951,16 +10593,19 @@ msgid ""
 "for %s displayed below\n"
 "and tick the check box for accepting it\n"
 msgstr ""
+"\n"
+"Arreta handiz irakurri beheko %s \n"
+"lizentzia-kontratua,\n"
+"eta, onartzeko, hautatu kontrol-laukia.\n"
 
 #: ../mail/em-account-editor.c:464 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:494
+#: ../mail/em-vfolder-rule.c:495
 msgid "Select Folder"
 msgstr "Hautatu karpeta"
 
 #: ../mail/em-account-editor.c:760
-#, fuzzy
 msgid "Ask for each message"
-msgstr "Ez dago horrelako mezurik"
+msgstr "Galdetu mezu bakoitzean"
 
 #: ../mail/em-account-editor.c:1724 ../mail/mail-config.glade.h:90
 msgid "Identity"
@@ -10971,42 +10616,37 @@ msgid "Receiving Email"
 msgstr "Mezuak jaso"
 
 #: ../mail/em-account-editor.c:1943
-#, fuzzy
 msgid "Automatically check for _new mail every"
-msgstr "_Automatikoki begiratu mezu berririk dagoen"
+msgstr "Automatikoki begiratu _mezu berririk dagoen"
 
 #: ../mail/em-account-editor.c:2111 ../mail/mail-config.glade.h:128
 msgid "Sending Email"
 msgstr "Mezuak bidali"
 
-#: ../mail/em-account-editor.c:2162 ../mail/mail-config.glade.h:68
-#, fuzzy
+#: ../mail/em-account-editor.c:2165 ../mail/mail-config.glade.h:68
 msgid "Defaults"
-msgstr "_Lehenespenak"
+msgstr "Lehenespenak"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:122
-#: ../plugins/exchange-operations/exchange-account-setup.c:311
-#, fuzzy
+#: ../mail/em-account-editor.c:2226 ../mail/mail-config.glade.h:122
+#: ../plugins/exchange-operations/exchange-account-setup.c:313
 msgid "Security"
-msgstr "Se_gurtasuna"
+msgstr "Segurtasuna"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2260 ../mail/em-account-editor.c:2334
-#, fuzzy
+#: ../mail/em-account-editor.c:2263 ../mail/em-account-editor.c:2337
 msgid "Receiving Options"
-msgstr "_Jasotzeko aukerak"
+msgstr "Jasotzeko aukerak"
 
-#: ../mail/em-account-editor.c:2261 ../mail/em-account-editor.c:2335
-#, fuzzy
+#: ../mail/em-account-editor.c:2264 ../mail/em-account-editor.c:2338
 msgid "Checking for New Mail"
 msgstr "Begiratu mezu berririk dagoen"
 
-#: ../mail/em-account-editor.c:2659 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2661 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Kontu-editorea"
 
-#: ../mail/em-account-editor.c:2659 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2661 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolution-eko kontuaren morroia"
 
@@ -11024,9 +10664,8 @@ msgid "Protocol"
 msgstr "Protokoloa"
 
 #: ../mail/em-account-prefs.c:517
-#, fuzzy
 msgid "Mail Accounts Table"
-msgstr "Posta-kontuak"
+msgstr "Posta-kontuen taula"
 
 #: ../mail/em-composer-prefs.c:307 ../mail/em-composer-prefs.c:430
 #: ../mail/mail-config.c:958
@@ -11038,18 +10677,16 @@ msgid "Language(s)"
 msgstr "Hizkuntza(k)"
 
 #: ../mail/em-composer-prefs.c:940
-#, fuzzy
 msgid "Add signature script"
-msgstr "_Gehitu sinadura"
+msgstr "Gehitu sinaduraren script-a"
 
 #: ../mail/em-composer-prefs.c:960
 msgid "Signature(s)"
 msgstr "Sinadura(k)"
 
 #: ../mail/em-composer-utils.c:853 ../mail/em-format-quote.c:389
-#, fuzzy
 msgid "-------- Forwarded Message --------"
-msgstr "Birbidalitako mezua"
+msgstr "-------- Birbidalitako mezua --------"
 
 #: ../mail/em-composer-utils.c:1648
 msgid "an unknown sender"
@@ -11063,11 +10700,13 @@ msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 msgstr ""
+"Jatorrizko mezua:\n"
+"data: ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} ${24Hour}:${Minute} "
+"${TimeZone}, egilea: ${Sender}"
 
 #: ../mail/em-filter-editor.c:147
-#, fuzzy
 msgid "_Filter Rules"
-msgstr "Iragazteko arauak"
+msgstr "_Iragazteko arauak"
 
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:2
@@ -11195,15 +10834,13 @@ msgid "is not Flagged"
 msgstr "ez da Banderaduna"
 
 #: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
-#: ../ui/evolution-mail-message.xml.h:48
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:47
 msgid "Junk"
-msgstr "ekaina"
+msgstr "Baztergarriak"
 
 #: ../mail/em-filter-i18n.h:36
-#, fuzzy
 msgid "Junk Test"
-msgstr "ekaina"
+msgstr "Mezu baztergarrien proba"
 
 #: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1063
 #: ../widgets/misc/e-expander.c:189
@@ -11215,9 +10852,8 @@ msgid "Mailing list"
 msgstr "Posta-zerrenda"
 
 #: ../mail/em-filter-i18n.h:39
-#, fuzzy
 msgid "Match All"
-msgstr "Mitchell"
+msgstr "Gutziekin bat etorri"
 
 #: ../mail/em-filter-i18n.h:40
 msgid "Message Body"
@@ -11228,23 +10864,20 @@ msgid "Message Header"
 msgstr "Mezuaren goiburua"
 
 #: ../mail/em-filter-i18n.h:42
-#, fuzzy
 msgid "Message is Junk"
-msgstr "Mezuak"
+msgstr "Mezua baztergarria da"
 
 #: ../mail/em-filter-i18n.h:43
-#, fuzzy
 msgid "Message is not Junk"
-msgstr "Bidali beharreko mezua"
+msgstr "Mezua ez da baztergarria"
 
 #: ../mail/em-filter-i18n.h:44
 msgid "Move to Folder"
 msgstr "Eraman karpeta honetara"
 
 #: ../mail/em-filter-i18n.h:45
-#, fuzzy
 msgid "Pipe to Program"
-msgstr "Programatik irten"
+msgstr "Kanalizatu programara"
 
 #: ../mail/em-filter-i18n.h:46
 msgid "Play Sound"
@@ -11279,9 +10912,8 @@ msgid "returns less than"
 msgstr "hau baino txikiagoa ematen du"
 
 #: ../mail/em-filter-i18n.h:54
-#, fuzzy
 msgid "Run Program"
-msgstr "Ireki programa:"
+msgstr "Exekutatu programa"
 
 #: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
 msgid "Score"
@@ -11334,44 +10966,38 @@ msgstr "Egoera ezarri gabe"
 
 #. and now for the action area
 #: ../mail/em-filter-rule.c:488
-#, fuzzy
 msgid "<b>Then</b>"
-msgstr "<b>Falta:</b> "
+msgstr "<b>Orduan</b>"
 
 #: ../mail/em-folder-browser.c:134
-#, fuzzy
 msgid "C_reate Search Folder From Search..."
-msgstr "Sortu _karpeta birtuala bilaketatik..."
+msgstr "Sortu bilaketa-karpeta bilaketatik..."
 
 #. TODO: can this be done in a loop?
 #: ../mail/em-folder-properties.c:144
-#, fuzzy
 msgid "Total message:"
 msgid_plural "Total messages:"
-msgstr[0] "Laguntza-mezua"
-msgstr[1] "Laguntza-mezua"
+msgstr[0] "Guztira mezua:"
+msgstr[1] "Guztira mezuak:"
 
 #: ../mail/em-folder-properties.c:156
-#, fuzzy
 msgid "Unread message:"
 msgid_plural "Unread messages:"
-msgstr[0] "Hurrengo _irakurri gabeko mezua"
-msgstr[1] "Hurrengo _irakurri gabeko mezua"
+msgstr[0] "Irakurri gabeko mezua:"
+msgstr[1] "irakurri gabeko mezuak:"
 
 #: ../mail/em-folder-properties.c:278
 #: ../plugins/groupwise-features/properties.glade.h:3
-#, fuzzy
 msgid "Folder Properties"
-msgstr "Letra-tipoen propietateak"
+msgstr "Karpetaren propietateak"
 
 #: ../mail/em-folder-selection-button.c:123
 msgid "<click here to select a folder>"
 msgstr "<egin klik hemen karpeta hautatzeko>"
 
 #: ../mail/em-folder-selector.c:261
-#, fuzzy
 msgid "Create"
-msgstr "Crestview"
+msgstr "Sortu"
 
 #: ../mail/em-folder-selector.c:265
 msgid "Folder _name:"
@@ -11379,17 +11005,15 @@ msgstr "_Karpetaren izena:"
 
 #: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
 #: ../mail/mail-vfolder.c:937 ../mail/mail-vfolder.c:1007
-#, fuzzy
 msgid "Search Folders"
-msgstr "Hautatu karpeta"
+msgstr "Bilatu karpeta"
 
 #. UNMATCHED is always last
 #: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
 msgid "UNMATCHED"
-msgstr ""
+msgstr "SAILKATU GABEAK"
 
 #: ../mail/em-folder-tree-model.c:469 ../mail/mail-component.c:144
-#, fuzzy
 msgid "Drafts"
 msgstr "Zirriborroa"
 
@@ -11406,86 +11030,83 @@ msgstr "Irteerako ontzia"
 msgid "Sent"
 msgstr "Bidalitakoak"
 
-#: ../mail/em-folder-tree-model.c:498 ../mail/em-folder-tree-model.c:802
+#: ../mail/em-folder-tree-model.c:499 ../mail/em-folder-tree-model.c:803
 msgid "Loading..."
 msgstr "Kargatzen..."
 
-#: ../mail/em-folder-tree.c:689
-#, fuzzy
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
-msgstr "Posta-iragazkiak"
+msgstr "Posta-karpetaren zuhaitza"
 
-#: ../mail/em-folder-tree.c:849
-#, fuzzy, c-format
+#: ../mail/em-folder-tree.c:854
+#, c-format
 msgid "Moving folder %s"
-msgstr "%s karpeta kentzen"
+msgstr "%s karpeta lekuz aldatzen"
 
-#: ../mail/em-folder-tree.c:851
-#, fuzzy, c-format
+#: ../mail/em-folder-tree.c:856
+#, c-format
 msgid "Copying folder %s"
-msgstr "%s karpeta irekitzen"
+msgstr "%s karpeta kopiatzen"
 
-#: ../mail/em-folder-tree.c:858 ../mail/message-list.c:1613
-#, fuzzy, c-format
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1613
+#, c-format
 msgid "Moving messages into folder %s"
-msgstr "Mezuak %s(e)ra eramaten"
+msgstr "Mezuak %s karpetara eramaten"
 
-#: ../mail/em-folder-tree.c:860 ../mail/message-list.c:1615
-#, fuzzy, c-format
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1615
+#, c-format
 msgid "Copying messages into folder %s"
-msgstr "Mezuak %s(e)n kopiatzen"
+msgstr "Mezuak %s karpetan kopiatzen"
 
-#: ../mail/em-folder-tree.c:876
-#, fuzzy
+#: ../mail/em-folder-tree.c:881
 msgid "Cannot drop message(s) into toplevel store"
-msgstr "Ezin dira mezuak Karpeta Birtual batera kopiatu edo eraman"
+msgstr "Ezin da mezurik ekarri maila goreneko biltegira"
 
-#: ../mail/em-folder-tree.c:972 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:103
 msgid "_Copy to Folder"
 msgstr "_Kopiatu karpetan"
 
-#: ../mail/em-folder-tree.c:973 ../ui/evolution-mail-message.xml.h:114
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:113
 msgid "_Move to Folder"
 msgstr "_Eraman karpetara"
 
-#: ../mail/em-folder-tree.c:1678 ../mail/mail-ops.c:1057
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\": karpetak eskaneatzen"
 
-#: ../mail/em-folder-tree.c:2031 ../ui/evolution-addressbook.xml.h:44
-#: ../ui/evolution-mail-global.xml.h:24
+#: ../mail/em-folder-tree.c:2036 ../ui/evolution-addressbook.xml.h:44
+#: ../ui/evolution-mail-global.xml.h:22
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:45
 msgid "_View"
 msgstr "_Ikusi"
 
-#: ../mail/em-folder-tree.c:2032
-#, fuzzy
+#: ../mail/em-folder-tree.c:2037
 msgid "Open in _New Window"
-msgstr "Ireki leiho berrian"
+msgstr "Ireki leiho _berrian"
 
-#: ../mail/em-folder-tree.c:2036
+#: ../mail/em-folder-tree.c:2041
 msgid "_Copy..."
 msgstr "K_opiatu..."
 
-#: ../mail/em-folder-tree.c:2037
+#: ../mail/em-folder-tree.c:2042
 msgid "_Move..."
 msgstr "_Lekuz aldatu..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2041
+#: ../mail/em-folder-tree.c:2046
 msgid "_New Folder..."
 msgstr "Kar_peta berria..."
 
-#: ../mail/em-folder-tree.c:2044 ../ui/evolution-mail-list.xml.h:30
+#: ../mail/em-folder-tree.c:2049 ../ui/evolution-mail-list.xml.h:30
 msgid "_Rename..."
 msgstr "Izena _aldatu..."
 
 #: ../mail/em-folder-utils.c:104
-#, fuzzy, c-format
+#, c-format
 msgid "Copying `%s' to `%s'"
-msgstr "Mezuak %s(e)n kopiatzen"
+msgstr "'%s' hemen kopiatzen:  %s"
 
 #: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:931
 #: ../mail/em-folder-view.c:946 ../mail/importers/evolution-mbox-importer.c:85
@@ -11494,9 +11115,8 @@ msgid "Select folder"
 msgstr "Hautatu karpeta"
 
 #: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:946
-#, fuzzy
 msgid "C_opy"
-msgstr "Kopiatu"
+msgstr "K_opiatu"
 
 #: ../mail/em-folder-utils.c:503
 #, c-format
@@ -11508,26 +11128,24 @@ msgid "Rename Folder"
 msgstr "Karpetaren izena aldatu"
 
 #: ../mail/em-folder-utils.c:511
-#, fuzzy
 msgid "Folder names cannot contain '/'"
-msgstr "Karpeta-izenak ezin du \"/\" karaktererik eduki."
+msgstr "Karpeta-izenak ezin du '/' karaktererik eduki."
 
 #: ../mail/em-folder-utils.c:581
 #: ../plugins/groupwise-features/share-folder-common.c:141
-#, fuzzy, c-format
+#, c-format
 msgid "Creating folder `%s'"
-msgstr "%s karpeta biltegiratzen"
+msgstr "`%s' karpeta sortzen"
 
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:387
-#, fuzzy
+#: ../plugins/groupwise-features/share-folder-common.c:384
 msgid "Create folder"
-msgstr "Sortu karpeta berria"
+msgstr "Sortu karpeta"
 
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../plugins/groupwise-features/share-folder-common.c:384
 msgid "Specify where to create the folder:"
 msgstr "Adierazi karpeta non sortu behar den:"
 
@@ -11535,16 +11153,16 @@ msgstr "Adierazi karpeta non sortu behar den:"
 msgid "Reply to _All"
 msgstr "Erantzun g_uztiei"
 
-#: ../mail/em-folder-view.c:1040 ../ui/evolution-mail-message.xml.h:122
+#: ../mail/em-folder-view.c:1040 ../ui/evolution-mail-message.xml.h:121
 msgid "_Reply to Sender"
 msgstr "Erantzun bidal_tzaileari"
 
 #: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:548 ../mail/em-popup.c:559
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Forward"
 msgstr "_Birbidali"
 
-#: ../mail/em-folder-view.c:1044 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1044 ../ui/evolution-mail-message.xml.h:105
 msgid "_Edit as New Message..."
 msgstr "_Editatu mezu berri gisa..."
 
@@ -11565,7 +11183,6 @@ msgid "Mar_k as Read"
 msgstr "Mar_katu irakurritako gisa"
 
 #: ../mail/em-folder-view.c:1056
-#, fuzzy
 msgid "Mark as _Unread"
 msgstr "Markatu i_rakurri gabeko gisa"
 
@@ -11578,19 +11195,16 @@ msgid "_Mark as Unimportant"
 msgstr "Mar_katu ez-garrantzitsu gisa"
 
 #: ../mail/em-folder-view.c:1059
-#, fuzzy
 msgid "Mark as _Junk"
-msgstr "Markatu i_rakurri gabeko gisa"
+msgstr "Markatu _baztergarri gisa"
 
 #: ../mail/em-folder-view.c:1060
-#, fuzzy
 msgid "Mark as _Not Junk"
-msgstr "Markatu garrantz_itsu gisa"
+msgstr "Markatu _ez baztergarri gisa"
 
 #: ../mail/em-folder-view.c:1061
-#, fuzzy
 msgid "Mark for Follo_w Up..."
-msgstr "_Jarraitu..."
+msgstr "Markatu jarraitasunerako..."
 
 #: ../mail/em-folder-view.c:1069
 msgid "Fla_g Completed"
@@ -11605,24 +11219,20 @@ msgid "Crea_te Rule From Message"
 msgstr "Sortu _araua mezutik"
 
 #: ../mail/em-folder-view.c:1074
-#, fuzzy
 msgid "Search Folder from _Subject"
-msgstr "_Gaiaren araberako karpeta birtuala"
+msgstr "Bilatu karpeta _gaiaren arabera"
 
 #: ../mail/em-folder-view.c:1075
-#, fuzzy
 msgid "Search Folder from Se_nder"
-msgstr "_Bidaltzailearen araberako karpeta birtuala"
+msgstr "Bilatu karpeta _bidaltzailearen arabera"
 
 #: ../mail/em-folder-view.c:1076
-#, fuzzy
 msgid "Search Folder from _Recipients"
-msgstr "_Hartzailearen araberako karpeta birtuala"
+msgstr "Bilatu _hartzailearen arabera"
 
 #: ../mail/em-folder-view.c:1077
-#, fuzzy
 msgid "Search Folder from Mailing _List"
-msgstr "Po_sta-zerrendaren araberako karpeta birtuala"
+msgstr "Bilatu po_sta-zerrendaren arabera"
 
 #: ../mail/em-folder-view.c:1081
 msgid "Filter on Sub_ject"
@@ -11652,101 +11262,95 @@ msgid "Print Message"
 msgstr "Inprimatu mezua"
 
 #: ../mail/em-folder-view.c:2220
-#, fuzzy
 msgid "Unable to retrieve message"
-msgstr "Ezin da mezua eskuratu: %s"
+msgstr "Ezin da mezua eskuratu"
 
 #: ../mail/em-folder-view.c:2413
-#, fuzzy
 msgid "_Copy Link Location"
-msgstr "Kopiatu estekaren helbidea"
+msgstr "_Kopiatu estekaren helbidea"
 
 #: ../mail/em-folder-view.c:2415
-#, fuzzy
 msgid "Create _Search Folder"
-msgstr "Sortu karpeta berria"
+msgstr "Sortu _bilaketa-karpeta"
 
 #: ../mail/em-folder-view.c:2416
-#, fuzzy
 msgid "_From this Address"
-msgstr "Etxeko helbidea"
+msgstr "_Helbidetik"
 
 #: ../mail/em-folder-view.c:2417
-#, fuzzy
 msgid "_To this Address"
-msgstr "Beste helbide bat"
+msgstr "_Helbidera"
 
 #: ../mail/em-folder-view.c:2698
-#, fuzzy, c-format
+#, c-format
 msgid "Click to mail %s"
-msgstr "Egin klik zeregina gehitzeko"
+msgstr "Egin klik %s bidaltzeko"
 
 #. message-search popup match count string
 #: ../mail/em-format-html-display.c:445
-#, fuzzy, c-format
+#, c-format
 msgid "Matches: %d"
-msgstr "Bat datozenak:"
+msgstr "Bat datozenak: %d"
 
 #: ../mail/em-format-html-display.c:696 ../mail/em-format-html.c:597
-#, fuzzy
 msgid "Unsigned"
-msgstr "Esleitua"
+msgstr "Sinatu gabe"
 
 #: ../mail/em-format-html-display.c:696
-#, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
-msgstr "Mezu honek sinadura digitala du eta egiazkoa da."
+msgstr ""
+"Mezu hau ez dago sinatuta. Ez dago inolako bermerik, mezu hau benetakoa dela "
+"bermatzen duenik."
 
 #: ../mail/em-format-html-display.c:697 ../mail/em-format-html.c:598
-#, fuzzy
 msgid "Valid signature"
-msgstr "Editatu sinadura"
+msgstr "Baliozko sinadura"
 
 #: ../mail/em-format-html-display.c:697
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr ""
+"Mezu hau sinatuta dago, eta baliozkoa da; hau da,oso litekeena da mezua "
+"benetakoa izatea."
 
 #: ../mail/em-format-html-display.c:698 ../mail/em-format-html.c:599
-#, fuzzy
 msgid "Invalid signature"
-msgstr "Gorde sinadura"
+msgstr "Sinadura baliogabea"
 
 #: ../mail/em-format-html-display.c:698
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
-msgstr ""
+msgstr "Mezu honen sinadura ezin da egiaztatu; beharbada bidean aldatuko zen."
 
 #: ../mail/em-format-html-display.c:699
 msgid "Valid signature, cannot verify sender"
-msgstr ""
+msgstr "Baliozko sinadura; bidaltzailea ezin da egiaztatu"
 
 #: ../mail/em-format-html-display.c:699
-#, fuzzy
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr ""
-"input_token -ek daukan sinadura bat ez da baliozkoa, edo ezin da egiaztatu."
+"Mezu honek baliozko sinadura du, baina mezuaren bidaltzailea ezin da "
+"egiaztatu."
 
 #: ../mail/em-format-html-display.c:705 ../mail/em-format-html.c:606
-#, fuzzy
 msgid "Unencrypted"
-msgstr "Etenda"
+msgstr "Enkriptatu gabe"
 
 #: ../mail/em-format-html-display.c:705
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
-msgstr ""
+msgstr "Mezu hau ez dago enkriptatuta. Edukia bidean ikus daiteke, Interneten."
 
 #: ../mail/em-format-html-display.c:706 ../mail/em-format-html.c:607
 msgid "Encrypted, weak"
-msgstr ""
+msgstr "Enkriptatuta, ahula"
 
 #: ../mail/em-format-html-display.c:706
 msgid ""
@@ -11754,21 +11358,25 @@ msgid ""
 "be difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
+"Mezu hau enkriptatuta dago, baina enkriptatze-algoritmo ahul batekin.  Zaila "
+"izan arren, litekeena da kanpoko norbaitek mezu honen edukia ikustea, "
+"horretarako denbora hartzen badu."
 
 #: ../mail/em-format-html-display.c:707 ../mail/em-format-html.c:608
-#, fuzzy
 msgid "Encrypted"
-msgstr "PGP enkriptatzea"
+msgstr "Enkriptatuta"
 
 #: ../mail/em-format-html-display.c:707
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
+"Mezu hau enkriptatuta dago. Oso zaila da kanpoko norbaitek mezuaren edukia "
+"ikustea."
 
 #: ../mail/em-format-html-display.c:708 ../mail/em-format-html.c:609
 msgid "Encrypted, strong"
-msgstr ""
+msgstr "Enkriptatuta, zorrotza"
 
 #: ../mail/em-format-html-display.c:708
 msgid ""
@@ -11776,21 +11384,21 @@ msgid ""
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
+"Mezu hau enkriptatuta dago, baina enkriptatze-algoritmo zorrotz batekin. Oso "
+"zaila izango da kanpoko norbaitek mezu honen edukia ikustea, arrazoizko "
+"denbora batean."
 
 #: ../mail/em-format-html-display.c:809 ../smime/gui/smime-ui.glade.h:48
-#, fuzzy
 msgid "_View Certificate"
-msgstr "_Ziurtagiri-IDa:"
+msgstr "_Ikusi ziurtagiria"
 
 #: ../mail/em-format-html-display.c:824
-#, fuzzy
 msgid "This certificate is not viewable"
-msgstr "Ziurtagiria oraindik ez da baliozkoa"
+msgstr "Ziurtagiri hau ez da ikusteko modukoa"
 
 #: ../mail/em-format-html-display.c:1106
-#, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr " - %Y %B %d, %l:%M %p"
+msgstr "Osatua: %Y %B %d, %l:%M %p"
 
 #: ../mail/em-format-html-display.c:1114
 msgid "Overdue:"
@@ -11801,61 +11409,52 @@ msgid "by %B %d, %Y, %l:%M %p"
 msgstr " - %Y %B %d, %l:%M %p"
 
 #: ../mail/em-format-html-display.c:1177
-#, fuzzy
 msgid "_View Inline"
-msgstr "Ikusi barnean"
+msgstr "_Ikusi barnean"
 
 #: ../mail/em-format-html-display.c:1178
-#, fuzzy
 msgid "_Hide"
-msgstr "Ezkutatu"
+msgstr "E_zkutatu"
 
 #: ../mail/em-format-html-display.c:1179
-#, fuzzy
 msgid "_Fit to Width"
-msgstr "Klip-aren zabalera"
+msgstr "_Doitu zabalera"
 
 #: ../mail/em-format-html-display.c:1180
-#, fuzzy
 msgid "Show _Original Size"
-msgstr "Jatorrizko ta_maina"
+msgstr "Erakutsi jatorrizko ta_maina"
 
 #: ../mail/em-format-html-display.c:1550
-#, fuzzy
 msgid "Attachment Button"
-msgstr "Eranskina"
+msgstr "Eranskin-botoia"
 
 #: ../mail/em-format-html-display.c:1757
-#, fuzzy
 msgid "Select folder to save all attachments..."
-msgstr "Gorde eranskina"
+msgstr "Hautatu karpeta eranskin guztiak gordetzeko..."
 
 #: ../mail/em-format-html-display.c:1796
 msgid "Select folder to save selected attachments..."
-msgstr ""
+msgstr "Hautatu karpeta hautatutako eranskina gordetzeko..."
 
 #: ../mail/em-format-html-display.c:1804
-#, fuzzy
 msgid "Save Selected..."
-msgstr "Ez da bat ere hautatu"
+msgstr "Gorde hautatutakoa..."
 
 #. Cant i put in the number of attachments here ?
 #: ../mail/em-format-html-display.c:1871
-#, fuzzy, c-format
+#, c-format
 msgid "%d attachment"
 msgid_plural "%d attachments"
-msgstr[0] "%s eranskina"
-msgstr[1] "%s eranskina"
+msgstr[0] "Eranskin %d"
+msgstr[1] "%d eranskin"
 
 #: ../mail/em-format-html-display.c:1935
-#, fuzzy
 msgid "No Attachment"
-msgstr "Eranskina"
+msgstr "Eranskinik ez"
 
 #: ../mail/em-format-html-display.c:1938
-#, fuzzy
 msgid "Save All"
-msgstr "Gorde honela"
+msgstr "Gorde denak"
 
 #: ../mail/em-format-html-print.c:130
 #, c-format
@@ -11863,13 +11462,13 @@ msgid "Page %d of %d"
 msgstr "%d/%d orria"
 
 #: ../mail/em-format-html.c:473 ../mail/em-format-html.c:475
-#, fuzzy, c-format
+#, c-format
 msgid "Retrieving `%s'"
-msgstr "%s mezua eskuratzen"
+msgstr "'%s' eskuratzen"
 
 #: ../mail/em-format-html.c:600
 msgid "Valid signature but cannot verify sender"
-msgstr ""
+msgstr "Baliozko sinadura du, baina ezin da bidaltzailea egiaztatu"
 
 #: ../mail/em-format-html.c:870
 msgid "Malformed external-body part."
@@ -11901,9 +11500,8 @@ msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kanpoko datu ezezagunetarako erakuslea (\"%s\" mota)"
 
 #: ../mail/em-format-html.c:1171
-#, fuzzy
 msgid "Formatting message"
-msgstr "Mezuak lekuz aldatzen"
+msgstr "Mezua formateatzea"
 
 #: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:83
@@ -11934,19 +11532,19 @@ msgstr "Bcc"
 
 #. pseudo-header
 #: ../mail/em-format-html.c:1576 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:987
+#: ../mail/em-mailer-prefs.c:992
 msgid "Mailer"
 msgstr "Bidalketa-funtzioa"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
 #: ../mail/em-format-html.c:1603
 msgid "<I> (%a, %R %Z)</I>"
-msgstr ""
+msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
 #: ../mail/em-format-html.c:1606
 msgid "<I> (%R %Z)</I>"
-msgstr ""
+msgstr "<I> (%R %Z)</I>"
 
 #: ../mail/em-format-html.c:1616 ../mail/em-format-quote.c:329
 #: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:89
@@ -11957,7 +11555,7 @@ msgstr "Data"
 #: ../mail/em-format-html.c:1639 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:90
 msgid "Newsgroups"
-msgstr ""
+msgstr "Berri-taldeak"
 
 #: ../mail/em-format.c:1102
 #, c-format
@@ -11965,9 +11563,8 @@ msgid "%s attachment"
 msgstr "%s eranskina"
 
 #: ../mail/em-format.c:1141 ../mail/em-format.c:1288 ../mail/em-format.c:1575
-#, fuzzy
 msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Ezin izan da MIME mezua analizatu. Iturburu gisa bistaratzen."
+msgstr "Ezin izan da S/MIME mezua analizatu: errore ezezaguna"
 
 #: ../mail/em-format.c:1270 ../mail/em-format.c:1426
 msgid "Could not parse MIME message. Displaying as source."
@@ -11975,42 +11572,35 @@ msgstr "Ezin izan da MIME mezua analizatu. Iturburu gisa bistaratzen."
 
 #: ../mail/em-format.c:1278
 msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
+msgstr "Enkriptatze-mota ez onartua multipart/enkriptatuarentzat"
 
 #: ../mail/em-format.c:1445
-#, fuzzy
 msgid "Unsupported signature format"
-msgstr "Onartzen ez den eskema"
+msgstr "Sinadura-formatu ez onartua"
 
 #: ../mail/em-format.c:1453 ../mail/em-format.c:1517
-#, fuzzy
 msgid "Error verifying signature"
-msgstr "Errorea zerrenda aldatzean"
+msgstr "Errorea sinadura egiaztatzean"
 
 #: ../mail/em-format.c:1453 ../mail/em-format.c:1517
-#, fuzzy
 msgid "Unknown error verifying signature"
-msgstr "Ezin da egiaztatu 'leaf' sinadura"
+msgstr "Errore ezezaguna sinadura egiaztatzean"
 
 #: ../mail/em-mailer-prefs.c:101
-#, fuzzy
 msgid "Every time"
-msgstr "Urtero"
+msgstr "Beti"
 
 #: ../mail/em-mailer-prefs.c:102
-#, fuzzy
 msgid "Once per day"
-msgstr "_Egun bat"
+msgstr "Egunean behin"
 
 #: ../mail/em-mailer-prefs.c:103
-#, fuzzy
 msgid "Once per week"
-msgstr "_Astebete"
+msgstr "Astean behin"
 
 #: ../mail/em-mailer-prefs.c:104
-#, fuzzy
 msgid "Once per month"
-msgstr "_Hilabete"
+msgstr "Hilean behin"
 
 #: ../mail/em-migrate.c:1198
 msgid ""
@@ -12019,99 +11609,92 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
+"Aldatu egin da Evolution-eko postontzi-karpeten hierarkia Evolution 1.x "
+"bertsioaz geroztik.\n"
+"\n"
+"Itxaron Evolution-ek karpetak migratzen dituen bitartean..."
 
 #: ../mail/em-migrate.c:1632
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create new folder `%s': %s"
-msgstr ""
-"Ezin izan da `%s' karpeta sortu:\n"
-"%s"
+msgstr "Ezin izan da `%s' karpeta berria sortu: %s"
 
 #: ../mail/em-migrate.c:1658
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr ""
-"Fitxategi-deskriptorea ezin da kopiatu: %s\n"
-"%s"
+msgstr "Ezin da kopiatu `%s' karpeta --> `%s': %s"
 
 #: ../mail/em-migrate.c:1843
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr ""
-"Ezin da sortu irteera-fitxategi hau: %s\n"
-" %s"
+msgstr "`%s' ezin da aztertu postontzirik dagoen ikusteko: %s"
 
 #: ../mail/em-migrate.c:2047
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "Huts egin du %s POP zerbitzarian autentifikatzean: %s"
+msgstr "Ezin dira ireki `%s' POP zerbitzarian gordetako datu zaharrak: %s"
 
 #: ../mail/em-migrate.c:2061
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "Huts egin du '%s'(e)rako kanalizazioa sortzean: %s"
+msgstr "Ezin da ireki `%s' POP3 zerbitzarian gordetzeko datuen direktorioa: %s"
 
 #: ../mail/em-migrate.c:2090
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr ""
+msgstr "Ezin dira kopiatu `%s' POP3 zerbitzarian gordetako datuak: %s"
 
 #: ../mail/em-migrate.c:2561 ../mail/em-migrate.c:2573
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to create local mail storage `%s': %s"
-msgstr "Huts egin du '%s'(e)rako kanalizazioa sortzean: %s"
+msgstr "Huts egin du `%s' posta-biltegi lokala sortzean: %s"
 
 #: ../mail/em-migrate.c:2693
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create local mail folders at `%s': %s"
-msgstr ""
-"Ezin da sortu irteera-fitxategi hau: %s\n"
-" %s"
+msgstr "Huts egin du posta lokalaren karpetak sortzean `%s'(e)n: %s"
 
 #: ../mail/em-migrate.c:2711
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
+"Ezin dira irakurri aurreko Evolution-en instalazioko ezarpenak; evolution/"
+"config.xmldb' ez dago, edo hondatuta dago bestela."
 
 #: ../mail/em-popup.c:399
-#, fuzzy
 msgid "Save As..."
-msgstr "Gorde hone_la..."
+msgstr "Gorde honela..."
 
 #: ../mail/em-popup.c:424
-#, fuzzy, c-format
+#, c-format
 msgid "untitled_image.%s"
-msgstr "Mezu izengabea"
+msgstr "irudi_izengabea.%s"
 
 #: ../mail/em-popup.c:542 ../mail/em-popup.c:553
 msgid "Set as _Background"
-msgstr ""
+msgstr "Ezarri _atzeko plano gisa"
 
 #: ../mail/em-popup.c:544 ../mail/em-popup.c:555
-#, fuzzy
 msgid "_Reply to sender"
 msgstr "Erantzun bidal_tzaileari"
 
 #: ../mail/em-popup.c:545 ../mail/em-popup.c:556
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Erantzun zerre_ndari"
 
 #: ../mail/em-popup.c:607
-#, fuzzy
 msgid "_Open Link in Browser"
-msgstr "Ireki esteka arakatzailean"
+msgstr "Ire_ki esteka arakatzailean"
 
 #: ../mail/em-popup.c:608
-#, fuzzy
 msgid "_Send New Message To..."
-msgstr "Bidali _mezua zerrendara..."
+msgstr "_Bidali mezu berria honi..."
 
 #: ../mail/em-popup.c:609
-#, fuzzy
 msgid "_Add to Addressbook"
-msgstr "Gehitu bidaltzailea helbide-liburuan"
+msgstr "_Gehitu helbide-liburuan"
 
 #: ../mail/em-popup.c:762
 #, c-format
@@ -12121,11 +11704,11 @@ msgstr "Ireki honekin: %s..."
 #: ../mail/em-subscribe-editor.c:614
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
+"Biltegi honek ez du onartzen harpidetzarik, edo, bestela, desgaituta daude."
 
 #: ../mail/em-subscribe-editor.c:643
-#, fuzzy
 msgid "Subscribed"
-msgstr "Harpidetu"
+msgstr "Harpidetuta"
 
 #: ../mail/em-subscribe-editor.c:647
 msgid "Folder"
@@ -12149,155 +11732,142 @@ msgid "Filters"
 msgstr "Iragazkiak"
 
 #: ../mail/em-utils.c:442 ../mail/em-utils.c:479
-#, fuzzy
 msgid "message"
-msgstr "Mezua"
+msgstr "mezua"
 
 #: ../mail/em-utils.c:614
-#, fuzzy
 msgid "Save Message..."
-msgstr "Gorde mezua honela..."
+msgstr "Gorde mezua..."
 
 #: ../mail/em-utils.c:663
-#, fuzzy
 msgid "Add address"
-msgstr "Helbidea"
+msgstr "Gehitu helbidea"
 
 #. Drop filename for messages from a mailbox
 #: ../mail/em-utils.c:1142
-#, fuzzy, c-format
+#, c-format
 msgid "Messages from %s"
 msgstr "Mezu-bidaltzailea: %s"
 
 #: ../mail/em-vfolder-editor.c:104
-#, fuzzy
 msgid "Search _Folders"
-msgstr "Hautatu karpeta"
+msgstr "Bilatu _karpetak"
 
-#: ../mail/em-vfolder-rule.c:574
-#, fuzzy
+#: ../mail/em-vfolder-rule.c:575
 msgid "Search Folder source"
-msgstr "Hautatu karpeta"
+msgstr "Bilatu karpetaren iturburua"
 
 #: ../mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
-msgstr ""
+msgstr "Esteka-ezagutze automatikoa"
 
 #: ../mail/evolution-mail.schemas.in.in.h:2
 msgid "Automatic smiley recognition"
-msgstr ""
+msgstr "Smiley-aurpegieren ezagutze automatikoa"
 
 #: ../mail/evolution-mail.schemas.in.in.h:3
 msgid "Check incoming mail being junk"
-msgstr ""
+msgstr "Begiratu sarrerako mezuak baztergarriak diren"
 
 #: ../mail/evolution-mail.schemas.in.in.h:4
 msgid "Citation highlight color"
-msgstr ""
+msgstr "Aipuak nabarmentzeko kolorea"
 
 #: ../mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight color."
-msgstr ""
+msgstr "Aipuak nabarmentzeko kolorea."
 
 #: ../mail/evolution-mail.schemas.in.in.h:6
 msgid "Composer Window default height"
-msgstr ""
+msgstr "Mezuak prestatzeko leihoaren altuera lehenetsia"
 
 #: ../mail/evolution-mail.schemas.in.in.h:7
 msgid "Composer Window default width"
-msgstr ""
+msgstr "Mezuak prestatzeko leihoaren zabalera lehenetsia"
 
 #: ../mail/evolution-mail.schemas.in.in.h:8
-#, fuzzy
 msgid "Default charset in which to compose messages"
-msgstr "Mezuaren gai lehenetsia."
+msgstr "Mezuak idazteko karaktere-joko lehenetsia"
 
 #: ../mail/evolution-mail.schemas.in.in.h:9
-#, fuzzy
 msgid "Default charset in which to compose messages."
-msgstr "Mezuaren gai lehenetsia."
+msgstr "Mezuak idazteko karaktere-joko lehenetsia."
 
 #: ../mail/evolution-mail.schemas.in.in.h:10
-#, fuzzy
 msgid "Default charset in which to display messages"
-msgstr "Bilatu testua bistaratutako mezuaren gorputzean"
+msgstr "Mezuak bistaratzeko karaktere-joko lehenetsia"
 
 #: ../mail/evolution-mail.schemas.in.in.h:11
-#, fuzzy
 msgid "Default charset in which to display messages."
-msgstr "Bilatu testua bistaratutako mezuaren gorputzean"
+msgstr "Mezuak bistaratzeko karaktere-joko lehenetsia"
 
 #: ../mail/evolution-mail.schemas.in.in.h:12
-#, fuzzy
 msgid "Default forward style"
-msgstr "_Birbidaltzeko estiloa:"
+msgstr "Birbidaltzeko estilo lehenetsia"
 
 #: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
-msgstr ""
+msgstr "Mezuak prestatzeko leihoaren altuera lehenetsia"
 
 #: ../mail/evolution-mail.schemas.in.in.h:14
-#, fuzzy
 msgid "Default height of the Message Window"
-msgstr "Mezuaren gai lehenetsia."
+msgstr "Mezuen leihoaren altuera lehenetsia"
 
 #: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
-msgstr ""
+msgstr "Harpidetzen elkarrizketa-koadroaren altuera lehenetsia"
 
 #: ../mail/evolution-mail.schemas.in.in.h:16
-#, fuzzy
 msgid "Default reply style"
-msgstr "_Erantzuteko estiloa:"
+msgstr "Erantzuteko estilo lehenetsia"
 
 #: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
-msgstr ""
+msgstr "Mezuak prestatzeko leihoaren zabalera lehenetsia"
 
 #: ../mail/evolution-mail.schemas.in.in.h:18
-#, fuzzy
 msgid "Default width of the Message Window"
-msgstr "Mezuaren gai lehenetsia."
+msgstr "Mezuen leihoaren zabalera lehenetsia"
 
 #: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
-msgstr ""
+msgstr "Harpidetzeko leihoaren zabalera lehenetsia"
 
 #: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
-msgstr ""
+msgstr "Marraztu errore ortografikoen adierazleak hitzetan  idatzi ahala."
 
 #: ../mail/evolution-mail.schemas.in.in.h:21
-#, fuzzy
 msgid "Empty Trash folders on exit"
-msgstr "H_ustu zakarrontziko karpetak irtetean"
+msgstr "Hustu zakarrontziko karpetak irtetean"
 
 #: ../mail/evolution-mail.schemas.in.in.h:22
-#, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
-msgstr "H_ustu zakarrontziko karpetak irtetean"
+msgstr "Hustu zakarrontziko karpeta guztiak Evolution-etik irtetean."
 
 #: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr ""
+msgstr "Gaitu kurtsore modua, mezuak irakurtzean kurtsorea ikusteko."
 
 #: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
-msgstr ""
+msgstr "Gaitu/desgatiu kurtsore modua"
 
 #: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
-msgstr ""
+msgstr "Mezu-zerrendaren panelaren altuera"
 
 #: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
-msgstr ""
+msgstr "Mezu-zerrendaren panelaren altuera."
 
 #: ../mail/evolution-mail.schemas.in.in.h:27
 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 ""
+"Erabiltzaileak 10 mezu edo gehiago irekitzen saiatzen bada aldi berean, "
+"galdetu erabiltzaileari benetan hori egitea nahi duen."
 
 #: ../mail/evolution-mail.schemas.in.in.h:28
 msgid ""
@@ -12305,52 +11875,59 @@ msgid ""
 "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 ""
+"Mime-mota jakin batentzako ikustaile inkorporaturik ez badago Evolution-en, "
+"GNOMEren mime-moten datu-baseko bonobo osagaien ikustaile batera mapatutako "
+"zerrendako edozein mime-mota erabil daiteke edukia bistaratzeko."
 
 #: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
-msgstr ""
+msgstr "Zakarrontzia hustu zen azken aldia"
 
 #: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
-msgstr ""
+msgstr "Etiketen zerrenda, eta bakoitzari asoziatutako koloreak"
 
 #: ../mail/evolution-mail.schemas.in.in.h:31
-#, fuzzy
 msgid "List of accepted licenses"
-msgstr "Posta-kontuak"
+msgstr "Onartutako lizentzien zerrenda"
 
 #: ../mail/evolution-mail.schemas.in.in.h:32
-#, fuzzy
 msgid "List of accounts"
-msgstr "Posta-kontuak"
+msgstr "Kontuen zerrenda"
 
 #: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
+"Evolution-en posta-osagaiak ezagutzen dituen kontuen zerrenda. Zerrendak /"
+"apps/evolution/mail/accounts-eko azpiderektorioen izenen kateak ditu."
 
 #: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
-msgstr ""
+msgstr "Goiburu pertsonalizatuen zerrenda, gaituta dauden edo ez zehaztuta."
 
 #: ../mail/evolution-mail.schemas.in.in.h:35
 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 ""
+"Evolution-en posta-osagaiak ezagutzen dituen etiketen zerrenda. Izena:"
+"kolorea duten kateak ditu, eta koloreak HTML kodeketa hamaseitarra "
+"erabiltzen du."
 
 #: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
+"Bonobo osagaien ikustaileentzat egiaztatu beharreko mime-moten zerrenda"
 
 #: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
-msgstr ""
+msgstr "Lizentzia onartu zaien protokolo-izenen zerrenda."
 
 #: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
-msgstr ""
+msgstr "Kargatu HTML mezuen irudiak http bidez"
 
 #: ../mail/evolution-mail.schemas.in.in.h:39
 msgid ""
@@ -12358,203 +11935,193 @@ msgid ""
 "load images off the net 1 - Load images in mail from contacts 2 - Always "
 "load images off the net"
 msgstr ""
+"Kargatu HTML mezuen irudiak http(s) bidez. Balio posibleak: 0 - Inoiz ez "
+"kargatu irudiak saretik kanpo 1 - Kargatu irudiak bidaltzailea helbide-"
+"liburuan badago 2 - Beti kargatu irudiak saretik"
 
 #: ../mail/evolution-mail.schemas.in.in.h:40
-#, fuzzy
 msgid "Log filter actions"
-msgstr "Exekutatu ekintzak"
+msgstr "Iragazki-ekintzen egunkaria"
 
 #: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
-msgstr ""
+msgstr "Erregistratu iragazki-ekintzak zehaztutako egunkari-fitxategian."
 
 #: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
-msgstr ""
+msgstr "Iragazki-ekintzak erregistratzeko egunkari-fitxategia"
 
 #: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
-msgstr ""
+msgstr "Iragazki-ekintzak erregistratzeko egunkari-fitxategia."
 
 #: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
-msgstr ""
+msgstr "Markatu Ikusitako gisa zehaztutako denbora-muga igarotzean"
 
 #: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
-msgstr ""
+msgstr "Markatu Ikusitako gisa zehaztutako denbora-muga igarotzean."
 
 #: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
-msgstr ""
+msgstr "Markatu aipuak mezuaren \"Aurrebistan\""
 
 #: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
-msgstr ""
+msgstr "Markatu aipuak mezuaren \"Aurrebistan\"."
 
 #: ../mail/evolution-mail.schemas.in.in.h:48
-#, fuzzy
 msgid "Message Window default height"
-msgstr "Lehentasun lehenetsia:"
+msgstr "Mezuen leihoaren altuera lehenetsia"
 
 #: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
-msgstr ""
+msgstr "Mezuen leihoaren zabalera lehenetsia"
 
 #: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (normal, full headers, source)"
-msgstr ""
+msgstr "Mezuak bistaratzeko estiloa (normala, goiburu osoak, iturburua)"
 
 #: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
-msgstr ""
+msgstr "Irtetean zakarrontzia husteko gutxieneko egun-kopurua"
 
 #: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
-msgstr ""
+msgstr "Irtetean zakarrontzia husteko gutxieneko denbora, egunetan."
 
 #: ../mail/evolution-mail.schemas.in.in.h:53
-#, fuzzy
 msgid "New Mail Notify sound file"
-msgstr "Mezu berrien jakinarazpena"
+msgstr "Mezu berria iritsi dela jakinarazteko soinu-fitxategia"
 
 #: ../mail/evolution-mail.schemas.in.in.h:54
-#, fuzzy
 msgid "New Mail Notify type"
-msgstr "Mezu berrien jakinarazpena"
+msgstr "Mezu berriaren jakinarazpen-mota"
 
 #: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
-msgstr ""
+msgstr "Abisatu gaia hutsik badago"
 
 #: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
-msgstr ""
+msgstr "Abisatu erabiltzaileari, karpeta bat betiko borratu aurretik."
 
 #: ../mail/evolution-mail.schemas.in.in.h:57
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
+"Abisatu erabiltzaileari, mezu bat gairik gabe bidaltzen saiatzen denean."
 
 #: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
-msgstr ""
+msgstr "Abisatu erabiltzaileak betiko borratzean"
 
 #: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
-msgstr ""
+msgstr "Abisatu erabiltzaileak Bcc bakarrik betetzen duenean"
 
 #: ../mail/evolution-mail.schemas.in.in.h:60
-#, fuzzy
 msgid "Prompt when user tries to open 10 or more messages at once"
-msgstr "Abisatu B_cc hartzaileak bakarrik dituzten mezuak bidali aurretik"
+msgstr ""
+"Abisatu erabiltzaileak 10 mezu edo gehiago aldi berean irekitzen saiatzean"
 
 #: ../mail/evolution-mail.schemas.in.in.h:61
-#, fuzzy
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
-msgstr "Abisatu _HTML formaturik nahi ez dutenei HTML mezuak bidali aurretik"
+msgstr ""
+"Abisatu HTML mezuak bidali aurretik beharbada HTML mezurik jaso nahi ez "
+"duten erabiltzaileei."
 
 #: ../mail/evolution-mail.schemas.in.in.h:62
-#, fuzzy
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr "Abisatu B_cc hartzaileak bakarrik dituzten mezuak bidali aurretik"
+msgstr "Abisatu Nori edo Cc hartzailerik gabeko mezu bat bidali aurretik."
 
 #: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
+msgstr "Abisatu HTMLrik nahi ez duenari HTML mezua bidali aurretik"
 
 #: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
-msgstr ""
+msgstr "Ezagutu testuko estekak, eta ordeztu."
 
 #: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
-msgstr ""
+msgstr "Ezagutu smiley-aurpegierak testuan, eta ordeztu irudiekin."
 
 #: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
-msgstr ""
+msgstr "Exekutatu mezu baztergarrien proba sarrerako mezuetan"
 
 #: ../mail/evolution-mail.schemas.in.in.h:67
-#, fuzzy
 msgid "Send HTML mail by default"
-msgstr "HTML mezua bidali?"
+msgstr "Bidali HTML mezuak lehenespenez"
 
 #: ../mail/evolution-mail.schemas.in.in.h:68
-#, fuzzy
 msgid "Send HTML mail by default."
-msgstr "HTML mezua bidali?"
+msgstr "Bidali HTML mezuak lehenespenez."
 
 #: ../mail/evolution-mail.schemas.in.in.h:69
-#, fuzzy
 msgid "Show Animations"
-msgstr "_Erakutsi irudi-animazioak"
+msgstr "Erakutsi animazioak"
 
 #: ../mail/evolution-mail.schemas.in.in.h:70
-#, fuzzy
 msgid "Show animated images as animations."
-msgstr "_Erakutsi irudi-animazioak"
+msgstr "Erakutsi irudi-animazioak animazio gisa."
 
 #: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
-msgstr ""
+msgstr "Erakutsi ezabatutako mezuak (marratuta) mezuen zerrendan."
 
 #: ../mail/evolution-mail.schemas.in.in.h:72
-#, fuzzy
 msgid "Show deleted messages in the message-list"
-msgstr "Erakutsi mezua estilo normalean"
+msgstr "Erakutsi ezabatutako mezuak mezuen zerrendan"
 
 #: ../mail/evolution-mail.schemas.in.in.h:73
-#, fuzzy
 msgid "Show the \"Preview\" pane"
-msgstr "Au_rrebistako panela"
+msgstr "Erakutsi\"Aurrebista\" panela"
 
 #: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
-msgstr ""
+msgstr "Erakutsi \"Aurrebista\" panela."
 
 #: ../mail/evolution-mail.schemas.in.in.h:75
-#, fuzzy
 msgid "Sound file to play when new mail arrives."
-msgstr "Jo _soinu-fitxategia mezu berriak iristen direnean"
+msgstr "Mezu berriak iristean jo beharreko soinu-fitxategia."
 
 #: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr ""
+msgstr "Erabili nahi den Mezu Berrien Jakinarazpenaren mota zehazten du."
 
 #: ../mail/evolution-mail.schemas.in.in.h:77
-#, fuzzy
 msgid "Spell check inline"
-msgstr "O_rtografia-egiaztapena"
+msgstr "Ortografia-egiaztapena barnean"
 
 #: ../mail/evolution-mail.schemas.in.in.h:78
-#, fuzzy
 msgid "Subscribe dialog default height"
-msgstr "Lehentasun lehenetsia:"
+msgstr "Harpidetzen elkarrizketa-koadroaren altuera lehenetsia"
 
 #: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
-msgstr ""
+msgstr "Harpidetzen elkarrizketa-koadroaren zabalera lehenetsia"
 
 #: ../mail/evolution-mail.schemas.in.in.h:80
-#, fuzzy
 msgid "Terminal font"
-msgstr "_Terminaleko letra-tipoa:"
+msgstr "Terminaleko letra-tipoa"
 
 #: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr ""
+"Zakarrontzia hustu zen azken aldia, Garaiaren hasieratik iragandako egunetan."
 
 #: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
-msgstr ""
+msgstr "Mezuak bistaratzeko erabiliko den terminaleko letra-tipoa"
 
 #: ../mail/evolution-mail.schemas.in.in.h:83
-#, fuzzy
 msgid "The variable width font for mail display"
-msgstr "Hautatu HTML zabalera aldakorreko letra-tipoa inprimatzeko"
+msgstr "Mezuak bistaratzeko erabiliko den zabalera aldakorreko letra-tipoa"
 
 #: ../mail/evolution-mail.schemas.in.in.h:84
 msgid ""
@@ -12563,148 +12130,146 @@ msgid ""
 "header enabled&gt; - set enabled if the header is to be displayed in the "
 "mail view."
 msgstr ""
+"Gako honek XML egituren zerrenda bat eduki beharko luke, goiburu "
+"pertsonalizatuak eta bistaratzekoak diren edo ez zehaztuta. XML formatuaren "
+"egitura - &lt;header enabled&gt; - gaituta ezartzen da, goiburua mezuen "
+"ikuspegian bistaratuko bada."
 
 #: ../mail/evolution-mail.schemas.in.in.h:85
-#, fuzzy
 msgid "Thread the message list."
-msgstr "Harian sartutako mezu-zerrenda"
+msgstr "Sartu harian mezuen zerrenda."
 
 #: ../mail/evolution-mail.schemas.in.in.h:86
-#, fuzzy
 msgid "Thread the message-list"
-msgstr "Harian sartutako mezu-zerrenda"
+msgstr "Sartu harian mezuen zerrenda"
 
 #: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
-msgstr ""
+msgstr "Sartu harian mezuen zerrenda, Gaiaren arabera"
 
 #: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
-msgstr ""
+msgstr "Mezua Ikusitako gisa markatzeko denbora-muga"
 
 #: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
-msgstr ""
+msgstr "Mezua Ikusitako gisa markatzeko denbora-muga."
 
 #: ../mail/evolution-mail.schemas.in.in.h:90
-#, fuzzy
 msgid "UID string of the default account."
-msgstr "_Lehenetsi kontu hau"
+msgstr "Kontu lehenetsiaren UID katea."
 
 #: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
-msgstr ""
+msgstr "Erabili Spamasssassin daemon-a eta bezeroa"
 
 #: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
-msgstr ""
+msgstr "Erabili Spamasssassin daemon-a eta bezeroa (spamc/spamd)"
 
 #: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
-msgstr ""
+msgstr "Erabili letra-tipo pertsonalizatuak"
 
 #: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
-msgstr ""
+msgstr "Erabili letra-tipo pertsonalizatuak mezuak bistaratzeko"
 
 #: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
-msgstr ""
+msgstr "Spam-proba lokalak bakarrik erabili."
 
 #: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
-msgstr ""
+msgstr "Spam-proba lokalak bakarrik erabili (DNSkorik ez)."
 
 #: ../mail/evolution-mail.schemas.in.in.h:97
-#, fuzzy
 msgid "Variable width font"
-msgstr "_Zabalera aldakorra:"
+msgstr "Zabalera aldakorreko letra-tipoa"
 
 #: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
-msgstr ""
+msgstr "Ikusi/Bcc menu-elementua hautatuta dago"
 
 #: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
-msgstr ""
+msgstr "Ikusi/Bcc menu-elementua hautatuta dago."
 
 #: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
-msgstr ""
+msgstr "Ikusi/Cc menu-elementua hautatuta dago"
 
 #: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
-msgstr ""
+msgstr "Ikusi/Cc menu-elementua hautatuta dago."
 
 #: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
-msgstr ""
+msgstr "Ikusi/Nork menu-elementua hautatuta dago"
 
 #: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
-msgstr ""
+msgstr "Ikusi/Nork menu-elementua hautatuta dago."
 
 #: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
-msgstr ""
+msgstr "Ikusi/Bidali hona menu-elementua hautatuta dago"
 
 #: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
-msgstr ""
+msgstr "Ikusi/Bidali hona menu-elementua hautatuta dago."
 
 #: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
-msgstr ""
+msgstr "Ikusi/Erantzun honi menu-elementua hautatuta dago"
 
 #: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
-msgstr ""
+msgstr "Ikusi/Erantzun honi menu-elementua hautatuta dago."
 
 #: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
+"Gaikako harian sartzera itzuli nahi duzun edo ez, mezuek ez daukatenean "
+"Erantzun honi edo Erreferentzia goibururik."
 
 #: ../mail/importers/elm-importer.c:193
-#, fuzzy
 msgid "Importing Elm data"
-msgstr "Fitxategiak inportatzen"
+msgstr "Elm datuak inportatzen"
 
 #: ../mail/importers/elm-importer.c:382
 msgid "Evolution Elm importer"
 msgstr "Evolution-en Elm inportatzailea"
 
 #: ../mail/importers/elm-importer.c:383
-#, fuzzy
 msgid "Import mail from Elm."
-msgstr "Mezu garrantzitsuak (lokala)"
+msgstr "Inportatu posta Elm-etik."
 
 #: ../mail/importers/evolution-mbox-importer.c:82
 #: ../mail/importers/evolution-outlook-importer.c:131
-#, fuzzy
 msgid "Destination folder:"
-msgstr "Ezabatu karpeta hau"
+msgstr "Helburuko karpeta:"
 
 #: ../mail/importers/evolution-mbox-importer.c:85
 #: ../mail/importers/evolution-outlook-importer.c:134
-#, fuzzy
 msgid "Select folder to import into"
-msgstr "Hautatu karpeta"
+msgstr "Hautatu inportazioetarako karpeta"
 
 #: ../mail/importers/evolution-mbox-importer.c:216
 msgid "Berkeley Mailbox (mbox)"
-msgstr ""
+msgstr "Berkeley postontzia (mbox)"
 
 #: ../mail/importers/evolution-mbox-importer.c:217
 msgid "Importer Berkeley Mailbox format folders"
-msgstr ""
+msgstr "Berkeley postontzien formatuen karpeten inportatzailea"
 
 #: ../mail/importers/evolution-outlook-importer.c:257
 #: ../mail/importers/mail-importer.c:230 ../shell/e-shell-importer.c:516
-#, fuzzy, c-format
+#, c-format
 msgid "Importing `%s'"
-msgstr "Inportatzen"
+msgstr "`%s' inportatzen"
 
 #: ../mail/importers/evolution-outlook-importer.c:259
 #: ../mail/importers/netscape-importer.c:1251
@@ -12720,9 +12285,8 @@ msgstr "Itxaron"
 
 #: ../mail/importers/evolution-outlook-importer.c:305
 #: ../mail/importers/mail-importer.c:144
-#, fuzzy
 msgid "Importing mailbox"
-msgstr "Fitxategiak inportatzen"
+msgstr "Postontzia inportatzen"
 
 #: ../mail/importers/mail-importer.c:373
 #, c-format
@@ -12790,9 +12354,8 @@ msgid "Evolution is importing your old Netscape data"
 msgstr "Netscape-ko datu zaharrak inportatzen ari da Evolution"
 
 #: ../mail/importers/netscape-importer.c:1707
-#, fuzzy
 msgid "Importing Netscape data"
-msgstr "Netscape-ko datu zaharrak inportatzen ari da Evolution"
+msgstr "Netscape datuak inportatzen"
 
 #: ../mail/importers/netscape-importer.c:1907
 msgid "Settings"
@@ -12811,18 +12374,16 @@ msgstr ""
 "Evolution-era inportatu nahi dituzu?"
 
 #: ../mail/importers/pine-importer.c:230
-#, fuzzy
 msgid "Importing Pine data"
-msgstr "Fitxategiak inportatzen"
+msgstr "Pine datuak inportatzen"
 
 #: ../mail/importers/pine-importer.c:434
 msgid "Evolution Pine importer"
 msgstr "Evolution-en Pine inportatzailea"
 
 #: ../mail/importers/pine-importer.c:435
-#, fuzzy
 msgid "Import mail from Pine."
-msgstr "Inportatu fitxategi bakarra"
+msgstr "Inportatu posta Pine-tik."
 
 #: ../mail/mail-autofilter.c:78
 #, c-format
@@ -12849,53 +12410,53 @@ msgid "Add Filter Rule"
 msgstr "Gehitu iragazteko araua"
 
 #: ../mail/mail-component.c:509
-#, fuzzy, c-format
+#, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
-msgstr[0] "%d hautatuta"
-msgstr[1] "%d hautatuta"
+msgstr[0] "%d ezabatuta"
+msgstr[1] "%d ezabatuta"
 
 #: ../mail/mail-component.c:511
-#, fuzzy, c-format
+#, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
-msgstr[0] "%d bidali gabe"
-msgstr[1] "%d bidali gabe"
+msgstr[0] "baztergarri %d"
+msgstr[1] "%d baztergarri"
 
 #: ../mail/mail-component.c:534
-#, fuzzy, c-format
+#, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
-msgstr[0] "Zirriborroak"
-msgstr[1] "Zirriborroak"
+msgstr[0] "zirriborro %d"
+msgstr[1] "%d zirriborro"
 
 #: ../mail/mail-component.c:536
-#, fuzzy, c-format
+#, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
-msgstr[0] "%d bidali"
-msgstr[1] "%d bidali"
+msgstr[0] "%d bidalita"
+msgstr[1] "%d bidalita"
 
 #: ../mail/mail-component.c:538
-#, fuzzy, c-format
+#, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d bidali gabe"
 msgstr[1] "%d bidali gabe"
 
 #: ../mail/mail-component.c:542
-#, fuzzy, c-format
+#, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d guztira"
 msgstr[1] "%d guztira"
 
 #: ../mail/mail-component.c:544
-#, fuzzy, c-format
+#, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
-msgstr[0] "%d bidali gabe"
-msgstr[1] "%d bidali gabe"
+msgstr[0] "%d irakurri gabe"
+msgstr[1] "%d irakurri gabe"
 
 #: ../mail/mail-component.c:765
 msgid "New Mail Message"
@@ -12910,206 +12471,189 @@ msgid "Compose a new mail message"
 msgstr "Prestatu posta-mezu berria"
 
 #: ../mail/mail-component.c:773
-#, fuzzy
 msgid "New Mail Folder"
-msgstr "Karpeta birtual berria"
+msgstr "Mezu berrien karpeta"
 
 #: ../mail/mail-component.c:774
-#, fuzzy
 msgid "Mail _Folder"
-msgstr "Posta-iragazkiak"
+msgstr "Posta _Karpeta"
 
 #: ../mail/mail-component.c:775
-#, fuzzy
 msgid "Create a new mail folder"
-msgstr "Sortu karpeta berria"
+msgstr "Sortu posta-karpeta berria"
 
 #: ../mail/mail-component.c:919
 msgid "Failed upgrading Mail settings or folders."
-msgstr ""
+msgstr "Huts egin du Postaren ezarpenak edo karpetak bertsio-berritzean."
 
 #: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
-#, fuzzy
 msgid "    "
 msgstr "      "
 
 #: ../mail/mail-config.glade.h:2
-#, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr " _Begiratu zein mota onartzen diren "
 
 #: ../mail/mail-config.glade.h:4
-#, fuzzy
 msgid "<b>SSL is not supported in this build of Evolution</b>"
-msgstr "(SSL ez da onartzen evolution-en bertsio honetan)"
+msgstr "<b>SSL ez da onartzen evolution-en bertsio honetan</b>"
 
 #: ../mail/mail-config.glade.h:5
-#, fuzzy
 msgid "<b>S_ignatures</b>"
-msgstr "<b>Egoera:</b>"
+msgstr "<b>S_inadurak</b>"
 
 #: ../mail/mail-config.glade.h:6
-#, fuzzy
 msgid "<b>_Languages</b>"
-msgstr "<b>Egoera:</b>"
+msgstr "<b>_Hizkuntzak</b>"
 
 #: ../mail/mail-config.glade.h:7
 msgid "<small>This will make the the filter more reliable, but slower</small>"
 msgstr ""
+"<small>Iragazkiak fidagarritasun handiagoa edukitzea eragingo du, baita "
+"motelagoa izatea ere</small>"
 
 #: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Kontu-informazioa</span>"
 
 #: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Abisuak</span>"
 
 #: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication Type</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Autentifikazio-mota</span>"
 
 #: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Autentifikazioa</span>"
 
 #: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Mezuak prestatzea</span>"
 
 #: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Konfigurazioa</span>"
 
 #: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Default Behavior</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Portaera lehenetsia</span>"
 
 #: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Ezabatu mezuak</span>"
 
 #: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Bistara_tutako mezu-goiburuak</span>"
 
 #: ../mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Filter Options</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Iragazteko aukerak</span>"
 
 #: ../mail/mail-config.glade.h:18
 #: ../plugins/itip-formatter/itip-formatter.c:1977
 msgid "<span weight=\"bold\">General</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Orokorra</span>"
 
 #: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels and Colors</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Etiketak eta Koloreak</span>"
 
 #: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Loading Images</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Irudi-kargatzea</span>"
 
 #: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Display</span>"
-msgstr ""
+msgstr "span weight=\"bold\">Mezu-bistaratzea</span>"
 
 #: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Fonts</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Mezuen letra-tipoak</span>"
 
 #: ../mail/mail-config.glade.h:23
-#, fuzzy
 msgid "<span weight=\"bold\">Message Receipts</span>"
-msgstr "Bidalitako mezuak eta zirriborroak"
+msgstr "<span weight=\"bold\">Mezuen irakurragiria</span>"
 
 #: ../mail/mail-config.glade.h:24
-#, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
-msgstr "Mezu berrien jakinarazpena"
+msgstr "<span weight=\"bold\">Mezu berrien jakinarazpena</span>"
 
 #: ../mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Optional Information</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Aukerako informazioa</span>"
 
 #: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Options</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Aukerak</span>"
 
 #: ../mail/mail-config.glade.h:27
-#, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-msgstr "Pretty Good Privacy (PGP/GPG)"
+msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 
 #: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Printed Fonts</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Inprimatzeko letra-tipoak</span>"
 
 #: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Required Information</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Beharrezko informazioa</span>"
 
 #: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">MIME segurua (S/MIME)</span>"
 
 #: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Segurtasuna</span>"
 
 #: ../mail/mail-config.glade.h:32
-#, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
-msgstr "Bidalitako mezuak eta zirriborroak"
+msgstr "<span weight=\"bold\">Bidalitako mezuak eta zirriborroak</span>"
 
 #: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Zerbitzariaren konfigurazioa</span>"
 
 #: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Kontuaren kudeaketa"
 
 #: ../mail/mail-config.glade.h:36
-#, fuzzy
 msgid "Add Ne_w Signature..."
-msgstr "Gehitu sinadura berria..."
+msgstr "Gehitu _sinadura berria..."
 
 #: ../mail/mail-config.glade.h:37
-#, fuzzy
 msgid "Add _Script"
 msgstr "_Gehitu script-a"
 
 #: ../mail/mail-config.glade.h:38
-#, fuzzy
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Beti _sinatu kontu honetatik bidalitako mezuak"
 
 #: ../mail/mail-config.glade.h:39
-#, fuzzy
 msgid "Also encrypt to sel_f when sending encrypted mail"
 msgstr "Enkriptatu _beti neure buruari posta enkriptatua bidaltzean"
 
 #: ../mail/mail-config.glade.h:40
-#, fuzzy
 msgid "Alway_s carbon-copy (cc) to:"
-msgstr "Beti bidali _Cc kopia honi:"
+msgstr "Be_ti bidali Cc kopia honi:"
 
 #: ../mail/mail-config.glade.h:41
-#, fuzzy
 msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "Beti bidali _Bcc kopia honi:"
+msgstr "Beti bi_dali Bcc kopia honi:"
 
 #: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Enkriptatzean beti _fidagarritzat jo nire gako-sortako gakoak"
 
 #: ../mail/mail-config.glade.h:43
-#, fuzzy
 msgid "Always encrypt to _myself when sending encrypted mail"
-msgstr "_Enkriptatu beti neure buruari posta enkriptatua bidaltzean"
+msgstr "Beti _sinatu kontu honetatik bidalitako mezuak"
 
 #: ../mail/mail-config.glade.h:44
 msgid "Attach original message"
@@ -13120,9 +12664,8 @@ msgid "Attachment"
 msgstr "Eranskina"
 
 #: ../mail/mail-config.glade.h:46
-#, fuzzy
 msgid "Automatically _insert smiley images"
-msgstr "_Automatikoki txertatu smiley irudiak"
+msgstr "Automatikoki t_xertatu smiley irudiak"
 
 #: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
@@ -13133,7 +12676,6 @@ msgid "Baltic (ISO-8859-4)"
 msgstr "Baltikokoa (ISO-8859-4)"
 
 #: ../mail/mail-config.glade.h:49
-#, fuzzy
 msgid "Beep w_hen new mail arrives"
 msgstr "J_o sistema-soinua mezu berriak iristen direnean"
 
@@ -13142,14 +12684,12 @@ msgid "C_haracter set:"
 msgstr "_Karaktere-jokoa:"
 
 #: ../mail/mail-config.glade.h:51
-#, fuzzy
 msgid "Ch_eck for Supported Types "
-msgstr " _Begiratu zein mota onartzen diren "
+msgstr "_Begiratu zein mota onartzen diren "
 
 #: ../mail/mail-config.glade.h:52
-#, fuzzy
 msgid "Check _incoming mail for junk"
-msgstr "Begiratu mezu berririk dagoen"
+msgstr "Begiratu _sarreran mezurik baztertzeko dagoen"
 
 #: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
@@ -13157,31 +12697,27 @@ msgstr "_Egiaztatu ortografia idatzi ahala"
 
 #: ../mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
-msgstr ""
+msgstr "Sarrerako mezuak baztergarriak diren egiaztatzen du"
 
 #: ../mail/mail-config.glade.h:55
-#, fuzzy
 msgid "Cle_ar"
-msgstr "Garbitu"
+msgstr "_Garbitu"
 
 #: ../mail/mail-config.glade.h:56
-#, fuzzy
 msgid "Clea_r"
-msgstr "Garbitu"
+msgstr "Ga_rbitu"
 
 #: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "_Ortografia-akatsa duten hitzen kolorea:"
 
 #: ../mail/mail-config.glade.h:58
-#, fuzzy
 msgid "Colors"
-msgstr "_Koloreak"
+msgstr "Koloreak"
 
 #: ../mail/mail-config.glade.h:59
-#, fuzzy
 msgid "Confirm _when expunging a folder"
-msgstr "_Berretsi karpeta betiko borratu aurretik"
+msgstr "Berretsi ka_rpeta betiko borratu aurretik"
 
 #: ../mail/mail-config.glade.h:60
 msgid ""
@@ -13204,14 +12740,12 @@ msgid "De_fault"
 msgstr "Le_henetsi"
 
 #: ../mail/mail-config.glade.h:67
-#, fuzzy
 msgid "Default character e_ncoding:"
-msgstr "_Karaktere-kodeketa lehenetsia:"
+msgstr "Karaktere-kodeketa _lehenetsia:"
 
 #: ../mail/mail-config.glade.h:70
-#, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
-msgstr "_Beti sinatu kontu honetatik bidalitako mezuak"
+msgstr "_Sinatu digitalki irteerako mezuak (lehenespenez)"
 
 #: ../mail/mail-config.glade.h:71
 msgid "Do not quote original message"
@@ -13222,40 +12756,34 @@ msgid "Done"
 msgstr "Eginda"
 
 #: ../mail/mail-config.glade.h:73
-#, fuzzy
 msgid "Drafts _Folder:"
-msgstr "_Zirriborroen karpeta:"
+msgstr "Z_irriborroen karpeta:"
 
 #: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "Posta-kontuak"
 
 #: ../mail/mail-config.glade.h:76
-#, fuzzy
 msgid "Email _Address:"
 msgstr "_Helbide elektronikoa:"
 
 #: ../mail/mail-config.glade.h:77
-#, fuzzy
 msgid "Empty trash folders on e_xit"
-msgstr "H_ustu zakarrontziko karpetak irtetean"
+msgstr "Hustu zakarrontziko karpetak _irtetean"
 
 #: ../mail/mail-config.glade.h:78
-#, fuzzy
 msgid "Encry_ption certificate:"
-msgstr "_Ziurtagiri-IDa:"
+msgstr "E_nkriptatze-ziurtagiria:"
 
 #: ../mail/mail-config.glade.h:79
-#, fuzzy
 msgid "Encrypt out_going messages (by default)"
-msgstr "_Beti sinatu kontu honetatik bidalitako mezuak"
+msgstr "Sinatu digitalki _irteerako mezuak (lehenespenez)"
 
 #: ../mail/mail-config.glade.h:81
 msgid "Execute Command..."
 msgstr "Exekutatu komandoa..."
 
 #: ../mail/mail-config.glade.h:82
-#, fuzzy
 msgid "Fi_xed-width:"
 msgstr "_Zabalera-finkoa:"
 
@@ -13268,12 +12796,10 @@ msgid "Format messages in _HTML"
 msgstr "Eman _HTML formatua mezuei"
 
 #: ../mail/mail-config.glade.h:86
-#, fuzzy
 msgid "HTML Mail"
-msgstr "_HTML mezuak"
+msgstr "HTML mezuak"
 
 #: ../mail/mail-config.glade.h:87
-#, fuzzy
 msgid "Headers"
 msgstr "Goiburua"
 
@@ -13282,18 +12808,16 @@ msgid "Highlight _quotations with"
 msgstr "_Aipamenak nabarmentzeko erabili"
 
 #: ../mail/mail-config.glade.h:89
-#, fuzzy
 msgid "I_nclude remote tests"
-msgstr "Sartu:"
+msgstr "_Sartu urruneko probak"
 
 #: ../mail/mail-config.glade.h:92
 msgid "Inline"
 msgstr "Barnean"
 
 #: ../mail/mail-config.glade.h:94
-#, fuzzy
 msgid "Languages Table"
-msgstr "Hizkuntza"
+msgstr "Hizkuntzen taula"
 
 #: ../mail/mail-config.glade.h:96
 msgid "Mail Configuration"
@@ -13301,7 +12825,7 @@ msgstr "Posta-konfigurazioa"
 
 #: ../mail/mail-config.glade.h:97
 msgid "Mail Headers Table"
-msgstr ""
+msgstr "Posta-goiburuen taula"
 
 #: ../mail/mail-config.glade.h:99
 msgid "Mailbox location"
@@ -13328,15 +12852,16 @@ msgid "PGP/GPG _Key ID:"
 msgstr "PGP/_GPG gakoaren IDa:"
 
 #: ../mail/mail-config.glade.h:106
-#, fuzzy
 msgid "Play sound file when new mail arri_ves"
-msgstr "Jo _soinu-fitxategia mezu berriak iristen direnean"
+msgstr "Jo soin_ua mezu berriak iristean"
 
 #: ../mail/mail-config.glade.h:107
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
 msgstr ""
+"Idatzi kontu honen izen deskribatzailea azpiko tartean.\n"
+"Izen hau bistaratzeko soilik erabiliko da."
 
 #: ../mail/mail-config.glade.h:109
 msgid ""
@@ -13373,33 +12898,28 @@ msgid "Quoted"
 msgstr "Aipamen gisa"
 
 #: ../mail/mail-config.glade.h:115
-#, fuzzy
 msgid "Re_member password"
-msgstr "_Gogoratu pasahitz hau"
+msgstr "_Gogoratu pasahitza"
 
 #: ../mail/mail-config.glade.h:116
 msgid "Re_ply-To:"
 msgstr "Erant_zun honi:"
 
 #: ../mail/mail-config.glade.h:118
-#, fuzzy
 msgid "Remember _password"
-msgstr "_Gogoratu pasahitz hau"
+msgstr "Gogoratu p_asahitza"
 
 #: ../mail/mail-config.glade.h:119
-#, fuzzy
 msgid "S_elect..."
-msgstr "Ezabatu..."
+msgstr "_Hautatu..."
 
 #: ../mail/mail-config.glade.h:120
-#, fuzzy
 msgid "S_tandard Font:"
 msgstr "_Letra-tipo estandarra:"
 
 #: ../mail/mail-config.glade.h:121
-#, fuzzy
 msgid "Se_lect..."
-msgstr "Ezabatu..."
+msgstr "H_autatu..."
 
 #: ../mail/mail-config.glade.h:123
 msgid "Select HTML fixed width font"
@@ -13418,18 +12938,16 @@ msgid "Select HTML variable width font for printing"
 msgstr "Hautatu HTML zabalera aldakorreko letra-tipoa inprimatzeko"
 
 #: ../mail/mail-config.glade.h:127
-#, fuzzy
 msgid "Send message receipts:"
-msgstr "Bidali _mezua zerrendara..."
+msgstr "Bidali mezuaren irakurragiria"
 
 #: ../mail/mail-config.glade.h:129
 msgid "Sending Mail"
 msgstr "Mezuak bidali"
 
 #: ../mail/mail-config.glade.h:130
-#, fuzzy
 msgid "Sent _Messages Folder:"
-msgstr "_Bidalitako mezuen karpeta:"
+msgstr "Bi_dalitako mezuen karpeta:"
 
 #: ../mail/mail-config.glade.h:131
 msgid "Ser_ver requires authentication"
@@ -13440,53 +12958,43 @@ msgid "Server _Type: "
 msgstr "_Zerbitzari-mota: "
 
 #: ../mail/mail-config.glade.h:133
-#, fuzzy
 msgid "Sig_ning certificate:"
-msgstr "_Ziurtagiri-IDa:"
+msgstr "Sinatze-ziur_tagiria:"
 
 #: ../mail/mail-config.glade.h:134
-#, fuzzy
 msgid "Signat_ure:"
-msgstr "Sinadura:"
+msgstr "Si_nadura:"
 
 #: ../mail/mail-config.glade.h:135
-#, fuzzy
 msgid "Signatures"
-msgstr "_Sinadurak"
+msgstr "Sinadurak"
 
 #: ../mail/mail-config.glade.h:136
-#, fuzzy
 msgid "Signatures Table"
-msgstr "_Sinadurak"
+msgstr "Sinaduren taula"
 
 #: ../mail/mail-config.glade.h:137
 msgid "Specify _filename:"
 msgstr "Zehaztu _fitxategi-izena:"
 
 #: ../mail/mail-config.glade.h:138
-#, fuzzy
 msgid "Spell Checking"
-msgstr "O_rtografia-egiaztapena"
+msgstr "Ortografia-egiaztapena"
 
 #: ../mail/mail-config.glade.h:139
-#, fuzzy
 msgid "T_erminal Font:"
-msgstr "_Terminaleko letra-tipoa:"
+msgstr "Termi_naleko letra-tipoa:"
 
 #: ../mail/mail-config.glade.h:140
-#, fuzzy
 msgid "T_ype: "
-msgstr "Mota:"
+msgstr "_Mota:"
 
 #: ../mail/mail-config.glade.h:141
-#, fuzzy
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
-"Ortografia-egiaztatzeko modua eta hizkuntza konfigura ditzakezu orrialde "
-"honetan. Hiztegia instalatuta daukaten hizkuntzak bakarrik azaltzen dira "
-"hemen."
+"Hiztegia instalatuta daukaten hizkuntzak bakarrik azaltzen dira zerrendan."
 
 #: ../mail/mail-config.glade.h:142
 msgid ""
@@ -13529,18 +13037,16 @@ msgid "_Add Signature"
 msgstr "_Gehitu sinadura"
 
 #: ../mail/mail-config.glade.h:155
-#, fuzzy
 msgid "_Always load images from the Internet"
-msgstr "_Beti kargatu irudiak saretik"
+msgstr "_Beti kargatu irudiuak Internetetik"
 
 #: ../mail/mail-config.glade.h:156
 msgid "_Do not notify me when new mail arrives"
 msgstr "Ez _jakinarazi mezu berriak iristen direnean"
 
 #: ../mail/mail-config.glade.h:157
-#, fuzzy
 msgid "_Don't sign meeting requests (for Outlook compatibility)"
-msgstr "Ez sinatu bilera-eskaerak (Outlook-ekin bateragarria izateko)"
+msgstr "_Ez sinatu bilera-eskaerak (Outlook-ekin bateragarria izateko)"
 
 #: ../mail/mail-config.glade.h:159
 msgid "_Forward style:"
@@ -13552,7 +13058,7 @@ msgstr "_Izen-abizenak:"
 
 #: ../mail/mail-config.glade.h:161
 msgid "_Load images in mail from contacts"
-msgstr ""
+msgstr "_kargatu irudiak mezuan kontaktuetatik"
 
 #: ../mail/mail-config.glade.h:162
 msgid "_Make this my default account"
@@ -13563,9 +13069,8 @@ msgid "_Mark messages as read after"
 msgstr "_Markatu mezuak irakurritako gisa"
 
 #: ../mail/mail-config.glade.h:165
-#, fuzzy
 msgid "_Never load images from the Internet"
-msgstr "_Inoiz ez kargatu irudirik saretik"
+msgstr "_Inoiz ez kargatu irudirik Internetetik"
 
 #: ../mail/mail-config.glade.h:166
 msgid "_Path:"
@@ -13592,9 +13097,8 @@ msgid "_Show animated images"
 msgstr "_Erakutsi irudi-animazioak"
 
 #: ../mail/mail-config.glade.h:173
-#, fuzzy
 msgid "_Use Secure Connection:"
-msgstr "E_rabili konexio segurua (SSL):"
+msgstr "E_rabili konexio segurua:"
 
 #: ../mail/mail-config.glade.h:174
 msgid "_Use the same fonts as other applications"
@@ -13609,32 +13113,28 @@ msgid "description"
 msgstr "azalpena"
 
 #: ../mail/mail-dialogs.glade.h:2
-#, fuzzy
 msgid "<b>Search Folder Sources</b>"
-msgstr "Karpeta birtualen iturburuak"
+msgstr "<b>Bilatu karpetaren iturburuak</b>"
 
 #: ../mail/mail-dialogs.glade.h:3
 msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Sinadura digitala</span>"
 
 #: ../mail/mail-dialogs.glade.h:4
 msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Enkriptatzea</span>"
 
 #: ../mail/mail-dialogs.glade.h:5
-#, fuzzy
 msgid "Case _Sensitive"
-msgstr "Maiuskula/minuskula"
+msgstr "_Maiuskula/minuskula"
 
 #: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
-#, fuzzy
 msgid "Co_mpleted"
-msgstr "Eginda"
+msgstr "_Eginda"
 
 #: ../mail/mail-dialogs.glade.h:8
-#, fuzzy
 msgid "F_ind:"
-msgstr "Bilatu:"
+msgstr "_Bilatu:"
 
 #: ../mail/mail-dialogs.glade.h:9
 msgid "Find in Message"
@@ -13651,7 +13151,7 @@ msgstr "Karpeta-harpidetzak"
 
 #: ../mail/mail-dialogs.glade.h:12
 msgid "License Agreement"
-msgstr ""
+msgstr "Lizentzia-kontratua"
 
 #: ../mail/mail-dialogs.glade.h:13
 msgid "None Selected"
@@ -13662,9 +13162,8 @@ msgid "S_erver:"
 msgstr "_Zerbitzaria:"
 
 #: ../mail/mail-dialogs.glade.h:15
-#, fuzzy
 msgid "Security Information"
-msgstr "Kontuaren informazioa"
+msgstr "Segurtasun-informazioa"
 
 #: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
 msgid ""
@@ -13675,12 +13174,10 @@ msgstr ""
 "Hautatu jarraitze-ekintza bat \"Bandera\" menuan."
 
 #: ../mail/mail-dialogs.glade.h:19
-#, fuzzy
 msgid "_Accept License"
-msgstr "Onartua"
+msgstr "_Onartu lizentzia"
 
 #: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
-#, fuzzy
 msgid "_Due By:"
 msgstr "_Noizko:"
 
@@ -13693,9 +13190,8 @@ msgid "_Subscribe"
 msgstr "_Harpidetu"
 
 #: ../mail/mail-dialogs.glade.h:23
-#, fuzzy
 msgid "_Tick this to accept the license agreement"
-msgstr "Posta-kontuak"
+msgstr "_Markatu hau lizentzia-kontratua onartzeko"
 
 #: ../mail/mail-dialogs.glade.h:24
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
@@ -13757,9 +13253,9 @@ msgid "Sending message %d of %d"
 msgstr "%d/%d mezua bidaltzen"
 
 #: ../mail/mail-ops.c:758
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to send %d of %d messages"
-msgstr "Huts egin du mezua deskodetzean."
+msgstr "Huts egin du mezuak bidaltzean: %d / %d "
 
 #: ../mail/mail-ops.c:760 ../mail/mail-send-recv.c:613
 msgid "Cancelled."
@@ -13810,12 +13306,12 @@ msgstr "%s karpeta biltegiratzen"
 #: ../mail/mail-ops.c:1519
 #, c-format
 msgid "Expunging and storing account '%s'"
-msgstr ""
+msgstr "'%s' kontua betiko borratzen eta biltegiratzen"
 
 #: ../mail/mail-ops.c:1520
-#, fuzzy, c-format
+#, c-format
 msgid "Storing account '%s'"
-msgstr "%s karpeta biltegiratzen"
+msgstr "'%s' kontua biltegiratzen"
 
 #: ../mail/mail-ops.c:1575
 msgid "Refreshing folder"
@@ -13840,17 +13336,17 @@ msgid "Retrieving message %s"
 msgstr "%s mezua eskuratzen"
 
 #: ../mail/mail-ops.c:1853
-#, fuzzy, c-format
+#, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
-msgstr[0] "%d mezu eskuratzen"
+msgstr[0] "Mezu %d eskuratzen"
 msgstr[1] "%d mezu eskuratzen"
 
 #: ../mail/mail-ops.c:1939
-#, fuzzy, c-format
+#, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
-msgstr[0] "%d mezu gordetzen"
+msgstr[0] "Mezu %d gordetzen"
 msgstr[1] "%d mezu gordetzen"
 
 #: ../mail/mail-ops.c:1989
@@ -13939,7 +13435,6 @@ msgid "Waiting..."
 msgstr "Zain..."
 
 #: ../mail/mail-send-recv.c:699
-#, fuzzy
 msgid "Checking for new mail"
 msgstr "Begiratu mezu berririk dagoen"
 
@@ -13970,14 +13465,14 @@ msgid "Name:"
 msgstr "Izena:"
 
 #: ../mail/mail-tools.c:116
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create spool directory `%s': %s"
-msgstr "Ezin izan da %s direktorioa sortu: %s"
+msgstr "Ezin izan da spool direktorioa sortu: `%s': %s"
 
 #: ../mail/mail-tools.c:143
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
-msgstr ""
+msgstr "Mezuak mbox ez den iturburu batera eramaten saiatzen: `%s'"
 
 #: ../mail/mail-tools.c:242
 #, c-format
@@ -13989,40 +13484,37 @@ msgid "Forwarded message"
 msgstr "Birbidalitako mezua"
 
 #: ../mail/mail-tools.c:284
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid folder: `%s'"
-msgstr "%s karpeta irekitzen"
+msgstr "Karpeta baliogabea: `%s'"
 
 #: ../mail/mail-vfolder.c:91
-#, fuzzy, c-format
+#, c-format
 msgid "Setting up Search Folder: %s"
-msgstr "Karpeta birtuala konfiguratzen: %s"
+msgstr "Bilaketa-karpeta konfiguratzen: %s"
 
 #: ../mail/mail-vfolder.c:240
-#, fuzzy, c-format
+#, c-format
 msgid "Updating Search Folders for '%s:%s'"
-msgstr "uri-aren karpeta birtualak eguneratzen: %s"
+msgstr "Bilaketa-karpeta eguneratzen - '%s:%s'"
 
 #: ../mail/mail-vfolder.c:247
-#, fuzzy, c-format
+#, c-format
 msgid "Updating Search Folders for '%s'"
-msgstr "uri-aren karpeta birtualak eguneratzen: %s"
+msgstr "Bilaketa-karpetak eguneratzen - '%s'"
 
 #: ../mail/mail-vfolder.c:1046
-#, fuzzy
 msgid "Edit Search Folder"
-msgstr "Hautatu karpeta"
+msgstr "Editatu bilaketa-karpeta"
 
 #: ../mail/mail-vfolder.c:1130
-#, fuzzy
 msgid "New Search Folder"
-msgstr "Hautatu karpeta"
+msgstr "Bilaketa berrien karpeta"
 
 #: ../mail/mail.error.xml.h:1
-#, fuzzy
 msgid ""
 "A folder named &quot;{1}&quot; already exists. Please use a different name."
-msgstr "\"%s\" izeneko karpeta bat badago. Erabili beste izen bat."
+msgstr "&quot;{1}&quot; izeneko karpeta bat badago. Erabili beste izen bat."
 
 #: ../mail/mail.error.xml.h:2
 msgid ""
@@ -14031,136 +13523,123 @@ msgid ""
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit.\n"
 msgstr ""
+"Hutsik ez dagoen &quot;{1}&quot; karpeta badago lehendik.\n"
+"\n"
+"Karpeta honi ez ikusi egitea aukera dezakezu, gainidaztea, bere edukia "
+"eranstea edo irtetzea aukera dezakezu.\n"
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
 "A read receipt notification has been requested for &quot;{1}&quot;.  Send "
 "the reciept notification to {0}?"
 msgstr ""
+"&quot;{1}&quot;(e)k irakurragiria eskatu duen jakinarazpena. Bidali  "
+"irakurragiriaren jakinarazpena {0}(r)i?"
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
 msgstr ""
+"Mezuaren Gaian lerro esanguratsu bat idaztean jasotzaileei zure mezuaren "
+"edukiari buruz argibideak ematen diezu."
 
 #: ../mail/mail.error.xml.h:8
-#, fuzzy
 msgid "Are you sure you want to delete this account and all its proxies?"
-msgstr "Ziur zaude kontu hau ezabatu nahi duzula?"
+msgstr "Ziur zaude kontu hau eta dagokion proxy guztiak ezabatu nahi duzula?"
 
 #: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account?"
 msgstr "Ziur zaude kontu hau ezabatu nahi duzula?"
 
 #: ../mail/mail.error.xml.h:10
-#, fuzzy
 msgid "Are you sure you want to open {0} messages at once?"
-msgstr "Ziur zaude %d mezuak editatu nahi dituzula?"
+msgstr "Ziur zaude {0} mezuak aldi berean irekitzea nahi dituzula?"
 
 #: ../mail/mail.error.xml.h:11
-#, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
-msgstr "Betiko kendu ezabatutako mezu guztiak karpeta guztietatik"
+msgstr ""
+"Ziur zaude karpeta guztietako ezabatutako mezu guztiak betiko kendu nahi "
+"dituzula?"
 
 #: ../mail/mail.error.xml.h:12
-#, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
-msgstr "Ziur zaude %d mezuak leiho banatan ireki nahi dituzula?"
+msgstr ""
+"Ziur zaude &quot;{0}&quot; karpetan dauden ezabatutako mezuak betiko kendu "
+"nahi dituzula?"
 
 #: ../mail/mail.error.xml.h:13
-#, fuzzy
 msgid "Are you sure you want to send a message in HTML format?"
-msgstr "Ziur zaude %d mezuak berriro bidali nahi dituzula?"
+msgstr "Ziur zaude mezua HTML formatuan bidali nahi duzula?"
 
 #: ../mail/mail.error.xml.h:14
-#, fuzzy
 msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "Ziur zaude %d mezuak berriro bidali nahi dituzula?"
+msgstr "Ziur zaude mezua BCC hartzaileekin bakarrik bidali nahi duzula?"
 
 #: ../mail/mail.error.xml.h:15
-#, fuzzy
 msgid "Are you sure you want to send a message without a subject?"
-msgstr "Ziur zaude %d mezuak berriro bidali nahi dituzula?"
+msgstr "Ziur zaude mezua gairik gabe bidali nahi duzula?"
 
 #: ../mail/mail.error.xml.h:16
 msgid "Because &quot;{0}&quot;."
-msgstr ""
+msgstr "Arrazoia: &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{2}&quot;."
-msgstr ""
+msgstr "Arrazoia: &quot;{2}&quot;."
 
 #: ../mail/mail.error.xml.h:19
-#, fuzzy
 msgid "Cannot add Search Folder &quot;{0}&quot;."
-msgstr ""
-"Ezin da karpeta ezabatu:\n"
-"%s"
+msgstr "Ezin da &quot;{0}&quot; karpeta birtuala gehitu"
 
 #: ../mail/mail.error.xml.h:20
-#, fuzzy
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Ezin da karpeta kopiatu: %s"
+msgstr "Ezin da &quot;{0}&quot; karpeta &quot;{1}&quot;(e)n kopiatu."
 
 #: ../mail/mail.error.xml.h:21
-#, fuzzy
 msgid "Cannot create folder &quot;{0}&quot;."
-msgstr "Ezin da karpeta atzitu: %s: %s"
+msgstr "Ezin da &quot;{0}&quot; karpeta sortu."
 
 #: ../mail/mail.error.xml.h:22
-#, fuzzy
 msgid "Cannot create temporary save directory."
-msgstr "Ezin izan da aldi baterako direktorioa sortu: %s"
+msgstr "Ezin da sortu aldi baterako gordetzeko direktorioa."
 
 #: ../mail/mail.error.xml.h:23
-#, fuzzy
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
-msgstr ""
-"Ezin da direktorioa sortu:\n"
-" %s\n"
-"Errorea: %s"
+msgstr "Ezin izan da direktorioan gorde. Arrazoia: &quot;{1}&quot;"
 
 #: ../mail/mail.error.xml.h:24
-#, fuzzy
 msgid "Cannot delete folder &quot;{0}&quot;."
-msgstr ""
-"Ezin da karpeta ezabatu:\n"
-"%s"
+msgstr "Ezin da &quot;{0}&quot; karpeta ezabatu."
 
 #: ../mail/mail.error.xml.h:25
-#, fuzzy
 msgid "Cannot delete system folder &quot;{0}&quot;."
-msgstr "Ezin da karpeta ezabatu: %s: Ez dago horrelako karpetarik"
+msgstr "Ezin da &quot;{0}&quot; karpeta ezabatu."
 
 #: ../mail/mail.error.xml.h:26
-#, fuzzy
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
-msgstr "`%s' karpeta ez dago."
+msgstr ""
+"Ezin da &quot;{0}&quot; karpeta birtuala editatu, karpeta hori ez dagoelako."
 
 #: ../mail/mail.error.xml.h:27
-#, fuzzy
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Ezin da karpeta eraman: %s"
+msgstr "Ezin da &quot;{0}&quot; karpeta &quot;{1}&quot;(e)ra eraman."
 
 #: ../mail/mail.error.xml.h:28
-#, fuzzy
 msgid "Cannot open source &quot;{1}&quot;"
-msgstr "Ezin izan da objektua eguneratu"
+msgstr "Ezin da ireki &quot;{1}&quot; iturburua."
 
 #: ../mail/mail.error.xml.h:29
-#, fuzzy
 msgid "Cannot open source &quot;{2}&quot;."
-msgstr "Ezin izan da objektua eguneratu"
+msgstr "Ezin da ireki &quot;{2}&quot; iturburua."
 
 #: ../mail/mail.error.xml.h:30
-#, fuzzy
 msgid "Cannot open target &quot;{2}&quot;."
-msgstr "Ezin da mezua ireki"
+msgstr "Ezin da ireki &quot;{2}&quot; helburua."
 
 #: ../mail/mail.error.xml.h:31
 msgid ""
@@ -14168,154 +13647,138 @@ msgid ""
 "problem.  You will not be able to use this provider until you can accept its "
 "license."
 msgstr ""
+"Ezin da &quot;{0}&quot; lizentzia-fitxategia irakurri instalazioko \n"
+"arazoa dela medio. Ezingo duzu hornitzaile hau erabili \n"
+"bere lizentzia onartu arte."
 
 #: ../mail/mail.error.xml.h:32
-#, fuzzy
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Ezin da karpeta eraman: %s"
+msgstr "Ezin da izena aldatu: &quot;{0}&quot; --> &quot;{1}&quot;."
 
 #: ../mail/mail.error.xml.h:33
-#, fuzzy
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
-msgstr "Ezin da karpetaren izena aldatu: %s: Ez dago horrelako karpetarik"
+msgstr "Ezin da sistemako &quot;{0}&quot; karpeta izenez edo lekuz aldatu."
 
 #: ../mail/mail.error.xml.h:34
-#, fuzzy
 msgid "Cannot save changes to account."
-msgstr "eta beste txartel bat."
+msgstr "Ezin dira gorde kontuko aldaketak."
 
 #: ../mail/mail.error.xml.h:35
-#, fuzzy
 msgid "Cannot save to directory &quot;{0}&quot;."
-msgstr "Ezin izan da %s direktorioa sortu: %s"
+msgstr "Ezin izan da &quot;{0}&quot; direktorioan gorde."
 
 #: ../mail/mail.error.xml.h:36
-#, fuzzy
 msgid "Cannot save to file &quot;{0}&quot;."
-msgstr ""
-"Ezin da gorde `%s'(e)n\n"
-" %s"
+msgstr "Ezin izan da &quot;{0}&quot; fitxategian gorde."
 
 #: ../mail/mail.error.xml.h:37
-#, fuzzy
 msgid "Cannot set signature script &quot;{0}&quot;."
-msgstr "_Gehitu sinadura"
+msgstr "Ezin da sinaduraren &quot;{0}&quot; script-a ezarri."
 
 #: ../mail/mail.error.xml.h:38
 msgid ""
 "Check to make sure your password is spelled correctly.  Remember that many "
 "passwords are case sensitive; your caps lock might be on."
 msgstr ""
+"Egiaztatu pasahitza ongi idatzita dagoela. Gogoan izan pasahitz asko "
+"maiuskulaz eta minuskulaz ezberdinak izaten direla. Agian maiuskulak "
+"aktibatuta dituzu."
 
 #: ../mail/mail.error.xml.h:39
-#, fuzzy
 msgid "Could not save signature file."
-msgstr "Ezin izan da sinadura-fitxategia gorde: %s"
+msgstr "Ezin izan da sinadura-fitxategia gorde."
 
 #: ../mail/mail.error.xml.h:40
-#, fuzzy
 msgid "Delete &quot;{0}&quot;?"
-msgstr "Ezabatu \"%s\""
+msgstr "Ezabatu &quot;{0}&quot;?"
 
 #: ../mail/mail.error.xml.h:41
-#, fuzzy
 msgid "Delete account?"
-msgstr "Ezabatu hautatutako kontaktuak"
+msgstr "Kontua ezabatu nahi duzu?"
 
 #: ../mail/mail.error.xml.h:42
-#, fuzzy
 msgid "Discard changed?"
-msgstr "_Ez gorde"
+msgstr "Aldaketak desegin?"
 
 #: ../mail/mail.error.xml.h:43
-#, fuzzy
 msgid "Do you want the operation to be performed in the subfolders?"
-msgstr "Eragiketa hau ezin da egin 'lineaz kanpo' moduan"
+msgstr "Eragiketa hau azpidirektorioetan egitea nahi duzu?"
 
 #: ../mail/mail.error.xml.h:44
-#, fuzzy
 msgid "Do you wish to save your changes?"
 msgstr "Aldaketak gorde nahi dituzu?"
 
 #: ../mail/mail.error.xml.h:45
-#, fuzzy
 msgid "Don't delete"
-msgstr "_Desezabatu"
+msgstr "Ez ezabatu"
 
 #: ../mail/mail.error.xml.h:46
-#, fuzzy
 msgid "Enter password."
-msgstr "Idatzi pasahitza"
+msgstr "Idatzi pasahitza."
 
 #: ../mail/mail.error.xml.h:47
-#, fuzzy
 msgid "Error loading filter definitions."
-msgstr ""
-"Errorea iragazki-informazioa kargatzean:\n"
-"%s"
+msgstr "Errorea iragazki-definizioak kargatzean."
 
 #: ../mail/mail.error.xml.h:48
-#, fuzzy
 msgid "Error while performing operation."
-msgstr ""
-"Errorea eragiketa egitean:\n"
-"%s"
+msgstr "Errorea eragiketa egitean."
 
 #: ../mail/mail.error.xml.h:49
-#, fuzzy
 msgid "Error while {0}."
-msgstr ""
-"Errorea '%s' saiatu denean:\n"
-"%s"
+msgstr "Errorea: \"{0}\"."
 
 #: ../mail/mail.error.xml.h:50
-#, fuzzy
 msgid "File exists but cannot overwrite it."
-msgstr "Fitxategia badago; gainidatzi?"
+msgstr "Fitxategia badago, baina ezin da gainidatzi."
 
 #: ../mail/mail.error.xml.h:51
-#, fuzzy
 msgid "File exists but is not a regular file."
-msgstr "`%s' fitxategia ez dago edo ez da fitxategi erregularra."
+msgstr "Fitxategia badago, baina ez da fitxategi erregularra."
 
 #: ../mail/mail.error.xml.h:52
 msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
+msgstr "Jarraitzen baduzu, ezingo dituzu mezu hauek berreskuratu."
 
 #: ../mail/mail.error.xml.h:53
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
 msgstr ""
+"Karpeta ezabatzen baduzu bere edukin eta azpikarpeta guztiak betiko ezabatu "
+"egingo dira."
 
 #: ../mail/mail.error.xml.h:54
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
 msgstr ""
+"Aurrera jarraituz gero, kontuaren informazioa \n"
+"eta dagokion proxy-en informazio guztia betiko ezabatuko da."
 
 #: ../mail/mail.error.xml.h:56
 msgid "If you proceed, the account information will be deleted permanently."
-msgstr ""
+msgstr "Aurrera jarraituz gero, kontuaren informazioa betiko ezabatuko da."
 
 #: ../mail/mail.error.xml.h:57
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr ""
+"Irteten bazara, mezu hauek ez dira bidaliko harik eta Evolution berriro "
+"abiarazi arte."
 
 #: ../mail/mail.error.xml.h:58
 msgid "Ignore"
-msgstr ""
+msgstr "Ez ikusi egin"
 
 #: ../mail/mail.error.xml.h:59
-#, fuzzy
 msgid "Invalid authentication"
-msgstr "Autentifikazioa"
+msgstr "Autentifikazio baliogabea"
 
 #: ../mail/mail.error.xml.h:60
 msgid "Mail filters automatically updated."
-msgstr ""
+msgstr "Posta-iragazkiak automatikoki eguneratu dira."
 
 #: ../mail/mail.error.xml.h:61
 msgid ""
@@ -14324,94 +13787,98 @@ msgid ""
 "your message anyway. To avoid this, you should add at least one To: or CC: "
 "recipient."
 msgstr ""
+"Posta-programa askok Apparently-To goiburua gehitzen diete BCC hartzaileak "
+"soilik dituzten mezuei. Goiburu hori gehituz gero, hartzaile guztiak "
+"zerrendatuko dira mezuan. Hori gerta ez dadin, gutxienez hartzaile bat "
+"zehaztu behar da Nori: edo Cc: hartzailean."
 
 #: ../mail/mail.error.xml.h:62
-#, fuzzy
 msgid "Mark all messages as read"
-msgstr "Markatu ikusgai dauden mezu guztiak irakurritako gisa"
+msgstr "Markatu mezu guztiak irakurritako gisa"
 
 #: ../mail/mail.error.xml.h:63
-#, fuzzy
 msgid "Mark all messages as read in the selected folder"
-msgstr "_Markatu mezuak irakurritako gisa"
+msgstr "Markatu mezuak irakurritako gisa hautatutako karpetan"
 
 #: ../mail/mail.error.xml.h:64
-#, fuzzy
 msgid "Missing folder."
-msgstr "%s karpeta kentzen"
+msgstr "Karpeta falta da."
 
 #: ../mail/mail.error.xml.h:66
-#, fuzzy
 msgid "No sources selected."
-msgstr "Ez da zerbitzaririk hautatu"
+msgstr "Ez da iturbururik hautatu"
 
 #: ../mail/mail.error.xml.h:67
 msgid "Opening too many messages at once may take a long time."
-msgstr ""
+msgstr "Mezu gehiegi batera irekitzeak denbora nahikoa denbora hartuko du."
 
 #: ../mail/mail.error.xml.h:68
 msgid "Please check your account settings and try again."
-msgstr ""
+msgstr "Egiaztatu kontuaren ezarpenak eta saiatu berriro."
 
 #: ../mail/mail.error.xml.h:69
 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 ""
+"Idatzi baliozko helbide elektroniko bat Nori: eremuan. Helbide elektronikoak "
+"bilatzeko, sarrera-koadroaren ondoko Nori: botoian klik egin dezakezu."
 
 #: ../mail/mail.error.xml.h:70
-#, fuzzy
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
 "{0}\n"
 "Send anyway?"
 msgstr ""
-"HTML formatuko mezua bidaltzera zoaz. Egiazta ezazu ondorengo\n"
-"hartzaileek HTML mezuak jaso ditzaketela eta jaso nahi dituztela:\n"
+"Egiazta ezazu ondorengo hartzaileek HTML mezuak jaso ditzaketela eta jaso "
+"nahi dituztela:\n"
+"{0}\n"
+"Bidali dena den?"
 
 #: ../mail/mail.error.xml.h:73
-#, fuzzy
 msgid "Please wait."
-msgstr "Itxaron"
+msgstr "Itxaron."
 
 #: ../mail/mail.error.xml.h:74
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
-msgstr ""
+msgstr "Arazoak &quot;{0}&quot; postontzi zaharretik migratzean."
 
 #: ../mail/mail.error.xml.h:75
 msgid "Querying server"
-msgstr ""
+msgstr "Zerbitzaria kontsultatzen"
 
 #: ../mail/mail.error.xml.h:76
-#, fuzzy
 msgid "Querying server for a list of supported authentication mechanisms."
-msgstr "Eskatutako autentifikazio-mekanismoak beharrezkoa du enkriptatzea"
+msgstr ""
+"Zerbitzaria kontsultatzen onartutako autentifikazio-mekanismoak zerrenda "
+"eskuratzeko."
 
 #: ../mail/mail.error.xml.h:77
-#, fuzzy
 msgid "Read receipt requested."
-msgstr "Irakurragiriak"
+msgstr "Erantzutea eskatu da."
 
 #: ../mail/mail.error.xml.h:78
-#, fuzzy
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
-msgstr "Ziur zaude \"%s\" karpeta ezabatu nahi duzula?"
+msgstr ""
+"Ziur zaude &quot;{0}&quot; karpeta (eta bere azpikarpeta guztiak) ezabatu "
+"nahi duzula?"
 
 #: ../mail/mail.error.xml.h:79
 msgid "Search Folders automatically updated."
-msgstr ""
+msgstr "Bilaketa-karpeta automatikoki eguneratu dira."
 
 #: ../mail/mail.error.xml.h:80
-#, fuzzy
 msgid "Send Receipt"
-msgstr "Irakurragiriak"
+msgstr "Bidali irakurragiria"
 
 #: ../mail/mail.error.xml.h:81
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
 msgstr ""
+"Ximian Evolution-ek sistemako karpetak behar ditu ongi funtzionatzeko eta "
+"ezin ditu izenez aldatu, lekuz aldatu edo ezabatu."
 
 #: ../mail/mail.error.xml.h:82
 msgid ""
@@ -14422,9 +13889,14 @@ msgid ""
 "your message. To avoid this, you should add at least one To: or CC: "
 "recipient. "
 msgstr ""
+"Bidaltzeko erabiltzen ari zaren kontaktu-zerrenda zerrendako hartzaileak "
+"ezkutatzeko konfiguratuta dago.\n"
+"Posta-programa askok Apparently-To goiburua gehietzen diete BCC hartzaileak "
+"soilik dituzten mezuei. Goiburu hori gehituz gero, hartzaile guztiak "
+"zerrendatuko dira mezuan. Hori gerta ez dadin, gutxienez hartzaile bat "
+"zehaztu behar da Nori: edo Cc: hartzailean. "
 
 #: ../mail/mail.error.xml.h:85
-#, fuzzy
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14432,13 +13904,13 @@ msgid ""
 "    &quot;{1}&quot;\n"
 "And have been updated."
 msgstr ""
-"Karpeta birtual hauek:\n"
-"%sKendutako karpeta bat erabiltzen zuten:\n"
-"    '%s'\n"
-"Eta eguneratu egin dira."
+"Bilaketa-karpeta hauek:\n"
+"{0}\n"
+"ezabatutako karpeta hau erabiltzen zuten:\n"
+"    &quot;{1}&quot;\n"
+"eta eguneratu egin dira."
 
 #: ../mail/mail.error.xml.h:90
-#, fuzzy
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14446,10 +13918,11 @@ msgid ""
 "    &quot;{1}&quot;\n"
 "And have been updated."
 msgstr ""
-"Karpeta birtual hauek:\n"
-"%sKendutako karpeta bat erabiltzen zuten:\n"
-"    '%s'\n"
-"Eta eguneratu egin dira."
+"Iragazki-arau hauek:\n"
+"{0}\n"
+"ezabatutako karpeta hau erabiltzen zuten:\n"
+"    &quot;{1}&quot;\n"
+"eta eguneratu egin dira."
 
 #: ../mail/mail.error.xml.h:95
 msgid ""
@@ -14458,68 +13931,64 @@ msgid ""
 "The message is stored in the Outbox folder.  Check the message for errors "
 "and resend."
 msgstr ""
+"Mezua kanpoko &quot;sendmail&quot; aplikazioaren bidez bidali da. Sendmail-"
+"ek honako errorearekin erantzun du: 67 egoera: mezua ez da bidali.\n"
+"Mezua Irteerako karpetan gorde da. Begiratu mezua erroreak aurkitzeko eta "
+"bidali berriro."
 
 #: ../mail/mail.error.xml.h:97
 msgid "The script file must exist and be executable."
-msgstr ""
+msgstr "Script fitxategia existitzeaz gain exekutagarria izan behar du."
 
 #: ../mail/mail.error.xml.h:98
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
+"Karpeta hau inplizitoki gehitu da, \n"
+"joan Bilaketa-karpetaren editorera esplizitoki gehitzeko, beharrezkoa izanez "
+"gero."
 
 #: ../mail/mail.error.xml.h:100
 msgid ""
 "This message cannot be sent because you have not specified any Recipients"
-msgstr ""
+msgstr "Mezu hau ezin da bidali, ez diozulako hartzailerik zehaztu"
 
 #: ../mail/mail.error.xml.h:101
-#, fuzzy
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr ""
-"%s SMTP zerbitzariak ez du onartzen eskatutako %s motako autentifikazioa."
+"Zerbitzari honek ez du onartzen mota honetako autentifikaziorik, eta "
+"beharbada ez du onartuko inolako autentifikaziorik."
 
 #: ../mail/mail.error.xml.h:102
-#, fuzzy
 msgid "This signature has been changed, but has not been saved."
-msgstr ""
-"Sinadura hau aldatu egin duzu, baina ez duzu gorde.\n"
-"\n"
-"Aldaketak gorde nahi dituzu?"
+msgstr "Sinadura hau aldatu egin duzu, baina ez duzu gorde."
 
 #: ../mail/mail.error.xml.h:103
-#, fuzzy
 msgid "Unable to connect to the GroupWise server."
-msgstr "Huts egin du LDAP zerbitzariarekin konektatzean"
+msgstr "Huts egin du GroupWise zerbitzariarekin konektatzean"
 
 #: ../mail/mail.error.xml.h:104
-#, fuzzy
 msgid ""
 "Unable to open the drafts folder for this account.  Use the system drafts "
 "folder instead?"
 msgstr ""
-"Ezin da kontu honetako zirriborroen karpeta ireki.\n"
-"Zirriborroen karpeta lehenetsia erabili nahi duzu?"
+"Ezin da ireki kontu honen zirriborroen karpeta. Horren ordez sistemaren "
+"zirriborro-karpeta erabili nahi duzu?"
 
 #: ../mail/mail.error.xml.h:105
-#, fuzzy
 msgid "Unable to read license file."
-msgstr ""
-"Ezin da fitxategian bilatu: %s\n"
-"%s"
+msgstr "Ezin da lizetzia-fitxategia irakurri."
 
 #: ../mail/mail.error.xml.h:106
-#, fuzzy
 msgid "Use _Default"
-msgstr "Lehenetsia"
+msgstr "Erabili _lehenetsia"
 
 #: ../mail/mail.error.xml.h:107
-#, fuzzy
 msgid "Use default drafts folder?"
-msgstr "Zereginen karpeta lehenetsia irekitzen"
+msgstr "Zirriborroen karpeta lehenetsia erabili nahi duzu?"
 
 #: ../mail/mail.error.xml.h:108
 msgid "You have not filled in all of the required information."
@@ -14534,9 +14003,8 @@ msgid "You may not create two accounts with the same name."
 msgstr "Ezin dituzu izen bereko bi kontu izan."
 
 #: ../mail/mail.error.xml.h:111
-#, fuzzy
 msgid "You must name this Search Folder."
-msgstr "Karpeta birtualari izena eman behar diozu."
+msgstr "Bilaketa-karpetari izena eman behar diozu."
 
 #: ../mail/mail.error.xml.h:112
 msgid "You must specify a folder."
@@ -14548,38 +14016,38 @@ msgid ""
 "Either by selecting the folders individually, and/or by selecting all local "
 "folders, all remote folders, or both."
 msgstr ""
+"Gutxienez karpeta bat zehaztu behar duzu iturburu gisa.\n"
+"Karpetak banaka hauta ditzakezu, eta/edo karpeta lokal guztiak\n"
+"hautatu, edo urruneko karpeta guztiak, edo biak."
 
 #: ../mail/mail.error.xml.h:115
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr ""
+"Huts egin du &quot;{0}&quot;zerbitzarian &quot;{0}&quot; gisa saioa hastean."
 
 #: ../mail/mail.error.xml.h:116
 msgid "Your message with the subject &quot;{0}&quot; was not delivered."
-msgstr ""
+msgstr "&quot;{0}&quot; gaia duen mezua ezin izan da bidali."
 
 #: ../mail/mail.error.xml.h:117
-#, fuzzy
 msgid "_Append"
-msgstr "Aspen"
+msgstr "Era_ntsi"
 
 #: ../mail/mail.error.xml.h:118
 msgid "_Discard changes"
 msgstr "_Ez gorde"
 
 #: ../mail/mail.error.xml.h:119
-#, fuzzy
 msgid "_Empty Trash"
 msgstr "Hustu _zakarrontzia"
 
 #: ../mail/mail.error.xml.h:120
-#, fuzzy
 msgid "_Expunge"
 msgstr "_Borratu betiko"
 
 #: ../mail/mail.error.xml.h:121
-#, fuzzy
 msgid "_Open Messages"
-msgstr "_Ireki mezua"
+msgstr "_Ireki mezuak"
 
 #: ../mail/message-list.c:996
 msgid "Unseen"
@@ -14645,9 +14113,8 @@ msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
 #: ../mail/message-list.c:2042
-#, fuzzy
 msgid "Message List"
-msgstr "Mezuak"
+msgstr "Mezuen zerrenda"
 
 #: ../mail/message-list.c:3387
 msgid "Generating message list"
@@ -14697,7 +14164,7 @@ msgstr "Egin jarraipena"
 msgid "For Your Information"
 msgstr "Informazio gisa"
 
-#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:41
 msgid "Forward"
 msgstr "Birbidali"
 
@@ -14705,11 +14172,11 @@ msgstr "Birbidali"
 msgid "No Response Necessary"
 msgstr "Ez da beharrezkoa erantzutea"
 
-#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:82
+#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply"
 msgstr "Erantzun"
 
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:83
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to All"
 msgstr "Erantzun denei"
 
@@ -14738,100 +14205,92 @@ msgid "Subject contains"
 msgstr "gaiak hau dauka"
 
 #: ../mail/searchtypes.xml.h:6
-#, fuzzy
 msgid "Subject or Sender contains"
-msgstr "gaiak hau dauka"
+msgstr "Gaiak edo Bidaltzaileak hau dauka"
 
 #: ../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 ""
+"Formatu emateko plugin-a lineako audioko eranskinak bistaratu eta zuzenean "
+"Evolution-etik erreproduzitzeko."
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
 msgid "Audio inline plugin"
-msgstr ""
+msgstr "Lineako audio plugin-a"
 
 #: ../plugins/backup-restore/backup-restore.c:51
 msgid "Select name of Evolution archive"
-msgstr ""
+msgstr "Hautatu Evolution-en artxiboaren izena"
 
 #: ../plugins/backup-restore/backup-restore.c:61
 msgid "_Restart Evolution after backup"
-msgstr ""
+msgstr "_Berrabiatu Evolution-en babeskopia egin ondoren"
 
 #: ../plugins/backup-restore/backup-restore.c:89
 msgid "Select Evolution archive to restore"
-msgstr ""
+msgstr "Hautatu Evolution-en artxiboa leheneratzeko"
 
 #: ../plugins/backup-restore/backup-restore.c:97
 msgid "_Restart Evolution after restore"
-msgstr ""
+msgstr "_Berrabiatu Evolution leheneratu ondoren"
 
 #: ../plugins/backup-restore/backup.c:109
-#, fuzzy
 msgid "Backup Evolution directory"
-msgstr "Evolution errorea"
+msgstr "Egin Evolution direktorioaren babeskopia"
 
 #: ../plugins/backup-restore/backup.c:111
-#, fuzzy
 msgid "Restore Evolution directory"
-msgstr "Evolution errorea"
+msgstr "Leheneratu Evolution-en direktorioa"
 
 #: ../plugins/backup-restore/backup.c:113
-#, fuzzy
 msgid "Check Evolution archive"
-msgstr "Evolution-en talde-lanerako suitea"
+msgstr "Egiaztatu Evolution-en artxiboa"
 
 #: ../plugins/backup-restore/backup.c:115
-#, fuzzy
 msgid "Restart Evolution"
-msgstr "Ezin da Ximian Evolution-en shell-a atzitu."
+msgstr "Berrabiatu Evolution"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr ""
+"Plugin-a babeskopia egiteko eta Evolution-en datuak eta ezarpenak "
+"leheneratzeko."
 
-#. the path to the shared library
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
 msgid "Backup and restore plugin"
-msgstr ""
+msgstr "Babeskopia egiteko eta leheneratzeko plugin-a"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
-#, fuzzy
 msgid "Backup Settings..."
-msgstr "_Ezarpenak..."
+msgstr "Babeskopiaren ezarpenak..."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
-#, fuzzy
 msgid "Backup and restore Evolution data and settings"
-msgstr "Aldatu Evolution-en ezarpenak"
+msgstr "Egin babeskopia eta leheneratu Evolution-en datuak eta ezarpenak"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
-#, fuzzy
 msgid "Restore Settings..."
-msgstr "Pilot-aren ezarpenak..."
+msgstr "Leheneratu ezarpenak..."
 
 #: ../plugins/bbdb/bbdb.c:404
-#, fuzzy
 msgid "Automatic Contacts"
-msgstr "Kontaktu garrantzitsuenak"
+msgstr "Kontaktu automatikoak"
 
 #: ../plugins/bbdb/bbdb.c:413
-#, fuzzy
 msgid "<span weight=\"bold\">Automatic Contacts</span>"
-msgstr "Bidalitako mezuak eta zirriborroak"
+msgstr "<span weight=\"bold\">Kontaktu automatikoak</span>"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:426
 msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
-msgstr ""
+msgstr "_Automatikoki sortutako sarrerak helbide-liburuan mezuei erantzutean"
 
 #: ../plugins/bbdb/bbdb.c:444
-#, fuzzy
 msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
-msgstr "Bidalitako mezuak eta zirriborroak"
+msgstr "<span weight=\"bold\">Berehalako mezularitzako kontaktuak</span>"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:457
@@ -14839,287 +14298,257 @@ msgid ""
 "Periodically synchronize contact information and images from my _instant "
 "messenger"
 msgstr ""
+"Sinkronizatu aldizka kontaktuen datuak eta irudiak zure _berehalako "
+"mezularitzarekin"
 
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:464
 msgid "Synchronize with _buddy list now"
-msgstr ""
+msgstr "Sinkronizatu _lagunen zerrendarekin"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
-#, fuzzy
 msgid "Automatic contacts"
-msgstr "Erakutsi kontaktuak"
+msgstr "Kontaktu automatikoak"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
 msgid ""
 "Automatically fills your addressbook with names and email addresses as you "
 "reply to mails. Also fills in IM contact information from your buddy lists."
 msgstr ""
+"Automatikoki helbide-liburua betetzen du erantzuten duzun izen eta "
+"helbideekin. Berehalako Mezularitzako kontaktuak ere betetzen ditu lagunen "
+"zerrendatik."
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
-msgstr ""
+msgstr "BBDB"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-#, fuzzy
 msgid "Local Calendars"
-msgstr "Egutegia kargatzen"
+msgstr "Egutegi lokalak"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
 msgid "Provides core functionality for local calendars."
-msgstr ""
+msgstr "Egutegi lokaleko funtzionalitate-motorra eskaintzen du."
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-#, fuzzy
 msgid "HTTP Calendars"
-msgstr "Egutegia"
+msgstr "HTTP egutegiak"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
 msgid "Provides core functionality for webcal and http calendars."
-msgstr ""
+msgstr "Webcal eta HTTP egutegientzako funtzionalitate-motorra eskaintze du."
 
 #: ../plugins/calendar-weather/calendar-weather.c:54
 #: ../plugins/calendar-weather/calendar-weather.c:60
-#, fuzzy
 msgid "Weather: Cloudy"
-msgstr "Eguraldia"
+msgstr "Eguraldia: hodeiak"
 
 #: ../plugins/calendar-weather/calendar-weather.c:61
-#, fuzzy
 msgid "Weather: Fog"
-msgstr "Eguraldia"
+msgstr "Eguraldia: lainoa"
 
 #: ../plugins/calendar-weather/calendar-weather.c:62
 msgid "Weather: Partly Cloudy"
-msgstr ""
+msgstr "Eguraldia: hodei tarteak"
 
 #: ../plugins/calendar-weather/calendar-weather.c:63
-#, fuzzy
 msgid "Weather: Rain"
-msgstr "Eguraldia"
+msgstr "Eguraldia: euria"
 
 #: ../plugins/calendar-weather/calendar-weather.c:64
-#, fuzzy
 msgid "Weather: Snow"
-msgstr "Eguraldia"
+msgstr "Eguraldia: elurra"
 
 #: ../plugins/calendar-weather/calendar-weather.c:65
-#, fuzzy
 msgid "Weather: Sunny"
-msgstr "Eguraldia"
+msgstr "Eguraldia: eguzkia"
 
 #: ../plugins/calendar-weather/calendar-weather.c:66
-#, fuzzy
 msgid "Weather: Thunderstorms"
-msgstr "Trumoi-ekaitza"
+msgstr "Eguraldia: trumoi-ekaitza"
 
 #: ../plugins/calendar-weather/calendar-weather.c:267
-#, fuzzy
 msgid "Select a location"
-msgstr "Hautatu ekintza bat"
+msgstr "Hautatu kokaleku bat"
 
 #: ../plugins/calendar-weather/calendar-weather.c:654
-#, fuzzy
 msgid "_Units:"
-msgstr "Unst"
+msgstr "_Unitateak:"
 
 #: ../plugins/calendar-weather/calendar-weather.c:661
 msgid "Metric (Celsius, cm, etc)"
-msgstr ""
+msgstr "Metrikoa (Celsius, zm, e.a.)"
 
 #: ../plugins/calendar-weather/calendar-weather.c:662
 msgid "Imperial (Fahrenheit, inches, etc)"
-msgstr ""
+msgstr "Inperiala (Fahrenheit, hatzak, e.a.)"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
 msgid "Provides core functionality for weather calendars."
-msgstr ""
+msgstr "Eguraldi-egutegien funtzionalitatearen motorra eskaintzen du."
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
-#, fuzzy
 msgid "Weather Calendars"
-msgstr "Egutegia"
+msgstr "Eguraldi-egutegiak"
 
 #: ../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 ""
+"Probako plugin-a menu-leihoa agertarazten duena gauzak arbelean kopiatzeko."
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-#, fuzzy
 msgid "Copy _Email Address"
-msgstr "_Helbide elektronikoa:"
+msgstr "Kopiatu _helbide elektronikoa"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-#, fuzzy
 msgid "Copy tool"
-msgstr "Kopiatu karpeta honetara"
+msgstr "Kopiatzeko tresna"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:1
-#, fuzzy
 msgid "Check whether Evolution is the default mailer"
-msgstr "Zereginen karpeta lehenetsia irekitzen"
+msgstr "Begiratu Evolution posta-bezero lehenetsia den"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
 msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
+"Evolution abiatzen den bakoitzean begiratu lehenespeneko posta-bezeroa den "
+"edo ez."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
 msgid "Checks whether Evolution is the default mail client on startup."
-msgstr ""
+msgstr "Begiratu Evolution posta-bezeroa den abiaratzean."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-#, fuzzy
 msgid "Default Mail Client "
-msgstr "_Erantzuteko estiloa:"
+msgstr "Posta-bezero lehenetsia"
 
 #: ../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 "Evolution posta-bezero lehenetsia izatea nahi duzu?"
 
 #: ../plugins/default-source/default-source.c:82
 #: ../plugins/default-source/default-source.c:109
-#, fuzzy
 msgid "Mark as default folder"
-msgstr "Zereginen karpeta lehenetsia irekitzen"
+msgstr "Markatu karpeta lehenetsi gisa"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
-msgstr "Ireki beste erabiltzaile baten karpeta"
+msgstr "Ireki beste erabiltzaileen karpeta"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
-#, fuzzy
 msgid "_Account:"
-msgstr "Kontuaren izena"
+msgstr "_Kontua:"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3
 msgid "_Folder Name:"
-msgstr "Ka_rpeta-izena:"
+msgstr "_Karpetaren izena:"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4
-#, fuzzy
 msgid "_User:"
-msgstr "_Erabiltzaile-izena:"
+msgstr "_Erabiltzailea:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
 #: ../plugins/exchange-operations/exchange-account-setup.c:63
-#, fuzzy
 msgid "Secure Password"
-msgstr "Idatzi pasahitza"
+msgstr "Pasahitz segurua"
 
 #. i18n: "NTLM" probably doesn't translate
 #: ../plugins/exchange-operations/exchange-account-setup.c:66
-#, fuzzy
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
 msgstr ""
-"Aukera honek zerbitzariarekin konektatuko zaitu Kerberos 5 "
-"autentifikazioaren bidez."
+"Aukera honek Exchange zerbitzariarekin konektatuko zaitu  NTLM pasahitz "
+"seguruaren autentifikazioaren bidez."
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:74
-#, fuzzy
 msgid "Plaintext Password"
-msgstr "Idatzi pasahitza"
+msgstr "Testu arrunteko pasahitza"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:76
-#, fuzzy
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
 msgstr ""
-"Aukera honek IMAP zerbitzariarekin konektatuko zaitu testu arrunteko "
+"Aukera honek Exchange zerbitzariarekin konektatuko zaitu testu arrunteko "
 "pasahitzaren bidez."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:251
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:253
 msgid "Out Of Office"
 msgstr "Bulegotik kanpo"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:258
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:260
 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 ""
-"<small>Behean idatzitako mezua automatikoki bidaliko zaie bulegoan ez "
-"zaudenean \n"
-"mezu bat bidaltzen dizuten guztiei.</small>"
+"Behean idatzitako mezua automatikoki bidaliko zaie bulegoan ez zaudenean \n"
+"mezu bat bidaltzen dizuten guztiei."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:270
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:272
+#: ../plugins/exchange-operations/exchange-account-setup.c:277
 msgid "I am out of the office"
 msgstr "Orain bulegotik kanpo nago"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:271
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:273
+#: ../plugins/exchange-operations/exchange-account-setup.c:276
 msgid "I am in the office"
 msgstr "Orain bulegoan nago"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:321
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:324
 msgid "Change the password for Exchange account"
-msgstr "Idatzi %s(r)en pasahitza"
+msgstr "Aldatu Exchange kontuaren pasahitza"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:323
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:2
-#, fuzzy
 msgid "Change Password"
-msgstr "Idatzi pasahitza"
+msgstr "Aldatu pasahitza"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:327
+#: ../plugins/exchange-operations/exchange-account-setup.c:331
 msgid "Manage the delegate settings for Exchange account"
-msgstr ""
+msgstr "Kudeatu Exchange kontuaren delegatze-ezarpenak"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:329
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Delegation Assitant"
-msgstr "LDAP konfiguratzeko laguntzailea"
+msgstr "Delegatzeko laguntzailea"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:339
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:345
 msgid "Miscelleneous"
-msgstr "<b>Mezuak bidali:</b>"
+msgstr "Hainbat"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:355
 msgid "View the size of all Exchange folders"
-msgstr "Bistaratu hautatutako karpeta"
+msgstr "Ikusi Exchange-ko karpeta guztien tamaina"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:351
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "Folders Size"
-msgstr "Karpetak"
+msgstr "Karpeten tamaina"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:358
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:364
 msgid "Exchange Settings"
-msgstr "Eguraldiaren ezarpenak"
+msgstr "Exchange-ren ezarpenak"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:601
+#: ../plugins/exchange-operations/exchange-account-setup.c:611
 msgid "_OWA Url:"
-msgstr ""
+msgstr "_OWA URLa:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:626
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:636
 msgid "A_uthenticate"
-msgstr "Autentifikazioak huts egin du"
+msgstr "A_utentifikatu"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:814
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:824
 msgid "Authentication Type"
-msgstr "A_utentifikazio-mota: "
+msgstr "Autentifikazio-mota: "
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:828
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:838
 msgid "Ch_eck for Supported Types"
 msgstr " _Begiratu zein mota onartzen diren "
 
@@ -15131,141 +14560,127 @@ msgid ""
 "The current password does not match the existing password for your account. "
 "Please enter the correct password"
 msgstr ""
+"Uneko pasahitza ez dator bat zure kontuaren pasahitzarekin.Idatzi pasahitz "
+"zuzena"
 
 #: ../plugins/exchange-operations/exchange-change-password.c:122
 msgid "The two passwords do not match. Please re-enter the passwords."
-msgstr ""
+msgstr "Bi pasahitzak ez datoz bat. Idatzi berriro pasahitzak."
 
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:3
-#, fuzzy
 msgid "Confirm Password:"
-msgstr "Idatzi pasahitza"
+msgstr "Berretsi pasahitza:"
 
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:4
-#, fuzzy
 msgid "Current Password:"
-msgstr "Idatzi pasahitza"
+msgstr "Uneko pasahitza:"
 
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:5
-#, fuzzy
 msgid "New Password:"
-msgstr "Pasahitza"
+msgstr "Pasahitz berria:"
 
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:6
 msgid "Your current password has expired. Please change your password now."
-msgstr ""
+msgstr "Uneko pasahitza iraungitu egin da. Aldatu pasahitza orain."
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:144
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:576
-#, fuzzy
 msgid "Custom"
-msgstr "Ikuspegi pertsonalizatua"
+msgstr "Pertsonalizatu"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:191
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
-#, fuzzy, c-format
+#, c-format
 msgid "Permissions for %s"
-msgstr "\"%s\" - propietateak"
+msgstr "%s(r)en baimenak"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:421
-#, fuzzy
 msgid "Delegate To"
 msgstr "Delegatu:"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:562
 #, c-format
 msgid "Remove the delegate %s?"
-msgstr ""
+msgstr "Kendu %s delegatua?"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:679
-#, fuzzy
 msgid "Could not access Active Directory"
-msgstr ""
-"Ezin izan da %s direktorioa sortu:\n"
-"%s"
+msgstr "Ezin izan da Active Direktoriora sartu"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:694
-#, fuzzy
 msgid "Could not find self in Active Directory"
-msgstr "Ezin izan da cache-direktorioa ireki: %s"
+msgstr "Ezin izan da Active Direktorio bera aurkitu"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:707
-#, fuzzy, c-format
+#, c-format
 msgid "Could not find delegate %s in Active Directory"
-msgstr "Ezin izan da cache-direktorioa ireki: %s"
+msgstr "Ezin izan da %s delegatua Active Direktorioan aurkitu"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:719
-#, fuzzy, c-format
+#, c-format
 msgid "Could not remove delegate %s"
-msgstr "Ezin izan da daturik idatzi: %s"
+msgstr "Ezin izan da %s delegatua kendu"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:779
-#, fuzzy
 msgid "Could not update list of delegates."
-msgstr "Ezin izan da objektu baliogabea eguneratu"
+msgstr "Ezin izan da delegatuen zerrenda eguneratu."
 
 #: ../plugins/exchange-operations/exchange-delegates.c:797
-#, fuzzy, c-format
+#, c-format
 msgid "Could not add delegate %s"
-msgstr "Ezin izan da '%s' karpeta ezabatu: %s"
+msgstr "Ezin izan da %s delegatua gehitu"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:965
-#, fuzzy
 msgid "Error reading delegates list."
-msgstr "Errorea zerrenda gehitzean"
+msgstr "Errorea delegatuen zerrenda irakurtzean."
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
-msgstr ""
+msgstr "Egilea (irakurri, sortu)"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:2
 msgid "C_alendar:"
-msgstr "E_gutegia:"
+msgstr "_Egutegia:"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:3
-#, fuzzy
 msgid "Co_ntacts:"
-msgstr "Kontaktuak: "
+msgstr "_Kontaktuak:"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:4
-#, fuzzy
 msgid "Delegate Permissions"
-msgstr "Delegatua"
+msgstr "Delegatu baimenak"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:5
-#, fuzzy
 msgid "Delegates"
-msgstr "Delegatua"
+msgstr "Delegatuak"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Editor (read, create, edit)"
-msgstr ""
+msgstr "Argitaratzailea (irakurri, sortu, editatu)"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
-#, fuzzy
 msgid "Permissions for"
-msgstr "Baimena ukatuta"
+msgstr "Baimenak:"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#, fuzzy
 msgid "Reviewer (read-only)"
-msgstr "Zerbitzua prest"
+msgstr "Gainbegiratzailea (irakurtzeko soilik)"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:10
 msgid ""
 "These users will be able to send mail on your behalf\n"
 "and access your folders with the permissions you give them."
 msgstr ""
+"Erabiltzaile hauek zure izenean posta bidal dezakete\n"
+"eta ematen dizkiezun baimenekin zure karpetetan sartu."
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:12
-#, fuzzy
 msgid "_Delegate can see private items"
-msgstr "Sortu zeregin berria"
+msgstr "_Delegatuak elementu pribatuak ikus ditzake"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:14
-#, fuzzy
 msgid "_Inbox:"
-msgstr "Sarrerako ontzia"
+msgstr "_Sarrerako ontzia:"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 msgid "_Tasks:"
@@ -15273,132 +14688,110 @@ msgstr "_Zereginak:"
 
 #: ../plugins/exchange-operations/exchange-folder-permission.c:58
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
-#, fuzzy
 msgid "Permissions..."
-msgstr "Baimena ukatuta"
+msgstr "Baimenak..."
 
 #: ../plugins/exchange-operations/exchange-folder-size-display.c:136
-#, fuzzy
 msgid "Folder Name"
-msgstr "Ka_rpeta-izena:"
+msgstr "Karpetaren izena"
 
 #: ../plugins/exchange-operations/exchange-folder-size-display.c:140
-#, fuzzy
 msgid "Folder Size"
-msgstr "Ka_rpeta-izena:"
+msgstr "Karpetaren tamaina"
 
 #: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
-#, fuzzy
 msgid "Exchange Folder Tree"
-msgstr "Posta-iragazkiak"
+msgstr "Exchange-ren karpeta-zuhaitza"
 
 #: ../plugins/exchange-operations/exchange-folder.c:62
 #: ../plugins/exchange-operations/exchange-folder.c:223
 #: ../plugins/exchange-operations/exchange-folder.c:233
-#, fuzzy
 msgid "Unsubscribe Folder..."
-msgstr "_Egin karpeten harpidetza..."
+msgstr "Kendu karpetaren harpidetza..."
 
 #: ../plugins/exchange-operations/exchange-folder.c:460
 #: ../plugins/exchange-operations/exchange-folder.c:520
-#, fuzzy, c-format
+#, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
-msgstr "\"%s\" karpetaren harpidetza kentzen"
+msgstr "\"%s\" karpetaren harpidetza kentzea nahi duzu?"
 
 #: ../plugins/exchange-operations/exchange-folder.c:472
 #: ../plugins/exchange-operations/exchange-folder.c:532
-#, fuzzy, c-format
+#, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "\"%s\" karpetaren harpidetza kentzen"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:301
-#, fuzzy
 msgid "(Permission denied.)"
-msgstr "Baimena ukatuta"
+msgstr "(Baimena ukatuta)"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
 msgid "Add User:"
-msgstr ""
+msgstr "Erabiltzaile denak:"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
-#, fuzzy
 msgid "Add User"
-msgstr "_Gehitu"
+msgstr "Gehitu erabiltzailea"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
-#, fuzzy
 msgid "<b>Permissions</b>"
-msgstr "Ordu-zonak"
+msgstr "<b>Baimenak</b>"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
-#, fuzzy
 msgid "Cannot Delete"
-msgstr "Sartu delegatua"
+msgstr "Ezin da delegatu"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
-#, fuzzy
 msgid "Cannot Edit"
-msgstr "Kontaktu-editorea"
+msgstr "Ezin da editatu"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
-#, fuzzy
 msgid "Create items"
-msgstr "Sortu karpeta berria"
+msgstr "Sortu elementuak"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
-#, fuzzy
 msgid "Create subfolders"
-msgstr "Sortu karpeta berria"
+msgstr "Sortu azpikarpetak"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
-#, fuzzy
 msgid "Delete Any Items"
-msgstr "Delegatua"
+msgstr "Ezabatu edozein elementu"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
-#, fuzzy
 msgid "Delete Own Items"
-msgstr "Delegatua"
+msgstr "Ezabatu elementu propioak"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
-#, fuzzy
 msgid "Edit Any Items"
-msgstr "Editatu iragazkiak"
+msgstr "Editatu edozein elementu"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
-#, fuzzy
 msgid "Edit Own Items"
-msgstr "Editatu iragazkiak"
+msgstr "Editatu elementu propioak"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
-#, fuzzy
 msgid "Folder contact"
-msgstr "Bilatu kontaktua hemen:"
+msgstr "Karpetaren kontaktua"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
-#, fuzzy
 msgid "Folder owner"
-msgstr "_Bidaltzailearen araberako karpeta birtuala"
+msgstr "Karpetaren jabea"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
-#, fuzzy
 msgid "Folder visible"
-msgstr "%d ikusgai"
+msgstr "Karpetaren ikusgaitasuna"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
-#, fuzzy
 msgid "Read items"
-msgstr "Irakurragiriak"
+msgstr "Irakurri elementuak"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
-#, fuzzy
 msgid "Role: "
-msgstr "Funtzioa"
+msgstr "Funtzioa:"
 
 #: ../plugins/exchange-operations/exchange-user-dialog.c:144
-#, fuzzy
 msgid "Select User"
-msgstr "Hautatu karpeta"
+msgstr "Hautatu erabiltzailea"
 
 #: ../plugins/exchange-operations/exchange-user-dialog.c:182
 msgid "Addressbook..."
@@ -15406,39 +14799,35 @@ msgstr "Helbide-liburua..."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
 msgid "Subscribe to Other User's Contacts"
-msgstr ""
+msgstr "Harpidetu beste erabiltzaileen kontaktuetan"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1
-#, fuzzy
 msgid "Subscribe to Other User's Calendar"
-msgstr "Ken_du beste erabiltzaile baten karpeta"
+msgstr "Harpidetu beste erabiltzaileen egutegira"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
 msgid "Cannot change password due to configuration problems."
-msgstr ""
+msgstr "Ezin da pasahitza aldatu konfigurazio arazoak daudelako."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
-#, fuzzy
 msgid "Cannot display folders."
-msgstr ""
-"Ezin izan da karpetaren izena aldatu:\n"
-"%s"
+msgstr "Ezin da karpeta bistaratu."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
 msgid ""
 "Changes to Exchange account configuration will take place after you quit and "
 "restart Evolution."
 msgstr ""
+"Exchange kontuaren konfigurazioaren aldaketak Evolution-etik irten eta "
+"berriro abiatzean eragingo dira"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
-#, fuzzy
 msgid "Could not authenticate to server."
-msgstr "Huts egin du %s POP zerbitzarian autentifikatzean: %s"
+msgstr "Ezin izan da zerbitzarian autentifikatu."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
-#, fuzzy
 msgid "Could not change password."
-msgstr "Ez duzu idatzi pasahitza."
+msgstr "Ezin izan da pasahitza aldatu."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid ""
@@ -15446,62 +14835,57 @@ msgid ""
 "an unknown error occurred. Check the URL, \n"
 "username, and password, and try again."
 msgstr ""
+"Ezin da Exchange-ko kontua konfiguratu errore\n"
+"ezezaguna gertatu delako. Egiaztatu URLa, \n"
+" erabiltzaile-izena eta pasahitza, eta saiatu berriro."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
-#, fuzzy
 msgid "Could not connect to server {0}."
-msgstr "Ezin izan da %s POP zerbitzariarekin konektatu"
+msgstr "Ezin izan da {0} zerbitzariarekin konektatu."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
-#, fuzzy
 msgid "Could not determine folder permissions for delegates."
-msgstr "Ezin izan da wombat zerbitzaria abiarazi"
+msgstr "Ezin izan da delegatuen karpeten baimenak zehaztu."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not find Exchange Web Storage System."
-msgstr ""
+msgstr "Ezin izan da Exchange-ren web biltegiratze sistema aurkitu."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
-#, fuzzy
 msgid "Could not locate server {0}."
-msgstr "Ezin izan da kanalizaziorik sortu: %s"
+msgstr "Ezin izan da {0} zerbitzaria kokatu."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not make {0} a delegate"
-msgstr ""
+msgstr "Ezin izan da {0} delegatu egin"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
-#, fuzzy
 msgid "Could not read folder permissions"
-msgstr "Ezin izan da karpetaren izena aldatu: %s"
+msgstr "Ezin izan da karpetaren baimenak irakurri."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
-#, fuzzy
 msgid "Could not read folder permissions."
-msgstr "Ezin izan da karpetaren izena aldatu: %s"
+msgstr "Ezin izan da karpetaren baimenak irakurri."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
-#, fuzzy
 msgid "Could not read out-of-office state"
-msgstr "Ezin izan da kanalizaziorik sortu: %s"
+msgstr "Ezin izan da 'bulegotik kanpo' egoera irakurri"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
-#, fuzzy
 msgid "Could not update folder permissions."
-msgstr "Ezin izan da '%s' karpeta ezabatu: %s"
+msgstr "Ezin izan da karpetaren baimenak eguneratu."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
-#, fuzzy
 msgid "Could not update out-of-office state"
-msgstr "Ezin izan da objektua eguneratu"
+msgstr "Ezin izan da 'bulegotik kanpo' egoera eguneratu"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Exchange Account is offline."
-msgstr ""
+msgstr "Exchange kontua lineaz kanpo dago."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Exchange Connector access error."
-msgstr ""
+msgstr "Exchange Konektatzailearen sarbide-errorea"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid ""
@@ -15519,26 +14903,31 @@ msgid ""
 "html\n"
 "  "
 msgstr ""
+"Exchange Konektatzaileak Exchange zerbitzariko zenbait funtzionalitate "
+"erabiltzea behar du, baina desgaituta edo blokeatuta daudela dirudi "
+"(arruntena nahigabe gertatzea izaten da). Exchange-ko administratzaileak "
+"funtzionalitate hau gaitu beharko du zuk Ximian Konektatzailea erabiltzeko.\n"
+"\n"
+"Exchange-ko administratzaileari xehetasunak emateko jarraitu azpiko esteka:\n"
+"http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328."
+"html\n"
+"  "
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
-#, fuzzy
 msgid "Failed to update delegates:"
-msgstr "Huts egin du autentifikatzean.\n"
+msgstr "Huts egin du delegatuak eguneratzean"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
-#, fuzzy
 msgid "Folder already exists"
-msgstr "Txartelaren ID hori badago lehendik"
+msgstr "Karpeta badago lehendik"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
-#, fuzzy
 msgid "Folder does not exist"
-msgstr "`%s' karpeta ez dago."
+msgstr "Karpeta ez dago"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
-#, fuzzy
 msgid "Folder offline"
-msgstr "Lan egin lineaz kanpo"
+msgstr "Karpeta lineaz kanpo"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 #: ../shell/e-shell.c:1265
@@ -15550,44 +14939,45 @@ msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
 msgstr ""
+"OWA beste helbide batean exekutatzen ari bada, zehaztu kontuaren  "
+"konfigurazioko elkarrizketa-koadroan."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Mailbox for {0} is not on this server."
-msgstr ""
+msgstr "{0}(r)en postontzia ez dago zerbitzari honetan."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Make sure the URL is correct and try again."
-msgstr ""
+msgstr "Ziurtatu URLa zuzenda dela eta saiatu berriro."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Make sure the server name is spelled correctly and try again."
-msgstr ""
+msgstr "Ziurtatu zerbitzari-izena ongi idatzita dagoela eta saiatu berriro."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Make sure the username and password are correct and try again."
 msgstr ""
+"Ziurtatu erabiltzaile-izena eta pasahitza zuzenak direla eta saiatu berriro."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "No Global Catalog server configured for this account."
-msgstr ""
+msgstr "Ez da Katalogo Globalaren zerbitzaririk konfiguratu kontuan."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "No mailbox for user {0} on {1}."
-msgstr ""
+msgstr "Ezin dago {0}(r)en postontzirik {1}(e)n."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
-#, fuzzy
 msgid "No such user {0}"
-msgstr "%s karpeta ez dago"
+msgstr "Ez dago {0} bezalako erabiltzailerik"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Password successfully changed."
-msgstr ""
+msgstr "Pasahitza ongi aldatu da."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
-#, fuzzy
 msgid "Please restart Evolution"
-msgstr "Ezin da Ximian Evolution-en shell-a atzitu."
+msgstr "Berrabiatu Evolution"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Please select a user."
@@ -15595,25 +14985,28 @@ msgstr "Hautatu erabiltzaile bat."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Server rejected password because it is too weak."
-msgstr ""
+msgstr "Zerbitzariak pasahitza ezetsi du ahulegia delako."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "The Exchange account will be disabled when you quit Evolution"
-msgstr ""
+msgstr "Exchange kontua desgaitu egingo da Evolution-etik irtetzean"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "The Exchange account will be removed when you quit Evolution"
-msgstr ""
+msgstr "Exchange kontua kendu egingo da Evolution-etik irtetzean"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "The Exchange server is not compatible with Exchange Connector."
-msgstr ""
+msgstr "Exchange zerbitzaria ez da Exchange Konektatzailearekin bateragarria."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid ""
 "The server is runinng Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
 msgstr ""
+"Zerbitzariak Exchange 5.5. exekutatzen ari da\n"
+"Exchange Konektatzaileak Microsoft Exchange 2000 eta 2003 soilik onartzen "
+"ditu."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid ""
@@ -15623,201 +15016,187 @@ msgid ""
 "\n"
 "Or you might have just typed your password wrong."
 msgstr ""
+"Baliteke zerbitzariak Windows-eko domeinu-izena zure erabiltzaile-izenaren "
+"zati bezala eskatzea (adib. &quot;DOMEINUA\\erabiltzailea&quot;).\n"
+"\n"
+"Edo pasahitza gaizki idatziko zenuen."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid "Try again with a different password."
-msgstr ""
+msgstr "Saiatu berriro beste pasahitz batekin."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
-#, fuzzy
 msgid "Unable to add user to access control list:"
-msgstr "Ezin da spool-karpeta prozesatu"
+msgstr "Ezin da erabiltzailea sarbide-kontrol zerrendan gehitu:"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
-#, fuzzy
 msgid "Unable to edit delegates."
-msgstr "Ezin da egiaztatu 'leaf' sinadura"
+msgstr "Ezin dira ordezkariak editatu."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
-#, fuzzy
 msgid "Unknown error looking up {0}"
-msgstr "Errore ezezaguna"
+msgstr "Errore ezezaguna {0} bilatzean"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
-#, fuzzy
 msgid "Unknown error."
-msgstr "Errore ezezaguna"
+msgstr "Errore ezezaguna."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
-#, fuzzy
 msgid "Unknown type"
-msgstr "Ezezaguna"
+msgstr "Mota ezezaguna"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unsupported operation"
-msgstr "Onartzen ez den eragiketa"
+msgstr "Onartu gabeko eragiketa"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
-#, fuzzy
 msgid "You are nearing your quota available for storing mails on this server."
-msgstr "IMAP zerbitzarietako posta irakurri eta gordetzeko."
+msgstr "Zerbitzariko kuotara (posta gordetzeko) iristen ari zara."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "You cannot make yourself your own delegate"
-msgstr ""
+msgstr "Ezin duzu zure burua ordezkari gisa jarri"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "You have exceeded your quota for storing mails on this server."
-msgstr ""
+msgstr "Zerbitzariko zure (posta gordetzeko) kuota gainditu duzu "
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "You may only configure a single Exchange account."
-msgstr ""
+msgstr "Exchange kontu bakuna konfigura dezakezu soilik"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid ""
 "Your current usage is : {0}KB. Try to clear up some space by deleting some "
 "mails."
-msgstr ""
+msgstr "Erabilitakoa: {0}KB. Saiatu lekua egiten zenbait posta ezabatuz."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid ""
 "Your current usage is : {0}KB. You will not be able to either send or "
 "recieve mails now."
-msgstr ""
+msgstr "Erabilitakoa: {0}KB. Ezin izango duzu posta jaso edo bidali"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "Your current usage is : {0}KB. You will not be able to send mails till you "
 "clear up some space by deleting some mails."
 msgstr ""
+"Erabilitakoa: {0}KB. Ezin izango duzu posta jaso edo bidali lekua egin arte "
+"(zenbait posta ezabatuz)."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
-msgstr ""
+msgstr "Pasahitza iraungitu da."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "{0} cannot be added to an access control list"
-msgstr ""
+msgstr "{0} ezin da gehitu sarbide-kontrol zerrendan"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "{0} is already a delegate"
-msgstr ""
+msgstr "{0} jadanik delegatua da"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0} is already in the list"
-msgstr ""
+msgstr "{0} jadanik zerrendan dago"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
 msgid "Subscribe to Other User's Tasks"
-msgstr ""
+msgstr "Harpidetu beste erabiltzaileen zereginetara"
 
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
-#, fuzzy
 msgid "Check folder permissions"
-msgstr "Karpeta-koherentzia egiaztatzen"
+msgstr "Begiratu karpetaren baimenak"
 
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
-#, fuzzy
 msgid "Subscribe to Other User's Folder"
-msgstr "Ireki beste erabiltzaile baten karpeta"
+msgstr "Harpidetu beste erabiltzaileen karpetan"
 
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
-#, fuzzy, c-format
+#, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "\"%s\" karpetaren harpidetza kentzen"
 
 #: ../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 ""
+"Baimendu posta-karpeten harpidetza kentzea karpeta-zuhaitzaren testuinguruko "
+"menuan."
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
-#, fuzzy
 msgid "Unsubscribe Folders"
-msgstr "_Egin karpeten harpidetza..."
+msgstr "Kendu karpeten harpidetza"
 
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
-#, fuzzy
 msgid "Checklist"
-msgstr "Lainobera itxia"
+msgstr "Egiaztapen-zerrenda"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-#, fuzzy
 msgid "Groupwise Account Setup"
-msgstr "Taldea"
+msgstr "Groupwise kontuaren konfigurazioa"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:77
-#, fuzzy
 msgid "Junk Settings"
-msgstr "Ezarpenak"
+msgstr "Baztergarrien ezarpenak"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:90
 msgid "<b>Junk Mail Settings</b>"
-msgstr ""
+msgstr "<b>Posta baztergarrien ezarpenak</b>"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:112
-#, fuzzy
 msgid "Junk Mail Settings..."
-msgstr "_Pilot-en ezarpenak..."
+msgstr "Posta baztergarrien ezarpenak..."
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:1
-#, fuzzy
 msgid "<b>Junk List :</b>"
-msgstr "Zereginen zerrenda"
+msgstr "<b>Baztergarrien zerrenda:</b>"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:2
-#, fuzzy
 msgid "Email:"
-msgstr "Helb. el."
+msgstr "Helb. el.:"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:3
-#, fuzzy
 msgid "Junk Mail Settings"
-msgstr "Ezarpenak"
+msgstr "Posta baztergarrien ezarpenak"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
 #: ../plugins/mail-account-disable/mail-account-disable.c:46
-#, fuzzy
 msgid "_Disable"
-msgstr "Desgaitu"
+msgstr "_Desgaitu"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:6
 msgid "_Enable"
 msgstr "_Gaitu"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:7
-#, fuzzy
 msgid "_Junk List"
-msgstr "ekaina"
+msgstr "_Baztergarrien zerrenda"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
-msgstr ""
+msgstr "Gehitu Bidaltzeko aukerak Groupwise-ko mezuei"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../widgets/misc/e-send-options.glade.h:17
-#, fuzzy
 msgid "Send Options"
-msgstr "Aukerak"
+msgstr "Bidaltzeko aukerak"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
-msgstr ""
+msgstr "Groupwise-ko kontuetako funtzioen plugin-a"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-#, fuzzy
 msgid "Groupwise Features"
-msgstr "Taldea"
+msgstr "Groupwise-en funtzioak"
 
 #: ../plugins/groupwise-features/process-meeting.c:49
-#, fuzzy
 msgid "Accept Tentatively"
-msgstr "Behin-behinekoa"
+msgstr "Onartu behin-behinekoa"
 
 #: ../plugins/groupwise-features/properties.glade.h:2
-#, fuzzy
 msgid "<b>Users :</b>"
-msgstr "<b>Falta:</b> "
+msgstr "<b>Erabiltzaileak:</b> "
 
 #: ../plugins/groupwise-features/properties.glade.h:4
 #: ../widgets/table/e-table-click-to-add.c:510
@@ -15826,93 +15205,80 @@ msgstr "Mezua"
 
 #: ../plugins/groupwise-features/properties.glade.h:6
 msgid "Shared Folder Notification"
-msgstr ""
+msgstr "Karpeta partekatuaren jakinarazpena"
 
 #: ../plugins/groupwise-features/properties.glade.h:8
 msgid "The participants will receive the following notification.\n"
-msgstr ""
+msgstr "Partaideak honako jakinarazpena jasoko dute.\n"
 
 #: ../plugins/groupwise-features/properties.glade.h:11
-#, fuzzy
 msgid "_Contacts..."
-msgstr "Kontaktuak"
+msgstr "_Kontaktuak..."
 
 #: ../plugins/groupwise-features/properties.glade.h:12
-#, fuzzy
 msgid "_Cutomize notification message"
-msgstr "Ezin izan da kanalizaziorik sortu: %s"
+msgstr "_Pertsonalizatu jakinarazpenaren mezua"
 
 #: ../plugins/groupwise-features/properties.glade.h:13
-#, fuzzy
 msgid "_Not Shared"
-msgstr "Ez da hasi"
+msgstr "Partekatu ga_be"
 
 #: ../plugins/groupwise-features/properties.glade.h:15
 msgid "_Shared With ..."
-msgstr ""
+msgstr "_Honekin partekatua..."
 
 #: ../plugins/groupwise-features/properties.glade.h:16
-#, fuzzy
 msgid "_Sharing"
-msgstr "Itzaldura"
+msgstr "_Partekatzea"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:1
-#, fuzzy
 msgid "<b>Name</b>"
-msgstr "<b>Falta:</b> "
+msgstr "<b>Izena</b>"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:2
 msgid "Access Rights"
-msgstr ""
+msgstr "Sarbide eskubideak"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
-#, fuzzy
 msgid "Add/Edit"
-msgstr "E_ditatu"
+msgstr "Gehitu/Editatu"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5
-#, fuzzy
 msgid "Con_tacts"
-msgstr "Kontaktuak"
+msgstr "_Kontaktuak"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
 msgid "Modify _folders/options/rules/"
-msgstr ""
+msgstr "Aldatu _karpetak/aukerak/arauak/"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
 msgid "Read items marked _private"
-msgstr ""
+msgstr "Irakurri _pribatu gisa markatutako elementuak"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
-#, fuzzy
 msgid "Reminder Notes"
-msgstr "Oroigarriak"
+msgstr "Jakinarazpeneko oharrak"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
-#, fuzzy
 msgid "Subscribe to my _alarms"
-msgstr "_Harpidetu"
+msgstr "Harpidetu _alarmetara"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
-#, fuzzy
 msgid "Subscribe to my _notifications"
-msgstr "_Harpidetu"
+msgstr "Harpidetu _jakinarazpetan"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:121
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Read"
-msgstr "Irakurrita"
+msgstr "_Irakurri"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:14
-#, fuzzy
 msgid "_Write"
-msgstr "_Inprimatu"
+msgstr "_Idatzi"
 
 #: ../plugins/groupwise-features/proxy-listing.glade.h:1
-#, fuzzy
 msgid "Proxy"
-msgstr "Lanb"
+msgstr "Proxy-a"
 
 #: ../plugins/groupwise-features/proxy-listing.glade.h:2
 #: ../smime/gui/smime-ui.glade.h:49
@@ -15922,133 +15288,119 @@ msgid "dialog1"
 msgstr "1 elkarrizketa-koadroa"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
-#, fuzzy
 msgid "<b>Account Name</b>"
-msgstr "Kontuaren izena"
+msgstr "<b>Kontuaren izena</b>"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
-#, fuzzy
 msgid "Proxy Login"
-msgstr "Saio-hasiera"
+msgstr "Proxy-aren saio-hasiera"
 
 #: ../plugins/groupwise-features/proxy-login.c:219
 #: ../plugins/groupwise-features/proxy-login.c:261
-#: ../plugins/groupwise-features/proxy.c:490
+#: ../plugins/groupwise-features/proxy.c:499
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sIdatzi %s(r)en pasahitza (%s erabiltzailea)"
 
 #: ../plugins/groupwise-features/proxy-login.c:484
-#, fuzzy
 msgid "_Proxy Login..."
-msgstr "I_nprimatu..."
+msgstr "_Proxy-aren saio-hasiera..."
 
-#: ../plugins/groupwise-features/proxy.c:672
+#: ../plugins/groupwise-features/proxy.c:680
 msgid "The Proxy tab will be available only when the account is enabled."
-msgstr ""
+msgstr "Proxy fitxa kontua gaitutakoan soilik egongo da eskuragarri."
 
 #: ../plugins/groupwise-features/share-folder-common.c:318
-#, fuzzy
 msgid "Users"
-msgstr "_Erabiltzaile-izena:"
+msgstr "Erabiltzaileak"
 
 #: ../plugins/groupwise-features/share-folder-common.c:319
 msgid "Enter the users and set permissions"
-msgstr ""
+msgstr "Sartu erabiltzaileak eta ezarri baimenak"
 
 #: ../plugins/groupwise-features/share-folder-common.c:338
-#, fuzzy
 msgid "New _Shared Folder..."
-msgstr "Kar_peta berria..."
+msgstr "Partekatutako _karpeta berria..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:453
-#, fuzzy
+#: ../plugins/groupwise-features/share-folder-common.c:446
 msgid "Sharing"
-msgstr "Itzaldura"
+msgstr "Partekatzea"
 
 #: ../plugins/groupwise-features/status-track.c:235
-#, fuzzy
 msgid "Track Message Status..."
-msgstr "Gorde mezuak honela..."
+msgstr "Jarraitu mezuaren egoera..."
 
 #: ../plugins/itip-formatter/itip-formatter.c:724
-#, fuzzy
 msgid "Unable to parse item"
-msgstr "Ezin da mezua eskuratu editoretik"
+msgstr "Ezin da elementua analizatu"
 
 #: ../plugins/itip-formatter/itip-formatter.c:780
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
-msgstr "Egutegia irekitzeko baimena ukatu egin da"
+msgstr "Ezin da bidali elementua '%s' egutegira. %s"
 
 #: ../plugins/itip-formatter/itip-formatter.c:791
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
-msgstr ""
+msgstr "Bidali '%s' egutegira onartuta bezala"
 
 #: ../plugins/itip-formatter/itip-formatter.c:795
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
-msgstr ""
+msgstr "Bidali '%s' egutegira saialdi gisa"
 
 #: ../plugins/itip-formatter/itip-formatter.c:800
 #, c-format
 msgid "Sent to calendar '%s' as declined"
-msgstr ""
+msgstr "Bidali '%s' egutegira baztertua bezala"
 
 #: ../plugins/itip-formatter/itip-formatter.c:805
 #, c-format
 msgid "Sent to calendar '%s' as cancelled"
-msgstr ""
+msgstr "Bidali '%s' egutegira baliogabetua bezala"
 
 #: ../plugins/itip-formatter/itip-formatter.c:898
 #, c-format
 msgid "Organizer has removed the delegate %s "
-msgstr ""
+msgstr "Antolatzaileak %s delegatua kendu du"
 
 #: ../plugins/itip-formatter/itip-formatter.c:905
 msgid "Sent a cancellation notice to the delegate"
-msgstr ""
+msgstr "Bidali bertan behera uztearen mezua delegatuari"
 
 #: ../plugins/itip-formatter/itip-formatter.c:907
-#, fuzzy
 msgid "Could not send the cancellation notice to the delegate"
-msgstr ""
-"Ziur zaude egunkariko sarrera hau bertan behera utzi eta ezabatu nahi duzula?"
+msgstr "Ezin izan da bertan behera uztearen oharra delegatuari bidali"
 
 #: ../plugins/itip-formatter/itip-formatter.c:991
-#, fuzzy
 msgid "Attendee status could not be updated because the status is invalid"
-msgstr "Partaidearen egoera ezin da eguneratu egoera baliogabea delako\n"
+msgstr "Partaide-egoera ezin da eguneratu egoera baliogabea delako"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1017
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to update attendee. %s"
-msgstr "Egutegia irekitzeko baimena ukatu egin da"
+msgstr "Ezin da partaideak eguneratu. %s"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1021
-#, fuzzy
 msgid "Attendee status updated"
-msgstr "Partaidearen egoera eguneratu da\n"
+msgstr "Partaide-egoera eguneratu da"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1148
-#, fuzzy
 msgid "The calendar attached is not valid"
-msgstr "Adierazitako karpeta-mota ez da baliozkoa"
+msgstr "Erantsitako egutegia ez da baliozkoa"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1149
 msgid ""
 "The message claims to contain a calendar, but the calendar is not valid "
 "iCalendar."
-msgstr ""
+msgstr "Mezuak egutegi bat duela dio, baina egutegia ez da baliozko iCalendar."
 
 #: ../plugins/itip-formatter/itip-formatter.c:1183
 #: ../plugins/itip-formatter/itip-formatter.c:1198
 #: ../plugins/itip-formatter/itip-formatter.c:1274
-#, fuzzy
 msgid "The item in the calendar is not valid"
-msgstr "Inprimatuko den egutegiaren aurrebista eskaintzen du"
+msgstr "Egutegiko elementua ez da baliozkoa"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1184
 #: ../plugins/itip-formatter/itip-formatter.c:1199
@@ -16057,41 +15409,43 @@ msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr ""
+"Mezuak egutegi bat du, baina egutegiak ez du gertaerarik, zereginik edo "
+"libre/okupatuta informaziorik"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1209
 msgid "The calendar attached contains multiple items"
-msgstr ""
+msgstr "Erantsitako egutegiak hainbat elementu ditu"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1210
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr ""
+"Fitxategia gorde eta egutegia inportatu behar da elementu guzti horiek "
+"prozesatzeko"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1968
-#, fuzzy
 msgid "Meetings and Tasks"
-msgstr "Egutegia eta zereginak"
+msgstr "Bilerak eta zereginak"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
 #: ../plugins/itip-formatter/itip-formatter.c:1991
 msgid "_Delete message after acting"
-msgstr ""
+msgstr "_Ezabatu mezua ekin ondoren"
 
 #: ../plugins/itip-formatter/itip-formatter.c:2001
-#, fuzzy
 msgid "<span weight=\"bold\">Conflict Search</span>"
-msgstr "Bidalitako mezuak eta zirriborroak"
+msgstr "<span weight=\"bold\">Gatazka-bilaketa</span>"
 
 #. Source selector
 #: ../plugins/itip-formatter/itip-formatter.c:2014
 msgid "Select the calendars to search for meeting conflicts"
-msgstr ""
+msgstr "Hautatu egutegiak bileren arteko gatazkak bilatzeko"
 
 #: ../plugins/itip-formatter/itip-formatter.c:2031
 msgid "Conflict Search Table"
-msgstr ""
+msgstr "Gatazka bilaketa-tauan"
 
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
@@ -16102,489 +15456,454 @@ msgstr "Gaur"
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:189
-#, fuzzy
 msgid "Today %H:%M"
-msgstr "Gaur %l:%M %p"
+msgstr "Gaur %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:193
-#, fuzzy
 msgid "Today %H:%M:%S"
-msgstr "Gaur %l:%M %p"
+msgstr "Gaur %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:202
-#, fuzzy
 msgid "Today %l:%M:%S %p"
-msgstr "Gaur %l:%M %p"
+msgstr "Gaur %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:212
-#, fuzzy
 msgid "Tomorrow"
-msgstr "Komoroak"
+msgstr "Bihar"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow %H:%M"
-msgstr ""
+msgstr "Bihar %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:221
-#, fuzzy
 msgid "Tomorrow %H:%M:%S"
-msgstr "%H:%M:%S"
+msgstr "Bihar %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:226
-#, fuzzy
 msgid "Tomorrow %l:%M %p"
-msgstr "Gaur %l:%M %p"
+msgstr "Bihar %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:230
-#, fuzzy
 msgid "Tomorrow %l:%M:%S %p"
-msgstr "Gaur %l:%M %p"
+msgstr "Bihar %l:%M:%S %p"
 
 #. strftime format of a weekday.
 #: ../plugins/itip-formatter/itip-view.c:249
 #, c-format
 msgid "%A"
-msgstr ""
+msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:254
-#, fuzzy
 msgid "%A %H:%M"
-msgstr "%H:%M"
+msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:258
-#, fuzzy
 msgid "%A %H:%M:%S"
-msgstr "%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:263
-#, fuzzy
 msgid "%A %l:%M %p"
-msgstr "%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:267
-#, fuzzy
 msgid "%A %l:%M:%S %p"
-msgstr "%I:%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:276
-#, fuzzy
 msgid "%A, %B %e"
-msgstr "%A, %Y %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:282
-#, fuzzy
 msgid "%A, %B %e %H:%M"
-msgstr "%A, %Y %B %e"
+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:286
-#, fuzzy
 msgid "%A, %B %e %H:%M:%S"
-msgstr "%A, %Y %B %e"
+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:291
-#, fuzzy
 msgid "%A, %B %e %l:%M %p"
-msgstr "%b %d %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:295
-#, fuzzy
 msgid "%A, %B %e %l:%M:%S %p"
-msgstr "%b %d %l:%M %p"
+msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:301
-#, fuzzy
 msgid "%A, %B %e, %Y"
 msgstr "%A, %Y %B %e"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:306
-#, fuzzy
 msgid "%A, %B %e, %Y %H:%M"
-msgstr "%A, %Y %B %e"
+msgstr "%A, %Y %B %e %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:310
-#, fuzzy
 msgid "%A, %B %e, %Y %H:%M:%S"
-msgstr "%a %Y/%m/%d %H:%M:%S"
+msgstr "%A %Y/%B/%e %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:315
-#, fuzzy
 msgid "%A, %B %e, %Y %l:%M %p"
-msgstr " - %Y %B %d, %l:%M %p"
+msgstr " %A, %Y %B %e, %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:319
-#, fuzzy
 msgid "%A, %B %e, %Y %l:%M:%S %p"
-msgstr " - %Y %B %d, %l:%M %p"
+msgstr "%A, %Y %B %d, %l:%M:%S %p"
 
 #: ../plugins/itip-formatter/itip-view.c:344
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
-msgstr "<b>%s</b>(e)k bilera-informazioa argitaratu du."
+msgstr "<b>%s</b>(e)k %s(e)n bidez bileraren honako informazioa argitaratu du:"
 
 #: ../plugins/itip-formatter/itip-view.c:346
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has published the following meeting information:"
-msgstr "<b>%s</b>(e)k bilera-informazioa argitaratu du."
+msgstr "<b>%s</b>(e)k bileraren honako informazioa argitaratu du:"
 
 #: ../plugins/itip-formatter/itip-view.c:351
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
-msgstr "<b>%s</b>(e)k bilera-eskaerari erantzun dio."
+msgstr "<b>%s</b>(e)k honako bilera zuri delegatu dizu:"
 
 #: ../plugins/itip-formatter/itip-view.c:354
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr "<b>%s</b>(e)k bilerarako deia egiten dizu."
+msgstr "<b>%s</b>(e)k %s(e)n bidez honako bilerarako deia egiten dizu:"
 
 #: ../plugins/itip-formatter/itip-view.c:356
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
-msgstr "<b>%s</b>(e)k bilerarako deia egiten dizu."
+msgstr "<b>%s</b>(e)k honako bilerarako deia egiten dizu:"
 
 #: ../plugins/itip-formatter/itip-view.c:362
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
-msgstr "<b>%s</b>(e)k bilera batean sartu nahi du."
+msgstr "<b>%s</b>(e)k %s(e)n bidez dagoen bilera batean sartu nahi du:"
 
 #: ../plugins/itip-formatter/itip-view.c:364
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
-msgstr "<b>%s</b>(e)k bilera batean sartu nahi du."
+msgstr "<b>%s</b>(e)k dagoen bilera batean sartu nahi du:"
 
 #: ../plugins/itip-formatter/itip-view.c:367
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr "<b>%s</b>(e)k zereginaren informazio berria jaso nahi du."
+msgstr "<b>%s</b>(e)k honako bileraren informazio berria jaso nahi du:"
 
 #: ../plugins/itip-formatter/itip-view.c:370
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
-msgstr "<b>%s</b>(e)k mezu ulertezina bidali du."
+msgstr "<b>%s</b>(e)k bilerari buruz honakoa erantzun du:"
 
 #: ../plugins/itip-formatter/itip-view.c:374
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> through %s has cancelled the following meeting:"
-msgstr "<b>%s</b>(e)k bilera bertan behera utzi du."
+msgstr "<b>%s</b>(e)k %s(e)n bidez honako bilera bertan behera utzi du:"
 
 #: ../plugins/itip-formatter/itip-view.c:376
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has cancelled the following meeting."
-msgstr "<b>%s</b>(e)k bilera bertan behera utzi du."
+msgstr "<b>%s</b>(e)k honako bilera bertan behera utzi du:"
 
 #: ../plugins/itip-formatter/itip-view.c:379
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
-msgstr "<b>%s</b>(e)k bilera-eskaerari erantzun dio."
+msgstr "<b>%s</b>(e)k bileraren honako aldaketak aurkeztu ditu:"
 
 #: ../plugins/itip-formatter/itip-view.c:383
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr "<b>%s</b>(e)k bilera-eskaerari erantzun dio."
+msgstr "<b>%s</b>(e)k %s(e)n bidez bileraren honako aldaketak baztertu ditu:"
 
 #: ../plugins/itip-formatter/itip-view.c:385
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
-msgstr "<b>%s</b>(e)k bilera-eskaerari erantzun dio."
+msgstr "<b>%s</b>(e)k bileraren honako aldaketak baztertu ditu."
 
 #: ../plugins/itip-formatter/itip-view.c:412
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> through %s has published the following task:"
-msgstr "<b>%s</b>(e)k zeregin-informazioa argitaratu du."
+msgstr "<b>%s</b>(e)k %s(e)n bidez honako zereginak argitaratu ditu:"
 
 #: ../plugins/itip-formatter/itip-view.c:414
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has published the following task:"
-msgstr "<b>%s</b>(e)k zeregin-informazioa argitaratu du."
+msgstr "<b>%s</b>(e)k honako zereginak argitaratu ditu:"
 
 #: ../plugins/itip-formatter/itip-view.c:419
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
-msgstr "<b>%s</b>(e)k bilerarako deia egiten dio %s(r)i."
+msgstr "<b>%s</b>(e)k %s(r)en honako zeregin-esleipena eskatzen du:"
 
 #: ../plugins/itip-formatter/itip-view.c:422
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
-msgstr "<b>%s</b>(e)k zeregina bertan behera utzi du."
+msgstr "<b>%s</b>(e)k %s(e)n bidez zeregin batera esleitu zaitu:"
 
 #: ../plugins/itip-formatter/itip-view.c:424
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has assigned you a task:"
-msgstr "<b>%s</b>(e)k zeregina bertan behera utzi du."
+msgstr "<b>%s</b>(e)k zeregin bat esleitu dizu:"
 
 #: ../plugins/itip-formatter/itip-view.c:430
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
-msgstr "<b>%s</b>(e)k zeregin batean sartu nahi du."
+msgstr "<b>%s</b>(e)k %s(e)n bidez zeregin batean sartu nahi du:"
 
 #: ../plugins/itip-formatter/itip-view.c:432
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
-msgstr "<b>%s</b>(e)k zeregin batean sartu nahi du."
+msgstr "<b>%s</b>(e)k zeregin batean sartu nahi du:"
 
 #: ../plugins/itip-formatter/itip-view.c:435
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
-msgstr "<b>%s</b>(e)k zereginaren informazio berria jaso nahi du."
+msgstr ""
+"<b>%s</b>(e)k honako zeregin-esleipenaren informazio berria jaso nahi du:"
 
 #: ../plugins/itip-formatter/itip-view.c:438
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
-msgstr "<b>%s</b>(e)k mezu ulertezina bidali du."
+msgstr "<b>%s</b>(e)k zeregin-esleipenari buruz honakoa erantzun du:"
 
 #: ../plugins/itip-formatter/itip-view.c:442
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> through %s has cancelled the following assigned task:"
-msgstr "<b>%s</b>(e)k zeregina bertan behera utzi du."
+msgstr ""
+"<b>%s</b>(e)k %s(e)n bidez honako zeregin-esleipena bertan behera utzi du:"
 
 #: ../plugins/itip-formatter/itip-view.c:444
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has cancelled the following assigned task:"
-msgstr "<b>%s</b>(e)k zeregina bertan behera utzi du."
+msgstr "<b>%s</b>(e)k honako zeregin-esleipena bertan behera utzi du:"
 
 #: ../plugins/itip-formatter/itip-view.c:447
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
-msgstr "<b>%s</b>(e)k zeregin-esleipenari erantzun dio."
+msgstr "<b>%s</b>(e)k honako zeregin-esleipenaren aldaketak aurkeztu ditu:"
 
 #: ../plugins/itip-formatter/itip-view.c:451
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
-msgstr ""
+msgstr "<b>%s</b>(e)k %s(e)n bidez honako zeregin-esleipena baztertu du:"
 
 #: ../plugins/itip-formatter/itip-view.c:453
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
-msgstr "<b>%s</b>(e)k zeregin-esleipenari erantzun dio."
+msgstr "<b>%s</b>(e)k honako zeregin-esleipena baztertu du:"
 
 #. Start time
 #: ../plugins/itip-formatter/itip-view.c:892
-#, fuzzy
 msgid "Start time:"
 msgstr "_Hasiera:"
 
 #. End time
 #: ../plugins/itip-formatter/itip-view.c:901
-#, fuzzy
 msgid "End time:"
-msgstr "_Amaiera:"
+msgstr "Amaiera:"
 
 #. Comment
 #: ../plugins/itip-formatter/itip-view.c:917
 #: ../plugins/itip-formatter/itip-view.c:967
-#, fuzzy
 msgid "Comment:"
-msgstr "Shell komandoa"
+msgstr "Iruzkina"
 
 #: ../plugins/itip-formatter/itip-view.c:981
 msgid "Send u_pdates to attendees"
-msgstr ""
+msgstr "Bidali eguneraketak partaideei"
 
 #: ../plugins/itip-formatter/itip-view.c:990
-#, fuzzy
 msgid "A_pply to all instances"
-msgstr "Instantzia guztiak"
+msgstr "_Aplikatu instantzia guztiak"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-#, fuzzy
 msgid "Displays text/calendar parts in messages."
-msgstr "Bistaratu hurrengo mezu garrantzitsua"
+msgstr "Testuen/Egutegien zatiak mezuetan bistaratzen ditu"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
-#, fuzzy
 msgid "Itip Formatter"
-msgstr "Inportatzaileak"
+msgstr "Itip formatu emailea"
 
 #: ../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 ""
+"&quot;{0}&quot; bilera delegatu du. &quot;{1}&quot; delegatua gehitzea nahi "
+"duzu?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
-#, fuzzy
 msgid "This meeting has been delegated"
-msgstr "Gertaera ezabatu da."
+msgstr "Bilera hau delegatu egin da"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-#, fuzzy
 msgid ""
 "This response is not from a current attendee. Add the sender as an attendee?"
-msgstr "Erantzun hau ez da uneko partaide batena.  Partaide gisa gehitu?"
+msgstr ""
+"Erantzun hau ez da uneko partaide batena.  Bidaltzailea partaide gisa gehitu?"
 
 #: ../plugins/mail-account-disable/mail-account-disable.c:47
 msgid "Proxy _Logout"
-msgstr ""
+msgstr "_Irten proxy-aren saiotik"
 
 #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
-#, fuzzy
 msgid "Allows disabling of accounts."
-msgstr "Posta-kontuak"
+msgstr "Baimendu kontuak desgaitzea."
 
 #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
-#, fuzzy
 msgid "Disable Account"
-msgstr "Posta-kontuak"
+msgstr "Desgaitu kontua"
 
 #: ../plugins/mail-remote/client.c:30
-#, fuzzy, c-format
+#, c-format
 msgid "System error: %s"
-msgstr "analisi-errorea"
+msgstr "Sistemako errorea: %s"
 
 #: ../plugins/mail-remote/client.c:32
-#, fuzzy, c-format
+#, c-format
 msgid "Camel error: %s"
-msgstr "Balidazio-errorea: %s"
+msgstr "Camel-errorea: %s"
 
 #: ../plugins/mail-remote/evolution-mail-store.c:476
 msgid "Account cannot send e-mail"
-msgstr ""
+msgstr "Kontua ezin da posta elektronikoz bidali"
 
 #: ../plugins/mail-remote/evolution-mail-store.c:605
-#, fuzzy
 msgid "No store available"
-msgstr "Ez dago azalpen erabilgarririk."
+msgstr "Ez dago biltegi erabilgarririk."
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
 msgid ""
 "A plugin which implements a CORBA interface for accessing mail data remotely."
 msgstr ""
+"Urrunetik posta-datuak eskuratzeko CORBA interfazea inplementatzen duen "
+"plugin-a"
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
-#, fuzzy
 msgid "Mail Remote"
-msgstr "Kendu"
+msgstr "Urruneko posta"
 
 #: ../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 ""
+msgstr "Posta batetik bilerak sortzeko plugin-a"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
-#, fuzzy
 msgid "Con_vert to Meeting"
-msgstr "Bertan behera utzi _bilera"
+msgstr "_Bihurtu bileran"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
-#, fuzzy
 msgid "Mail to meeting"
-msgstr "Mezu-hartzailea: %s"
+msgstr "Posta - Bilera"
 
 #: ../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 ""
+msgstr "Posta batetik zereginak sortzeko plugin-a"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
 msgid "Con_vert to Task"
-msgstr ""
+msgstr "Bihurtu _zereginean"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-#, fuzzy
 msgid "Mail to task"
-msgstr "Mezu-hartzailea: %s"
+msgstr "Posta - zeregina"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
-#, fuzzy
 msgid "Contact list _owner"
-msgstr "Kontaktu-zerrendaren editorea"
+msgstr "Kontaktu-zerrendaren _jabea"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get list _archive"
-msgstr ""
+msgstr "Lortu _artxiboen zerrenda"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
-#, fuzzy
 msgid "Get list _usage information"
-msgstr "Bileraren informazioa"
+msgstr "Lortu zerrenda-erabileraren informazioa"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
-#, fuzzy
 msgid "Mailing List Actions"
-msgstr "Posta-zerrenda"
+msgstr "Posta-zerrendaren ekintzak"
 
 #: ../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
-#, fuzzy
 msgid "Mailing _List"
-msgstr "Posta-zerrenda"
+msgstr "Posta-_zerrenda"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
 msgid ""
 "Provide actions for common mailing list commands (subscribe, "
 "unsubscribe, ...)."
 msgstr ""
+"Posta-zerrendako komendoen ekintzak eskaintzen ditu (harpidetu, kendu "
+"harpidetza,...)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
-#, fuzzy
 msgid "_Post message to list"
-msgstr "Bidali _mezua zerrendara..."
+msgstr "_Bidali mezua zerrendara"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
-#, fuzzy
 msgid "_Subscribe to list"
-msgstr "_Harpidetu"
+msgstr "_Harpidetu zerrendan"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
-#, fuzzy
 msgid "_Un-subscribe to list"
-msgstr "Harpidetza _kendu"
+msgstr "_Kendu harpidetza zerrendatik"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
-#, fuzzy
 msgid "Action not available"
-msgstr "TLS ez dago erabilgarri"
+msgstr "Ekintza ez dago erabilgarri"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
@@ -16594,32 +15913,35 @@ msgid ""
 "You should receive an answer from the mailing list shortly after the message "
 "has been sent."
 msgstr ""
+"Posta-elektroniko bat \"{0}\" URLra bidali egingo da. Mezua automatikoki "
+"bidal dezakezu, edo aurrenik irakurri eta aldaketak egin.\n"
+"\n"
+"Mezu bat jasoko duzu posta-zerrendatik zure mezua bidali bezain azkar."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
-#, fuzzy
 msgid "Malformed header"
-msgstr "Gorde sinadura"
+msgstr "Formatu okerreko goiburua"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
-#, fuzzy
 msgid "No e-mail action"
-msgstr "Exekutatu ekintzak"
+msgstr "Postaren ekintzarik ez"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7
-#, fuzzy
 msgid "Posting not allowed"
-msgstr "Eragiketak huts egin du: %s"
+msgstr "Baimendu gabeko argitarapena"
 
 #: ../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 ""
+"Posta-zerrenda honetan argitaratzea ez dago baimenduta. Litekeena daposta-"
+"zerrenda irakurtzeko soilik izatea. Jar zaitez zerrendako "
+"administratzailearekin harremanetan."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
-#, fuzzy
 msgid "Send e-mail message to mailing list?"
-msgstr "Bidali _mezua zerrendara..."
+msgstr "Bidali mezua posta-zerrendara?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
@@ -16628,6 +15950,10 @@ msgid ""
 "\n"
 "Header: {0}"
 msgstr ""
+"Ekintza ezinda landu. Ekintza honen goiburuak ez du inolako ekintzarik "
+"kudeatzeko.\n"
+"\n"
+"Goiburua: {0}"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:13
 msgid ""
@@ -16635,122 +15961,111 @@ msgid ""
 "\n"
 "Header: {1}"
 msgstr ""
+"Mezuaren {0} goiburua formatu okerrekoa da eta ezin da prozesatu.\n"
+"\n"
+"Goiburua: {1}"
 
 #: ../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 ""
+msgstr "Mezuak ez du ekintza honek behar duen goiburuko informaziorik."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
-#, fuzzy
 msgid "_Edit message"
-msgstr "Mezua bidaltzen"
+msgstr "_Editatu mezua"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18
-#, fuzzy
 msgid "_Send message"
-msgstr "Mezua bidaltzen"
+msgstr "_Bidali mezua"
 
 #: ../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 "Kontaktatu  mezuaren posta-zerrendako arduradunarekin"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
 msgid "Get an archive of the list this message belongs to"
-msgstr ""
+msgstr "Lortu mezuaren zerrendaren artxiboa"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
 msgid "Get information about the usage of the list this message belongs to"
-msgstr ""
+msgstr "Lortu mezuaren zerrendaren erabileraren informazioa"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
-#, fuzzy
 msgid "Post a message to the mailing list this message belongs to"
-msgstr "Prestatu hautatutako mezuaren posta-zerrendarentzako erantzuna"
+msgstr "Bidali mezua mezuaren posta-zerrendara"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
-#, fuzzy
 msgid "Subscribe to the mailing list this message belongs to"
-msgstr "Prestatu hautatutako mezuaren posta-zerrendarentzako erantzuna"
+msgstr "Harpidetu mezuaren posta-zerrendan"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
-#, fuzzy
 msgid "Unsubscribe to the mailing list this message belongs to"
-msgstr "Prestatu hautatutako mezuaren posta-zerrendarentzako erantzuna"
+msgstr "Kendu harpidetze mezuaren posta-zerrendatik"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
 msgid "Mark calendar offline"
-msgstr ""
+msgstr "Markatu egutegia lineaz kanpo"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
-#, fuzzy
 msgid "Marks the selected calendar for offline viewing."
-msgstr "Markatu hautatutako mezuak ezabatzeko gisa"
+msgstr "Markatu hautatutako egutegia lineaz kanpo ikusteko."
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
 msgid "_Do not make this available offline"
-msgstr ""
+msgstr "_Ez egin hau lineaz kanpo eskuragarri"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
 msgid "_Mark Calendar for offline use"
-msgstr ""
+msgstr "_Markatu egutegia lineaz kanpo erabiltzeko"
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
-msgstr ""
+msgstr "Mono plugin-ak inplementatzeko plugin-a."
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
-#, fuzzy
 msgid "Mono Loader"
-msgstr "Eraman karpeta honetara"
+msgstr "Mono kargatzailea"
 
 #: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:1
-#, fuzzy
 msgid "Generates a D-BUS message when new mail arrives."
-msgstr "J_o sistema-soinua mezu berriak iristen direnean"
+msgstr "D-BUS mezua sortzen du mezu berri bat jasotzean"
 
 #: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:2
-#, fuzzy
 msgid "New Mail Notification"
-msgstr "Mezu berrien jakinarazpena"
+msgstr "Mezu berriaren jakinarazpena"
 
 #: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:3
-#, fuzzy
 msgid "New mail notify"
-msgstr "Mezu berrien jakinarazpena"
+msgstr "Mezu berriaren jakinarazpena"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "A plugin for managing which plugins are enabled or disabled."
-msgstr ""
+msgstr "Plugin-ak kudeatzeko plugin-a "
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
 msgid "Plugin manager"
-msgstr ""
+msgstr "Plugin-kudeatzailea"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
 msgid "Enable and disable plugins"
-msgstr ""
+msgstr "Gaitu eta desgaitu plugin-ak"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
-#, fuzzy
 msgid "Plugins"
-msgstr "Turin"
+msgstr "Plugin-ak"
 
 #: ../plugins/plugin-manager/plugin-manager.c:45
-#, fuzzy
 msgid "Author(s)"
-msgstr "ordu"
+msgstr "Egilea(k)"
 
 #: ../plugins/plugin-manager/plugin-manager.c:46
-#, fuzzy
 msgid "Id"
-msgstr "jn."
+msgstr "ld"
 
 #: ../plugins/plugin-manager/plugin-manager.c:47
-#, fuzzy
 msgid "Path"
-msgstr "_Bide-izena:"
+msgstr "Bide-izena"
 
 #: ../plugins/plugin-manager/plugin-manager.c:48
 #: ../widgets/table/e-table-config-no-group.glade.h:6
@@ -16760,19 +16075,17 @@ msgstr "Azalpena"
 
 #. Setup the ui
 #: ../plugins/plugin-manager/plugin-manager.c:188
-#, fuzzy
 msgid "Plugin Manager"
-msgstr "Zuzendaria"
+msgstr "Plugin-kudeatzailea"
 
 #: ../plugins/plugin-manager/plugin-manager.c:201
 msgid "Note: Some changes will not take effect until restart"
-msgstr ""
+msgstr "Oharra: aldaketa batzuk ez dira aplikatuko berrabiatu arte"
 
 #: ../plugins/plugin-manager/plugin-manager.c:210
 #: ../plugins/plugin-manager/plugin-manager.c:271
-#, fuzzy
 msgid "Plugin"
-msgstr "Turin"
+msgstr "Plugin-a"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
 msgid ""
@@ -16781,93 +16094,89 @@ msgid ""
 "\n"
 "This plugin is unsupported demonstration code only.\n"
 msgstr ""
+"Probak egiteko plugin-a, HTML motako mezuak desgaitzea utziko dizun "
+"plugin formateatzailea.\n"
+"\n"
+"Plugin hau egiaztatu gabeko demostrazioak egiteko kodea bakarrik da.\n"
 
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
-#, fuzzy
 msgid "Plain Text Mode"
-msgstr "Testu-eredua"
+msgstr "Testu arrunt modua"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
 msgid "Prefer plain-text"
-msgstr ""
+msgstr "Lehenetsi testu arrunta"
 
 #: ../plugins/prefer-plain/prefer-plain.c:105
 msgid "Show HTML if present"
-msgstr ""
+msgstr "Erakutsi HTML egonez gero"
 
 #: ../plugins/prefer-plain/prefer-plain.c:106
 msgid "Prefer PLAIN"
-msgstr ""
+msgstr "Hobetsi formaturik gabe"
 
 #: ../plugins/prefer-plain/prefer-plain.c:107
 msgid "Only ever show PLAIN"
-msgstr ""
+msgstr "Formaturik gabe bakarrik erakutsi"
 
 #: ../plugins/prefer-plain/prefer-plain.c:150
-#, fuzzy
 msgid "HTML Mode"
-msgstr "_HTML mezuak"
+msgstr "HTML modua"
 
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
 msgid "Gives an option to print mail from composer"
-msgstr ""
+msgstr "Eman aukera bat mezua prestatzeko leihotik mezua inprimatzeko"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
 #: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-tasks.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Inprimatzeko _aurrebista"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:2
-#, fuzzy
 msgid "Prints the message"
-msgstr "Inprimatu mezu hau"
+msgstr "Mezua inprimatzen du"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:98
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:99
 msgid "Spamassassin (built-in)"
-msgstr ""
+msgstr "Spamassassin (inkorporatua)"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
 msgid "Sa junk-plugin"
-msgstr ""
+msgstr "Sa junk plugin-a"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
 msgid "learns junk messages using spamd."
-msgstr ""
+msgstr "Spamd erabiliz mezu baztergarriak ikasten ditu"
 
 #: ../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 ""
+msgstr "Eranskin guztiak edo mezuen zaitka aldi berean gordetzeko plugin-a"
 
-#. the path to the shared library
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#, fuzzy
+#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:2
 msgid "Save attachments"
-msgstr "Gorde eranskina"
+msgstr "Gorde eranskinak"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
-#, fuzzy
 msgid "Save Attachments ..."
-msgstr "Gorde eranskina..."
+msgstr "Gorde eranskinak..."
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
-#, fuzzy
 msgid "Save all attachments"
-msgstr "Gorde eranskina"
+msgstr "Gorde eranskin guztiak"
 
 #: ../plugins/save-attachments/save-attachments.c:331
-#, fuzzy
 msgid "Select save base name"
-msgstr "Hautatu ordu-zona"
+msgstr "Hautatu oinarrizko izena gordetzeko"
 
 #: ../plugins/save-attachments/save-attachments.c:351
-#, fuzzy
 msgid "MIME Type"
-msgstr "MIME mota:"
+msgstr "MIME mota"
 
 #: ../plugins/save-attachments/save-attachments.c:359
 #: ../ui/evolution-message-composer.xml.h:18
+#: ../ui/evolution-signature-editor.xml.h:6
 msgid "Save"
 msgstr "Gorde"
 
@@ -16877,109 +16186,95 @@ msgstr "Gorde"
 #. *
 #: ../plugins/save-calendar/csv-format.c:171
 msgid "%F %T"
-msgstr ""
+msgstr "%Y %B"
 
 #: ../plugins/save-calendar/csv-format.c:385
 msgid "Uid"
-msgstr ""
+msgstr "UIDa"
 
 #: ../plugins/save-calendar/csv-format.c:387
-#, fuzzy
 msgid "Description List"
-msgstr "Azalpena"
+msgstr "Azalpenen zerrenda"
 
 #: ../plugins/save-calendar/csv-format.c:388
-#, fuzzy
 msgid "Categories List"
-msgstr "Kategoria-zerrenda"
+msgstr "Kategorien zerrenda"
 
 #: ../plugins/save-calendar/csv-format.c:389
-#, fuzzy
 msgid "Comment List"
-msgstr "K_ontaktuen zerrenda"
+msgstr "Iruzkinen zerrenda"
 
 #: ../plugins/save-calendar/csv-format.c:391
-#, fuzzy
 msgid "Created"
-msgstr "Crestview"
+msgstr "Sortuta"
 
 #: ../plugins/save-calendar/csv-format.c:392
-#, fuzzy
 msgid "Contact List"
-msgstr "K_ontaktuen zerrenda"
+msgstr "Kontaktuen zerrenda"
 
 #: ../plugins/save-calendar/csv-format.c:393
-#, fuzzy
 msgid "Start"
-msgstr "Egoera"
+msgstr "Hasi"
 
 #: ../plugins/save-calendar/csv-format.c:394
-#, fuzzy
 msgid "End"
-msgstr "Enid"
+msgstr "Amaitu"
 
 #: ../plugins/save-calendar/csv-format.c:396
-#, fuzzy
 msgid "percent Done"
-msgstr "Trenton"
+msgstr "Osatutako ehunekoa:"
 
 #: ../plugins/save-calendar/csv-format.c:398
 msgid "Url"
 msgstr "URLa"
 
 #: ../plugins/save-calendar/csv-format.c:399
-#, fuzzy
 msgid "Attendees List"
-msgstr "Partaidea"
+msgstr "Partaideen zerrenda"
 
 #: ../plugins/save-calendar/csv-format.c:401
-#, fuzzy
 msgid "Modified"
-msgstr "_Aldatu"
+msgstr "Aldatua"
 
 #: ../plugins/save-calendar/csv-format.c:552
 msgid "Advanced options for the CSV format"
-msgstr ""
+msgstr "CSV formatuaren aukera aurreratuak"
 
 #: ../plugins/save-calendar/csv-format.c:559
 msgid "Prepend a header"
-msgstr ""
+msgstr "Gehitu goiburua aurrean"
 
 #: ../plugins/save-calendar/csv-format.c:568
 msgid "Value delimiter:"
-msgstr ""
+msgstr "Balioaren mugatzailea:"
 
 #: ../plugins/save-calendar/csv-format.c:574
 msgid "Record delimiter:"
-msgstr ""
+msgstr "Erregistroaren mugatzailea:"
 
 #: ../plugins/save-calendar/csv-format.c:580
 msgid "Encapsulate values with:"
-msgstr ""
+msgstr "Kapsulatu balioak:"
 
 #: ../plugins/save-calendar/csv-format.c:602
 msgid "Comma separated value format (.csv)"
-msgstr ""
+msgstr "Komaz bereiztutako balio formatua (.csv)"
 
 #: ../plugins/save-calendar/ical-format.c:137
-#, fuzzy
 msgid "iCalendar format (.ics)"
-msgstr "iCalendar fitxategiak (.ics)"
+msgstr "iCalendar formatua (.ics)"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
-#, fuzzy
 msgid "Save Selected"
-msgstr "Ez da bat ere hautatu"
+msgstr "Gorde hautatutakoa"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-#, fuzzy
 msgid "Save to _Disk"
-msgstr "Gorde honela"
+msgstr "Gorde _diskoan"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
-#, fuzzy
 msgid "Saves selected calendar or tasks list to disk."
-msgstr "Gorde hautatutako kontaktuak VCard gisa."
+msgstr "Gorde hautatutako egutegi edo zereginen zerrenda diskoan."
 
 #.
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
@@ -16988,17 +16283,16 @@ msgstr "Gorde hautatutako kontaktuak VCard gisa."
 #. *
 #: ../plugins/save-calendar/rdf-format.c:158
 msgid "%FT%T"
-msgstr ""
+msgstr "%FT%T"
 
 #: ../plugins/save-calendar/rdf-format.c:396
 msgid "RDF format (.rdf)"
-msgstr ""
+msgstr "RDF formatua (.rdf)"
 
 #: ../plugins/save-calendar/save-calendar.c:171
 #: ../plugins/save-calendar/save-calendar.c:181
-#, fuzzy
 msgid "Select destination file"
-msgstr "Bidalketa-helburua"
+msgstr "Hautatu helburuko fitxategia"
 
 #: ../plugins/save-calendar/save-calendar.c:216
 #, c-format
@@ -17006,28 +16300,28 @@ msgid ""
 "The suggested filename extension of this filetype (%s) is unused in the "
 "chosen filename. Do you want to continue?"
 msgstr ""
+"%s fitxategi motaren gomendatutako luzapena ez da fitxategi-izenean erabili."
+"Aurrera jarraitu nahi duzu?"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
-#, fuzzy
 msgid "Select one source"
-msgstr "Hautatu inportatzailea"
+msgstr "Hautatu iturburu bat"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
 msgid "Selects a single calendar or task source for viewing."
-msgstr ""
+msgstr "Hautatu egutegi bakuna edo zereginen iturburua ikusteko."
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
-#, fuzzy
 msgid "_Show only this Calendar"
-msgstr "Erakutsi ordena honetan"
+msgstr "_Erakutsi egutegi hau soilik"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
 msgid "_Show only this Task List"
-msgstr ""
+msgstr "_Erakutsi zeregin-zerrenda hau soilik"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
 msgid "Startup wizard"
-msgstr ""
+msgstr "Hasierako morroia"
 
 #: ../plugins/startup-wizard/startup-wizard.c:85
 msgid "Evolution Setup Assistant"
@@ -17038,7 +16332,6 @@ msgid "Welcome"
 msgstr "Ongi etorri"
 
 #: ../plugins/startup-wizard/startup-wizard.c:89
-#, fuzzy
 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"
@@ -17064,95 +16357,83 @@ msgstr "%s(e)tik:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:234
 #: ../shell/e-shell-importer.c:509
-#, fuzzy
 msgid "Importing data."
-msgstr "Fitxategiak inportatzen"
+msgstr "Datuak inportatzen."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Indicates if threading of messages should fall back to subject."
-msgstr ""
+msgstr "Mezuaren haria gaiaren arabera egin behar den adierazten du."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
-#, fuzzy
 msgid "Subject Threading"
-msgstr "Hautatu _haria"
+msgstr "Gaiaren haria"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
-#, fuzzy
 msgid "Thread messages by subject"
-msgstr "Harian sartutako mezu-zerrenda"
+msgstr "Sartu harian mezuak gaiaren arabera"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
 #: ../plugins/subject-thread/subject-thread.c:54
 msgid "Fall back to threading messages by sub_ject"
-msgstr ""
+msgstr "Itzuli mezuen harira g_aiaren arabera"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "Evolution-en shell-a"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
 msgid "Evolution Shell Config factory"
-msgstr "Evolution-en shell-a"
+msgstr "Evolution-en shell-aren konfigurazioaren fabrika"
 
 #: ../shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
 msgid "Evolution Test"
-msgstr "Evolution"
+msgstr "Evolution-en proba"
 
 #: ../shell/GNOME_Evolution_Test.server.in.in.h:2
-#, fuzzy
 msgid "Evolution Test component"
 msgstr "Evolution-en probaren osagaia"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "A GNOME Print description of the current printer settings"
-msgstr ""
+msgstr "Uneko inprimagailuaren azalpena GNOMErako"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:2
-#, fuzzy
 msgid "Configuration version"
-msgstr "Evolution-en posta konfiguratzeko interfazea"
+msgstr "Konfigurazio-bertsioa"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:3
-#, fuzzy
 msgid "Default sidebar width"
-msgstr "Lehentasun lehenetsia:"
+msgstr "Albo-panelaren zabalera lehenetsia"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:4
-#, fuzzy
 msgid "Default window height"
-msgstr "Lehentasun lehenetsia:"
+msgstr "Albo-panelaren altuera lehenetsia"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
-#, fuzzy
 msgid "Default window width"
-msgstr "Lehentasun lehenetsia:"
+msgstr "Leihoaren zabalera lehenetsia"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:6
-#, fuzzy
 msgid "ID or alias of the component to be shown by default at start-up."
-msgstr "Markatu eranskina mezuaren barruan erakusteko lehenespenez."
+msgstr "Lehenespenez abioan erakutsi beharreko IDa edo aliasa."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:7
-#, fuzzy
 msgid "Last upgraded configuration version"
-msgstr "Evolution-en posta konfiguratzeko interfazea"
+msgstr "Azken bertsio-berritutako konfigurazio-bertsioa"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
+"Lineaz kanpo erabiltzeko, diskora sinkronizatzeko karpeten bideen zerrenda"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:9
-#, fuzzy
 msgid "Printer settings"
-msgstr "Eguraldiaren ezarpenak"
+msgstr "Inprimagailuaren ezarpenak"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Skip development warning dialog"
-msgstr ""
+msgstr "Saltatu garapen-abisuaren elkarrizketa-koadroa"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:468
 msgid "Start in offline mode"
@@ -17162,27 +16443,27 @@ msgstr "Hasi lineaz kanpo"
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level"
 msgstr ""
+"Evolution-en konfigurazio-bertsioa, konfigurazio maila altuarekin/baxuarekin"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:13
-#, fuzzy
 msgid "The default height for the main window, in pixels."
-msgstr "Mezuaren gai lehenetsia."
+msgstr "Leiho nagusiaren altuera lehenetsia, pixeletan."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:14
-#, fuzzy
 msgid "The default width for the main window, in pixels."
-msgstr "Mezuaren gai lehenetsia."
+msgstr "Leiho nagusiaren zabalera lehenetsia, pixeletan."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:15
-#, fuzzy
 msgid "The default width for the sidebar, in pixels."
-msgstr "Erakutsi/ezkutatu karpeta-barra"
+msgstr "Albo-panelaren zabalera lehenetsia, pixeletan."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level"
 msgstr ""
+"Azken bertsio-berritutako Evolution-en konfigurazio-bertsioa, konfigurazio "
+"maila altuarekin/baxuarekin"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid ""
@@ -17190,40 +16471,42 @@ msgid ""
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
 msgstr ""
+"Leihoko botoien estiloa.  \"Testu\", \"Ikonoak\", \"Biak\", \"Tresna-barra\" "
+"izan daiteke. \"Tresna-barra\" ezartzen bada botoien estiloa GNOMEko tresna-"
+"barraren ezarpenak zehaztuko du."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid "Toolbar is visible"
-msgstr ""
+msgstr "Tresna-barra ikusgai dago"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr ""
+msgstr "Evolution lineaz kanpoko moduan abiarazi behar den edo ez"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Whether the toolbar should be visible."
-msgstr ""
+msgstr "Tresna-barra ikusgai izango den edo ez."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
-msgstr ""
+msgstr "Garapen-abisuaren elkarrizketa-koadroa saltatu behar den edo ez"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether the window buttons should be visible."
-msgstr ""
+msgstr "Leihoko botoiak ikusgai egongo diren edo ez."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Window button style"
-msgstr ""
+msgstr "Leihoko botoi-estiloa"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Window buttons are visible"
-msgstr ""
+msgstr "Leihoko botoiak ikusgai daude"
 
 #: ../shell/e-active-connection-dialog.glade.h:1
-#, fuzzy
 msgid "<b>Active Connections</b>"
-msgstr "Konexio aktiboak"
+msgstr "<b>Konexio aktiboak</b>"
 
 #: ../shell/e-active-connection-dialog.glade.h:2
 msgid "Active Connections"
@@ -17257,12 +16540,10 @@ msgstr ""
 "bideratzen."
 
 #: ../shell/e-shell-importer.c:142
-#, fuzzy
 msgid "Choose the destination for this import"
-msgstr "Ber_tan behera utzi elementu honentzako bilera"
+msgstr "Aukeratu helburua hau inportatzeko"
 
 #: ../shell/e-shell-importer.c:148
-#, fuzzy
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17275,33 +16556,28 @@ msgstr ""
 "nahi baduzu, sakatu \"Atzera\" botoia.\n"
 
 #: ../shell/e-shell-importer.c:283
-#, fuzzy
 msgid "F_ilename:"
-msgstr "Fitxategi-izena:"
+msgstr "_Fitxategi-izena:"
 
 #: ../shell/e-shell-importer.c:288
 msgid "Select a file"
 msgstr "Hautatu fitxategia"
 
 #: ../shell/e-shell-importer.c:300
-#, fuzzy
 msgid "File _type:"
-msgstr "Fitxategi-mota:"
+msgstr "Fitxategi-_mota:"
 
 #: ../shell/e-shell-importer.c:336
-#, fuzzy
 msgid "Import data and settings from _older programs"
-msgstr "Inportatu programa zaharretako datuak eta ezarpenak"
+msgstr "Inportatu programa _zaharretako datuak eta ezarpenak"
 
 #: ../shell/e-shell-importer.c:339
-#, fuzzy
 msgid "Import a _single file"
-msgstr "Inportatu fitxategi bakarra"
+msgstr "Inportatu fitxategi _bakarra"
 
 #: ../shell/e-shell-importer.c:698
-#, fuzzy
 msgid "_Import"
-msgstr "Inportatu"
+msgstr "_Inportatu"
 
 #: ../shell/e-shell-settings-dialog.c:318
 msgid "Evolution Settings"
@@ -17349,18 +16625,17 @@ msgstr "Ezin izan da Bug Buddy exekutatu."
 #. * about box
 #: ../shell/e-shell-window-commands.c:532
 msgid "translator-credits"
-msgstr ""
+msgstr "Hizkuntza Politikarako Sailburuordetza <hizpol@ej-gv.es>"
 
 #: ../shell/e-shell-window-commands.c:546
-#, fuzzy
 msgid "Groupware Suite"
-msgstr "Taldea"
+msgstr "Talde-lanerako suitea"
 
 #: ../shell/e-shell-window-commands.c:774
 msgid "_Work Online"
 msgstr "_Lan egin linean"
 
-#: ../shell/e-shell-window-commands.c:787 ../ui/evolution.xml.h:50
+#: ../shell/e-shell-window-commands.c:787 ../ui/evolution.xml.h:47
 msgid "_Work Offline"
 msgstr "_Lan egin lineaz kanpo"
 
@@ -17369,38 +16644,33 @@ msgid "Work Offline"
 msgstr "Lan egin lineaz kanpo"
 
 #: ../shell/e-shell-window.c:343
-#, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
-"Ximian Evolution linean dago.  Egin klik botoi honetan lineaz kanpo lan "
+"Ximian Evolution linean dago. Egin klik botoi honetan lineaz kanpo lan "
 "egiteko."
 
 #: ../shell/e-shell-window.c:351
-#, fuzzy
 msgid "Evolution is in the process of going offline."
-msgstr "Ximian Evolution lineaz kanpo jartzeko prozesuan dago."
+msgstr "Evolution lineaz kanpo jartzeko prozesuan dago."
 
 #: ../shell/e-shell-window.c:358
-#, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
-"Ximian Evolution lineaz kanpo dago.  Egin klik botoi honetan linean lan "
-"egiteko."
+"Evolution lineaz kanpo dago.  Egin klik botoi honetan linean lan egiteko."
 
 #: ../shell/e-shell-window.c:724
-#, fuzzy, c-format
+#, c-format
 msgid "Switch to %s"
-msgstr "Mezu-hartzailea: %s"
+msgstr "Aldatu hona: %s"
 
 #: ../shell/e-shell.c:623
-#, fuzzy
 msgid "Uknown system error."
-msgstr "Errore ezezaguna"
+msgstr "Sistemako errore ezezaguna"
 
 #: ../shell/e-shell.c:825 ../shell/e-shell.c:826
-#, fuzzy, c-format
+#, c-format
 msgid "%ld KB"
-msgstr "%B %d"
+msgstr "%ld KB"
 
 #: ../shell/e-shell.c:1257 ../widgets/misc/e-cell-date-edit.c:256
 msgid "OK"
@@ -17423,19 +16693,16 @@ msgid "New"
 msgstr "Berria"
 
 #: ../shell/evolution-test-component.c:140
-#, fuzzy
 msgid "New Test"
-msgstr "Zeregin berria"
+msgstr "Proba berria"
 
 #: ../shell/evolution-test-component.c:141
-#, fuzzy
 msgid "_Test"
-msgstr "Proba"
+msgstr "_Probatu"
 
 #: ../shell/evolution-test-component.c:142
-#, fuzzy
 msgid "Create a new test item"
-msgstr "Sortu zeregin berria"
+msgstr "Sortu probako elementu berria"
 
 #: ../shell/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -17447,27 +16714,22 @@ msgid "Evolution Import Assistant"
 msgstr "Evolution-era inportatzeko laguntzailea"
 
 #: ../shell/import.glade.h:3
-#, fuzzy
 msgid "Import File"
-msgstr "Fitxategiak inportatzen"
+msgstr "Inportatu fitxategia"
 
 #: ../shell/import.glade.h:4
-#, fuzzy
 msgid "Import Location"
-msgstr "Inportatzen"
+msgstr "Inportatu kokalekua"
 
 #: ../shell/import.glade.h:5
-#, fuzzy
 msgid "Importer Type"
-msgstr "Inportatzaileak"
+msgstr "Inportatzaile mota"
 
 #: ../shell/import.glade.h:6
-#, fuzzy
 msgid "Select Importers"
-msgstr "Hautatu inportatzailea"
+msgstr "Hautatu inportatzaileak"
 
 #: ../shell/import.glade.h:7
-#, fuzzy
 msgid "Select a File"
 msgstr "Hautatu fitxategia"
 
@@ -17483,7 +16745,7 @@ msgstr ""
 
 #. Preview/Alpha/Beta version warning message
 #: ../shell/main.c:230
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -17519,13 +16781,12 @@ msgstr ""
 "dela eta zure ekarpena egitera animatuko zarela!\n"
 
 #: ../shell/main.c:254
-#, fuzzy
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 "Eskerrik asko\n"
-"Ximian Evolution taldea\n"
+"Evolution taldea\n"
 
 #: ../shell/main.c:261
 msgid "Don't tell me again"
@@ -17533,20 +16794,19 @@ msgstr "Ez esan berriro"
 
 #: ../shell/main.c:466
 msgid "Start Evolution activating the specified component"
-msgstr ""
+msgstr "Abiarazi Evolution zehaztutako osagaia aktibatuz"
 
 #: ../shell/main.c:470
 msgid "Start in online mode"
 msgstr "Hasi linean"
 
 #: ../shell/main.c:473
-#, fuzzy
 msgid "Forcibly shut down all Evolution components"
 msgstr "Behartu evolution-en osagai guztiak ixtea"
 
 #: ../shell/main.c:477
 msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr ""
+msgstr "Behartu Evolution 1.4etik migratzera"
 
 #: ../shell/main.c:480
 msgid "Send the debugging output of all components to a file."
@@ -17554,7 +16814,7 @@ msgstr "Bidali osagai guztien arazketa-irteera fitxategi batera."
 
 #: ../shell/main.c:482
 msgid "Disable loading of any plugins."
-msgstr ""
+msgstr "Desgaitu edozein plugin kargatzea."
 
 #: ../shell/main.c:513
 #, c-format
@@ -17566,38 +16826,36 @@ msgstr ""
 "  Erabili %s --help informazio gehiago lortzeko.\n"
 
 #: ../shell/shell.error.xml.h:1
-#, fuzzy
 msgid "Are you sure you want to forget all remembered passwords?"
-msgstr "Ziur zaude `%s' zeregina ezabatu nahi duzula?"
+msgstr "Ziur zaude gogoan hartutako pasahitz guztiak ahaztea nahi dituzula?"
 
 #: ../shell/shell.error.xml.h:2
-#, fuzzy
 msgid "Continue"
-msgstr "Constantine"
+msgstr "Jarraitu"
 
 #: ../shell/shell.error.xml.h:3
 msgid "Delete old data from version {0}?"
-msgstr ""
+msgstr "Ezabatu {0} bertsioko datu zaharrak?"
 
 #: ../shell/shell.error.xml.h:4
-#, fuzzy
 msgid "Evolution can not start."
-msgstr "Evolution-eko kontuaren morroia"
+msgstr "Evolution ezin da abiarazi."
 
 #: ../shell/shell.error.xml.h:5
-#, fuzzy
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed. "
-msgstr "Ahaztu gogoratutako pasahitzak (horrela berriz galdetuko dizkizu)"
+msgstr ""
+"Gogoratutako pasahitzak ahaztean gogoan hartutako pasahitz guztiak garbituko "
+"dira. Behar diren hurrengo aldian berriz galdetuko dizkizu."
 
 #: ../shell/shell.error.xml.h:7
 msgid "Insufficient disk space for upgrade."
-msgstr ""
+msgstr "Diskoan ez dago nahikoa leku bertsio-berritzeko."
 
 #: ../shell/shell.error.xml.h:8
 msgid "Really delete old data?"
-msgstr ""
+msgstr "Ezabatu datu zaharrak?"
 
 #: ../shell/shell.error.xml.h:9
 msgid ""
@@ -17611,6 +16869,15 @@ msgid ""
 "Once deleted, you cannot downgrade to the previous version of Evolution "
 "without manual intervention.\n"
 msgstr ""
+"&quot;evolution&quot; direktorioaren eduki guztia betirako ezabatu egingo "
+"da.\n"
+"\n"
+"Datu guztiak Evolution-eko bertsio berrian daudela (posta, kontaktuak, "
+"egutegiak) eta datu hauekin lan egokia egiten duela ziurtatu datu zaharrak "
+"ezabatu aurretik.\n"
+" \n"
+"Ezabatutakoan ezin izango duzu bertsio zaharrera itzuli, baldin eta zeuk ez "
+"baduzu eskuz lantzen.\n"
 
 #: ../shell/shell.error.xml.h:15
 msgid ""
@@ -17621,10 +16888,16 @@ msgid ""
 "keep this data, then you may manually remove the contents of &quot;"
 "evolution&quot; at your convenience.\n"
 msgstr ""
+"Evolution-en aurreko bertsioak beste helbide batean gordetzen zituen "
+"datuak.\n"
+"Datu hauek ezabatzea aukeratzen baduzu, &quot;evolution&quot; izeneko "
+"karpetako eduki guztia betirako ezabatuko da. Datuok mantentzea erabakitzen "
+"baduzu &quot;evolution&quot; karpetako edukia ezabatzea nahi duzunean eskuz "
+"egin beharko duzu.\n"
 
 #: ../shell/shell.error.xml.h:19
 msgid "Upgrade from previous version failed: {0}"
-msgstr ""
+msgstr "Aurreko bertsiotik eguneratzeak huts egin du: {0}"
 
 #: ../shell/shell.error.xml.h:20
 msgid ""
@@ -17634,6 +16907,10 @@ msgid ""
 "You will need to make more space available in your home directory before you "
 "can continue."
 msgstr ""
+"Datuak eta ezarpenak bertsio-berritzeko {0} libre eduki behar dira diskoan, "
+"baina {1} bakarrik dauzkazu.\n"
+"\n"
+"Etxeko direktorioan leku egoin beharko duzu jarraitu aurretik."
 
 #: ../shell/shell.error.xml.h:23
 msgid ""
@@ -17641,6 +16918,9 @@ msgid ""
 "\n"
 "Click help for details"
 msgstr ""
+"Zure sistema-konfigurazioa ez dator bat Evolution-en konfigurazioarekin.\n"
+"\n"
+"Xehetasunak ikusteko, egin klik Laguntzan"
 
 #: ../shell/shell.error.xml.h:26
 msgid ""
@@ -17650,20 +16930,22 @@ msgid ""
 "\n"
 "Click help for details."
 msgstr ""
+"Zure sistema-konfigurazioa ez dator bat Evolution-en konfigurazioarekin:\n"
+"\n"
+"{0}\n"
+"Egin klik xehetasunak ikusteko."
 
 #: ../shell/shell.error.xml.h:31
-#, fuzzy
 msgid "_Forget"
-msgstr "_Lehentasuna:"
+msgstr "_Ahaztu"
 
 #: ../shell/shell.error.xml.h:32
 msgid "_Keep Data"
-msgstr ""
+msgstr "_Mantendu datuak"
 
 #: ../shell/shell.error.xml.h:33
-#, fuzzy
 msgid "_Remind Me Later"
-msgstr "Oroigarria"
+msgstr "_Gogoratu nazazu geroago"
 
 #: ../shell/shell.error.xml.h:34
 msgid ""
@@ -17672,6 +16954,9 @@ msgid ""
 "If you choose to continue, you may not have access to some of your old "
 "data.\n"
 msgstr ""
+"{1}\n"
+"\n"
+"Jarraitzea aukeratu baduzu, zenbait datu zahar ezingo dituzu erabili.\n"
 
 #: ../smime/gui/ca-trust-dialog.c:96
 #, c-format
@@ -17680,6 +16965,9 @@ msgid ""
 "\n"
 "Edit trust settings:"
 msgstr ""
+"'%s' ziurtagiria ZE ziurtagiria da.\n"
+"\n"
+"Editatu fidagarritasun-ezarpenak:"
 
 #: ../smime/gui/cert-trust-dialog.c:145
 msgid ""
@@ -17687,6 +16975,8 @@ msgid ""
 "then you trust the authenticity of this certificate unless otherwise "
 "indicated here"
 msgstr ""
+"Ziurtagiria bidali duenaren ZEaz fidatzen zarenez, besterik esan ezean "
+"ziurtagiriaren autentifikazioaz fidatzen zara."
 
 #: ../smime/gui/cert-trust-dialog.c:149
 msgid ""
@@ -17694,6 +16984,8 @@ msgid ""
 "certificate, then you do not trust the authenticity of this certificate "
 "unless otherwise indicated here"
 msgstr ""
+"Ziurtagiria bidali duenaren ZEaz fidatzen ez zarenez, besterik esan ezean "
+"ziurtagiriaren autentifikazioaz ez zara fidatzen."
 
 #: ../smime/gui/certificate-manager.c:134
 #: ../smime/gui/certificate-manager.c:142
@@ -17701,60 +16993,51 @@ msgstr ""
 #: ../smime/gui/certificate-manager.c:385
 #: ../smime/gui/certificate-manager.c:597
 #: ../smime/gui/certificate-manager.c:605
-#, fuzzy
 msgid "Select a certificate to import..."
-msgstr "Hautatu inportatzailea"
+msgstr "Hautatu ziurtatigira inportatzeko..."
 
 #: ../smime/gui/certificate-manager.c:265
 #: ../smime/gui/certificate-manager.c:474
 #: ../smime/gui/certificate-manager.c:692
-#, fuzzy
 msgid "Certificate Name"
-msgstr "_Ziurtagiri-IDa:"
+msgstr "Ziurtagiri-izena"
 
 #: ../smime/gui/certificate-manager.c:274
 #: ../smime/gui/certificate-manager.c:492
-#, fuzzy
 msgid "Purposes"
-msgstr "Lanean"
+msgstr "Xedeak"
 
 #: ../smime/gui/certificate-manager.c:283 ../smime/gui/smime-ui.glade.h:37
 #: ../smime/lib/e-cert.c:569
 msgid "Serial Number"
-msgstr ""
+msgstr "Serie-zenbakia"
 
 #: ../smime/gui/certificate-manager.c:291
-#, fuzzy
 msgid "Expires"
-msgstr "Adierazpena"
+msgstr "Iraungitze-data"
 
 #: ../smime/gui/certificate-manager.c:483
-#, fuzzy
 msgid "E-Mail Address"
-msgstr "Fusionatu helbide elektronikoa"
+msgstr "Helbide elektronikoa"
 
 #: ../smime/gui/certificate-viewer.c:334
-#, fuzzy, c-format
+#, c-format
 msgid "Certificate Viewer: %s"
-msgstr ""
-"Ziurtagiria iraungita: %s\n"
-"Jaulkitzailea: %s"
+msgstr "Ziurtagiri-ikustailea: %s"
 
 #: ../smime/gui/component.c:45
-#, fuzzy, c-format
+#, c-format
 msgid "Enter the password for `%s'"
-msgstr "Idatzi %s(r)en pasahitza"
+msgstr "Idatzi `%s' pasahitza"
 
 #. we're setting the password initially
 #: ../smime/gui/component.c:68
-#, fuzzy
 msgid "Enter new password for certificate database"
-msgstr "%sIdatzi %s(r)en pasahitza (%s erabiltzailea)"
+msgstr "Idatzi ziurtagirien datu-baseko pasahitz berria"
 
 #: ../smime/gui/component.c:70
-#, fuzzy
 msgid "Enter new password"
-msgstr "Idatzi pasahitza"
+msgstr "Idatzi pasahitz berria"
 
 #. FIXME: add serial no, validity date, uses
 #: ../smime/gui/e-cert-selector.c:119
@@ -17763,6 +17046,8 @@ msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
+"Honentzat jaulkia:\n"
+"  Gaia: %s\n"
 
 #: ../smime/gui/e-cert-selector.c:120
 #, c-format
@@ -17770,135 +17055,120 @@ msgid ""
 "Issued by:\n"
 "  Subject: %s\n"
 msgstr ""
+"Jaulkitzailea:\n"
+"  Gaia: %s\n"
 
 #: ../smime/gui/e-cert-selector.c:167
-#, fuzzy
 msgid "Select certificate"
-msgstr "Joan data jakin batera"
+msgstr "Hautatu ziurtagiria"
 
 #: ../smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
-msgstr ""
+msgstr "<Ez da ziurtagiriaren zatia>"
 
 #: ../smime/gui/smime-ui.glade.h:2
-#, fuzzy
 msgid "<b>Certificate Fields</b>"
-msgstr "Ziurtagiria errebokatu egin da"
+msgstr "<b>Ziurtagiriaren eremuak</b>"
 
 #: ../smime/gui/smime-ui.glade.h:3
 msgid "<b>Certificate Hierarchy</b>"
-msgstr ""
+msgstr "<b>Ziurtagiriaren hierarkia</b>"
 
 #: ../smime/gui/smime-ui.glade.h:4
-#, fuzzy
 msgid "<b>Field Value</b>"
-msgstr "<b>Mezuak bidali:</b>"
+msgstr "<b>Eremuko balioa</b>"
 
 #: ../smime/gui/smime-ui.glade.h:5
 msgid "<b>Fingerprints</b>"
-msgstr ""
+msgstr "<b>Hatz-markak</b>"
 
 #: ../smime/gui/smime-ui.glade.h:6
-#, fuzzy
 msgid "<b>Issued By</b>"
-msgstr "<b>Falta:</b> "
+msgstr "<b>Jaulkitzailea</b>"
 
 #: ../smime/gui/smime-ui.glade.h:7
-#, fuzzy
 msgid "<b>Issued To</b>"
-msgstr "<b>Falta:</b> "
+msgstr "<b>Honentzat jaulkia</b>"
 
 #: ../smime/gui/smime-ui.glade.h:8
 msgid "<b>This certificate has been verified for the following uses:</b>"
-msgstr ""
+msgstr "<b>Ziurtagiri hau ondorengo erabileretarako egiaztatu da:</b>"
 
 #: ../smime/gui/smime-ui.glade.h:9
-#, fuzzy
 msgid "<b>Validity</b>"
-msgstr "<b>Egoera:</b>"
+msgstr "<b>Baliozkotasuna</b>"
 
 #: ../smime/gui/smime-ui.glade.h:10
-#, fuzzy
 msgid "Authorities"
-msgstr "Poitiers"
+msgstr "Autoritateak"
 
 #: ../smime/gui/smime-ui.glade.h:11
-#, fuzzy
 msgid "Backup"
-msgstr "Blackpool"
+msgstr "Babeskopia"
 
 #: ../smime/gui/smime-ui.glade.h:12
-#, fuzzy
 msgid "Backup All"
-msgstr "Blackpool"
+msgstr "Egin guztiaren babeskopia"
 
 #: ../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 ""
+"Ziurtagiri-emaile honetaz edozein xedetarako fidatu aurretik, bere politika, "
+"prozedurak eta ziurtagiria aztertu beharko zenituzke (erabilgarri badaude)."
 
 #: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1076
-#, fuzzy
 msgid "Certificate"
-msgstr "_Ziurtagiri-IDa:"
+msgstr "Ziurtagiria"
 
 #: ../smime/gui/smime-ui.glade.h:15
-#, fuzzy
 msgid "Certificate Authority Trust"
-msgstr "Ziurtagiria ez da fidagarria"
+msgstr "Ziurtagiri-emaileaz fidatzea"
 
 #: ../smime/gui/smime-ui.glade.h:16
-#, fuzzy
 msgid "Certificate details"
-msgstr "Ziurtagiria oraindik ez da baliozkoa"
+msgstr "Ziurtagiriaren xehetasunak"
 
 #: ../smime/gui/smime-ui.glade.h:17
-#, fuzzy
 msgid "Certificates Table"
-msgstr "_Ziurtagiri-IDa:"
+msgstr "Ziurtagiri-taula"
 
 #: ../smime/gui/smime-ui.glade.h:18
-#, fuzzy
 msgid "Common Name (CN)"
-msgstr "Izen arrunta"
+msgstr "Izen arrunta (CN)"
 
 #: ../smime/gui/smime-ui.glade.h:19
-#, fuzzy
 msgid "Contact Certificates"
-msgstr "_Ziurtagiri-IDa:"
+msgstr "Kontaktu-ziurtagiriak"
 
 #: ../smime/gui/smime-ui.glade.h:21
 msgid "Do not trust the authenticity of this certificate"
-msgstr ""
+msgstr "Ez fidatu ziurtagiri honen  autentikotasunaz"
 
 #: ../smime/gui/smime-ui.glade.h:22
 msgid "Dummy window only"
-msgstr ""
+msgstr "Leiho faltsua bakarrik"
 
 #: ../smime/gui/smime-ui.glade.h:23
-#, fuzzy
 msgid "Edit"
-msgstr "E_ditatu"
+msgstr "Editatu"
 
 #: ../smime/gui/smime-ui.glade.h:24
-#, fuzzy
 msgid "Email Certificate Trust Settings"
-msgstr "Autoritate ziurtagiri-emailea baliogabea da"
+msgstr "Postaren ziurtagiriaren fidagarritasun kontrola"
 
 #: ../smime/gui/smime-ui.glade.h:25
 msgid "Email Recipient Certificate"
-msgstr ""
+msgstr "Posta elektronikoko hartzailearen ziurtagiria"
 
 #: ../smime/gui/smime-ui.glade.h:26
-#, fuzzy
 msgid "Email Signer Certificate"
-msgstr "Huts egin du ziurtagiriak egiaztatzean."
+msgstr "Posta elektronikoko sinatzailearen ziurtagiria"
 
 #: ../smime/gui/smime-ui.glade.h:27
-#, fuzzy
 msgid "Expires On"
-msgstr "Adierazpena"
+msgstr "Iraungitze-data"
 
 #: ../smime/gui/smime-ui.glade.h:29
 msgid "Import"
@@ -17906,190 +17176,173 @@ msgstr "Inportatu"
 
 #: ../smime/gui/smime-ui.glade.h:30
 msgid "Issued On"
-msgstr ""
+msgstr "Jaulkitze-data"
 
 #: ../smime/gui/smime-ui.glade.h:31
 msgid "MD5 Fingerprint"
-msgstr ""
+msgstr "MD5 hatz-marka"
 
 #: ../smime/gui/smime-ui.glade.h:32
-#, fuzzy
 msgid "Organization (O)"
-msgstr "Erakundea"
+msgstr "Erakundea (O)"
 
 #: ../smime/gui/smime-ui.glade.h:33
-#, fuzzy
 msgid "Organizational Unit (OU)"
-msgstr "Erakundeko saila"
+msgstr "Erakundeko Saila (OU)"
 
 #: ../smime/gui/smime-ui.glade.h:34
 msgid "SHA1 Fingerprint"
-msgstr ""
+msgstr "SHA1 hatz-marka"
 
 #: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
-msgstr ""
+msgstr "SSL bezero-ziurtagiria"
 
 #: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
-msgstr ""
+msgstr "SSL zerbitzari-ziurtagiria"
 
 #: ../smime/gui/smime-ui.glade.h:38
 msgid "Trust the authenticity of this certificate"
-msgstr ""
+msgstr "Fidatu ziurtagiri-emaile honetaz posta-erabiltzaileak identifikatzeko."
 
 #: ../smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify email users."
 msgstr ""
+"Fidatu ziurtagiri-emaile honetaz software-garatzaileak identifikatzeko."
 
 #: ../smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify software developers."
-msgstr ""
+msgstr "Fidatu ziurtagiri-emaile honetaz posta-erabiltzaileak identifikatzeko."
 
 #: ../smime/gui/smime-ui.glade.h:41
 msgid "Trust this CA to identify web sites."
-msgstr ""
+msgstr "Fidatu ziurtagiri-emaile honetaz web guneak identifikatzeko."
 
 #: ../smime/gui/smime-ui.glade.h:42
-#, fuzzy
 msgid "View"
-msgstr "_Ikusi"
+msgstr "Ikusi"
 
 #: ../smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
-msgstr ""
+msgstr "Identifikatzen zaituzten erakunde horien ziurtagiriak dituzu:"
 
 #: ../smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
+"Ziurtagiri-emaileok identifikatzen dituzten ziurtagiriak dituzu artxibatuta:"
 
 #: ../smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
+"Pertsona hauek identifikatzen dituzten ziurtagiriak dituzu artxibatuta:"
 
 #: ../smime/gui/smime-ui.glade.h:46
-#, fuzzy
 msgid "Your Certificates"
-msgstr "_Ziurtagiri-IDa:"
+msgstr "Zure ziurtagiriak"
 
 #: ../smime/gui/smime-ui.glade.h:47
 msgid "_Edit CA Trust"
-msgstr ""
+msgstr "_Editatu ziurtagiri-emailearen fidagarritasuna"
 
 #. XXX we shouldn't be popping up dialogs in this code.
 #: ../smime/lib/e-cert-db.c:651
-#, fuzzy
 msgid "Certificate already exists"
-msgstr "Txartelaren ID hori badago lehendik"
+msgstr "Ziurtagiria badago lehendik"
 
 #: ../smime/lib/e-cert.c:238 ../smime/lib/e-cert.c:248
-#, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%Y/%m/%d"
 
 #. x509 certificate usage types
 #: ../smime/lib/e-cert.c:424
-#, fuzzy
 msgid "Sign"
-msgstr "Stauning"
+msgstr "Sinatu"
 
 #: ../smime/lib/e-cert.c:425
-#, fuzzy
 msgid "Encrypt"
-msgstr "PGP enkriptatzea"
+msgstr "Enkriptatu"
 
 #: ../smime/lib/e-cert.c:530
-#, fuzzy
 msgid "Version"
-msgstr "Vermont"
+msgstr "Bertsioa"
 
 #: ../smime/lib/e-cert.c:545
-#, fuzzy
 msgid "Version 1"
-msgstr "Vermillion"
+msgstr "1. bertsioa"
 
 #: ../smime/lib/e-cert.c:548
-#, fuzzy
 msgid "Version 2"
-msgstr "Vermillion"
+msgstr "2. bertsioa"
 
 #: ../smime/lib/e-cert.c:551
-#, fuzzy
 msgid "Version 3"
-msgstr "Vermillion"
+msgstr "3. bertsioa"
 
 #: ../smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
-msgstr ""
+msgstr "PKCS #1 MD2 - RSA enkriptatzearekin"
 
 #: ../smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
-msgstr ""
+msgstr "PKCS #1 MD5 RSA enkriptatzearekin"
 
 #: ../smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
-msgstr ""
+msgstr "PKCS #1 SHA-1 RSA enkriptatzearekin"
 
 #: ../smime/lib/e-cert.c:642
-#, fuzzy
 msgid "C"
 msgstr " C"
 
 #: ../smime/lib/e-cert.c:645
-#, fuzzy
 msgid "CN"
-msgstr "I"
+msgstr "CN"
 
 #: ../smime/lib/e-cert.c:648
 msgid "OU"
-msgstr ""
+msgstr "OU"
 
 #: ../smime/lib/e-cert.c:651
-#, fuzzy
 msgid "O"
-msgstr "Ados"
+msgstr "O"
 
 #: ../smime/lib/e-cert.c:654
 msgid "L"
-msgstr ""
+msgstr "L"
 
 #: ../smime/lib/e-cert.c:657
-#, fuzzy
 msgid "DN"
-msgstr "I"
+msgstr "DN"
 
 #: ../smime/lib/e-cert.c:660
 msgid "DC"
-msgstr ""
+msgstr "DC"
 
 #: ../smime/lib/e-cert.c:663
-#, fuzzy
 msgid "ST"
-msgstr "SMTP"
+msgstr "ST"
 
 #: ../smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
-msgstr ""
+msgstr "PKCS #1 RSA enkriptatzearekin"
 
 #: ../smime/lib/e-cert.c:669
-#, fuzzy
 msgid "Certificate Key Usage"
-msgstr "Ziurtagiria errebokatu egin da"
+msgstr "Ziurtagiri-gakoen erabilera"
 
 #: ../smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
-msgstr ""
+msgstr "Netscape-ren ziurtagiri-mota"
 
 #: ../smime/lib/e-cert.c:675
-#, fuzzy
 msgid "Certificate Authority Key Identifier"
-msgstr "Ziurtagiria ez da fidagarria"
+msgstr "Ziurtagiri-emailearen gako-identifikatzailea"
 
 #: ../smime/lib/e-cert.c:678
-#, fuzzy
 msgid "UID"
-msgstr "IDa"
+msgstr "UIDa"
 
 #: ../smime/lib/e-cert.c:681
 msgid "E"
@@ -18098,137 +17351,120 @@ msgstr "E"
 #: ../smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
-msgstr ""
+msgstr "Objektu-identifikatzailea (%s)"
 
 #: ../smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
-msgstr ""
+msgstr "Algoritmo-identifikatzailea"
 
 #: ../smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
-msgstr ""
+msgstr "Algoritmo-parametroak"
 
 #: ../smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
-msgstr ""
+msgstr "Subjektuaren gako publikoaren informazioa"
 
 #: ../smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
-msgstr ""
+msgstr "Subjektuaren gako publikoaren algoritmoa"
 
 #: ../smime/lib/e-cert.c:788
-#, fuzzy
 msgid "Subject's Public Key"
-msgstr "Gaia: %s"
+msgstr "Subjektuaren gako publikoa"
 
 #: ../smime/lib/e-cert.c:809 ../smime/lib/e-cert.c:858
-#, fuzzy
 msgid "Error: Unable to process extension"
-msgstr "Ezin da spool-karpeta prozesatu"
+msgstr "Errorea: ezin da luzapena prozesatu"
 
 #: ../smime/lib/e-cert.c:830 ../smime/lib/e-cert.c:842
 msgid "Object Signer"
-msgstr ""
+msgstr "Objektu-sinatzailea"
 
 #: ../smime/lib/e-cert.c:834
-#, fuzzy
 msgid "SSL Certificate Authority"
-msgstr "Autoritate ziurtagiri-emailea baliogabea da"
+msgstr "SSL ziurtagiri-emailea"
 
 #: ../smime/lib/e-cert.c:838
-#, fuzzy
 msgid "Email Certificate Authority"
-msgstr "Autoritate ziurtagiri-emailea baliogabea da"
+msgstr "Posta elektronikoko ziurtagiri-emailea"
 
 #: ../smime/lib/e-cert.c:866
-#, fuzzy
 msgid "Signing"
-msgstr "Stauning"
+msgstr "Sinatzea"
 
 #: ../smime/lib/e-cert.c:870
-#, fuzzy
 msgid "Non-repudiation"
-msgstr "Ez dago informaziorik"
+msgstr "Errefusatzerik ez"
 
 #: ../smime/lib/e-cert.c:874
 msgid "Key Encipherment"
-msgstr ""
+msgstr "Gako-zifraketa"
 
 #: ../smime/lib/e-cert.c:878
-#, fuzzy
 msgid "Data Encipherment"
-msgstr "eranskina"
+msgstr "Datu-zifraketa"
 
 #: ../smime/lib/e-cert.c:882
 msgid "Key Agreement"
-msgstr ""
+msgstr "Gako-hitzarmena"
 
 #: ../smime/lib/e-cert.c:886
-#, fuzzy
 msgid "Certificate Signer"
-msgstr "Ziurtagiri-sinaduraren hutsegitea"
+msgstr "Ziurtagiri-sinatzailea"
 
 #: ../smime/lib/e-cert.c:890
 msgid "CRL Signer"
-msgstr ""
+msgstr "CRL sinatzailea"
 
 #: ../smime/lib/e-cert.c:938
-#, fuzzy
 msgid "Critical"
-msgstr "Curitiba"
+msgstr "Kritikoa"
 
 #: ../smime/lib/e-cert.c:940 ../smime/lib/e-cert.c:943
-#, fuzzy
 msgid "Not Critical"
-msgstr "Ipar Carolina"
+msgstr "Ez kritikoa"
 
 #: ../smime/lib/e-cert.c:964
-#, fuzzy
 msgid "Extensions"
-msgstr "Adierazpena"
+msgstr "Luzapenak"
 
 #: ../smime/lib/e-cert.c:1035
-#, fuzzy, c-format
+#, c-format
 msgid "%s = %s"
 msgstr "%s - %s"
 
 #: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1211
-#, fuzzy
 msgid "Certificate Signature Algorithm"
-msgstr "Ziurtagiri-sinaduraren hutsegitea"
+msgstr "Ziurtagiriaren sinaduraren algoritmoa"
 
 #: ../smime/lib/e-cert.c:1100
-#, fuzzy
 msgid "Issuer"
-msgstr "_Txertatu"
+msgstr "Jaulkitzailea"
 
 #: ../smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
-msgstr ""
+msgstr "Jaulkitzailearen ID esklusiboa"
 
 #: ../smime/lib/e-cert.c:1173
-#, fuzzy
 msgid "Subject Unique ID"
-msgstr "Gaia: %s"
+msgstr "Subjektuaren ID esklusiboa"
 
 #: ../smime/lib/e-cert.c:1216
-#, fuzzy
 msgid "Certificate Signature Value"
-msgstr "Ziurtagiri-sinaduraren hutsegitea"
+msgstr "Ziurtagiriaren sinaduraren balioa"
 
 #: ../smime/lib/e-pkcs12.c:264
 msgid "PKCS12 File Password"
-msgstr ""
+msgstr "PKCS12 fitxategiaren pasahitza"
 
 #: ../smime/lib/e-pkcs12.c:264
-#, fuzzy
 msgid "Enter password for PKCS12 file:"
-msgstr "Idatzi %s(r)en pasahitza"
+msgstr "Idatzi PKCS12 fitxategiaren pasahitza:"
 
 #: ../smime/lib/e-pkcs12.c:363
-#, fuzzy
 msgid "Imported Certificate"
-msgstr "_Ziurtagiri-IDa:"
+msgstr "Inportatutako ziurtagiria"
 
 #: ../tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
@@ -18268,9 +17504,8 @@ msgid "Shutting down %s (%s)\n"
 msgstr "%s ixten (%s)\n"
 
 #: ../ui/evolution-addressbook.xml.h:3
-#, fuzzy
 msgid "Copy Selected Contacts to Another Folder..."
-msgstr "Kopiatu kontaktua(k) beste karpeta batean..."
+msgstr "Kopiatu hautatutako kontaktua(k) beste karpeta batean..."
 
 #: ../ui/evolution-addressbook.xml.h:4 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
@@ -18289,9 +17524,8 @@ msgid "Delete selected contacts"
 msgstr "Ezabatu hautatutako kontaktuak"
 
 #: ../ui/evolution-addressbook.xml.h:11
-#, fuzzy
 msgid "Move Selected Contacts to Another Folder..."
-msgstr "Eraman kontaktua(k) beste karpeta batera..."
+msgstr "Eraman hautatutako kontaktua(k) beste karpeta batera..."
 
 #: ../ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
@@ -18322,7 +17556,6 @@ msgid "Select all contacts"
 msgstr "Hautatu kontaktu guztiak"
 
 #: ../ui/evolution-addressbook.xml.h:23
-#, fuzzy
 msgid "Send a message to the selected contacts."
 msgstr "Bidali mezua hautatutako kontaktuei."
 
@@ -18335,9 +17568,8 @@ msgid "Send selected contacts to another person."
 msgstr "Bidali hautatutako kontaktuak beste norbaiti."
 
 #: ../ui/evolution-addressbook.xml.h:26
-#, fuzzy
 msgid "Show contact preview window"
-msgstr "Erakutsi mezu-aurrebistaren leihoa"
+msgstr "Erakutsi kontaktu-aurrebistaren leihoa"
 
 #: ../ui/evolution-addressbook.xml.h:27
 msgid "Stop"
@@ -18352,7 +17584,7 @@ msgid "View the current contact"
 msgstr "Ikusi uneko kontaktua"
 
 #: ../ui/evolution-addressbook.xml.h:30 ../ui/evolution-calendar.xml.h:38
-#: ../ui/evolution-tasks.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:26 ../ui/evolution-tasks.xml.h:19
 msgid "_Actions"
 msgstr "_Ekintzak"
 
@@ -18365,9 +17597,8 @@ msgid "_Preview Pane"
 msgstr "Au_rrebistako panela"
 
 #: ../ui/evolution-addressbook.xml.h:41
-#, fuzzy
 msgid "_Save as VCard..."
-msgstr "_Gorde VCard gisa"
+msgstr "_Gorde VCard gisa..."
 
 #: ../ui/evolution-addressbook.xml.h:42
 msgid "_Select All"
@@ -18417,7 +17648,7 @@ msgstr "Zerrenda"
 msgid "Month"
 msgstr "_Hilabetea"
 
-#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:59
 msgid "Next"
 msgstr "Hurrengoa"
 
@@ -18425,7 +17656,7 @@ msgstr "Hurrengoa"
 msgid "Previews the calendar to be printed"
 msgstr "Inprimatuko den egutegiaren aurrebista eskaintzen du"
 
-#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:75
 msgid "Previous"
 msgstr "Aurrekoa"
 
@@ -18438,34 +17669,28 @@ msgid "Publish Free/Busy information for this calendar"
 msgstr "Argitaratu egutegi honen libre/okupatuta informazioa"
 
 #: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
-#, fuzzy
 msgid "Purg_e"
-msgstr "Bourges"
+msgstr "_Borratu betiko"
 
 #: ../ui/evolution-calendar.xml.h:24
-#, fuzzy
 msgid "Purge old appointments and meetings"
-msgstr "Hitzorduak eta gertaerak dituen karpeta publikoa"
+msgstr "Borratu hitzordu eta bilera zaharrak"
 
 #: ../ui/evolution-calendar.xml.h:25
-#, fuzzy
 msgid "Select _Date"
-msgstr "Hautatu izenak"
+msgstr "Hautatu _data"
 
 #: ../ui/evolution-calendar.xml.h:27
-#, fuzzy
 msgid "Select a specific date"
-msgstr "Joan data jakin batera"
+msgstr "Hautatu zehaztutako data bat"
 
 #: ../ui/evolution-calendar.xml.h:28
-#, fuzzy
 msgid "Select today"
-msgstr "Hautatu karpeta"
+msgstr "Hautatu gaur"
 
 #: ../ui/evolution-calendar.xml.h:29
-#, fuzzy
 msgid "Show as list"
-msgstr "Erakutsi xehetasunak"
+msgstr "Erakutsi zerrenda gisa"
 
 #: ../ui/evolution-calendar.xml.h:30
 msgid "Show one day"
@@ -18484,9 +17709,8 @@ msgid "Show the working week"
 msgstr "Erakutsi lan-astea"
 
 #: ../ui/evolution-calendar.xml.h:35
-#, fuzzy
 msgid "View the current appointment"
-msgstr "Ikusi uneko kontaktua"
+msgstr "Ikusi uneko hitzordua"
 
 #: ../ui/evolution-calendar.xml.h:36
 msgid "Week"
@@ -18497,9 +17721,8 @@ msgid "Work Week"
 msgstr "Lan-astea"
 
 #: ../ui/evolution-calendar.xml.h:42
-#, fuzzy
 msgid "_Open Appointment"
-msgstr "_Hitzordua"
+msgstr "_Ireki hitzordua"
 
 #: ../ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
@@ -18534,19 +17757,16 @@ msgid "Cancel the current mail operation"
 msgstr "Bertan behera utzi uneko posta-eragiketa"
 
 #: ../ui/evolution-mail-global.xml.h:3
-#, fuzzy
 msgid "Copy the selected folder into another folder"
-msgstr "Kopiatu hautatutako mezuak beste karpeta batean"
+msgstr "Kopiatu hautatutako karpeta beste karpeta batean"
 
 #: ../ui/evolution-mail-global.xml.h:4
-#, fuzzy
 msgid "Create a new folder for storing mail"
-msgstr "Sortu karpeta birtuala posta-zerrenda honentzat"
+msgstr "Sortu karpeta  berria posta gordetzeko"
 
 #: ../ui/evolution-mail-global.xml.h:5
-#, fuzzy
 msgid "Create or edit Search Folder definitions"
-msgstr "Sortu edo editatu karpeta birtualen definizioak"
+msgstr "Sortu edo editatu bilaketa-karpetaren definizioak"
 
 #: ../ui/evolution-mail-global.xml.h:6
 msgid "Create or edit rules for filtering new mail"
@@ -18556,35 +17776,34 @@ msgstr "Sortu edo editatu mezu berriak iragazteko arauak"
 msgid "Empty _Trash"
 msgstr "Hustu _zakarrontzia"
 
-#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:7
+#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:6
 #: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "Kar_peta"
 
 #: ../ui/evolution-mail-global.xml.h:9
-#, fuzzy
 msgid "Message F_ilters"
-msgstr "Mezuen letra-tipoak"
+msgstr "Posta-_iragazkiak"
 
 #: ../ui/evolution-mail-global.xml.h:10
-#, fuzzy
-msgid "Message _Preview"
-msgstr "Mezuaren goiburua"
+msgid "Message _List As"
+msgstr "Mezuen zerrenda:"
 
 #: ../ui/evolution-mail-global.xml.h:11
-#, fuzzy
+msgid "Message _Preview"
+msgstr "Mezuaren _aurrebista"
+
+#: ../ui/evolution-mail-global.xml.h:12
 msgid "Move the selected folder into another folder"
-msgstr "Eraman hautatutako mezua(k) beste karpeta batera"
+msgstr "Eraman hautatutako karpeta beste karpeta batera"
 
-#. Alphabetical by name, yo
 #: ../ui/evolution-mail-global.xml.h:13
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Betiko kendu ezabatutako mezu guztiak karpeta guztietatik"
 
 #: ../ui/evolution-mail-global.xml.h:14
-#, fuzzy
 msgid "Search F_olders"
-msgstr "Hautatu karpeta"
+msgstr "Bilaketa-_karpetak"
 
 #: ../ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
@@ -18595,593 +17814,538 @@ msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Harpidetza egin edo kendu urruneko zerbitzarietako karpetetan"
 
 #: ../ui/evolution-mail-global.xml.h:17
-#, fuzzy
 msgid "_Copy Folder To..."
-msgstr "K_opiatu karpeta honetan..."
+msgstr "K_opiatu karpeta hemen..."
 
 #: ../ui/evolution-mail-global.xml.h:18
-#, fuzzy
 msgid "_Move Folder To..."
-msgstr "_Eraman karpeta honetara..."
+msgstr "_Eraman karpeta hona..."
 
 #: ../ui/evolution-mail-global.xml.h:19
+msgid "_New Search _Folder (FIXME)"
+msgstr "_Bilaketa-karpeta berria (ZUZENTZEKO)"
+
+#: ../ui/evolution-mail-global.xml.h:20
 msgid "_New..."
-msgstr "Berr_ia..."
+msgstr "_Berria..."
 
-#.
-#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
-#.
-#: ../ui/evolution-mail-global.xml.h:23
-#, fuzzy
+#: ../ui/evolution-mail-global.xml.h:21
 msgid "_Subscriptions"
-msgstr "Karpeta-harpidetzak"
+msgstr "_Harpidetzak"
 
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
-msgstr "Aldatu karpeta honen izena"
+msgstr "Aldatu karpetaren izena"
 
 #: ../ui/evolution-mail-list.xml.h:2
 msgid "Change the properties of this folder"
 msgstr "Aldatu karpeta honen propietateak"
 
-#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:12
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Kopiatu hautatutako mezua(k) arbelean"
 
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-list.xml.h:5 ../ui/evolution-mail-message.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:4 ../ui/evolution-mail-message.xml.h:23
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Ebaki hautatutako mezua(k) arbelera"
 
-#: ../ui/evolution-mail-list.xml.h:6
-#, fuzzy
+#: ../ui/evolution-mail-list.xml.h:5
 msgid "E_xpunge"
-msgstr "_Borratu betiko"
+msgstr "_Betiko borratu"
 
-#: ../ui/evolution-mail-list.xml.h:8
-#, fuzzy
+#: ../ui/evolution-mail-list.xml.h:7
 msgid "Group By _Threads"
-msgstr "Elkartu eremu honen arabera"
+msgstr "Elkartu _harien arabera"
 
-#: ../ui/evolution-mail-list.xml.h:9
-#, fuzzy
+#: ../ui/evolution-mail-list.xml.h:8
 msgid "Hide S_elected Messages"
-msgstr "Ez_kutatu ezabatutako mezuak"
+msgstr "Ezkutatu _hautatutako mezuak"
 
-#: ../ui/evolution-mail-list.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:9
 msgid "Hide _Deleted Messages"
 msgstr "Ez_kutatu ezabatutako mezuak"
 
-#: ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-list.xml.h:10
 msgid "Hide _Read Messages"
 msgstr "Ezkutatu _irakurritako mezuak"
 
-#: ../ui/evolution-mail-list.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:11
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr "Ezkutatu ezabatutako mezuak, marratuta erakutsi beharrean"
 
-#: ../ui/evolution-mail-list.xml.h:13
-#, fuzzy
+#: ../ui/evolution-mail-list.xml.h:12
 msgid "Mark Me_ssages as Read"
-msgstr "_Markatu mezuak irakurritako gisa"
+msgstr "Markatu _mezuak irakurritako gisa"
 
-#: ../ui/evolution-mail-list.xml.h:14 ../ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-list.xml.h:13 ../ui/evolution-mail-message.xml.h:68
 msgid "Paste message(s) from the clipboard"
 msgstr "Itsatsi mezua(k) arbeletik"
 
-#: ../ui/evolution-mail-list.xml.h:15
+#: ../ui/evolution-mail-list.xml.h:14
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Betiko kendu karpeta honetatik ezabatutako mezu guztiak"
 
-#: ../ui/evolution-mail-list.xml.h:16
-#, fuzzy
+#: ../ui/evolution-mail-list.xml.h:15
 msgid "Permanently remove this folder"
-msgstr "Betiko kendu karpeta honetatik ezabatutako mezu guztiak"
+msgstr "Betiko kendu karpeta honetatik"
 
-#: ../ui/evolution-mail-list.xml.h:17
-#, fuzzy
+#: ../ui/evolution-mail-list.xml.h:16
 msgid "Select Message _Thread"
-msgstr "Ezkutatu _hautatutako mezuak"
+msgstr "Hautatu mezuen _haria"
 
-#: ../ui/evolution-mail-list.xml.h:18
-#, fuzzy
+#: ../ui/evolution-mail-list.xml.h:17
 msgid "Select _All Messages"
-msgstr "Hautatu ikusgai dauden mezu guztiak"
+msgstr "Hautatu mezu _guztiak"
 
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:18
 msgid "Select all and only the messages that are not currently selected"
 msgstr "Hautatu une honetan hautatu gabe dauden mezu guztiak"
 
-#: ../ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:19
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Hautatu hautatutako mezuaren hari berean dauden mezu guztiak"
 
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:20
 msgid "Select all visible messages"
 msgstr "Hautatu ikusgai dauden mezu guztiak"
 
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:21
 msgid "Sh_ow Hidden Messages"
 msgstr "E_rakutsi ezkutuko mezuak"
 
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:22
 msgid "Show messages that have been temporarily hidden"
 msgstr "Erakutsi aldi batez ezkutuan egon diren mezuak"
 
-#: ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:23
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Aldi baterako ezkutatu jadanik irakurrita dauden mezu guztiak"
 
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:24
 msgid "Temporarily hide the selected messages"
 msgstr "Aldi baterako ezkutatu hautatutako mezuak"
 
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "Threaded Message list"
 msgstr "Harian sartutako mezu-zerrenda"
 
-#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:112
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
-#, fuzzy
 msgid "_Message"
-msgstr "Mezuak"
+msgstr "_Mezua"
 
 #: ../ui/evolution-mail-message.xml.h:1
-#, fuzzy
 msgid "A_dd Sender to Address Book"
-msgstr "Gehitu bidaltzailea _helbide-liburuan"
+msgstr "Ge_hitu bidaltzailea helbide-liburuan"
 
 #: ../ui/evolution-mail-message.xml.h:2
 msgid "A_pply Filters"
 msgstr "_Aplikatu iragazkiak"
 
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-message.xml.h:4
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:3
 msgid "Add Sender to Address Book"
 msgstr "Gehitu bidaltzailea helbide-liburuan"
 
-#: ../ui/evolution-mail-message.xml.h:5
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:4
 msgid "All Message _Headers"
-msgstr "Mezuaren goiburua"
+msgstr "Mezu guztien _goiburuak"
 
-#: ../ui/evolution-mail-message.xml.h:6
+#: ../ui/evolution-mail-message.xml.h:5
 msgid "Apply filter rules to the selected messages"
 msgstr "Aplikatu iragazki-arauak hautatutako mezuei"
 
-#: ../ui/evolution-mail-message.xml.h:7
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:6
 msgid "Check for _Junk"
-msgstr "Begiratu mezu berririk dagoen"
+msgstr "Begiratu mezu _baztergarririk dagoen"
 
-#: ../ui/evolution-mail-message.xml.h:8
+#: ../ui/evolution-mail-message.xml.h:7
 msgid "Compose _New Message"
 msgstr "Prestatu mezu _berria"
 
-#: ../ui/evolution-mail-message.xml.h:9
+#: ../ui/evolution-mail-message.xml.h:8
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Prestatu hautatutako mezuaren hartzaile guztientzako erantzuna"
 
-#: ../ui/evolution-mail-message.xml.h:10
+#: ../ui/evolution-mail-message.xml.h:9
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Prestatu hautatutako mezuaren posta-zerrendarentzako erantzuna"
 
-#: ../ui/evolution-mail-message.xml.h:11
+#: ../ui/evolution-mail-message.xml.h:10
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Prestatu hautatutako mezuaren bidaltzailearentzako erantzuna"
 
-#: ../ui/evolution-mail-message.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:13
 msgid "Copy selected messages to another folder"
 msgstr "Kopiatu hautatutako mezuak beste karpeta batean"
 
-#: ../ui/evolution-mail-message.xml.h:15
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:14
 msgid "Create R_ule"
-msgstr "Sortu karpeta berria"
+msgstr "Sortu a_raua"
 
-#: ../ui/evolution-mail-message.xml.h:16
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:15
 msgid "Create a Search Folder for these recipients"
-msgstr "Sortu karpeta birtuala hartzaile hauentzat"
+msgstr "Sortu bilaketa-karpeta hartzaile hauentzat"
 
-#: ../ui/evolution-mail-message.xml.h:17
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:16
 msgid "Create a Search Folder for this mailing list"
-msgstr "Sortu karpeta birtuala posta-zerrenda honentzat"
+msgstr "Sortu bilaketa-karpeta posta-zerrenda honentzat"
 
-#: ../ui/evolution-mail-message.xml.h:18
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:17
 msgid "Create a Search Folder for this sender"
-msgstr "Sortu karpeta birtuala bidaltzaile honentzat"
+msgstr "Sortu bilaketa-karpeta bidaltzaile honentzat"
 
-#: ../ui/evolution-mail-message.xml.h:19
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:18
 msgid "Create a Search Folder for this subject"
-msgstr "Sortu karpeta birtuala gai honentzat"
+msgstr "Sortu bilaketa-karpeta gai honentzat"
 
-#: ../ui/evolution-mail-message.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a rule to filter messages from this sender"
 msgstr "Sortu araua bidaltzaile hau duten mezuak iragazteko"
 
-#: ../ui/evolution-mail-message.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Sortu araua hartzaile hauek dituzten mezuak iragazteko"
 
-#: ../ui/evolution-mail-message.xml.h:22
+#: ../ui/evolution-mail-message.xml.h:21
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Sortu araua posta-zerrenda honetako mezuak iragazteko"
 
-#: ../ui/evolution-mail-message.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:22
 msgid "Create a rule to filter messages with this subject"
 msgstr "Sortu araua gai hau duten mezuak iragazteko"
 
-#: ../ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-mail-message.xml.h:24
 msgid "Decrease the text size"
 msgstr "Txikitu testuaren tamaina"
 
-#: ../ui/evolution-mail-message.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:26
 msgid "Display the next important message"
 msgstr "Bistaratu hurrengo mezu garrantzitsua"
 
-#: ../ui/evolution-mail-message.xml.h:28
+#: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next message"
 msgstr "Bistaratu hurrengo mezua"
 
-#: ../ui/evolution-mail-message.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:28
 msgid "Display the next unread message"
 msgstr "Bistaratu irakurri gabeko hurrengo mezua"
 
-#: ../ui/evolution-mail-message.xml.h:30
+#: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the next unread thread"
 msgstr "Bistaratu irakurri gabeko hurrengo haria"
 
-#: ../ui/evolution-mail-message.xml.h:31
+#: ../ui/evolution-mail-message.xml.h:30
 msgid "Display the previous important message"
 msgstr "Bistaratu aurreko mezu garrantzitsua"
 
-#: ../ui/evolution-mail-message.xml.h:32
+#: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous message"
 msgstr "Bistaratu aurreko mezua"
 
-#: ../ui/evolution-mail-message.xml.h:33
+#: ../ui/evolution-mail-message.xml.h:32
 msgid "Display the previous unread message"
 msgstr "Bistaratu irakurri gabeko aurreko mezua"
 
-#: ../ui/evolution-mail-message.xml.h:34
+#: ../ui/evolution-mail-message.xml.h:33
 msgid "Filter on Mailing _List..."
 msgstr "_Posta-zerrendaren araberako iragazkia..."
 
-#: ../ui/evolution-mail-message.xml.h:35
+#: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Se_nder..."
 msgstr "Bi_daltzailearen araberako iragazkia..."
 
-#: ../ui/evolution-mail-message.xml.h:36
+#: ../ui/evolution-mail-message.xml.h:35
 msgid "Filter on _Recipients..."
 msgstr "Hart_zailearen araberako iragazkia..."
 
-#: ../ui/evolution-mail-message.xml.h:37
+#: ../ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Subject..."
 msgstr "G_aiaren araberako iragazkia..."
 
-#: ../ui/evolution-mail-message.xml.h:38
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:37
 msgid "Filter the selected messages for junk status"
-msgstr "Markatu hautatutako mezuak ezabatzeko gisa"
+msgstr "Iragazi hautatutako mezuak, baztergarri-egoeraren arabera"
 
-#: ../ui/evolution-mail-message.xml.h:39
+#: ../ui/evolution-mail-message.xml.h:38
 msgid "Flag selected message(s) for follow-up"
 msgstr "Markatu hautatutako mezuak jarraipena egiteko"
 
-#: ../ui/evolution-mail-message.xml.h:40
+#: ../ui/evolution-mail-message.xml.h:39
 msgid "Follow _Up..."
 msgstr "Jarrait_u..."
 
-#: ../ui/evolution-mail-message.xml.h:41
+#: ../ui/evolution-mail-message.xml.h:40
 msgid "Force images in HTML mail to be loaded"
 msgstr "Kargarazi HTML mezuetako irudiak"
 
-#: ../ui/evolution-mail-message.xml.h:43
+#: ../ui/evolution-mail-message.xml.h:42
 msgid "Forward the selected message in the body of a new message"
 msgstr "Birbidali hautatutako mezua beste mezu baten testuaren barnean"
 
-#: ../ui/evolution-mail-message.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message quoted like a reply"
 msgstr "Birbidali hautatutako mezua erantzun gisa aipatuta"
 
-#: ../ui/evolution-mail-message.xml.h:45
+#: ../ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message to someone"
 msgstr "Birbidali hautatutako mezua norbaiti"
 
-#: ../ui/evolution-mail-message.xml.h:46
+#: ../ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Birbidali hautatutako mezua norbaiti eranskin gisa"
 
-#: ../ui/evolution-mail-message.xml.h:47
+#: ../ui/evolution-mail-message.xml.h:46
 msgid "Increase the text size"
 msgstr "Handitu testuaren tamaina"
 
-#: ../ui/evolution-mail-message.xml.h:49
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as"
-msgstr "Mar_katu irakurritako gisa"
+msgstr "Mar_katu honela"
 
-#: ../ui/evolution-mail-message.xml.h:50
+#: ../ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected message(s) as having been read"
 msgstr "Markatu hautatutako mezua(k) irakurritako gisa"
 
-#: ../ui/evolution-mail-message.xml.h:51
+#: ../ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as important"
 msgstr "Markatu hautatutako mezua(k) garrantzitsu gisa"
 
-#: ../ui/evolution-mail-message.xml.h:52
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected message(s) as junk"
-msgstr "Markatu hautatutako mezua(k) ez-garrantzitsu gisa"
+msgstr "Markatu hautatutako mezua(k) baztergarri gisa"
 
-#: ../ui/evolution-mail-message.xml.h:53
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected message(s) as not being junk"
-msgstr "Markatu hautatutako mezua(k) irakurri gabeko gisa"
+msgstr "Markatu hautatutako mezua(k) ez-baztergarri gisa"
 
-#: ../ui/evolution-mail-message.xml.h:54
+#: ../ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Markatu hautatutako mezua(k) irakurri gabeko gisa"
 
-#: ../ui/evolution-mail-message.xml.h:55
+#: ../ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Markatu hautatutako mezua(k) ez-garrantzitsu gisa"
 
-#: ../ui/evolution-mail-message.xml.h:56
+#: ../ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected messages for deletion"
 msgstr "Markatu hautatutako mezuak ezabatzeko gisa"
 
-#: ../ui/evolution-mail-message.xml.h:57
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:56
 msgid "Message Source"
-msgstr "Mezu-biltegiratzea"
+msgstr "Mezuaren iturburua"
 
-#: ../ui/evolution-mail-message.xml.h:58
+#: ../ui/evolution-mail-message.xml.h:57
 msgid "Move"
 msgstr "Eraman"
 
-#: ../ui/evolution-mail-message.xml.h:59
+#: ../ui/evolution-mail-message.xml.h:58
 msgid "Move selected message(s) to another folder"
 msgstr "Eraman hautatutako mezua(k) beste karpeta batera"
 
-#: ../ui/evolution-mail-message.xml.h:61
+#: ../ui/evolution-mail-message.xml.h:60
 msgid "Next _Important Message"
 msgstr "Hurrengo mezu _garrantzitsua"
 
-#: ../ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Thread"
 msgstr "_Hurrengo haria"
 
-#: ../ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:62
 msgid "Next _Unread Message"
 msgstr "Hurrengo _irakurri gabeko mezua"
 
-#: ../ui/evolution-mail-message.xml.h:64
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:63
 msgid "Not Junk"
-msgstr "Ez da aurkitu"
+msgstr "Ez-baztergarria"
 
-#: ../ui/evolution-mail-message.xml.h:65
+#: ../ui/evolution-mail-message.xml.h:64
 msgid "Open a window for composing a mail message"
 msgstr "Ireki posta-mezua idazteko leihoa"
 
-#: ../ui/evolution-mail-message.xml.h:66
+#: ../ui/evolution-mail-message.xml.h:65
 msgid "Open the selected message in a new window"
 msgstr "Ireki hautatutako mezua leiho berri batean"
 
-#: ../ui/evolution-mail-message.xml.h:67
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:66
 msgid "Open the selected message in the composer for editing"
-msgstr "Ireki hautatutako mezua mezu-prestatzailean, berriro bidaltzeko"
+msgstr "Ireki hautatutako mezua mezuak prestatzeko leihoan editatzeko"
 
-#: ../ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-message.xml.h:67
 msgid "P_revious Unread Message"
 msgstr "Irakurri _gabeko aurreko mezua"
 
-#: ../ui/evolution-mail-message.xml.h:70
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Pos_t New Message to Folder"
-msgstr "Bidali mezu berria"
+msgstr "_Bidali mezu berria karpetara"
 
-#: ../ui/evolution-mail-message.xml.h:71
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:70
 msgid "Post a Repl_y"
-msgstr "Bidali erantzuna"
+msgstr "Bidali era_ntzuna"
 
-#: ../ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-mail-message.xml.h:71
 msgid "Post a message to a Public folder"
 msgstr "Bidali mezua karpeta publiko batera"
 
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:72
 msgid "Post a reply to a message in a Public folder"
 msgstr "Bidali mezu baten erantzuna karpeta publiko batera"
 
-#: ../ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Pr_evious Important Message"
 msgstr "Aurreko _mezu garrantzitsua"
 
-#: ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-mail-message.xml.h:74
 msgid "Preview the message to be printed"
 msgstr "Inprimatuko den mezuaren aurrebista eskaintzen du"
 
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:78
 msgid "Print this message"
 msgstr "Inprimatu mezu hau"
 
-#: ../ui/evolution-mail-message.xml.h:80
+#: ../ui/evolution-mail-message.xml.h:79
 msgid "Re_direct"
 msgstr "Birbi_deratu"
 
-#: ../ui/evolution-mail-message.xml.h:81
+#: ../ui/evolution-mail-message.xml.h:80
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Birbideratu (errebotatu) hautatutako mezua norbaiti"
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Reset the text to its original size"
 msgstr "Testua jatorrizko tamainan berrezartzen du"
 
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:85
 msgid "Save the message as a text file"
 msgstr "Gorde mezua testu-fitxategi gisa"
 
-#: ../ui/evolution-mail-message.xml.h:87
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Search Folder from Mailing _List..."
-msgstr "_Posta-zerrendaren araberako karpeta birtuala..."
+msgstr "_Posta-zerrendaren bilaketa-karpeta..."
 
-#: ../ui/evolution-mail-message.xml.h:88
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Search Folder from Recipients..."
-msgstr "_Hartzailearen araberako karpeta birtuala..."
+msgstr "Hartzailearen bilaketa-karpeta..."
 
-#: ../ui/evolution-mail-message.xml.h:89
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Search Folder from S_ubject..."
-msgstr "_Gaiaren araberako karpeta birtuala..."
+msgstr "_Gaiaren bilaketa-karpeta..."
 
-#: ../ui/evolution-mail-message.xml.h:90
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:89
 msgid "Search Folder from Sen_der..."
-msgstr "_Bidaltzailearen araberako karpeta birtuala..."
+msgstr "_Bidaltzailearen bilaketa-karpeta..."
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Search for text in the body of the displayed message"
 msgstr "Bilatu testua bistaratutako mezuaren gorputzean"
 
-#: ../ui/evolution-mail-message.xml.h:92
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Select _All Text"
-msgstr "Hautatu testu osoa"
+msgstr "Hautatu testu _osoa"
 
-#: ../ui/evolution-mail-message.xml.h:93
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Select all the text in a message"
-msgstr "Hautatu ikusgai dauden mezu guztiak"
+msgstr "Hautatu mezuko testu osoa"
 
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Set up the page settings for your current printer"
 msgstr "Konfiguratu orrialde-ezarpenak uneko inprimagailuarentzat"
 
-#: ../ui/evolution-mail-message.xml.h:95
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "Bilatu testua bistaratutako mezuaren gorputzean"
+msgstr "Erakutsi kurtsore keinukaria bistaratutako mezuen gorputzean"
 
-#: ../ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Show message in the normal style"
 msgstr "Erakutsi mezua estilo normalean"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show message with all email headers"
 msgstr "Erakutsi mezua posta-goiburu guztiekin"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Show the raw email source of the message"
 msgstr "Erakutsi mezu-iturburua formatu gabe"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Un-delete the selected messages"
 msgstr "Desezabatu hautatutako mezuak"
 
-#: ../ui/evolution-mail-message.xml.h:100
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Uni_mportant"
-msgstr "Garrantzitsua"
+msgstr "Ez-garrantzitsua"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "Zoom _Out"
-msgstr ""
+msgstr "_Txikiagotu"
 
-#: ../ui/evolution-mail-message.xml.h:102
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
-msgstr "Testu-eredua"
+msgstr "Kurtsore _modua"
 
-#: ../ui/evolution-mail-message.xml.h:105
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:104
 msgid "_Delete Message"
-msgstr "Ez_kutatu ezabatutako mezuak"
+msgstr "_Ezabatu mezua"
 
-#: ../ui/evolution-mail-message.xml.h:107
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Find in Message..."
-msgstr "Bilatu mezuan"
+msgstr "_Bilatu mezuan..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Go To"
 msgstr "_Joan hona"
 
-#: ../ui/evolution-mail-message.xml.h:110
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Important"
-msgstr "Garrantzitsua"
+msgstr "_Garrantzitsua"
 
-#: ../ui/evolution-mail-message.xml.h:111
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Junk"
-msgstr "ekaina"
+msgstr "_Baztergarria"
 
-#: ../ui/evolution-mail-message.xml.h:112
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Load Images"
 msgstr "Kargatu iru_diak"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Next Message"
 msgstr "_Hurrengo mezua"
 
-#: ../ui/evolution-mail-message.xml.h:116
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Normal Size"
-msgstr "Normala"
+msgstr "_Tamaina normala"
 
-#: ../ui/evolution-mail-message.xml.h:117
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Not Junk"
-msgstr "Ez da aurkitu"
+msgstr "E_z-baztergarria"
 
-#: ../ui/evolution-mail-message.xml.h:118
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Open in New Window"
-msgstr "Ireki leiho berrian"
+msgstr "Ireki leiho _berrian"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Previous Message"
 msgstr "_Aurreko mezua"
 
-#: ../ui/evolution-mail-message.xml.h:123
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Save Message..."
-msgstr "Gorde mezua honela..."
+msgstr "_Gorde mezua..."
 
-#: ../ui/evolution-mail-message.xml.h:124
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:123
 msgid "_Undelete Message"
-msgstr "_Hurrengo mezua"
+msgstr "_Berreskuratu mezua"
 
-#: ../ui/evolution-mail-message.xml.h:125
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Unread"
-msgstr "Markatu i_rakurri gabeko gisa"
+msgstr "_Irakurri gabea"
 
-#: ../ui/evolution-mail-message.xml.h:126
+#: ../ui/evolution-mail-message.xml.h:125
 msgid "_Zoom In"
-msgstr ""
+msgstr "_Handiagotu"
 
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
 #: ../ui/evolution-mail-messagedisplay.xml.h:1
 #: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:7
+#: ../ui/evolution-signature-editor.xml.h:2
 msgid "Close"
 msgstr "Itxi"
 
@@ -19189,7 +18353,7 @@ msgstr "Itxi"
 msgid "Close this window"
 msgstr "Itxi leiho hau"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "Tresna-barra nagusia"
 
@@ -19200,8 +18364,8 @@ msgstr "It_xi"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:45
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:36
+#: ../ui/evolution-signature-editor.xml.h:13
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:33
 msgid "_File"
 msgstr "_Fitxategia"
 
@@ -19215,15 +18379,10 @@ msgstr "Erantsi fitxategi bat"
 
 #: ../ui/evolution-message-composer.xml.h:3
 msgid "Check to get delivery notification when your message is read"
-msgstr ""
+msgstr "Egiaztatu bidaltze-jakinarazpena lortzeko mezu bat irakurtzean"
 
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
 #: ../ui/evolution-message-composer.xml.h:5
-#: ../ui/evolution-signature-editor.xml.h:13
+#: ../ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
 msgstr "Itxi uneko fitxategia"
 
@@ -19236,12 +18395,11 @@ msgid "Encrypt this message with PGP"
 msgstr "Enkriptatu mezu hau PGPrekin"
 
 #: ../ui/evolution-message-composer.xml.h:8
-#, fuzzy
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Enkriptatu mezu hau zure S/MIME enkriptatze-ziurtagiriarekin"
 
 #: ../ui/evolution-message-composer.xml.h:9
-#: ../ui/evolution-signature-editor.xml.h:14
+#: ../ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
 msgstr "For_matua"
 
@@ -19262,9 +18420,8 @@ msgid "PGP Sign"
 msgstr "PGP sinadura"
 
 #: ../ui/evolution-message-composer.xml.h:15
-#, fuzzy
 msgid "Request read receipt"
-msgstr "Irakurragiriak"
+msgstr "Eskatu irakurragiriak"
 
 #: ../ui/evolution-message-composer.xml.h:16
 msgid "S/MIME Encrypt"
@@ -19279,9 +18436,8 @@ msgid "Save As"
 msgstr "Gorde honela"
 
 #: ../ui/evolution-message-composer.xml.h:20
-#, fuzzy
 msgid "Save Draft"
-msgstr "Gorde _zirriborroa"
+msgstr "Gorde zirriborroa"
 
 #: ../ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
@@ -19292,15 +18448,15 @@ msgid "Save _Draft"
 msgstr "Gorde _zirriborroa"
 
 #: ../ui/evolution-message-composer.xml.h:23
-#, fuzzy
 msgid "Save as draft"
-msgstr "Gorde _zirriborroa"
+msgstr "Gorde zirriborro gisa"
 
 #: ../ui/evolution-message-composer.xml.h:24
 msgid "Save in folder..."
 msgstr "Gorde karpetan..."
 
 #: ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-signature-editor.xml.h:9
 msgid "Save the current file"
 msgstr "Gorde uneko fitxategia"
 
@@ -19313,7 +18469,7 @@ msgid "Save the message in a specified folder"
 msgstr "Gorde mezua adierazitako karpetan"
 
 #: ../ui/evolution-message-composer.xml.h:29
-#: ../ui/evolution-signature-editor.xml.h:22
+#: ../ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
 msgstr "Bidali mezua HTML formatuan"
 
@@ -19342,18 +18498,16 @@ msgid "Toggles whether the From chooser is displayed"
 msgstr "'Nork' eremua erakutsi edo ezkutatzen du"
 
 #: ../ui/evolution-message-composer.xml.h:36
-#, fuzzy
 msgid "Toggles whether the Post-To field is displayed"
-msgstr "'Erantzun honi' eremua erakutsi edo ezkutatzen du"
+msgstr "''Bidali hona' eremua erakutsi edo ezkutatzen du"
 
 #: ../ui/evolution-message-composer.xml.h:37
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "'Erantzun honi' eremua erakutsi edo ezkutatzen du"
 
 #: ../ui/evolution-message-composer.xml.h:38
-#, fuzzy
 msgid "Toggles whether the To field is displayed"
-msgstr "CC eremua erakutsi edo ezkutatzen du"
+msgstr "'Nori' eremua erakutsi edo ezkutatzen du"
 
 #: ../ui/evolution-message-composer.xml.h:39
 msgid "_Attachment..."
@@ -19376,7 +18530,7 @@ msgid "_From Field"
 msgstr "'Nork' e_remua"
 
 #: ../ui/evolution-message-composer.xml.h:47
-#: ../ui/evolution-signature-editor.xml.h:25
+#: ../ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Txertatu"
 
@@ -19385,9 +18539,8 @@ msgid "_Open..."
 msgstr "_Ireki..."
 
 #: ../ui/evolution-message-composer.xml.h:49
-#, fuzzy
 msgid "_Post-To Field"
-msgstr "'Erant_zun honi' eremua"
+msgstr "'Bidali _hona' eremua"
 
 #: ../ui/evolution-message-composer.xml.h:50
 msgid "_Reply-To Field"
@@ -19398,30 +18551,26 @@ msgid "_Security"
 msgstr "Se_gurtasuna"
 
 #: ../ui/evolution-message-composer.xml.h:53
-#, fuzzy
 msgid "_To Field"
-msgstr "'Nork' e_remua"
+msgstr "'N_ori' eremua"
 
 #: ../ui/evolution-signature-editor.xml.h:1
 msgid "C_lose"
 msgstr "_Itxi"
 
-#: ../ui/evolution-signature-editor.xml.h:15
+#: ../ui/evolution-signature-editor.xml.h:5
 msgid "H_TML"
 msgstr "_HTML"
 
-#: ../ui/evolution-signature-editor.xml.h:16
+#: ../ui/evolution-signature-editor.xml.h:7
 msgid "Save and Close"
 msgstr "Gorde eta itxi"
 
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:20
+#: ../ui/evolution-signature-editor.xml.h:8
 msgid "Save and _Close"
 msgstr "Gorde eta _itxi"
 
-#: ../ui/evolution-signature-editor.xml.h:21
+#: ../ui/evolution-signature-editor.xml.h:10
 msgid "Save the current file and close the window"
 msgstr "Gorde uneko fitxategia eta itxi leihoa"
 
@@ -19490,28 +18639,24 @@ msgid "Print the list of tasks"
 msgstr "Inprimatu zereginen zerrenda"
 
 #: ../ui/evolution-tasks.xml.h:18
-#, fuzzy
 msgid "View the selected task"
-msgstr "Ezabatu hautatutako zereginak"
+msgstr "Ikusi hautatutako zeregina"
 
 #: ../ui/evolution-tasks.xml.h:25
-#, fuzzy
 msgid "_Open Task"
-msgstr "Zeregin berria"
+msgstr "_Ireki zeregina"
 
 #: ../ui/evolution.xml.h:1
-#, fuzzy
 msgid "About Evolution..."
-msgstr "Ximian Evolution-i buruz"
+msgstr "Evolution-i buruz..."
 
 #: ../ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Aldatu Evolution-en ezarpenak"
 
 #: ../ui/evolution.xml.h:3
-#, fuzzy
 msgid "Change the visibility of the toolbar"
-msgstr "Aldatu karpeta honen propietateak"
+msgstr "Aldatu tresna-barraren ikusgaitasuna"
 
 #: ../ui/evolution.xml.h:5
 msgid "Create a new window displaying this folder"
@@ -19520,161 +18665,151 @@ msgstr "Sortu karpeta hau erakusten duen leiho berri bat"
 #: ../ui/evolution.xml.h:6
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
+"Bistaratu leihoko botoiak mahagaineko tresna-barraren ezarpenak erabiliz"
 
 #: ../ui/evolution.xml.h:7
 msgid "Display window buttons with icons and text"
-msgstr ""
+msgstr "Bistaratu leihoko botoiak ikonoekin eta testuarekin"
 
 #: ../ui/evolution.xml.h:8
 msgid "Display window buttons with icons only"
-msgstr ""
+msgstr "Bistaratu leihoko botoiak ikonoekin bakarrik"
 
 #: ../ui/evolution.xml.h:9
 msgid "Display window buttons with text only"
-msgstr ""
+msgstr "Bistaratu leihoko botoiak testuarekin soilik"
 
 #: ../ui/evolution.xml.h:10
+msgid "Evolution _FAQ"
+msgstr "Evolution-en _MEG"
+
+#: ../ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Programatik irten"
 
-#: ../ui/evolution.xml.h:11
+#: ../ui/evolution.xml.h:12
 msgid "Forget _Passwords"
 msgstr "Ahaztu _pasahitzak"
 
-#: ../ui/evolution.xml.h:12
+#: ../ui/evolution.xml.h:13
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Ahaztu gogoratutako pasahitzak (horrela berriz galdetuko dizkizu)"
 
-#: ../ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:14
 msgid "Hide window buttons"
-msgstr ""
+msgstr "Ezkutatu leihoko botoiak"
 
-#: ../ui/evolution.xml.h:14
+#: ../ui/evolution.xml.h:15
 msgid "Icons _and text"
-msgstr ""
+msgstr "Ikonoak _eta testua"
 
-#: ../ui/evolution.xml.h:15
+#: ../ui/evolution.xml.h:16
 msgid "Import data from other programs"
 msgstr "Inportatu datuak beste programa batzuetatik"
 
-#: ../ui/evolution.xml.h:17
-#, fuzzy
+#: ../ui/evolution.xml.h:18
 msgid "New _Window"
-msgstr "_Bilatu orain"
+msgstr "Leiho _berria"
 
-#: ../ui/evolution.xml.h:18
-#, fuzzy
+#: ../ui/evolution.xml.h:19
 msgid "Prefere_nces"
-msgstr "Posta-hobespenak"
+msgstr "_Hobespenak"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:20
 msgid "Send / Receive"
 msgstr "Bidali / Jaso"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "Bidali ilaran gordetako elementuak eta hartu elementu berriak"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "Konfiguratu Pilot-en ezarpenak"
 
-#: ../ui/evolution.xml.h:22
-#, fuzzy
+#: ../ui/evolution.xml.h:23
 msgid "Show information about Evolution"
-msgstr "Erakutsi Ximian Evolution-i buruzko informazioa"
+msgstr "Erakutsi Evolution-i buruzko informazioa"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "Bidali programa-erroreen berri-ematea"
 
-#. <menuitem name="HelpFAQ" verb=""
-#. _label="Evolution _FAQ"/>
-#.
-#. <separator/>
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "_Bidali programa-erroreen berri-ematea"
 
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Eman programa-erroreen berri Bug Buddy erabiliz"
 
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:27
 msgid "Toggle whether we are working offline."
 msgstr "Gaitu/desgaitu lineaz kanpo lanean aritzea."
 
-#: ../ui/evolution.xml.h:31
-#, fuzzy
+#: ../ui/evolution.xml.h:28
 msgid "Tool_bar"
-msgstr "Tresna-barra nagusia"
+msgstr "Tresna-_barra"
 
-#: ../ui/evolution.xml.h:32
-#, fuzzy
+#: ../ui/evolution.xml.h:29
 msgid "Tool_bar style"
-msgstr "Tresna-barra nagusia"
+msgstr "Tresna-barraren estiloa"
 
-#: ../ui/evolution.xml.h:33
-#, fuzzy
+#: ../ui/evolution.xml.h:30
 msgid "_About Evolution..."
-msgstr "Ximian Evolution-i buruz"
+msgstr "Evolution-i _buruz..."
 
-#: ../ui/evolution.xml.h:34
-#, fuzzy
+#: ../ui/evolution.xml.h:31
 msgid "_Close Window"
-msgstr "Itxi leiho hau"
+msgstr "_Itxi leihoa"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:34
 msgid "_Help"
 msgstr "_Laguntza"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:35
 msgid "_Hide buttons"
-msgstr ""
+msgstr "_Ezkutatu botoiak"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:36
 msgid "_Icons only"
-msgstr ""
+msgstr "_Ikonoak soilik"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:37
 msgid "_Import..."
 msgstr "Inp_ortatu..."
 
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:38
 msgid "_New"
 msgstr "_Berria"
 
-#: ../ui/evolution.xml.h:42
-#, fuzzy
+#: ../ui/evolution.xml.h:39
 msgid "_Quick Reference"
-msgstr "Posta-hobespenak"
+msgstr "_Erreferentzia azkarra"
 
-#: ../ui/evolution.xml.h:43
-#, fuzzy
+#: ../ui/evolution.xml.h:40
 msgid "_Quit"
-msgstr "E_baki"
+msgstr "_Irten"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:41
 msgid "_Send / Receive"
 msgstr "_Bidali / Jaso"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:42
 msgid "_Switcher Appearance"
-msgstr ""
+msgstr "_Konmutadorearen itxura"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:43
 msgid "_Synchronization Options..."
-msgstr ""
+msgstr "_sinkronizazio aukerak..."
 
-#: ../ui/evolution.xml.h:47
-#, fuzzy
+#: ../ui/evolution.xml.h:44
 msgid "_Text only"
-msgstr "Testu-eredua"
+msgstr "_Testua soilik"
 
-#: ../ui/evolution.xml.h:49
-#, fuzzy
+#: ../ui/evolution.xml.h:46
 msgid "_Window"
-msgstr "_Bilatu orain"
+msgstr "_Leihoa"
 
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
@@ -19697,9 +18832,8 @@ msgid "_Day View"
 msgstr "_Eguneko ikuspegia"
 
 #: ../views/calendar/galview.xml.h:3
-#, fuzzy
 msgid "_List View"
-msgstr "Ikuspegi pertsonalizatua"
+msgstr "_Zerrenda-ikuspegia"
 
 #: ../views/calendar/galview.xml.h:4
 msgid "_Month View"
@@ -19710,44 +18844,36 @@ msgid "_Work Week View"
 msgstr "_Lan-asteko ikuspegia"
 
 #: ../views/mail/galview.xml.h:1
-#, fuzzy
 msgid "As _Sent Folder"
-msgstr "Bidalitakoen karpeta bezala"
+msgstr "Bida_litakoen karpeta gisa"
 
 #: ../views/mail/galview.xml.h:2
-#, fuzzy
 msgid "By S_tatus"
-msgstr "Egoeraren arabera"
+msgstr "E_goeraren arabera"
 
 #: ../views/mail/galview.xml.h:3
-#, fuzzy
 msgid "By Se_nder"
-msgstr "Bidaltzailearen arabera"
+msgstr "Bi_daltzailearen arabera"
 
 #: ../views/mail/galview.xml.h:4
-#, fuzzy
 msgid "By Su_bject"
-msgstr "Gaiaren arabera"
+msgstr "Gaiaren a_rabera"
 
 #: ../views/mail/galview.xml.h:5
-#, fuzzy
 msgid "By _Follow Up Flag"
-msgstr "Jarraitze-banderaren arabera"
+msgstr "Jarraitze-_markaren arabera"
 
 #: ../views/mail/galview.xml.h:6
-#, fuzzy
 msgid "_Messages"
-msgstr "Mezuak"
+msgstr "_Mezuak"
 
 #: ../views/tasks/galview.xml.h:1
-#, fuzzy
 msgid "With _Due Date"
-msgstr "_Mugaeguna:"
+msgstr "E_pearekin"
 
 #: ../views/tasks/galview.xml.h:2
-#, fuzzy
 msgid "With _Status"
-msgstr "Ezarri egoera"
+msgstr "Eg_oerarekin"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:195
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:637
@@ -19755,23 +18881,20 @@ msgid "UTC"
 msgstr "UTC"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
-#, fuzzy
 msgid "<b>Time Zones</b>"
-msgstr "Ordu-zonak"
+msgstr "<b>Ordu-zonak</b>"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
-#, fuzzy
 msgid "<b>_Selection</b>"
-msgstr "_Hautapena:"
+msgstr "<b>_Hautapena</b>"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Select a Time Zone"
 msgstr "Hautatu ordu-zona"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
-#, fuzzy
 msgid "TimeZone Combobox"
-msgstr "Ordu-zona "
+msgstr "Ordu-zonaren konbinazio-koadroa"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
 msgid ""
@@ -19785,31 +18908,28 @@ msgstr ""
 
 #: ../widgets/menus/gal-define-views-dialog.c:76
 #: ../widgets/menus/gal-define-views-model.c:188
-#, fuzzy
 msgid "Collection"
-msgstr "College Station"
+msgstr "Bilduma"
 
 #: ../widgets/menus/gal-define-views-dialog.c:325
 #: ../widgets/menus/gal-define-views.glade.h:4
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Define Views for %s"
-msgstr "Definitu ikuspegiak..."
+msgstr "Definitu %s(r)en ikuspegiak..."
 
 #: ../widgets/menus/gal-define-views-dialog.c:333
 #: ../widgets/menus/gal-define-views-dialog.c:335
-#, fuzzy
 msgid "Define Views"
-msgstr "Definitu ikuspegiak..."
+msgstr "Definitu ikuspegiak"
 
 #: ../widgets/menus/gal-define-views.glade.h:2
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Define Views for \"%s\""
-msgstr "Definitu ikuspegiak..."
+msgstr "Definitu \"%s\"(r)en ikuspegiak..."
 
 #: ../widgets/menus/gal-define-views.glade.h:5
-#, fuzzy
 msgid "_Edit..."
-msgstr "E_ditatu"
+msgstr "E_ditatu..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
 #: ../widgets/table/e-table-header-item.c:1845
@@ -19819,23 +18939,20 @@ msgid "Table"
 msgstr "Taula"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:182
-#, fuzzy
 msgid "Instance"
-msgstr "Instantzia guztiak"
+msgstr "Instantzia"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:232
-#, fuzzy
 msgid "Save Current View"
-msgstr "Uneko ikuspegia"
+msgstr "gorde uneko ikuspegia"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
-#, fuzzy
 msgid "_Create new view"
-msgstr "Sortu karpeta berria"
+msgstr "_Sortuikuspegi berria"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
 msgid "_Replace existing view"
-msgstr ""
+msgstr "_Ordeztu dagoen ikuspegia"
 
 #: ../widgets/menus/gal-view-menus.c:291
 msgid "_Current View"
@@ -19850,24 +18967,21 @@ msgstr "Gorde ikuspegi pertsonalizatua..."
 msgid "Factory"
 msgstr "Fabrika"
 
-#
 #: ../widgets/menus/gal-view-new-dialog.c:115
 msgid "Define New View"
-msgstr "Zehaztu ikuspegi berriak"
+msgstr "Definitu ikuspegi berria"
 
 #: ../widgets/menus/gal-view-new-dialog.glade.h:2
 msgid "Name of new view:"
-msgstr ""
+msgstr "Ikuspegi berriaren izena:"
 
 #: ../widgets/menus/gal-view-new-dialog.glade.h:3
-#, fuzzy
 msgid "Type of View"
-msgstr "Bistaratzeko ikuspegi-mota"
+msgstr "Ikuspegi-mota"
 
 #: ../widgets/menus/gal-view-new-dialog.glade.h:4
-#, fuzzy
 msgid "Type of view:"
-msgstr "Bistaratzeko ikuspegi-mota"
+msgstr "Ikuspegi-mota"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
@@ -19881,16 +18995,13 @@ msgid "%B %Y"
 msgstr "%Y %B"
 
 #: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
-#, fuzzy
 msgid "Previous Button"
-msgstr "Aurrekoa"
+msgstr "Aurreko botoia"
 
 #: ../widgets/misc/e-calendar.c:226
-#, fuzzy
 msgid "Month Calendar"
-msgstr "Egutegia kargatzen"
+msgstr "Hileko egutegia"
 
-#
 #: ../widgets/misc/e-canvas-background.c:456
 #: ../widgets/misc/e-canvas-background.c:457 ../widgets/text/e-entry.c:1284
 #: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3540
@@ -19909,33 +19020,32 @@ msgstr "Betetze-kolorea"
 msgid "GDK fill color"
 msgstr "GDK betetze-kolorea"
 
-#
 #: ../widgets/misc/e-canvas-background.c:477
 #: ../widgets/misc/e-canvas-background.c:478 ../widgets/text/e-entry.c:1305
 #: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3562
 #: ../widgets/text/e-text.c:3563
 msgid "Fill stipple"
-msgstr "Betetze-puntuak"
+msgstr "Betetze-puntua"
 
 #: ../widgets/misc/e-canvas-background.c:484
 #: ../widgets/misc/e-canvas-background.c:485
 msgid "X1"
-msgstr ""
+msgstr "X1"
 
 #: ../widgets/misc/e-canvas-background.c:491
 #: ../widgets/misc/e-canvas-background.c:492
 msgid "X2"
-msgstr ""
+msgstr "X2"
 
 #: ../widgets/misc/e-canvas-background.c:498
 #: ../widgets/misc/e-canvas-background.c:499
 msgid "Y1"
-msgstr ""
+msgstr "Y1"
 
 #: ../widgets/misc/e-canvas-background.c:505
 #: ../widgets/misc/e-canvas-background.c:506
 msgid "Y2"
-msgstr ""
+msgstr "Y2"
 
 #: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1430
 #: ../widgets/table/e-table-group-container.c:978
@@ -19953,9 +19063,8 @@ msgstr "Gutxieneko zabalera"
 
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
 #: ../widgets/misc/e-expander.c:205
-#, fuzzy
 msgid "Spacing"
-msgstr "Espainia"
+msgstr "Tartea"
 
 #: ../widgets/misc/e-cell-date-edit.c:232 ../widgets/misc/e-dateedit.c:451
 msgid "Now"
@@ -20015,9 +19124,8 @@ msgid "Western European"
 msgstr "Europako Mendebaldekoa"
 
 #: ../widgets/misc/e-charset-picker.c:74
-#, fuzzy
 msgid "Western European, New"
-msgstr "Europako Mendebaldekoa"
+msgstr "Europako Mendebaldekoa, Berria"
 
 #: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
 #: ../widgets/misc/e-charset-picker.c:93
@@ -20060,70 +19168,68 @@ msgid "..."
 msgstr "..."
 
 #: ../widgets/misc/e-dateedit.c:316
-#, fuzzy
 msgid "Date and Time Entry"
-msgstr "<b>Falta:</b> "
+msgstr "Dataren eta orduaren sarrera"
 
 #: ../widgets/misc/e-dateedit.c:335
 msgid "Text entry to input date"
-msgstr ""
+msgstr "Testu sarrera data txertatzeko"
 
 #: ../widgets/misc/e-dateedit.c:336
 msgid "Text Date Entry"
-msgstr ""
+msgstr "Dataren testu-sarrera"
 
 #: ../widgets/misc/e-dateedit.c:353
 msgid "Click this button to show a calendar"
-msgstr ""
+msgstr "Egin klik botoian egutegia erakusteko"
 
 #: ../widgets/misc/e-dateedit.c:354
-#, fuzzy
 msgid "Date Button"
-msgstr "Marraztu botoia"
+msgstr "Dataren botoia"
 
 #: ../widgets/misc/e-dateedit.c:374
 msgid "Combo box to select time"
-msgstr ""
+msgstr "Konbinazio-koadroa ordua hautatzeko"
 
 #: ../widgets/misc/e-dateedit.c:375
 msgid "Time Combo Box"
-msgstr ""
+msgstr "Orduaren konbinazio-koadroa"
 
 #: ../widgets/misc/e-expander.c:181
-#, fuzzy
 msgid "Expanded"
-msgstr "_Borratu betiko"
+msgstr "Zabalduta"
 
 #: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
-msgstr ""
+msgstr "Zabaltzailea zabalduko den edo ez"
 
 #: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
-msgstr ""
+msgstr "Zabaltzailearen etiketako testua"
 
 #: ../widgets/misc/e-expander.c:197
-#, fuzzy
 msgid "Use underline"
-msgstr "Definitu gabe"
+msgstr "Erabili azpimarra"
 
 #: ../widgets/misc/e-expander.c:198
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
 msgstr ""
+"Ezartzen bada, testuko azpimarrak adierazten du hurrengo karakterea tekla "
+"bizkortzaile mnemoteknikorako erabili behar dela."
 
 #: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
-msgstr ""
+msgstr "Etiketaren eta umearen artean jarri beharreko tartea"
 
 #: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
-msgstr ""
+msgstr "Etiketa-trepeta"
 
 #: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
-msgstr ""
+msgstr "Ohiko zabaltzaile-etiketaren ordez bistaratu beharreko trepeta"
 
 #: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3318
 msgid "Expander Size"
@@ -20131,21 +19237,19 @@ msgstr "Zabaltzailearen tamaina"
 
 #: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3319
 msgid "Size of the expander arrow"
-msgstr "Zabaltze-geziaren tamaina"
+msgstr "Zabaltzailearen geziaren tamaina"
 
 #: ../widgets/misc/e-expander.c:231
-#, fuzzy
 msgid "Indicator Spacing"
-msgstr "Indian Springs"
+msgstr "Adierazlearen tartea"
 
 #: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
-msgstr ""
+msgstr "Zabaltzailearen geziaren inguruko tartea"
 
 #: ../widgets/misc/e-filter-bar.c:195
-#, fuzzy
 msgid "_Searches"
-msgstr "_Bilatu"
+msgstr "_Bilaketak"
 
 #: ../widgets/misc/e-filter-bar.c:197
 msgid "Search Editor"
@@ -20165,30 +19269,28 @@ msgid "_Edit Saved Searches..."
 msgstr "_Editatu gordetako bilaketak..."
 
 #: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
-#, fuzzy
 msgid "_Advanced Search..."
-msgstr "Bilaketa aurreratua"
+msgstr "Bilaketa _aurreratua..."
 
 #: ../widgets/misc/e-image-chooser.c:172
-#, fuzzy
 msgid "Choose Image"
-msgstr "Aukeratu fitxategi bat"
+msgstr "Aukeratu irudia"
 
 #: ../widgets/misc/e-map.c:647
-#, fuzzy
 msgid "World Map"
-msgstr "Worland"
+msgstr "Munduaren mapa"
 
 #: ../widgets/misc/e-map.c:649
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should select the timezone from the below combo box instead."
 msgstr ""
+"Saguan oinarritutako mapa interaktiboa ordu-zona hautatzeko. Teklatuarekin "
+"beheko konbinazio-koadroa erabil daiteke."
 
 #: ../widgets/misc/e-pilot-settings.c:103
-#, fuzzy
 msgid "Sync with:"
-msgstr "honela amaitzen da"
+msgstr "Sinkronizatu honekin:"
 
 #: ../widgets/misc/e-pilot-settings.c:111
 msgid "Sync Private Records:"
@@ -20199,26 +19301,22 @@ msgid "Sync Categories:"
 msgstr "Sinkronizatu kategoriak:"
 
 #: ../widgets/misc/e-reflow.c:1452 ../widgets/misc/e-reflow.c:1453
-#, fuzzy
 msgid "Empty message"
-msgstr "Mezu hutsa"
+msgstr "Mezu _hutsa"
 
 #: ../widgets/misc/e-reflow.c:1459 ../widgets/misc/e-reflow.c:1460
-#, fuzzy
 msgid "Reflow model"
-msgstr "Hautapen-modeloa"
+msgstr "Ordezte-modeloa"
 
 #: ../widgets/misc/e-reflow.c:1466 ../widgets/misc/e-reflow.c:1467
-#, fuzzy
 msgid "Column width"
 msgstr "Zutabe-zabalera"
 
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
 #: ../widgets/misc/e-search-bar.c:345
-#, fuzzy
 msgid "Search Text Entry"
-msgstr "Bilaketa-editorea"
+msgstr "Bilaketa-testuaren sarrera"
 
 #: ../widgets/misc/e-search-bar.c:549
 msgid "_Search"
@@ -20233,9 +19331,8 @@ msgid "_Clear"
 msgstr "Ga_rbitu"
 
 #: ../widgets/misc/e-search-bar.c:647
-#, fuzzy
 msgid "Search Type"
-msgstr "Bilaketa-_esparrua: "
+msgstr "Bilaketa-mota "
 
 #: ../widgets/misc/e-search-bar.c:851
 msgid "Item ID"
@@ -20252,9 +19349,8 @@ msgid "Text"
 msgstr "Testua"
 
 #: ../widgets/misc/e-search-bar.c:945
-#, fuzzy
 msgid "Find _Now"
-msgstr "Bilatu orain"
+msgstr "Bilatu _orain"
 
 #: ../widgets/misc/e-selection-model-array.c:546
 #: ../widgets/table/e-tree-selection-model.c:811
@@ -20267,74 +19363,65 @@ msgstr "Kurtsore-errenkada"
 msgid "Cursor Column"
 msgstr "Kurtsore-zutabea"
 
-#
 #: ../widgets/misc/e-selection-model.c:214
 msgid "Sorter"
 msgstr "Ordenatzailea"
 
 #: ../widgets/misc/e-selection-model.c:221
 msgid "Selection Mode"
-msgstr "Hautapen-modua"
+msgstr "Hautapen mota"
 
 #: ../widgets/misc/e-selection-model.c:229
 msgid "Cursor Mode"
-msgstr "Kurtsore-modua"
+msgstr "Kurtsore modua"
 
 #: ../widgets/misc/e-send-options.c:521
-#, fuzzy
 msgid "When de_leted:"
-msgstr "%d hautatuta"
+msgstr "_Ezabatzean:"
 
 #: ../widgets/misc/e-send-options.glade.h:1
-#, fuzzy
 msgid "<b>Delivery Options</b>"
-msgstr "Ordu-zonak"
+msgstr "<b>Banatzeko aukerak</b>"
 
 #: ../widgets/misc/e-send-options.glade.h:2
-#, fuzzy
 msgid "<b>Replies</b>"
-msgstr "<b>Falta:</b> "
+msgstr "<b>Erantzunak</b> "
 
 #: ../widgets/misc/e-send-options.glade.h:3
-#, fuzzy
 msgid "<b>Return Notification</b>"
-msgstr "Autentifikazioa"
+msgstr "<b>Itzuli jakinarazpena</b>"
 
 #: ../widgets/misc/e-send-options.glade.h:4
-#, fuzzy
 msgid "<b>Status Tracking</b>"
-msgstr "Bilaketa"
+msgstr "<b>Egoeraren jarraipena</b>"
 
 #: ../widgets/misc/e-send-options.glade.h:5
-#, fuzzy
 msgid "A_uto-delete sent item"
-msgstr "Ezabatu elementu hau"
+msgstr "Ezabatu automatikoki bidalitako elementua"
 
 #: ../widgets/misc/e-send-options.glade.h:6
-#, fuzzy
 msgid "C_lassification"
-msgstr "Sailkapena"
+msgstr "_Sailkapena"
 
 #: ../widgets/misc/e-send-options.glade.h:7
-#, fuzzy
 msgid "Creat_e a sent item to track information"
-msgstr "Lortu zereginari buruzko azken informazioa"
+msgstr "_Sortu bidalitako elementua informazioaren jarraipena egiteko"
 
 #: ../widgets/misc/e-send-options.glade.h:8
 msgid "Deli_vered and opened"
-msgstr ""
+msgstr "Banatuta eta irekita"
 
 #: ../widgets/misc/e-send-options.glade.h:9
-#, fuzzy
 msgid "Gene_ral Options"
-msgstr "Au_kerak"
+msgstr "Aukera _orokorrak"
 
 #: ../widgets/misc/e-send-options.glade.h:10
-#, fuzzy
 msgid ""
 "None\n"
 "Mail Receipt"
-msgstr "Irakurragiriak"
+msgstr ""
+"Bat ere ez\n"
+"Posta-agiria"
 
 #: ../widgets/misc/e-send-options.glade.h:12
 msgid ""
@@ -20342,15 +19429,17 @@ msgid ""
 "Private\n"
 "Confidential\n"
 msgstr ""
+"Publikoa\n"
+"Pribatua\n"
+"Konfidentziala\n"
 
 #: ../widgets/misc/e-send-options.glade.h:16
-#, fuzzy
 msgid "R_eply requested"
-msgstr "_Erantzuteko estiloa:"
+msgstr "_Erantzutea eskatu da"
 
 #: ../widgets/misc/e-send-options.glade.h:18
 msgid "Sta_tus Tracking"
-msgstr ""
+msgstr "_Egoeraren jarraipena"
 
 #: ../widgets/misc/e-send-options.glade.h:19
 msgid ""
@@ -20359,64 +19448,58 @@ msgid ""
 "Standard\n"
 "Low"
 msgstr ""
+"Definitu gabea\n"
+"Altua\n"
+"Estandarra\n"
+"Baxua"
 
 #: ../widgets/misc/e-send-options.glade.h:23
-#, fuzzy
 msgid "W_ithin"
-msgstr "Zain"
+msgstr "_Barruan"
 
 #: ../widgets/misc/e-send-options.glade.h:24
-#, fuzzy
 msgid "When acce_pted:"
-msgstr "Onartua"
+msgstr "_Onartzean:"
 
 #: ../widgets/misc/e-send-options.glade.h:25
-#, fuzzy
 msgid "When co_mpleted:"
-msgstr "Osatze-data:"
+msgstr "Osatzean:"
 
 #: ../widgets/misc/e-send-options.glade.h:26
-#, fuzzy
 msgid "When decli_ned:"
-msgstr "Ukatua"
+msgstr "Ba_ztertzean:  "
 
 #: ../widgets/misc/e-send-options.glade.h:27
-#, fuzzy
 msgid "_After:"
-msgstr "geroago"
+msgstr "O_ndoren:"
 
 #: ../widgets/misc/e-send-options.glade.h:28
-#, fuzzy
 msgid "_All information"
-msgstr "Zereginaren informazioa"
+msgstr "_Informazioa guztia"
 
 #: ../widgets/misc/e-send-options.glade.h:29
-#, fuzzy
 msgid "_Delay message delivery"
-msgstr "Utzi mezuak zerbitzarian"
+msgstr "_Atzeratu mezuen banaketa"
 
 #: ../widgets/misc/e-send-options.glade.h:30
-#, fuzzy
 msgid "_Delivered"
-msgstr "E_zabatu"
+msgstr "_Banatuta"
 
 #: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Set expiration date"
-msgstr ""
+msgstr "_Ezarri iraungitze-data"
 
 #: ../widgets/misc/e-send-options.glade.h:33
-#, fuzzy
 msgid "_Until:"
-msgstr "data hau arte:"
+msgstr "A_rte:"
 
 #: ../widgets/misc/e-send-options.glade.h:34
 msgid "_When convenient"
-msgstr ""
+msgstr "_Komeni denean"
 
 #: ../widgets/misc/e-send-options.glade.h:35
-#, fuzzy
 msgid "_When opened:"
-msgstr "Osatze-data:"
+msgstr "_Irekitzean: "
 
 #: ../widgets/misc/e-task-widget.c:208
 #, c-format
@@ -20429,36 +19512,32 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%%%d osatuta)"
 
 #: ../widgets/misc/e-url-entry.c:107
-#, fuzzy
 msgid "click here to go to url"
-msgstr "<egin klik hemen karpeta hautatzeko>"
+msgstr "egin klik hemen URLra joateko"
 
 #: ../widgets/misc/gal-categories.glade.h:2
 msgid "Edit Master Category List..."
-msgstr ""
+msgstr "Editatu Kategoria-zerrenda nagusia..."
 
 #: ../widgets/misc/gal-categories.glade.h:3
-#, fuzzy
 msgid "Item(s) belong to these _categories:"
-msgstr "Kontaktu hau kategoria hauetakoa da:"
+msgstr "Elementua(k) kategoria hauetakoa d(ir)a:"
 
 #: ../widgets/misc/gal-categories.glade.h:4
-#, fuzzy
 msgid "_Available Categories:"
-msgstr "Kategoriak"
+msgstr "Dauden _kategoriak:"
 
 #: ../widgets/misc/gal-categories.glade.h:5
-#, fuzzy
 msgid "categories"
-msgstr "Kategoriak"
+msgstr "kategoriak"
 
 #: ../widgets/table/e-cell-combo.c:177
 msgid "popup list"
-msgstr ""
+msgstr "Zerrenda laster-leihoan"
 
 #: ../widgets/table/e-cell-date.c:64
 msgid "%l:%M %p"
-msgstr "%l:%M %p"
+msgstr "%I:%M %p"
 
 #: ../widgets/table/e-cell-pixbuf.c:397
 msgid "Selected Column"
@@ -20470,7 +19549,7 @@ msgstr "Enfokatutako zutabea"
 
 #: ../widgets/table/e-cell-pixbuf.c:411
 msgid "Unselected Column"
-msgstr "Hautatu gabeko zutabea"
+msgstr "Desautatutako zutabea"
 
 #: ../widgets/table/e-cell-text.c:1740
 msgid "Strikeout Column"
@@ -20478,7 +19557,7 @@ msgstr "Zutabe marratua"
 
 #: ../widgets/table/e-cell-text.c:1747
 msgid "Underline Column"
-msgstr "Zutabe azpimarratua"
+msgstr "Azpimarratu zutabea"
 
 #
 #: ../widgets/table/e-cell-text.c:1754
@@ -20495,15 +19574,13 @@ msgid "BG Color Column"
 msgstr "Atzeko planoaren koloreko zutabea"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:1
-#, fuzzy
 msgid "<- _Remove"
-msgstr "_Kendu"
+msgstr "<- _Kendu"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:2
 #: ../widgets/table/e-table-config.glade.h:1
-#, fuzzy
 msgid "A_vailable Fields:"
-msgstr "Eremu editagarriak"
+msgstr "Dauden eremuak:"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:3
 #: ../widgets/table/e-table-config.glade.h:2
@@ -20512,9 +19589,8 @@ msgstr "Gorantz"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:4
 #: ../widgets/table/e-table-config.glade.h:3
-#, fuzzy
 msgid "Clear All"
-msgstr "_Garbitu bandera"
+msgstr "Garbitu dena"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:5
 #: ../widgets/table/e-table-config.glade.h:4
@@ -20523,73 +19599,63 @@ msgstr "Beherantz"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:8
 #: ../widgets/table/e-table-config.glade.h:7
-#, fuzzy
 msgid "Group Items By"
-msgstr "_Elkartu honen arabera..."
+msgstr "Elkartu elementuak honen arabera"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:9
 #: ../widgets/table/e-table-config.glade.h:8
-#, fuzzy
 msgid "Move _Down"
-msgstr "Mobile Downtown"
+msgstr "Eraman _behera"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:9
-#, fuzzy
 msgid "Move _Up"
-msgstr "Eraman"
+msgstr "Eraman _gora"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:11
 msgid "Sh_ow these fields in order:"
-msgstr ""
+msgstr "_Erakutsi eremuak ordenean:"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:12
 #: ../widgets/table/e-table-config.c:563
 #: ../widgets/table/e-table-config.glade.h:10
-#, fuzzy
 msgid "Show Fields"
-msgstr "'Nork' e_remua"
+msgstr "Erakutsi eremuak"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:11
 msgid "Show field in View"
-msgstr ""
+msgstr "Erakutsi eremua ikuspegian"
 
-#
 #: ../widgets/table/e-table-config-no-group.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:12
-#, fuzzy
 msgid "Sort"
-msgstr "Ordenatzailea"
+msgstr "Ordenatu"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:15
 #: ../widgets/table/e-table-config.glade.h:13
-#, fuzzy
 msgid "Sort Items By"
-msgstr "Ordenatu"
+msgstr "Ordenatu elementuak honen arabera"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:16
 #: ../widgets/table/e-table-config.glade.h:14
 msgid "Then By"
-msgstr "Ondoren, honen arabera"
+msgstr "Gero "
 
 #: ../widgets/table/e-table-config-no-group.glade.h:17
-#, fuzzy
 msgid "_Add ->"
-msgstr "_Gehitu"
+msgstr "_Gehitu ->"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:18
 #: ../widgets/table/e-table-config.glade.h:16
 msgid "_Fields Shown..."
-msgstr ""
+msgstr "_Erakutsitako eremuak..."
 
 #: ../widgets/table/e-table-config-no-group.glade.h:19
 #: ../widgets/table/e-table-config.glade.h:20
-#, fuzzy
 msgid "_Sort..."
-msgstr "_Lasterbidea..."
+msgstr "_Ordenatu..."
 
-#
 #: ../widgets/table/e-table-config.c:150
 msgid "State"
 msgstr "Egoera"
@@ -20611,18 +19677,16 @@ msgid "No grouping"
 msgstr "Elkartu gabe"
 
 #: ../widgets/table/e-table-config.c:584
-#, fuzzy
 msgid "Available Fields"
-msgstr "Eremu editagarriak"
+msgstr "Eremu eskuragarriak"
 
 #: ../widgets/table/e-table-config.glade.h:17
-#, fuzzy
 msgid "_Group By..."
-msgstr "_Elkartu honen arabera..."
+msgstr "_E_lkartu honela..."
 
 #: ../widgets/table/e-table-config.glade.h:19
 msgid "_Show these fields in order:"
-msgstr ""
+msgstr "_Erakutsi eremuak ordenean:"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:646
@@ -20636,42 +19700,43 @@ msgstr "DnD kodea"
 #: ../widgets/table/e-table-field-chooser.c:86
 #: ../widgets/table/e-table-header-item.c:1824
 msgid "Full Header"
-msgstr "Goiburu osoa"
+msgstr "Goiburu osoak"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:126
 msgid "Add a column..."
 msgstr "Gehitu zutabea..."
 
 #: ../widgets/table/e-table-field-chooser.glade.h:1
-#, fuzzy
 msgid "Field Chooser"
-msgstr "Eremu-izena"
+msgstr "Eremu-aukeratzailea"
 
 #: ../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 ""
+"Taulan zutabe bat gehitzeko arrastatu bertara\n"
+"agertzea nahi duzun kokalekura."
 
 #: ../widgets/table/e-table-group-container.c:350
 #, c-format
 msgid "%s : %s (%d item)"
-msgstr ""
+msgstr "%s : %s (%d elementu)"
 
 #: ../widgets/table/e-table-group-container.c:351
 #, c-format
 msgid "%s : %s (%d items)"
-msgstr ""
+msgstr "%s : %s (%d elementu)"
 
 #: ../widgets/table/e-table-group-container.c:356
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%d item)"
-msgstr "%s (%d)"
+msgstr "%s (%%%d elementu)"
 
 #: ../widgets/table/e-table-group-container.c:357
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%d items)"
-msgstr "%s (%d)"
+msgstr "%s (%%%d elementu)"
 
 #: ../widgets/table/e-table-group-container.c:901
 #: ../widgets/table/e-table-group-container.c:902
@@ -20688,7 +19753,7 @@ msgstr "Errenkada-kolore txandakatuak"
 #: ../widgets/table/e-table-item.c:2970 ../widgets/table/e-table-item.c:2971
 #: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
 msgid "Horizontal Draw Grid"
-msgstr "Marrazki-sareta horizontala"
+msgstr "Marrazteko sareta horizontala"
 
 #: ../widgets/table/e-table-group-container.c:915
 #: ../widgets/table/e-table-group-container.c:916
@@ -20697,7 +19762,7 @@ msgstr "Marrazki-sareta horizontala"
 #: ../widgets/table/e-table-item.c:2977 ../widgets/table/e-table-item.c:2978
 #: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
 msgid "Vertical Draw Grid"
-msgstr "Marrazki-sareta bertikala"
+msgstr "Marrazteko sareta bertikala"
 
 #: ../widgets/table/e-table-group-container.c:922
 #: ../widgets/table/e-table-group-container.c:923
@@ -20722,7 +19787,7 @@ msgstr "Kurtsore-modua"
 #: ../widgets/table/e-table-group-leaf.c:616
 #: ../widgets/table/e-table-item.c:2956 ../widgets/table/e-table-item.c:2957
 msgid "Selection model"
-msgstr "Hautapen-modeloa"
+msgstr "Hautapen modeloa"
 
 #: ../widgets/table/e-table-group-container.c:943
 #: ../widgets/table/e-table-group-container.c:944
@@ -20749,7 +19814,7 @@ msgstr "Errenkada-altuera uniformea"
 #: ../widgets/table/e-table-group-leaf.c:643
 #: ../widgets/table/e-table-group-leaf.c:644
 msgid "Frozen"
-msgstr "Izoztuta"
+msgstr "Izoztua"
 
 #: ../widgets/table/e-table-header-item.c:1472
 msgid "Customize Current View"
@@ -20765,7 +19830,7 @@ msgstr "Ordenatu beherantz"
 
 #: ../widgets/table/e-table-header-item.c:1494
 msgid "Unsort"
-msgstr "Desordenatu"
+msgstr "Ordenatu gabe"
 
 #: ../widgets/table/e-table-header-item.c:1496
 msgid "Group By This Field"
@@ -20785,7 +19850,7 @@ msgstr "Gehitu zutabea..."
 
 #: ../widgets/table/e-table-header-item.c:1502
 msgid "Alignment"
-msgstr "Lerrokatzea"
+msgstr "Lerrokadura"
 
 #: ../widgets/table/e-table-header-item.c:1503
 msgid "Best Fit"
@@ -20793,7 +19858,7 @@ msgstr "Egokiena"
 
 #: ../widgets/table/e-table-header-item.c:1504
 msgid "Format Columns..."
-msgstr "Formatua eman zutabeei..."
+msgstr "Eman formatu zutabeei..."
 
 #: ../widgets/table/e-table-header-item.c:1506
 msgid "Customize Current View..."
@@ -20802,7 +19867,7 @@ msgstr "Pertsonalizatu uneko ikuspegia..."
 #: ../widgets/table/e-table-header-item.c:1817 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
-msgstr "Letra-tipoen ezarpena"
+msgstr "Letra-tipoak"
 
 #
 #: ../widgets/table/e-table-header-item.c:1838
@@ -20810,7 +19875,6 @@ msgstr "Letra-tipoen ezarpena"
 msgid "Sort Info"
 msgstr "Ordenatu informazioa"
 
-#
 #: ../widgets/table/e-table-header-item.c:1852
 #: ../widgets/table/e-tree-scrolled.c:223
 #: ../widgets/table/e-tree-scrolled.c:224
@@ -20818,27 +19882,24 @@ msgid "Tree"
 msgstr "Zuhaitza"
 
 #: ../widgets/table/e-table-item.c:2942 ../widgets/table/e-table-item.c:2943
-#, fuzzy
 msgid "Table header"
-msgstr "Etree taulako egokitzailea"
+msgstr "Taulako goiburua"
 
 #: ../widgets/table/e-table-item.c:2949 ../widgets/table/e-table-item.c:2950
-#, fuzzy
 msgid "Table model"
-msgstr "Testu-eredua"
+msgstr "Taulako eredua"
 
 #: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
-#, fuzzy
 msgid "Cursor row"
-msgstr "Kurtsore-errenkada"
+msgstr "Kurtsore-zutabea"
 
 #: ../widgets/table/e-table.c:3330
 msgid "Always Search"
-msgstr "Beti bilatu"
+msgstr "Bilatu beti"
 
 #: ../widgets/table/e-table.c:3337
 msgid "Use click to add"
-msgstr "Egin klik gehitzeko"
+msgstr "Erabili 'egin klik' gehitzeko"
 
 #: ../widgets/table/e-tree.c:3290 ../widgets/table/e-tree.c:3291
 msgid "ETree table adapter"
@@ -20846,7 +19907,7 @@ msgstr "Etree taulako egokitzailea"
 
 #: ../widgets/table/e-tree.c:3304 ../widgets/table/e-tree.c:3305
 msgid "Always search"
-msgstr "Beti bilatu"
+msgstr "Bilatu beti"
 
 #: ../widgets/table/e-tree.c:3311
 msgid "Retro Look"
@@ -20858,30 +19919,28 @@ msgstr "Marraztu marrak eta +/- zabaltzaileak."
 
 #: ../widgets/text/e-entry-test.c:49
 msgid "Minicard Test"
-msgstr ""
+msgstr "Minitxartelaren proba"
 
 #: ../widgets/text/e-entry-test.c:50
 msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr ""
+msgstr "Copyright (C) 2000, Helix Code, Inc."
 
 #: ../widgets/text/e-entry-test.c:52
 msgid "This should test the minicard canvas item"
-msgstr ""
+msgstr "Honek minitxartelaren oihaleko elementua probatu beharko luke"
 
 #: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
 #: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
 msgid "Event Processor"
-msgstr "Gertaera-prozesatzailea"
+msgstr "Prozesadorearen gertaera"
 
 #: ../widgets/text/e-entry.c:1256 ../widgets/text/e-entry.c:1257
-#, fuzzy
 msgid "Font"
-msgstr "Letra-tipoak"
+msgstr "Letra-tipoa"
 
 #: ../widgets/text/e-entry.c:1270 ../widgets/text/e-entry.c:1271
-#, fuzzy
 msgid "GDKFont"
-msgstr "Letra-tipoak"
+msgstr "GDKFont"
 
 #: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
 #: ../widgets/text/e-text.c:3491 ../widgets/text/e-text.c:3492
@@ -20901,7 +19960,7 @@ msgstr "Elipsia"
 #: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
 #: ../widgets/text/e-text.c:3605 ../widgets/text/e-text.c:3606
 msgid "Line wrap"
-msgstr "Lerro-itzulbira"
+msgstr "Lerroa itzulbiratu"
 
 #: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
 #: ../widgets/text/e-text.c:3612 ../widgets/text/e-text.c:3613
@@ -20911,7 +19970,7 @@ msgstr "Hautsi karaktereak"
 #: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
 #: ../widgets/text/e-text.c:3619 ../widgets/text/e-text.c:3620
 msgid "Max lines"
-msgstr "Lerroak gehienez"
+msgstr "Gehien lerroak"
 
 #: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
 #: ../widgets/text/e-text.c:3648 ../widgets/text/e-text.c:3649
@@ -20933,7 +19992,6 @@ msgstr "Marraztu atzeko planoa"
 msgid "Draw button"
 msgstr "Marraztu botoia"
 
-#
 #: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
 #: ../widgets/text/e-text.c:3669 ../widgets/text/e-text.c:3670
 msgid "Cursor position"
@@ -20941,13 +19999,12 @@ msgstr "Kurtsorearen posizioa"
 
 #: ../widgets/text/e-entry.c:1389 ../widgets/text/e-entry.c:1390
 msgid "Emulate label resize"
-msgstr ""
+msgstr "Emulatu etiketa tamainaz aldatzea"
 
 #: ../widgets/text/e-text.c:2696
 msgid "Input Methods"
-msgstr "Sarrera-metodoak"
+msgstr "Sarrerako metodoak"
 
-#
 #: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
 msgid "Bold"
 msgstr "Lodia"
@@ -20962,11 +20019,11 @@ msgstr "Ainguratu"
 
 #: ../widgets/text/e-text.c:3498 ../widgets/text/e-text.c:3499
 msgid "Clip Width"
-msgstr "Klip-aren zabalera"
+msgstr "Klip-zabalera"
 
 #: ../widgets/text/e-text.c:3505 ../widgets/text/e-text.c:3506
 msgid "Clip Height"
-msgstr "Klip-aren altuera"
+msgstr "Klip-altuera"
 
 #: ../widgets/text/e-text.c:3512 ../widgets/text/e-text.c:3513
 msgid "Clip"
@@ -20986,7 +20043,7 @@ msgstr "Y desplazamendua"
 
 #: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
 msgid "Text width"
-msgstr "Testu-zabalera"
+msgstr "Testuaren zabalera"
 
 #: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
 msgid "Text height"
@@ -20994,7 +20051,7 @@ msgstr "Testuaren altuera"
 
 #: ../widgets/text/e-text.c:3676 ../widgets/text/e-text.c:3677
 msgid "IM Context"
-msgstr "IM testuingurua"
+msgstr "BM testuingurua"
 
 #: ../widgets/text/e-text.c:3683 ../widgets/text/e-text.c:3684
 msgid "Handle Popup"
diff --git a/po/fi.po b/po/fi.po
index b6ef2b557e..e1d477d402 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-21 06:08+0200\n"
-"PO-Revision-Date: 2005-11-21 06:12+0200\n"
+"POT-Creation-Date: 2005-11-10 07:28+0200\n"
+"PO-Revision-Date: 2005-11-14 17:35+0200\n"
 "Last-Translator: Ilkka Tuohela <hile@iki.fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -41,7 +41,7 @@ msgstr[0] "Valitussa osoitekirjassa on %d kortti"
 msgstr[1] "Valitussa osoitekirjassa on %d korttia"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../calendar/gui/alarm-notify/alarm-queue.c:969
+#: ../calendar/gui/alarm-notify/alarm-queue.c:965
 #: ../ui/evolution-message-composer.xml.h:11
 msgid "Open"
 msgstr "Avaa"
@@ -95,7 +95,7 @@ msgstr "Uusi tapaaminen"
 msgid "New All Day Event"
 msgstr "Uusi koko päivän tapahtuma"
 
-#: ../a11y/calendar/ea-cal-view.c:308
+#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1522
 msgid "New Meeting"
 msgstr "Uusi kokous"
 
@@ -455,7 +455,7 @@ msgstr ""
 "poistaa lähdeosoitekirjasta. Haluatko sen sijaan tallentaa kopion?"
 
 #: ../addressbook/addressbook.error.xml.h:28
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:59
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -531,7 +531,7 @@ msgstr "Määrittele automaatinen täydennys"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1180
+#: ../addressbook/gui/component/addressbook-view.c:1133
 #: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:388
 msgid "Contacts"
 msgstr "Yhteystiedot"
@@ -572,12 +572,10 @@ msgstr "Hallitse S/Mime varmenteitasi"
 #. On This Computer is always first and Search Folders is always last
 #: ../addressbook/gui/component/addressbook-component.c:137
 #: ../addressbook/gui/component/addressbook-migrate.c:502
-#: ../calendar/gui/calendar-component.c:208
-#: ../calendar/gui/memos-component.c:192 ../calendar/gui/migration.c:462
-#: ../calendar/gui/migration.c:555 ../calendar/gui/migration.c:1057
-#: ../calendar/gui/tasks-component.c:188 ../mail/em-folder-tree-model.c:197
-#: ../mail/em-folder-tree-model.c:199 ../mail/mail-component.c:292
-#: ../mail/mail-vfolder.c:223
+#: ../calendar/gui/calendar-component.c:208 ../calendar/gui/migration.c:462
+#: ../calendar/gui/migration.c:555 ../calendar/gui/tasks-component.c:188
+#: ../mail/em-folder-tree-model.c:197 ../mail/em-folder-tree-model.c:199
+#: ../mail/mail-component.c:292 ../mail/mail-vfolder.c:223
 msgid "On This Computer"
 msgstr "Tällä tietokoneella"
 
@@ -589,12 +587,10 @@ msgstr "Tällä tietokoneella"
 #: ../addressbook/gui/component/addressbook-component.c:145
 #: ../addressbook/gui/component/addressbook-migrate.c:510
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../calendar/gui/calendar-component.c:216
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:470
-#: ../calendar/gui/migration.c:563 ../calendar/gui/migration.c:1065
-#: ../calendar/gui/tasks-component.c:196 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1043 ../mail/mail-config.c:78
-#: ../mail/mail-config.glade.h:104
+#: ../calendar/gui/calendar-component.c:216 ../calendar/gui/migration.c:470
+#: ../calendar/gui/migration.c:563 ../calendar/gui/tasks-component.c:196
+#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1043
+#: ../mail/mail-config.c:78 ../mail/mail-config.glade.h:104
 msgid "Personal"
 msgstr "Henkilökohtainen"
 
@@ -621,7 +617,8 @@ msgid "Create a new contact list"
 msgstr "Luo uusi yhteystietoluettelo"
 
 #: ../addressbook/gui/component/addressbook-component.c:241
-#: ../addressbook/gui/component/addressbook-config.c:1149
+#: ../addressbook/gui/component/addressbook-config.c:1118
+#: ../addressbook/gui/component/addressbook-view.c:763
 msgid "New Address Book"
 msgstr "Uusi osoitekirja"
 
@@ -637,60 +634,59 @@ msgstr "Luo uusi osoitekirja"
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "Osoitekirjan asetusten tai kansioiden päivitys epäonnistui."
 
-#: ../addressbook/gui/component/addressbook-config.c:316
+#: ../addressbook/gui/component/addressbook-config.c:313
 msgid "Base"
 msgstr "Kanta"
 
-#: ../addressbook/gui/component/addressbook-config.c:511
+#: ../addressbook/gui/component/addressbook-config.c:508
 #: ../calendar/gui/dialogs/calendar-setup.c:192
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Tyyppi:"
 
-#: ../addressbook/gui/component/addressbook-config.c:610
+#: ../addressbook/gui/component/addressbook-config.c:607
 msgid "Copy book content locally for offline operation"
 msgstr "Kopioi kirjan sisältö paikallisesti yhteydettömään käyttöön"
 
-#: ../addressbook/gui/component/addressbook-config.c:933
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/addressbook-config.c:902
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:366
+#: ../calendar/gui/dialogs/calendar-setup.c:377
 #: ../mail/em-folder-properties.c:215 ../mail/mail-config.glade.h:85
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Yleiset"
 
-#: ../addressbook/gui/component/addressbook-config.c:934
+#: ../addressbook/gui/component/addressbook-config.c:903
 #: ../mail/importers/pine-importer.c:393
 msgid "Addressbook"
 msgstr "Osoitekirja"
 
-#: ../addressbook/gui/component/addressbook-config.c:938
+#: ../addressbook/gui/component/addressbook-config.c:907
 msgid "Server Information"
 msgstr "Palvelimen tiedot"
 
-#: ../addressbook/gui/component/addressbook-config.c:940
+#: ../addressbook/gui/component/addressbook-config.c:909
 msgid "Authentication"
 msgstr "Kirjautuminen"
 
-#: ../addressbook/gui/component/addressbook-config.c:943
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/addressbook-config.c:912
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 #: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Yksityiskohtaiset"
 
-#: ../addressbook/gui/component/addressbook-config.c:944
+#: ../addressbook/gui/component/addressbook-config.c:913
 msgid "Searching"
 msgstr "Etsitään"
 
-#: ../addressbook/gui/component/addressbook-config.c:946
+#: ../addressbook/gui/component/addressbook-config.c:915
 msgid "Downloading"
 msgstr "Haetaan"
 
-#: ../addressbook/gui/component/addressbook-config.c:1147
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/addressbook-config.c:1116
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Osoitekirjan ominaisuudet"
 
@@ -755,30 +751,22 @@ msgstr ""
 "\n"
 "Odota kärsivällisesti kun Evolution muuntaa Pilotin synkronointitietojasi..."
 
-#: ../addressbook/gui/component/addressbook-view.c:763
-msgid "_New Address Book"
-msgstr "_Uusi osoitekirja"
-
-#. FIXME: need to disable for undeletable folders
 #: ../addressbook/gui/component/addressbook-view.c:764
 #: ../addressbook/gui/widgets/e-addressbook-view.c:952
 #: ../calendar/gui/calendar-component.c:537
-#: ../calendar/gui/e-calendar-table.c:1187
-#: ../calendar/gui/e-calendar-view.c:1569 ../calendar/gui/e-memo-table.c:862
-#: ../calendar/gui/tasks-component.c:441 ../mail/em-folder-tree.c:2054
-#: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:34
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
-#: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
-msgid "_Delete"
-msgstr "_Poista"
+#: ../calendar/gui/tasks-component.c:441 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:26 ../ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Poista"
 
 #: ../addressbook/gui/component/addressbook-view.c:766
 #: ../calendar/gui/calendar-component.c:538
 #: ../calendar/gui/tasks-component.c:442
-msgid "_Properties..."
-msgstr "_Ominaisuudet..."
+msgid "Properties..."
+msgstr "Ominaisuudet..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1191
+#: ../addressbook/gui/component/addressbook-view.c:1144
 msgid "Contact Source Selector"
 msgstr "Yhteystietojen lähdevalinta"
 
@@ -787,12 +775,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Otetaan yhteyttä LDAP-palvelimeen anonyymisti"
 
 #: ../addressbook/gui/component/addressbook.c:191
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:490
 msgid "Failed to authenticate.\n"
 msgstr "Kirjautuminen epäonnistui.\n"
 
 #: ../addressbook/gui/component/addressbook.c:198
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:469
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Syötä salasana palvelulle %s (käyttäjä %s)"
@@ -838,7 +826,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "Viimeksi nimien valinta-ikkunassa valitun kansion URI"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 msgid "Vertical pane position"
 msgstr "Vaakapaneelin sijainti"
 
@@ -847,123 +835,129 @@ msgid "Whether to show the preview pane."
 msgstr "Näytetäänkö esikatselupaneeli."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:1
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/event-page.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../mail/message-tags.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:1
+msgid "*"
+msgstr "*"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr "1"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:2
+#: ../addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:3
+#: ../addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:5
+#: ../addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:6
+#: ../addressbook/gui/component/ldap-config.glade.h:7
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Todennus</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:7
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Display</b>"
 msgstr "<b>Näytä</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:8
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Downloading</b>"
 msgstr "<b>Haetaan</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Searching</b>"
 msgstr "<b>Etsitään</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Server Information</b>"
 msgstr "<b>Palvelimen tiedot</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:12
 msgid "<b>Type:</b>"
 msgstr "<b>Tyyppi:</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add Address Book"
 msgstr "Lisää osoitekirja"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 #: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:759
 msgid "Always"
 msgstr "Aina"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonyymisti"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 msgid "Basic"
 msgstr "Yleistä"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr "Yksikäsitteinen nimi"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid "Email address"
 msgstr "Sähköpostiosoite"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution käyttää tätä sähköpostiosoitetta sinun todentamiseksesi "
 "palvelimelle."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:22
 msgid "Find Possible Search Bases"
 msgstr "Etsi mahdolliset hakupohjat"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "Lo_gin:"
 msgstr "_Kirjautuminen:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 #: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:758
 msgid "Never"
 msgstr "Ei koskaan"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "Yksi"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
-msgid "Search Filter"
-msgstr "Hakusuodatin"
-
 #: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid "Search _base:"
 msgstr "Haku_pohja:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:28
-msgid "Search _filter:"
-msgstr "Hakusuodatin:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:29
-msgid "Search filter"
-msgstr "Hakusuodatin"
-
-#: ../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 or TLS."
@@ -971,7 +965,7 @@ msgstr ""
 "Tämän vaihtoehdon valinta tarkoittaa, että Evolution ottaa yhteyttä LDAP-"
 "palvelimeen vain jos se tukee SSL- tai TLS-salausta."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a insecure environment. For example, if you and your LDAP server "
@@ -984,7 +978,7 @@ msgstr ""
 "tarvitse käyttää SSL- tai TLS-salausta, koska yhteytesi on jo muutenkin "
 "turvallinen."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 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 "
@@ -994,15 +988,15 @@ msgstr ""
 "salausta. Tämä tarkoittaa, että yhteytesi on turvaton ja että olet "
 "haavoittuvainen yhteyden turvaan kohdistuville hyökkäyksille."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Sub"
 msgstr "Ali"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid "Supported Search Bases"
 msgstr "Tuetut hakupohjat"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 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 "
@@ -1011,7 +1005,7 @@ msgstr ""
 "Hakupohja on sen kentän, josta hakusi alkavat, yksilöllinen nimi (DN). Jos "
 "jätät tämän tyhjäksi, haut alkavat hakemistopuun juuresta."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 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 "
@@ -1023,13 +1017,13 @@ msgstr ""
 "alipuissa, kun taas kattavuus \"Yksi\" kattaa kentät yhden tason "
 "hakupohjastasi alaspäin."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "LDAP-palvelimesi koko nimi, esimerkiksi \"ldap.mycompany.com\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1037,7 +1031,7 @@ msgstr ""
 "Suurin sallittu haettavien korttien määrä hakua kohti. Tämän arvon "
 "asettaminen liian suureksi hidastaa osoitekirjaasi."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1047,7 +1041,7 @@ msgstr ""
 "asettaminen arvoon \"Sähköpostiosoite\" vaatii anonyymiä pääsyä LDAP-"
 "palvelimellesi."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1055,7 +1049,7 @@ msgstr ""
 "Tämä on nimi, jolla tämä palvelin näkyy Evolutionin kansiolistoissa. Sitä "
 "käytetään ainoastaan listoilla näyttämiseen."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 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 "
@@ -1065,36 +1059,36 @@ msgstr ""
 "on lista yleisistä porteista. Kysy tarvittaessa järjestelmäsi ylläpitäjältä "
 "mitä porttia sinun tulisi käyttää."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid "Using distinguished name (DN)"
 msgstr "Käytetään yksilöllistä nimeä (DN)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid "Using email address"
 msgstr "Käytetään sähköpostiosoitetta"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 #: ../mail/em-account-editor.c:301
 msgid "Whenever Possible"
 msgstr "Milloin mahdollista"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid "_Add Address Book"
 msgstr "_Lisää osoitekirja"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "_Download limit:"
 msgstr "_Haun rajoitus:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid "_Find Possible Search Bases"
 msgstr "Etsi mahdolliset hakupohjat"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "_Login method:"
 msgstr "_Kirjautumismenetelmä:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 #: ../calendar/gui/dialogs/calendar-setup.c:244
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:8
 #: ../mail/mail-config.glade.h:164
@@ -1102,33 +1096,33 @@ msgstr "_Kirjautumismenetelmä:"
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Port:"
 msgstr "_Portti:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Search scope:"
 msgstr "_Hakualue:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 #: ../mail/mail-config.glade.h:171
 msgid "_Server:"
 msgstr "_Palvelin: "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Timeout:"
 msgstr "_Aikakatkaisu:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Use secure connection:"
 msgstr "_Käytä salattua yhteyttä:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 msgid "cards"
 msgstr "kortteja"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
 #: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1951
@@ -1137,30 +1131,6 @@ msgstr "kortteja"
 msgid "minutes"
 msgstr "minuutti"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../mail/message-tags.glade.h:1
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
-#: ../plugins/groupwise-features/properties.glade.h:1
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>Sähköpostiosoite</b>"
@@ -1214,7 +1184,7 @@ msgstr "Yhteystieto"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:525
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:540
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2372
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2353
 msgid "Contact Editor"
 msgstr "Yhteystiedonhallinta"
 
@@ -1284,7 +1254,6 @@ msgid "_Calendar:"
 msgstr "_Kalenteri:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: ../ui/evolution-event-editor.xml.h:26 ../ui/evolution-task-editor.xml.h:18
 msgid "_Categories"
 msgstr "_Ryhmät"
 
@@ -2458,20 +2427,20 @@ msgid "Changed"
 msgstr "Muutettu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:535
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2367
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2348
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Yhteystiedon muokkain - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2680
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2661
 msgid "Please select an image for this contact"
 msgstr "Valitse kuva tälle yhteystiedolle"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2681
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2662
 msgid "No image"
 msgstr "Ei kuvaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2960
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2941
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2479,7 +2448,7 @@ msgstr ""
 "Yhteystieto on virheellinen:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3012
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2993
 msgid "Invalid contact."
 msgstr "Virheellinen yhteystieto."
 
@@ -2632,8 +2601,8 @@ msgstr "_Pikaviestipalvelu:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:234
-#: ../plugins/exchange-operations/exchange-contacts.c:214
+#: ../plugins/exchange-operations/exchange-calendar.c:224
+#: ../plugins/exchange-operations/exchange-contacts.c:203
 msgid "_Location:"
 msgstr "_Sijainti:"
 
@@ -2810,9 +2779,8 @@ msgstr "Lähde"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:377
+#: ../calendar/gui/e-meeting-list-view.c:370
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Tyyppi"
 
@@ -2821,86 +2789,78 @@ msgid "Address Book"
 msgstr "Osoitekirja"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:807
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2018
-#: ../ui/evolution-addressbook.xml.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2016
+#: ../ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Tallenna VCardina..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:930
-#: ../calendar/gui/dialogs/comp-editor.c:1054
 #: ../calendar/gui/e-calendar-table.c:1167
-#: ../calendar/gui/e-calendar-view.c:1549 ../calendar/gui/e-memo-table.c:845
-#: ../ui/evolution-addressbook.xml.h:38
+#: ../calendar/gui/e-calendar-view.c:1545 ../ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Avaa"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:932
-msgid "_New Contact..."
-msgstr "_Uusi yhteystieto..."
+msgid "New Contact..."
+msgstr "Uusi yhteystieto..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:933
-msgid "New Contact _List..."
-msgstr "Uusi yhteystieto_luettelo..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
-#: ../ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard..."
-msgstr "_Tallenna vCard..."
+msgid "New Contact List..."
+msgstr "Uusi yhteystietoluettelo..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:937
-msgid "_Forward Contact"
-msgstr "_Välitä yhteystieto"
+#: ../ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "Välitä yhteystieto eteenpäin"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:938
-msgid "_Forward Contacts"
-msgstr "_Välitä yhteystiedot"
+msgid "Forward Contacts"
+msgstr "Välitä yhteystiedot eteenpäin"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:939
-msgid "Send _Message to Contact"
-msgstr "Lähetä _viesti yhteystiedolle"
+msgid "Send Message to Contact"
+msgstr "Lähetä viesti yhteystiedolle"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:940
-msgid "Send _Message to List"
-msgstr "Lähetä _viesti listalle"
+msgid "Send Message to List"
+msgstr "Lähetä viesti postituslistalle"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:941
-msgid "Send _Message to Contacts"
-msgstr "Lähetä _viesti yhteystiedoille"
+msgid "Send Message to Contacts"
+msgstr "Lähetä viesti yhteystiedoille"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:942
-msgid "_Print"
-msgstr "_Tulosta"
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2510
+#: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "Tulosta"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:945
-msgid "Cop_y to Address Book..."
-msgstr "_Kopioi osoitekirjaan..."
+msgid "Copy to Address Book..."
+msgstr "Kopioi osoitekirjaan..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:946
-msgid "Mo_ve to Address Book..."
-msgstr "_Siirrä osoitekirjaan..."
+msgid "Move to Address Book..."
+msgstr "Siirrä osoitekirjaan..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:949
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:8
-msgid "Cu_t"
-msgstr "_Leikkaa"
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Leikkaa"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:950
 #: ../calendar/gui/calendar-component.c:536
-#: ../calendar/gui/dialogs/comp-editor.c:431
-#: ../calendar/gui/e-calendar-table.c:1175
-#: ../calendar/gui/e-calendar-view.c:1556 ../calendar/gui/e-memo-table.c:853
-#: ../calendar/gui/tasks-component.c:440 ../composer/e-msg-composer.c:3049
-#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1035
-#: ../mail/message-list.c:1718 ../ui/evolution-addressbook.xml.h:32
-#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:103
-#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
-msgid "_Copy"
-msgstr "_Kopioi"
+#: ../calendar/gui/tasks-component.c:440 ../ui/evolution-addressbook.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:12 ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Kopioi"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:951
-msgid "P_aste"
-msgstr "L_iitä"
+#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "Liitä"
 
 #. All, unmatched, separator
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1565
@@ -2908,8 +2868,7 @@ msgstr "L_iitä"
 msgid "Any Category"
 msgstr "Mikä tahansa luokka"
 
-#. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1767
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1766
 msgid "Print cards"
 msgstr "Tulosta kortit"
 
@@ -2942,9 +2901,9 @@ msgid "Car Phone"
 msgstr "Autopuhelin"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: ../calendar/gui/dialogs/task-page.glade.h:6
 #: ../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 "Ryhmät"
 
@@ -3049,7 +3008,7 @@ msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:388
+#: ../calendar/gui/e-meeting-list-view.c:378
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
 msgid "Role"
@@ -3318,7 +3277,7 @@ msgstr "Protokolla ei ole tuettu"
 #: ../calendar/gui/e-cal-component-preview.c:232
 #: ../calendar/gui/e-cal-model-tasks.c:348
 #: ../calendar/gui/e-cal-model-tasks.c:661
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2375
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2373
 msgid "Cancelled"
 msgstr "Peruutettu"
 
@@ -3546,16 +3505,6 @@ msgstr "Useita VCardeja"
 msgid "VCard for %s"
 msgstr "VCard %s:lle"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1031
-#: ../addressbook/gui/widgets/eab-gui-util.c:1049
-msgid "Contact information"
-msgstr "Yhteystiedot"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:1051
-#, c-format
-msgid "Contact information for %s"
-msgstr "%s yhteystiedot"
-
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -3647,12 +3596,12 @@ msgstr "Evolutionin VCard-tuoja"
 msgid "Print envelope"
 msgstr "Tulosta kirjekuori"
 
-#: ../addressbook/printing/e-contact-print.c:1026
+#: ../addressbook/printing/e-contact-print.c:1014
 msgid "Print contacts"
 msgstr "Tulosta yhteystiedot"
 
-#: ../addressbook/printing/e-contact-print.c:1117
-#: ../addressbook/printing/e-contact-print.c:1145
+#: ../addressbook/printing/e-contact-print.c:1104
+#: ../addressbook/printing/e-contact-print.c:1132
 msgid "Print contact"
 msgstr "Tulosta yhteystieto"
 
@@ -3806,8 +3755,8 @@ msgstr "Varjostus"
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
 #: ../plugins/exchange-operations/exchange-account-setup.c:940
-#: ../plugins/exchange-operations/exchange-calendar.c:224
-#: ../plugins/exchange-operations/exchange-contacts.c:197
+#: ../plugins/exchange-operations/exchange-calendar.c:214
+#: ../plugins/exchange-operations/exchange-contacts.c:186
 msgid "Size:"
 msgstr "Koko:"
 
@@ -4071,13 +4020,13 @@ msgid "Delete calendar '{0}'?"
 msgstr "Poista kalenteri '{0}'"
 
 #: ../calendar/calendar.error.xml.h:26
-msgid "Delete memo list '{0}'?"
-msgstr "Poistetaanko muistilappulista '{0}'?"
-
-#: ../calendar/calendar.error.xml.h:27
 msgid "Delete task list '{0}'?"
 msgstr "Poista tehtävälista '{0}'"
 
+#: ../calendar/calendar.error.xml.h:27
+msgid "Discard Changes"
+msgstr "Hylkää muutokset"
+
 #: ../calendar/calendar.error.xml.h:28
 msgid "Don't Send"
 msgstr "Älä lähetä"
@@ -4113,14 +4062,10 @@ msgid "Error loading calendar"
 msgstr "Virhe ladattaessa kalenteria"
 
 #: ../calendar/calendar.error.xml.h:35
-msgid "Error loading memo list"
-msgstr "Virhe ladattaessa muistilappulistaa"
-
-#: ../calendar/calendar.error.xml.h:36
 msgid "Error loading task list"
 msgstr "Virhe ladattaessa tehtävälistaa"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:36
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the journal has been deleted."
@@ -4128,7 +4073,7 @@ msgstr ""
 "Jos et lähetä perumisilmoitusta, eivät muut osanottajat ehkä tiedä että "
 "journal on peruttu."
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:37
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the meeting is canceled."
@@ -4136,7 +4081,7 @@ msgstr ""
 "Jos et lähetä perumisilmoitusta, eivät muut osanottajat ehkä tiedä että "
 "kokous on peruttu."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the task has been deleted."
@@ -4144,6 +4089,10 @@ msgstr ""
 "Jos et lähetä perumisilmoitusta, eivät muut osanottajat ehkä tiedä että "
 "kokous on peruttu."
 
+#: ../calendar/calendar.error.xml.h:39
+msgid "Save Changes"
+msgstr "Tallenna muutokset"
+
 #: ../calendar/calendar.error.xml.h:40
 #: ../ui/evolution-message-composer.xml.h:28
 msgid "Send"
@@ -4183,103 +4132,85 @@ msgid "The calendar is not marked for offline usage"
 msgstr "Kalenteri ei ole merkitty käytettäväksi yhteydettömässä tilassa"
 
 #: ../calendar/calendar.error.xml.h:48
-msgid "The memo list is not marked for offline usage"
-msgstr ""
-"Muistilappulistaa ei ole merkitty käytettäväksi yhteydettömässä tilassa"
-
-#: ../calendar/calendar.error.xml.h:49
 msgid "The task list is not marked for offline usage"
 msgstr "Tehtävälista ei ole merkitty käytettäväksi yhteydettömässä tilassa"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:49
 msgid "This calendar will be removed permanently."
 msgstr "Tämä kalenteri poistetaan pysyvästi."
 
-#: ../calendar/calendar.error.xml.h:51
-msgid "This memo list will be removed permanently."
-msgstr "Tämä muistilappulista poistetaan pysyvästi."
-
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:50
 msgid "This task list will be removed permanently."
 msgstr "Tämä tehtävälista poistetaan pysyvästi."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:51
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Haluatko tallentaa muutokset tähän tapaamiseen?"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:52
 msgid "Would you like to save your changes to this task?"
 msgstr "Haluatko tallentaa muutoksesi tähän tehtävään?"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:53
 msgid "Would you like to send a cancellation notice for this journal entry?"
 msgstr "Haluatko lähettää perumisilmoituksen tälle journalille?"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:54
 msgid "Would you like to send all the participants a cancellation notice?"
 msgstr "Haluatko lähettää perumisilmoituksen kaikille osanottajille?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:55
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Haluatko lähettää kokouskutsuja osallistujille?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:56
 msgid "Would you like to send this task to participants?"
 msgstr "Haluatko lähettää tämän tehtävän osanottajille?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Haluatko lähettää päivitetyt kokouksen tiedot osanottajille?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send updated task information to participants?"
 msgstr "Halutako lähettää päivitetyn tehtävätiedon osanottajille?"
 
-#: ../calendar/calendar.error.xml.h:62
-msgid "You have changed this appointment, but not yet saved them."
-msgstr "Olet muuttanut tätä tapaamista, mutta et ole vielä tallentanut sitä."
+#: ../calendar/calendar.error.xml.h:60
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "Olet tehnyt muutoksia, mutta et ole vielä tallentanut niitä."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:61
 msgid "You have made changes to this task, but not yet saved them."
 msgstr ""
 "Olet tehnyt muutoksia tähän tehtävään, mutta et ole vielä tallentanut niitä."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:62
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Kalenterisi eivät ole käytettävissä ennen kuin Evolution on käynnistetty "
 "uudestaan."
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:63
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 "Tehtävät eivät ole käytettävissä ennen kuin Evolution on käynnistetty "
 "uudestaan."
 
-#: ../calendar/calendar.error.xml.h:66
-#: ../composer/mail-composer.error.xml.h:29
-msgid "_Discard Changes"
-msgstr "_Hylkää muutokset"
-
-#: ../calendar/calendar.error.xml.h:67 ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:64
 #: ../ui/evolution-message-composer.xml.h:51
 msgid "_Save"
 msgstr "_Tallenna"
 
-#: ../calendar/calendar.error.xml.h:68
-msgid "_Save Changes"
-msgstr "_Tallenna muutokset"
-
-#: ../calendar/calendar.error.xml.h:69
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:127
+#: ../calendar/calendar.error.xml.h:65
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:123
 msgid "_Send"
 msgstr "_Lähetä"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:66
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:323
+#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:322
 #: ../smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Syötä salasana"
@@ -4290,10 +4221,8 @@ msgstr "Jaa usean päivän tapahtumat:"
 
 #: ../calendar/conduits/calendar/calendar-conduit.c:1377
 #: ../calendar/conduits/calendar/calendar-conduit.c:1378
-#: ../calendar/conduits/memo/memo-conduit.c:854
-#: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:988
-#: ../calendar/conduits/todo/todo-conduit.c:989
+#: ../calendar/conduits/todo/todo-conduit.c:879
+#: ../calendar/conduits/todo/todo-conduit.c:880
 msgid "Could not start evolution-data-server"
 msgstr "Evolutionin tietopalvelimen käynnistys epäonnistui"
 
@@ -4302,32 +4231,16 @@ msgstr "Evolutionin tietopalvelimen käynnistys epäonnistui"
 msgid "Could not read pilot's Calendar application block"
 msgstr "Pilotin kalenterin ohjelmalohkoa ei voitu lukea"
 
-#: ../calendar/conduits/memo/memo-conduit.c:937
-#: ../calendar/conduits/memo/memo-conduit.c:940
-msgid "Could not read pilot's Memo application block"
-msgstr "Pilotin muistilappujen ohjelmalohkoa ei voitu lukea"
-
-#: ../calendar/conduits/memo/memo-conduit.c:976
-#: ../calendar/conduits/memo/memo-conduit.c:979
-msgid "Could not write pilot's Memo application block"
-msgstr "Pilotin muistilappujen ohjelmalohkoa ei voitu lukea"
-
-#: ../calendar/conduits/todo/todo-conduit.c:237
+#: ../calendar/conduits/todo/todo-conduit.c:234
 msgid "Default Priority:"
 msgstr "Prioriteetin oletusarvo:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1071
-#: ../calendar/conduits/todo/todo-conduit.c:1074
+#: ../calendar/conduits/todo/todo-conduit.c:959
+#: ../calendar/conduits/todo/todo-conduit.c:962
 msgid "Could not read pilot's ToDo application block"
-msgstr "Pilotin tehtävälistan ohjelmalohkoa ei voitu lukea"
-
-#: ../calendar/conduits/todo/todo-conduit.c:1110
-#: ../calendar/conduits/todo/todo-conduit.c:1113
-msgid "Could not write pilot's ToDo application block"
-msgstr "Pilotin tehtävälistan ohjelmalohkoa ei voitu kirjoittaa"
+msgstr "Pilotin tehtävien ohjelmalohkoa ei voitu lukea"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:1968
 msgid "Calendar and Tasks"
 msgstr "Kalenteri ja tehtävät"
 
@@ -4350,7 +4263,7 @@ msgstr "Evolution kalenterin määrittely"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution kalenterin ajanvarausviestien katselin"
+msgstr "Evolution kalenterin viestin skeduloinnin katselin"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 msgid "Evolution Calendar/Task editor"
@@ -4361,40 +4274,26 @@ msgid "Evolution's Calendar component"
 msgstr "Evolutionin kalenterin komponentti"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution's Memos component"
-msgstr "Evolutionin muistilappukomponentti"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Tasks component"
 msgstr "Evolutionin tehtävien komponentti"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Memo_s"
-msgstr "Mui_stilaput"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memos.c:1091 ../calendar/gui/memos-component.c:528
-#: ../calendar/gui/memos-component.c:998 ../calendar/gui/memos-control.c:334
-msgid "Memos"
-msgstr "Muistilaput"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-tasks.c:1333 ../calendar/gui/print.c:1831
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#: ../calendar/gui/e-tasks.c:1282 ../calendar/gui/print.c:1831
 #: ../calendar/gui/tasks-component.c:519
-#: ../calendar/gui/tasks-component.c:1013 ../calendar/gui/tasks-control.c:466
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:456
 #: ../calendar/importers/icalendar-importer.c:79
 #: ../calendar/importers/icalendar-importer.c:707
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:589
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Tehtävät"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 msgid "_Calendars"
 msgstr "_Kalenterit"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
 #: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tehtävät"
@@ -4403,13 +4302,13 @@ msgstr "_Tehtävät"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution kalenterin hälytys ja huomautuspalvelu"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuutti"
 msgstr[1] "minuuttia"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:251
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:250
 msgid "Start time"
 msgstr "Alkamisaika"
 
@@ -4429,7 +4328,7 @@ msgstr "Tapaamiset"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/e-itip-control.c:1117
+#: ../calendar/gui/e-itip-control.c:1120
 #: ../plugins/itip-formatter/itip-view.c:884
 msgid "Location:"
 msgstr "Sijainti:"
@@ -4443,13 +4342,13 @@ msgstr "Torkkumisaika:"
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:6
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:13
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-editor.xml.h:17
-#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-addressbook.xml.h:34 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-composer-entries.xml.h:8
+#: ../ui/evolution-mail-messagedisplay.xml.h:5
 #: ../ui/evolution-message-composer.xml.h:44
 #: ../ui/evolution-signature-editor.xml.h:23
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution.xml.h:35
 msgid "_Edit"
 msgstr "_Muokkaa"
 
@@ -4458,31 +4357,35 @@ msgid "_Snooze"
 msgstr "_Torku"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+msgid "description of appointment"
+msgstr "tapaamisen kuvaus"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 msgid "location of appointment"
 msgstr "tapaamisen sijainti"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:970
+#: ../calendar/gui/alarm-notify/alarm-queue.c:966
 msgid "Dismiss"
 msgstr "Hylkää"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:971
+#: ../calendar/gui/alarm-notify/alarm-queue.c:967
 msgid "Dismiss All"
 msgstr "Hylkää kaikki"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1053
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1049
 msgid "No summary available."
 msgstr "Ei yhteenvetoa saatavilla"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1062
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1064
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1058
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1060
 msgid "No description available."
 msgstr "Ei kuvausta saatavilla"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1072
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1068
 msgid "No location information available."
 msgstr "Ei sijaintitietoja saatavilla"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1088
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1084
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -4495,12 +4398,12 @@ msgstr ""
 "Alkaa %s\n"
 "Päättyy %s"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1191
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1215
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1187
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1211
 msgid "Warning"
 msgstr "Varoitus"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1195
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1191
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4512,7 +4415,7 @@ msgstr ""
 "lähettämään sähköpostia. Evolution näyttää sen sijaan\n"
 "tavallisen huomautusikkunan."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1221
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1217
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4529,7 +4432,7 @@ msgstr ""
 "\n"
 "Haluatko varmasti suorittaa tämän ohjelman?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1235
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1231
 msgid "Do not ask me about this program again."
 msgstr "Älä kysy tästä ohjelmasta enää uudelleen"
 
@@ -4728,60 +4631,26 @@ msgid "Programs that are allowed to be run by alarms."
 msgstr "Ohjelmat, joita voidaan suorittaa hälytyksistä."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
-msgid "Show RSVP field in the event/task/meeting editor"
-msgstr "Näytä RSVP-kenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
-msgid "Show Role field in the event/task/meeting editor"
-msgstr "Näytä roolikenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr "Näytä tapaamisten loppumisajat viikko- ja kuukausinäkymissä"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
-msgid "Show categories field in the event/meeting/task editor"
-msgstr "Näytä luokkakenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show display alarms in notification tray"
 msgstr "Näytä näkyvät hälytykset ilmoitusalueella"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
-msgid "Show status field in the event/task/meeting editor"
-msgstr "Näytä tilakenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
-#: ../mail/evolution-mail.schemas.in.in.h:73
-msgid "Show the \"Preview\" pane"
-msgstr "Näytä \"Esikatselu\"-paneeli"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
-#: ../mail/evolution-mail.schemas.in.in.h:74
-msgid "Show the \"Preview\" pane."
-msgstr "Näytä esikatselupaneeli"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
-msgid "Show timezone field in the event/meeting editor"
-msgstr "Näytä aikavyöhyke tapahtuman tai kokouksen muokkaimessa"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
-msgid "Show type field in the event/task/meeting editor"
-msgstr "Näytä tyyppikenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show week numbers in date navigator"
 msgstr "Näytä viikkonumerot päivämääräselaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Tasks due today color"
 msgstr "Tänään erääntyvien tehtävien väri"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Tasks vertical pane position"
 msgstr "Tehtäväpaneelin pystysijainti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -4790,7 +4659,7 @@ msgstr ""
 "kääntämätön Olsenin aikavyöhyketietokantamuoto, esimerkiksi \"Finland/"
 "Helsinki\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
 #, no-c-format
 msgid ""
 "The url template to use as a free/busy data fallback, %u is replaced by the "
@@ -4799,54 +4668,54 @@ msgstr ""
 "URL-pohja jota käytetään vapaa/varattu tiedon varaosoitteena, %u korvataan "
 "käyttäjäosalla ja %d aluenimellä sähköpostiosoitteesta."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Time divisions"
 msgstr "Aikajaot"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Time the last alarm ran, in time_t."
 msgstr "Viimeisimmän hälytyksen suoritusaika, time_t yksikkönä"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Timezone"
 msgstr "Aikavyöhyke"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Twenty four hour time format"
 msgstr "24-tunnin kello"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Oletusmuistutusten yksikkö, \"minutes\", \"hours\" tai \"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Yksikkö, jonka avulla päätetään milloin tehtäviä piilotetaan. Arvot \"minutes"
 "\", \"hours\" tai \"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid "Week start"
 msgstr "Viikon alku"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Viikonpäivä josta viikko alkaa, sunnuntaista (0) lauantaihin (6)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Käytetäänkö ilmoitusaluetta hälytysten näyttämiseen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Kysytäänkö vahvistusta poistettaessa tapaamista tai tehtävää."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Kysytäänkö vahvistusta siivottaessa tapaamisia tai tehtäviä"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -4854,76 +4723,49 @@ msgstr ""
 "Pakataanko viikonloput kuukausinäkymässä. Tämä tiivistää lauantain ja "
 "sunnuntain yhden viikonpäivän kokoisiksi."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "Näytetäänkö tapahtumien loppumisaika viikko- ja kuukausinäkymissä."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "Piirretäänkö Marcus Bains-viiva (viiva nykyhetkessä) kalenteriin."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Piilotetaanko valmistuneet tehtävät tehtävänäkymstä."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Whether to set a default reminder for appointments."
 msgstr "Asetetaanko tapaamisille oletusmuistutus."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
-msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr ""
-"Näytetäänkö RSVP-kenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
-msgid "Whether to show categories field in the event/meeting editor"
-msgstr "Näytetäänkö luokkakenttä tapahtuman tai kokouksen muokkaimessa"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
-msgid "Whether to show role field in the event/task/meeting editor"
-msgstr ""
-"Näytetäänkö roolikenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
-msgid "Whether to show status field in the event/task/meeting editor"
-msgstr "Näytetäänkö tilakenttä tapahtuman, tehtävät tai kokouksen muokkaimessa"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Näytetäänkö kello 24 tunnin vai am/pm muodossa."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
-msgid "Whether to show timezone field in the event/meeting editor"
-msgstr "Näytetäänkö aiakavyöhykekenttä tapahtuman tai kokouksen muokkaimessa"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
-msgid "Whether to show type field in the event/task/meeting editor"
-msgstr ""
-"Näytetäänkö tyyppikenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Näytetäänkö viikkonumerot päivämääräselaimessa."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Work days"
 msgstr "Työpäivät"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid "Workday end hour"
 msgstr "Työpäivän päättymistunti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Workday end minute"
 msgstr "Työpäivän päättymisminuutti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid "Workday start hour"
 msgstr "Työpäivän alkamistunti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Workday start minute"
 msgstr "Työpäivän alkamisminuutti"
 
@@ -4947,22 +4789,13 @@ msgstr "Sijainti sisältää"
 msgid "Unmatched"
 msgstr "Täsmäämättömät"
 
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2512
-#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-memos.xml.h:11
-#: ../ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "Tulosta"
-
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:367
 #: ../calendar/gui/gnome-cal.c:2116
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:590
-#: ../plugins/hula-account-setup/camel-hula-listener.c:374
-#: ../plugins/hula-account-setup/camel-hula-listener.c:403
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:588
 msgid "Calendar"
 msgstr "Kalenteri"
 
@@ -4989,13 +4822,10 @@ msgid "days"
 msgstr "päivä"
 
 #. 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:234
-#: ../calendar/gui/memos-component.c:219 ../calendar/gui/migration.c:489
-#: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1084
-#: ../calendar/gui/tasks-component.c:215
+#: ../calendar/gui/calendar-component.c:234 ../calendar/gui/migration.c:489
+#: ../calendar/gui/migration.c:582 ../calendar/gui/tasks-component.c:215
 msgid "On The Web"
 msgstr "Verkossa"
 
@@ -5010,14 +4840,15 @@ msgid "Weather"
 msgstr "Sää"
 
 #: ../calendar/gui/calendar-component.c:535
-msgid "_New Calendar"
-msgstr "_Uusi kalenteri"
+#: ../calendar/gui/dialogs/calendar-setup.c:449
+msgid "New Calendar"
+msgstr "Uusi kalenteri"
 
 #: ../calendar/gui/calendar-component.c:858
 msgid "Failed upgrading calendars."
 msgstr "Kalenterien päivitys epäonnistui."
 
-#: ../calendar/gui/calendar-component.c:1157
+#: ../calendar/gui/calendar-component.c:1154
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
@@ -5072,7 +4903,6 @@ msgid "New calendar"
 msgstr "Uusi kalenteri"
 
 #: ../calendar/gui/calendar-component.c:1500
-#: ../calendar/gui/dialogs/event-page.c:828
 msgid "Cale_ndar"
 msgstr "_Kalenteri"
 
@@ -5207,8 +5037,7 @@ msgstr "tunti(a)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../calendar/gui/dialogs/event-page.glade.h:18 ../filter/filter.glade.h:15
-#: ../plugins/calendar-http/calendar-http.c:264
+#: ../filter/filter.glade.h:15 ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:564
 msgid "hours"
 msgstr "tunti"
@@ -5230,8 +5059,6 @@ msgid "A_dd"
 msgstr "_Lisää"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Hälytykset"
 
@@ -5258,20 +5085,17 @@ msgstr "%.0fG"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:311
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
-#: ../calendar/gui/dialogs/comp-editor.c:2575
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:138
-#: ../mail/em-utils.c:483 ../mail/em-utils.c:520
-#: ../widgets/misc/e-attachment-bar.c:341
+#: ../calendar/gui/dialogs/comp-editor.c:2440
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:444
+#: ../mail/em-utils.c:481 ../widgets/misc/e-attachment-bar.c:341
 msgid "attachment"
 msgstr "liite"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:473
-#: ../calendar/gui/dialogs/comp-editor.c:1055
-#: ../calendar/gui/dialogs/event-page.c:1733
-#: ../calendar/gui/dialogs/meeting-page.c:908
-#: ../calendar/gui/dialogs/task-page.c:1182
+#: ../calendar/gui/dialogs/comp-editor.c:1083
+#: ../calendar/gui/dialogs/meeting-page.c:887
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3545
+#: ../composer/e-msg-composer.c:3400
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
@@ -5279,23 +5103,23 @@ msgid "_Remove"
 msgstr "_Poista"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:474
-#: ../calendar/gui/dialogs/comp-editor.c:1056
+#: ../calendar/gui/dialogs/comp-editor.c:1084
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3546 ../mail/em-folder-tree.c:2058
+#: ../composer/e-msg-composer.c:3401 ../mail/em-folder-tree.c:2052
 #: ../ui/evolution-mail-list.xml.h:29
 msgid "_Properties"
 msgstr "_Ominaisuudet..."
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:476
-#: ../calendar/gui/dialogs/comp-editor.c:1058
+#: ../calendar/gui/dialogs/comp-editor.c:1086
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3548
+#: ../composer/e-msg-composer.c:3403
 msgid "_Add attachment..."
 msgstr "_Lisää liite..."
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:736
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:994
+#: ../widgets/misc/e-attachment-bar.c:963
 msgid "Attachment Bar"
 msgstr "Liitepalkki"
 
@@ -5310,7 +5134,7 @@ msgid "Suggest automatic display of attachment"
 msgstr "Ehdota liitteen automaattista näyttämistä"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
-#: ../composer/e-msg-composer-select-file.c:239
+#: ../composer/e-msg-composer-select-file.c:241
 msgid "Attach file(s)"
 msgstr "Liitä tiedosto(t)"
 
@@ -5345,7 +5169,7 @@ msgstr "Liitteen ominaisuudet"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:267
-#: ../calendar/gui/e-itip-control.c:1163
+#: ../calendar/gui/e-itip-control.c:1166
 #: ../calendar/gui/e-itip-control.glade.h:6
 #: ../composer/e-msg-composer-attachment.glade.h:3
 #: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
@@ -5366,7 +5190,7 @@ msgstr "MIME-tyyppi:"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:576
-#: ../mail/em-account-prefs.c:504 ../mail/em-composer-prefs.c:919
+#: ../mail/em-account-prefs.c:504 ../mail/em-composer-prefs.c:891
 #: ../plugins/plugin-manager/plugin-manager.c:213
 msgid "Enabled"
 msgstr "Käytä"
@@ -5484,14 +5308,12 @@ msgid "E_nable"
 msgstr "Kä_ytä"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: ../calendar/gui/dialogs/event-editor.c:549
-#: ../ui/evolution-event-editor.xml.h:6
 msgid "Free/Busy"
 msgstr "Vapaa/Varattu"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: ../calendar/gui/dialogs/recurrence-page.c:1049
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Friday"
 msgstr "Perjantai"
 
@@ -5505,7 +5327,7 @@ msgstr "Minuutti"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: ../calendar/gui/dialogs/recurrence-page.c:1045
-#: ../calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Monday"
 msgstr "Maanantai"
 
@@ -5519,7 +5341,7 @@ msgstr "_Su"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ../calendar/gui/dialogs/recurrence-page.c:1050
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Saturday"
 msgstr "Lauantai"
 
@@ -5533,7 +5355,7 @@ msgstr "Näytä _viikkonumerot"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: ../calendar/gui/dialogs/recurrence-page.c:1051
-#: ../calendar/gui/e-itip-control.c:726
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Sunday"
 msgstr "Sunnuntai"
 
@@ -5551,12 +5373,11 @@ msgstr "Pohja:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 #: ../calendar/gui/dialogs/recurrence-page.c:1048
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Thursday"
 msgstr "Torstai"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "Time _zone:"
 msgstr "Aikavyöhyke: "
 
@@ -5566,7 +5387,7 @@ msgstr "Ajan muoto:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/dialogs/recurrence-page.c:1046
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Tuesday"
 msgstr "Tiistai"
 
@@ -5576,7 +5397,7 @@ msgstr "Viikko _alkaa:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #: ../calendar/gui/dialogs/recurrence-page.c:1047
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
@@ -5664,40 +5485,23 @@ msgstr "Kopioi kansion sisältö paikallisesti yhteydettömään käyttöön"
 msgid "Copy task list contents locally for offline operation"
 msgstr "Kopioi tehtävälistan sisältö paikallisesti yhteydettömään käyttöön"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-msgid "Copy memo list contents locally for offline operation"
-msgstr "Kopioi muistilappujen sisältö paikallisesti yhteydettömään käyttöön"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:341
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "_Väri:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:378
 msgid "Tasks List"
 msgstr "Lista tehtävistä"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-msgid "Memos List"
-msgstr "_Muistilappulista"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:460
+#: ../calendar/gui/dialogs/calendar-setup.c:447
 msgid "Calendar Properties"
 msgstr "Kalenterin ominaisuudet"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:462
-msgid "New Calendar"
-msgstr "Uusi kalenteri"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:528
+#: ../calendar/gui/dialogs/calendar-setup.c:515
 msgid "Task List Properties"
 msgstr "Tehtävälistan ominaisuudet"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:594
-#: ../calendar/gui/memos-component.c:448
-msgid "New Memo List"
-msgstr "Uusi muistilappulista"
-
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
 msgstr "Lisää kalenteri"
@@ -5805,103 +5609,104 @@ msgstr "(erääntyy "
 msgid "Due "
 msgstr "Erääntyy "
 
-#: ../calendar/gui/dialogs/comp-editor.c:193 ../composer/e-msg-composer.c:2800
+#: ../calendar/gui/dialogs/comp-editor.c:190 ../composer/e-msg-composer.c:2664
 #, c-format
 msgid "Attached message - %s"
 msgstr "Liitetty viesti - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:198
-#: ../calendar/gui/dialogs/comp-editor.c:368 ../composer/e-msg-composer.c:2805
-#: ../composer/e-msg-composer.c:2984
+#: ../calendar/gui/dialogs/comp-editor.c:195
+#: ../calendar/gui/dialogs/comp-editor.c:365 ../composer/e-msg-composer.c:2669
+#: ../composer/e-msg-composer.c:2846
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Liitetty viesti"
 msgstr[1] "%d liitettyä viestiä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:432 ../composer/e-msg-composer.c:3050
+#: ../calendar/gui/dialogs/comp-editor.c:428
+#: ../calendar/gui/e-calendar-table.c:1175
+#: ../calendar/gui/e-calendar-view.c:1552 ../composer/e-msg-composer.c:2911
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1035
+#: ../mail/message-list.c:1708 ../ui/evolution-addressbook.xml.h:31
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-tasks.xml.h:21
+msgid "_Copy"
+msgstr "_Kopioi"
+
+#: ../calendar/gui/dialogs/comp-editor.c:429 ../composer/e-msg-composer.c:2912
 #: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1719
+#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1709
 msgid "_Move"
 msgstr "_Siirrä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:434 ../composer/e-msg-composer.c:3052
-#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1721
+#: ../calendar/gui/dialogs/comp-editor.c:431 ../composer/e-msg-composer.c:2914
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1711
 msgid "Cancel _Drag"
 msgstr "Peruuta _raahaus"
 
-#: ../calendar/gui/dialogs/comp-editor.c:777
+#: ../calendar/gui/dialogs/comp-editor.c:774
 msgid "Could not update object"
 msgstr "Kohdetta ei voitu päivittää"
 
-#: ../calendar/gui/dialogs/comp-editor.c:913 ../composer/e-msg-composer.c:2443
+#: ../calendar/gui/dialogs/comp-editor.c:977 ../composer/e-msg-composer.c:2318
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> liite"
 msgstr[1] "<b>%d</b> liitettä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:943
-msgid "Hide Attachment _Bar"
-msgstr "Piilota _liitepalkki"
-
-#: ../calendar/gui/dialogs/comp-editor.c:946
-#: ../calendar/gui/dialogs/comp-editor.c:1363
-msgid "Show Attachment _Bar"
-msgstr "Näytä _liitepalkki"
+#: ../calendar/gui/dialogs/comp-editor.c:1249
+msgid "_Attachment Bar (drop attachments here)"
+msgstr "_Liitepalkki (raahaa tähän liitteitä)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
-msgid "Attachment Button: Press space key to toggle attachment bar"
-msgstr "Liitepainike: Näytä ja piilota liitepalkki välilyönnillä"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1984
-#: ../calendar/gui/dialogs/comp-editor.c:2027
+#: ../calendar/gui/dialogs/comp-editor.c:1850
+#: ../calendar/gui/dialogs/comp-editor.c:1893
 msgid "Edit Appointment"
 msgstr "Muokkaa tapaamista"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1990
-#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/dialogs/comp-editor.c:1856
+#: ../calendar/gui/dialogs/comp-editor.c:1899
 #, c-format
 msgid "Meeting - %s"
 msgstr "Kokous - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1992
-#: ../calendar/gui/dialogs/comp-editor.c:2035
+#: ../calendar/gui/dialogs/comp-editor.c:1858
+#: ../calendar/gui/dialogs/comp-editor.c:1901
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tapaaminen - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1996
-#: ../calendar/gui/dialogs/comp-editor.c:2039
+#: ../calendar/gui/dialogs/comp-editor.c:1862
+#: ../calendar/gui/dialogs/comp-editor.c:1905
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tehtävänanto - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1998
-#: ../calendar/gui/dialogs/comp-editor.c:2041
+#: ../calendar/gui/dialogs/comp-editor.c:1864
+#: ../calendar/gui/dialogs/comp-editor.c:1907
 #, c-format
 msgid "Task - %s"
 msgstr "Tehtävä - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2001
-#: ../calendar/gui/dialogs/comp-editor.c:2044
+#: ../calendar/gui/dialogs/comp-editor.c:1867
+#: ../calendar/gui/dialogs/comp-editor.c:1910
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Päiväkirjamerkintä - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2012
-#: ../calendar/gui/dialogs/comp-editor.c:2054
+#: ../calendar/gui/dialogs/comp-editor.c:1878
+#: ../calendar/gui/dialogs/comp-editor.c:1920
 msgid "No summary"
 msgstr "Ei kuvausta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2668
-#: ../calendar/gui/dialogs/comp-editor.c:2701
-#: ../calendar/gui/dialogs/comp-editor.c:2725
+#: ../calendar/gui/dialogs/comp-editor.c:2532
+#: ../calendar/gui/dialogs/comp-editor.c:2565
+#: ../calendar/gui/dialogs/comp-editor.c:2589
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Tähän kohtaan tehdyt muutokset voidaan hylätä, jos päivitys saapuu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2749
+#: ../calendar/gui/dialogs/comp-editor.c:2613
 msgid "Unable to use current version!"
 msgstr "Nykyistä versiota ei voida käyttää!"
 
@@ -5980,178 +5785,203 @@ msgstr "Valtuuta:"
 msgid "Enter Delegate"
 msgstr "Syötä valtuutettu"
 
-#: ../calendar/gui/dialogs/event-editor.c:525
-msgid "Appoint_ment"
-msgstr "Tapaa_minen"
+#: ../calendar/gui/dialogs/event-editor.c:141 ../calendar/gui/print.c:2307
+msgid "Appointment"
+msgstr "Tapaaminen"
 
-#: ../calendar/gui/dialogs/event-editor.c:529
-#: ../ui/evolution-event-editor.xml.h:12
+#: ../calendar/gui/dialogs/event-editor.c:150
 msgid "Recurrence"
 msgstr "Toistuvuus"
 
-#: ../calendar/gui/dialogs/event-page.c:834
-#: ../calendar/gui/dialogs/task-page.c:443
-msgid "Or_ganizer"
-msgstr "_Järjestäjä"
+#: ../calendar/gui/dialogs/event-editor.c:164
+#: ../calendar/gui/dialogs/event-editor.c:248
+#: ../calendar/gui/dialogs/event-editor.c:422
+msgid "Scheduling"
+msgstr "Ajoitus"
+
+#: ../calendar/gui/dialogs/event-editor.c:174
+msgid "Delegatees"
+msgstr "Valtuutetut"
 
-#: ../calendar/gui/dialogs/event-page.c:872
-msgid "_Delegatees"
-msgstr "_Valtuutetut"
+#: ../calendar/gui/dialogs/event-editor.c:178
+msgid "Attendees"
+msgstr "Osanottajat"
 
-#: ../calendar/gui/dialogs/event-page.c:874
-msgid "Atte_ndees"
-msgstr "_Osanottajat"
+#: ../calendar/gui/dialogs/event-editor.c:251
+#: ../calendar/gui/dialogs/event-editor.c:425
+msgid "Invitations"
+msgstr "Kutsut"
 
-#: ../calendar/gui/dialogs/event-page.c:1033
+#: ../calendar/gui/dialogs/event-page.c:731
 msgid "Event with no start date"
 msgstr "Tapahtuma ilman alkupäivämäärää"
 
-#: ../calendar/gui/dialogs/event-page.c:1036
+#: ../calendar/gui/dialogs/event-page.c:734
 msgid "Event with no end date"
 msgstr "Tapahtuma ilman päättymispäivää"
 
-#: ../calendar/gui/dialogs/event-page.c:1201
-#: ../calendar/gui/dialogs/task-page.c:847
+#: ../calendar/gui/dialogs/event-page.c:900
+#: ../calendar/gui/dialogs/task-page.c:556
 msgid "Start date is wrong"
 msgstr "Aloituspäiväys on virheellinen"
 
-#: ../calendar/gui/dialogs/event-page.c:1211
+#: ../calendar/gui/dialogs/event-page.c:910
 msgid "End date is wrong"
 msgstr "Lopetuspäiväys on virheellinen"
 
-#: ../calendar/gui/dialogs/event-page.c:1234
+#: ../calendar/gui/dialogs/event-page.c:933
 msgid "Start time is wrong"
 msgstr "Alkamisaika on väärin"
 
-#: ../calendar/gui/dialogs/event-page.c:1241
+#: ../calendar/gui/dialogs/event-page.c:940
 msgid "End time is wrong"
 msgstr "Lopetusaika on virheellinen"
 
-#: ../calendar/gui/dialogs/event-page.c:1396
-#: ../calendar/gui/dialogs/meeting-page.c:463
-#: ../calendar/gui/dialogs/task-page.c:904
-msgid "The organizer selected no longer has an account."
-msgstr "Valitulla järjestäjällä ei enää ole käyttäjätiliä"
-
-#: ../calendar/gui/dialogs/event-page.c:1402
-#: ../calendar/gui/dialogs/meeting-page.c:469
-#: ../calendar/gui/dialogs/task-page.c:910
-msgid "An organizer is required."
-msgstr "Järjestäjä vaaditaan."
-
-#: ../calendar/gui/dialogs/event-page.c:1417
-#: ../calendar/gui/dialogs/meeting-page.c:484
-#: ../calendar/gui/dialogs/task-page.c:925
-msgid "At least one attendee is required."
-msgstr "Vähintään yksi läsnäolija vaaditaan."
-
-#: ../calendar/gui/dialogs/event-page.c:1734
-#: ../calendar/gui/dialogs/meeting-page.c:909
-#: ../calendar/gui/dialogs/task-page.c:1183
-msgid "_Add "
-msgstr "_Lisää "
-
-#: ../calendar/gui/dialogs/event-page.c:2421
+#: ../calendar/gui/dialogs/event-page.c:1686
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kalenterin '%s' ei voitu avata"
 
-#: ../calendar/gui/dialogs/event-page.c:2661
+#: ../calendar/gui/dialogs/event-page.c:1892
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d päivä ennen tapaamista"
 msgstr[1] "%d päivää ennen tapaamista"
 
-#: ../calendar/gui/dialogs/event-page.c:2669
+#: ../calendar/gui/dialogs/event-page.c:1900
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d tunti ennen tapaamista"
 msgstr[1] "%d tuntia ennen tapaamista"
 
-#: ../calendar/gui/dialogs/event-page.c:2677
+#: ../calendar/gui/dialogs/event-page.c:1908
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuutti ennen tapaamista"
 msgstr[1] "%d minuuttia ennen apaamista"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:1
+#: ../calendar/gui/dialogs/event-page.glade.h:2
+msgid "1 day before appointment"
+msgstr "1 päivä ennen tapaamista"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:3
 msgid "1 hour before appointment"
 msgstr "1 tunti ennen tapaamista"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "15 minutes before appointment"
 msgstr "15 minuuttia ennen tapaamista"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:3
-msgid "1day before appointment"
-msgstr "1 päivä ennen tapaamista"
-
 #: ../calendar/gui/dialogs/event-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "Atte_ndees..."
-msgstr "_Osanottajat..."
+msgid "<b>Basics</b>"
+msgstr "<b>Perusasiat</b>"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
-msgid "C_ustomize"
-msgstr "_Muokkaa"
+#: ../calendar/gui/dialogs/task-page.glade.h:2
+msgid "<b>Date and Time</b>"
+msgstr "<b>Päiväys ja aika</b>"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
-msgid "Ca_tegories..."
-msgstr "Ry_hmät..."
+#: ../calendar/gui/dialogs/task-page.glade.h:3
+msgid "<b>Send Options</b>"
+msgstr "<b>Lähetyksen valinnat</b>"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:8
-msgid "Cale_ndar:"
-msgstr "_Kalenteri:"
+msgid "A_ll day event"
+msgstr "_Koko päivän kestävä tapahtuma"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "Event Description"
-msgstr "Tapahtuman kuvaus:"
+#: ../calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ad_vanced send options"
+msgstr "_Edistyneet lähetyksen asetukset"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:10
-msgid "Locat_ion:"
-msgstr "_Sijainti:"
+msgid "C_ustomize..."
+msgstr "_Muokkaa..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:11
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "Or_ganizer:"
-msgstr "_Järjestäjä:"
+#: ../calendar/gui/dialogs/task-page.glade.h:5
+msgid "Ca_tegories..."
+msgstr "Ry_hmät..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:12
-#: ../calendar/gui/dialogs/task-page.glade.h:6
-msgid "Su_mmary:"
-msgstr "_Yhteenveto:"
+msgid "Cale_ndar:"
+msgstr "_Kalenteri:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/task-page.glade.h:7
+msgid "Classi_fication:"
+msgstr "_Luokittelu:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:14
-msgid "_Description:"
-msgstr "K_uvaus:"
+#: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:364
+msgid "Confidential"
+msgstr "Luottamuksellinen"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:15
-msgid "_Set alarm\t"
-msgstr "_Aseta hälytys\t"
+msgid "Event Description"
+msgstr "Tapahtuman kuvaus:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:16
-msgid "_Time:"
-msgstr "_Aika:"
+msgid "Locat_ion:"
+msgstr "_Sijainti:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:17
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
-msgid "for"
-msgstr "kertaa"
+#: ../calendar/gui/dialogs/task-page.glade.h:10
+#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:323
+#: ../calendar/gui/e-calendar-table.c:363
+msgid "Private"
+msgstr "Henkilökohtainen"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:18
+#: ../calendar/gui/dialogs/task-page.glade.h:11
+#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:314
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:362
+msgid "Public"
+msgstr "Julkinen"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "until"
-msgstr "kunnes"
+msgid "Show time as _busy"
+msgstr "Näytä aika varattuna"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:20
+#: ../calendar/gui/dialogs/task-page.glade.h:13
+msgid "Su_mmary:"
+msgstr "_Yhteenveto:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:21
+msgid "This appointment has customized alarms"
+msgstr "Tässä tapaamisessa on muokattuja hälytyksiä"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:22
+msgid "_Alarm"
+msgstr "_Hälytys"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:23
+msgid "_Description:"
+msgstr "K_uvaus:"
 
-#: ../calendar/gui/dialogs/meeting-page.c:305
+#: ../calendar/gui/dialogs/event-page.glade.h:24
+#: ../calendar/gui/e-meeting-time-sel.c:642
+msgid "_End time:"
+msgstr "_Loppumisaika:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:25
+#: ../calendar/gui/e-meeting-time-sel.c:615
+msgid "_Start time:"
+msgstr "_Alkamisaika:"
+
+#: ../calendar/gui/dialogs/meeting-page.c:303
 msgid "<b>Dele_gatees</b>"
 msgstr "<b>_Valtuutetut</b>"
 
-#: ../calendar/gui/dialogs/meeting-page.c:309
+#: ../calendar/gui/dialogs/meeting-page.c:307
 msgid "<b>From:</b>"
 msgstr "<b>Lähde:</b>"
 
@@ -6160,10 +5990,10 @@ msgstr "<b>Lähde:</b>"
 #. When "None" is selected we want the field to be cleared.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../calendar/gui/dialogs/meeting-page.c:315
+#: ../calendar/gui/dialogs/meeting-page.c:313
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:653
-#: ../calendar/gui/e-itip-control.c:1103 ../composer/e-msg-composer.c:2246
+#: ../calendar/gui/e-itip-control.c:1106 ../composer/e-msg-composer.c:2122
 #: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
 #: ../mail/em-account-editor.c:1348 ../mail/em-account-prefs.c:464
 #: ../mail/em-folder-view.c:1064 ../mail/em-junk-hook.c:78
@@ -6172,12 +6002,29 @@ msgstr "<b>Lähde:</b>"
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:7
 #: ../plugins/itip-formatter/itip-formatter.c:1627
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
-#: ../widgets/misc/e-cell-date-edit.c:248 ../widgets/misc/e-dateedit.c:467
-#: ../widgets/misc/e-dateedit.c:1506 ../widgets/misc/e-dateedit.c:1675
+#: ../widgets/misc/e-cell-date-edit.c:248 ../widgets/misc/e-dateedit.c:465
+#: ../widgets/misc/e-dateedit.c:1504 ../widgets/misc/e-dateedit.c:1673
 msgid "None"
 msgstr "Määrittelemätön"
 
+#: ../calendar/gui/dialogs/meeting-page.c:461
+msgid "The organizer selected no longer has an account."
+msgstr "Valitulla järjestäjällä ei enää ole käyttäjätiliä"
+
+#: ../calendar/gui/dialogs/meeting-page.c:467
+msgid "An organizer is required."
+msgstr "Järjestäjä vaaditaan."
+
+#: ../calendar/gui/dialogs/meeting-page.c:482
+msgid "At least one attendee is required."
+msgstr "Vähintään yksi läsnäolija vaaditaan."
+
+#: ../calendar/gui/dialogs/meeting-page.c:884
+msgid "_Delegate To..."
+msgstr "_Valtuuta..."
+
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
+#: ../calendar/gui/e-meeting-list-view.c:358
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Osanottaja"
@@ -6213,14 +6060,15 @@ msgid "Member"
 msgstr "Jäsen"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:399
+#: ../calendar/gui/e-meeting-list-view.c:386
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Kuittauspyyntö"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
+#: ../calendar/gui/dialogs/task-editor.c:146
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:410
+#: ../calendar/gui/e-meeting-list-view.c:394
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
 #: ../mail/message-list.etspec.h:12
 msgid "Status"
@@ -6235,8 +6083,13 @@ msgid "C_hange Organizer"
 msgstr "Vaihda _järjestäjää"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Co_ntacts..."
-msgstr "_Yhteystiedot..."
+#: ../calendar/gui/e-meeting-time-sel.c:428
+msgid "Con_tacts..."
+msgstr "_Yhteystiedot"
+
+#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+msgid "Or_ganizer:"
+msgstr "_Järjestäjä:"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "Organizer"
@@ -6247,50 +6100,6 @@ msgstr "Järjestäjä:"
 msgid "Organizer:"
 msgstr "Järjestäjä:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:130 ../calendar/gui/print.c:2311
-msgid "Memo"
-msgstr "Muistilappu"
-
-#: ../calendar/gui/dialogs/memo-page.c:489
-#, c-format
-msgid "Unable to open memos in '%s'."
-msgstr "Muistilappuja kohteesta '%s' ei voitu avata."
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:2
-msgid "<span weight=\"bold\">Basics</span>"
-msgstr "<span weight=\"bold\">Perusasiat</span>"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-msgid "Classi_fication:"
-msgstr "_Luokittelu:"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
-#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:364
-msgid "Confidential"
-msgstr "Luottamuksellinen"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:363
-msgid "Private"
-msgstr "Henkilökohtainen"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:362
-msgid "Public"
-msgstr "Julkinen"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:8
-#: ../calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Group:"
-msgstr "_Ryhmä:"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:9
-msgid "_Memo Content:"
-msgstr "_Muistilapun sisältö:"
-
 #: ../calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Kalenterin vaihtoehdot</b>"
@@ -6434,6 +6243,10 @@ msgstr "Joka"
 msgid "This appointment rec_urs"
 msgstr "Tapaaminen _toistuu"
 
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "for"
+msgstr "kertaa"
+
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "ikuisesti"
@@ -6442,6 +6255,10 @@ msgstr "ikuisesti"
 msgid "month(s)"
 msgstr "kuukautta"
 
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid "until"
+msgstr "kunnes"
+
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "viikko(a)"
@@ -6473,15 +6290,15 @@ msgstr "<span weight=\"bold\">Tila</span>"
 #: ../calendar/gui/e-cal-component-preview.c:229
 #: ../calendar/gui/e-cal-model-tasks.c:346
 #: ../calendar/gui/e-cal-model-tasks.c:659
-#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/e-itip-control.c:895
+#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/e-itip-control.c:898
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../calendar/gui/print.c:2372 ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/print.c:2370 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Valmis"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-calendar-table.c:384 ../mail/message-list.c:1018
+#: ../calendar/gui/e-calendar-table.c:384 ../mail/message-list.c:1008
 msgid "High"
 msgstr "Korkea"
 
@@ -6490,20 +6307,20 @@ msgstr "Korkea"
 #: ../calendar/gui/e-cal-model-tasks.c:344
 #: ../calendar/gui/e-cal-model-tasks.c:657
 #: ../calendar/gui/e-cal-model-tasks.c:732
-#: ../calendar/gui/e-calendar-table.c:458 ../calendar/gui/print.c:2369
+#: ../calendar/gui/e-calendar-table.c:458 ../calendar/gui/print.c:2367
 msgid "In Progress"
 msgstr "Työn alla"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1016
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1006
 msgid "Low"
 msgstr "Matala"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-cal-model.c:920 ../calendar/gui/e-calendar-table.c:385
-#: ../mail/message-list.c:1017
+#: ../mail/message-list.c:1007
 msgid "Normal"
 msgstr "Tavallinen"
 
@@ -6511,7 +6328,7 @@ msgstr "Tavallinen"
 #: ../calendar/gui/e-cal-component-preview.c:236
 #: ../calendar/gui/e-cal-model-tasks.c:342
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:457 ../calendar/gui/print.c:2366
+#: ../calendar/gui/e-calendar-table.c:457 ../calendar/gui/print.c:2364
 msgid "Not Started"
 msgstr "Ei aloitettu"
 
@@ -6520,73 +6337,66 @@ msgid "P_ercent complete:"
 msgstr "Pros_enttia valmiina:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:11
-msgid "Stat_us:"
-msgstr "_Tila:"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 #: ../calendar/gui/e-calendar-table.c:387
 msgid "Undefined"
 msgstr "Määrittelemätön"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "_Date completed:"
 msgstr "_Valmistumispäivä:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:14
+#: ../calendar/gui/dialogs/task-details-page.glade.h:13
 #: ../widgets/misc/e-send-options.glade.h:31
 msgid "_Priority:"
 msgstr "_Prioriteetti:"
 
+#: ../calendar/gui/dialogs/task-details-page.glade.h:14
+msgid "_Status:"
+msgstr "_Tila:"
+
 #: ../calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Web Page:"
 msgstr "_Kotisivun osoite:"
 
-#: ../calendar/gui/dialogs/task-editor.c:419
-#: ../calendar/gui/tasks-component.c:1172
-msgid "_Task"
-msgstr "_Tehtävä"
-
-#: ../calendar/gui/dialogs/task-editor.c:423
-msgid "Task Details"
-msgstr "Tehtävän yksityiskohdat"
+#: ../calendar/gui/dialogs/task-editor.c:137 ../calendar/gui/print.c:2309
+msgid "Task"
+msgstr "Tehtävä"
 
-#: ../calendar/gui/dialogs/task-page.c:436
-msgid "_Group"
-msgstr "_Ryhmä"
+#: ../calendar/gui/dialogs/task-editor.c:161
+#: ../calendar/gui/dialogs/task-editor.c:223
+#: ../calendar/gui/dialogs/task-editor.c:380
+msgid "Assignment"
+msgstr "Tapaaminen"
 
-#: ../calendar/gui/dialogs/task-page.c:820
+#: ../calendar/gui/dialogs/task-page.c:529
 msgid "Due date is wrong"
 msgstr "Eräpäivä on virheellinen"
 
-#: ../calendar/gui/dialogs/task-page.c:1613
+#: ../calendar/gui/dialogs/task-page.c:873
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Tehtäviä kohteessa '%s' ei voitu avata."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:2
-msgid "Categor_ies..."
-msgstr "_Luokat..."
-
-#: ../calendar/gui/dialogs/task-page.glade.h:3
+#: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "D_escription:"
 msgstr "_Kuvaus:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:4
-msgid "Or_ganiser:"
-msgstr "_Järjestäjä:"
-
-#: ../calendar/gui/dialogs/task-page.glade.h:5
+#: ../calendar/gui/dialogs/task-page.glade.h:12
 msgid "Sta_rt date:"
 msgstr "_Alkamispäivä:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:7
-msgid "Time zone:"
-msgstr "Aikavyöhyke:"
+#: ../calendar/gui/dialogs/task-page.glade.h:14
+msgid "Task Description"
+msgstr "Tehtävän kuvaus"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../calendar/gui/dialogs/task-page.glade.h:15
 msgid "_Due date:"
 msgstr "_Eräpäivä:"
 
+#: ../calendar/gui/dialogs/task-page.glade.h:16
+msgid "_Group:"
+msgstr "_Ryhmä:"
+
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Free/Busy C_alendars</b>"
 msgstr "<b>Vapaa/Varattu _kalenterit</b>"
@@ -6712,27 +6522,17 @@ msgstr "%s %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s tuntemattomalle liipasintyypille"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2704
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2703
 #, c-format
 msgid "Click to open %s"
 msgstr "Napsauta avataksesi %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:199
-msgid "Memo:"
-msgstr "Muistilappu:"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:232
-#: ../calendar/gui/e-cal-component-preview.c:299
-msgid "Web Page:"
-msgstr "WWW-sivu:"
-
 #: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:796
 msgid "Untitled"
 msgstr "Nimetön"
 
 #: ../calendar/gui/e-cal-component-preview.c:186
-#: ../calendar/gui/e-itip-control.c:1107
+#: ../calendar/gui/e-itip-control.c:1110
 #: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kuvaus:"
@@ -6749,7 +6549,7 @@ msgstr "Eräpäivä:"
 #. write status
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:222
-#: ../calendar/gui/e-itip-control.c:1131
+#: ../calendar/gui/e-itip-control.c:1134
 #: ../plugins/exchange-operations/exchange-account-setup.c:265
 #: ../plugins/itip-formatter/itip-view.c:909
 msgid "Status:"
@@ -6759,6 +6559,10 @@ msgstr "Tila:"
 msgid "Priority:"
 msgstr "Prioriteetti:"
 
+#: ../calendar/gui/e-cal-component-preview.c:299
+msgid "Web Page:"
+msgstr "WWW-sivu:"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Päättymispäivä"
@@ -6769,8 +6573,7 @@ msgstr "Aloituspäivä"
 
 #: ../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:16
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../mail/mail-dialogs.glade.h:16 ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "Kuvaus"
 
@@ -6781,7 +6584,7 @@ msgstr "Vapaa"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
 #: ../calendar/gui/e-calendar-table.c:437
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Busy"
 msgstr "Varattu"
 
@@ -6812,17 +6615,15 @@ msgstr "Ei"
 
 #. This is the default filename used for temporary file creation
 #: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-model.c:330
-#: ../calendar/gui/e-cal-popup.c:106 ../calendar/gui/e-cal-popup.c:121
-#: ../calendar/gui/e-cal-popup.c:165 ../calendar/gui/e-itip-control.c:1148
-#: ../calendar/gui/e-itip-control.c:1289
+#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.c:1292
 #: ../calendar/gui/e-meeting-list-view.c:168
 #: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1283
+#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1244
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1652
 #: ../plugins/plugin-manager/plugin-manager.c:72
-#: ../widgets/misc/e-attachment-bar.c:690
+#: ../widgets/misc/e-attachment-bar.c:659
 #: ../widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "Tuntematon"
@@ -6835,39 +6636,6 @@ msgstr "Toistuva"
 msgid "Assigned"
 msgstr "Annettu tehtäväksi"
 
-#: ../calendar/gui/e-cal-popup.c:171 ../mail/em-popup.c:411
-msgid "Save As..."
-msgstr "Tallenna nimellä..."
-
-#: ../calendar/gui/e-cal-popup.c:187 ../mail/em-format-html-display.c:1812
-msgid "Select folder to save selected attachments..."
-msgstr "Valitse kansio, johon valitut liitteet tallennetaan..."
-
-#: ../calendar/gui/e-cal-popup.c:216 ../mail/em-popup.c:436
-#, c-format
-msgid "untitled_image.%s"
-msgstr "nimetön_kuva.%s"
-
-#: ../calendar/gui/e-cal-popup.c:270 ../calendar/gui/e-calendar-table.c:1169
-#: ../calendar/gui/e-calendar-view.c:1550 ../calendar/gui/e-memo-table.c:847
-#: ../mail/em-folder-view.c:1045 ../mail/em-popup.c:553 ../mail/em-popup.c:564
-msgid "_Save As..."
-msgstr "Tallenna _nimellä..."
-
-#: ../calendar/gui/e-cal-popup.c:271 ../mail/em-popup.c:554
-#: ../mail/em-popup.c:565
-msgid "Set as _Background"
-msgstr "Aseta _taustaksi"
-
-#: ../calendar/gui/e-cal-popup.c:272
-msgid "_Save Selected"
-msgstr "Tallenna _valitut"
-
-#: ../calendar/gui/e-cal-popup.c:394 ../mail/em-popup.c:774
-#, c-format
-msgid "Open in %s..."
-msgstr "Avaa ohjelmassa %s..."
-
 #: ../calendar/gui/e-calendar-table.c:406
 msgid "0%"
 msgstr "0%"
@@ -6917,58 +6685,58 @@ msgid "Task Table"
 msgstr "Tehtävätaulukko"
 
 #: ../calendar/gui/e-calendar-table.c:696
-#: ../calendar/gui/e-calendar-view.c:671 ../calendar/gui/e-memo-table.c:426
+#: ../calendar/gui/e-calendar-view.c:671
 msgid "Deleting selected objects"
 msgstr "Poistetaan valitut kohteet"
 
 #: ../calendar/gui/e-calendar-table.c:875
-#: ../calendar/gui/e-calendar-view.c:799 ../calendar/gui/e-memo-table.c:603
+#: ../calendar/gui/e-calendar-view.c:799
 msgid "Updating objects"
 msgstr "Päivitetään olioita"
 
 #: ../calendar/gui/e-calendar-table.c:1025
-#: ../calendar/gui/e-calendar-view.c:1126 ../calendar/gui/e-memo-table.c:735
-#: ../composer/e-msg-composer.c:1341
+#: ../calendar/gui/e-calendar-view.c:1122 ../composer/e-msg-composer.c:1243
 msgid "Save as..."
 msgstr "Tallenna nimellä..."
 
-#: ../calendar/gui/e-calendar-table.c:1168 ../calendar/gui/e-memo-table.c:846
+#: ../calendar/gui/e-calendar-table.c:1168
 msgid "Open _Web Page"
 msgstr "_Avaa www-sivu"
 
+#: ../calendar/gui/e-calendar-table.c:1169
+#: ../calendar/gui/e-calendar-view.c:1546 ../mail/em-folder-view.c:1045
+#: ../mail/em-popup.c:541 ../mail/em-popup.c:552
+msgid "_Save As..."
+msgstr "Tallenna _nimellä..."
+
 #: ../calendar/gui/e-calendar-table.c:1170
-#: ../calendar/gui/e-calendar-view.c:1530
-#: ../calendar/gui/e-calendar-view.c:1551 ../calendar/gui/e-memo-table.c:848
-#: ../mail/em-folder-view.c:1046
+#: ../calendar/gui/e-calendar-view.c:1526
+#: ../calendar/gui/e-calendar-view.c:1547 ../mail/em-folder-view.c:1046
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:120 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:120 ../ui/evolution-tasks.xml.h:27
 msgid "_Print..."
 msgstr "T_ulosta..."
 
 #: ../calendar/gui/e-calendar-table.c:1174
-#: ../calendar/gui/e-calendar-view.c:1555 ../calendar/gui/e-memo-table.c:852
-#: ../ui/evolution-addressbook.xml.h:1 ../ui/evolution-calendar.xml.h:1
-#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-view.c:1551 ../ui/evolution-addressbook.xml.h:1
+#: ../ui/evolution-calendar.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "L_eikkaa"
 
 #: ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:1533
-#: ../calendar/gui/e-calendar-view.c:1557 ../calendar/gui/e-memo-table.c:854
-#: ../ui/evolution-addressbook.xml.h:39 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-composer-entries.xml.h:9 ../ui/evolution-editor.xml.h:22
-#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
+#: ../calendar/gui/e-calendar-view.c:1529
+#: ../calendar/gui/e-calendar-view.c:1553 ../ui/evolution-addressbook.xml.h:38
+#: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
+#: ../ui/evolution-tasks.xml.h:26
 msgid "_Paste"
 msgstr "L_iitä"
 
-#: ../calendar/gui/e-calendar-table.c:1180 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1180 ../ui/evolution-tasks.xml.h:20
 msgid "_Assign Task"
 msgstr "_Anna tehtäväksi"
 
-#: ../calendar/gui/e-calendar-table.c:1181 ../calendar/gui/e-memo-table.c:858
-#: ../ui/evolution-tasks.xml.h:26
+#: ../calendar/gui/e-calendar-table.c:1181 ../ui/evolution-tasks.xml.h:24
 msgid "_Forward as iCalendar"
 msgstr "_Välitä iCalendar-muodossa"
 
@@ -6980,11 +6748,20 @@ msgstr "_Merkitse valmiiksi"
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merkitse valitut tehtävät valmiiksi"
 
+#. FIXME: need to disable for undeletable folders
+#: ../calendar/gui/e-calendar-table.c:1187
+#: ../calendar/gui/e-calendar-view.c:1565 ../mail/em-folder-tree.c:2048
+#: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:33
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
+#: ../ui/evolution-tasks.xml.h:22
+msgid "_Delete"
+msgstr "_Poista"
+
 #: ../calendar/gui/e-calendar-table.c:1188
 msgid "_Delete Selected Tasks"
 msgstr "_Poista valitut tehtävät"
 
-#: ../calendar/gui/e-calendar-table.c:1421
+#: ../calendar/gui/e-calendar-table.c:1407
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Lisää tehtävä näpäyttämällä tästä"
@@ -7019,78 +6796,73 @@ msgstr "Aloituspäivä"
 msgid "Task sort"
 msgstr "Tehtävän tyyppi"
 
-#: ../calendar/gui/e-calendar-view.c:1252
+#: ../calendar/gui/e-calendar-view.c:1248
 msgid "Moving items"
 msgstr "Siirretään kohteita"
 
-#: ../calendar/gui/e-calendar-view.c:1254
+#: ../calendar/gui/e-calendar-view.c:1250
 msgid "Copying items"
 msgstr "Kopioidaan kohteita"
 
-#: ../calendar/gui/e-calendar-view.c:1524
+#: ../calendar/gui/e-calendar-view.c:1520
 msgid "New _Appointment..."
 msgstr "Uusi t_apaaminen..."
 
-#: ../calendar/gui/e-calendar-view.c:1525
+#: ../calendar/gui/e-calendar-view.c:1521
 msgid "New All Day _Event"
 msgstr "Uusi koko pä_ivän tapahtuma"
 
-#: ../calendar/gui/e-calendar-view.c:1526
-msgid "New _Meeting"
-msgstr "Uusi _kokous"
-
-#: ../calendar/gui/e-calendar-view.c:1527
-msgid "New _Task"
-msgstr "Uusi _tehtävä"
+#: ../calendar/gui/e-calendar-view.c:1523
+msgid "New Task"
+msgstr "Uusi tehtävä"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1537
-#: ../widgets/menus/gal-view-menus.c:291
-msgid "_Current View"
-msgstr "_Nykyinen näkymä"
+#: ../calendar/gui/e-calendar-view.c:1533
+msgid "Current View"
+msgstr "Nykyinen näkymä"
 
-#: ../calendar/gui/e-calendar-view.c:1539
-msgid "Select T_oday"
+#: ../calendar/gui/e-calendar-view.c:1535 ../ui/evolution-calendar.xml.h:26
+msgid "Select _Today"
 msgstr "Valitse _tämä päivä"
 
-#: ../calendar/gui/e-calendar-view.c:1540
+#: ../calendar/gui/e-calendar-view.c:1536
 msgid "_Select Date..."
 msgstr "_Valitse päiväys..."
 
 #. TODO: Why is this in a context menu when it applies globally?
-#: ../calendar/gui/e-calendar-view.c:1545 ../ui/evolution-calendar.xml.h:45
+#: ../calendar/gui/e-calendar-view.c:1541 ../ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Julkaise vapaa/varattu-tietoja"
 
-#: ../calendar/gui/e-calendar-view.c:1561
+#: ../calendar/gui/e-calendar-view.c:1557
 msgid "Cop_y to Calendar..."
 msgstr "_Kopioi kalenteriin..."
 
-#: ../calendar/gui/e-calendar-view.c:1562
+#: ../calendar/gui/e-calendar-view.c:1558
 msgid "Mo_ve to Calendar..."
 msgstr "_Siirrä kalenteriin..."
 
-#: ../calendar/gui/e-calendar-view.c:1563
+#: ../calendar/gui/e-calendar-view.c:1559
 msgid "_Delegate Meeting..."
 msgstr "_Delegoi kokous..."
 
-#: ../calendar/gui/e-calendar-view.c:1564
+#: ../calendar/gui/e-calendar-view.c:1560
 msgid "_Schedule Meeting..."
 msgstr "_Järjestä kokous..."
 
-#: ../calendar/gui/e-calendar-view.c:1565
+#: ../calendar/gui/e-calendar-view.c:1561
 msgid "_Forward as iCalendar..."
 msgstr "_Välitä iCalendar-muodossa..."
 
-#: ../calendar/gui/e-calendar-view.c:1570
+#: ../calendar/gui/e-calendar-view.c:1566
 msgid "Make this Occurrence _Movable"
 msgstr "Muuta tämä kerta _siirrettäväksi"
 
-#: ../calendar/gui/e-calendar-view.c:1571
+#: ../calendar/gui/e-calendar-view.c:1567
 msgid "Delete this _Occurrence"
 msgstr "Poista tämä _tapahtumakerta"
 
-#: ../calendar/gui/e-calendar-view.c:1572
+#: ../calendar/gui/e-calendar-view.c:1568
 msgid "Delete _All Occurrences"
 msgstr "Poista _kaikki tapahtumakerrat"
 
@@ -7153,94 +6925,94 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:760
+#: ../calendar/gui/e-itip-control.c:763
 msgid "Yes. (Complex Recurrence)"
 msgstr "Kyllä (monimutkainen toistuvuus)"
 
-#: ../calendar/gui/e-itip-control.c:771
+#: ../calendar/gui/e-itip-control.c:774
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Joka päivä"
 msgstr[1] "Joka %d:s päivä"
 
-#: ../calendar/gui/e-itip-control.c:776
+#: ../calendar/gui/e-itip-control.c:779
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Joka kerta"
 msgstr[1] "Joka %d:s kerta"
 
-#: ../calendar/gui/e-itip-control.c:778
+#: ../calendar/gui/e-itip-control.c:781
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Joka viikko "
 msgstr[1] "Joka %d:s viikko "
 
-#: ../calendar/gui/e-itip-control.c:786
+#: ../calendar/gui/e-itip-control.c:789
 msgid " and "
 msgstr " ja "
 
-#: ../calendar/gui/e-itip-control.c:793
+#: ../calendar/gui/e-itip-control.c:796
 #, c-format
 msgid "The %s day of "
 msgstr "%s:s päivä"
 
-#: ../calendar/gui/e-itip-control.c:806
+#: ../calendar/gui/e-itip-control.c:809
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s"
 
-#: ../calendar/gui/e-itip-control.c:813
+#: ../calendar/gui/e-itip-control.c:816
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "kerran kuussa"
 msgstr[1] "kerran %d:s kuu"
 
-#: ../calendar/gui/e-itip-control.c:817
+#: ../calendar/gui/e-itip-control.c:820
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Joka vuosi"
 msgstr[1] "Joka %d:s vuosi"
 
-#: ../calendar/gui/e-itip-control.c:828
+#: ../calendar/gui/e-itip-control.c:831
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " %d kerran"
 msgstr[1] " %d kertaa"
 
-#: ../calendar/gui/e-itip-control.c:837
+#: ../calendar/gui/e-itip-control.c:840
 msgid ", ending on "
 msgstr ", päättyen"
 
-#: ../calendar/gui/e-itip-control.c:861
+#: ../calendar/gui/e-itip-control.c:864
 msgid "Starts"
 msgstr "Alkaa"
 
-#: ../calendar/gui/e-itip-control.c:874
+#: ../calendar/gui/e-itip-control.c:877
 msgid "Ends"
 msgstr "Päättyy"
 
-#: ../calendar/gui/e-itip-control.c:908
+#: ../calendar/gui/e-itip-control.c:911
 #: ../plugins/save-calendar/csv-format.c:395
 msgid "Due"
 msgstr "Erääntyy "
 
-#: ../calendar/gui/e-itip-control.c:948 ../calendar/gui/e-itip-control.c:1005
+#: ../calendar/gui/e-itip-control.c:951 ../calendar/gui/e-itip-control.c:1008
 msgid "iCalendar Information"
 msgstr "iCalendarin tiedot"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:965
+#: ../calendar/gui/e-itip-control.c:968
 msgid "iCalendar Error"
 msgstr "iCalendarin virhe"
 
-#: ../calendar/gui/e-itip-control.c:1037 ../calendar/gui/e-itip-control.c:1053
-#: ../calendar/gui/e-itip-control.c:1064 ../calendar/gui/e-itip-control.c:1081
+#: ../calendar/gui/e-itip-control.c:1040 ../calendar/gui/e-itip-control.c:1056
+#: ../calendar/gui/e-itip-control.c:1067 ../calendar/gui/e-itip-control.c:1084
 #: ../plugins/itip-formatter/itip-view.c:338
 #: ../plugins/itip-formatter/itip-view.c:339
 #: ../plugins/itip-formatter/itip-view.c:406
@@ -7249,299 +7021,299 @@ msgid "An unknown person"
 msgstr "Tuntematon henkilö"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1088
+#: ../calendar/gui/e-itip-control.c:1091
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Tarkista seuraavat tiedot ja valitse toimenpide allaolevasta valikosta"
 
-#: ../calendar/gui/e-itip-control.c:1136
+#: ../calendar/gui/e-itip-control.c:1139
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:546
+#: ../calendar/gui/itip-utils.c:548
 #: ../plugins/itip-formatter/itip-formatter.c:1640
 msgid "Accepted"
 msgstr "Hyväksytty"
 
-#: ../calendar/gui/e-itip-control.c:1140 ../calendar/gui/itip-utils.c:549
+#: ../calendar/gui/e-itip-control.c:1143 ../calendar/gui/itip-utils.c:551
 #: ../plugins/itip-formatter/itip-formatter.c:1643
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyväksytty"
 
-#: ../calendar/gui/e-itip-control.c:1144
+#: ../calendar/gui/e-itip-control.c:1147
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/itip-utils.c:552 ../calendar/gui/itip-utils.c:581
+#: ../calendar/gui/itip-utils.c:554 ../calendar/gui/itip-utils.c:583
 #: ../plugins/itip-formatter/itip-formatter.c:1646
 msgid "Declined"
 msgstr "Hylätty"
 
-#: ../calendar/gui/e-itip-control.c:1228
+#: ../calendar/gui/e-itip-control.c:1231
 msgid ""
 "The meeting has been cancelled, however it could not be found in your "
 "calendars"
 msgstr "Kokous on peruttu, mutta sitä ei voitu löytää kalentereistasi"
 
-#: ../calendar/gui/e-itip-control.c:1230
+#: ../calendar/gui/e-itip-control.c:1233
 msgid ""
 "The task has been cancelled, however it could not be found in your task lists"
 msgstr "Tehtävä on peruttu, mutta sitä ei voitu löytää tehtävälistoiltasi"
 
-#: ../calendar/gui/e-itip-control.c:1309
+#: ../calendar/gui/e-itip-control.c:1312
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> on julkaissut tapaamistietonsa."
 
-#: ../calendar/gui/e-itip-control.c:1310
+#: ../calendar/gui/e-itip-control.c:1313
 msgid "Meeting Information"
 msgstr "Kokouksen tiedot"
 
-#: ../calendar/gui/e-itip-control.c:1316
+#: ../calendar/gui/e-itip-control.c:1319
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> pyytää %s läsnäoloa tapaamisessa."
 
-#: ../calendar/gui/e-itip-control.c:1318
+#: ../calendar/gui/e-itip-control.c:1321
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> pyytää läsnäoloasi kokouksessa."
 
-#: ../calendar/gui/e-itip-control.c:1319
+#: ../calendar/gui/e-itip-control.c:1322
 msgid "Meeting Proposal"
 msgstr "Kokousehdotus"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1325
+#: ../calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> toivoo pääsyä olemassaolevaan kokoukseen."
 
-#: ../calendar/gui/e-itip-control.c:1326
+#: ../calendar/gui/e-itip-control.c:1329
 msgid "Meeting Update"
 msgstr "Kokouksen päivitys"
 
-#: ../calendar/gui/e-itip-control.c:1330
+#: ../calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> toivoo saavansa viimeisimmät tapaamistiedot."
 
-#: ../calendar/gui/e-itip-control.c:1331
+#: ../calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update Request"
 msgstr "Kokouksen päivtyspyyntö"
 
-#: ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-itip-control.c:1341
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> on vastannut tapaamispyyntöön."
 
-#: ../calendar/gui/e-itip-control.c:1339
+#: ../calendar/gui/e-itip-control.c:1342
 msgid "Meeting Reply"
 msgstr "Kokouspyynnön vastaus"
 
-#: ../calendar/gui/e-itip-control.c:1346
+#: ../calendar/gui/e-itip-control.c:1349
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> on peruuttanut tapaamisen."
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1350
 msgid "Meeting Cancellation"
 msgstr "Kokouksen peruminen"
 
-#: ../calendar/gui/e-itip-control.c:1357 ../calendar/gui/e-itip-control.c:1434
-#: ../calendar/gui/e-itip-control.c:1474
+#: ../calendar/gui/e-itip-control.c:1360 ../calendar/gui/e-itip-control.c:1437
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> lähetti järjettömän viestin."
 
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1361
 msgid "Bad Meeting Message"
 msgstr "Huono tapaaminen-sanoma"
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1388
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> on julkaissut tehtävätietonsa."
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1389
 msgid "Task Information"
 msgstr "Tehtävän tiedot"
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1396
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> pyytää %s tekemään työtehtävän."
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1398
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> pyytää sinua suorittamaan tehtävän."
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1399
 msgid "Task Proposal"
 msgstr "Tehtäväehdotus"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1402
+#: ../calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> toivoo lisäystään olemassaolevaan tehtävään"
 
-#: ../calendar/gui/e-itip-control.c:1403
+#: ../calendar/gui/e-itip-control.c:1406
 msgid "Task Update"
 msgstr "Tehtävän päivitys"
 
-#: ../calendar/gui/e-itip-control.c:1407
+#: ../calendar/gui/e-itip-control.c:1410
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> toivoo saavansa viimeisimmät työtehtävätiedot."
 
-#: ../calendar/gui/e-itip-control.c:1408
+#: ../calendar/gui/e-itip-control.c:1411
 msgid "Task Update Request"
 msgstr "Tehtävän päivityspyyntö"
 
-#: ../calendar/gui/e-itip-control.c:1415
+#: ../calendar/gui/e-itip-control.c:1418
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> on vastannut työtehtävän antoon."
 
-#: ../calendar/gui/e-itip-control.c:1416
+#: ../calendar/gui/e-itip-control.c:1419
 msgid "Task Reply"
 msgstr "Vastaus tehtävään"
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1426
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> perui tehtävän."
 
-#: ../calendar/gui/e-itip-control.c:1424
+#: ../calendar/gui/e-itip-control.c:1427
 msgid "Task Cancellation"
 msgstr "Tehtävän peruminen"
 
-#: ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1438
 msgid "Bad Task Message"
 msgstr "Huono tehtävä-sanoma"
 
-#: ../calendar/gui/e-itip-control.c:1459
+#: ../calendar/gui/e-itip-control.c:1462
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> on julkaissut vapaa/varattu-tietonsa."
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Free/Busy Information"
 msgstr "Vapaa/varattu-tiedot"
 
-#: ../calendar/gui/e-itip-control.c:1464
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> pyytää sinun vapaa/varattu -tietoja."
 
-#: ../calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Free/Busy Request"
 msgstr "Vapaa/varattu-tiedustulu"
 
-#: ../calendar/gui/e-itip-control.c:1469
+#: ../calendar/gui/e-itip-control.c:1472
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> on vastannut vapaa/varattu -kyselyyn."
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1473
 msgid "Free/Busy Reply"
 msgstr "Vapaa/varattu-vastaus"
 
-#: ../calendar/gui/e-itip-control.c:1475
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Bad Free/Busy Message"
 msgstr "Huono vapaa/kiireinen -viesti"
 
-#: ../calendar/gui/e-itip-control.c:1550
+#: ../calendar/gui/e-itip-control.c:1553
 msgid "The message does not appear to be properly formed"
 msgstr "Viesti ei näytä olevan kunnolla muotoiltu."
 
-#: ../calendar/gui/e-itip-control.c:1609
+#: ../calendar/gui/e-itip-control.c:1612
 msgid "The message contains only unsupported requests."
 msgstr "Viesti sisältää vain pyyntöjä, jotka eivät ole tuettu."
 
-#: ../calendar/gui/e-itip-control.c:1642
+#: ../calendar/gui/e-itip-control.c:1645
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Liite ei sisällä kelvollista kalenteriviestiä"
 
-#: ../calendar/gui/e-itip-control.c:1674
+#: ../calendar/gui/e-itip-control.c:1677
 msgid "The attachment has no viewable calendar items"
 msgstr "Liitteessä ei ole näytettäviä kalenteriviestejä"
 
-#: ../calendar/gui/e-itip-control.c:1908
+#: ../calendar/gui/e-itip-control.c:1911
 msgid "Update complete\n"
 msgstr "Päivitys valmis\n"
 
-#: ../calendar/gui/e-itip-control.c:1936
+#: ../calendar/gui/e-itip-control.c:1939
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Kohde on virheellinen eikä sitä voida päivittää\n"
 
-#: ../calendar/gui/e-itip-control.c:1946
+#: ../calendar/gui/e-itip-control.c:1949
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Vastaus ei ole tämänhetkiseltä läsnäolijalta. Lisää läsnäolijaksi?"
 
-#: ../calendar/gui/e-itip-control.c:1958
+#: ../calendar/gui/e-itip-control.c:1961
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Läsnäolon tilaa ei voitu päivittää virheellisen tilan takia\n"
 
-#: ../calendar/gui/e-itip-control.c:1975
+#: ../calendar/gui/e-itip-control.c:1978
 msgid "Attendee status updated\n"
 msgstr "Läsnäolon tila päivitetty\n"
 
-#: ../calendar/gui/e-itip-control.c:1978
+#: ../calendar/gui/e-itip-control.c:1981
 #: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Läsnäolon tilaa ei voida päivittää, koska kohdetta ei enää ole olemassa"
 
-#: ../calendar/gui/e-itip-control.c:2008
+#: ../calendar/gui/e-itip-control.c:2011
 msgid "Removal Complete"
 msgstr "Poisto valmis"
 
-#: ../calendar/gui/e-itip-control.c:2031 ../calendar/gui/e-itip-control.c:2079
+#: ../calendar/gui/e-itip-control.c:2034 ../calendar/gui/e-itip-control.c:2082
 msgid "Item sent!\n"
 msgstr "Lähetetty\n"
 
-#: ../calendar/gui/e-itip-control.c:2033 ../calendar/gui/e-itip-control.c:2083
+#: ../calendar/gui/e-itip-control.c:2036 ../calendar/gui/e-itip-control.c:2086
 msgid "The item could not be sent!\n"
 msgstr "Kohdetta ei voitu lähettää!\n"
 
-#: ../calendar/gui/e-itip-control.c:2163
+#: ../calendar/gui/e-itip-control.c:2166
 msgid "Choose an action:"
 msgstr "Valitse toiminto:"
 
-#: ../calendar/gui/e-itip-control.c:2234
+#: ../calendar/gui/e-itip-control.c:2237
 msgid "Update"
 msgstr "Päivitä"
 
-#: ../calendar/gui/e-itip-control.c:2262
+#: ../calendar/gui/e-itip-control.c:2265
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Hyväksy"
 
-#: ../calendar/gui/e-itip-control.c:2263
+#: ../calendar/gui/e-itip-control.c:2266
 msgid "Tentatively accept"
 msgstr "Hyväksy alustavasti"
 
-#: ../calendar/gui/e-itip-control.c:2264
+#: ../calendar/gui/e-itip-control.c:2267
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Hylkää"
 
-#: ../calendar/gui/e-itip-control.c:2293
+#: ../calendar/gui/e-itip-control.c:2296
 msgid "Send Free/Busy Information"
 msgstr "Lähetä vapaa/varattu-tiedot"
 
-#: ../calendar/gui/e-itip-control.c:2321
+#: ../calendar/gui/e-itip-control.c:2324
 msgid "Update respondent status"
 msgstr "Päivitä vastaajan tila"
 
-#: ../calendar/gui/e-itip-control.c:2349
+#: ../calendar/gui/e-itip-control.c:2352
 msgid "Send Latest Information"
 msgstr "Lähetä viimeisimmät tiedot"
 
-#: ../calendar/gui/e-itip-control.c:2377 ../calendar/gui/itip-utils.c:569
+#: ../calendar/gui/e-itip-control.c:2380 ../calendar/gui/itip-utils.c:571
 #: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
@@ -7653,22 +7425,17 @@ msgstr "Vaatii toimenpiteitä"
 
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Tentative"
 msgstr "Alustava"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
 #: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/itip-utils.c:555
+#: ../calendar/gui/itip-utils.c:557
 #: ../plugins/itip-formatter/itip-formatter.c:1649
 msgid "Delegated"
 msgstr "Valtuutettu"
 
-#. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:361
-msgid "Attendee                          "
-msgstr "Osallistuja                       "
-
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
 msgid "In Process"
 msgstr "Työn alla"
@@ -7676,7 +7443,7 @@ msgstr "Työn alla"
 #. 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:444
-#: ../calendar/gui/e-meeting-time-sel.c:2105
+#: ../calendar/gui/e-meeting-time-sel.c:2102
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7687,7 +7454,7 @@ msgstr "%A, %B %d, %Y"
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
 #: ../calendar/gui/e-meeting-time-sel-item.c:448
-#: ../calendar/gui/e-meeting-time-sel.c:2138 ../e-util/e-time-utils.c:203
+#: ../calendar/gui/e-meeting-time-sel.c:2135 ../e-util/e-time-utils.c:203
 #: ../e-util/e-time-utils.c:296 ../e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
@@ -7699,92 +7466,68 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format for a short date. %m = month,
 #. %d = day of month, %Y = year (all digits).
 #: ../calendar/gui/e-meeting-time-sel-item.c:452 ../e-util/e-time-utils.c:238
-#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1684
+#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1682
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:416 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Poissa konttorilta"
 
-#: ../calendar/gui/e-meeting-time-sel.c:417
+#: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "No Information"
 msgstr "Ei tietoa"
 
-#: ../calendar/gui/e-meeting-time-sel.c:431
-msgid "Con_tacts..."
-msgstr "_Yhteystiedot"
-
-#: ../calendar/gui/e-meeting-time-sel.c:448
+#: ../calendar/gui/e-meeting-time-sel.c:445
 msgid "O_ptions"
 msgstr "_Asetukset"
 
-#: ../calendar/gui/e-meeting-time-sel.c:465
+#: ../calendar/gui/e-meeting-time-sel.c:462
 msgid "Show _only working hours"
 msgstr "Näytä vain _työtunnit"
 
-#: ../calendar/gui/e-meeting-time-sel.c:475
+#: ../calendar/gui/e-meeting-time-sel.c:472
 msgid "Show _zoomed out"
 msgstr "Näytä _etäänpää"
 
-#: ../calendar/gui/e-meeting-time-sel.c:490
+#: ../calendar/gui/e-meeting-time-sel.c:487
 msgid "_Update free/busy"
 msgstr "_Päivitä vapaa/varattu"
 
-#: ../calendar/gui/e-meeting-time-sel.c:505
+#: ../calendar/gui/e-meeting-time-sel.c:502
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:523
+#: ../calendar/gui/e-meeting-time-sel.c:520
 msgid "_Autopick"
 msgstr "_Automaattinen valinta"
 
-#: ../calendar/gui/e-meeting-time-sel.c:538
+#: ../calendar/gui/e-meeting-time-sel.c:535
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:555
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "_All people and resources"
 msgstr "_Kaikki henkilöt ja resurssit"
 
-#: ../calendar/gui/e-meeting-time-sel.c:564
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "All _people and one resource"
 msgstr "Kaikki _henkilöt ja yksi resurssi"
 
-#: ../calendar/gui/e-meeting-time-sel.c:573
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "_Required people"
 msgstr "_Vaaditut henkilöt"
 
-#: ../calendar/gui/e-meeting-time-sel.c:582
+#: ../calendar/gui/e-meeting-time-sel.c:579
 msgid "Required people and _one resource"
 msgstr "Vaaditut henkilöt ja _yksi resurssi"
 
-#: ../calendar/gui/e-meeting-time-sel.c:618
-msgid "_Start time:"
-msgstr "_Alkamisaika:"
-
-#: ../calendar/gui/e-meeting-time-sel.c:645
-msgid "_End time:"
-msgstr "_Loppumisaika:"
-
-#: ../calendar/gui/e-memo-table.c:267
-msgid "Memo Table"
-msgstr "Muistilapputaulu"
-
-#: ../calendar/gui/e-memo-table.c:863
-msgid "_Delete Selected Memos"
-msgstr "_Poista valitut muistilaput"
-
-#: ../calendar/gui/e-memo-table.c:986 ../calendar/gui/e-memo-table.etspec.h:2
-msgid "Click to add a memo"
-msgstr "Lisää muistilappu näpäyttämällä tästä"
-
-#: ../calendar/gui/e-memo-table.etspec.h:3
-msgid "Memo sort"
-msgstr "Muistilappujen järjestys"
+#: ../calendar/gui/e-pub-utils.c:321
+#, c-format
+msgid "Enter the password for %s"
+msgstr "Syötä salasana %s:lle"
 
-#: ../calendar/gui/e-memos.c:727 ../calendar/gui/e-tasks.c:822
-#: ../calendar/gui/gnome-cal.c:2556
+#: ../calendar/gui/e-tasks.c:820 ../calendar/gui/gnome-cal.c:2554
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7793,38 +7536,24 @@ msgstr ""
 "Virhe %s:ssä:\n"
 "%s"
 
-#: ../calendar/gui/e-memos.c:775
-msgid "Loading memos"
-msgstr "Ladataan muistilappuja"
-
-#: ../calendar/gui/e-memos.c:860
-#, c-format
-msgid "Opening memos at %s"
-msgstr "Avataan muistilappuja sijainnista %s"
-
-#: ../calendar/gui/e-memos.c:1033 ../calendar/gui/e-tasks.c:1225
-msgid "Deleting selected objects..."
-msgstr "Valtuutetaan seuraavat tehtävät...."
-
-#: ../calendar/gui/e-pub-utils.c:322
-#, c-format
-msgid "Enter the password for %s"
-msgstr "Syötä salasana %s:lle"
-
-#: ../calendar/gui/e-tasks.c:870
+#: ../calendar/gui/e-tasks.c:868
 msgid "Loading tasks"
 msgstr "Ladataan tehtäviä"
 
-#: ../calendar/gui/e-tasks.c:957
+#: ../calendar/gui/e-tasks.c:952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Avataan tehtävät %s"
 
-#: ../calendar/gui/e-tasks.c:1202
+#: ../calendar/gui/e-tasks.c:1151
 msgid "Completing tasks..."
 msgstr "Viimeistellään tehtäviä..."
 
-#: ../calendar/gui/e-tasks.c:1252
+#: ../calendar/gui/e-tasks.c:1174
+msgid "Deleting selected objects..."
+msgstr "Valtuutetaan seuraavat tehtävät...."
+
+#: ../calendar/gui/e-tasks.c:1201
 msgid "Expunging"
 msgstr "Poistetaan poistettuja"
 
@@ -7843,34 +7572,37 @@ msgstr "%d %B"
 msgid "Updating query"
 msgstr "Päivitetään kyselyä"
 
-#: ../calendar/gui/gnome-cal.c:2231
-msgid "_Custom View"
-msgstr "_Oma näkymä"
+#. bonobo displays this string so it must be in locale
+#: ../calendar/gui/gnome-cal.c:2231 ../widgets/menus/gal-view-instance.c:585
+#: ../widgets/menus/gal-view-menus.c:350
+msgid "Custom View"
+msgstr "Oma näkymä"
 
-#: ../calendar/gui/gnome-cal.c:2232
-msgid "_Save Custom View"
-msgstr "_Tallenna oma näkymä"
+#: ../calendar/gui/gnome-cal.c:2232 ../widgets/menus/gal-view-instance.c:586
+msgid "Save Custom View"
+msgstr "Tallenna oma näkymä"
 
-#: ../calendar/gui/gnome-cal.c:2237
-msgid "_Define Views..."
-msgstr "_Määrittele näkymät..."
+#: ../calendar/gui/gnome-cal.c:2237 ../widgets/menus/gal-view-instance.c:590
+#: ../widgets/menus/gal-view-menus.c:372
+msgid "Define Views..."
+msgstr "Määrittele näkymät..."
 
-#: ../calendar/gui/gnome-cal.c:2399
+#: ../calendar/gui/gnome-cal.c:2400
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Ladataan tapaamisia %s"
 
-#: ../calendar/gui/gnome-cal.c:2418
+#: ../calendar/gui/gnome-cal.c:2419
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Ladataan tehtäviä %s"
 
-#: ../calendar/gui/gnome-cal.c:2522
+#: ../calendar/gui/gnome-cal.c:2520
 #, c-format
 msgid "Opening %s"
 msgstr "Avataan %s"
 
-#: ../calendar/gui/gnome-cal.c:3440
+#: ../calendar/gui/gnome-cal.c:3437
 msgid "Purging"
 msgstr "Tyhjennetään"
 
@@ -7930,139 +7662,60 @@ msgstr "Syyskuu"
 msgid "_Select Today"
 msgstr "_Valitse tämä päivä"
 
-#: ../calendar/gui/itip-utils.c:351 ../calendar/gui/itip-utils.c:400
-#: ../calendar/gui/itip-utils.c:440
+#: ../calendar/gui/itip-utils.c:353 ../calendar/gui/itip-utils.c:402
+#: ../calendar/gui/itip-utils.c:442
 msgid "An organizer must be set."
 msgstr "Järjestäjä tulee asettaa."
 
-#: ../calendar/gui/itip-utils.c:387
+#: ../calendar/gui/itip-utils.c:389
 msgid "At least one attendee is necessary"
 msgstr "Vähintään yksi läsnäoliko on välttämätön."
 
-#: ../calendar/gui/itip-utils.c:508 ../calendar/gui/itip-utils.c:630
+#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:632
 msgid "Event information"
 msgstr "Tapahtuman tiedot"
 
-#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:632
+#: ../calendar/gui/itip-utils.c:512 ../calendar/gui/itip-utils.c:634
 msgid "Task information"
 msgstr "Tehtävän tiedot"
 
-#: ../calendar/gui/itip-utils.c:512 ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:514 ../calendar/gui/itip-utils.c:636
 msgid "Journal information"
 msgstr "Päiväkirjan tiedot"
 
-#: ../calendar/gui/itip-utils.c:514 ../calendar/gui/itip-utils.c:652
+#: ../calendar/gui/itip-utils.c:516 ../calendar/gui/itip-utils.c:654
 msgid "Free/Busy information"
 msgstr "Vapaa/varattu-tiedot"
 
-#: ../calendar/gui/itip-utils.c:516
+#: ../calendar/gui/itip-utils.c:518
 msgid "Calendar information"
 msgstr "Kalenteritiedot"
 
-#: ../calendar/gui/itip-utils.c:565
+#: ../calendar/gui/itip-utils.c:567
 msgid "Updated"
 msgstr "Päivitetty"
 
-#: ../calendar/gui/itip-utils.c:573
+#: ../calendar/gui/itip-utils.c:575
 msgid "Refresh"
 msgstr "Virkistä"
 
-#: ../calendar/gui/itip-utils.c:577
+#: ../calendar/gui/itip-utils.c:579
 msgid "Counter-proposal"
 msgstr "Vastaehdotus"
 
-#: ../calendar/gui/itip-utils.c:648
+#: ../calendar/gui/itip-utils.c:650
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Vapaa/varattu-tiedot (%s - %s)"
 
-#: ../calendar/gui/itip-utils.c:658
+#: ../calendar/gui/itip-utils.c:660
 msgid "iCalendar information"
 msgstr "iCalendarin tiedot"
 
-#: ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:815
 msgid "You must be an attendee of the event."
 msgstr "Sinun täytyy osallistua tapahtumaan."
 
-#: ../calendar/gui/memos-component.c:449 ../ui/evolution-addressbook.xml.h:3
-#: ../ui/evolution-mail-message.xml.h:12 ../ui/evolution-memos.xml.h:2
-#: ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Kopioi"
-
-#: ../calendar/gui/memos-component.c:450 ../mail/em-filter-i18n.h:11
-#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:26 ../ui/evolution-memos.xml.h:6
-#: ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Poista"
-
-#: ../calendar/gui/memos-component.c:451
-msgid "Properties..."
-msgstr "Ominaisuudet..."
-
-#: ../calendar/gui/memos-component.c:524
-#, c-format
-msgid "%d memo"
-msgid_plural "%d memos"
-msgstr[0] "%d muistilappu"
-msgstr[1] "%d muistilappua"
-
-#: ../calendar/gui/memos-component.c:526 ../calendar/gui/tasks-component.c:517
-#: ../mail/mail-component.c:548
-#, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] ", %d valittu"
-msgstr[1] ", %d valittua"
-
-#: ../calendar/gui/memos-component.c:573
-msgid "Failed upgrading memos."
-msgstr "Muistilappujen päivitys epäonnistui."
-
-#: ../calendar/gui/memos-component.c:869
-#, c-format
-msgid "Unable to open the memo list '%s' for creating events and meetings"
-msgstr ""
-"Muistilappulistaa '%s' ei voitu avata uusien tapahtumien ja kokousten "
-"lisäämistä varten"
-
-#: ../calendar/gui/memos-component.c:882
-msgid "There is no calendar available for creating memos"
-msgstr "Muistilappujen luomiseen tarvittavaa kalenteria ei ole saatavilla"
-
-#: ../calendar/gui/memos-component.c:973
-msgid "Memo Source Selector"
-msgstr "Muistilappujen lähteen valinta"
-
-#: ../calendar/gui/memos-component.c:1156
-msgid "New memo"
-msgstr "Uusi muistilappu"
-
-#: ../calendar/gui/memos-component.c:1157
-msgid "_Memo"
-msgstr "_Muistilappu"
-
-#: ../calendar/gui/memos-component.c:1158
-msgid "Create a new memo"
-msgstr "Luo uusi muistilappu"
-
-#: ../calendar/gui/memos-component.c:1164
-msgid "New memo list"
-msgstr "Uusi muistilappulista"
-
-#: ../calendar/gui/memos-component.c:1165
-msgid "Memo l_ist"
-msgstr "Muistilappul_ista"
-
-#: ../calendar/gui/memos-component.c:1166
-msgid "Create a new memo list"
-msgstr "Luo uusi muistilappulista"
-
-#: ../calendar/gui/memos-control.c:334
-msgid "Print Memos"
-msgstr "Tulosta muistilaput"
-
 #: ../calendar/gui/migration.c:151
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
@@ -8290,65 +7943,57 @@ msgstr "Valittu kuukausi (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Valittu vuosi (%Y)"
 
-#: ../calendar/gui/print.c:2307
-msgid "Appointment"
-msgstr "Tapaaminen"
-
-#: ../calendar/gui/print.c:2309
-msgid "Task"
-msgstr "Tehtävä"
-
-#: ../calendar/gui/print.c:2331
+#: ../calendar/gui/print.c:2329
 #, c-format
 msgid "Summary: %s"
 msgstr "Yhteenveto: %s"
 
-#: ../calendar/gui/print.c:2339
+#: ../calendar/gui/print.c:2337
 #, c-format
 msgid "Location: %s"
 msgstr "Sijainti: %s"
 
-#: ../calendar/gui/print.c:2382
+#: ../calendar/gui/print.c:2380
 #, c-format
 msgid "Status: %s"
 msgstr "Tila: %s"
 
-#: ../calendar/gui/print.c:2399
+#: ../calendar/gui/print.c:2397
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioriteetti: %s"
 
-#: ../calendar/gui/print.c:2411
+#: ../calendar/gui/print.c:2409
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Valmis (%%): %i"
 
-#: ../calendar/gui/print.c:2423
+#: ../calendar/gui/print.c:2421
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2437
+#: ../calendar/gui/print.c:2435
 #, c-format
 msgid "Categories: %s"
 msgstr "Ryhmät: %s"
 
-#: ../calendar/gui/print.c:2448
+#: ../calendar/gui/print.c:2446
 msgid "Contacts: "
 msgstr "Yhteystiedot: "
 
-#: ../calendar/gui/print.c:2588 ../calendar/gui/print.c:2676
-#: ../calendar/gui/print.c:2802 ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2586 ../calendar/gui/print.c:2674
+#: ../calendar/gui/print.c:2800 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Tulostuksen esikatselu"
 
-#: ../calendar/gui/print.c:2623
+#: ../calendar/gui/print.c:2621
 msgid "Print Item"
 msgstr "Tulosta kohta"
 
 #: ../calendar/gui/tasks-component.c:439
-msgid "_New Task List"
-msgstr "_Uusi tehtävälista"
+msgid "New Task List"
+msgstr "Uusi tehtävälista"
 
 #: ../calendar/gui/tasks-component.c:515
 #, c-format
@@ -8357,58 +8002,69 @@ msgid_plural "%d tasks"
 msgstr[0] "%d tehtävä"
 msgstr[1] "%d tehtävää"
 
+#: ../calendar/gui/tasks-component.c:517 ../mail/mail-component.c:548
+#, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] ", %d valittu"
+msgstr[1] ", %d valittua"
+
 #: ../calendar/gui/tasks-component.c:564
 msgid "Failed upgrading tasks."
 msgstr "Tehtävälistan päivitys epäonnistui."
 
-#: ../calendar/gui/tasks-component.c:875
+#: ../calendar/gui/tasks-component.c:872
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Tehtävälistaa '%s' ei voitu avata uusien tehtävien ja tapaamisten tekemistä "
 "varten"
 
-#: ../calendar/gui/tasks-component.c:888
+#: ../calendar/gui/tasks-component.c:887
 msgid "There is no calendar available for creating tasks"
 msgstr "Tehtävien luomiseen tarvittavaa kalenteria ei ole saatavilla"
 
-#: ../calendar/gui/tasks-component.c:988
+#: ../calendar/gui/tasks-component.c:987
 msgid "Task Source Selector"
 msgstr "Tehtävien lähteen valinta"
 
-#: ../calendar/gui/tasks-component.c:1171
+#: ../calendar/gui/tasks-component.c:1170
 msgid "New task"
 msgstr "Uusi tehtävä"
 
-#: ../calendar/gui/tasks-component.c:1173
+#: ../calendar/gui/tasks-component.c:1171
+msgid "_Task"
+msgstr "_Tehtävä"
+
+#: ../calendar/gui/tasks-component.c:1172
 msgid "Create a new task"
 msgstr "Luo uusi tehtävä"
 
-#: ../calendar/gui/tasks-component.c:1179
+#: ../calendar/gui/tasks-component.c:1178
 msgid "New assigned task"
 msgstr "Uusi tehtäväksianto"
 
-#: ../calendar/gui/tasks-component.c:1180
+#: ../calendar/gui/tasks-component.c:1179
 msgid "Assigne_d Task"
 msgstr "Tehtäväksi_anto"
 
-#: ../calendar/gui/tasks-component.c:1181
+#: ../calendar/gui/tasks-component.c:1180
 msgid "Create a new assigned task"
 msgstr "Luo uusi tehtäväksianto"
 
-#: ../calendar/gui/tasks-component.c:1187
+#: ../calendar/gui/tasks-component.c:1186
 msgid "New task list"
 msgstr "Uusi tehtävälista"
 
-#: ../calendar/gui/tasks-component.c:1188
+#: ../calendar/gui/tasks-component.c:1187
 msgid "Task l_ist"
 msgstr "_Tehtävälista"
 
-#: ../calendar/gui/tasks-component.c:1189
+#: ../calendar/gui/tasks-component.c:1188
 msgid "Create a new task list"
 msgstr "Luo uusi tehtävälista"
 
-#: ../calendar/gui/tasks-control.c:429
+#: ../calendar/gui/tasks-control.c:419
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8420,11 +8076,11 @@ msgstr ""
 "\n"
 "Valmis poistaa nämä tehtävät?"
 
-#: ../calendar/gui/tasks-control.c:432
+#: ../calendar/gui/tasks-control.c:422
 msgid "Do not ask me again."
 msgstr "Älä kysy enää uudestaan"
 
-#: ../calendar/gui/tasks-control.c:466
+#: ../calendar/gui/tasks-control.c:456
 msgid "Print Tasks"
 msgstr "Tulosta tehtävät"
 
@@ -10084,14 +9740,14 @@ msgstr "_Postita:"
 msgid "A_ttach"
 msgstr "Lii_tä"
 
-#: ../composer/e-msg-composer.c:832
+#: ../composer/e-msg-composer.c:738
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Lähtevää viestiä ei voida allekirjoittaa: allekirjoitusvarmennetta ei ole "
 "asetettu tälle tilille"
 
-#: ../composer/e-msg-composer.c:839
+#: ../composer/e-msg-composer.c:745
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10099,47 +9755,47 @@ msgstr ""
 "Lähtevää viestiä ei voida salata: Salausvarmennetta ei ole asetettu tälle "
 "tilille"
 
-#: ../composer/e-msg-composer.c:1322 ../composer/e-msg-composer.c:1356
+#: ../composer/e-msg-composer.c:1224 ../composer/e-msg-composer.c:1257
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Tuntematon syy"
 
-#: ../composer/e-msg-composer.c:1394
+#: ../composer/e-msg-composer.c:1294
 msgid "Could not open file"
 msgstr "Tiedostoa ei voitu avata"
 
-#: ../composer/e-msg-composer.c:1402
+#: ../composer/e-msg-composer.c:1302
 msgid "Unable to retrieve message from editor"
 msgstr "Viestiä ei voida hakea muokkaimelta"
 
-#: ../composer/e-msg-composer.c:1677
+#: ../composer/e-msg-composer.c:1572
 msgid "Untitled Message"
 msgstr "Nimeämätön viesti"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1712
+#: ../composer/e-msg-composer.c:1606
 msgid "Open File"
 msgstr "Avaa tiedosto"
 
-#: ../composer/e-msg-composer.c:2126 ../mail/em-account-editor.c:588
+#: ../composer/e-msg-composer.c:2006 ../mail/em-account-editor.c:588
 #: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:700
 msgid "Autogenerated"
 msgstr "Automaattisesti luotu"
 
-#: ../composer/e-msg-composer.c:2229
+#: ../composer/e-msg-composer.c:2105
 msgid "Si_gnature:"
 msgstr "_Allekirjoitus:"
 
-#: ../composer/e-msg-composer.c:2472 ../composer/e-msg-composer.c:3673
-#: ../composer/e-msg-composer.c:3676
+#: ../composer/e-msg-composer.c:2347 ../composer/e-msg-composer.c:3527
+#: ../composer/e-msg-composer.c:3528
 msgid "Compose a message"
 msgstr "Kirjoita viesti"
 
-#: ../composer/e-msg-composer.c:3791
+#: ../composer/e-msg-composer.c:3643
 msgid "_Attachment Bar"
 msgstr "Liitep_alkki"
 
-#: ../composer/e-msg-composer.c:4881
+#: ../composer/e-msg-composer.c:4720
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10171,7 +9827,7 @@ msgstr ""
 "&quot;{0}&quot; johtuen sinun täytyy ehkä valita eri sähköpostin asetukset."
 
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:17
 msgid "Because &quot;{1}&quot;."
 msgstr "Syy: &quot;{1}&quot;."
 
@@ -10282,6 +9938,10 @@ msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Käyttäjätili täytyy määritellä ennen kuin sähköpostia voidaan lähettää."
 
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Discard Changes"
+msgstr "_Hylkää muutokset"
+
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Save Message"
 msgstr "_Tallenna viesti"
@@ -10410,7 +10070,7 @@ msgstr ""
 "Mitä Evolutionin tulisi tehdä, kun vastaanotat sähköpostiviestin \"luettu\"-"
 "kuittauspyynnöllä?"
 
-#: ../e-util/e-dialog-utils.c:270
+#: ../e-util/e-dialog-utils.c:267
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10418,7 +10078,7 @@ msgstr ""
 "Saman niminen tiedosto on jo olemassa.\n"
 "Kirjoitetaanko sen yli?"
 
-#: ../e-util/e-dialog-utils.c:272 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:269 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Kirjoita tiedoston yli?"
 
@@ -10463,7 +10123,7 @@ msgstr "Haluatko ylikirjoittaa?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "Tiedosto &quot;{0}&quot;on jo olemassa."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:126
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:122
 msgid "_Overwrite"
 msgstr "_Ylikirjoita"
 
@@ -10547,7 +10207,7 @@ msgstr "%H:%M:%S"
 #. without seconds.
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: ../e-util/e-time-utils.c:348 ../e-util/e-time-utils.c:435
-#: ../widgets/misc/e-dateedit.c:1440 ../widgets/misc/e-dateedit.c:1722
+#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1720
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -10556,7 +10216,7 @@ msgstr "%I:%M %p"
 #. without seconds.
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: ../e-util/e-time-utils.c:352 ../e-util/e-time-utils.c:427
-#: ../widgets/misc/e-dateedit.c:1437 ../widgets/misc/e-dateedit.c:1719
+#: ../widgets/misc/e-dateedit.c:1435 ../widgets/misc/e-dateedit.c:1717
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -10698,11 +10358,11 @@ msgid "Include threads"
 msgstr "Ota myös säikeet mukaan"
 
 #: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:330
+#: ../mail/em-utils.c:291
 msgid "Incoming"
 msgstr "Tulevat"
 
-#: ../filter/filter-rule.c:978 ../mail/em-utils.c:331
+#: ../filter/filter-rule.c:978 ../mail/em-utils.c:292
 msgid "Outgoing"
 msgstr "Lähtevät"
 
@@ -10727,7 +10387,7 @@ msgstr "Päiväys puuttuu."
 msgid "Missing file name."
 msgstr "Tiedostonimi puuttuu."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:67
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:65
 msgid "Missing name."
 msgstr "Nimi puuttuu."
 
@@ -10955,11 +10615,11 @@ msgstr "Vastaanoton asetukset"
 msgid "Checking for New Mail"
 msgstr "Uusien viestien haku"
 
-#: ../mail/em-account-editor.c:2662 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2661 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Tilimuokkain"
 
-#: ../mail/em-account-editor.c:2662 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2661 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolutionin sähköpostitilien apulainen"
 
@@ -10980,35 +10640,35 @@ msgstr "Protokolla"
 msgid "Mail Accounts Table"
 msgstr "Sähköpostitilit"
 
-#: ../mail/em-composer-prefs.c:309 ../mail/em-composer-prefs.c:435
+#: ../mail/em-composer-prefs.c:307 ../mail/em-composer-prefs.c:430
 #: ../mail/mail-config.c:958
 msgid "Unnamed"
 msgstr "Nimeämätön"
 
-#: ../mail/em-composer-prefs.c:925
+#: ../mail/em-composer-prefs.c:897
 msgid "Language(s)"
 msgstr "Kielet"
 
-#: ../mail/em-composer-prefs.c:968
+#: ../mail/em-composer-prefs.c:940
 msgid "Add signature script"
 msgstr "Lisää allekirjoitus-skripti"
 
-#: ../mail/em-composer-prefs.c:988
+#: ../mail/em-composer-prefs.c:960
 msgid "Signature(s)"
 msgstr "Allekirjoitukset"
 
-#: ../mail/em-composer-utils.c:855 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:853 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr "------- Välitetty viesti ---------"
 
-#: ../mail/em-composer-utils.c:1650
+#: ../mail/em-composer-utils.c:1648
 msgid "an unknown sender"
 msgstr "Tuntematon lähettäjä"
 
 #. 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:1697
+#: ../mail/em-composer-utils.c:1695
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11033,7 +10693,7 @@ msgstr "Aseta väri"
 msgid "Assign Score"
 msgstr "Aseta pistemäärä"
 
-#: ../mail/em-filter-i18n.h:5 ../ui/evolution-editor.xml.h:1
+#: ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "Liitteet"
 
@@ -11360,12 +11020,12 @@ msgstr "Siirretään kansiota %s"
 msgid "Copying folder %s"
 msgstr "Kopioidaan kansiota %s"
 
-#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1623
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1613
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Siirretään viestejä kansioon %s"
 
-#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1625
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1615
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopioidaan viestejä kansioon %s"
@@ -11387,39 +11047,34 @@ msgstr "_Siirrä kansioon"
 msgid "Scanning folders in \"%s\""
 msgstr "Etsitään kansioita kohteessa \"%s\""
 
-#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:44
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
+#: ../mail/em-folder-tree.c:2036 ../ui/evolution-addressbook.xml.h:44
+#: ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:48
 msgid "_View"
 msgstr "_Näytä"
 
-#: ../mail/em-folder-tree.c:2043
+#: ../mail/em-folder-tree.c:2037
 msgid "Open in _New Window"
 msgstr "Avaa _uudessa ikkunassa"
 
-#: ../mail/em-folder-tree.c:2047
+#: ../mail/em-folder-tree.c:2041
 msgid "_Copy..."
 msgstr "_Kopioi..."
 
-#: ../mail/em-folder-tree.c:2048
+#: ../mail/em-folder-tree.c:2042
 msgid "_Move..."
 msgstr "_Siirrä..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2052
+#: ../mail/em-folder-tree.c:2046
 msgid "_New Folder..."
 msgstr "_Uusi kansio..."
 
-#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:30
+#: ../mail/em-folder-tree.c:2049 ../ui/evolution-mail-list.xml.h:30
 msgid "_Rename..."
 msgstr "_Nimeä uudestaan..."
 
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:123
-msgid "_Empty Trash"
-msgstr "_Tyhjennä roskakori"
-
 #: ../mail/em-folder-utils.c:104
 #, c-format
 msgid "Copying `%s' to `%s'"
@@ -11466,7 +11121,7 @@ msgstr "Luo uusi kansio"
 msgid "Specify where to create the folder:"
 msgstr "Määrittele mihin kansio luodaan:"
 
-#: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:558 ../mail/em-popup.c:569
+#: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:546 ../mail/em-popup.c:557
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
@@ -11474,7 +11129,7 @@ msgstr "Vastaa k_aikille"
 msgid "_Reply to Sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:560 ../mail/em-popup.c:571
+#: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:548 ../mail/em-popup.c:559
 #: ../ui/evolution-mail-message.xml.h:108
 msgid "_Forward"
 msgstr "_Välitä"
@@ -11487,11 +11142,11 @@ msgstr "_Muokkaa uutena viestinä..."
 msgid "U_ndelete"
 msgstr "_Palauta"
 
-#: ../mail/em-folder-view.c:1051 ../ui/evolution-addressbook.xml.h:37
+#: ../mail/em-folder-view.c:1051 ../ui/evolution-addressbook.xml.h:36
 msgid "_Move to Folder..."
 msgstr "_Siirrä kansioon..."
 
-#: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:33
+#: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
@@ -11568,52 +11223,52 @@ msgid "Filter on _Mailing List"
 msgstr "Suodata _postituslistan mukaan"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1922 ../mail/em-folder-view.c:1966
+#: ../mail/em-folder-view.c:1921 ../mail/em-folder-view.c:1965
 msgid "Default"
 msgstr "Oletukset"
 
-#: ../mail/em-folder-view.c:2065
+#: ../mail/em-folder-view.c:2064
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
-#: ../mail/em-folder-view.c:2221
+#: ../mail/em-folder-view.c:2220
 msgid "Unable to retrieve message"
 msgstr "Viestiä ei voida hakea"
 
-#: ../mail/em-folder-view.c:2414
+#: ../mail/em-folder-view.c:2413
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: ../mail/em-folder-view.c:2416
+#: ../mail/em-folder-view.c:2415
 msgid "Create _Search Folder"
 msgstr "Luo uusi hakunäkymä"
 
-#: ../mail/em-folder-view.c:2417
+#: ../mail/em-folder-view.c:2416
 msgid "_From this Address"
 msgstr "_Tästä osoitteesta"
 
-#: ../mail/em-folder-view.c:2418
+#: ../mail/em-folder-view.c:2417
 msgid "_To this Address"
 msgstr "_Osoitteeseen:"
 
-#: ../mail/em-folder-view.c:2699
+#: ../mail/em-folder-view.c:2698
 #, c-format
 msgid "Click to mail %s"
 msgstr "Napsauta lähettääksesi %s"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:461
+#: ../mail/em-format-html-display.c:445
 #, c-format
 msgid "Matches: %d"
 msgstr "Osumia: %d"
 
-#: ../mail/em-format-html-display.c:712 ../mail/em-format-html.c:597
+#: ../mail/em-format-html-display.c:696 ../mail/em-format-html.c:597
 msgid "Unsigned"
 msgstr "Allekirjoittamaton"
 
-#: ../mail/em-format-html-display.c:712
+#: ../mail/em-format-html-display.c:696
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11621,11 +11276,11 @@ msgstr ""
 "Viesti ei ole allekirjoitettu. Ei ole varmaa, että viestin lähettäjä on "
 "varmasti se, jolta viesti näyttää olevan."
 
-#: ../mail/em-format-html-display.c:713 ../mail/em-format-html.c:598
+#: ../mail/em-format-html-display.c:697 ../mail/em-format-html.c:598
 msgid "Valid signature"
 msgstr "Hyväksytty allekirjoitus"
 
-#: ../mail/em-format-html-display.c:713
+#: ../mail/em-format-html-display.c:697
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11633,11 +11288,11 @@ msgstr ""
 "Tämä viesti on allekirjoitettu ja varmennettu. Viesti on "
 "hyvintodennäköisesti aito."
 
-#: ../mail/em-format-html-display.c:714 ../mail/em-format-html.c:599
+#: ../mail/em-format-html-display.c:698 ../mail/em-format-html.c:599
 msgid "Invalid signature"
 msgstr "Hylätty allekirjoitus"
 
-#: ../mail/em-format-html-display.c:714
+#: ../mail/em-format-html-display.c:698
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11645,11 +11300,11 @@ msgstr ""
 "Tämän viestin allekirjoitusta ei voida tarkistaa, se on ehkä muuttunut "
 "siirron aikana."
 
-#: ../mail/em-format-html-display.c:715
+#: ../mail/em-format-html-display.c:699
 msgid "Valid signature, cannot verify sender"
 msgstr "Allekirjoitus on kelvollinen, mutta lähettäjää ei voida varmistaa"
 
-#: ../mail/em-format-html-display.c:715
+#: ../mail/em-format-html-display.c:699
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11657,11 +11312,11 @@ msgstr ""
 "Tämä viesti on allekirjoitettu kelvollisella allekirjoituksella, mutta "
 "viestin lähettäjää ei voida varmistaa."
 
-#: ../mail/em-format-html-display.c:721 ../mail/em-format-html.c:606
+#: ../mail/em-format-html-display.c:705 ../mail/em-format-html.c:606
 msgid "Unencrypted"
 msgstr "Salaamaton"
 
-#: ../mail/em-format-html-display.c:721
+#: ../mail/em-format-html-display.c:705
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -11669,11 +11324,11 @@ msgstr ""
 "Viesti ei ole salattu. Viestin sisältöä voidaan tutkia sen kulkiessa "
 "Internetin läpi."
 
-#: ../mail/em-format-html-display.c:722 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:706 ../mail/em-format-html.c:607
 msgid "Encrypted, weak"
 msgstr "Heikosti salattu"
 
-#: ../mail/em-format-html-display.c:722
+#: ../mail/em-format-html-display.c:706
 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 "
@@ -11683,11 +11338,11 @@ msgstr ""
 "mahdotonta, että ulkopuolinen pystyy purkamaan ja katsomaanviestin sisällön "
 "käytännöllisen lyhyessä ajassa."
 
-#: ../mail/em-format-html-display.c:723 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:707 ../mail/em-format-html.c:608
 msgid "Encrypted"
 msgstr "Salattu"
 
-#: ../mail/em-format-html-display.c:723
+#: ../mail/em-format-html-display.c:707
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11695,11 +11350,11 @@ msgstr ""
 "Viesti on salattu. Ulkopuolisen on vaikea avata viestin sisältö "
 "luettavakseen."
 
-#: ../mail/em-format-html-display.c:724 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:708 ../mail/em-format-html.c:609
 msgid "Encrypted, strong"
 msgstr "Salattu vahvalla algoritmilla"
 
-#: ../mail/em-format-html-display.c:724
+#: ../mail/em-format-html-display.c:708
 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 "
@@ -11709,67 +11364,71 @@ msgstr ""
 "vaikea purkaa salausta ja nähdä tämän viestin sisältön missään "
 "käytännöllisessä ajassa."
 
-#: ../mail/em-format-html-display.c:825 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:809 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Näytä varmenne"
 
-#: ../mail/em-format-html-display.c:840
+#: ../mail/em-format-html-display.c:824
 msgid "This certificate is not viewable"
 msgstr "Tätä varmennetta ei voida näyttää"
 
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1106
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Valmistui %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1130
+#: ../mail/em-format-html-display.c:1114
 msgid "Overdue:"
 msgstr "Eräpäivä ylitetty:"
 
-#: ../mail/em-format-html-display.c:1133
+#: ../mail/em-format-html-display.c:1117
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "kirjoittanut %d %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1193
+#: ../mail/em-format-html-display.c:1177
 msgid "_View Inline"
 msgstr "Näytä _sisäkkäisesti"
 
-#: ../mail/em-format-html-display.c:1194
+#: ../mail/em-format-html-display.c:1178
 msgid "_Hide"
 msgstr "_Piilota"
 
-#: ../mail/em-format-html-display.c:1195
+#: ../mail/em-format-html-display.c:1179
 msgid "_Fit to Width"
 msgstr "Sovita _leveyteen"
 
-#: ../mail/em-format-html-display.c:1196
+#: ../mail/em-format-html-display.c:1180
 msgid "Show _Original Size"
 msgstr "Näytä alkuperäinen k_oko"
 
-#: ../mail/em-format-html-display.c:1566
+#: ../mail/em-format-html-display.c:1550
 msgid "Attachment Button"
 msgstr "Liitepainike"
 
-#: ../mail/em-format-html-display.c:1773
+#: ../mail/em-format-html-display.c:1757
 msgid "Select folder to save all attachments..."
 msgstr "Valitse kansio, johon kaikki liitteet tallennetaan..."
 
-#: ../mail/em-format-html-display.c:1820
+#: ../mail/em-format-html-display.c:1796
+msgid "Select folder to save selected attachments..."
+msgstr "Valitse kansio, johon valitut liitteet tallennetaan..."
+
+#: ../mail/em-format-html-display.c:1804
 msgid "Save Selected..."
 msgstr "Tallenna valitut..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1887
+#: ../mail/em-format-html-display.c:1871
 #, c-format
 msgid "%d attachment"
 msgid_plural "%d attachments"
 msgstr[0] "%d liite"
 msgstr[1] "%d liitettä"
 
-#: ../mail/em-format-html-display.c:1951
+#: ../mail/em-format-html-display.c:1935
 msgid "No Attachment"
 msgstr "Ei liitteitä"
 
-#: ../mail/em-format-html-display.c:1954
+#: ../mail/em-format-html-display.c:1938
 msgid "Save All"
 msgstr "Tallenna kaikki"
 
@@ -11980,27 +11639,45 @@ msgstr ""
 "Asetuksia ei voitu lukea aikaisemmasta Evolutionin asennuksesta, evolution/"
 "config.xmldb' on joko vaurioitunut tai puuttuu."
 
-#: ../mail/em-popup.c:556 ../mail/em-popup.c:567
+#: ../mail/em-popup.c:399
+msgid "Save As..."
+msgstr "Tallenna nimellä..."
+
+#: ../mail/em-popup.c:424
+#, c-format
+msgid "untitled_image.%s"
+msgstr "nimetön_kuva.%s"
+
+#: ../mail/em-popup.c:542 ../mail/em-popup.c:553
+msgid "Set as _Background"
+msgstr "Aseta _taustaksi"
+
+#: ../mail/em-popup.c:544 ../mail/em-popup.c:555
 msgid "_Reply to sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: ../mail/em-popup.c:557 ../mail/em-popup.c:568
+#: ../mail/em-popup.c:545 ../mail/em-popup.c:556
 #: ../ui/evolution-mail-message.xml.h:84
 msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
-#: ../mail/em-popup.c:619
+#: ../mail/em-popup.c:607
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimessa"
 
-#: ../mail/em-popup.c:620
+#: ../mail/em-popup.c:608
 msgid "_Send New Message To..."
 msgstr "Lähetä uusi _viesti..."
 
-#: ../mail/em-popup.c:621
+#: ../mail/em-popup.c:609
 msgid "_Add to Addressbook"
 msgstr "_Lisää osoitekirjaan"
 
+#: ../mail/em-popup.c:762
+#, c-format
+msgid "Open in %s..."
+msgstr "Avaa ohjelmassa %s..."
+
 #: ../mail/em-subscribe-editor.c:614
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Tämä varasto ei tue tilaamista tai tilaukset eivät ole käytössä."
@@ -12022,28 +11699,28 @@ msgstr "Valitse palvelin."
 msgid "No server has been selected"
 msgstr "Ei palvelinta valittuna"
 
-#: ../mail/em-utils.c:106
+#: ../mail/em-utils.c:105
 msgid "Don't show this message again."
 msgstr "Älä näytä tätä viestiä uudelleen."
 
-#: ../mail/em-utils.c:338
+#: ../mail/em-utils.c:299
 msgid "Filters"
 msgstr "Suodattimet"
 
-#: ../mail/em-utils.c:481 ../mail/em-utils.c:518
+#: ../mail/em-utils.c:442 ../mail/em-utils.c:479
 msgid "message"
 msgstr "viesti"
 
-#: ../mail/em-utils.c:653
+#: ../mail/em-utils.c:614
 msgid "Save Message..."
 msgstr "Tallenna viesti..."
 
-#: ../mail/em-utils.c:702
+#: ../mail/em-utils.c:663
 msgid "Add address"
 msgstr "Lisää osoite"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1181
+#: ../mail/em-utils.c:1142
 #, c-format
 msgid "Messages from %s"
 msgstr "Viestit %s:ltä"
@@ -12379,6 +12056,14 @@ msgstr "Näytä poistetut viestit yliviivattuna viestilistassa."
 msgid "Show deleted messages in the message-list"
 msgstr "Näytä poistetut viestit viestilistalla"
 
+#: ../mail/evolution-mail.schemas.in.in.h:73
+msgid "Show the \"Preview\" pane"
+msgstr "Näytä \"Esikatselu\"-paneeli"
+
+#: ../mail/evolution-mail.schemas.in.in.h:74
+msgid "Show the \"Preview\" pane."
+msgstr "Näytä esikatselupaneeli"
+
 #: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Äänitiedosto joka soitetaan, kun uusia viestejä saapuu."
@@ -12743,7 +12428,7 @@ msgstr[1] "%d lähettämätöntä"
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d viesti"
-msgstr[1] "%d viestiä"
+msgstr[1] "%d viestä"
 
 #: ../mail/mail-component.c:544
 #, c-format
@@ -13735,7 +13420,6 @@ msgid "Checking for new mail"
 msgstr "Tarkistetaan onko uusia viestejä"
 
 #: ../mail/mail-session.c:207
-#: ../plugins/exchange-operations/exchange-config-listener.c:601
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Anna salasana tunnukselle %s"
@@ -13748,20 +13432,20 @@ msgstr "Anna salasana"
 msgid "User canceled operation."
 msgstr "Käyttäjä keskeytti toimenpiteen"
 
-#: ../mail/mail-signature-editor.c:381
+#: ../mail/mail-signature-editor.c:372
 msgid "Edit signature"
 msgstr "Muokkaa allekirjoitusta"
 
-#: ../mail/mail-signature-editor.c:423
+#: ../mail/mail-signature-editor.c:412
 msgid "Enter a name for this signature."
 msgstr "Anna allekirjoitukselle nimi"
 
-#: ../mail/mail-signature-editor.c:426
+#: ../mail/mail-signature-editor.c:415
 #: ../plugins/groupwise-features/properties.glade.h:5
 msgid "Name:"
 msgstr "Nimi:"
 
-#: ../mail/mail-tools.c:115
+#: ../mail/mail-tools.c:116
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Saapuvien kansiota '%s' ei voitu luoda: %s"
@@ -13771,16 +13455,16 @@ msgstr "Saapuvien kansiota '%s' ei voitu luoda: %s"
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "Yritettiin 'movemail':ia lähteelle '%s', joka ei ole tyyppiä mbox"
 
-#: ../mail/mail-tools.c:249
+#: ../mail/mail-tools.c:242
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Välitetty viesti - %s"
 
-#: ../mail/mail-tools.c:251
+#: ../mail/mail-tools.c:244
 msgid "Forwarded message"
 msgstr "Välitetty viesti"
 
-#: ../mail/mail-tools.c:291
+#: ../mail/mail-tools.c:284
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Virheellinen kansio: ' %s'"
@@ -13834,38 +13518,32 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
-"A signature already exists with the name &quot;{0}&quot;. Please specify a "
-"different name."
-msgstr "Nimellä &quot;{0}&quot; on jo allekirjoitus. Anna toinen nimi."
-
-#: ../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 ""
 "Merkityksellisen aihe-kentän lisääminen viesteihisi helpottaa vastaanottajaa "
 "ymmärtämään, mistä viestissä on kyse."
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:8
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Haluatko varmasti poistaa tämän tilin ja kaikki sen välimuistit?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account?"
 msgstr "Haluatko varmasti poistaa tämän tilin?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:10
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr "Haluatko varmasti avata {0} viestiä kerralla?"
 
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:11
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr ""
 "Haluatko varmasti poistaa kaikki poistetut viestit kaikista kansioista?"
 
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:12
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
@@ -13874,82 +13552,78 @@ msgstr ""
 "{0}&quot;\n"
 "?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:13
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Haluatko varmasti lähettää viestin HTML-muodossa?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:14
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
 "Haluatko varmasti lähettää viestin, jossa on vain piilokopion vastaanottajia "
 "(Bcc)?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Haluatko varmasti lähettää ilman aihetta?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:16
 msgid "Because &quot;{0}&quot;."
 msgstr "Syy: &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{2}&quot;."
 msgstr "Syy: &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:20
-msgid "Blank Signature"
-msgstr "Tyhjä allekirjoitus"
-
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:19
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "Hakunäkymää &quot;{0}&quot; ei voida lisätä."
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:20
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Kansiota &quot;{0}&quot; ei voida kopioida kohtaan &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:21
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "Kansiota &quot;{0}&quot; ei voida luoda."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot create temporary save directory."
 msgstr "Väliaikaista hakemistoa ei voida luoda."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "Tallennushakemisto ei voida luoda, syy: &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "Kansiota &quot;{0}&quot; ei voida poistaa."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "Järjestelmäkansiota &quot;{0}&quot; ei voida poistaa."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr ""
 "Hakunäkymää &quot;{0}&quot; ei voida muokata, koska sitä ei ole olemassa."
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Kansiota &quot;{0}&quot; ei voida siirtää  kohtaan &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "Lähdettä &quot;{1}&quot; ei voida avata."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "Lähdettä &quot;{2}&quot; ei voida avata."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "Kohdetta &quot;{2}&quot; ei voida avata."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:31
 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 "
@@ -13958,32 +13632,32 @@ msgstr ""
 "Lisenssitiedostoa &quot;{0}&quot; ei voida lukea asennusongelman takia. Et "
 "voi käyttää tätä lähdettä ennen kuin hyväksyt sen lisenssin."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "&quot;{0}&quot; ei voida nimetä uudelleen nimelle &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr ""
 "Järjestelmäkansiota &quot;{0}&quot; ei voida siirtää tai nimetä uudestaan."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot save changes to account."
 msgstr "Muutoksia tiliin ei voida tallentaa."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "Hakemistoon &quot;{0}&quot; ei voida tallentaa."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "Tiedostoon &quot;{0}&quot; ei voida tallentaa."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "Allekirjoitus-skriptiä &quot;{0}&quot; ei voida asettaa."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:38
 msgid ""
 "Check to make sure your password is spelled correctly.  Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -13992,63 +13666,63 @@ msgstr ""
 "salasanoissa isot ja pienet kirjaimet ovat eri asia. Tarkista ettei CapsLock "
 "ole päällä."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:39
 msgid "Could not save signature file."
 msgstr "Allekirjoitustiedostoa ei voitu tallentaa."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:40
 msgid "Delete &quot;{0}&quot;?"
 msgstr "Poista &quot;{0}&quot;"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:41
 msgid "Delete account?"
 msgstr "Poista tili?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
 msgid "Discard changed?"
 msgstr "Hylkää muutokset?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr "Haluatko toiminnon tehtäväksi alikansioissa?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid "Do you wish to save your changes?"
 msgstr "Haluatko tallentaa muutokset?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:45
 msgid "Don't delete"
 msgstr "Älä poista"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:46
 msgid "Enter password."
 msgstr "Syötä salasana."
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:47
 msgid "Error loading filter definitions."
 msgstr "Virhe ladattaessa suodatinten määrittelyjä."
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid "Error while performing operation."
 msgstr "Virhe suoritettessa toimenpidettä."
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Error while {0}."
 msgstr "Virhe suoritettaessa \"{0}\"."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:50
 msgid "File exists but cannot overwrite it."
 msgstr "Tiedosto on jo olemassa, mutta sitä ei voida ylikirjoittaa."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "File exists but is not a regular file."
 msgstr "Tiedosto on olemassa mutta ei ole tavallinen tiedosto."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Jos jatkat, et voi palauttaa näitä viestejä."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:53
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -14056,7 +13730,7 @@ msgstr ""
 "Jos poistat kansion, menetetään kaikki sen sisältö ja alikansiot "
 "sisältöineen pysyvästi."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:54
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14064,11 +13738,11 @@ msgstr ""
 "Jos jatkat, tilin tiedot ja kaikki siihen liittyvä välimuistitieto "
 "poistetaan pysyvästi."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:56
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Jos jatkat, tilin tiedot poistetaan pysyvästi."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:57
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -14076,19 +13750,19 @@ msgstr ""
 "Jos suljet, näitä viestejä ei lähetetä ennen kuin Evolution on käynnistetty "
 "uudestaan."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:58
 msgid "Ignore"
 msgstr "Älä välitä"
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:59
 msgid "Invalid authentication"
 msgstr "Virheellinen tunnistautuminen"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:60
 msgid "Mail filters automatically updated."
 msgstr "Sähköpostin suodattimet päivitetty automaattisesti."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:61
 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 "
@@ -14100,31 +13774,31 @@ msgstr ""
 "paljastaa kaikki viestisi vastaanottajat. Välttääksesi tämän tulee viestiin "
 "määritellä ainakin yksi tavallinen vastaanottaja tai kopio-osoite"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:62
 msgid "Mark all messages as read"
 msgstr "Merkitse kaikki viestit luetuiksi"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:63
 msgid "Mark all messages as read in the selected folder"
 msgstr "_Merkitse kaikki viestit luetuiksi valitussa kansiossa"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:64
 msgid "Missing folder."
 msgstr "Kansio puuttuu."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:66
 msgid "No sources selected."
 msgstr "Lähteitä ei ole valittuna."
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:67
 msgid "Opening too many messages at once may take a long time."
 msgstr "Liian monen viestin avaus kerralla voi viedä pitkän ajan."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:68
 msgid "Please check your account settings and try again."
 msgstr "Tarkista tilisi asetukset ja yritä uudestaan."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:69
 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."
@@ -14132,7 +13806,7 @@ msgstr ""
 "Syötä kelvollinen sähköpostiosoite Vastaanottaja: kenttään. Voit etsiä "
 "sähköpostiosoitteita näpäyttämällä Vastaanottaja: painiketta kentän vieressä."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:70
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14144,47 +13818,39 @@ msgstr ""
 "\n"
 "Lähetetäänkö joka tapauksessa?"
 
-#: ../mail/mail.error.xml.h:75
-msgid "Please provide an unique name to identify this signature."
-msgstr "Anna allekirjoitukselle yksikäsitteinen nimi."
-
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:73
 msgid "Please wait."
 msgstr "Odota, ole hyvä."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:74
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Virhe siirrettäessä vanhaa sähköpostikansiota &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:75
 msgid "Querying server"
 msgstr "Kysytään palvelimelta"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:76
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Kysytään palvelimelta tuettuja tunnistautumismenetelmiä."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:77
 msgid "Read receipt requested."
 msgstr "Kuittausta pyydetty."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:78
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Poistetaanko todella kansio &quot;{0}&quot; ja kaikki sen alikansiot?"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:79
 msgid "Search Folders automatically updated."
 msgstr "Hakunäkymät päivitetty automaattisesti."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:80
 msgid "Send Receipt"
 msgstr "Lähetä kuittaus"
 
-#: ../mail/mail.error.xml.h:84
-msgid "Signature Already Exists"
-msgstr "Allekirjoitus on jo olemassa"
-
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -14192,7 +13858,7 @@ msgstr ""
 "Järjestelmän kansioita tarvitaan, jotta Evolution toimii oikein, eikä niitä "
 "voida nimetä uudelleen, siirtää tai poistaa."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:82
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14209,7 +13875,7 @@ msgstr ""
 "paljastaa kaikki viestisi vastaanottajat. Välttääksesi tämän tulee viestiin "
 "määritellä ainakin yksi tavallinen vastaanottaja tai kopio-osoite"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:85
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14223,7 +13889,7 @@ msgstr ""
 "   &quot;{0}&quot;\n"
 "ja ne on päivitetty."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14237,7 +13903,7 @@ msgstr ""
 "   &quot;{1}&quot;\n"
 "ja ne on päivitetty."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "The message was sent via the &quot;sendmail&quot; external application.  "
 "Sendmail reports the following error: status 67: mail not sent.\n"
@@ -14249,11 +13915,11 @@ msgstr ""
 "Viestisi on tallennettu Lähtevät-kansioon. Tarkista viesti virheiden varalta "
 "ja yritä lähettää uudestaan."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:97
 msgid "The script file must exist and be executable."
 msgstr "Skriptitiedoston tulee olla olemassa ja suoritettavissa."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14261,13 +13927,13 @@ msgstr ""
 "Kansio on ehkä lisätty järjestelmän puolesta.\n"
 "Siirry hakunäkymien muokkaukseen ja lisää se erikseen, jos tarpeen."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:100
 msgid ""
 "This message cannot be sent because you have not specified any Recipients"
 msgstr ""
 "Viestiä ei voida lähettää, koska et ole määritellyt yhtäkään vastaanottajaa"
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:101
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14275,15 +13941,15 @@ msgstr ""
 "Palvelin ei tue tämän tyyppistä tunnistautumista eikä välttämättä tue "
 "lainkaan tunnistautumista."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:102
 msgid "This signature has been changed, but has not been saved."
 msgstr "Tämä allekirjoitus on muuttunut, mutta sitä ei ole tallennettu."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:103
 msgid "Unable to connect to the GroupWise server."
 msgstr "GroupWise-palvelimeen ei saatu yhteyttä."
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "Unable to open the drafts folder for this account.  Use the system drafts "
 "folder instead?"
@@ -14291,40 +13957,40 @@ msgstr ""
 "Tämän sähköpostitilin luonnoskansiota ei voida avata. Haluatko käyttää "
 "luonnosten oletuskansiota sen sijaan?"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:105
 msgid "Unable to read license file."
 msgstr "Lisenssitiedostoa ei voitu avata."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:106
 msgid "Use _Default"
 msgstr "Käytä _oletuksia"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:107
 msgid "Use default drafts folder?"
 msgstr "Käytä oletuskansiota luonnoksille?"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:108
 msgid "You have not filled in all of the required information."
 msgstr "Et ole täyttänyt kaikkia tarvittavia kohtia."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:109
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 "Sinulla on lähettämättömiä viestejä, haluatko poistua siitä huolimatta?"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:110
 msgid "You may not create two accounts with the same name."
 msgstr "Et voi luoda kahta tiliä samalla nimellä."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:111
 msgid "You must name this Search Folder."
 msgstr "Hakunäkymälle täytyy antaa nimi."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:112
 msgid "You must specify a folder."
 msgstr "Kansio täytyy valita."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14334,100 +14000,104 @@ msgstr ""
 "Valitse joko kansiot yksitellen, kaikki paikalliset tai etäkansiot, tai "
 "kaikki etä- ja paikalliset kansiot."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:115
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr ""
 "Kirjautumisesi palvelimelle  &quot;{0}&quot; käyttäjänä &quot;{0}&quot; "
 "epäonnistui."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:116
 msgid "Your message with the subject &quot;{0}&quot; was not delivered."
 msgstr "Viestiäsi aiheesta &quot;{0}&quot; ei lähetetty."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:117
 msgid "_Append"
 msgstr "_Lisää"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:118
 msgid "_Discard changes"
 msgstr "_Hylkää muutokset"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:119
+msgid "_Empty Trash"
+msgstr "_Tyhjennä roskakori"
+
+#: ../mail/mail.error.xml.h:120
 msgid "_Expunge"
 msgstr "_Poista pysyvästi"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:121
 msgid "_Open Messages"
 msgstr "_Avaa viestit"
 
-#: ../mail/message-list.c:1006
+#: ../mail/message-list.c:996
 msgid "Unseen"
 msgstr "Nähty"
 
-#: ../mail/message-list.c:1007
+#: ../mail/message-list.c:997
 msgid "Seen"
 msgstr "Näkemättä"
 
-#: ../mail/message-list.c:1008
+#: ../mail/message-list.c:998
 msgid "Answered"
 msgstr "Vastattu"
 
-#: ../mail/message-list.c:1009
+#: ../mail/message-list.c:999
 msgid "Multiple Unseen Messages"
 msgstr "Useita lukemattomia viestejä"
 
-#: ../mail/message-list.c:1010
+#: ../mail/message-list.c:1000
 msgid "Multiple Messages"
 msgstr "Useita viestejä"
 
-#: ../mail/message-list.c:1014
+#: ../mail/message-list.c:1004
 msgid "Lowest"
 msgstr "Matalin"
 
-#: ../mail/message-list.c:1015
+#: ../mail/message-list.c:1005
 msgid "Lower"
 msgstr "Matalampi"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1009
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1010
 msgid "Highest"
 msgstr "Korkein"
 
-#: ../mail/message-list.c:1348 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1338 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1355 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1345 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Tänään %l:%M %p"
 
-#: ../mail/message-list.c:1364 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1354 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l:%M %p"
 
-#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1366 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1384 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1374 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1386 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2052
+#: ../mail/message-list.c:2042
 msgid "Message List"
 msgstr "_Viestilista"
 
-#: ../mail/message-list.c:3397
+#: ../mail/message-list.c:3387
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
@@ -14584,26 +14254,26 @@ msgstr "Varmuuskopioi ja palauta Evolutionin tietoja ja asetuksia"
 msgid "Restore Settings..."
 msgstr "Palauta asetukset..."
 
-#: ../plugins/bbdb/bbdb.c:410
+#: ../plugins/bbdb/bbdb.c:404
 msgid "Automatic Contacts"
 msgstr "Automaattiset yhteystiedot"
 
-#: ../plugins/bbdb/bbdb.c:419
+#: ../plugins/bbdb/bbdb.c:413
 msgid "<span weight=\"bold\">Automatic Contacts</span>"
 msgstr "<span weight=\"bold\">Automaattiset yhteystiedot</span>"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:432
+#: ../plugins/bbdb/bbdb.c:426
 msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
 msgstr "Lisää lähettäjä _automaattisesti osoitekirjaan, kun viestiin vastataan"
 
-#: ../plugins/bbdb/bbdb.c:450
+#: ../plugins/bbdb/bbdb.c:444
 msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
 msgstr "<span weight=\"bold\">Pikaviestinten yhteystiedot</span>"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:463
+#: ../plugins/bbdb/bbdb.c:457
 msgid ""
 "Periodically synchronize contact information and images from my _instant "
 "messenger"
@@ -14611,7 +14281,7 @@ msgstr ""
 "Hae ja yhdistä säännöllisin väliajoin yhteystiedot ja kuvat _pikaviestimistä"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:470
+#: ../plugins/bbdb/bbdb.c:464
 msgid "Synchronize with _buddy list now"
 msgstr "Yhdistä tiedot _pikaviestimistä"
 
@@ -14857,15 +14527,6 @@ msgstr "Kirjautumisen tyyppi"
 msgid "Ch_eck for Supported Types"
 msgstr "Tar_kista tuetut tyypit"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:192
-#: ../plugins/exchange-operations/exchange-contacts.c:162
-msgid ""
-"Evolution is in offline mode. You cannot create or modify folders now.\n"
-"Please switch to online mode for such operations."
-msgstr ""
-"Evolution on yhteydettömässä tilassa. Et voi luoda tai muokata kansioita.\n"
-"Vaihda yhteydelliseen tilaan, jotta voit suorittaa näitä toimintoja."
-
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
@@ -15013,28 +14674,24 @@ msgstr "Kansion nimi"
 msgid "Folder Size"
 msgstr "Kansion koko"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:180
-msgid "Subscribe to Other User's"
-msgstr "Tilaa muilta käyttäjiltä"
-
 #: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
 msgid "Exchange Folder Tree"
 msgstr "Exchangen kansiopuu"
 
-#: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:227
-#: ../plugins/exchange-operations/exchange-folder.c:237
+#: ../plugins/exchange-operations/exchange-folder.c:62
+#: ../plugins/exchange-operations/exchange-folder.c:223
+#: ../plugins/exchange-operations/exchange-folder.c:233
 msgid "Unsubscribe Folder..."
 msgstr "Peru kansion tilaus..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:464
-#: ../plugins/exchange-operations/exchange-folder.c:524
+#: ../plugins/exchange-operations/exchange-folder.c:460
+#: ../plugins/exchange-operations/exchange-folder.c:520
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Perutaanko todella kansion \"%s\" tilaus?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:476
-#: ../plugins/exchange-operations/exchange-folder.c:536
+#: ../plugins/exchange-operations/exchange-folder.c:472
+#: ../plugins/exchange-operations/exchange-folder.c:532
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Peru \"%s\" tilaus"
@@ -15502,7 +15159,6 @@ msgid "Add Send Options to groupwise messages"
 msgstr "Lisää lähetysoptioita groupwise-viesteihin"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:8
 #: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "Lähetyksen asetukset"
@@ -15622,7 +15278,7 @@ msgstr "Välimuistiin kirjautuminen"
 
 #: ../plugins/groupwise-features/proxy-login.c:219
 #: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:501
+#: ../plugins/groupwise-features/proxy.c:499
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -15632,13 +15288,7 @@ msgstr "%sSyötä salasana palvelulle %s (käyttäjä %s)"
 msgid "_Proxy Login..."
 msgstr "Välimuistin kirjautuminen..."
 
-#: ../plugins/groupwise-features/proxy.c:690
-msgid "The Proxy tab will be available only when the account is online."
-msgstr ""
-"Välimuistin välilehti on käytettävissä vain jos tili on yhteydellisessä "
-"tilassa."
-
-#: ../plugins/groupwise-features/proxy.c:695
+#: ../plugins/groupwise-features/proxy.c:680
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Välimuisti on käytettävissä vain jos tili on käytössä."
 
@@ -15662,65 +15312,6 @@ msgstr "Jakaminen"
 msgid "Track Message Status..."
 msgstr "Seuraa viestin tilaa..."
 
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "Hula Account Setup"
-msgstr "Hula-tilin asetukset"
-
-#: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:137
-msgid "iCalendar format (.ics)"
-msgstr "iCalendar muoto (.ics)"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
-msgstr "Synkronoi valitut tehtävät, kalenterit tai osoitekirjat Apple iPodiin"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
-msgid "Synchronize to iPod"
-msgstr "_Synkronoi iPod"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
-msgid "iPod Synchronization"
-msgstr "_iPodin synkronointi"
-
-#: ../plugins/ipod-sync/sync.c:158
-msgid "No output directory!"
-msgstr "Kohdehakemistoa ei ole!"
-
-#: ../plugins/ipod-sync/sync.c:159
-msgid ""
-"The output directory was not found on iPod! Please ensure that iPod has been "
-"correctly set up and try again."
-msgstr ""
-"iPodista ei löytynyt kohdehakemistoa! Tarkista että iPodin asetukset on "
-"tehty oikein ja yritä uudestaan."
-
-#: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
-msgid "Could not export data!"
-msgstr "Tietoja ei voitu viedä!"
-
-#: ../plugins/ipod-sync/sync.c:203
-msgid "Exporting data failed."
-msgstr "Tietojen vienti epäonnistui."
-
-#: ../plugins/ipod-sync/sync.c:231
-msgid "Could not open addressbook!"
-msgstr "Osoitekirjaa ei voitu avata!"
-
-#: ../plugins/ipod-sync/sync.c:232
-msgid "Could not open the Evolution addressbook to export data."
-msgstr "Evolutionin osoitekirjaa ei voitu avata tietojen viemiseksi."
-
-#: ../plugins/ipod-sync/sync.c:291
-msgid "Could not open calendar/todo!"
-msgstr "Kalenteria tai tehtävälistää ei voitu avata!"
-
-#: ../plugins/ipod-sync/sync.c:292
-msgid "Could not open the Evolution calendar/todo list to export data."
-msgstr ""
-"Evolutionin kalenteria tai tehtävälistaa ei voitu avata tietojen vientiä "
-"varten."
-
 #: ../plugins/itip-formatter/itip-formatter.c:724
 msgid "Unable to parse item"
 msgstr "Kohdetta ei voitu tulkita"
@@ -15816,6 +15407,10 @@ msgstr ""
 "Jos haluat käsitellä kaikki nämä kohdat, tiedosto täytyy tallentaa ja avata "
 "tuomalla tiedosto kalenteriin"
 
+#: ../plugins/itip-formatter/itip-formatter.c:1968
+msgid "Meetings and Tasks"
+msgstr "Kokoukset ja tehtävät"
+
 #. Delete message after acting
 #. FIXME Need a schema for this
 #: ../plugins/itip-formatter/itip-formatter.c:1991
@@ -15837,7 +15432,7 @@ msgstr "Ristiriitaisuuksien hakutaulukko"
 
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:240 ../widgets/misc/e-dateedit.c:459
+#: ../widgets/misc/e-cell-date-edit.c:240 ../widgets/misc/e-dateedit.c:457
 msgid "Today"
 msgstr "Tänään"
 
@@ -16522,9 +16117,8 @@ msgid "Gives an option to print mail from composer"
 msgstr "Antaa mahdollisuuden tulostaa viesti kirjoitusikkunasta"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:18 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-memos.xml.h:12
-#: ../ui/evolution-tasks.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Tulostuksen esikatselu"
 
@@ -16570,7 +16164,7 @@ msgid "MIME Type"
 msgstr "MIME-tyyppi"
 
 #: ../plugins/save-attachments/save-attachments.c:359
-#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:18
+#: ../ui/evolution-message-composer.xml.h:18
 msgid "Save"
 msgstr "Tallenna"
 
@@ -16654,6 +16248,10 @@ msgstr "Kapsuloi arvot käyttäen:"
 msgid "Comma separated value format (.csv)"
 msgstr "Pilkulla erotettu muoto (.csv)"
 
+#: ../plugins/save-calendar/ical-format.c:137
+msgid "iCalendar format (.ics)"
+msgstr "iCalendar muoto (.ics)"
+
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
 msgstr "Tallenna valittu"
@@ -16679,11 +16277,20 @@ msgstr "%FT%T"
 msgid "RDF format (.rdf)"
 msgstr "RDF-muoto (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:170
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:171
+#: ../plugins/save-calendar/save-calendar.c:181
 msgid "Select destination file"
 msgstr "Valitse kohdetiedosto"
 
+#: ../plugins/save-calendar/save-calendar.c:216
+#, c-format
+msgid ""
+"The suggested filename extension of this filetype (%s) is unused in the "
+"chosen filename. Do you want to continue?"
+msgstr ""
+"Suositeltu tiedoston pääte tälle tiedostotyypille (%s) ei ole käytössä "
+"valitussa tiedostonimessä. Haluatko jatkaa?"
+
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
 msgid "Select one source"
 msgstr "Valitse lähde"
@@ -16985,27 +16592,27 @@ msgstr "Kansion nimi ei voi sisältää merkkiä \"#\""
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' ja '..' ovat varattuja kansion nimiä"
 
-#: ../shell/e-shell-window-commands.c:71
+#: ../shell/e-shell-window-commands.c:70
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Gnomen Pilot-työkalut eivät ole asennetuina tähän järjestelmään."
 
-#: ../shell/e-shell-window-commands.c:79
+#: ../shell/e-shell-window-commands.c:78
 #, c-format
 msgid "Error executing %s."
 msgstr "Virhe suoritettaessa %s."
 
-#: ../shell/e-shell-window-commands.c:128
+#: ../shell/e-shell-window-commands.c:127
 msgid "Bug buddy is not installed."
 msgstr "Bug buddya ei ole asennettu."
 
-#: ../shell/e-shell-window-commands.c:136
+#: ../shell/e-shell-window-commands.c:135
 msgid "Bug buddy could not be run."
 msgstr "Bug buddya ei voitu ajaa."
 
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
 #. * about box
-#: ../shell/e-shell-window-commands.c:533
+#: ../shell/e-shell-window-commands.c:532
 msgid "translator-credits"
 msgstr ""
 "Jarkko Ranta, 2000-2001\n"
@@ -17014,19 +16621,19 @@ msgstr ""
 "\n"
 "http://gnome.fi/"
 
-#: ../shell/e-shell-window-commands.c:547
+#: ../shell/e-shell-window-commands.c:546
 msgid "Groupware Suite"
 msgstr "Ryhmätyöohjelmisto"
 
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:774
 msgid "_Work Online"
 msgstr "_Yhtedellinen tila"
 
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:52
+#: ../shell/e-shell-window-commands.c:787 ../ui/evolution.xml.h:50
 msgid "_Work Offline"
 msgstr "_Yhteydetön tila"
 
-#: ../shell/e-shell-window-commands.c:801
+#: ../shell/e-shell-window-commands.c:800
 msgid "Work Offline"
 msgstr "Valitse yhteydetön tila"
 
@@ -17046,10 +16653,10 @@ msgstr ""
 "Evolution on yhteydettömässä tilassa. Paina tästä siirtyäksesi "
 "yhteydelliseen tilaan."
 
-#: ../shell/e-shell-window.c:735
+#: ../shell/e-shell-window.c:724
 #, c-format
 msgid "Switch to %s"
-msgstr "Avaa %s"
+msgstr "Vaihda %s:aan"
 
 #: ../shell/e-shell.c:623
 msgid "Uknown system error."
@@ -17132,7 +16739,7 @@ msgstr ""
 
 #. Preview/Alpha/Beta version warning message
 #: ../shell/main.c:230
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -17143,7 +16750,7 @@ msgid ""
 "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"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
 "This product comes with no warranty and is not intended for\n"
 "individuals prone to violent fits of anger.\n"
 "\n"
@@ -17880,113 +17487,103 @@ msgstr "Komentoa %s ei toitu suorittaa: %s\n"
 msgid "Shutting down %s (%s)\n"
 msgstr "Sammutetaan %s (%s)\n"
 
-#: ../ui/evolution-addressbook.xml.h:2
-msgid "Contact _Preview"
-msgstr "Yhteystiedon _esikatselu"
-
-#: ../ui/evolution-addressbook.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:3
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "Kopioi valitutu yhteystiedot toiseen kansioon..."
 
-#: ../ui/evolution-addressbook.xml.h:5 ../ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:4 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Kopioi valinta"
 
-#: ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-addressbook.xml.h:5
 msgid "Copy to Folder..."
 msgstr "Kopioi kansioon..."
 
-#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-memos.xml.h:4
-#: ../ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Leikkaa"
-
-#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Leikkaa valinta"
 
-#: ../ui/evolution-addressbook.xml.h:10
+#: ../ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Poista valitut yhteystiedot"
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Forward Contact"
-msgstr "Välitä yhteystieto eteenpäin"
-
-#: ../ui/evolution-addressbook.xml.h:12
 msgid "Move Selected Contacts to Another Folder..."
 msgstr "Siirrä valitut yhteystiedot toiseen kansioon..."
 
-#: ../ui/evolution-addressbook.xml.h:13
+#: ../ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr "Siirrä kansioon..."
 
-#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-memos.xml.h:8
-#: ../ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Liitä"
-
-#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
 msgstr "Liitä leikepöytä"
 
-#: ../ui/evolution-addressbook.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Esikatsele tulostettavia yhteystietoja"
 
-#: ../ui/evolution-addressbook.xml.h:19
+#: ../ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Tulosta valitut yhteystiedot"
 
-#: ../ui/evolution-addressbook.xml.h:21
+#: ../ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Tallenna valitut yhteystiedot VCardina."
 
-#: ../ui/evolution-addressbook.xml.h:22 ../widgets/text/e-text.c:2684
+#: ../ui/evolution-addressbook.xml.h:21 ../widgets/text/e-text.c:2684
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#: ../ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Valitse kaikki yhteystiedot"
 
-#: ../ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-addressbook.xml.h:23
 msgid "Send a message to the selected contacts."
 msgstr "Lähetä viesti valituille  henkilöille."
 
-#: ../ui/evolution-addressbook.xml.h:25
+#: ../ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Lähetä viesti yhteystiedolle"
 
-#: ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Lähetä valitut yhteystiedot toiselle henkilölle."
 
-#: ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-addressbook.xml.h:26
 msgid "Show contact preview window"
 msgstr "Näytä yhteystiedon esikatseluruutu"
 
-#: ../ui/evolution-addressbook.xml.h:28
+#: ../ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Pysäytä"
 
-#: ../ui/evolution-addressbook.xml.h:29
+#: ../ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Pysäytä lataaminen"
 
-#: ../ui/evolution-addressbook.xml.h:30
+#: ../ui/evolution-addressbook.xml.h:29
 msgid "View the current contact"
 msgstr "Katsele nykyistä yhteystietoa"
 
-#: ../ui/evolution-addressbook.xml.h:31 ../ui/evolution-calendar.xml.h:38
-#: ../ui/evolution-tasks.xml.h:21
+#: ../ui/evolution-addressbook.xml.h:30 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-tasks.xml.h:19
 msgid "_Actions"
 msgstr "T_oiminnot"
 
-#: ../ui/evolution-addressbook.xml.h:36
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "_Forward Contact..."
 msgstr "_Välitä yhteystieto..."
 
+#: ../ui/evolution-addressbook.xml.h:39
+msgid "_Preview Pane"
+msgstr "_Esikatseluruutu"
+
+#: ../ui/evolution-addressbook.xml.h:41
+msgid "_Save as VCard..."
+msgstr "_Tallenna vCard..."
+
 #: ../ui/evolution-addressbook.xml.h:42
 msgid "_Select All"
 msgstr "Valitse k_aikki"
@@ -18067,10 +17664,6 @@ msgstr "Poista vanhat tapaamiset ja kokoukset"
 msgid "Select _Date"
 msgstr "Valitse _päivä"
 
-#: ../ui/evolution-calendar.xml.h:26
-msgid "Select _Today"
-msgstr "Valitse _tämä päivä"
-
 #: ../ui/evolution-calendar.xml.h:27
 msgid "Select a specific date"
 msgstr "Valitse tietty päivä"
@@ -18115,191 +17708,30 @@ msgstr "Työviikko"
 msgid "_Open Appointment"
 msgstr "_Avaa tapaaminen"
 
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-editor.xml.h:7
+#: ../ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
 msgstr "Kopioi valittu teksti leikepöydälle"
 
-#: ../ui/evolution-composer-entries.xml.h:3 ../ui/evolution-editor.xml.h:9
+#: ../ui/evolution-composer-entries.xml.h:2
+msgid "Cu_t"
+msgstr "_Leikkaa"
+
+#: ../ui/evolution-composer-entries.xml.h:3
 msgid "Cut selected text to the clipboard"
 msgstr "_Kopioi valittu teksti leikepöydälle"
 
-#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:10
+#: ../ui/evolution-composer-entries.xml.h:4
 msgid "Paste text from the clipboard"
 msgstr "Liitä tekstiä leikepöydältä"
 
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-editor.xml.h:12
-#: ../ui/evolution-subscribe.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Valitse _kaikki"
 
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:6
 msgid "Select all text"
 msgstr "Valitse kaikki teksti"
 
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "Liitä tiedosta napsauttamalla tästä"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "Sulje nykyinen ikkuna napsauttamalla tästä"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "Tallenna nykyinen ikkuna napsauttamalla tästä"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help availabe"
-msgstr "Näytä ohje, jos sellainen löytyy, napsauttamalla tästä"
-
-#.
-#. <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:4
-#: ../ui/evolution-signature-editor.xml.h:7
-msgid "Close"
-msgstr "Sulje"
-
-#: ../ui/evolution-editor.xml.h:14
-msgid "_Attachments"
-msgstr "_Liitteet"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:42 ../ui/evolution-subscribe.xml.h:9
-msgid "_Close"
-msgstr "_Sulje"
-
-#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:45
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:37
-msgid "_File"
-msgstr "_Tiedosto"
-
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:38
-msgid "_Help"
-msgstr "O_hje"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-message-composer.xml.h:47
-#: ../ui/evolution-signature-editor.xml.h:25
-msgid "_Insert"
-msgstr "Li_sää"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "_Vaihtoehdot"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All day Event"
-msgstr "Koko päivän tapahtuma"
-
-#: ../ui/evolution-event-editor.xml.h:3 ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "Luokittele luottamukselliseksi"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "Luokittele yksityiseksi"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "Luokittele julkiseksi"
-
-#: ../ui/evolution-event-editor.xml.h:7 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "Lisää erityisiä lähetysvaihtoehtoja"
-
-#: ../ui/evolution-event-editor.xml.h:8
-msgid "Make this a recurring event"
-msgstr "Muuta tämä tapahtuma toistuvaksi"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "J_ulkinen"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Query free / busy information for the attendees"
-msgstr "Kysy vapaa/varattu-tietoja osanottajilta"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "R_oolikenttä"
-
-#: ../ui/evolution-event-editor.xml.h:14 ../ui/evolution-task-editor.xml.h:9
-msgid "Show Time _Zone"
-msgstr "Näytä Aikavyöhyke"
-
-#: ../ui/evolution-event-editor.xml.h:15
-msgid "Show time as b_usy"
-msgstr "Näytä aika _varattuna"
-
-#: ../ui/evolution-event-editor.xml.h:16 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "Määrittää näytetäänkö läsnäolijakenttä"
-
-#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "Määrittää näytetäänkö RSVP-kenttä"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "Määrittää näytetäänkö roolikenttä"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "Määrittää näytetäänkö tilakenttä"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "Määrittää näytetäänkö aihavyöhykekenttä"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "Määrittää näytetäänkö luokat"
-
-#: ../ui/evolution-event-editor.xml.h:22
-msgid "Toggles whether to have All day Event"
-msgstr "Määrittää onko tämä koko päivän tapahtuma"
-
-#: ../ui/evolution-event-editor.xml.h:23
-msgid "Toggles whether to show time as busy"
-msgstr "Määrittää näytetäänkö aika varattuna"
-
-#: ../ui/evolution-event-editor.xml.h:24
-msgid "_Alarms"
-msgstr "_Hälytykset"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "_All day Event"
-msgstr "_Koko päivän tapahtuma"
-
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "Lu_okittelu"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "_Luottamuksellinen"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "_Yksityinen"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Field"
-msgstr "_Tilakenttä"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:25
-msgid "_Type Field"
-msgstr "T_yyppikenttä"
-
 #: ../ui/evolution-executive-summary.xml.h:1
 msgid "Customize My Evolution"
 msgstr "Muokkaa omaa  Evolutioniasi"
@@ -18425,8 +17857,8 @@ msgstr ""
 "Piilota poistetut viestit sen sijaan, että ne näytettäisiin yliviivattuina"
 
 #: ../ui/evolution-mail-list.xml.h:13
-msgid "Mar_k Messages as Read"
-msgstr "Mer_kitse vietit luetuksi"
+msgid "Mark Me_ssages as Read"
+msgstr "Merkitse vie_stit luetuiksi"
 
 #: ../ui/evolution-mail-list.xml.h:14 ../ui/evolution-mail-message.xml.h:69
 msgid "Paste message(s) from the clipboard"
@@ -18895,6 +18327,17 @@ msgstr "l_ukematon"
 msgid "_Zoom In"
 msgstr "Lä_hennä"
 
+#.
+#. <cmd name="FileSave" _label="Save"
+#. _tip="Save the current file" pixtype="stock" pixname="Save"
+#. accel="*Ctrl*s"/>
+#.
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+#: ../ui/evolution-message-composer.xml.h:4
+#: ../ui/evolution-signature-editor.xml.h:7
+msgid "Close"
+msgstr "Sulje"
+
 #: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Sulje tämä ikkuna"
@@ -18903,37 +18346,17 @@ msgstr "Sulje tämä ikkuna"
 msgid "Main toolbar"
 msgstr "Päätyökalupalkki"
 
-#: ../ui/evolution-memos.xml.h:3
-msgid "Copy selected memo"
-msgstr "Kopioi valittu muistilappu"
-
-#: ../ui/evolution-memos.xml.h:5
-msgid "Cut selected memo"
-msgstr "Leikkaa valittu muistilappu"
-
-#: ../ui/evolution-memos.xml.h:7
-msgid "Delete selected memos"
-msgstr "Poista valitut muistilaput"
-
-#: ../ui/evolution-memos.xml.h:9
-msgid "Paste memo from the clipboard"
-msgstr "Liitä muistilappu leikepöydältä"
-
-#: ../ui/evolution-memos.xml.h:10
-msgid "Previews the list of memos to be printed"
-msgstr "Esikatselee listaa tulostettavista muistilapuista"
-
-#: ../ui/evolution-memos.xml.h:13
-msgid "Print the list of memos"
-msgstr "Tulosta lista muistilapuista"
-
-#: ../ui/evolution-memos.xml.h:14
-msgid "View the selected memo"
-msgstr "Näytä valittu muistilappu"
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:42 ../ui/evolution-subscribe.xml.h:9
+msgid "_Close"
+msgstr "_Sulje"
 
-#: ../ui/evolution-memos.xml.h:18
-msgid "_Open Memo"
-msgstr "_Avaa muistilappu"
+#: ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:45
+#: ../ui/evolution-signature-editor.xml.h:24
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:36
+msgid "_File"
+msgstr "_Tiedosto"
 
 #: ../ui/evolution-message-composer.xml.h:1
 msgid "Attach"
@@ -19099,6 +18522,11 @@ msgstr "_Poista kaikki"
 msgid "_From Field"
 msgstr "_Lähettäjä-kenttä"
 
+#: ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-signature-editor.xml.h:25
+msgid "_Insert"
+msgstr "Li_sää"
+
 #: ../ui/evolution-message-composer.xml.h:48
 msgid "_Open..."
 msgstr "_Avaa..."
@@ -19170,22 +18598,6 @@ msgstr "Poista tilaus"
 msgid "_Invert Selection"
 msgstr "_Käännä valinta"
 
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "Napsauta painiketta ja muuta tai näytä tehtävän yksityiskohtia"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Status Details"
-msgstr "Tilan yksityiskohdat"
-
-#: ../ui/evolution-task-editor.xml.h:11
-msgid "Time Zone"
-msgstr "Aikavyöhyke"
-
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Status Details"
-msgstr "_Tilan yksityiskohdat"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopioi valittu tehtävä"
@@ -19223,18 +18635,10 @@ msgid "Print the list of tasks"
 msgstr "Tulosta lista tehtävistä"
 
 #: ../ui/evolution-tasks.xml.h:18
-msgid "Show task preview window"
-msgstr "Näytä tehtävien esikatseluruutu"
-
-#: ../ui/evolution-tasks.xml.h:19
-msgid "Task _Preview"
-msgstr "Tehtävien _esikatselu"
-
-#: ../ui/evolution-tasks.xml.h:20
 msgid "View the selected task"
 msgstr "Näytä valitut tehtävät"
 
-#: ../ui/evolution-tasks.xml.h:27
+#: ../ui/evolution-tasks.xml.h:25
 msgid "_Open Task"
 msgstr "Avaa _tehtävä"
 
@@ -19348,62 +18752,58 @@ msgid "Tool_bar style"
 msgstr "_Työkalupalkin tyyli"
 
 #: ../ui/evolution.xml.h:33
-msgid "View/Hide the Status Bar"
-msgstr "Näytä/piilota tilarivi"
-
-#: ../ui/evolution.xml.h:34
 msgid "_About Evolution..."
 msgstr "_Tietoja Evolutionista"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:34
 msgid "_Close Window"
 msgstr "_Sulje ikkuna"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:37
+msgid "_Help"
+msgstr "O_hje"
+
+#: ../ui/evolution.xml.h:38
 msgid "_Hide buttons"
 msgstr "_Piilota napit"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:39
 msgid "_Icons only"
 msgstr "Vain _kuvakkeina"
 
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:40
 msgid "_Import..."
 msgstr "_Tuo..."
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:41
 msgid "_New"
 msgstr "_Uusi"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:42
 msgid "_Quick Reference"
 msgstr "_Pikaopas"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:43
 msgid "_Quit"
 msgstr "_Lopeta"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:44
 msgid "_Send / Receive"
 msgstr "_Lähetä / Vastaanota"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:45
 msgid "_Switcher Appearance"
 msgstr "Valit_simen tyyli"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:46
 msgid "_Synchronization Options..."
 msgstr "_Pilotin synkronointi..."
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:47
 msgid "_Text only"
 msgstr "Vain _teksti"
 
-#: ../ui/evolution.xml.h:50
-msgid "_View Status Bar"
-msgstr "_Näytä tilarivi"
-
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:49
 msgid "_Window"
 msgstr "_Ikkuna "
 
@@ -19463,10 +18863,6 @@ msgstr "_Vastaus viestiin-lipun mukaan"
 msgid "_Messages"
 msgstr "_Viestit"
 
-#: ../views/memos/galview.xml.h:1
-msgid "_Memos"
-msgstr "_Muistilaput"
-
 #: ../views/tasks/galview.xml.h:1
 msgid "With _Due Date"
 msgstr "_Eräpäivän kanssa"
@@ -19554,20 +18950,9 @@ msgstr "Luo uusi _näkymä"
 msgid "_Replace existing view"
 msgstr "_Korvaa olemassaoleva näkymä"
 
-#. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:585
-#: ../widgets/menus/gal-view-menus.c:350
-msgid "Custom View"
-msgstr "Oma näkymä"
-
-#: ../widgets/menus/gal-view-instance.c:586
-msgid "Save Custom View"
-msgstr "Tallenna oma näkymä"
-
-#: ../widgets/menus/gal-view-instance.c:590
-#: ../widgets/menus/gal-view-menus.c:372
-msgid "Define Views..."
-msgstr "Määrittele näkymät..."
+#: ../widgets/menus/gal-view-menus.c:291
+msgid "_Current View"
+msgstr "_Nykyinen näkymä"
 
 #: ../widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View..."
@@ -19676,7 +19061,7 @@ msgstr "Minimileveys"
 msgid "Spacing"
 msgstr "Välistys"
 
-#: ../widgets/misc/e-cell-date-edit.c:232 ../widgets/misc/e-dateedit.c:453
+#: ../widgets/misc/e-cell-date-edit.c:232 ../widgets/misc/e-dateedit.c:451
 msgid "Now"
 msgstr "Nyt"
 
@@ -19789,19 +19174,19 @@ msgstr "Tekstikenttä päiväyksen syöttöön"
 msgid "Text Date Entry"
 msgstr "Tekstikentää päiväykselle"
 
-#: ../widgets/misc/e-dateedit.c:354
+#: ../widgets/misc/e-dateedit.c:353
 msgid "Click this button to show a calendar"
 msgstr "Paina tästä näyttääksesi kalenterin"
 
-#: ../widgets/misc/e-dateedit.c:355
+#: ../widgets/misc/e-dateedit.c:354
 msgid "Date Button"
 msgstr "Päiväyspainike"
 
-#: ../widgets/misc/e-dateedit.c:376
+#: ../widgets/misc/e-dateedit.c:374
 msgid "Combo box to select time"
 msgstr "Yhdistelmävalitsin ajan valitsemiseen"
 
-#: ../widgets/misc/e-dateedit.c:377
+#: ../widgets/misc/e-dateedit.c:375
 msgid "Time Combo Box"
 msgstr "Ajan yhdistelmävalitsin"
 
@@ -19924,41 +19309,41 @@ msgstr "Sarakkeen leveys"
 
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:346
+#: ../widgets/misc/e-search-bar.c:345
 msgid "Search Text Entry"
 msgstr "Haettava teksti"
 
-#: ../widgets/misc/e-search-bar.c:550
+#: ../widgets/misc/e-search-bar.c:549
 msgid "_Search"
 msgstr "_Etsi"
 
-#: ../widgets/misc/e-search-bar.c:556
+#: ../widgets/misc/e-search-bar.c:555
 msgid "_Find Now"
 msgstr "_Etsi nyt"
 
-#: ../widgets/misc/e-search-bar.c:557 ../widgets/misc/e-search-bar.c:944
+#: ../widgets/misc/e-search-bar.c:556 ../widgets/misc/e-search-bar.c:943
 msgid "_Clear"
 msgstr "_Tyhjennä"
 
-#: ../widgets/misc/e-search-bar.c:648
+#: ../widgets/misc/e-search-bar.c:647
 msgid "Search Type"
 msgstr "Haun tyyppi"
 
-#: ../widgets/misc/e-search-bar.c:852
+#: ../widgets/misc/e-search-bar.c:851
 msgid "Item ID"
 msgstr "Kohteen ID"
 
-#: ../widgets/misc/e-search-bar.c:859
+#: ../widgets/misc/e-search-bar.c:858
 msgid "Subitem ID"
 msgstr "Alikohteen ID"
 
-#: ../widgets/misc/e-search-bar.c:866 ../widgets/text/e-entry.c:1249
+#: ../widgets/misc/e-search-bar.c:865 ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3462
 #: ../widgets/text/e-text.c:3463
 msgid "Text"
 msgstr "Teksti"
 
-#: ../widgets/misc/e-search-bar.c:946
+#: ../widgets/misc/e-search-bar.c:945
 msgid "Find _Now"
 msgstr "_Etsi nyt"
 
@@ -20663,60 +20048,453 @@ msgstr "IM-konteksti"
 msgid "Handle Popup"
 msgstr "Kahvan ponnahdusikkuna"
 
-#~ msgid "description of appointment"
-#~ msgstr "tapaamisen kuvaus"
+#~ msgid "The Proxy tab will be available only when the account is online."
+#~ msgstr ""
+#~ "Välimuistin välilehti on käytettävissä vain jos tili on yhteydellisessä "
+#~ "tilassa."
+
+#~ msgid "Mo_ve to Folder..."
+#~ msgstr "_Siirrä kansioon..."
+
+#~ msgid "Unknown error verifying signed messaage"
+#~ msgstr "Tuntematon virhe varmennettaessa viestin allekirjoitusta"
+
+#~ msgid "Unknown error decrypting messaage"
+#~ msgstr "Tuntematon virhe purettaessa viestin salausta"
+
+#~ msgid "FIll stipple"
+#~ msgstr "Täytön kuviopeite"
+
+#~ msgid "vFolders"
+#~ msgstr "vKansiot"
+
+#~ msgid "Create _vFolder"
+#~ msgstr "Luo vKansio"
+
+#~ msgid "v_Folders"
+#~ msgstr "v_Kansiot"
+
+#~ msgid "vFolder source"
+#~ msgstr "vKansion lähde"
+
+#~ msgid "Edit vFolder"
+#~ msgstr "Muokkaa vKansiota"
+
+#~ msgid "New vFolder"
+#~ msgstr "Uusi vKansio"
+
+#~ msgid "SaveDraft"
+#~ msgstr "Tallenna luonnos"
+
+#~ msgid "_Host:"
+#~ msgstr "_Isäntäpalvelin:"
+
+#~ msgid "Message _List As"
+#~ msgstr "_Viestilista"
+
+#~ msgid "_New Search _Folder (FIXME)"
+#~ msgstr "Uusi hakukansio (FIXME)"
+
+#~ msgid "Evolution _FAQ"
+#~ msgstr "Evolutionin _FAQ"
+
+#~ msgid ""
+#~ "Could not read folder permissions.\n"
+#~ "Unable to edit delegates."
+#~ msgstr ""
+#~ "Kansion oikeuksia ei voitu lukea.\n"
+#~ "Valtuutuksia ei voida muokata."
 
-#~ msgid "Schedulin_g"
-#~ msgstr "_Ajanvaraus"
+#~ msgid "Could not update folder permissions. %s"
+#~ msgstr "Kansion oikeuksia ei voitu päivittää. %s"
 
-#~ msgid "In_vitations"
-#~ msgstr "_Kutsut"
+#~ msgid ""
+#~ "Unable to add user to access control list:\n"
+#~ "No Global Catalog server is configured for this account."
+#~ msgstr ""
+#~ "Käyttäjää ei voida lisätä pääsylistalle:\n"
+#~ "Tilille ei ole määritelty yhteistä luettelopalvelinta."
 
-#~ msgid "<b>Basics</b>"
-#~ msgstr "<b>Perusasiat</b>"
+#~ msgid ""
+#~ "Evolution has found Gnome Calendar files.\n"
+#~ "Would you like to import them into Evolution?"
+#~ msgstr ""
+#~ "Evolution löysi Gnome-kalenterin tiedostoja.\n"
+#~ "Haluatko tuoda nämä Evolutioniin?"
 
-#~ msgid "<b>Date and Time</b>"
-#~ msgstr "<b>Päiväys ja aika</b>"
+#~ msgid "Evolution Netscape Mail importer"
+#~ msgstr "Evolutionin Netscape sähköpostin tuoja"
 
-#~ msgid "<b>Send Options</b>"
-#~ msgstr "<b>Lähetyksen valinnat</b>"
+#~ msgid "Evolution Outlook Express 4 importer"
+#~ msgstr "Evolution Outlook Express 4 tuoja"
 
-#~ msgid "Ala_rm"
-#~ msgstr "_Hälytys"
+#~ msgid "Evolution mbox importer"
+#~ msgstr "Evolution mbox-tuoja"
 
-#~ msgid "This appointment has customized alarms"
-#~ msgstr "Tässä tapaamisessa on muokattuja hälytyksiä"
+#~ msgid "MBox (mbox)"
+#~ msgstr "MBox (mbox)"
+
+#~ msgid "Outlook Express 4 (.mbx)"
+#~ msgstr "Outlook Express 4 (.mbx)"
+
+#~ msgid "Evolution is importing your old Elm mail"
+#~ msgstr "Evolution tuo vanhoja Elm-sähköpostejasi"
+
+#~ msgid ""
+#~ "Evolution has found Elm mail files\n"
+#~ "Would you like to import them into Evolution?"
+#~ msgstr ""
+#~ "Evolution löysi Elmin sähköpostitiedostoja.\n"
+#~ "Haluatko tuoda nämä Evolutioniin?"
 
-#~ msgid "Assig_nment"
-#~ msgstr "Tehtävä_nanto"
+#~ msgid "Elm"
+#~ msgstr "Elm"
 
-#~ msgid "Task Description"
-#~ msgstr "Tehtävän kuvaus"
+#~ msgid "Evolution is importing your old Pine data"
+#~ msgstr "Evolution tuo vanhoja Pinen tietojasi"
 
 #~ msgid ""
-#~ "The suggested filename extension of this filetype (%s) is unused in the "
-#~ "chosen filename. Do you want to continue?"
+#~ "Evolution has found Pine mail files.\n"
+#~ "Would you like to import them into Evolution?"
 #~ msgstr ""
-#~ "Suositeltu tiedoston pääte tälle tiedostotyypille (%s) ei ole käytössä "
-#~ "valitussa tiedostonimessä. Haluatko jatkaa?"
+#~ "Evolution löysi Pinen sähköpostitiedostoja.\n"
+#~ "Haluatko tuoda nämä Evolutioniin?"
 
-#~ msgid "Meetings and Tasks"
-#~ msgstr "Kokoukset ja tehtävät"
+#~ msgid "Pine"
+#~ msgstr "Pine"
+
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importing item %d."
+#~ msgstr ""
+#~ "Tuodaan %s\n"
+#~ "Tuodaan osaa %d."
+
+#~ msgid "Select importer"
+#~ msgstr "Valitse tuoja"
+
+#~ msgid "Importing"
+#~ msgstr "Tuodaan"
+
+#~ msgid "Importing %s.\n"
+#~ msgstr "Tuodaan %s.\n"
+
+#~ msgid "Error loading %s"
+#~ msgstr "Virhe %s:n lataamisessa"
+
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importing item 1."
+#~ msgstr ""
+#~ "Tuodaan %s\n"
+#~ "Tuodaan ensimmäistä tietoa"
 
-#~ msgid "Discard Changes"
-#~ msgstr "Hylkää muutokset"
+#~ msgid "Automatic"
+#~ msgstr "Automaattinen"
 
-#~ msgid "_Attachment Bar (drop attachments here)"
-#~ msgstr "_Liitepalkki (raahaa tähän liitteitä)"
+#~ msgid ""
+#~ "Please wait...\n"
+#~ "Scanning for existing setups"
+#~ msgstr ""
+#~ "Odota...\n"
+#~ "Etsitään olemassaolevia asetuksia"
+
+#~ msgid "Starting Intelligent Importers"
+#~ msgstr "Älykkäät tuojat käynnistyvät"
+
+#~ msgid "No importer available for file %s"
+#~ msgstr "Tiedostolel '%s' ei ole käytettävissä tuojaa"
+
+#~ msgid "Unable to execute importer"
+#~ msgstr "Tuojan suoritus epäonnistui"
+
+#~ msgid "Importers"
+#~ msgstr "Tuojat"
+
+#~ msgid "Don't import"
+#~ msgstr "Älä tuo"
+
+#~ msgid "Don't ask me again"
+#~ msgstr "Älä kysy tätä enää uudelleen"
+
+#~ msgid "Evolution can import data from the following files:"
+#~ msgstr "Evolution voi tuoda tietoa seuraavista tiedostoista:"
+
+#~ msgid "Show _Messages"
+#~ msgstr "Näytä _viestit"
+
+#~ msgid "Un_read Messages"
+#~ msgstr "L_ukemattomat viestit"
+
+#~ msgid "_All"
+#~ msgstr "K_aikki"
+
+#~ msgid "_Tools"
+#~ msgstr "T_yökalut"
+
+#~ msgid "From:"
+#~ msgstr "Lähettäjä:"
+
+#~ msgid "Out of office Message:"
+#~ msgstr "<b>Ei tavoitettavissa:</b>"
+
+#~ msgid "<b>%s</b> requests the presence of %s at the following meeting:"
+#~ msgstr "<b>%s</b> pyytää %s:n läsnäoloa seuraavassa kokouksessa:"
+
+#~ msgid "Your server needs to be updated"
+#~ msgstr "Palvelimesti täytyy päivittää"
+
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr ""
+#~ "Haluatko varmasti\n"
+#~ "poistaa tämän yhteystiedon?"
 
-#~ msgid "_Alarm"
-#~ msgstr "_Hälytys"
+#~ msgid "Save Appointment"
+#~ msgstr "Tallenna tapaaminen"
+
+#~ msgid ""
+#~ "Some features may not work correctly with your current server version "
+#~ msgstr ""
+#~ "Jotkut ominaisuudet eivät toimi oikein palvelimesi nykyisen version "
+#~ "kanssa "
+
+#~ msgid "Appointment Title"
+#~ msgstr "Tapaamisen aihe"
+
+#~ msgid "end-time"
+#~ msgstr "loppumisaika"
+
+#~ msgid "start-time"
+#~ msgstr "alkamisaika"
+
+#~ msgid "Show _Attachment Bar (drop attachments here)"
+#~ msgstr "Näytä _liitepalkki (tiputa liitteitä tähän)"
+
+#~ msgid "Attachment Button: Press space key to toggle attachment bar"
+#~ msgstr "Liitepainike: Paina välilyntöä, jos haluat nähdä liitepalkin"
+
+#~ msgid "Ad_vanced  send options"
+#~ msgstr "_Edistyneet lähetyksen asetukset"
+
+#~ msgid "N"
+#~ msgstr "P"
+
+#~ msgid "S"
+#~ msgstr "E"
+
+#~ msgid "W"
+#~ msgstr "L"
+
+#~ msgid "<b>If</b>"
+#~ msgstr "<b>Jos</b>"
+
+#~ msgid "port for starting user runned spamd"
+#~ msgstr "Portti, jossa käyttäjän spamd-palvelinta ajetaan"
+
+#~ msgid "spamd port"
+#~ msgstr "Spamd:n portti"
+
+#~ msgid "_Load images if sender is in address book"
+#~ msgstr "_Lataa kuvat, jos lähettäjä on osoitekirjassa"
+
+#~ msgid "{1}."
+#~ msgstr "{1}."
+
+#~ msgid "Mark  as default folder"
+#~ msgstr "Merkitse oletuskansioksi"
+
+#~ msgid "Manage Plugins..."
+#~ msgstr "Hallitse liitännäisiä..."
+
+#~ msgid "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
+#~ msgstr "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
+
+#~ msgid ""
+#~ "Uid%sSummary%sDescription List%sCategories List%sComment List%sCompleted%"
+#~ "sCreated%sContact List%sStart%sEnd%sDue%sPercent Done%sPriority%sUrl%"
+#~ "sAttendees List%sLocation%sModified%s"
+#~ msgstr ""
+#~ "Uid%sYhteenveto%sLista kuvauksista%sLista luokista%sLista kommenteista%"
+#~ "sValmiina%sLuotu%sLista yhteystiedoista%sAlkoi%sLoppui%sErääntyy%"
+#~ "sProsenttia tehty%sPrioriteetti%sUrl%sLista läsnäolijoista%sSijainti%"
+#~ "sMuokattu%s"
+
+#~ msgid "Invalid user"
+#~ msgstr "Virheellinen käyttäjä"
+
+#~ msgid ""
+#~ "\n"
+#~ "You cannot share folder with specified user \"{0}\" \n"
+#~ msgstr ""
+#~ "\n"
+#~ "Et voi jakaa kansiota annetun käyttäjän \"{0}\" kanssa\n"
+
+#~ msgid "Specify User"
+#~ msgstr "Määritelty käyttäjä"
+
+#~ msgid ""
+#~ "\n"
+#~ "\tYou have to specify a user name whom you want to add to the list \n"
+#~ msgstr ""
+#~ "\n"
+#~ "\tSinun täytyy määritellä käyttäjänimi, jonka haluat lisätä listalle \n"
+
+#~ msgid "Closing connections..."
+#~ msgstr "Suljetaan yhteyksiä...."
+
+#~ msgid "Starting import"
+#~ msgstr "Aloitetaan tuonti"
+
+#~ msgid ""
+#~ "If you quit the Evolution Setup Assistant now, all of the information "
+#~ "that you have entered will be forgotten. You will need to run this "
+#~ "assistant again before using Evolution.\n"
+#~ "\n"
+#~ "Do you want to quit using the Assistant now?"
+#~ msgstr ""
+#~ "Jos suljet Evolutionin asetusapulaisen nyt, kaikki syöttämäsi tieto "
+#~ "unohdetaan. Sinun täytyy ajaa tämä apulainen uudestaan ennen kuin voit "
+#~ "käyttää Evolutionia.\n"
+#~ "\n"
+#~ "Haluatko suljea apulaisen?"
+
+#~ msgid "Importing Files"
+#~ msgstr "Tuodaan tiedostoja"
+
+#~ msgid "Timezone "
+#~ msgstr "Aikavyöhyke "
+
+#~ msgid ""
+#~ "You have successfully entered all of the information needed to set up "
+#~ "Evolution. \n"
+#~ "\n"
+#~ "Click the \"Apply\" button to save your settings. "
+#~ msgstr ""
+#~ "Kaikki tarvittavat tiedot on nyt onnistuneesti syötetty Evolutioniin.\n"
+#~ "\n"
+#~ "Valitse \"Toteuta\" tallentaaksesi asetuksesi."
+
+#~ msgid "Disable the mono plugin environment."
+#~ msgstr "Älä käytä mono-liitännäisiä."
+
+#~ msgid "Cannot start Evolution"
+#~ msgstr "Evolutionia ei voitu käynnistää"
+
+#~ msgid "_Filters..."
+#~ msgstr "S_uodattimet..."
+
+#~ msgid "vFolder _Editor..."
+#~ msgstr "vKansioiden _muokkain..."
+
+#~ msgid "Mark All as _Read"
+#~ msgstr "Merkitse ka_ikki luetuksi"
+
+#~ msgid "_Folder"
+#~ msgstr "_Kansio"
+
+#~ msgid "_Threaded Message List"
+#~ msgstr "Säikeis_tetty viesti-ikkuna"
+
+#~ msgid "Create _vFolder From Message"
+#~ msgstr "_Luo viestistä vKansio"
+
+#~ msgid "F_orward As..."
+#~ msgstr "_Välitä muodossa..."
+
+#~ msgid "Filter _Junk"
+#~ msgstr "Suodata _roskapostia"
+
+#~ msgid "Mark as I_mportant"
+#~ msgstr "Merkitse _tärkeäksi"
+
+#~ msgid "Mark as Unimp_ortant"
+#~ msgstr "Merkitse _samantekeväksi"
+
+#~ msgid "S_earch in Message..."
+#~ msgstr "_Etsi viestistä..."
+
+#~ msgid "S_maller"
+#~ msgstr "_Pienempi"
+
+#~ msgid "Show Email _Source"
+#~ msgstr "Näytä sähköpostin _lähdekoodi"
+
+#~ msgid "Text Si_ze"
+#~ msgstr "Tekstin _koko"
+
+#~ msgid "_Attached"
+#~ msgstr "_Liitetty"
+
+#~ msgid "_Create Filter From Message"
+#~ msgstr "_Luo viestistä suodatin"
+
+#~ msgid "_Inline"
+#~ msgstr "_Sisäkkäisesti"
+
+#~ msgid "_Larger"
+#~ msgstr "_Suurempi"
+
+#~ msgid "_Message Display"
+#~ msgstr "_Viestin näyttö"
+
+#~ msgid "_Open Message"
+#~ msgstr "_Avaa viesti"
+
+#~ msgid "_Undelete"
+#~ msgstr "_Palauta"
+
+#~ msgid "Show / hide attachments"
+#~ msgstr "Näytä / piilota liitetiedostot"
+
+#~ msgid "Show _attachments"
+#~ msgstr "Näytä _liitteet"
+
+#~ msgid "Show attachments"
+#~ msgstr "Näytä liitteet"
+
+#~ msgid "E_xit"
+#~ msgstr "_Lopeta"
+
+#~ msgid "Window B_uttons"
+#~ msgstr "Ikkunan _napit"
+
+#~ msgid "_Advanced..."
+#~ msgstr "_Lisäasetukset..."
+
+#~ msgid ""
+#~ "None\n"
+#~ "Mail Receipt\n"
+#~ msgstr ""
+#~ "Ei mitään\n"
+#~ "Vastaanottaja\n"
+
+#~ msgid ""
+#~ " Some features may not work correctly with your current server version"
+#~ msgstr ""
+#~ "Jotkut ominaisuudet eivät toimi oikein nykyisen palvelinversioisi kanssa"
+
+#~ msgid "_Remember this password"
+#~ msgstr "_Muista tämä salasana"
+
+#~ msgid "_Remember this password for the remainder of this session"
+#~ msgstr "Muista salasana tämän istunnon loppuun asti"
+
+#~ msgid ""
+#~ "\n"
+#~ " Please read carefully the license agreement displayed\n"
+#~ " below and tick the check box for accepting it\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Lue tarkkaan allaoleva lisenssisopimus ja laita rasti ruutuun\n"
+#~ "jos hyväksyt lisenssin\n"
 
-#~ msgid "_Delegate To..."
-#~ msgstr "_Valtuuta..."
+#~ msgid "Add Sender to Address_book"
+#~ msgstr "Lisää lähettäjä _osoitekirjaan"
 
-#~ msgid "Current View"
-#~ msgstr "Nykyinen näkymä"
+#~ msgid "Appl_y Filters"
+#~ msgstr "Toteuta _suodattimet"
 
-#~ msgid "_Preview Pane"
-#~ msgstr "_Esikatseluruutu"
+#~ msgid "F_ilter Junk"
+#~ msgstr "_Suodata roskapostit"
diff --git a/po/fr.po b/po/fr.po
index 4077ed9006..175a5b684d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -18,10 +18,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.4.0\n"
+"Project-Id-Version: evolution 2.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-11 17:30+0200\n"
-"PO-Revision-Date: 2005-09-07 21:01+0200\n"
+"POT-Creation-Date: 2005-10-20 01:00+0200\n"
+"PO-Revision-Date: 2005-10-20 00:43+0200\n"
 "Last-Translator: Christophe Merlet (RedFox) <redfox@redfoxcenter.org>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -53,7 +53,7 @@ msgstr[0] "dossier actuel du carnet d'adresses possède %d carte"
 msgstr[1] "dossier actuel du carnet d'adresses possède %d cartes"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../calendar/gui/alarm-notify/alarm-queue.c:953
+#: ../calendar/gui/alarm-notify/alarm-queue.c:965
 #: ../ui/evolution-message-composer.xml.h:11
 msgid "Open"
 msgstr "Ouvrir"
@@ -107,7 +107,7 @@ msgstr "Nouveau rendez-vous"
 msgid "New All Day Event"
 msgstr "Nouvel événement journée entière"
 
-#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1505
+#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1522
 msgid "New Meeting"
 msgstr "Nouvelle réunion"
 
@@ -499,7 +499,7 @@ msgstr ""
 "Vos contacts pour {0} ne seront plus disponibles tant que Evolution n'a pas "
 "été redémarré."
 
-#: ../addressbook/addressbook.error.xml.h:31 ../mail/em-vfolder-rule.c:494
+#: ../addressbook/addressbook.error.xml.h:31 ../mail/em-vfolder-rule.c:495
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
@@ -797,12 +797,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Accès anonyme au serveur LDAP"
 
 #: ../addressbook/gui/component/addressbook.c:191
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:485
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:490
 msgid "Failed to authenticate.\n"
 msgstr "L'authentification a échoué.\n"
 
 #: ../addressbook/gui/component/addressbook.c:198
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:464
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:469
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Saisissez le mot de passe pour %s (utilisateur %s)"
@@ -2495,7 +2495,7 @@ msgstr "_Nom complet :"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:316
 msgid "E-_mail:"
-msgstr "_Adresse électionique :"
+msgstr "_Adresse électronique :"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:323
 #, c-format
@@ -2630,8 +2630,8 @@ msgstr "_Service d'IM :"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:215
-#: ../plugins/exchange-operations/exchange-contacts.c:193
+#: ../plugins/exchange-operations/exchange-calendar.c:224
+#: ../plugins/exchange-operations/exchange-contacts.c:203
 msgid "_Location:"
 msgstr "_Emplacement :"
 
@@ -2821,14 +2821,14 @@ msgstr "Carnet d'adresses"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:807
 #: ../addressbook/gui/widgets/e-addressbook-view.c:936
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2011
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ../ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Enregistrer comme VCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:930
-#: ../calendar/gui/e-calendar-table.c:1154
-#: ../calendar/gui/e-calendar-view.c:1528 ../ui/evolution-addressbook.xml.h:37
+#: ../calendar/gui/e-calendar-table.c:1167
+#: ../calendar/gui/e-calendar-view.c:1545 ../ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Ouvrir"
 
@@ -2862,7 +2862,7 @@ msgid "Send Message to Contacts"
 msgstr "Envoyer un message aux contacts"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:942
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2501
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2510
 #: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
 #: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
@@ -2894,12 +2894,12 @@ msgid "Paste"
 msgstr "Coller"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1562
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1565
 #: ../calendar/gui/cal-search-bar.c:346
 msgid "Any Category"
 msgstr "Toute catégorie"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1761
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1766
 msgid "Print cards"
 msgstr "Imprimer les cartes"
 
@@ -2943,7 +2943,7 @@ msgid "Company Phone"
 msgstr "Téléphone (société)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:564
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 #: ../smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "Adresse électronique"
@@ -3237,7 +3237,7 @@ msgid "WWW"
 msgstr "Web"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:378
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
 msgid "Blog"
 msgstr "Blog"
 
@@ -3245,11 +3245,11 @@ msgstr "Blog"
 msgid "personal"
 msgstr "personnel"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "Fonction"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "Site internet"
 
@@ -3308,7 +3308,7 @@ msgstr "Protocole non supporté"
 #: ../calendar/gui/e-cal-component-preview.c:232
 #: ../calendar/gui/e-cal-model-tasks.c:348
 #: ../calendar/gui/e-cal-model-tasks.c:661
-#: ../calendar/gui/e-calendar-table.c:456 ../calendar/gui/print.c:2364
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2373
 msgid "Cancelled"
 msgstr "Annulée"
 
@@ -3607,18 +3607,18 @@ msgstr "Vue carte"
 msgid "GTK Tree View"
 msgstr "Affichage de l'arborescence GTK"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:486
+#: ../addressbook/importers/evolution-ldif-importer.c:582
 #: ../addressbook/importers/evolution-vcard-importer.c:249
 #: ../calendar/importers/icalendar-importer.c:311
 #: ../calendar/importers/icalendar-importer.c:643 ../shell/shell.error.xml.h:6
 msgid "Importing ..."
 msgstr "Importation..."
 
-#: ../addressbook/importers/evolution-ldif-importer.c:652
+#: ../addressbook/importers/evolution-ldif-importer.c:748
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:653
+#: ../addressbook/importers/evolution-ldif-importer.c:749
 msgid "Evolution LDIF importer"
 msgstr "Assistant d'importation LDIF d'Evolution"
 
@@ -3635,12 +3635,12 @@ msgstr "Assistant d'importation VCard d'Evolution"
 msgid "Print envelope"
 msgstr "Imprimer l'enveloppe"
 
-#: ../addressbook/printing/e-contact-print.c:1001
+#: ../addressbook/printing/e-contact-print.c:1014
 msgid "Print contacts"
 msgstr "Imprimer les contacts"
 
-#: ../addressbook/printing/e-contact-print.c:1066
-#: ../addressbook/printing/e-contact-print.c:1093
+#: ../addressbook/printing/e-contact-print.c:1104
+#: ../addressbook/printing/e-contact-print.c:1132
 msgid "Print contact"
 msgstr "Imprimer les contacts"
 
@@ -3793,9 +3793,9 @@ msgstr "Ombrage"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:917
-#: ../plugins/exchange-operations/exchange-calendar.c:205
-#: ../plugins/exchange-operations/exchange-contacts.c:176
+#: ../plugins/exchange-operations/exchange-account-setup.c:940
+#: ../plugins/exchange-operations/exchange-calendar.c:214
+#: ../plugins/exchange-operations/exchange-contacts.c:186
 msgid "Size:"
 msgstr "Taille :"
 
@@ -4272,7 +4272,7 @@ msgstr "_Envoyer"
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:301
+#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:312
 #: ../smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Saisissez le mot de passe"
@@ -4281,15 +4281,15 @@ msgstr "Saisissez le mot de passe"
 msgid "Split Multi-Day Events:"
 msgstr "Partager les événements sur plusieurs jours :"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1365
-#: ../calendar/conduits/calendar/calendar-conduit.c:1366
+#: ../calendar/conduits/calendar/calendar-conduit.c:1377
+#: ../calendar/conduits/calendar/calendar-conduit.c:1378
 #: ../calendar/conduits/todo/todo-conduit.c:879
 #: ../calendar/conduits/todo/todo-conduit.c:880
 msgid "Could not start evolution-data-server"
 msgstr "Impossible de démarrer evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1474
-#: ../calendar/conduits/calendar/calendar-conduit.c:1477
+#: ../calendar/conduits/calendar/calendar-conduit.c:1486
+#: ../calendar/conduits/calendar/calendar-conduit.c:1489
 msgid "Could not read pilot's Calendar application block"
 msgstr "Impossible de lire les données du bloc Calendrier du Pilot."
 
@@ -4342,13 +4342,13 @@ msgid "Evolution's Tasks component"
 msgstr "Composant Tâches d'Evolution"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#: ../calendar/gui/e-tasks.c:1257 ../calendar/gui/print.c:1822
+#: ../calendar/gui/e-tasks.c:1283 ../calendar/gui/print.c:1831
 #: ../calendar/gui/tasks-component.c:519
-#: ../calendar/gui/tasks-component.c:1006 ../calendar/gui/tasks-control.c:457
+#: ../calendar/gui/tasks-component.c:1013 ../calendar/gui/tasks-control.c:456
 #: ../calendar/importers/icalendar-importer.c:79
 #: ../calendar/importers/icalendar-importer.c:707
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:582
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:589
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Tâches"
@@ -4372,11 +4372,11 @@ msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:248
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:250
 msgid "Start time"
 msgstr "Heure de début"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:349
 #, c-format
 msgid ""
 "<big><b>%s</b></big>\n"
@@ -4392,7 +4392,7 @@ msgstr "Rendez-vous"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/e-itip-control.c:1120
+#: ../calendar/gui/e-itip-control.c:1117
 #: ../plugins/itip-formatter/itip-view.c:884
 msgid "Location:"
 msgstr "Lieu :"
@@ -4428,28 +4428,28 @@ msgstr "description du rendez-vous"
 msgid "location of appointment"
 msgstr "lieu du rendez-vous"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:954
+#: ../calendar/gui/alarm-notify/alarm-queue.c:966
 msgid "Dismiss"
 msgstr "Faire disparaître"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:955
+#: ../calendar/gui/alarm-notify/alarm-queue.c:967
 msgid "Dismiss All"
 msgstr "Faire tout disparaître"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1037
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1049
 msgid "No summary available."
 msgstr "Aucun résumé disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1046
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1048
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1058
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1060
 msgid "No description available."
 msgstr "Aucune description disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1056
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1068
 msgid "No location information available."
 msgstr "Aucune information sur l'emplacement disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1072
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1084
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -4462,12 +4462,12 @@ msgstr ""
 "Débute à %s\n"
 "Fini à %s"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1175
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1199
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1187
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1211
 msgid "Warning"
 msgstr "Avertissement"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1179
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1191
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4480,7 +4480,7 @@ msgstr ""
 "un courriel. Evolution affichera une fenêtre\n"
 "d'avertissement classique à la place."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1205
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1217
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4497,15 +4497,15 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment lancer ce programme ?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1219
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1231
 msgid "Do not ask me about this program again."
 msgstr "Ne plus me demander à propos de ce programme."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:140
+#: ../calendar/gui/alarm-notify/notify-main.c:147
 msgid "Could not initialize Bonobo"
 msgstr "Impossible d'initialiser Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:151
+#: ../calendar/gui/alarm-notify/notify-main.c:158
 msgid "Could not create the alarm notify service factory"
 msgstr "Impossible de créer la fabrique de services de notification d'alarme"
 
@@ -4885,10 +4885,10 @@ msgstr "Différent"
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:708
 #: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/gnome-cal.c:2094
+#: ../calendar/gui/gnome-cal.c:2113
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:581
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:588
 msgid "Calendar"
 msgstr "Calendrier"
 
@@ -4942,7 +4942,7 @@ msgstr "Nouveau calendrier"
 msgid "Failed upgrading calendars."
 msgstr "Échec de la mise à jour des calendriers."
 
-#: ../calendar/gui/calendar-component.c:1154
+#: ../calendar/gui/calendar-component.c:1157
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
@@ -5202,7 +5202,7 @@ msgstr "_Enlever"
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:474
 #: ../calendar/gui/dialogs/comp-editor.c:1084
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3401 ../mail/em-folder-tree.c:2047
+#: ../composer/e-msg-composer.c:3401 ../mail/em-folder-tree.c:2052
 #: ../ui/evolution-mail-list.xml.h:29
 msgid "_Properties"
 msgstr "_Propriétés"
@@ -5267,7 +5267,7 @@ msgstr "Propriétés de la pièce jointe"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:267
-#: ../calendar/gui/e-itip-control.c:1166
+#: ../calendar/gui/e-itip-control.c:1163
 #: ../calendar/gui/e-itip-control.glade.h:6
 #: ../composer/e-msg-composer-attachment.glade.h:3
 #: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
@@ -5293,29 +5293,29 @@ msgstr "Type MIME :"
 msgid "Enabled"
 msgstr "Activé"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:733
 msgid "Are you sure you want to remove this URL?"
 msgstr "Êtes-vous sûr de vouloir supprimer cette URL ?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:736
 msgid "Remove"
 msgstr "Supprimer"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:738
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:741
 msgid "Don't Remove"
 msgstr "Ne pas supprimer"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:853
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:823
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:856
 #: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
 #: ../mail/em-account-prefs.c:406
 msgid "Disable"
 msgstr "Désactiver"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:855
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:823
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:858
 #: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
 #: ../mail/em-account-prefs.c:408
 msgid "Enable"
@@ -5411,8 +5411,8 @@ msgid "Free/Busy"
 msgstr "Libre/Occupé"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/recurrence-page.c:1049
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Friday"
 msgstr "Vendredi"
 
@@ -5425,8 +5425,8 @@ msgid "Minutes"
 msgstr "Minutes"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Monday"
 msgstr "Lundi"
 
@@ -5439,8 +5439,8 @@ msgid "S_un"
 msgstr "_Dim"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Saturday"
 msgstr "Samedi"
 
@@ -5453,8 +5453,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:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/recurrence-page.c:1051
+#: ../calendar/gui/e-itip-control.c:726
 msgid "Sunday"
 msgstr "Dimanche"
 
@@ -5471,8 +5471,8 @@ msgid "Template:"
 msgstr "Modèle :"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Thursday"
 msgstr "Jeudi"
 
@@ -5485,8 +5485,8 @@ msgid "Time format:"
 msgstr "Format de date :"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Tuesday"
 msgstr "Mardi"
 
@@ -5495,8 +5495,8 @@ msgid "W_eek starts:"
 msgstr "La s_emaine débute :"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Wednesday"
 msgstr "Mercredi"
 
@@ -5697,23 +5697,23 @@ msgstr "%s  Vous n'avez fait aucune modification. Mettre à jour l'éditeur ?"
 msgid "Validation error: %s"
 msgstr "Erreur de validation : %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2261
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2270
 msgid " to "
 msgstr " À "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2265
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2274
 msgid " (Completed "
 msgstr " (Terminé "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2267
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2276
 msgid "Completed "
 msgstr "Terminé "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2272
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2281
 msgid " (Due "
 msgstr " (Date d'échéance "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2274
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2283
 msgid "Due "
 msgstr "Date d'échéance "
 
@@ -5733,9 +5733,9 @@ msgstr[0] "Message attaché"
 msgstr[1] "%d messages attachés"
 
 #: ../calendar/gui/dialogs/comp-editor.c:428
-#: ../calendar/gui/e-calendar-table.c:1162
-#: ../calendar/gui/e-calendar-view.c:1535 ../composer/e-msg-composer.c:2911
-#: ../mail/em-folder-tree.c:974 ../mail/em-folder-view.c:1035
+#: ../calendar/gui/e-calendar-table.c:1175
+#: ../calendar/gui/e-calendar-view.c:1552 ../composer/e-msg-composer.c:2911
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1035
 #: ../mail/message-list.c:1708 ../ui/evolution-addressbook.xml.h:31
 #: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
 #: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-tasks.xml.h:21
@@ -5743,13 +5743,13 @@ msgid "_Copy"
 msgstr "_Copier"
 
 #: ../calendar/gui/dialogs/comp-editor.c:429 ../composer/e-msg-composer.c:2912
-#: ../mail/em-folder-tree.c:975 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
 #: ../mail/em-folder-view.c:931 ../mail/message-list.c:1709
 msgid "_Move"
 msgstr "_Déplacer"
 
 #: ../calendar/gui/dialogs/comp-editor.c:431 ../composer/e-msg-composer.c:2914
-#: ../mail/em-folder-tree.c:977 ../mail/message-list.c:1711
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1711
 msgid "Cancel _Drag"
 msgstr "Annuler le _déplacement"
 
@@ -5808,15 +5808,15 @@ msgstr "Entrée de journal - %s"
 msgid "No summary"
 msgstr "Aucun résumé"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2528
-#: ../calendar/gui/dialogs/comp-editor.c:2561
-#: ../calendar/gui/dialogs/comp-editor.c:2585
+#: ../calendar/gui/dialogs/comp-editor.c:2532
+#: ../calendar/gui/dialogs/comp-editor.c:2565
+#: ../calendar/gui/dialogs/comp-editor.c:2589
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Les changements apportés à cet élément peuvent être annulés en cas de "
 "réception d'une mise à jour."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2609
+#: ../calendar/gui/dialogs/comp-editor.c:2613
 msgid "Unable to use current version!"
 msgstr "Impossible d'utiliser la version courante !"
 
@@ -5898,7 +5898,7 @@ msgstr "Déléguer à :"
 msgid "Enter Delegate"
 msgstr "Saisissez un délégué"
 
-#: ../calendar/gui/dialogs/event-editor.c:141 ../calendar/gui/print.c:2298
+#: ../calendar/gui/dialogs/event-editor.c:141 ../calendar/gui/print.c:2307
 msgid "Appointment"
 msgstr "Rendez-vous"
 
@@ -5950,26 +5950,26 @@ msgstr "L'heure de début est erronée."
 msgid "End time is wrong"
 msgstr "L'heure de fin est erronée."
 
-#: ../calendar/gui/dialogs/event-page.c:1686
+#: ../calendar/gui/dialogs/event-page.c:1693
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Impossible d'ouvrir le calendrier « %s »."
 
-#: ../calendar/gui/dialogs/event-page.c:1892
+#: ../calendar/gui/dialogs/event-page.c:1894
 #, 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:1900
+#: ../calendar/gui/dialogs/event-page.c:1902
 #, 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:1908
+#: ../calendar/gui/dialogs/event-page.c:1910
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
@@ -6033,7 +6033,7 @@ msgstr "Classi_fication :"
 #: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:8
 #: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:360
+#: ../calendar/gui/e-calendar-table.c:364
 msgid "Confidential"
 msgstr "Confidentiel"
 
@@ -6048,14 +6048,14 @@ msgstr "L_ieu :"
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 #: ../calendar/gui/dialogs/task-page.glade.h:10
 #: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:359
+#: ../calendar/gui/e-calendar-table.c:363
 msgid "Private"
 msgstr "Privé"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:18
 #: ../calendar/gui/dialogs/task-page.glade.h:11
 #: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:358
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:362
 msgid "Public"
 msgstr "Public"
 
@@ -6106,7 +6106,7 @@ msgstr "<b>De :</b>"
 #: ../calendar/gui/dialogs/meeting-page.c:313
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:653
-#: ../calendar/gui/e-itip-control.c:1106 ../composer/e-msg-composer.c:2122
+#: ../calendar/gui/e-itip-control.c:1103 ../composer/e-msg-composer.c:2122
 #: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
 #: ../mail/em-account-editor.c:1348 ../mail/em-account-prefs.c:464
 #: ../mail/em-folder-view.c:1064 ../mail/em-junk-hook.c:78
@@ -6179,7 +6179,7 @@ msgid "RSVP"
 msgstr "Réponse S.V.P"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
-#: ../calendar/gui/dialogs/task-editor.c:147
+#: ../calendar/gui/dialogs/task-editor.c:146
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/e-meeting-list-view.c:394
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
@@ -6290,51 +6290,51 @@ msgstr "Cette instances et les instances futures"
 msgid "All Instances"
 msgstr "Toutes les occurrences"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:496
+#: ../calendar/gui/dialogs/recurrence-page.c:497
 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:817
+#: ../calendar/gui/dialogs/recurrence-page.c:818
 msgid "Recurrence date is invalid"
 msgstr "La date de la récurrence est non valide"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:928
+#: ../calendar/gui/dialogs/recurrence-page.c:929
 msgid "on"
 msgstr "le"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:988
+#: ../calendar/gui/dialogs/recurrence-page.c:989
 msgid "first"
 msgstr "premier"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:989
+#: ../calendar/gui/dialogs/recurrence-page.c:990
 msgid "second"
 msgstr "seconde"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:990
+#: ../calendar/gui/dialogs/recurrence-page.c:991
 msgid "third"
 msgstr "troisième"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:991
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "fourth"
 msgstr "quatrième"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#: ../calendar/gui/dialogs/recurrence-page.c:993
 msgid "last"
 msgstr "dernier"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1015
+#: ../calendar/gui/dialogs/recurrence-page.c:1016
 msgid "Other Date"
 msgstr "Autre date"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "day"
 msgstr "jour"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1180
+#: ../calendar/gui/dialogs/recurrence-page.c:1181
 msgid "on the"
 msgstr "le"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1369
+#: ../calendar/gui/dialogs/recurrence-page.c:1370
 msgid "occurrences"
 msgstr "occurrences"
 
@@ -6410,15 +6410,15 @@ msgstr "<span weight=\"bold\">État</span>"
 #: ../calendar/gui/e-cal-component-preview.c:229
 #: ../calendar/gui/e-cal-model-tasks.c:346
 #: ../calendar/gui/e-cal-model-tasks.c:659
-#: ../calendar/gui/e-calendar-table.c:455 ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/e-itip-control.c:895
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../calendar/gui/print.c:2361 ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/print.c:2370 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Achevée"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-calendar-table.c:380 ../mail/message-list.c:1008
+#: ../calendar/gui/e-calendar-table.c:384 ../mail/message-list.c:1008
 msgid "High"
 msgstr "Haute"
 
@@ -6427,19 +6427,19 @@ msgstr "Haute"
 #: ../calendar/gui/e-cal-model-tasks.c:344
 #: ../calendar/gui/e-cal-model-tasks.c:657
 #: ../calendar/gui/e-cal-model-tasks.c:732
-#: ../calendar/gui/e-calendar-table.c:454 ../calendar/gui/print.c:2358
+#: ../calendar/gui/e-calendar-table.c:458 ../calendar/gui/print.c:2367
 msgid "In Progress"
 msgstr "En cours"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1006
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1006
 msgid "Low"
 msgstr "Basse"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:381
+#: ../calendar/gui/e-cal-model.c:920 ../calendar/gui/e-calendar-table.c:385
 #: ../mail/message-list.c:1007
 msgid "Normal"
 msgstr "Normal"
@@ -6448,7 +6448,7 @@ msgstr "Normal"
 #: ../calendar/gui/e-cal-component-preview.c:236
 #: ../calendar/gui/e-cal-model-tasks.c:342
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:453 ../calendar/gui/print.c:2355
+#: ../calendar/gui/e-calendar-table.c:457 ../calendar/gui/print.c:2364
 msgid "Not Started"
 msgstr "Non démarrée"
 
@@ -6457,7 +6457,7 @@ msgid "P_ercent complete:"
 msgstr "Pourcentage _effectué :"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:11
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:387
 msgid "Undefined"
 msgstr "Indéfinie"
 
@@ -6478,13 +6478,13 @@ msgstr "_État :"
 msgid "_Web Page:"
 msgstr "Page _Web :"
 
-#: ../calendar/gui/dialogs/task-editor.c:138 ../calendar/gui/print.c:2300
+#: ../calendar/gui/dialogs/task-editor.c:137 ../calendar/gui/print.c:2309
 msgid "Task"
 msgstr "Tâche"
 
-#: ../calendar/gui/dialogs/task-editor.c:162
-#: ../calendar/gui/dialogs/task-editor.c:224
-#: ../calendar/gui/dialogs/task-editor.c:378
+#: ../calendar/gui/dialogs/task-editor.c:161
+#: ../calendar/gui/dialogs/task-editor.c:223
+#: ../calendar/gui/dialogs/task-editor.c:380
 msgid "Assignment"
 msgstr "Tâche"
 
@@ -6492,7 +6492,7 @@ msgstr "Tâche"
 msgid "Due date is wrong"
 msgstr "La date d'échéance est erronée."
 
-#: ../calendar/gui/dialogs/task-page.c:873
+#: ../calendar/gui/dialogs/task-page.c:880
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Impossible d'ouvrir les tâches dans '%s'."
@@ -6652,7 +6652,7 @@ msgid "Untitled"
 msgstr "Sans titre"
 
 #: ../calendar/gui/e-cal-component-preview.c:186
-#: ../calendar/gui/e-itip-control.c:1110
+#: ../calendar/gui/e-itip-control.c:1107
 #: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Résumé :"
@@ -6669,8 +6669,8 @@ msgstr "Date d'échéance :"
 #. write status
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:222
-#: ../calendar/gui/e-itip-control.c:1134
-#: ../plugins/exchange-operations/exchange-account-setup.c:263
+#: ../calendar/gui/e-itip-control.c:1131
+#: ../plugins/exchange-operations/exchange-account-setup.c:265
 #: ../plugins/itip-formatter/itip-view.c:909
 msgid "Status:"
 msgstr "État :"
@@ -6698,12 +6698,12 @@ msgid "Summary"
 msgstr "Résumé"
 
 #: ../calendar/gui/e-cal-model-calendar.c:180
-#: ../calendar/gui/e-calendar-table.c:432
+#: ../calendar/gui/e-calendar-table.c:436
 msgid "Free"
 msgstr "Libre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:433
+#: ../calendar/gui/e-calendar-table.c:437
 #: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Busy"
 msgstr "Occupé"
@@ -6718,7 +6718,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:926
 #: ../calendar/gui/e-meeting-list-view.c:192
 #: ../calendar/gui/e-meeting-store.c:168 ../calendar/gui/e-meeting-store.c:178
 #: ../calendar/gui/e-meeting-store.c:808
@@ -6726,7 +6726,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Oui"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:926
 #: ../calendar/gui/e-meeting-list-view.c:193
 #: ../calendar/gui/e-meeting-store.c:180
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
@@ -6735,7 +6735,7 @@ msgstr "Non"
 
 #. This is the default filename used for temporary file creation
 #: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-model.c:330
-#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.c:1292
+#: ../calendar/gui/e-itip-control.c:1148 ../calendar/gui/e-itip-control.c:1289
 #: ../calendar/gui/e-meeting-list-view.c:168
 #: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
@@ -6748,140 +6748,140 @@ msgstr "Non"
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Recurring"
 msgstr "Récurrent"
 
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:924
 msgid "Assigned"
 msgstr "Attribué"
 
-#: ../calendar/gui/e-calendar-table.c:402
+#: ../calendar/gui/e-calendar-table.c:406
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:403
+#: ../calendar/gui/e-calendar-table.c:407
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:404
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:405
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:407
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:514
+#: ../calendar/gui/e-calendar-table.c:518
 msgid "Task Table"
 msgstr "Tableau des tâches"
 
-#: ../calendar/gui/e-calendar-table.c:692
-#: ../calendar/gui/e-calendar-view.c:661
+#: ../calendar/gui/e-calendar-table.c:696
+#: ../calendar/gui/e-calendar-view.c:671
 msgid "Deleting selected objects"
 msgstr "Supprimer les objets sélectionnés"
 
-#: ../calendar/gui/e-calendar-table.c:871
-#: ../calendar/gui/e-calendar-view.c:789
+#: ../calendar/gui/e-calendar-table.c:875
+#: ../calendar/gui/e-calendar-view.c:799
 msgid "Updating objects"
 msgstr "Mise à jour des objets"
 
-#: ../calendar/gui/e-calendar-table.c:1012
-#: ../calendar/gui/e-calendar-view.c:1105 ../composer/e-msg-composer.c:1243
+#: ../calendar/gui/e-calendar-table.c:1025
+#: ../calendar/gui/e-calendar-view.c:1122 ../composer/e-msg-composer.c:1243
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
-#: ../calendar/gui/e-calendar-table.c:1155
+#: ../calendar/gui/e-calendar-table.c:1168
 msgid "Open _Web Page"
 msgstr "Ouvrir le _site internet"
 
-#: ../calendar/gui/e-calendar-table.c:1156
-#: ../calendar/gui/e-calendar-view.c:1529 ../mail/em-folder-view.c:1045
+#: ../calendar/gui/e-calendar-table.c:1169
+#: ../calendar/gui/e-calendar-view.c:1546 ../mail/em-folder-view.c:1045
 #: ../mail/em-popup.c:541 ../mail/em-popup.c:552
 msgid "_Save As..."
 msgstr "Enregistrer _sous..."
 
-#: ../calendar/gui/e-calendar-table.c:1157
-#: ../calendar/gui/e-calendar-view.c:1509
-#: ../calendar/gui/e-calendar-view.c:1530 ../mail/em-folder-view.c:1046
+#: ../calendar/gui/e-calendar-table.c:1170
+#: ../calendar/gui/e-calendar-view.c:1526
+#: ../calendar/gui/e-calendar-view.c:1547 ../mail/em-folder-view.c:1046
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:120 ../ui/evolution-tasks.xml.h:27
 msgid "_Print..."
 msgstr "_Imprimer..."
 
-#: ../calendar/gui/e-calendar-table.c:1161
-#: ../calendar/gui/e-calendar-view.c:1534 ../ui/evolution-addressbook.xml.h:1
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1551 ../ui/evolution-addressbook.xml.h:1
 #: ../ui/evolution-calendar.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Co_uper"
 
-#: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:1512
-#: ../calendar/gui/e-calendar-view.c:1536 ../ui/evolution-addressbook.xml.h:38
+#: ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1529
+#: ../calendar/gui/e-calendar-view.c:1553 ../ui/evolution-addressbook.xml.h:38
 #: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Paste"
 msgstr "C_oller"
 
-#: ../calendar/gui/e-calendar-table.c:1167 ../ui/evolution-tasks.xml.h:20
+#: ../calendar/gui/e-calendar-table.c:1180 ../ui/evolution-tasks.xml.h:20
 msgid "_Assign Task"
 msgstr "_Assigner une tâche"
 
-#: ../calendar/gui/e-calendar-table.c:1168 ../ui/evolution-tasks.xml.h:24
+#: ../calendar/gui/e-calendar-table.c:1181 ../ui/evolution-tasks.xml.h:24
 msgid "_Forward as iCalendar"
 msgstr "_Faire suivre comme iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1169
+#: ../calendar/gui/e-calendar-table.c:1182
 msgid "_Mark as Complete"
 msgstr "_Marquer comme terminé"
 
-#: ../calendar/gui/e-calendar-table.c:1170
+#: ../calendar/gui/e-calendar-table.c:1183
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marquer les tâches sélectionnées comme terminées"
 
 #. FIXME: need to disable for undeletable folders
-#: ../calendar/gui/e-calendar-table.c:1174
-#: ../calendar/gui/e-calendar-view.c:1548 ../mail/em-folder-tree.c:2043
+#: ../calendar/gui/e-calendar-table.c:1187
+#: ../calendar/gui/e-calendar-view.c:1565 ../mail/em-folder-tree.c:2048
 #: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:33
 #: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
 #: ../ui/evolution-tasks.xml.h:22
 msgid "_Delete"
 msgstr "_Supprimer"
 
-#: ../calendar/gui/e-calendar-table.c:1175
+#: ../calendar/gui/e-calendar-table.c:1188
 msgid "_Delete Selected Tasks"
 msgstr "_Supprimer les tâches sélectionnées"
 
-#: ../calendar/gui/e-calendar-table.c:1326
+#: ../calendar/gui/e-calendar-table.c:1407
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Cliquez ici pour ajouter une tâche"
@@ -6916,73 +6916,73 @@ msgstr "Date de début"
 msgid "Task sort"
 msgstr "Tri par tâche"
 
-#: ../calendar/gui/e-calendar-view.c:1231
+#: ../calendar/gui/e-calendar-view.c:1248
 msgid "Moving items"
 msgstr "Déplacement d'éléments"
 
-#: ../calendar/gui/e-calendar-view.c:1233
+#: ../calendar/gui/e-calendar-view.c:1250
 msgid "Copying items"
 msgstr "Copie d'éléments"
 
-#: ../calendar/gui/e-calendar-view.c:1503
+#: ../calendar/gui/e-calendar-view.c:1520
 msgid "New _Appointment..."
 msgstr "Nouveau _rendez-vous..."
 
-#: ../calendar/gui/e-calendar-view.c:1504
+#: ../calendar/gui/e-calendar-view.c:1521
 msgid "New All Day _Event"
 msgstr "Nouvel événement journée _entière"
 
-#: ../calendar/gui/e-calendar-view.c:1506
+#: ../calendar/gui/e-calendar-view.c:1523
 msgid "New Task"
 msgstr "Nouvelle tâche"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1516
+#: ../calendar/gui/e-calendar-view.c:1533
 msgid "Current View"
 msgstr "Vue courante"
 
-#: ../calendar/gui/e-calendar-view.c:1518 ../ui/evolution-calendar.xml.h:26
+#: ../calendar/gui/e-calendar-view.c:1535 ../ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Sélectionner au_jourd'hui"
 
-#: ../calendar/gui/e-calendar-view.c:1519
+#: ../calendar/gui/e-calendar-view.c:1536
 msgid "_Select Date..."
 msgstr "_Sélectionner une date..."
 
 #. TODO: Why is this in a context menu when it applies globally?
-#: ../calendar/gui/e-calendar-view.c:1524 ../ui/evolution-calendar.xml.h:45
+#: ../calendar/gui/e-calendar-view.c:1541 ../ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publier l'information Libre/Occupé"
 
-#: ../calendar/gui/e-calendar-view.c:1540
+#: ../calendar/gui/e-calendar-view.c:1557
 msgid "Cop_y to Calendar..."
 msgstr "_Copier vers le calendrier..."
 
-#: ../calendar/gui/e-calendar-view.c:1541
+#: ../calendar/gui/e-calendar-view.c:1558
 msgid "Mo_ve to Calendar..."
 msgstr "Déplacer _vers le calendrier..."
 
-#: ../calendar/gui/e-calendar-view.c:1542
+#: ../calendar/gui/e-calendar-view.c:1559
 msgid "_Delegate Meeting..."
 msgstr "Déléguer une _réunion..."
 
-#: ../calendar/gui/e-calendar-view.c:1543
+#: ../calendar/gui/e-calendar-view.c:1560
 msgid "_Schedule Meeting..."
 msgstr "Planifier une _réunion..."
 
-#: ../calendar/gui/e-calendar-view.c:1544
+#: ../calendar/gui/e-calendar-view.c:1561
 msgid "_Forward as iCalendar..."
 msgstr "_Faire suivre comme iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1549
+#: ../calendar/gui/e-calendar-view.c:1566
 msgid "Make this Occurrence _Movable"
 msgstr "Rendre cette occurrence _déplaçable"
 
-#: ../calendar/gui/e-calendar-view.c:1550
+#: ../calendar/gui/e-calendar-view.c:1567
 msgid "Delete this _Occurrence"
 msgstr "Supprimer cette _occurrence"
 
-#: ../calendar/gui/e-calendar-view.c:1551
+#: ../calendar/gui/e-calendar-view.c:1568
 msgid "Delete _All Occurrences"
 msgstr "Supprimer _toutes les occurrences"
 
@@ -7029,7 +7029,7 @@ msgstr "%02i divisions par minute"
 #. order but don't change the specifiers or add
 #. anything.
 #: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1493
-#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1517
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1526
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -7045,94 +7045,94 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:763
+#: ../calendar/gui/e-itip-control.c:760
 msgid "Yes. (Complex Recurrence)"
 msgstr "Oui. (Récurrence complexe)"
 
-#: ../calendar/gui/e-itip-control.c:774
+#: ../calendar/gui/e-itip-control.c:771
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Tous les jours"
 msgstr[1] "Tous les %d jours"
 
-#: ../calendar/gui/e-itip-control.c:779
+#: ../calendar/gui/e-itip-control.c:776
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Toutes les semaines"
 msgstr[1] "Toutes les %d semaines"
 
-#: ../calendar/gui/e-itip-control.c:781
+#: ../calendar/gui/e-itip-control.c:778
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Toutes les semaines le "
 msgstr[1] "Toutes les %d semaines le "
 
-#: ../calendar/gui/e-itip-control.c:789
+#: ../calendar/gui/e-itip-control.c:786
 msgid " and "
 msgstr " et "
 
-#: ../calendar/gui/e-itip-control.c:796
+#: ../calendar/gui/e-itip-control.c:793
 #, c-format
 msgid "The %s day of "
 msgstr "Le %s jour de"
 
-#: ../calendar/gui/e-itip-control.c:809
+#: ../calendar/gui/e-itip-control.c:806
 #, c-format
 msgid "The %s %s of "
 msgstr "Le %s %s de"
 
-#: ../calendar/gui/e-itip-control.c:816
+#: ../calendar/gui/e-itip-control.c:813
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "tous les mois"
 msgstr[1] "tous les %d mois"
 
-#: ../calendar/gui/e-itip-control.c:820
+#: ../calendar/gui/e-itip-control.c:817
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Tous les ans"
 msgstr[1] "Tous les %d ans"
 
-#: ../calendar/gui/e-itip-control.c:831
+#: ../calendar/gui/e-itip-control.c:828
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " un total de %d fois"
 msgstr[1] " un total de %d fois"
 
-#: ../calendar/gui/e-itip-control.c:840
+#: ../calendar/gui/e-itip-control.c:837
 msgid ", ending on "
 msgstr ", finissant le"
 
-#: ../calendar/gui/e-itip-control.c:864
+#: ../calendar/gui/e-itip-control.c:861
 msgid "Starts"
 msgstr "Débuts"
 
-#: ../calendar/gui/e-itip-control.c:877
+#: ../calendar/gui/e-itip-control.c:874
 msgid "Ends"
 msgstr "Fins"
 
-#: ../calendar/gui/e-itip-control.c:911
+#: ../calendar/gui/e-itip-control.c:908
 #: ../plugins/save-calendar/csv-format.c:395
 msgid "Due"
 msgstr "Échéance"
 
-#: ../calendar/gui/e-itip-control.c:951 ../calendar/gui/e-itip-control.c:1008
+#: ../calendar/gui/e-itip-control.c:948 ../calendar/gui/e-itip-control.c:1005
 msgid "iCalendar Information"
 msgstr "Information iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:968
+#: ../calendar/gui/e-itip-control.c:965
 msgid "iCalendar Error"
 msgstr "Erreur iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1040 ../calendar/gui/e-itip-control.c:1056
-#: ../calendar/gui/e-itip-control.c:1067 ../calendar/gui/e-itip-control.c:1084
+#: ../calendar/gui/e-itip-control.c:1037 ../calendar/gui/e-itip-control.c:1053
+#: ../calendar/gui/e-itip-control.c:1064 ../calendar/gui/e-itip-control.c:1081
 #: ../plugins/itip-formatter/itip-view.c:338
 #: ../plugins/itip-formatter/itip-view.c:339
 #: ../plugins/itip-formatter/itip-view.c:406
@@ -7141,7 +7141,7 @@ msgid "An unknown person"
 msgstr "Une personne inconnue"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1091
+#: ../calendar/gui/e-itip-control.c:1088
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7150,7 +7150,7 @@ msgstr ""
 "action\n"
 "du menu ci-dessous."
 
-#: ../calendar/gui/e-itip-control.c:1139
+#: ../calendar/gui/e-itip-control.c:1136
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
 #: ../calendar/gui/itip-utils.c:548
@@ -7158,12 +7158,12 @@ msgstr ""
 msgid "Accepted"
 msgstr "Accepté"
 
-#: ../calendar/gui/e-itip-control.c:1143 ../calendar/gui/itip-utils.c:551
+#: ../calendar/gui/e-itip-control.c:1140 ../calendar/gui/itip-utils.c:551
 #: ../plugins/itip-formatter/itip-formatter.c:1643
 msgid "Tentatively Accepted"
 msgstr "Accepté provisoirement"
 
-#: ../calendar/gui/e-itip-control.c:1147
+#: ../calendar/gui/e-itip-control.c:1144
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
 #: ../calendar/gui/itip-utils.c:554 ../calendar/gui/itip-utils.c:583
@@ -7171,7 +7171,7 @@ msgstr "Accepté provisoirement"
 msgid "Declined"
 msgstr "Refusé"
 
-#: ../calendar/gui/e-itip-control.c:1231
+#: ../calendar/gui/e-itip-control.c:1228
 msgid ""
 "The meeting has been cancelled, however it could not be found in your "
 "calendars"
@@ -7179,271 +7179,271 @@ 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:1233
+#: ../calendar/gui/e-itip-control.c:1230
 msgid ""
 "The task has been cancelled, 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:1312
+#: ../calendar/gui/e-itip-control.c:1309
 #, 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:1313
+#: ../calendar/gui/e-itip-control.c:1310
 msgid "Meeting Information"
 msgstr "Informations de la réunion"
 
-#: ../calendar/gui/e-itip-control.c:1319
+#: ../calendar/gui/e-itip-control.c:1316
 #, 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:1321
+#: ../calendar/gui/e-itip-control.c:1318
 #, 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:1322
+#: ../calendar/gui/e-itip-control.c:1319
 msgid "Meeting Proposal"
 msgstr "Proposition de réunion"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1328
+#: ../calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> souhaite être intégré à une réunion existante."
 
-#: ../calendar/gui/e-itip-control.c:1329
+#: ../calendar/gui/e-itip-control.c:1326
 msgid "Meeting Update"
 msgstr "Mise à jour de la réunion"
 
-#: ../calendar/gui/e-itip-control.c:1333
+#: ../calendar/gui/e-itip-control.c:1330
 #, 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:1334
+#: ../calendar/gui/e-itip-control.c:1331
 msgid "Meeting Update Request"
 msgstr "Demande de mise à jour de la réunion"
 
-#: ../calendar/gui/e-itip-control.c:1341
+#: ../calendar/gui/e-itip-control.c:1338
 #, 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:1342
+#: ../calendar/gui/e-itip-control.c:1339
 msgid "Meeting Reply"
 msgstr "Réponse à une réunion"
 
-#: ../calendar/gui/e-itip-control.c:1349
+#: ../calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> a annulé une réunion."
 
-#: ../calendar/gui/e-itip-control.c:1350
+#: ../calendar/gui/e-itip-control.c:1347
 msgid "Meeting Cancellation"
 msgstr "Annulation de réunion"
 
-#: ../calendar/gui/e-itip-control.c:1360 ../calendar/gui/e-itip-control.c:1437
-#: ../calendar/gui/e-itip-control.c:1477
+#: ../calendar/gui/e-itip-control.c:1357 ../calendar/gui/e-itip-control.c:1434
+#: ../calendar/gui/e-itip-control.c:1474
 #, 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:1361
+#: ../calendar/gui/e-itip-control.c:1358
 msgid "Bad Meeting Message"
 msgstr "Mauvais message de réunion"
 
-#: ../calendar/gui/e-itip-control.c:1388
+#: ../calendar/gui/e-itip-control.c:1385
 #, 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:1389
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Task Information"
 msgstr "Informations de la tâche"
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1393
 #, 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:1398
+#: ../calendar/gui/e-itip-control.c:1395
 #, 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:1399
+#: ../calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr "Tâche proposée"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1402
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> souhaite être intégré à une tâche existante."
 
-#: ../calendar/gui/e-itip-control.c:1406
+#: ../calendar/gui/e-itip-control.c:1403
 msgid "Task Update"
 msgstr "Mise à jour de tâche"
 
-#: ../calendar/gui/e-itip-control.c:1410
+#: ../calendar/gui/e-itip-control.c:1407
 #, 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:1411
+#: ../calendar/gui/e-itip-control.c:1408
 msgid "Task Update Request"
 msgstr "Demande de mise à jour de tâche"
 
-#: ../calendar/gui/e-itip-control.c:1418
+#: ../calendar/gui/e-itip-control.c:1415
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> a répondu à une assignation de tâche."
 
-#: ../calendar/gui/e-itip-control.c:1419
+#: ../calendar/gui/e-itip-control.c:1416
 msgid "Task Reply"
 msgstr "Réponse à une tâche"
 
-#: ../calendar/gui/e-itip-control.c:1426
+#: ../calendar/gui/e-itip-control.c:1423
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> a annulé une tâche."
 
-#: ../calendar/gui/e-itip-control.c:1427
+#: ../calendar/gui/e-itip-control.c:1424
 msgid "Task Cancellation"
 msgstr "Annulation de tâche"
 
-#: ../calendar/gui/e-itip-control.c:1438
+#: ../calendar/gui/e-itip-control.c:1435
 msgid "Bad Task Message"
 msgstr "Mauvais message de tâche"
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1459
 #, 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:1463
+#: ../calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Information"
 msgstr "Information Libre/Occupé"
 
-#: ../calendar/gui/e-itip-control.c:1467
+#: ../calendar/gui/e-itip-control.c:1464
 #, 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:1468
+#: ../calendar/gui/e-itip-control.c:1465
 msgid "Free/Busy Request"
 msgstr "Demande Libre/Occupé"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1469
 #, 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:1473
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Free/Busy Reply"
 msgstr "Réponse Libre/Occupé"
 
-#: ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1475
 msgid "Bad Free/Busy Message"
 msgstr "Mauvais message Libre/Occupé"
 
-#: ../calendar/gui/e-itip-control.c:1553
+#: ../calendar/gui/e-itip-control.c:1550
 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:1612
+#: ../calendar/gui/e-itip-control.c:1609
 msgid "The message contains only unsupported requests."
 msgstr "Le message ne contient que des requêtes non supportées."
 
-#: ../calendar/gui/e-itip-control.c:1645
+#: ../calendar/gui/e-itip-control.c:1642
 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:1677
+#: ../calendar/gui/e-itip-control.c:1674
 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:1911
+#: ../calendar/gui/e-itip-control.c:1908
 msgid "Update complete\n"
 msgstr "Mise à jour terminée\n"
 
-#: ../calendar/gui/e-itip-control.c:1939
+#: ../calendar/gui/e-itip-control.c:1936
 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:1949
+#: ../calendar/gui/e-itip-control.c:1946
 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:1961
+#: ../calendar/gui/e-itip-control.c:1958
 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:1978
+#: ../calendar/gui/e-itip-control.c:1975
 msgid "Attendee status updated\n"
 msgstr "État du participant mis à jour\n"
 
-#: ../calendar/gui/e-itip-control.c:1981
+#: ../calendar/gui/e-itip-control.c:1978
 #: ../plugins/itip-formatter/itip-formatter.c:1025
 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:2011
+#: ../calendar/gui/e-itip-control.c:2008
 msgid "Removal Complete"
 msgstr "Effacement Terminé"
 
-#: ../calendar/gui/e-itip-control.c:2034 ../calendar/gui/e-itip-control.c:2082
+#: ../calendar/gui/e-itip-control.c:2031 ../calendar/gui/e-itip-control.c:2079
 msgid "Item sent!\n"
 msgstr "Élément envoyé !\n"
 
-#: ../calendar/gui/e-itip-control.c:2036 ../calendar/gui/e-itip-control.c:2086
+#: ../calendar/gui/e-itip-control.c:2033 ../calendar/gui/e-itip-control.c:2083
 msgid "The item could not be sent!\n"
 msgstr "Impossible d'envoyer l'élément !\n"
 
-#: ../calendar/gui/e-itip-control.c:2166
+#: ../calendar/gui/e-itip-control.c:2163
 msgid "Choose an action:"
 msgstr "Sélectionner une action :"
 
-#: ../calendar/gui/e-itip-control.c:2237
+#: ../calendar/gui/e-itip-control.c:2234
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: ../calendar/gui/e-itip-control.c:2265
+#: ../calendar/gui/e-itip-control.c:2262
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Accepter"
 
-#: ../calendar/gui/e-itip-control.c:2266
+#: ../calendar/gui/e-itip-control.c:2263
 msgid "Tentatively accept"
 msgstr "Accepter provisoirement"
 
-#: ../calendar/gui/e-itip-control.c:2267
+#: ../calendar/gui/e-itip-control.c:2264
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Refuser"
 
-#: ../calendar/gui/e-itip-control.c:2296
+#: ../calendar/gui/e-itip-control.c:2293
 msgid "Send Free/Busy Information"
 msgstr "Envoyer l'information Libre/Occupé"
 
-#: ../calendar/gui/e-itip-control.c:2324
+#: ../calendar/gui/e-itip-control.c:2321
 msgid "Update respondent status"
 msgstr "Mettre à jour l'état de l'interlocuteur"
 
-#: ../calendar/gui/e-itip-control.c:2352
+#: ../calendar/gui/e-itip-control.c:2349
 msgid "Send Latest Information"
 msgstr "Envoyer les dernières informations"
 
-#: ../calendar/gui/e-itip-control.c:2380 ../calendar/gui/itip-utils.c:571
+#: ../calendar/gui/e-itip-control.c:2377 ../calendar/gui/itip-utils.c:571
 #: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
@@ -7472,7 +7472,7 @@ msgstr "Chargement du calendrier"
 
 #: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
-msgstr "Chargement du calendrier"
+msgstr "Chargement du calendrier..."
 
 #: ../calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
@@ -7652,12 +7652,12 @@ msgstr "Personnes atte_ndues"
 msgid "Required people and _one resource"
 msgstr "Personnes attendues et _une ressource"
 
-#: ../calendar/gui/e-pub-utils.c:300
+#: ../calendar/gui/e-pub-utils.c:311
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Saisissez le mot de passe pour %s"
 
-#: ../calendar/gui/e-tasks.c:798 ../calendar/gui/gnome-cal.c:2532
+#: ../calendar/gui/e-tasks.c:818 ../calendar/gui/gnome-cal.c:2553
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7666,24 +7666,24 @@ msgstr ""
 "Erreur sur %s :\n"
 " %s"
 
-#: ../calendar/gui/e-tasks.c:846
+#: ../calendar/gui/e-tasks.c:866
 msgid "Loading tasks"
 msgstr "Chargement des tâches"
 
-#: ../calendar/gui/e-tasks.c:930
+#: ../calendar/gui/e-tasks.c:953
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ouverture des tâches à %s"
 
-#: ../calendar/gui/e-tasks.c:1126
+#: ../calendar/gui/e-tasks.c:1152
 msgid "Completing tasks..."
 msgstr "Achèvement des tâches..."
 
-#: ../calendar/gui/e-tasks.c:1149
+#: ../calendar/gui/e-tasks.c:1175
 msgid "Deleting selected objects..."
 msgstr "Suppression des objets sélectionnés..."
 
-#: ../calendar/gui/e-tasks.c:1176
+#: ../calendar/gui/e-tasks.c:1202
 msgid "Expunging"
 msgstr "Nettoyage"
 
@@ -7694,45 +7694,45 @@ msgstr "Bouton du 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:329 ../calendar/gui/print.c:1501
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1510
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:789
+#: ../calendar/gui/gnome-cal.c:790
 msgid "Updating query"
 msgstr "Mise à jour de la requête"
 
 #. bonobo displays this string so it must be in locale
-#: ../calendar/gui/gnome-cal.c:2209 ../widgets/menus/gal-view-instance.c:585
+#: ../calendar/gui/gnome-cal.c:2228 ../widgets/menus/gal-view-instance.c:585
 #: ../widgets/menus/gal-view-menus.c:350
 msgid "Custom View"
 msgstr "Vue personnalisée"
 
-#: ../calendar/gui/gnome-cal.c:2210 ../widgets/menus/gal-view-instance.c:586
+#: ../calendar/gui/gnome-cal.c:2229 ../widgets/menus/gal-view-instance.c:586
 msgid "Save Custom View"
 msgstr "Enregistrer la vue personnalisée"
 
-#: ../calendar/gui/gnome-cal.c:2215 ../widgets/menus/gal-view-instance.c:590
+#: ../calendar/gui/gnome-cal.c:2234 ../widgets/menus/gal-view-instance.c:590
 #: ../widgets/menus/gal-view-menus.c:372
 msgid "Define Views..."
 msgstr "Définir les vues..."
 
-#: ../calendar/gui/gnome-cal.c:2378
+#: ../calendar/gui/gnome-cal.c:2396
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Chargement des rendez-vous à %s"
 
-#: ../calendar/gui/gnome-cal.c:2397
+#: ../calendar/gui/gnome-cal.c:2415
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Chargement des tâches à %s"
 
-#: ../calendar/gui/gnome-cal.c:2498
+#: ../calendar/gui/gnome-cal.c:2519
 #, c-format
 msgid "Opening %s"
 msgstr "Ouverture de %s"
 
-#: ../calendar/gui/gnome-cal.c:3388
+#: ../calendar/gui/gnome-cal.c:3411
 msgid "Purging"
 msgstr "Purger"
 
@@ -8042,83 +8042,83 @@ msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: ../calendar/gui/print.c:1917
+#: ../calendar/gui/print.c:1926
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Jour sélectionné (%a %d %b %Y)"
 
-#: ../calendar/gui/print.c:1942 ../calendar/gui/print.c:1946
+#: ../calendar/gui/print.c:1951 ../calendar/gui/print.c:1955
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: ../calendar/gui/print.c:1943
+#: ../calendar/gui/print.c:1952
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: ../calendar/gui/print.c:1947 ../calendar/gui/print.c:1949
-#: ../calendar/gui/print.c:1950
+#: ../calendar/gui/print.c:1956 ../calendar/gui/print.c:1958
+#: ../calendar/gui/print.c:1959
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: ../calendar/gui/print.c:1954
+#: ../calendar/gui/print.c:1963
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Semaine sélectionnée (%s - %s)"
 
 #. Month
-#: ../calendar/gui/print.c:1962
+#: ../calendar/gui/print.c:1971
 msgid "Selected month (%b %Y)"
 msgstr "Mois sélectionné (%b %Y)"
 
 #. Year
-#: ../calendar/gui/print.c:1969
+#: ../calendar/gui/print.c:1978
 msgid "Selected year (%Y)"
 msgstr "Année sélectionnée (%Y)"
 
-#: ../calendar/gui/print.c:2320
+#: ../calendar/gui/print.c:2329
 #, c-format
 msgid "Summary: %s"
 msgstr "Résumé : %s"
 
-#: ../calendar/gui/print.c:2328
+#: ../calendar/gui/print.c:2337
 #, c-format
 msgid "Location: %s"
 msgstr "Lieu : %s"
 
-#: ../calendar/gui/print.c:2371
+#: ../calendar/gui/print.c:2380
 #, c-format
 msgid "Status: %s"
 msgstr "État : %s"
 
-#: ../calendar/gui/print.c:2388
+#: ../calendar/gui/print.c:2397
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorité : %s"
 
-#: ../calendar/gui/print.c:2400
+#: ../calendar/gui/print.c:2409
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Pourcentage effectué : %i"
 
-#: ../calendar/gui/print.c:2412
+#: ../calendar/gui/print.c:2421
 #, c-format
 msgid "URL: %s"
 msgstr "URL : %s"
 
-#: ../calendar/gui/print.c:2426
+#: ../calendar/gui/print.c:2435
 #, c-format
 msgid "Categories: %s"
 msgstr "Catégories : %s"
 
-#: ../calendar/gui/print.c:2437
+#: ../calendar/gui/print.c:2446
 msgid "Contacts: "
 msgstr "Contacts : "
 
-#: ../calendar/gui/print.c:2577 ../calendar/gui/print.c:2665
-#: ../calendar/gui/print.c:2791 ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2586 ../calendar/gui/print.c:2674
+#: ../calendar/gui/print.c:2800 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Aperçu avant impression"
 
-#: ../calendar/gui/print.c:2612
+#: ../calendar/gui/print.c:2621
 msgid "Print Item"
 msgstr "Imprimer l'élément"
 
@@ -8144,54 +8144,54 @@ msgstr[1] ", %d sélectionnés"
 msgid "Failed upgrading tasks."
 msgstr "La mise à jour des tâches a échoué."
 
-#: ../calendar/gui/tasks-component.c:872
+#: ../calendar/gui/tasks-component.c:875
 #, 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:887
+#: ../calendar/gui/tasks-component.c:888
 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:981
+#: ../calendar/gui/tasks-component.c:988
 msgid "Task Source Selector"
 msgstr "Sélecteur de source de tâche"
 
-#: ../calendar/gui/tasks-component.c:1164
+#: ../calendar/gui/tasks-component.c:1171
 msgid "New task"
 msgstr "Nouvelle tâche"
 
-#: ../calendar/gui/tasks-component.c:1165
+#: ../calendar/gui/tasks-component.c:1172
 msgid "_Task"
 msgstr "_Tâche"
 
-#: ../calendar/gui/tasks-component.c:1166
+#: ../calendar/gui/tasks-component.c:1173
 msgid "Create a new task"
 msgstr "Créer une nouvelle tâche"
 
-#: ../calendar/gui/tasks-component.c:1172
+#: ../calendar/gui/tasks-component.c:1179
 msgid "New assigned task"
 msgstr "Tâche nouvellement assignée"
 
-#: ../calendar/gui/tasks-component.c:1173
+#: ../calendar/gui/tasks-component.c:1180
 msgid "Assigne_d Task"
 msgstr "_Assigner une tâche"
 
-#: ../calendar/gui/tasks-component.c:1174
+#: ../calendar/gui/tasks-component.c:1181
 msgid "Create a new assigned task"
 msgstr "Créer une tâche nouvellement assignée"
 
-#: ../calendar/gui/tasks-component.c:1180
+#: ../calendar/gui/tasks-component.c:1187
 msgid "New task list"
 msgstr "Nouvelle liste des tâches"
 
-#: ../calendar/gui/tasks-component.c:1181
+#: ../calendar/gui/tasks-component.c:1188
 msgid "Task l_ist"
 msgstr "_Liste de tâches"
 
-#: ../calendar/gui/tasks-component.c:1182
+#: ../calendar/gui/tasks-component.c:1189
 msgid "Create a new task list"
 msgstr "Créer une nouvelle liste des tâches"
 
@@ -8211,7 +8211,7 @@ msgstr ""
 msgid "Do not ask me again."
 msgstr "Ne plus me demander."
 
-#: ../calendar/gui/tasks-control.c:457
+#: ../calendar/gui/tasks-control.c:456
 msgid "Print Tasks"
 msgstr "Imprimer les tâches"
 
@@ -8239,7 +8239,7 @@ msgstr "Assistant d'importation iCalendar d'Evolution"
 
 #: ../calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
-msgstr "Rappel !!"
+msgstr "Rappel !"
 
 #: ../calendar/importers/icalendar-importer.c:539
 msgid "vCalendar files (.vcf)"
@@ -9926,7 +9926,7 @@ msgstr "Composer un message"
 msgid "_Attachment Bar"
 msgstr "Barre des pièces _jointes"
 
-#: ../composer/e-msg-composer.c:4718
+#: ../composer/e-msg-composer.c:4720
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10186,7 +10186,7 @@ msgstr "Me demander si je souhaite envoyer un accusé de réception."
 
 #: ../designs/read_receipts/read.glade.h:8
 msgid "Never send back a read receipt"
-msgstr "Ne jamais envoyé d'accusé de réception."
+msgstr "Ne jamais envoyer d'accusé de réception."
 
 #: ../designs/read_receipts/read.glade.h:9
 msgid "Read Receipts"
@@ -10711,7 +10711,7 @@ msgstr ""
 "et cochez la case pour l'accepter\n"
 
 #: ../mail/em-account-editor.c:464 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:494
+#: ../mail/em-vfolder-rule.c:495
 msgid "Select Folder"
 msgstr "Sélectionnez un dossier"
 
@@ -10735,30 +10735,30 @@ msgstr "Vérifier automatiquement les _nouveaux courriels toutes les"
 msgid "Sending Email"
 msgstr "Envoi du courriel"
 
-#: ../mail/em-account-editor.c:2162 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2165 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Valeurs par défaut"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:122
-#: ../plugins/exchange-operations/exchange-account-setup.c:311
+#: ../mail/em-account-editor.c:2226 ../mail/mail-config.glade.h:122
+#: ../plugins/exchange-operations/exchange-account-setup.c:313
 msgid "Security"
 msgstr "Sécurité"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2260 ../mail/em-account-editor.c:2334
+#: ../mail/em-account-editor.c:2263 ../mail/em-account-editor.c:2337
 msgid "Receiving Options"
 msgstr "Options de réception"
 
-#: ../mail/em-account-editor.c:2261 ../mail/em-account-editor.c:2335
+#: ../mail/em-account-editor.c:2264 ../mail/em-account-editor.c:2338
 msgid "Checking for New Mail"
 msgstr "Recherche de nouveau courriel"
 
-#: ../mail/em-account-editor.c:2659 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2661 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Éditeur de compte"
 
-#: ../mail/em-account-editor.c:2659 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2661 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Assistant de compte d'Evolution"
 
@@ -11141,77 +11141,77 @@ msgstr "Boîte d'envoi"
 msgid "Sent"
 msgstr "Envoyé"
 
-#: ../mail/em-folder-tree-model.c:498 ../mail/em-folder-tree-model.c:802
+#: ../mail/em-folder-tree-model.c:499 ../mail/em-folder-tree-model.c:803
 msgid "Loading..."
 msgstr "Chargement..."
 
-#: ../mail/em-folder-tree.c:689
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "Arborescence des courriels"
 
-#: ../mail/em-folder-tree.c:849
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "Déplacement du dossier %s"
 
-#: ../mail/em-folder-tree.c:851
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copie du dossier %s"
 
-#: ../mail/em-folder-tree.c:858 ../mail/message-list.c:1613
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1613
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Déplacement des messages vers le dossier %s"
 
-#: ../mail/em-folder-tree.c:860 ../mail/message-list.c:1615
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1615
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copie des messages vers le dossier %s"
 
-#: ../mail/em-folder-tree.c:876
+#: ../mail/em-folder-tree.c:881
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 "Impossible de déposer le ou les messages dans le stockage de haut niveau"
 
-#: ../mail/em-folder-tree.c:972 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:104
 msgid "_Copy to Folder"
 msgstr "_Copier vers le dossier"
 
-#: ../mail/em-folder-tree.c:973 ../ui/evolution-mail-message.xml.h:114
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:114
 msgid "_Move to Folder"
 msgstr "_Déplacer vers le dossier"
 
-#: ../mail/em-folder-tree.c:1678 ../mail/mail-ops.c:1057
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examen des dossiers dans « %s »"
 
-#: ../mail/em-folder-tree.c:2031 ../ui/evolution-addressbook.xml.h:44
+#: ../mail/em-folder-tree.c:2036 ../ui/evolution-addressbook.xml.h:44
 #: ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:48
 msgid "_View"
 msgstr "Afficha_ge"
 
-#: ../mail/em-folder-tree.c:2032
+#: ../mail/em-folder-tree.c:2037
 msgid "Open in _New Window"
 msgstr "Ouvrir dans une _nouvelle fenêtre"
 
-#: ../mail/em-folder-tree.c:2036
+#: ../mail/em-folder-tree.c:2041
 msgid "_Copy..."
 msgstr "_Copier..."
 
-#: ../mail/em-folder-tree.c:2037
+#: ../mail/em-folder-tree.c:2042
 msgid "_Move..."
 msgstr "_Déplacer..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2041
+#: ../mail/em-folder-tree.c:2046
 msgid "_New Folder..."
 msgstr "_Nouveau dossier..."
 
-#: ../mail/em-folder-tree.c:2044 ../ui/evolution-mail-list.xml.h:30
+#: ../mail/em-folder-tree.c:2049 ../ui/evolution-mail-list.xml.h:30
 msgid "_Rename..."
 msgstr "_Renommer..."
 
@@ -11251,13 +11251,13 @@ msgstr "Création du dossier « %s »"
 
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../plugins/groupwise-features/share-folder-common.c:384
 msgid "Create folder"
 msgstr "Créer un dossier"
 
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../plugins/groupwise-features/share-folder-common.c:384
 msgid "Specify where to create the folder:"
 msgstr "Précisez où créer le dossier >"
 
@@ -11649,7 +11649,7 @@ msgstr "Cci"
 
 #. pseudo-header
 #: ../mail/em-format-html.c:1576 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:987
+#: ../mail/em-mailer-prefs.c:992
 msgid "Mailer"
 msgstr "Logiciel de messagerie"
 
@@ -11879,7 +11879,7 @@ msgstr "Messages de %s"
 msgid "Search _Folders"
 msgstr "Dossiers de _recherche"
 
-#: ../mail/em-vfolder-rule.c:574
+#: ../mail/em-vfolder-rule.c:575
 msgid "Search Folder source"
 msgstr "Source du dossier de recherche"
 
@@ -13980,8 +13980,8 @@ 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 ""
-"Saisissez une adresse électronique valide dans le champ To:. Vous pouvez "
-"rechercher des adresses électroniques en cliquant sur le bouton To : à côté "
+"Saisissez une adresse électronique valide dans le champ À :. Vous pouvez "
+"rechercher des adresses électroniques en cliquant sur le bouton À : à côté "
 "de la boîte de saisie."
 
 #: ../mail/mail.error.xml.h:70
@@ -14494,7 +14494,7 @@ msgstr "Calendriers locaux"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
 msgid "Provides core functionality for local calendars."
-msgstr "Fourni la fonctionnalité à la base des calendriers locaux."
+msgstr "Fournit la fonctionnalité à la base des calendriers locaux."
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
 msgid "HTTP Calendars"
@@ -14502,7 +14502,7 @@ msgstr "Calendriers HTTP"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
 msgid "Provides core functionality for webcal and http calendars."
-msgstr "Fourni la fonctionnalité à la base des calendriers webcal et http."
+msgstr "Fournit la fonctionnalité à la base des calendriers webcal et http."
 
 #: ../plugins/calendar-weather/calendar-weather.c:54
 #: ../plugins/calendar-weather/calendar-weather.c:60
@@ -14551,7 +14551,7 @@ msgstr "Impérial (Farenheit, pouces, etc)"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
 msgid "Provides core functionality for weather calendars."
-msgstr "Fourni la fonctionnalité à la base des calendriers météo."
+msgstr "Fournit la fonctionnalité à la base des calendriers météo."
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 msgid "Weather Calendars"
@@ -14644,11 +14644,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:251
+#: ../plugins/exchange-operations/exchange-account-setup.c:253
 msgid "Out Of Office"
 msgstr "Absent du bureau"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:258
+#: ../plugins/exchange-operations/exchange-account-setup.c:260
 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."
@@ -14657,66 +14657,66 @@ msgstr ""
 "vous\n"
 "envoyant du courriel pendant votre absence du bureau."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:270
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:272
+#: ../plugins/exchange-operations/exchange-account-setup.c:277
 msgid "I am out of the office"
 msgstr "Je suis actuellement absent du bureau"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:271
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:273
+#: ../plugins/exchange-operations/exchange-account-setup.c:276
 msgid "I am in the office"
 msgstr "Je suis actuellement au bureau"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:321
+#: ../plugins/exchange-operations/exchange-account-setup.c:324
 msgid "Change the password for Exchange account"
 msgstr "Changer le mot de passe pour le compte Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:323
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:327
+#: ../plugins/exchange-operations/exchange-account-setup.c:331
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Gère les réglages de délégation pour un compte Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:329
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Delegation Assitant"
 msgstr "Assistant de délégation"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:339
+#: ../plugins/exchange-operations/exchange-account-setup.c:345
 msgid "Miscelleneous"
 msgstr "Divers"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:355
 msgid "View the size of all Exchange folders"
 msgstr "Voir la taille de tous les dossiers Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:351
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "Folders Size"
 msgstr "Taille des dossiers"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:358
+#: ../plugins/exchange-operations/exchange-account-setup.c:364
 msgid "Exchange Settings"
 msgstr "Paramètres d'Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:601
+#: ../plugins/exchange-operations/exchange-account-setup.c:611
 msgid "_OWA Url:"
 msgstr "Url _OWA :"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:626
+#: ../plugins/exchange-operations/exchange-account-setup.c:636
 msgid "A_uthenticate"
 msgstr "S'a_uthentifier"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:814
+#: ../plugins/exchange-operations/exchange-account-setup.c:824
 msgid "Authentication Type"
 msgstr "Type d'authentification"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:828
+#: ../plugins/exchange-operations/exchange-account-setup.c:838
 msgid "Ch_eck for Supported Types"
 msgstr "_Vérifier les types supportés "
 
@@ -15490,7 +15490,7 @@ msgstr "Identification sur le proxy"
 
 #: ../plugins/groupwise-features/proxy-login.c:219
 #: ../plugins/groupwise-features/proxy-login.c:261
-#: ../plugins/groupwise-features/proxy.c:490
+#: ../plugins/groupwise-features/proxy.c:499
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -15500,7 +15500,7 @@ msgstr "%sSaisissez le mot de passe pour %s (utilisateur %s)."
 msgid "_Proxy Login..."
 msgstr "_Identification sur le proxy..."
 
-#: ../plugins/groupwise-features/proxy.c:672
+#: ../plugins/groupwise-features/proxy.c:680
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "L'onglet proxy sera accessible seulement quand le compte sera actif."
 
@@ -15516,7 +15516,7 @@ msgstr "Saisissez les utilisateurs et réglez les permissions"
 msgid "New _Shared Folder..."
 msgstr "Nouveau dossier _partagé..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:453
+#: ../plugins/groupwise-features/share-folder-common.c:446
 msgid "Sharing"
 msgstr "Partage"
 
@@ -16097,8 +16097,8 @@ msgid ""
 "Provide actions for common mailing list commands (subscribe, "
 "unsubscribe, ...)."
 msgstr ""
-"Fourni les actions communes aux listes de diffusion (subscribe, unsubscribe, "
-"etc)."
+"Fournit les actions communes aux listes de diffusion (subscribe, "
+"unsubscribe, etc)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
@@ -16349,7 +16349,7 @@ msgstr "Mode HTML"
 
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
 msgid "Gives an option to print mail from composer"
-msgstr "Fourni une option pour imprimer un courriel depuis l'éditeur"
+msgstr "Fournit une option pour imprimer un courriel depuis l'éditeur"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
 #: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
@@ -16361,7 +16361,7 @@ msgstr "_Aperçu avant impression"
 msgid "Prints the message"
 msgstr "Imprime le message"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:98
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:99
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (intégré)"
 
diff --git a/po/gl.po b/po/gl.po
index c2cdf20884..4a02bc1b5b 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,6 +1,4 @@
-# translation of evolution.HEAD.po to Galego
-# translation of gl.po to Galego
-# translation of evolution.gnome-2-12.gl.po to
+# translation of evolution.gnome-2-12.gl.po to 
 # translation of evolution.gnome-2-12.gl.po to
 # translation of evolution.gnome-2-12.gl.po to
 # translation of evolution.gnome-2-12.gl.po to
@@ -40,17 +38,17 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gl\n"
+"Project-Id-Version: evolution.gnome-2-12.gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-25 01:38+0100\n"
-"PO-Revision-Date: 2005-11-25 01:43+0100\n"
-"Last-Translator: Ignacio Casal Quinteiro <nacho.resa@gmail.com>\n"
-"Language-Team: Galego\n"
+"POT-Creation-Date: 2005-11-13 23:37+0100\n"
+"PO-Revision-Date: 2005-11-13 12:04+0100\n"
+"Last-Translator: \n"
+"Language-Team:  <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.10.2\n"
+"X-Generator: KBabel 1.9.1\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
@@ -76,6 +74,7 @@ msgstr[0] "o cartafol de libretas de enderezos ten %d tarxeta"
 msgstr[1] "o cartafol de libretas de enderezos ten %d tarxetas"
 
 #: ../a11y/addressbook/ea-minicard.c:31
+#: ../calendar/gui/alarm-notify/alarm-queue.c:965
 #: ../ui/evolution-message-composer.xml.h:11
 msgid "Open"
 msgstr "Abrir"
@@ -129,7 +128,7 @@ msgstr "Nova cita"
 msgid "New All Day Event"
 msgstr "Novo Evento de Día Completo"
 
-#: ../a11y/calendar/ea-cal-view.c:308
+#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1522
 msgid "New Meeting"
 msgstr "Nova xuntanza"
 
@@ -391,60 +390,46 @@ msgid "Could not remove addressbook."
 msgstr "Non se puido eliminar a libreta de enderezos."
 
 #: ../addressbook/addressbook.error.xml.h:8
-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 ""
-"Actualmente só podes acceder ao sistema GroupWise de libro de enderezos "
-"desde Evolution. Por favor use algún outro cliente de correo Groupwise unha "
-"vez para obter os contactos frecuentes de GroupWise e os cartafoles de "
-"contactos persoais de GroupWise."
-
-#: ../addressbook/addressbook.error.xml.h:9
 msgid "Delete address book '{0}'?"
 msgstr "Eliminar libro de enderezos '{0}'?"
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Error loading addressbook."
 msgstr "Erro cargando o libro de enderezos."
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:10
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Erro gardando {0} a {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:11
 msgid "Failed to authenticate with LDAP server."
 msgstr "Fallou ao autenticarse co servidor LDAP."
 
-#: ../addressbook/addressbook.error.xml.h:13
-msgid "GroupWise Address book creation:"
-msgstr "Creación do libro de enderezos de GroupWise"
-
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "LDAP server did not respond with valid schema information."
 msgstr "O servidor LDAP non respondeu cunha información do esquema válido."
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:13
 msgid "Server Version"
 msgstr "Versión do servidor"
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:14
 #: ../calendar/calendar.error.xml.h:44
 msgid "Some features may not work properly with your current server"
 msgstr ""
 "Algunhas características quizais non funcionen apropiadamente co seu "
 "servidor actual"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "O libro de enderezos de Evolution rematou inesperadamente."
 
-#: ../addressbook/addressbook.error.xml.h:18
-msgid "The image you have selected is large. Do you want to resize and store it?"
+#: ../addressbook/addressbook.error.xml.h:16
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
 msgstr "A imaxe que seleccionou é grande. Quere redimensionala e almacenala?"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:17
 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 "
@@ -454,21 +439,21 @@ msgstr ""
 "soporta esta funcionalidade ou quizais está mal configurado. Pida a seu "
 "administrador de sistema as bases de busca soportadas."
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "This address book will be removed permanently."
 msgstr "Este libro de enderezos eliminarase para sempre."
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "This addressbook could not be opened."
 msgstr "Este libro de enderezos non se puido abrir."
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "This addressbook server does not have any suggested search bases."
 msgstr ""
 "Este servidor de libros de enderezos non ten ningunha das bases de busca "
 "suxeridas."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:21
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -477,27 +462,27 @@ msgstr ""
 "do servidor pode estar mal configurado ou súa conexión de rede quizais está "
 "caída."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Este servidor non soporta o esquema de información LDAPv3."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "Unable to open addressbook"
 msgstr "Imposible abrir o libro de enderezos"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "Unable to perform search."
 msgstr "Imposible efectuar a busca."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "Unable to save {0}."
 msgstr "Imposible gardar {0}."
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "Would you like to save your changes?"
 msgstr "Desexa gardar os trocos?"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:27
 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?"
@@ -505,8 +490,8 @@ msgstr ""
 "Está movendo un contacto desde un libro a outro, pero non pode ser eliminado "
 "do orixe. Quere gardar unha copia en vez de mover?"
 
-#: ../addressbook/addressbook.error.xml.h:30
-#: ../calendar/calendar.error.xml.h:61
+#: ../addressbook/addressbook.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:59
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -516,35 +501,36 @@ msgstr ""
 "problemas usando Evolution. Para os mellores resultados o servidor debería "
 "actualizarse a unha versión soportada"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:29
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "Fixo modificacións neste contacto. Desexa gardar estos trocos?"
 
-#: ../addressbook/addressbook.error.xml.h:32
-msgid "Your contacts for {0} will not be available until Evolution is restarted."
+#: ../addressbook/addressbook.error.xml.h:30
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Seus contactos para {0} non estarán dispoñibles ata que Evolution sexa "
 "reiniciado."
 
-#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:495
+#: ../addressbook/addressbook.error.xml.h:31 ../mail/em-vfolder-rule.c:495
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
 msgid "_Add"
 msgstr "_Engadir"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:33
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "{0}"
 msgstr "{0}"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "{1}"
 msgstr "{1}"
 
@@ -580,7 +566,7 @@ msgstr "Configurar autocompletado aquí"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1180
+#: ../addressbook/gui/component/addressbook-view.c:1133
 #: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:388
 msgid "Contacts"
 msgstr "Contactos"
@@ -621,12 +607,10 @@ msgstr "Xestione seus certificados S/MIME aquí"
 #. On This Computer is always first and Search Folders is always last
 #: ../addressbook/gui/component/addressbook-component.c:137
 #: ../addressbook/gui/component/addressbook-migrate.c:502
-#: ../calendar/gui/calendar-component.c:208
-#: ../calendar/gui/memos-component.c:192 ../calendar/gui/migration.c:462
-#: ../calendar/gui/migration.c:555 ../calendar/gui/migration.c:1057
-#: ../calendar/gui/tasks-component.c:188 ../mail/em-folder-tree-model.c:197
-#: ../mail/em-folder-tree-model.c:199 ../mail/mail-component.c:292
-#: ../mail/mail-vfolder.c:223
+#: ../calendar/gui/calendar-component.c:208 ../calendar/gui/migration.c:462
+#: ../calendar/gui/migration.c:555 ../calendar/gui/tasks-component.c:188
+#: ../mail/em-folder-tree-model.c:197 ../mail/em-folder-tree-model.c:199
+#: ../mail/mail-component.c:292 ../mail/mail-vfolder.c:223
 msgid "On This Computer"
 msgstr "Neste computador"
 
@@ -638,12 +622,10 @@ msgstr "Neste computador"
 #: ../addressbook/gui/component/addressbook-component.c:145
 #: ../addressbook/gui/component/addressbook-migrate.c:510
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../calendar/gui/calendar-component.c:216
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:470
-#: ../calendar/gui/migration.c:563 ../calendar/gui/migration.c:1065
-#: ../calendar/gui/tasks-component.c:196 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1043 ../mail/mail-config.c:78
-#: ../mail/mail-config.glade.h:104
+#: ../calendar/gui/calendar-component.c:216 ../calendar/gui/migration.c:470
+#: ../calendar/gui/migration.c:563 ../calendar/gui/tasks-component.c:196
+#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1043
+#: ../mail/mail-config.c:78 ../mail/mail-config.glade.h:104
 msgid "Personal"
 msgstr "Persoal"
 
@@ -670,7 +652,8 @@ msgid "Create a new contact list"
 msgstr "Crear unha nova lista de contactos"
 
 #: ../addressbook/gui/component/addressbook-component.c:241
-#: ../addressbook/gui/component/addressbook-config.c:1149
+#: ../addressbook/gui/component/addressbook-config.c:1118
+#: ../addressbook/gui/component/addressbook-view.c:763
 msgid "New Address Book"
 msgstr "Novo Libro de Enderezos"
 
@@ -686,60 +669,59 @@ msgstr "Crear un novo libro de enderezos"
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "Fallou ao actualizar a configuración do libro ou cartafoles."
 
-#: ../addressbook/gui/component/addressbook-config.c:316
+#: ../addressbook/gui/component/addressbook-config.c:313
 msgid "Base"
 msgstr "Base"
 
-#: ../addressbook/gui/component/addressbook-config.c:511
+#: ../addressbook/gui/component/addressbook-config.c:508
 #: ../calendar/gui/dialogs/calendar-setup.c:192
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../addressbook/gui/component/addressbook-config.c:610
+#: ../addressbook/gui/component/addressbook-config.c:607
 msgid "Copy book content locally for offline operation"
 msgstr "Copiar o contido do libro localmente para operación desconectada"
 
-#: ../addressbook/gui/component/addressbook-config.c:933
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/addressbook-config.c:902
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:366
+#: ../calendar/gui/dialogs/calendar-setup.c:377
 #: ../mail/em-folder-properties.c:215 ../mail/mail-config.glade.h:85
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Xeral"
 
-#: ../addressbook/gui/component/addressbook-config.c:934
+#: ../addressbook/gui/component/addressbook-config.c:903
 #: ../mail/importers/pine-importer.c:393
 msgid "Addressbook"
 msgstr "Libro de Enderezos"
 
-#: ../addressbook/gui/component/addressbook-config.c:938
+#: ../addressbook/gui/component/addressbook-config.c:907
 msgid "Server Information"
 msgstr "Información do servidor"
 
-#: ../addressbook/gui/component/addressbook-config.c:940
+#: ../addressbook/gui/component/addressbook-config.c:909
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: ../addressbook/gui/component/addressbook-config.c:943
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/addressbook-config.c:912
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 #: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detalles"
 
-#: ../addressbook/gui/component/addressbook-config.c:944
+#: ../addressbook/gui/component/addressbook-config.c:913
 msgid "Searching"
 msgstr "Procurando"
 
-#: ../addressbook/gui/component/addressbook-config.c:946
+#: ../addressbook/gui/component/addressbook-config.c:915
 msgid "Downloading"
 msgstr "Descargando"
 
-#: ../addressbook/gui/component/addressbook-config.c:1147
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/addressbook-config.c:1116
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Propiedades do libro de enderezos"
 
@@ -805,30 +787,22 @@ msgstr ""
 "\n"
 "Teña paciencia mentras Evolution migra seus datos Pilot Sync..."
 
-#: ../addressbook/gui/component/addressbook-view.c:763
-msgid "_New Address Book"
-msgstr "_Novo Libro de Enderezos"
-
-#. FIXME: need to disable for undeletable folders
 #: ../addressbook/gui/component/addressbook-view.c:764
 #: ../addressbook/gui/widgets/e-addressbook-view.c:952
 #: ../calendar/gui/calendar-component.c:537
-#: ../calendar/gui/e-calendar-table.c:1187
-#: ../calendar/gui/e-calendar-view.c:1575 ../calendar/gui/e-memo-table.c:862
-#: ../calendar/gui/tasks-component.c:441 ../mail/em-folder-tree.c:2054
-#: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:34
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
-#: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
-msgid "_Delete"
-msgstr "_Borrar"
+#: ../calendar/gui/tasks-component.c:441 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:26 ../ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Eliminar"
 
 #: ../addressbook/gui/component/addressbook-view.c:766
 #: ../calendar/gui/calendar-component.c:538
 #: ../calendar/gui/tasks-component.c:442
-msgid "_Properties..."
-msgstr "_Propiedades..."
+msgid "Properties..."
+msgstr "Propiedades..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1191
+#: ../addressbook/gui/component/addressbook-view.c:1144
 msgid "Contact Source Selector"
 msgstr "Selector de orixe de contactos"
 
@@ -837,12 +811,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Accedendo ao servidor LDAP anonimamente"
 
 #: ../addressbook/gui/component/addressbook.c:191
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:490
 msgid "Failed to authenticate.\n"
 msgstr "Fallou ao autenticar.\n"
 
 #: ../addressbook/gui/component/addressbook.c:198
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:469
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Introduza o seu contrasinal para %s (usuario %s)"
@@ -881,14 +855,16 @@ msgstr ""
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
 msgid "URI for the folder last used in the select names dialog"
-msgstr "URI para o cartafol usado por última vez no diálogo de selección de nomes"
+msgstr ""
+"URI para o cartafol usado por última vez no diálogo de selección de nomes"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
 msgid "URI for the folder last used in the select names dialog."
-msgstr "URI para o cartafol usado por última vez no diálogo de selección de nomes."
+msgstr ""
+"URI para o cartafol usado por última vez no diálogo de selección de nomes."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 msgid "Vertical pane position"
 msgstr "Posición vertical do panel"
 
@@ -897,123 +873,128 @@ msgid "Whether to show the preview pane."
 msgstr "Indica se se amosa o panel de vista previa."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:1
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/event-page.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../mail/message-tags.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:1
+msgid "*"
+msgstr "*"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr "1"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:2
+#: ../addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:3
+#: ../addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:5
+#: ../addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:6
+#: ../addressbook/gui/component/ldap-config.glade.h:7
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Autenticación</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:7
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Display</b>"
 msgstr "<b>Pantalla</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:8
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Downloading</b>"
 msgstr "<b>Descargando</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Searching</b>"
 msgstr "<b>Procurando</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Server Information</b>"
 msgstr "<b>Información do servidor</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:12
 msgid "<b>Type:</b>"
 msgstr "<b>Tipo:</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add Address Book"
 msgstr "Engadir libro de enderezos"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 #: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:759
 msgid "Always"
 msgstr "Sempre"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonimamente"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 msgid "Basic"
 msgstr "Básico"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr "Nome distintivo"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid "Email address"
 msgstr "Enderezo de Correo"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:20
-msgid "Evolution will use this email address to authenticate you with the server."
-msgstr "Evolution empregará este enderezo de correro para autenticarse co servidor."
-
 #: ../addressbook/gui/component/ldap-config.glade.h:21
+msgid ""
+"Evolution will use this email address to authenticate you with the server."
+msgstr ""
+"Evolution empregará este enderezo de correro para autenticarse co servidor."
+
+#: ../addressbook/gui/component/ldap-config.glade.h:22
 msgid "Find Possible Search Bases"
 msgstr "Buscar bases de busca posibles"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "Lo_gin:"
 msgstr "_Inicio de sesión:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 #: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:758
 msgid "Never"
 msgstr "Nunca"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "Un"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
-msgid "Search Filter"
-msgstr "Filtro de busca"
-
 #: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid "Search _base:"
 msgstr "_Base de busca:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:28
-msgid "Search _filter:"
-msgstr "_Filtro de busca:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:29
-msgid "Search filter"
-msgstr "Filtro de busca"
-
-#: ../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 ""
-"Filtro de busca é o tipo dos obxectos buscados, mentras se realiza a busca. "
-"Se isto non se modifica, a busca por omisión realizarase sobre a clase de "
-"obxectos de tipo \"person\"."
-
-#: ../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 or TLS."
@@ -1021,7 +1002,7 @@ msgstr ""
 "Seleccionar esta opción significa que Evolution só conectará co seu servidor "
 "LDAP se seu servidor LDAP soporta SSL ou TLS."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a insecure environment. For example, if you and your LDAP server "
@@ -1033,7 +1014,7 @@ msgstr ""
 "tras un cortafogos no traballo, entón Evolution non necesita usar SSL/TLS "
 "porque súa conexión xa é segura."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 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 "
@@ -1043,15 +1024,15 @@ msgstr ""
 "TLS. Isto significa que súa conexión será insegura e que vostede será "
 "vulnerabel a fallos de seguranza."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Sub"
 msgstr "Sub"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid "Supported Search Bases"
 msgstr "Bases de busca soportadas"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 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 "
@@ -1061,7 +1042,7 @@ msgstr ""
 "comezarán. Se deixa isto en branco, a busca comerzará na raíz da árbore de "
 "directorios."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 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 "
@@ -1073,13 +1054,14 @@ msgstr ""
 "todas as entradas por debaixo da súa base de busca. Un ámbito \"un\" só "
 "incluirá as entradas un nivel baixo a súa base."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
-msgstr "Este é o nome completo do servidor LDAP. Por exemplo, \"ldap.mycompany.com\"."
+msgstr ""
+"Este é o nome completo do servidor LDAP. Por exemplo, \"ldap.mycompany.com\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1087,7 +1069,7 @@ msgstr ""
 "Este é o máximo número de entradas para descargar. Se pon este número "
 "demasiado alto ralentizará seu libro de enderezos."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1097,7 +1079,7 @@ msgstr ""
 "que establecer isto a \"Enderezo de correo\" require acceso anónimo a seu "
 "servidor LDAP."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1105,7 +1087,7 @@ msgstr ""
 "Este é o nome que identificará este servidor na lista de cartafoles de "
 "Evolution. É só para poder amosalo en pantalla."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 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 "
@@ -1115,36 +1097,36 @@ msgstr ""
 "Proporcionouse unha lista de portos estándar. Pregunte a seu administrador "
 "do sistema qué porto debería especificar."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid "Using distinguished name (DN)"
 msgstr "Usando nome distintivo (DN)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid "Using email address"
 msgstr "Usando enderezo de correo"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 #: ../mail/em-account-editor.c:301
 msgid "Whenever Possible"
 msgstr "Cando sexa posible"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid "_Add Address Book"
 msgstr "_Engadir Libro de Enderezos"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "_Download limit:"
 msgstr "Límite de _descarga:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid "_Find Possible Search Bases"
 msgstr "_Procurar bases de busca posibles"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "_Login method:"
 msgstr "Método de _inicio de sesión:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 #: ../calendar/gui/dialogs/calendar-setup.c:244
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:8
 #: ../mail/mail-config.glade.h:164
@@ -1152,35 +1134,33 @@ msgstr "Método de _inicio de sesión:"
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Port:"
 msgstr "_Porto:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Search scope:"
 msgstr "Ámbito da bu_sca:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 #: ../mail/mail-config.glade.h:171
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Timeout:"
 msgstr "_Tempo de expiración:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Use secure connection:"
 msgstr "_Usar conexión segura:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 msgid "cards"
 msgstr "tarxetas"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
-#: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/alarm-notify/util.c:66
+#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
 #: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1951
@@ -1189,30 +1169,6 @@ msgstr "tarxetas"
 msgid "minutes"
 msgstr "minutos"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../mail/message-tags.glade.h:1
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
-#: ../plugins/groupwise-features/properties.glade.h:1
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>Correo electrónico</b>"
@@ -1266,7 +1222,7 @@ msgstr "Contacto"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:525
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:540
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2372
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2353
 msgid "Contact Editor"
 msgstr "Editor de Contactos"
 
@@ -1331,12 +1287,11 @@ msgid "_Birthday:"
 msgstr "_Cumpreanos:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../plugins/itip-formatter/itip-view.c:1661
+#: ../plugins/itip-formatter/itip-view.c:1662
 msgid "_Calendar:"
 msgstr "_Calendario:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: ../ui/evolution-event-editor.xml.h:26 ../ui/evolution-task-editor.xml.h:18
 msgid "_Categories"
 msgstr "_Categorías"
 
@@ -2510,20 +2465,20 @@ msgid "Changed"
 msgstr "Modificado"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:535
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2367
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2348
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de Contactos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2680
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2661
 msgid "Please select an image for this contact"
 msgstr "Escolla unha imaxe para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2681
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2662
 msgid "No image"
 msgstr "Sen imaxe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2960
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2941
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2531,7 +2486,7 @@ msgstr ""
 "Os datos do contacto son inválidos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3012
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2993
 msgid "Invalid contact."
 msgstr "Contacto inválido."
 
@@ -2684,8 +2639,8 @@ msgstr "Servizo M_I:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:234
-#: ../plugins/exchange-operations/exchange-contacts.c:214
+#: ../plugins/exchange-operations/exchange-calendar.c:224
+#: ../plugins/exchange-operations/exchange-contacts.c:203
 msgid "_Location:"
 msgstr "_Ubicación:"
 
@@ -2728,7 +2683,8 @@ msgstr "_Seleccionar"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr "_Escriba un enderezo de correo ou arraste un contacto á lista de abaixo:"
+msgstr ""
+"_Escriba un enderezo de correo ou arraste un contacto á lista de abaixo:"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
@@ -2862,9 +2818,8 @@ msgstr "Fonte"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:377
+#: ../calendar/gui/e-meeting-list-view.c:370
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Tipo"
 
@@ -2873,86 +2828,78 @@ msgid "Address Book"
 msgstr "Libro de Enderezos"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:807
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2018
-#: ../ui/evolution-addressbook.xml.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2016
+#: ../ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Gardar como VCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:930
-#: ../calendar/gui/dialogs/comp-editor.c:1054
 #: ../calendar/gui/e-calendar-table.c:1167
-#: ../calendar/gui/e-calendar-view.c:1555 ../calendar/gui/e-memo-table.c:845
-#: ../ui/evolution-addressbook.xml.h:38
+#: ../calendar/gui/e-calendar-view.c:1545 ../ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Abrir"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:932
-msgid "_New Contact..."
-msgstr "_Novo Contacto..."
+msgid "New Contact..."
+msgstr "Novo Contacto..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:933
-msgid "New Contact _List..."
-msgstr "Nova _Lista de Contactos..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
-#: ../ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard..."
-msgstr "_Gardar coma VCard..."
+msgid "New Contact List..."
+msgstr "Nova Lista de Contactos..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:937
-msgid "_Forward Contact"
-msgstr "_Remitir Contacto"
+#: ../ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "Remitir Contacto"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:938
-msgid "_Forward Contacts"
-msgstr "_Remitir Contactos"
+msgid "Forward Contacts"
+msgstr "Remitir Contactos"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:939
-msgid "Send _Message to Contact"
-msgstr "Enviar unha _Mensaxe ao Contacto"
+msgid "Send Message to Contact"
+msgstr "Enviar unha Mensaxe ao Contacto"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:940
-msgid "Send _Message to List"
-msgstr "Enviar unha _Mensaxe á lista"
+msgid "Send Message to List"
+msgstr "Enviar unha Mensaxe á lista"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:941
-msgid "Send _Message to Contacts"
-msgstr "Enviar unha _Mensaxe aos Contactos"
+msgid "Send Message to Contacts"
+msgstr "Enviar unha Mensaxe aos Contactos"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:942
-msgid "_Print"
-msgstr "Im_primir"
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2510
+#: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "Imprimir"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:945
-msgid "Cop_y to Address Book..."
-msgstr "Co_piar ao Libro de Enderezos..."
+msgid "Copy to Address Book..."
+msgstr "Copiar ao Libro de Enderezos..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:946
-msgid "Mo_ve to Address Book..."
-msgstr "Mo_ver ao Libro de Enderezos..."
+msgid "Move to Address Book..."
+msgstr "Mover ao Libro de Enderezos..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:949
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:8
-msgid "Cu_t"
-msgstr "Cor_tar"
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Cortar"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:950
 #: ../calendar/gui/calendar-component.c:536
-#: ../calendar/gui/dialogs/comp-editor.c:431
-#: ../calendar/gui/e-calendar-table.c:1175
-#: ../calendar/gui/e-calendar-view.c:1562 ../calendar/gui/e-memo-table.c:853
-#: ../calendar/gui/tasks-component.c:440 ../composer/e-msg-composer.c:3049
-#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1035
-#: ../mail/message-list.c:1718 ../ui/evolution-addressbook.xml.h:32
-#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:105
-#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
-msgid "_Copy"
-msgstr "_Copiar"
+#: ../calendar/gui/tasks-component.c:440 ../ui/evolution-addressbook.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:12 ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Copiar"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:951
-msgid "P_aste"
-msgstr "_Pegar"
+#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "Pegar"
 
 #. All, unmatched, separator
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1565
@@ -2960,8 +2907,7 @@ msgstr "_Pegar"
 msgid "Any Category"
 msgstr "Calquera Categoría"
 
-#. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1767
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1766
 msgid "Print cards"
 msgstr "Imprimir tarxetas"
 
@@ -2994,10 +2940,9 @@ msgid "Car Phone"
 msgstr "Teléfono do Automóbil"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/task-page.glade.h:6
 #: ../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 "Categorías"
 
@@ -3102,7 +3047,7 @@ msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:388
+#: ../calendar/gui/e-meeting-list-view.c:378
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
 msgid "Role"
@@ -3371,7 +3316,7 @@ msgstr "Protocolo non soportado"
 #: ../calendar/gui/e-cal-component-preview.c:232
 #: ../calendar/gui/e-cal-model-tasks.c:348
 #: ../calendar/gui/e-cal-model-tasks.c:661
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2375
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2373
 msgid "Cancelled"
 msgstr "Cancelada"
 
@@ -3489,11 +3434,13 @@ msgstr ""
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:157
 msgid "The backend for this addressbook was unable to parse this query."
-msgstr "O backend para este libro de enderezos non puido analizar esta consulta."
+msgstr ""
+"O backend para este libro de enderezos non puido analizar esta consulta."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:160
 msgid "The backend for this addressbook refused to perform this query."
-msgstr "O backend para este libro de enderezos refusou a efectuar esta consulta."
+msgstr ""
+"O backend para este libro de enderezos refusou a efectuar esta consulta."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:163
 msgid "This query did not complete successfully."
@@ -3601,16 +3548,6 @@ msgstr "Varias VCards"
 msgid "VCard for %s"
 msgstr "VCard para %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1031
-#: ../addressbook/gui/widgets/eab-gui-util.c:1049
-msgid "Contact information"
-msgstr "Información de contacto"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:1051
-#, c-format
-msgid "Contact information for %s"
-msgstr "Información de contacto de %s"
-
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -3706,8 +3643,8 @@ msgstr "Imprimir sobre"
 msgid "Print contacts"
 msgstr "Imprimi-los contactos"
 
-#: ../addressbook/printing/e-contact-print.c:1117
-#: ../addressbook/printing/e-contact-print.c:1145
+#: ../addressbook/printing/e-contact-print.c:1116
+#: ../addressbook/printing/e-contact-print.c:1144
 msgid "Print contact"
 msgstr "Imprimir contacto"
 
@@ -3861,8 +3798,8 @@ msgstr "Sombreado"
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
 #: ../plugins/exchange-operations/exchange-account-setup.c:940
-#: ../plugins/exchange-operations/exchange-calendar.c:224
-#: ../plugins/exchange-operations/exchange-contacts.c:197
+#: ../plugins/exchange-operations/exchange-calendar.c:214
+#: ../plugins/exchange-operations/exchange-contacts.c:186
 msgid "Size:"
 msgstr "Tamaño:"
 
@@ -3951,7 +3888,8 @@ msgid "Export in asynchronous mode"
 msgstr "Exportar en modo asíncrono"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
-msgid "The number of cards in one output file in asychronous mode, default size 100."
+msgid ""
+"The number of cards in one output file in asychronous mode, default size 100."
 msgstr ""
 "O número de tarxetas nun ficheiro de saída en modo asíncrono, tamaño por "
 "amisión 100."
@@ -3961,7 +3899,8 @@ msgid "NUMBER"
 msgstr "NÚMERO"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:91
-msgid "Command line arguments error, please use --help option to see the usage."
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Erro nos argumentos da liña de comandos, por favor use a opción --help para "
 "ver o uso."
@@ -4035,7 +3974,8 @@ msgstr ""
 "recuperar."
 
 #: ../calendar/calendar.error.xml.h:6
-msgid "All information in this journal will be deleted and can not be restored."
+msgid ""
+"All information in this journal will be deleted and can not be restored."
 msgstr "Toda a información neste diario borrarase e non se poderá recuperar."
 
 #: ../calendar/calendar.error.xml.h:7
@@ -4049,7 +3989,8 @@ msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "Toda a información destas tarefas borrarase e non se poderá recuperar."
 
 #: ../calendar/calendar.error.xml.h:9
-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 "Toda a información desta cita borrarase e non se poderá recuperar."
 
 #: ../calendar/calendar.error.xml.h:10
@@ -4061,12 +4002,15 @@ msgstr ""
 "recuperar."
 
 #: ../calendar/calendar.error.xml.h:11
-msgid "All information on this meeting will be deleted and can not be restored."
-msgstr "Toda a información acerca desta xuntanza borrarase e non se poderá recuperar."
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+"Toda a información acerca desta xuntanza borrarase e non se poderá recuperar."
 
 #: ../calendar/calendar.error.xml.h:12
 msgid "All information on this task will be deleted and can not be restored."
-msgstr "Toda a información acerca desta tarefa borrarase e non pode ser recuperada."
+msgstr ""
+"Toda a información acerca desta tarefa borrarase e non pode ser recuperada."
 
 #: ../calendar/calendar.error.xml.h:13
 msgid "Are you sure you want to delete the '{0}' task?"
@@ -4121,13 +4065,13 @@ msgid "Delete calendar '{0}'?"
 msgstr "Borrar calendario '{0}?"
 
 #: ../calendar/calendar.error.xml.h:26
-msgid "Delete memo list '{0}'?"
-msgstr "Borrar a lista de memorándum '{0}'?"
-
-#: ../calendar/calendar.error.xml.h:27
 msgid "Delete task list '{0}'?"
 msgstr "Borrar a lista de tarefas '{0}'?"
 
+#: ../calendar/calendar.error.xml.h:27
+msgid "Discard Changes"
+msgstr "Descartar trocos"
+
 #: ../calendar/calendar.error.xml.h:28
 msgid "Don't Send"
 msgstr "Non enviar"
@@ -4145,7 +4089,8 @@ msgid "Editor could not be loaded."
 msgstr "Non se puido cargar o editor."
 
 #: ../calendar/calendar.error.xml.h:32
-msgid "Email invitations will be sent to all participants and allow them to RSVP."
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
 msgstr ""
 "As invitacións serán enviadas por correos-e a todos os participantes e as "
 "permitirá RSVP."
@@ -4163,14 +4108,10 @@ msgid "Error loading calendar"
 msgstr "Erro ao cargar o calendario"
 
 #: ../calendar/calendar.error.xml.h:35
-msgid "Error loading memo list"
-msgstr "Erro ao cargar a lista de notas"
-
-#: ../calendar/calendar.error.xml.h:36
 msgid "Error loading task list"
 msgstr "Erro ao cargar a lista de tarefas"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:36
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the journal has been deleted."
@@ -4178,7 +4119,7 @@ msgstr ""
 "Se non envía unha notificación de cancelación, os outros participantes "
 "quizais non saiban que o diario foi borrado."
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:37
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the meeting is canceled."
@@ -4186,7 +4127,7 @@ msgstr ""
 "Se non envía unha notificación de cancelación, os outros participantes "
 "quizais non saiban que a xuntanza cancelouse."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the task has been deleted."
@@ -4194,6 +4135,10 @@ msgstr ""
 "Se non envía unha notificación de cancelación, os outros participantes "
 "quizais non saiban que a tarefa foi borrada."
 
+#: ../calendar/calendar.error.xml.h:39
+msgid "Save Changes"
+msgstr "Gardar trocos"
+
 #: ../calendar/calendar.error.xml.h:40
 #: ../ui/evolution-message-composer.xml.h:28
 msgid "Send"
@@ -4232,99 +4177,85 @@ msgid "The calendar is not marked for offline usage"
 msgstr "O calendario non está marcado para empregarse sen conexión"
 
 #: ../calendar/calendar.error.xml.h:48
-msgid "The memo list is not marked for offline usage"
-msgstr "A lista de notas non está marcada para empregarse sen conexión"
-
-#: ../calendar/calendar.error.xml.h:49
 msgid "The task list is not marked for offline usage"
 msgstr "A lista de tarefas non está marcada para empregarse sen conexión"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:49
 msgid "This calendar will be removed permanently."
 msgstr "Este calendario eliminarase permanentemente."
 
-#: ../calendar/calendar.error.xml.h:51
-msgid "This memo list will be removed permanently."
-msgstr "Esta lista de notas será eliminada permanentemente."
-
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:50
 msgid "This task list will be removed permanently."
 msgstr "Esta lista de tarefas será eliminada permanentemente."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:51
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Desexa gardar os trocos a esta cita?"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:52
 msgid "Would you like to save your changes to this task?"
 msgstr "Desexa gardar os trocos a esta tarefa?"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:53
 msgid "Would you like to send a cancellation notice for this journal entry?"
 msgstr ""
 "Está seguro de que quere enviar unha notificación de cancelación para esta "
 "entrada de diario?"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:54
 msgid "Would you like to send all the participants a cancellation notice?"
-msgstr "Quere enviar a todos os participantes unha notificación de cancelación?"
+msgstr ""
+"Quere enviar a todos os participantes unha notificación de cancelación?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:55
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Quere enviar invitacións aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:56
 msgid "Would you like to send this task to participants?"
 msgstr "Quere enviar esta tarefa aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Quere enviar información da xuntanza actualizada aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send updated task information to participants?"
 msgstr "Quere enviar información de tarefas actualizada aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:62
-msgid "You have changed this appointment, but not yet saved them."
-msgstr "Cambiou esta cita, pero non a gardou aínda."
+#: ../calendar/calendar.error.xml.h:60
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "Realizou trocos a esta cita, pero non os gardou."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:61
 msgid "You have made changes to this task, but not yet saved them."
 msgstr "Realizou trocos a esta tarefa, pero non os gardou aínda."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:62
 msgid "Your calendars will not be available until Evolution is restarted."
-msgstr "Seus calendarios non estarán dispoñibles ata que Evolution sexa reiniciado."
+msgstr ""
+"Seus calendarios non estarán dispoñibles ata que Evolution sexa reiniciado."
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:63
 msgid "Your tasks will not be available until Evolution is restarted."
-msgstr "Súas tarefas non estarán dispoñibles ata que Evolution sexa iniciado de novo."
-
-#: ../calendar/calendar.error.xml.h:66
-#: ../composer/mail-composer.error.xml.h:29
-msgid "_Discard Changes"
-msgstr "_Descartar trocos"
+msgstr ""
+"Súas tarefas non estarán dispoñibles ata que Evolution sexa iniciado de novo."
 
-#: ../calendar/calendar.error.xml.h:67 ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:64
 #: ../ui/evolution-message-composer.xml.h:51
 msgid "_Save"
 msgstr "_Gardar"
 
-#: ../calendar/calendar.error.xml.h:68
-msgid "_Save Changes"
-msgstr "_Gardar trocos"
-
-#: ../calendar/calendar.error.xml.h:69
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:129
+#: ../calendar/calendar.error.xml.h:65
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:123
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:66
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:323
+#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:322
 #: ../smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Introducir contrasinal"
@@ -4335,10 +4266,8 @@ msgstr "Dividir acontecementos de días múltiples:"
 
 #: ../calendar/conduits/calendar/calendar-conduit.c:1377
 #: ../calendar/conduits/calendar/calendar-conduit.c:1378
-#: ../calendar/conduits/memo/memo-conduit.c:854
-#: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:988
-#: ../calendar/conduits/todo/todo-conduit.c:989
+#: ../calendar/conduits/todo/todo-conduit.c:879
+#: ../calendar/conduits/todo/todo-conduit.c:880
 msgid "Could not start evolution-data-server"
 msgstr "Non se puido iniciar o servidor evolution-data-server"
 
@@ -4347,32 +4276,16 @@ msgstr "Non se puido iniciar o servidor evolution-data-server"
 msgid "Could not read pilot's Calendar application block"
 msgstr "Non se puido ler información da aplicación de calendario do Pilot"
 
-#: ../calendar/conduits/memo/memo-conduit.c:937
-#: ../calendar/conduits/memo/memo-conduit.c:940
-msgid "Could not read pilot's Memo application block"
-msgstr "Non foi posible ler os datos da aplicación Memo do Pilot"
-
-#: ../calendar/conduits/memo/memo-conduit.c:976
-#: ../calendar/conduits/memo/memo-conduit.c:979
-msgid "Could not write pilot's Memo application block"
-msgstr "Non foi posible escribir os datos da aplicación Memo do Pilot"
-
-#: ../calendar/conduits/todo/todo-conduit.c:237
+#: ../calendar/conduits/todo/todo-conduit.c:234
 msgid "Default Priority:"
 msgstr "Prioridade predeterminada:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1071
-#: ../calendar/conduits/todo/todo-conduit.c:1074
+#: ../calendar/conduits/todo/todo-conduit.c:959
+#: ../calendar/conduits/todo/todo-conduit.c:962
 msgid "Could not read pilot's ToDo application block"
 msgstr "Non foi posible ler o bloque de aplicación ToDo do pilot"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1110
-#: ../calendar/conduits/todo/todo-conduit.c:1113
-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:1968
 msgid "Calendar and Tasks"
 msgstr "Calendario e Tarefas"
 
@@ -4406,40 +4319,26 @@ msgid "Evolution's Calendar component"
 msgstr "Compoñente de Calendario de Evolution"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution's Memos component"
-msgstr "Compoñente de Notas de Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Tasks component"
 msgstr "Compoñente de Tarefas de Evolution"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Memo_s"
-msgstr "Nota_s"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memos.c:1091 ../calendar/gui/memos-component.c:528
-#: ../calendar/gui/memos-component.c:998 ../calendar/gui/memos-control.c:334
-msgid "Memos"
-msgstr "Notas"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-tasks.c:1333 ../calendar/gui/print.c:1831
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#: ../calendar/gui/e-tasks.c:1282 ../calendar/gui/print.c:1831
 #: ../calendar/gui/tasks-component.c:519
-#: ../calendar/gui/tasks-component.c:1013 ../calendar/gui/tasks-control.c:466
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:456
 #: ../calendar/importers/icalendar-importer.c:79
 #: ../calendar/importers/icalendar-importer.c:707
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:589
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Tarefas"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 msgid "_Calendars"
 msgstr "_Calendarios"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
 #: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tarefas"
@@ -4448,15 +4347,13 @@ msgstr "_Tarefas"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Servizo de notificación por alarma do Calendario de Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
-#: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/alarm-notify/util.c:66
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:251
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:250
 msgid "Start time"
 msgstr "Hora de comezo"
 
@@ -4476,10 +4373,8 @@ msgstr "Citas"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1419
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1425
-#: ../calendar/gui/e-itip-control.c:1117
-#: ../plugins/itip-formatter/itip-view.c:883
+#: ../calendar/gui/e-itip-control.c:1120
+#: ../plugins/itip-formatter/itip-view.c:884
 msgid "Location:"
 msgstr "Ubicación:"
 
@@ -4492,13 +4387,13 @@ msgstr "_Pospoñer o aviso:"
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:6
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:13
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-editor.xml.h:17
-#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-addressbook.xml.h:34 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-composer-entries.xml.h:8
+#: ../ui/evolution-mail-messagedisplay.xml.h:5
 #: ../ui/evolution-message-composer.xml.h:44
 #: ../ui/evolution-signature-editor.xml.h:23
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution.xml.h:35
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -4507,51 +4402,53 @@ msgid "_Snooze"
 msgstr "_Pospoñer"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+msgid "description of appointment"
+msgstr "descrición da cita"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 msgid "location of appointment"
 msgstr "lugar da cita"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1097
-msgid "<b>Calendars</b>"
-msgstr "<b>Calendarios</b>"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1163
-msgid "Preferences"
-msgstr "Preferencias"
+#: ../calendar/gui/alarm-notify/alarm-queue.c:966
+msgid "Dismiss"
+msgstr "Rexeitar"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1176
-msgid "_Configure Alarms"
-msgstr "_Configurar alarmas"
+#: ../calendar/gui/alarm-notify/alarm-queue.c:967
+msgid "Dismiss All"
+msgstr "Rexeitar todas"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1178 ../ui/evolution.xml.h:44
-msgid "_Quit"
-msgstr "_Saír"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1284
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1401
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1049
 msgid "No summary available."
 msgstr "Non hai resumo dispoñible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1293
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1295
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1058
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1060
 msgid "No description available."
 msgstr "Non hai unha descrición dispoñible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1303
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1068
 msgid "No location information available."
 msgstr "Non hai información do lugar dispoñible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1339
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1084
 #, c-format
-msgid "You have %d alarms"
-msgstr "Ten %d alarmas."
-
-#. FIXME
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1502
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1526
+msgid ""
+"Alarm on %s\n"
+"%s\n"
+"Starting at %s\n"
+"Ending at %s"
+msgstr ""
+"Alarma en %s\n"
+"%s\n"
+"Comeza ás %s\n"
+"Remata ás %s"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1187
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1211
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1506
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1191
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4563,7 +4460,7 @@ msgstr ""
 "configurado para enviar unha mensaxe de correo-e. No seu lugar\n"
 "Evolution amosará un diálogo de recordatorio normal."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1532
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1217
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4580,7 +4477,7 @@ msgstr ""
 "\n"
 "Está seguro de quere executar este programa?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1546
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1231
 msgid "Do not ask me about this program again."
 msgstr "Non preguntar de novo sobre este programa."
 
@@ -4596,62 +4493,6 @@ msgstr "Non foi posible crear a fábrica do servicio de notificacións de alarma
 msgid "invalid time"
 msgstr "hora inválida"
 
-#. Can't be zero
-#: ../calendar/gui/alarm-notify/util.c:58
-#, c-format
-msgid "(%d seconds)"
-msgstr "(%d segundos)"
-
-#: ../calendar/gui/alarm-notify/util.c:64
-#, c-format
-msgid "(%d %s %d %s)"
-msgstr "(%d %s %d %s)"
-
-#: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/dialogs/recurrence-page.c:990
-msgid "second"
-msgstr "segundo"
-
-#: ../calendar/gui/alarm-notify/util.c:64 ../filter/filter.glade.h:18
-#: ../mail/mail-config.glade.h:177
-msgid "seconds"
-msgstr "segundos"
-
-#: ../calendar/gui/alarm-notify/util.c:66
-#, c-format
-msgid "(%d %s)"
-msgstr "(%d %s)"
-
-#: ../calendar/gui/alarm-notify/util.c:77
-#, c-format
-msgid " %u second"
-msgstr " %u segundo"
-
-#: ../calendar/gui/alarm-notify/util.c:77
-#, c-format
-msgid " %u seconds"
-msgstr "%u segundos"
-
-#: ../calendar/gui/alarm-notify/util.c:79
-#, c-format
-msgid " %u minute"
-msgstr "%u minuto"
-
-#: ../calendar/gui/alarm-notify/util.c:79
-#, c-format
-msgid " %u minutes"
-msgstr "%u minutos"
-
-#: ../calendar/gui/alarm-notify/util.c:81
-#, c-format
-msgid "%u hour"
-msgstr "%u hora"
-
-#: ../calendar/gui/alarm-notify/util.c:81
-#, c-format
-msgid "%u hours"
-msgstr "%u horas"
-
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 msgid "Alarm programs"
 msgstr "Programas de alarma"
@@ -4666,14 +4507,16 @@ msgstr "Cor de fondo para as tarefas que vencen hoxe, en formato \"#rrggbb\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr "Cor de fondo para as tarefas que están retrasadas, en formato \"#rrggbb\"."
+msgstr ""
+"Cor de fondo para as tarefas que están retrasadas, en formato \"#rrggbb\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
 msgid "Calendars to run alarms for"
 msgstr "Os calendarios executarán alarmas durante"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.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 ""
 "Cor para debuxar a liña de Marcus Bains na barra de Tempo (balerio por "
 "omisión)."
@@ -4744,7 +4587,8 @@ msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr "Os intervalos de tempo amosados nas vistas diarias e semanais, en minutos."
+msgstr ""
+"Os intervalos de tempo amosados nas vistas diarias e semanais, en minutos."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
@@ -4839,60 +4683,26 @@ msgid "Programs that are allowed to be run by alarms."
 msgstr "Programas que se permite que sexan executados polas alarmas."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
-msgid "Show RSVP field in the event/task/meeting editor"
-msgstr "Amosar o campo RSVP no editor de eventos/tarefas/xuntanzas"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
-msgid "Show Role field in the event/task/meeting editor"
-msgstr "Amosar o campo Rol no editor de eventos/tarefas/xuntanzas"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr "Amosar os prazos finais das citas nas vistas semanal e mensual"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
-msgid "Show categories field in the event/meeting/task editor"
-msgstr "Amosar o campo categorías no editor de eventos/xuntanzas/tarefas"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show display alarms in notification tray"
 msgstr "Amosar o visor da alarma nunha bandexa de notificación"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
-msgid "Show status field in the event/task/meeting editor"
-msgstr "Amosar o campo estado no editor de eventos/tarefas/xuntanzas"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
-#: ../mail/evolution-mail.schemas.in.in.h:73
-msgid "Show the \"Preview\" pane"
-msgstr "Amosar o panel de \"Vista previa\""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
-#: ../mail/evolution-mail.schemas.in.in.h:74
-msgid "Show the \"Preview\" pane."
-msgstr "Amosar o panel de \"Vista previa\"."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
-msgid "Show timezone field in the event/meeting editor"
-msgstr "Amosar o campo fuso horario no editor de eventos/xuntanzas"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
-msgid "Show type field in the event/task/meeting editor"
-msgstr "Amosar o campo tipo no editor de eventos/tarefas/xuntanzas"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show week numbers in date navigator"
 msgstr "Amosa-los números das semanas no navegador de datas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Tasks due today color"
 msgstr "Cor para as tarefas que vencen hoxe"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Tasks vertical pane position"
 msgstr "Posición do panel vertical de tarefas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -4901,7 +4711,7 @@ msgstr ""
 "calendario, coma unha localización sen traslación da base de datos de "
 "franxas horarias Olsen, como en \"America/New York\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
 #, no-c-format
 msgid ""
 "The url template to use as a free/busy data fallback, %u is replaced by the "
@@ -4911,55 +4721,57 @@ msgstr ""
 "reemprázase pola parte de usuario do enderezo de correo e %d reemprázase "
 "polo dominio."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Time divisions"
 msgstr "Divisións horarias"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Time the last alarm ran, in time_t."
 msgstr "A hora na que a última alarma sonou, en time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Timezone"
 msgstr "Fuso horario"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Twenty four hour time format"
 msgstr "Formato de hora en vintecatro horas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unidades para o recordatorio predeterminado, \"minutes\", \"hours\" ou \"days"
 "\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
-msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unidades para determinar cándo agochar tarefas, \"minutes\", \"hours\" or "
 "\"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid "Week start"
 msgstr "Comezo da semana"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "O día no que comeza a semana, desde o Domingo (0) ata o Sábado (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Whether or not to use the notification tray for display alarms."
-msgstr "Indica se se debe usar ou non a bandexa de notificación para amosar alarmas."
+msgstr ""
+"Indica se se debe usar ou non a bandexa de notificación para amosar alarmas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Indica se se debe pedir confirmación ao borrar unha cita ou tarefa."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Indica se se debe pedir confirmación ao compactar citas ou tarefas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -4967,77 +4779,56 @@ msgstr ""
 "Indica se se deben comprimir os fins de semana, o cal pon ao Sábado e ao "
 "Domingo no mesmo espazo que un día laborabel."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Indica se se debe amosar a hora de finalización dos acontecementos nas "
 "vistas semanais e mensuais."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
-msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Indica se debe debuxar a liña Marcus Bains (liña á hora actual) no "
 "calendario."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Indica se debe agochar as tarefas rematadas na vista de tarefas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Whether to set a default reminder for appointments."
-msgstr "Indica se debe establecer un recordatorio predeterminado para as citas."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
-msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr "Indica se debe amosar o campo RSVP no editor de eventos/tarefas/xuntanzas"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
-msgid "Whether to show categories field in the event/meeting editor"
-msgstr "Indica se debe amosar o campo categorías no editor de eventos/xuntanzas"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
-msgid "Whether to show role field in the event/task/meeting editor"
-msgstr "Indica se debe amosar o campo rol no editor de eventos/tarefas/xuntanzas"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
-msgid "Whether to show status field in the event/task/meeting editor"
-msgstr "Indica se debe amosar o campo estado no editor de eventos/tarefas/xuntanzas"
+msgstr ""
+"Indica se debe establecer un recordatorio predeterminado para as citas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
-msgid "Whether to show times in twenty four hour format instead of using am/pm."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
 "Indica se debe amosar as horas en formato de vintecatro horas en vez de usar "
 "am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
-msgid "Whether to show timezone field in the event/meeting editor"
-msgstr "Indica se debe amosar o campo fuso horario no editor de eventos/xuntanzas"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
-msgid "Whether to show type field in the event/task/meeting editor"
-msgstr "Indica se debe amosar o campo tipo no editor de eventos/tarefas/xuntanzas"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Indica se debe amosar os números da semana no navegador de datas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Work days"
 msgstr "Días laborables"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid "Workday end hour"
 msgstr "Hora de finalización da xornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Workday end minute"
 msgstr "Minuto de finalización da xornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid "Workday start hour"
 msgstr "Hora de comezo da xornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Workday start minute"
 msgstr "Minuto de comezo da xornada laboral"
 
@@ -5061,22 +4852,13 @@ msgstr "A ubicación contén"
 msgid "Unmatched"
 msgstr "Non concorda"
 
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2512
-#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-memos.xml.h:11
-#: ../ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "Imprimir"
-
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:367
 #: ../calendar/gui/gnome-cal.c:2116
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:590
-#: ../plugins/hula-account-setup/camel-hula-listener.c:374
-#: ../plugins/hula-account-setup/camel-hula-listener.c:403
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:588
 msgid "Calendar"
 msgstr "Axenda"
 
@@ -5104,13 +4886,10 @@ msgid "days"
 msgstr "días"
 
 #. 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:234
-#: ../calendar/gui/memos-component.c:219 ../calendar/gui/migration.c:489
-#: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1084
-#: ../calendar/gui/tasks-component.c:215
+#: ../calendar/gui/calendar-component.c:234 ../calendar/gui/migration.c:489
+#: ../calendar/gui/migration.c:582 ../calendar/gui/tasks-component.c:215
 msgid "On The Web"
 msgstr "Na Web"
 
@@ -5125,17 +4904,19 @@ msgid "Weather"
 msgstr "Tempo"
 
 #: ../calendar/gui/calendar-component.c:535
-msgid "_New Calendar"
-msgstr "_Novo calendario"
+#: ../calendar/gui/dialogs/calendar-setup.c:449
+msgid "New Calendar"
+msgstr "Novo calendario"
 
 #: ../calendar/gui/calendar-component.c:858
 msgid "Failed upgrading calendars."
 msgstr "Fallou ao actualizar calendarios."
 
-#: ../calendar/gui/calendar-component.c:1157
+#: ../calendar/gui/calendar-component.c:1154
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
-msgstr "Non se puido abrir o calendario '%s' para crear acontecementos e xuntanzas"
+msgstr ""
+"Non se puido abrir o calendario '%s' para crear acontecementos e xuntanzas"
 
 #: ../calendar/gui/calendar-component.c:1170
 msgid "There is no calendar available for creating events and meetings"
@@ -5186,7 +4967,6 @@ msgid "New calendar"
 msgstr "Novo calendario"
 
 #: ../calendar/gui/calendar-component.c:1500
-#: ../calendar/gui/dialogs/event-page.c:828
 msgid "Cale_ndar"
 msgstr "Cale_ndario"
 
@@ -5321,8 +5101,7 @@ msgstr "hora(s)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/calendar-http/calendar-http.c:264
+#: ../filter/filter.glade.h:15 ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:564
 msgid "hours"
 msgstr "horas"
@@ -5344,8 +5123,6 @@ msgid "A_dd"
 msgstr "Enga_dir"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Alarmas"
 
@@ -5372,20 +5149,17 @@ msgstr "%.0fG"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:311
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
-#: ../calendar/gui/dialogs/comp-editor.c:2575
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:138
-#: ../mail/em-utils.c:483 ../mail/em-utils.c:520
-#: ../widgets/misc/e-attachment-bar.c:341
+#: ../calendar/gui/dialogs/comp-editor.c:2440
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:444
+#: ../mail/em-utils.c:481 ../widgets/misc/e-attachment-bar.c:341
 msgid "attachment"
 msgstr "anexo"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:473
-#: ../calendar/gui/dialogs/comp-editor.c:1055
-#: ../calendar/gui/dialogs/event-page.c:1733
-#: ../calendar/gui/dialogs/meeting-page.c:908
-#: ../calendar/gui/dialogs/task-page.c:1182
+#: ../calendar/gui/dialogs/comp-editor.c:1083
+#: ../calendar/gui/dialogs/meeting-page.c:887
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3545
+#: ../composer/e-msg-composer.c:3400
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
@@ -5393,23 +5167,23 @@ msgid "_Remove"
 msgstr "Elimina_r"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:474
-#: ../calendar/gui/dialogs/comp-editor.c:1056
+#: ../calendar/gui/dialogs/comp-editor.c:1084
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3546 ../mail/em-folder-tree.c:2058
+#: ../composer/e-msg-composer.c:3401 ../mail/em-folder-tree.c:2052
 #: ../ui/evolution-mail-list.xml.h:29
 msgid "_Properties"
 msgstr "_Propiedades"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:476
-#: ../calendar/gui/dialogs/comp-editor.c:1058
+#: ../calendar/gui/dialogs/comp-editor.c:1086
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3548
+#: ../composer/e-msg-composer.c:3403
 msgid "_Add attachment..."
 msgstr "_Engadir anexo..."
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:736
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:994
+#: ../widgets/misc/e-attachment-bar.c:963
 msgid "Attachment Bar"
 msgstr "Barra de adxuntos"
 
@@ -5424,7 +5198,7 @@ msgid "Suggest automatic display of attachment"
 msgstr "Suxerir que se amose o anexo automaticamente"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
-#: ../composer/e-msg-composer-select-file.c:239
+#: ../composer/e-msg-composer-select-file.c:241
 msgid "Attach file(s)"
 msgstr "Anexar un ficheiro(s)"
 
@@ -5459,7 +5233,7 @@ msgstr "Propiedades de adxuntos"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:267
-#: ../calendar/gui/e-itip-control.c:1163
+#: ../calendar/gui/e-itip-control.c:1166
 #: ../calendar/gui/e-itip-control.glade.h:6
 #: ../composer/e-msg-composer-attachment.glade.h:3
 #: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
@@ -5480,7 +5254,7 @@ msgstr "Tipo MIME:"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:576
-#: ../mail/em-account-prefs.c:504 ../mail/em-composer-prefs.c:919
+#: ../mail/em-account-prefs.c:504 ../mail/em-composer-prefs.c:891
 #: ../plugins/plugin-manager/plugin-manager.c:213
 msgid "Enabled"
 msgstr "Activado"
@@ -5563,8 +5337,10 @@ msgstr "<b>Semana Laboral</b>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #, no-c-format
-msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr "<i>%u e %d reemprazarán polo usuario e o dominio do enderezo de correo-e.</i>"
+msgid ""
+"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgstr ""
+"<i>%u e %d reemprazarán polo usuario e o dominio do enderezo de correo-e.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Calendar and Tasks Settings"
@@ -5596,14 +5372,12 @@ msgid "E_nable"
 msgstr "A_ctivar"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: ../calendar/gui/dialogs/event-editor.c:549
-#: ../ui/evolution-event-editor.xml.h:6
 msgid "Free/Busy"
 msgstr "Dispoñibilidade"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: ../calendar/gui/dialogs/recurrence-page.c:1049
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Friday"
 msgstr "Venres"
 
@@ -5617,7 +5391,7 @@ msgstr "Minutos"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: ../calendar/gui/dialogs/recurrence-page.c:1045
-#: ../calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Monday"
 msgstr "Luns"
 
@@ -5631,7 +5405,7 @@ msgstr "_Dom"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ../calendar/gui/dialogs/recurrence-page.c:1050
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -5645,7 +5419,7 @@ msgstr "Amosa-los _números das semanas no navegador de datas"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: ../calendar/gui/dialogs/recurrence-page.c:1051
-#: ../calendar/gui/e-itip-control.c:726
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -5663,12 +5437,11 @@ msgstr "Modelo:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 #: ../calendar/gui/dialogs/recurrence-page.c:1048
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Thursday"
 msgstr "Xoves"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "Time _zone:"
 msgstr "Fuso _horario:"
 
@@ -5678,7 +5451,7 @@ msgstr "Formato da hora:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/dialogs/recurrence-page.c:1046
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Tuesday"
 msgstr "Martes"
 
@@ -5688,7 +5461,7 @@ msgstr "A _semana comeza en:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #: ../calendar/gui/dialogs/recurrence-page.c:1047
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Wednesday"
 msgstr "Mércores"
 
@@ -5774,42 +5547,26 @@ msgstr "Copiar o contido do calendario localmente para operación desconectada"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:290
 msgid "Copy task list contents locally for offline operation"
-msgstr "Copiar o contido da lista de tarefas localmente para operación desconectada"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-msgid "Copy memo list contents locally for offline operation"
-msgstr "Copiar o contido da lista de notas localmente para operación desconectada"
+msgstr ""
+"Copiar o contido da lista de tarefas localmente para operación desconectada"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:341
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "C_or:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:378
 msgid "Tasks List"
 msgstr "Lista de Tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-msgid "Memos List"
-msgstr "Lista de notas"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:460
+#: ../calendar/gui/dialogs/calendar-setup.c:447
 msgid "Calendar Properties"
 msgstr "Propiedades do calendario"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:462
-msgid "New Calendar"
-msgstr "Novo calendario"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:528
+#: ../calendar/gui/dialogs/calendar-setup.c:515
 msgid "Task List Properties"
 msgstr "Propiedades de lista de tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:594
-#: ../calendar/gui/memos-component.c:448
-msgid "New Memo List"
-msgstr "Nova Lista de Notas"
-
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
 msgstr "Engadir calendario"
@@ -5917,105 +5674,106 @@ msgstr " (Pendente "
 msgid "Due "
 msgstr "Pendente "
 
-#: ../calendar/gui/dialogs/comp-editor.c:193 ../composer/e-msg-composer.c:2800
+#: ../calendar/gui/dialogs/comp-editor.c:190 ../composer/e-msg-composer.c:2664
 #, c-format
 msgid "Attached message - %s"
 msgstr "Mensaxe adxunta - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:198
-#: ../calendar/gui/dialogs/comp-editor.c:368 ../composer/e-msg-composer.c:2805
-#: ../composer/e-msg-composer.c:2984
+#: ../calendar/gui/dialogs/comp-editor.c:195
+#: ../calendar/gui/dialogs/comp-editor.c:365 ../composer/e-msg-composer.c:2669
+#: ../composer/e-msg-composer.c:2846
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Mensaxe adxunta"
 msgstr[1] "%d mensaxes adxuntas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:432 ../composer/e-msg-composer.c:3050
+#: ../calendar/gui/dialogs/comp-editor.c:428
+#: ../calendar/gui/e-calendar-table.c:1175
+#: ../calendar/gui/e-calendar-view.c:1552 ../composer/e-msg-composer.c:2911
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1035
+#: ../mail/message-list.c:1708 ../ui/evolution-addressbook.xml.h:31
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-tasks.xml.h:21
+msgid "_Copy"
+msgstr "_Copiar"
+
+#: ../calendar/gui/dialogs/comp-editor.c:429 ../composer/e-msg-composer.c:2912
 #: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1719
+#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1709
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../calendar/gui/dialogs/comp-editor.c:434 ../composer/e-msg-composer.c:3052
-#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1721
+#: ../calendar/gui/dialogs/comp-editor.c:431 ../composer/e-msg-composer.c:2914
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1711
 msgid "Cancel _Drag"
 msgstr "Cancelar _arrastre"
 
-#: ../calendar/gui/dialogs/comp-editor.c:777
+#: ../calendar/gui/dialogs/comp-editor.c:774
 msgid "Could not update object"
 msgstr "Non se puido actualizar o obxecto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:913 ../composer/e-msg-composer.c:2443
+#: ../calendar/gui/dialogs/comp-editor.c:977 ../composer/e-msg-composer.c:2318
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> Adxunto"
 msgstr[1] "<b>%d</b> Adxuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:943
-msgid "Hide Attachment _Bar"
-msgstr "Agochar _barra de adxuntos"
-
-#: ../calendar/gui/dialogs/comp-editor.c:946
-#: ../calendar/gui/dialogs/comp-editor.c:1363
-msgid "Show Attachment _Bar"
-msgstr "Amosar _barra de adxuntos"
+#: ../calendar/gui/dialogs/comp-editor.c:1249
+msgid "_Attachment Bar (drop attachments here)"
+msgstr "Barra de _adxuntos (soltar adxuntos aquí)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
-msgid "Attachment Button: Press space key to toggle attachment bar"
-msgstr "Botón de adxuntos: Prema a tecla de espazo para cambiar a barra de adxuntos"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1984
-#: ../calendar/gui/dialogs/comp-editor.c:2027
+#: ../calendar/gui/dialogs/comp-editor.c:1850
+#: ../calendar/gui/dialogs/comp-editor.c:1893
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1990
-#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/dialogs/comp-editor.c:1856
+#: ../calendar/gui/dialogs/comp-editor.c:1899
 #, c-format
 msgid "Meeting - %s"
 msgstr "Xuntanza - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1992
-#: ../calendar/gui/dialogs/comp-editor.c:2035
+#: ../calendar/gui/dialogs/comp-editor.c:1858
+#: ../calendar/gui/dialogs/comp-editor.c:1901
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1996
-#: ../calendar/gui/dialogs/comp-editor.c:2039
+#: ../calendar/gui/dialogs/comp-editor.c:1862
+#: ../calendar/gui/dialogs/comp-editor.c:1905
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tarefa asignada - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1998
-#: ../calendar/gui/dialogs/comp-editor.c:2041
+#: ../calendar/gui/dialogs/comp-editor.c:1864
+#: ../calendar/gui/dialogs/comp-editor.c:1907
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2001
-#: ../calendar/gui/dialogs/comp-editor.c:2044
+#: ../calendar/gui/dialogs/comp-editor.c:1867
+#: ../calendar/gui/dialogs/comp-editor.c:1910
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada de diario - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2012
-#: ../calendar/gui/dialogs/comp-editor.c:2054
+#: ../calendar/gui/dialogs/comp-editor.c:1878
+#: ../calendar/gui/dialogs/comp-editor.c:1920
 msgid "No summary"
 msgstr "Sen resumo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2668
-#: ../calendar/gui/dialogs/comp-editor.c:2701
-#: ../calendar/gui/dialogs/comp-editor.c:2725
+#: ../calendar/gui/dialogs/comp-editor.c:2532
+#: ../calendar/gui/dialogs/comp-editor.c:2565
+#: ../calendar/gui/dialogs/comp-editor.c:2589
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Os trocos efectuados a este elemento poden descartarse se chega unha "
 "actualización por correo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2749
+#: ../calendar/gui/dialogs/comp-editor.c:2613
 msgid "Unable to use current version!"
 msgstr "Imposible usar a versión actual!"
 
@@ -6092,178 +5850,203 @@ msgstr "Delegar En:"
 msgid "Enter Delegate"
 msgstr "Introducir Delegado"
 
-#: ../calendar/gui/dialogs/event-editor.c:525
-msgid "Appoint_ment"
-msgstr "_Cita"
+#: ../calendar/gui/dialogs/event-editor.c:141 ../calendar/gui/print.c:2307
+msgid "Appointment"
+msgstr "Cita"
 
-#: ../calendar/gui/dialogs/event-editor.c:529
-#: ../ui/evolution-event-editor.xml.h:12
+#: ../calendar/gui/dialogs/event-editor.c:150
 msgid "Recurrence"
 msgstr "Recorrencia"
 
-#: ../calendar/gui/dialogs/event-page.c:834
-#: ../calendar/gui/dialogs/task-page.c:443
-msgid "Or_ganizer"
-msgstr "Or_ganizador"
+#: ../calendar/gui/dialogs/event-editor.c:164
+#: ../calendar/gui/dialogs/event-editor.c:248
+#: ../calendar/gui/dialogs/event-editor.c:422
+msgid "Scheduling"
+msgstr "Planificación"
+
+#: ../calendar/gui/dialogs/event-editor.c:174
+msgid "Delegatees"
+msgstr "Delegados"
 
-#: ../calendar/gui/dialogs/event-page.c:872
-msgid "_Delegatees"
-msgstr "_Delegados"
+#: ../calendar/gui/dialogs/event-editor.c:178
+msgid "Attendees"
+msgstr "Participantes"
 
-#: ../calendar/gui/dialogs/event-page.c:874
-msgid "Atte_ndees"
-msgstr "_Participantes"
+#: ../calendar/gui/dialogs/event-editor.c:251
+#: ../calendar/gui/dialogs/event-editor.c:425
+msgid "Invitations"
+msgstr "Invitacións"
 
-#: ../calendar/gui/dialogs/event-page.c:1033
+#: ../calendar/gui/dialogs/event-page.c:731
 msgid "Event with no start date"
 msgstr "Evento sen data de comezo"
 
-#: ../calendar/gui/dialogs/event-page.c:1036
+#: ../calendar/gui/dialogs/event-page.c:734
 msgid "Event with no end date"
 msgstr "Evento sen data de finalización"
 
-#: ../calendar/gui/dialogs/event-page.c:1201
-#: ../calendar/gui/dialogs/task-page.c:847
+#: ../calendar/gui/dialogs/event-page.c:900
+#: ../calendar/gui/dialogs/task-page.c:556
 msgid "Start date is wrong"
 msgstr "A data de comezo é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1211
+#: ../calendar/gui/dialogs/event-page.c:910
 msgid "End date is wrong"
 msgstr "A data de finalización é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1234
+#: ../calendar/gui/dialogs/event-page.c:933
 msgid "Start time is wrong"
 msgstr "A hora de comezo está equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1241
+#: ../calendar/gui/dialogs/event-page.c:940
 msgid "End time is wrong"
 msgstr "A hora de finalización está equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1396
-#: ../calendar/gui/dialogs/meeting-page.c:463
-#: ../calendar/gui/dialogs/task-page.c:904
-msgid "The organizer selected no longer has an account."
-msgstr "O organizador seleccionado xa non ten unha conta."
-
-#: ../calendar/gui/dialogs/event-page.c:1402
-#: ../calendar/gui/dialogs/meeting-page.c:469
-#: ../calendar/gui/dialogs/task-page.c:910
-msgid "An organizer is required."
-msgstr "Requírese un organizador."
-
-#: ../calendar/gui/dialogs/event-page.c:1417
-#: ../calendar/gui/dialogs/meeting-page.c:484
-#: ../calendar/gui/dialogs/task-page.c:925
-msgid "At least one attendee is required."
-msgstr "É necesario polo menos un participante."
-
-#: ../calendar/gui/dialogs/event-page.c:1734
-#: ../calendar/gui/dialogs/meeting-page.c:909
-#: ../calendar/gui/dialogs/task-page.c:1183
-msgid "_Add "
-msgstr "_Engadir "
-
-#: ../calendar/gui/dialogs/event-page.c:2421
+#: ../calendar/gui/dialogs/event-page.c:1686
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Non se puido abrir o calendario '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2661
+#: ../calendar/gui/dialogs/event-page.c:1892
 #, 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:2669
+#: ../calendar/gui/dialogs/event-page.c:1900
 #, 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:2677
+#: ../calendar/gui/dialogs/event-page.c:1908
 #, c-format
 msgid "%d minute before appointement"
 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.glade.h:1
+#: ../calendar/gui/dialogs/event-page.glade.h:2
+msgid "1 day before appointment"
+msgstr "1 día antes da cita"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:3
 msgid "1 hour before appointment"
 msgstr "1 hora antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "15 minutes before appointment"
 msgstr "15 minutos antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:3
-msgid "1day before appointment"
-msgstr "1 día antes da cita"
-
 #: ../calendar/gui/dialogs/event-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "Atte_ndees..."
-msgstr "_Participantes..."
+msgid "<b>Basics</b>"
+msgstr "<b>Básico</b>"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
-msgid "C_ustomize"
-msgstr "_Personalizar"
+#: ../calendar/gui/dialogs/task-page.glade.h:2
+msgid "<b>Date and Time</b>"
+msgstr "<b>Data e Hora</b>"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
-msgid "Ca_tegories..."
-msgstr "Ca_tegorías..."
+#: ../calendar/gui/dialogs/task-page.glade.h:3
+msgid "<b>Send Options</b>"
+msgstr "<b>Opcións de envío</b>"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:8
-msgid "Cale_ndar:"
-msgstr "Cale_ndario:"
+msgid "A_ll day event"
+msgstr "Evento de día comp_leto"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ad_vanced send options"
+msgstr "Opcións a_vanzadas de envío"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:10
-msgid "Event Description"
-msgstr "Descrición do evento"
+msgid "C_ustomize..."
+msgstr "_Personalizar..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:11
-msgid "Locat_ion:"
-msgstr "_Lugar:"
+#: ../calendar/gui/dialogs/task-page.glade.h:5
+msgid "Ca_tegories..."
+msgstr "Ca_tegorías..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:12
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "Or_ganizer:"
-msgstr "Or_ganizador:"
+msgid "Cale_ndar:"
+msgstr "Cale_ndario:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:13
-#: ../calendar/gui/dialogs/task-page.glade.h:6
-msgid "Su_mmary:"
-msgstr "_Resumo:"
+#: ../calendar/gui/dialogs/task-page.glade.h:7
+msgid "Classi_fication:"
+msgstr "Clasi_ficación:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:364
+msgid "Confidential"
+msgstr "Confidencial"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:15
-msgid "_Description:"
-msgstr "_Descrición:"
+msgid "Event Description"
+msgstr "Descrición do evento"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:16
-msgid "_Set alarm\t"
-msgstr "_Establecer alarma\t"
+msgid "Locat_ion:"
+msgstr "_Lugar:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:17
-msgid "_Time:"
-msgstr "_Hora:"
+#: ../calendar/gui/dialogs/task-page.glade.h:10
+#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:323
+#: ../calendar/gui/e-calendar-table.c:363
+msgid "Private"
+msgstr "Privado"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
-msgid "for"
-msgstr "para"
+#: ../calendar/gui/dialogs/task-page.glade.h:11
+#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:314
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:362
+msgid "Public"
+msgstr "Público"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:19
+msgid "Show time as _busy"
+msgstr "Amosar hora como _ocupada"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:20
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "until"
-msgstr "ata"
+#: ../calendar/gui/dialogs/task-page.glade.h:13
+msgid "Su_mmary:"
+msgstr "_Resumo:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:21
+msgid "This appointment has customized alarms"
+msgstr "Esta cita ten alarmas personalizadas"
 
-#: ../calendar/gui/dialogs/meeting-page.c:305
+#: ../calendar/gui/dialogs/event-page.glade.h:22
+msgid "_Alarm"
+msgstr "_Alarma"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:23
+msgid "_Description:"
+msgstr "_Descrición:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:24
+#: ../calendar/gui/e-meeting-time-sel.c:642
+msgid "_End time:"
+msgstr "Hora de _finalización:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:25
+#: ../calendar/gui/e-meeting-time-sel.c:615
+msgid "_Start time:"
+msgstr "Hora de _comezo:"
+
+#: ../calendar/gui/dialogs/meeting-page.c:303
 msgid "<b>Dele_gatees</b>"
 msgstr "<b>Dele_gados</b>"
 
-#: ../calendar/gui/dialogs/meeting-page.c:309
+#: ../calendar/gui/dialogs/meeting-page.c:307
 msgid "<b>From:</b>"
 msgstr "<b>De:</b>"
 
@@ -6272,10 +6055,10 @@ msgstr "<b>De:</b>"
 #. When "None" is selected we want the field to be cleared.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../calendar/gui/dialogs/meeting-page.c:315
+#: ../calendar/gui/dialogs/meeting-page.c:313
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:653
-#: ../calendar/gui/e-itip-control.c:1103 ../composer/e-msg-composer.c:2246
+#: ../calendar/gui/e-itip-control.c:1106 ../composer/e-msg-composer.c:2122
 #: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
 #: ../mail/em-account-editor.c:1348 ../mail/em-account-prefs.c:464
 #: ../mail/em-folder-view.c:1064 ../mail/em-junk-hook.c:78
@@ -6284,12 +6067,29 @@ msgstr "<b>De:</b>"
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:7
 #: ../plugins/itip-formatter/itip-formatter.c:1627
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
-#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:474
-#: ../widgets/misc/e-dateedit.c:1513 ../widgets/misc/e-dateedit.c:1727
+#: ../widgets/misc/e-cell-date-edit.c:248 ../widgets/misc/e-dateedit.c:465
+#: ../widgets/misc/e-dateedit.c:1504 ../widgets/misc/e-dateedit.c:1673
 msgid "None"
 msgstr "Nada"
 
+#: ../calendar/gui/dialogs/meeting-page.c:461
+msgid "The organizer selected no longer has an account."
+msgstr "O organizador seleccionado xa non ten unha conta."
+
+#: ../calendar/gui/dialogs/meeting-page.c:467
+msgid "An organizer is required."
+msgstr "Requírese un organizador."
+
+#: ../calendar/gui/dialogs/meeting-page.c:482
+msgid "At least one attendee is required."
+msgstr "É necesario polo menos un participante."
+
+#: ../calendar/gui/dialogs/meeting-page.c:884
+msgid "_Delegate To..."
+msgstr "_Delegar En..."
+
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
+#: ../calendar/gui/e-meeting-list-view.c:358
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Asistente"
@@ -6325,14 +6125,15 @@ msgid "Member"
 msgstr "Membro"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:399
+#: ../calendar/gui/e-meeting-list-view.c:386
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
+#: ../calendar/gui/dialogs/task-editor.c:146
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:410
+#: ../calendar/gui/e-meeting-list-view.c:394
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
 #: ../mail/message-list.etspec.h:12
 msgid "Status"
@@ -6347,8 +6148,13 @@ msgid "C_hange Organizer"
 msgstr "_Cambiar Organizador"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Co_ntacts..."
-msgstr "Co_ntactos..."
+#: ../calendar/gui/e-meeting-time-sel.c:428
+msgid "Con_tacts..."
+msgstr "Con_tactos..."
+
+#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+msgid "Or_ganizer:"
+msgstr "Or_ganizador:"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "Organizer"
@@ -6359,50 +6165,6 @@ msgstr "Organizador"
 msgid "Organizer:"
 msgstr "Organizador:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:130 ../calendar/gui/print.c:2311
-msgid "Memo"
-msgstr "Nota"
-
-#: ../calendar/gui/dialogs/memo-page.c:489
-#, c-format
-msgid "Unable to open memos in '%s'."
-msgstr "Non é posible abrir as notas en '%s'."
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:2
-msgid "<span weight=\"bold\">Basics</span>"
-msgstr "<span weight=\"bold\">Básicos</span>"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-msgid "Classi_fication:"
-msgstr "Clasi_ficación:"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
-#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:364
-msgid "Confidential"
-msgstr "Confidencial"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:363
-msgid "Private"
-msgstr "Privado"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:362
-msgid "Public"
-msgstr "Público"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:8
-#: ../calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Group:"
-msgstr "_Grupo:"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:9
-msgid "_Memo Content:"
-msgstr "Contido da _nota:"
-
 #: ../calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Opcións do calendario</b>"
@@ -6452,8 +6214,10 @@ msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Está modificando unha tarefa que se repite, que quere modificar?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:62
-msgid "You are modifying a recurring journal entry, what would you like to modify?"
-msgstr "Está modificando unha entrada do diario que se repite, que quere modificar?"
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
+msgstr ""
+"Está modificando unha entrada do diario que se repite, que quere modificar?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
@@ -6487,6 +6251,10 @@ msgstr "en"
 msgid "first"
 msgstr "primeiro"
 
+#: ../calendar/gui/dialogs/recurrence-page.c:990
+msgid "second"
+msgstr "segundo"
+
 #: ../calendar/gui/dialogs/recurrence-page.c:991
 msgid "third"
 msgstr "terceiro"
@@ -6540,6 +6308,10 @@ msgstr "Cada"
 msgid "This appointment rec_urs"
 msgstr "Esta cita _repítese"
 
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "for"
+msgstr "para"
+
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "para sempre"
@@ -6548,6 +6320,10 @@ msgstr "para sempre"
 msgid "month(s)"
 msgstr "mes(es)"
 
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid "until"
+msgstr "ata"
+
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "semana(s)"
@@ -6579,15 +6355,15 @@ msgstr "<span weight=\"bold\">Estado</span>"
 #: ../calendar/gui/e-cal-component-preview.c:229
 #: ../calendar/gui/e-cal-model-tasks.c:346
 #: ../calendar/gui/e-cal-model-tasks.c:659
-#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/e-itip-control.c:895
+#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/e-itip-control.c:898
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../calendar/gui/print.c:2372 ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/print.c:2370 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Completada"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-calendar-table.c:384 ../mail/message-list.c:1018
+#: ../calendar/gui/e-calendar-table.c:384 ../mail/message-list.c:1008
 msgid "High"
 msgstr "Alta"
 
@@ -6596,20 +6372,20 @@ msgstr "Alta"
 #: ../calendar/gui/e-cal-model-tasks.c:344
 #: ../calendar/gui/e-cal-model-tasks.c:657
 #: ../calendar/gui/e-cal-model-tasks.c:732
-#: ../calendar/gui/e-calendar-table.c:458 ../calendar/gui/print.c:2369
+#: ../calendar/gui/e-calendar-table.c:458 ../calendar/gui/print.c:2367
 msgid "In Progress"
 msgstr "En Progreso"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1016
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1006
 msgid "Low"
 msgstr "Baixa"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-cal-model.c:920 ../calendar/gui/e-calendar-table.c:385
-#: ../mail/message-list.c:1017
+#: ../mail/message-list.c:1007
 msgid "Normal"
 msgstr "Normal"
 
@@ -6617,7 +6393,7 @@ msgstr "Normal"
 #: ../calendar/gui/e-cal-component-preview.c:236
 #: ../calendar/gui/e-cal-model-tasks.c:342
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:457 ../calendar/gui/print.c:2366
+#: ../calendar/gui/e-calendar-table.c:457 ../calendar/gui/print.c:2364
 msgid "Not Started"
 msgstr "Non Iniciada"
 
@@ -6626,73 +6402,66 @@ msgid "P_ercent complete:"
 msgstr "P_orcentaxe completado:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:11
-msgid "Stat_us:"
-msgstr "Esta_do:"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 #: ../calendar/gui/e-calendar-table.c:387
 msgid "Undefined"
 msgstr "Indefinida"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "_Date completed:"
 msgstr "_Data Completada:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:14
+#: ../calendar/gui/dialogs/task-details-page.glade.h:13
 #: ../widgets/misc/e-send-options.glade.h:31
 msgid "_Priority:"
 msgstr "_Prioridade:"
 
+#: ../calendar/gui/dialogs/task-details-page.glade.h:14
+msgid "_Status:"
+msgstr "E_stado:"
+
 #: ../calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Web Page:"
 msgstr "Páxina _Web:"
 
-#: ../calendar/gui/dialogs/task-editor.c:419
-#: ../calendar/gui/tasks-component.c:1172
-msgid "_Task"
-msgstr "_Tarefa"
-
-#: ../calendar/gui/dialogs/task-editor.c:423
-msgid "Task Details"
-msgstr "Detalles de tarefas"
+#: ../calendar/gui/dialogs/task-editor.c:137 ../calendar/gui/print.c:2309
+msgid "Task"
+msgstr "Tarefa"
 
-#: ../calendar/gui/dialogs/task-page.c:436
-msgid "_Group"
-msgstr "_Grupo"
+#: ../calendar/gui/dialogs/task-editor.c:161
+#: ../calendar/gui/dialogs/task-editor.c:223
+#: ../calendar/gui/dialogs/task-editor.c:380
+msgid "Assignment"
+msgstr "Asignación"
 
-#: ../calendar/gui/dialogs/task-page.c:820
+#: ../calendar/gui/dialogs/task-page.c:529
 msgid "Due date is wrong"
 msgstr "A data de vencemento é errónea"
 
-#: ../calendar/gui/dialogs/task-page.c:1613
+#: ../calendar/gui/dialogs/task-page.c:873
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Non é posible abrir as tarefas en '%s'."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:2
-msgid "Categor_ies..."
-msgstr "Ca_tegorías..."
-
-#: ../calendar/gui/dialogs/task-page.glade.h:3
+#: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "D_escription:"
 msgstr "D_escrición:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:4
-msgid "Or_ganiser:"
-msgstr "Or_ganizador:"
-
-#: ../calendar/gui/dialogs/task-page.glade.h:5
+#: ../calendar/gui/dialogs/task-page.glade.h:12
 msgid "Sta_rt date:"
 msgstr "Data de _Inicio:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:7
-msgid "Time zone:"
-msgstr "Fuso horario:"
+#: ../calendar/gui/dialogs/task-page.glade.h:14
+msgid "Task Description"
+msgstr "Descrición da tarefa"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../calendar/gui/dialogs/task-page.glade.h:15
 msgid "_Due date:"
 msgstr "_Data Límite:"
 
+#: ../calendar/gui/dialogs/task-page.glade.h:16
+msgid "_Group:"
+msgstr "_Grupo:"
+
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Free/Busy C_alendars</b>"
 msgstr "<b>C_alendarios de dispoñibilidade</b>"
@@ -6818,27 +6587,17 @@ msgstr "%s a %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de disparador descoñecido"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2704
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2703
 #, c-format
 msgid "Click to open %s"
 msgstr "Prema para abrir %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:199
-msgid "Memo:"
-msgstr "Nota:"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:232
-#: ../calendar/gui/e-cal-component-preview.c:299
-msgid "Web Page:"
-msgstr "Páxina Web:"
-
 #: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:796
 msgid "Untitled"
 msgstr "Sen título"
 
 #: ../calendar/gui/e-cal-component-preview.c:186
-#: ../calendar/gui/e-itip-control.c:1107
+#: ../calendar/gui/e-itip-control.c:1110
 #: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumo:"
@@ -6855,9 +6614,9 @@ msgstr "Data Límite:"
 #. write status
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:222
-#: ../calendar/gui/e-itip-control.c:1131
+#: ../calendar/gui/e-itip-control.c:1134
 #: ../plugins/exchange-operations/exchange-account-setup.c:265
-#: ../plugins/itip-formatter/itip-view.c:908
+#: ../plugins/itip-formatter/itip-view.c:909
 msgid "Status:"
 msgstr "Estado:"
 
@@ -6865,6 +6624,10 @@ msgstr "Estado:"
 msgid "Priority:"
 msgstr "Prioridade:"
 
+#: ../calendar/gui/e-cal-component-preview.c:299
+msgid "Web Page:"
+msgstr "Páxina Web:"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Data Final"
@@ -6875,8 +6638,7 @@ 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:16
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../mail/mail-dialogs.glade.h:16 ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "Resumo"
 
@@ -6887,7 +6649,7 @@ msgstr "Libre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
 #: ../calendar/gui/e-calendar-table.c:437
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Busy"
 msgstr "Ocupado"
 
@@ -6918,17 +6680,15 @@ msgstr "Non"
 
 #. This is the default filename used for temporary file creation
 #: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-model.c:330
-#: ../calendar/gui/e-cal-popup.c:106 ../calendar/gui/e-cal-popup.c:121
-#: ../calendar/gui/e-cal-popup.c:165 ../calendar/gui/e-itip-control.c:1148
-#: ../calendar/gui/e-itip-control.c:1289
+#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.c:1292
 #: ../calendar/gui/e-meeting-list-view.c:168
 #: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1283
+#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1244
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1652
 #: ../plugins/plugin-manager/plugin-manager.c:72
-#: ../widgets/misc/e-attachment-bar.c:690
+#: ../widgets/misc/e-attachment-bar.c:659
 #: ../widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "Descoñecido"
@@ -6941,39 +6701,6 @@ msgstr "Recorrendo"
 msgid "Assigned"
 msgstr "Asignada"
 
-#: ../calendar/gui/e-cal-popup.c:171 ../mail/em-popup.c:411
-msgid "Save As..."
-msgstr "Gardar Como..."
-
-#: ../calendar/gui/e-cal-popup.c:187 ../mail/em-format-html-display.c:1812
-msgid "Select folder to save selected attachments..."
-msgstr "Seleccione o cartafol onde gardar os adxuntos seleccionados..."
-
-#: ../calendar/gui/e-cal-popup.c:216 ../mail/em-popup.c:436
-#, c-format
-msgid "untitled_image.%s"
-msgstr "imaxe_sen-título.%s"
-
-#: ../calendar/gui/e-cal-popup.c:270 ../calendar/gui/e-calendar-table.c:1169
-#: ../calendar/gui/e-calendar-view.c:1556 ../calendar/gui/e-memo-table.c:847
-#: ../mail/em-folder-view.c:1045 ../mail/em-popup.c:553 ../mail/em-popup.c:564
-msgid "_Save As..."
-msgstr "Gardar _Como..."
-
-#: ../calendar/gui/e-cal-popup.c:271 ../mail/em-popup.c:554
-#: ../mail/em-popup.c:565
-msgid "Set as _Background"
-msgstr "Establecer como _fondo"
-
-#: ../calendar/gui/e-cal-popup.c:272
-msgid "_Save Selected"
-msgstr "_Gardar seleccionados"
-
-#: ../calendar/gui/e-cal-popup.c:394 ../mail/em-popup.c:774
-#, c-format
-msgid "Open in %s..."
-msgstr "Abrir en %s..."
-
 #: ../calendar/gui/e-calendar-table.c:406
 msgid "0%"
 msgstr "0%"
@@ -7023,58 +6750,58 @@ msgid "Task Table"
 msgstr "Táboa de tarefas"
 
 #: ../calendar/gui/e-calendar-table.c:696
-#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:426
+#: ../calendar/gui/e-calendar-view.c:671
 msgid "Deleting selected objects"
 msgstr "Borrando os obxectos seleccionados"
 
 #: ../calendar/gui/e-calendar-table.c:875
-#: ../calendar/gui/e-calendar-view.c:805 ../calendar/gui/e-memo-table.c:603
+#: ../calendar/gui/e-calendar-view.c:799
 msgid "Updating objects"
 msgstr "Actualizando obxectos"
 
 #: ../calendar/gui/e-calendar-table.c:1025
-#: ../calendar/gui/e-calendar-view.c:1132 ../calendar/gui/e-memo-table.c:735
-#: ../composer/e-msg-composer.c:1341
+#: ../calendar/gui/e-calendar-view.c:1122 ../composer/e-msg-composer.c:1243
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: ../calendar/gui/e-calendar-table.c:1168 ../calendar/gui/e-memo-table.c:846
+#: ../calendar/gui/e-calendar-table.c:1168
 msgid "Open _Web Page"
 msgstr "Abrir páxina _web"
 
+#: ../calendar/gui/e-calendar-table.c:1169
+#: ../calendar/gui/e-calendar-view.c:1546 ../mail/em-folder-view.c:1045
+#: ../mail/em-popup.c:541 ../mail/em-popup.c:552
+msgid "_Save As..."
+msgstr "Gardar _Como..."
+
 #: ../calendar/gui/e-calendar-table.c:1170
-#: ../calendar/gui/e-calendar-view.c:1536
-#: ../calendar/gui/e-calendar-view.c:1557 ../calendar/gui/e-memo-table.c:848
-#: ../mail/em-folder-view.c:1046
+#: ../calendar/gui/e-calendar-view.c:1526
+#: ../calendar/gui/e-calendar-view.c:1547 ../mail/em-folder-view.c:1046
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:120 ../ui/evolution-tasks.xml.h:27
 msgid "_Print..."
 msgstr "_Imprimir..."
 
 #: ../calendar/gui/e-calendar-table.c:1174
-#: ../calendar/gui/e-calendar-view.c:1561 ../calendar/gui/e-memo-table.c:852
-#: ../ui/evolution-addressbook.xml.h:1 ../ui/evolution-calendar.xml.h:1
-#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-view.c:1551 ../ui/evolution-addressbook.xml.h:1
+#: ../ui/evolution-calendar.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Co_rtar"
 
 #: ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:1539
-#: ../calendar/gui/e-calendar-view.c:1563 ../calendar/gui/e-memo-table.c:854
-#: ../ui/evolution-addressbook.xml.h:39 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-composer-entries.xml.h:9 ../ui/evolution-editor.xml.h:22
-#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
+#: ../calendar/gui/e-calendar-view.c:1529
+#: ../calendar/gui/e-calendar-view.c:1553 ../ui/evolution-addressbook.xml.h:38
+#: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
+#: ../ui/evolution-tasks.xml.h:26
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: ../calendar/gui/e-calendar-table.c:1180 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1180 ../ui/evolution-tasks.xml.h:20
 msgid "_Assign Task"
 msgstr "_Asignar Tarefa"
 
-#: ../calendar/gui/e-calendar-table.c:1181 ../calendar/gui/e-memo-table.c:858
-#: ../ui/evolution-tasks.xml.h:26
+#: ../calendar/gui/e-calendar-table.c:1181 ../ui/evolution-tasks.xml.h:24
 msgid "_Forward as iCalendar"
 msgstr "_Remitir como iCalendar"
 
@@ -7086,11 +6813,20 @@ msgstr "_Marcar como Completa"
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marca-las Tarefas seleccionadas como Completas"
 
+#. FIXME: need to disable for undeletable folders
+#: ../calendar/gui/e-calendar-table.c:1187
+#: ../calendar/gui/e-calendar-view.c:1565 ../mail/em-folder-tree.c:2048
+#: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:33
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
+#: ../ui/evolution-tasks.xml.h:22
+msgid "_Delete"
+msgstr "_Borrar"
+
 #: ../calendar/gui/e-calendar-table.c:1188
 msgid "_Delete Selected Tasks"
 msgstr "_Borra-las Tarefas Seleccionadas"
 
-#: ../calendar/gui/e-calendar-table.c:1421
+#: ../calendar/gui/e-calendar-table.c:1407
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Prema para engadir unha tarefa"
@@ -7125,78 +6861,73 @@ msgstr "Data de Inicio"
 msgid "Task sort"
 msgstr "Ordenamento das tarefas"
 
-#: ../calendar/gui/e-calendar-view.c:1258
+#: ../calendar/gui/e-calendar-view.c:1248
 msgid "Moving items"
 msgstr "Movendo elementos"
 
-#: ../calendar/gui/e-calendar-view.c:1260
+#: ../calendar/gui/e-calendar-view.c:1250
 msgid "Copying items"
 msgstr "Copiando elementos"
 
-#: ../calendar/gui/e-calendar-view.c:1530
+#: ../calendar/gui/e-calendar-view.c:1520
 msgid "New _Appointment..."
 msgstr "Nova _Cita..."
 
-#: ../calendar/gui/e-calendar-view.c:1531
+#: ../calendar/gui/e-calendar-view.c:1521
 msgid "New All Day _Event"
 msgstr "Novo _Evento de Día Completo"
 
-#: ../calendar/gui/e-calendar-view.c:1532
-msgid "New _Meeting"
-msgstr "Nova _xuntanza"
-
-#: ../calendar/gui/e-calendar-view.c:1533
-msgid "New _Task"
-msgstr "Nova _Tarefa"
+#: ../calendar/gui/e-calendar-view.c:1523
+msgid "New Task"
+msgstr "Nova Tarefa"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1543
-#: ../widgets/menus/gal-view-menus.c:291
-msgid "_Current View"
-msgstr "_Vista Actual"
+#: ../calendar/gui/e-calendar-view.c:1533
+msgid "Current View"
+msgstr "Vista Actual"
 
-#: ../calendar/gui/e-calendar-view.c:1545
-msgid "Select T_oday"
+#: ../calendar/gui/e-calendar-view.c:1535 ../ui/evolution-calendar.xml.h:26
+msgid "Select _Today"
 msgstr "Seleccionar _hoxe"
 
-#: ../calendar/gui/e-calendar-view.c:1546
+#: ../calendar/gui/e-calendar-view.c:1536
 msgid "_Select Date..."
 msgstr "_Seleccionar data..."
 
 #. TODO: Why is this in a context menu when it applies globally?
-#: ../calendar/gui/e-calendar-view.c:1551 ../ui/evolution-calendar.xml.h:45
+#: ../calendar/gui/e-calendar-view.c:1541 ../ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar Información de Libre/Ocupado"
 
-#: ../calendar/gui/e-calendar-view.c:1567
+#: ../calendar/gui/e-calendar-view.c:1557
 msgid "Cop_y to Calendar..."
 msgstr "Cop_iar a un calendario..."
 
-#: ../calendar/gui/e-calendar-view.c:1568
+#: ../calendar/gui/e-calendar-view.c:1558
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver ao calendario..."
 
-#: ../calendar/gui/e-calendar-view.c:1569
+#: ../calendar/gui/e-calendar-view.c:1559
 msgid "_Delegate Meeting..."
 msgstr "_Delegar Xuntanza..."
 
-#: ../calendar/gui/e-calendar-view.c:1570
+#: ../calendar/gui/e-calendar-view.c:1560
 msgid "_Schedule Meeting..."
 msgstr "_Concertar Xuntanza..."
 
-#: ../calendar/gui/e-calendar-view.c:1571
+#: ../calendar/gui/e-calendar-view.c:1561
 msgid "_Forward as iCalendar..."
 msgstr "_Remitir como iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1576
+#: ../calendar/gui/e-calendar-view.c:1566
 msgid "Make this Occurrence _Movable"
 msgstr "Facer esta Ocorrencia _Movible"
 
-#: ../calendar/gui/e-calendar-view.c:1577
+#: ../calendar/gui/e-calendar-view.c:1567
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _Ocorrencia"
 
-#: ../calendar/gui/e-calendar-view.c:1578
+#: ../calendar/gui/e-calendar-view.c:1568
 msgid "Delete _All Occurrences"
 msgstr "Borrar _Tódalas Ocorrencias"
 
@@ -7259,103 +6990,103 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:760
+#: ../calendar/gui/e-itip-control.c:763
 msgid "Yes. (Complex Recurrence)"
 msgstr "Si. (Recorrencia composta)"
 
-#: ../calendar/gui/e-itip-control.c:771
+#: ../calendar/gui/e-itip-control.c:774
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Cada día"
 msgstr[1] "Cada %d días"
 
-#: ../calendar/gui/e-itip-control.c:776
+#: ../calendar/gui/e-itip-control.c:779
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Cada semana"
 msgstr[1] "Cada %d semanas"
 
-#: ../calendar/gui/e-itip-control.c:778
+#: ../calendar/gui/e-itip-control.c:781
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Cada semana en"
 msgstr[1] "Cada %d semanas en"
 
-#: ../calendar/gui/e-itip-control.c:786
+#: ../calendar/gui/e-itip-control.c:789
 msgid " and "
 msgstr " e "
 
-#: ../calendar/gui/e-itip-control.c:793
+#: ../calendar/gui/e-itip-control.c:796
 #, c-format
 msgid "The %s day of "
 msgstr "O %s día de"
 
-#: ../calendar/gui/e-itip-control.c:806
+#: ../calendar/gui/e-itip-control.c:809
 #, c-format
 msgid "The %s %s of "
 msgstr "O %s %s de"
 
-#: ../calendar/gui/e-itip-control.c:813
+#: ../calendar/gui/e-itip-control.c:816
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "cada mes"
 msgstr[1] "cada %d meses"
 
-#: ../calendar/gui/e-itip-control.c:817
+#: ../calendar/gui/e-itip-control.c:820
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Cada ano"
 msgstr[1] "Cada %d anos"
 
-#: ../calendar/gui/e-itip-control.c:828
+#: ../calendar/gui/e-itip-control.c:831
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " un total de %d vez"
 msgstr[1] " un total de %d veces"
 
-#: ../calendar/gui/e-itip-control.c:837
+#: ../calendar/gui/e-itip-control.c:840
 msgid ", ending on "
 msgstr ", rematando en"
 
-#: ../calendar/gui/e-itip-control.c:861
+#: ../calendar/gui/e-itip-control.c:864
 msgid "Starts"
 msgstr "Comeza"
 
-#: ../calendar/gui/e-itip-control.c:874
+#: ../calendar/gui/e-itip-control.c:877
 msgid "Ends"
 msgstr "Remata"
 
-#: ../calendar/gui/e-itip-control.c:908
+#: ../calendar/gui/e-itip-control.c:911
 #: ../plugins/save-calendar/csv-format.c:395
 msgid "Due"
 msgstr "Vence"
 
-#: ../calendar/gui/e-itip-control.c:948 ../calendar/gui/e-itip-control.c:1005
+#: ../calendar/gui/e-itip-control.c:951 ../calendar/gui/e-itip-control.c:1008
 msgid "iCalendar Information"
 msgstr "información de iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:965
+#: ../calendar/gui/e-itip-control.c:968
 msgid "iCalendar Error"
 msgstr "Erro de iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1037 ../calendar/gui/e-itip-control.c:1053
-#: ../calendar/gui/e-itip-control.c:1064 ../calendar/gui/e-itip-control.c:1081
-#: ../plugins/itip-formatter/itip-view.c:337
+#: ../calendar/gui/e-itip-control.c:1040 ../calendar/gui/e-itip-control.c:1056
+#: ../calendar/gui/e-itip-control.c:1067 ../calendar/gui/e-itip-control.c:1084
 #: ../plugins/itip-formatter/itip-view.c:338
-#: ../plugins/itip-formatter/itip-view.c:405
+#: ../plugins/itip-formatter/itip-view.c:339
 #: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:407
 msgid "An unknown person"
 msgstr "Unha persoa descoñecida"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1088
+#: ../calendar/gui/e-itip-control.c:1091
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7363,28 +7094,28 @@ msgstr ""
 "<br> Por favor, olle a seguinte información, e escolla unha acción do menú "
 "de embaixo."
 
-#: ../calendar/gui/e-itip-control.c:1136
+#: ../calendar/gui/e-itip-control.c:1139
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:546
+#: ../calendar/gui/itip-utils.c:548
 #: ../plugins/itip-formatter/itip-formatter.c:1640
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: ../calendar/gui/e-itip-control.c:1140 ../calendar/gui/itip-utils.c:549
+#: ../calendar/gui/e-itip-control.c:1143 ../calendar/gui/itip-utils.c:551
 #: ../plugins/itip-formatter/itip-formatter.c:1643
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
-#: ../calendar/gui/e-itip-control.c:1144
+#: ../calendar/gui/e-itip-control.c:1147
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/itip-utils.c:552 ../calendar/gui/itip-utils.c:581
+#: ../calendar/gui/itip-utils.c:554 ../calendar/gui/itip-utils.c:583
 #: ../plugins/itip-formatter/itip-formatter.c:1646
 msgid "Declined"
 msgstr "Rexeitado"
 
-#: ../calendar/gui/e-itip-control.c:1228
+#: ../calendar/gui/e-itip-control.c:1231
 msgid ""
 "The meeting has been cancelled, however it could not be found in your "
 "calendars"
@@ -7392,269 +7123,271 @@ msgstr ""
 "A xuntanza foi cancelada, nembargantes non puido atoparse nos seus "
 "calendarios"
 
-#: ../calendar/gui/e-itip-control.c:1230
-msgid "The task has been cancelled, however it could not be found in your task lists"
+#: ../calendar/gui/e-itip-control.c:1233
+msgid ""
+"The task has been cancelled, however it could not be found in your task lists"
 msgstr ""
 "A tarefa foi cancelada, nembargantes non puido atoparse nas súas listas de "
 "tarefas"
 
-#: ../calendar/gui/e-itip-control.c:1309
+#: ../calendar/gui/e-itip-control.c:1312
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> publicou información sobre unha xuntanza."
 
-#: ../calendar/gui/e-itip-control.c:1310
+#: ../calendar/gui/e-itip-control.c:1313
 msgid "Meeting Information"
 msgstr "Información da Xuntanza"
 
-#: ../calendar/gui/e-itip-control.c:1316
+#: ../calendar/gui/e-itip-control.c:1319
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> require a presencia de %s nunha reunión."
 
-#: ../calendar/gui/e-itip-control.c:1318
+#: ../calendar/gui/e-itip-control.c:1321
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> require a súa presencia nunha reunión."
 
-#: ../calendar/gui/e-itip-control.c:1319
+#: ../calendar/gui/e-itip-control.c:1322
 msgid "Meeting Proposal"
 msgstr "Proposta de Xuntanza"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1325
+#: ../calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> desexa asistir a unha reunión existente."
 
-#: ../calendar/gui/e-itip-control.c:1326
+#: ../calendar/gui/e-itip-control.c:1329
 msgid "Meeting Update"
 msgstr "Actualización da Xuntanza"
 
-#: ../calendar/gui/e-itip-control.c:1330
+#: ../calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> desexa recibir a última información sobre a reunión."
 
-#: ../calendar/gui/e-itip-control.c:1331
+#: ../calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update Request"
 msgstr "_Solicitude de Actualización de Xuntanza"
 
-#: ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-itip-control.c:1341
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> respostou a unha petición de xuntanza."
 
-#: ../calendar/gui/e-itip-control.c:1339
+#: ../calendar/gui/e-itip-control.c:1342
 msgid "Meeting Reply"
 msgstr "Resposta de Xuntanza"
 
-#: ../calendar/gui/e-itip-control.c:1346
+#: ../calendar/gui/e-itip-control.c:1349
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> cancelou unha reunión."
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1350
 msgid "Meeting Cancellation"
 msgstr "Cancelación da Xuntanza"
 
-#: ../calendar/gui/e-itip-control.c:1357 ../calendar/gui/e-itip-control.c:1434
-#: ../calendar/gui/e-itip-control.c:1474
+#: ../calendar/gui/e-itip-control.c:1360 ../calendar/gui/e-itip-control.c:1437
+#: ../calendar/gui/e-itip-control.c:1477
 #, 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:1358
+#: ../calendar/gui/e-itip-control.c:1361
 msgid "Bad Meeting Message"
 msgstr "Mensaxe Incorrecta sobre a Xuntanza"
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1388
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> publicou información sobre tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1389
 msgid "Task Information"
 msgstr "Información da Tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1396
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> require a %s que se encargue dunha tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1398
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> require que se encargue dunha tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1399
 msgid "Task Proposal"
 msgstr "Proposta de Tarefas"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1402
+#: ../calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> desexa asistir a unha tarefa existente."
 
-#: ../calendar/gui/e-itip-control.c:1403
+#: ../calendar/gui/e-itip-control.c:1406
 msgid "Task Update"
 msgstr "Actualización de Tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1407
+#: ../calendar/gui/e-itip-control.c:1410
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> desexa recibir a última información sobre a tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1408
+#: ../calendar/gui/e-itip-control.c:1411
 msgid "Task Update Request"
 msgstr "Petición de Actualización de Tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1415
+#: ../calendar/gui/e-itip-control.c:1418
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> respostou a unha asignación de tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1416
+#: ../calendar/gui/e-itip-control.c:1419
 msgid "Task Reply"
 msgstr "Resposta á Tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1426
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> cancelou unha tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1424
+#: ../calendar/gui/e-itip-control.c:1427
 msgid "Task Cancellation"
 msgstr "Cancelación de Tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1438
 msgid "Bad Task Message"
 msgstr "Mensaxe Incorrecta sobre a Tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1459
+#: ../calendar/gui/e-itip-control.c:1462
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> publicou información de libre/ocupado."
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Free/Busy Information"
 msgstr "Información de Libre/Ocupado"
 
-#: ../calendar/gui/e-itip-control.c:1464
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> require a súa información libre/ocupado."
 
-#: ../calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Free/Busy Request"
 msgstr "Petición de Libre/Ocupado"
 
-#: ../calendar/gui/e-itip-control.c:1469
+#: ../calendar/gui/e-itip-control.c:1472
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> respostou a unha petición de libre/ocupado."
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1473
 msgid "Free/Busy Reply"
 msgstr "Resposta de Libre/Ocupado"
 
-#: ../calendar/gui/e-itip-control.c:1475
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Bad Free/Busy Message"
 msgstr "Mensaxe de Libre/Ocupado Incorrecta"
 
-#: ../calendar/gui/e-itip-control.c:1550
+#: ../calendar/gui/e-itip-control.c:1553
 msgid "The message does not appear to be properly formed"
 msgstr "A mensaxe non parece estar formada correctamente"
 
-#: ../calendar/gui/e-itip-control.c:1609
+#: ../calendar/gui/e-itip-control.c:1612
 msgid "The message contains only unsupported requests."
 msgstr "Esta mensaxe só contén solicitudes non soportadas."
 
-#: ../calendar/gui/e-itip-control.c:1642
+#: ../calendar/gui/e-itip-control.c:1645
 msgid "The attachment does not contain a valid calendar message"
 msgstr "O adxunto non contén unha mensaxe de calendario válida"
 
-#: ../calendar/gui/e-itip-control.c:1674
+#: ../calendar/gui/e-itip-control.c:1677
 msgid "The attachment has no viewable calendar items"
 msgstr "O adxunto non ten elementos de calendario visibles"
 
-#: ../calendar/gui/e-itip-control.c:1908
+#: ../calendar/gui/e-itip-control.c:1911
 msgid "Update complete\n"
 msgstr "Actualización completada\n"
 
-#: ../calendar/gui/e-itip-control.c:1936
+#: ../calendar/gui/e-itip-control.c:1939
 msgid "Object is invalid and cannot be updated\n"
 msgstr "O obxecto é inválido e non pode ser actualizado\n"
 
-#: ../calendar/gui/e-itip-control.c:1946
+#: ../calendar/gui/e-itip-control.c:1949
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr "Esta resposta non é dun participante. Desexa engadilo como participante?"
+msgstr ""
+"Esta resposta non é dun participante. Desexa engadilo como participante?"
 
-#: ../calendar/gui/e-itip-control.c:1958
+#: ../calendar/gui/e-itip-control.c:1961
 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 "
 "inválido!\n"
 
-#: ../calendar/gui/e-itip-control.c:1975
+#: ../calendar/gui/e-itip-control.c:1978
 msgid "Attendee status updated\n"
 msgstr "Estado do participante actualizado\n"
 
-#: ../calendar/gui/e-itip-control.c:1978
+#: ../calendar/gui/e-itip-control.c:1981
 #: ../plugins/itip-formatter/itip-formatter.c:1025
 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:2008
+#: ../calendar/gui/e-itip-control.c:2011
 msgid "Removal Complete"
 msgstr "Eliminación Completa"
 
-#: ../calendar/gui/e-itip-control.c:2031 ../calendar/gui/e-itip-control.c:2079
+#: ../calendar/gui/e-itip-control.c:2034 ../calendar/gui/e-itip-control.c:2082
 msgid "Item sent!\n"
 msgstr "¡Elemento enviado!\n"
 
-#: ../calendar/gui/e-itip-control.c:2033 ../calendar/gui/e-itip-control.c:2083
+#: ../calendar/gui/e-itip-control.c:2036 ../calendar/gui/e-itip-control.c:2086
 msgid "The item could not be sent!\n"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
-#: ../calendar/gui/e-itip-control.c:2163
+#: ../calendar/gui/e-itip-control.c:2166
 msgid "Choose an action:"
 msgstr "Escolla unha Acción:"
 
-#: ../calendar/gui/e-itip-control.c:2234
+#: ../calendar/gui/e-itip-control.c:2237
 msgid "Update"
 msgstr "Actualización"
 
-#: ../calendar/gui/e-itip-control.c:2262
+#: ../calendar/gui/e-itip-control.c:2265
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Aceptado"
 
-#: ../calendar/gui/e-itip-control.c:2263
+#: ../calendar/gui/e-itip-control.c:2266
 msgid "Tentatively accept"
 msgstr "Aceptar provisionalmente"
 
-#: ../calendar/gui/e-itip-control.c:2264
+#: ../calendar/gui/e-itip-control.c:2267
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Rexeitar"
 
-#: ../calendar/gui/e-itip-control.c:2293
+#: ../calendar/gui/e-itip-control.c:2296
 msgid "Send Free/Busy Information"
 msgstr "Enviar información de Libre/Ocupado"
 
-#: ../calendar/gui/e-itip-control.c:2321
+#: ../calendar/gui/e-itip-control.c:2324
 msgid "Update respondent status"
 msgstr "Actualizar o estado do remitente"
 
-#: ../calendar/gui/e-itip-control.c:2349
+#: ../calendar/gui/e-itip-control.c:2352
 msgid "Send Latest Information"
 msgstr "Enviar a última información"
 
-#: ../calendar/gui/e-itip-control.c:2377 ../calendar/gui/itip-utils.c:569
+#: ../calendar/gui/e-itip-control.c:2380 ../calendar/gui/itip-utils.c:571
 #: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
@@ -7766,22 +7499,17 @@ msgstr "Precisa dunha Acción"
 
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Tentative"
 msgstr "Tentativa"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
 #: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/itip-utils.c:555
+#: ../calendar/gui/itip-utils.c:557
 #: ../plugins/itip-formatter/itip-formatter.c:1649
 msgid "Delegated"
 msgstr "Delegado"
 
-#. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:361
-msgid "Attendee                          "
-msgstr "Participante                          "
-
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
 msgid "In Process"
 msgstr "En Progreso"
@@ -7789,7 +7517,7 @@ 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:444
-#: ../calendar/gui/e-meeting-time-sel.c:2105
+#: ../calendar/gui/e-meeting-time-sel.c:2102
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
@@ -7800,7 +7528,7 @@ msgstr "%A, %d de %B de %Y"
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
 #: ../calendar/gui/e-meeting-time-sel-item.c:448
-#: ../calendar/gui/e-meeting-time-sel.c:2138 ../e-util/e-time-utils.c:203
+#: ../calendar/gui/e-meeting-time-sel.c:2135 ../e-util/e-time-utils.c:203
 #: ../e-util/e-time-utils.c:296 ../e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
@@ -7812,92 +7540,68 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format for a short date. %m = month,
 #. %d = day of month, %Y = year (all digits).
 #: ../calendar/gui/e-meeting-time-sel-item.c:452 ../e-util/e-time-utils.c:238
-#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1736
+#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1682
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:416 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Fóra da Oficina"
 
-#: ../calendar/gui/e-meeting-time-sel.c:417
+#: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "No Information"
 msgstr "Sen Información"
 
-#: ../calendar/gui/e-meeting-time-sel.c:431
-msgid "Con_tacts..."
-msgstr "Con_tactos..."
-
-#: ../calendar/gui/e-meeting-time-sel.c:448
+#: ../calendar/gui/e-meeting-time-sel.c:445
 msgid "O_ptions"
 msgstr "O_pcións"
 
-#: ../calendar/gui/e-meeting-time-sel.c:465
+#: ../calendar/gui/e-meeting-time-sel.c:462
 msgid "Show _only working hours"
 msgstr "Amosar _só as horas de traballo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:475
+#: ../calendar/gui/e-meeting-time-sel.c:472
 msgid "Show _zoomed out"
 msgstr "Amozar sen _ampliación"
 
-#: ../calendar/gui/e-meeting-time-sel.c:490
+#: ../calendar/gui/e-meeting-time-sel.c:487
 msgid "_Update free/busy"
 msgstr "_Actualizar dispoñibilidade"
 
-#: ../calendar/gui/e-meeting-time-sel.c:505
+#: ../calendar/gui/e-meeting-time-sel.c:502
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:523
+#: ../calendar/gui/e-meeting-time-sel.c:520
 msgid "_Autopick"
 msgstr "_Autoescoller"
 
-#: ../calendar/gui/e-meeting-time-sel.c:538
+#: ../calendar/gui/e-meeting-time-sel.c:535
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:555
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "_All people and resources"
 msgstr "_Tódalas persoas e recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:564
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "All _people and one resource"
 msgstr "Tódalas _persoas e un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:573
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "_Required people"
 msgstr "Persoas _requiridas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:582
+#: ../calendar/gui/e-meeting-time-sel.c:579
 msgid "Required people and _one resource"
 msgstr "Persoas requiridas e _un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:618
-msgid "_Start time:"
-msgstr "Hora de _comezo:"
-
-#: ../calendar/gui/e-meeting-time-sel.c:645
-msgid "_End time:"
-msgstr "Hora de _finalización:"
-
-#: ../calendar/gui/e-memo-table.c:267
-msgid "Memo Table"
-msgstr "Táboa de notas"
-
-#: ../calendar/gui/e-memo-table.c:863
-msgid "_Delete Selected Memos"
-msgstr "_Borra-las notas seleccionadas"
-
-#: ../calendar/gui/e-memo-table.c:986 ../calendar/gui/e-memo-table.etspec.h:2
-msgid "Click to add a memo"
-msgstr "Prema para engadir unha nota"
-
-#: ../calendar/gui/e-memo-table.etspec.h:3
-msgid "Memo sort"
-msgstr "Ordenar nota"
+#: ../calendar/gui/e-pub-utils.c:321
+#, c-format
+msgid "Enter the password for %s"
+msgstr "Introduza o seu contrasinal para %s"
 
-#: ../calendar/gui/e-memos.c:727 ../calendar/gui/e-tasks.c:822
-#: ../calendar/gui/gnome-cal.c:2556
+#: ../calendar/gui/e-tasks.c:820 ../calendar/gui/gnome-cal.c:2554
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7906,38 +7610,24 @@ msgstr ""
 "Erro en %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:775
-msgid "Loading memos"
-msgstr "Cargando notas"
-
-#: ../calendar/gui/e-memos.c:860
-#, c-format
-msgid "Opening memos at %s"
-msgstr "Abrindo notas en %s"
-
-#: ../calendar/gui/e-memos.c:1033 ../calendar/gui/e-tasks.c:1225
-msgid "Deleting selected objects..."
-msgstr "Borrando os obxectos seleccionados..."
-
-#: ../calendar/gui/e-pub-utils.c:322
-#, c-format
-msgid "Enter the password for %s"
-msgstr "Introduza o seu contrasinal para %s"
-
-#: ../calendar/gui/e-tasks.c:870
+#: ../calendar/gui/e-tasks.c:868
 msgid "Loading tasks"
 msgstr "Cargando tarefas"
 
-#: ../calendar/gui/e-tasks.c:957
+#: ../calendar/gui/e-tasks.c:952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrindo tarefas en %s"
 
-#: ../calendar/gui/e-tasks.c:1202
+#: ../calendar/gui/e-tasks.c:1151
 msgid "Completing tasks..."
 msgstr "Rematando tarefas..."
 
-#: ../calendar/gui/e-tasks.c:1252
+#: ../calendar/gui/e-tasks.c:1174
+msgid "Deleting selected objects..."
+msgstr "Borrando os obxectos seleccionados..."
+
+#: ../calendar/gui/e-tasks.c:1201
 msgid "Expunging"
 msgstr "Compactando"
 
@@ -7956,34 +7646,37 @@ msgstr "%d de %b"
 msgid "Updating query"
 msgstr "Actualizando consulta"
 
-#: ../calendar/gui/gnome-cal.c:2231
-msgid "_Custom View"
-msgstr "Vista _personalizada"
+#. bonobo displays this string so it must be in locale
+#: ../calendar/gui/gnome-cal.c:2231 ../widgets/menus/gal-view-instance.c:585
+#: ../widgets/menus/gal-view-menus.c:350
+msgid "Custom View"
+msgstr "Vista personalizada"
 
-#: ../calendar/gui/gnome-cal.c:2232
-msgid "_Save Custom View"
-msgstr "_Gardar vista personalizada"
+#: ../calendar/gui/gnome-cal.c:2232 ../widgets/menus/gal-view-instance.c:586
+msgid "Save Custom View"
+msgstr "Gardar vista personalizada"
 
-#: ../calendar/gui/gnome-cal.c:2237
-msgid "_Define Views..."
-msgstr "_Definir Vistas..."
+#: ../calendar/gui/gnome-cal.c:2237 ../widgets/menus/gal-view-instance.c:590
+#: ../widgets/menus/gal-view-menus.c:372
+msgid "Define Views..."
+msgstr "Definir Vistas..."
 
-#: ../calendar/gui/gnome-cal.c:2399
+#: ../calendar/gui/gnome-cal.c:2400
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Cargando citas de %s"
 
-#: ../calendar/gui/gnome-cal.c:2418
+#: ../calendar/gui/gnome-cal.c:2419
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Cargando tarefas de %s"
 
-#: ../calendar/gui/gnome-cal.c:2522
+#: ../calendar/gui/gnome-cal.c:2520
 #, c-format
 msgid "Opening %s"
 msgstr "Abrindo %s"
 
-#: ../calendar/gui/gnome-cal.c:3440
+#: ../calendar/gui/gnome-cal.c:3437
 msgid "Purging"
 msgstr "Purgando"
 
@@ -8043,137 +7736,60 @@ msgstr "Setembro"
 msgid "_Select Today"
 msgstr "_Seleccionar hoxe"
 
-#: ../calendar/gui/itip-utils.c:351 ../calendar/gui/itip-utils.c:400
-#: ../calendar/gui/itip-utils.c:440
+#: ../calendar/gui/itip-utils.c:353 ../calendar/gui/itip-utils.c:402
+#: ../calendar/gui/itip-utils.c:442
 msgid "An organizer must be set."
 msgstr "Debe estabrecerse un organizador."
 
-#: ../calendar/gui/itip-utils.c:387
+#: ../calendar/gui/itip-utils.c:389
 msgid "At least one attendee is necessary"
 msgstr "É necesario polo menos un participante"
 
-#: ../calendar/gui/itip-utils.c:508 ../calendar/gui/itip-utils.c:630
+#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:632
 msgid "Event information"
 msgstr "Información do evento"
 
-#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:632
+#: ../calendar/gui/itip-utils.c:512 ../calendar/gui/itip-utils.c:634
 msgid "Task information"
 msgstr "Información da Tarefa"
 
-#: ../calendar/gui/itip-utils.c:512 ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:514 ../calendar/gui/itip-utils.c:636
 msgid "Journal information"
 msgstr "Información do xornal"
 
-#: ../calendar/gui/itip-utils.c:514 ../calendar/gui/itip-utils.c:652
+#: ../calendar/gui/itip-utils.c:516 ../calendar/gui/itip-utils.c:654
 msgid "Free/Busy information"
 msgstr "Información de Libre/Ocupado"
 
-#: ../calendar/gui/itip-utils.c:516
+#: ../calendar/gui/itip-utils.c:518
 msgid "Calendar information"
 msgstr "Información do calendario"
 
-#: ../calendar/gui/itip-utils.c:565
+#: ../calendar/gui/itip-utils.c:567
 msgid "Updated"
 msgstr "Actualizado"
 
-#: ../calendar/gui/itip-utils.c:573
+#: ../calendar/gui/itip-utils.c:575
 msgid "Refresh"
 msgstr "Refrescar"
 
-#: ../calendar/gui/itip-utils.c:577
+#: ../calendar/gui/itip-utils.c:579
 msgid "Counter-proposal"
 msgstr "Contra-proposta"
 
-#: ../calendar/gui/itip-utils.c:648
+#: ../calendar/gui/itip-utils.c:650
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Información de Libre/Ocupado (de %s a %s)"
 
-#: ../calendar/gui/itip-utils.c:658
+#: ../calendar/gui/itip-utils.c:660
 msgid "iCalendar information"
 msgstr "Información de iCalendar"
 
-#: ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:815
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un participante no evento."
 
-#: ../calendar/gui/memos-component.c:449 ../ui/evolution-addressbook.xml.h:3
-#: ../ui/evolution-mail-message.xml.h:12 ../ui/evolution-memos.xml.h:2
-#: ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Copiar"
-
-#: ../calendar/gui/memos-component.c:450 ../mail/em-filter-i18n.h:11
-#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:26 ../ui/evolution-memos.xml.h:6
-#: ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Eliminar"
-
-#: ../calendar/gui/memos-component.c:451
-msgid "Properties..."
-msgstr "Propiedades..."
-
-#: ../calendar/gui/memos-component.c:524
-#, c-format
-msgid "%d memo"
-msgid_plural "%d memos"
-msgstr[0] "%d nota"
-msgstr[1] "%d notas"
-
-#: ../calendar/gui/memos-component.c:526 ../calendar/gui/tasks-component.c:517
-#: ../mail/mail-component.c:548
-#, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] ", %d seleccionada"
-msgstr[1] ", %d seleccionadas"
-
-#: ../calendar/gui/memos-component.c:573
-msgid "Failed upgrading memos."
-msgstr "Fallou ao actualizar as notas."
-
-#: ../calendar/gui/memos-component.c:869
-#, 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 xuntanzas"
-
-#: ../calendar/gui/memos-component.c:882
-msgid "There is no calendar available for creating memos"
-msgstr "Non hai un calendario dispoñible para crear notas"
-
-#: ../calendar/gui/memos-component.c:973
-msgid "Memo Source Selector"
-msgstr "Selector de orixe de notas"
-
-#: ../calendar/gui/memos-component.c:1156
-msgid "New memo"
-msgstr "Nova nota"
-
-#: ../calendar/gui/memos-component.c:1157
-msgid "_Memo"
-msgstr "_Nota"
-
-#: ../calendar/gui/memos-component.c:1158
-msgid "Create a new memo"
-msgstr "Crear unha nova nota"
-
-#: ../calendar/gui/memos-component.c:1164
-msgid "New memo list"
-msgstr "Nova lista de notas"
-
-#: ../calendar/gui/memos-component.c:1165
-msgid "Memo l_ist"
-msgstr "L_ista de notas"
-
-#: ../calendar/gui/memos-component.c:1166
-msgid "Create a new memo list"
-msgstr "Crear unha nova lista de notas"
-
-#: ../calendar/gui/memos-control.c:334
-msgid "Print Memos"
-msgstr "Imprimir nota"
-
 #: ../calendar/gui/migration.c:151
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
@@ -8400,65 +8016,57 @@ msgstr "Mes seleccionado (%b de %Y)"
 msgid "Selected year (%Y)"
 msgstr "Ano seleccionado (%Y)"
 
-#: ../calendar/gui/print.c:2307
-msgid "Appointment"
-msgstr "Cita"
-
-#: ../calendar/gui/print.c:2309
-msgid "Task"
-msgstr "Tarefa"
-
-#: ../calendar/gui/print.c:2331
+#: ../calendar/gui/print.c:2329
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumo: %s"
 
-#: ../calendar/gui/print.c:2339
+#: ../calendar/gui/print.c:2337
 #, c-format
 msgid "Location: %s"
 msgstr "Localización: %s"
 
-#: ../calendar/gui/print.c:2382
+#: ../calendar/gui/print.c:2380
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:2399
+#: ../calendar/gui/print.c:2397
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridade: %s"
 
-#: ../calendar/gui/print.c:2411
+#: ../calendar/gui/print.c:2409
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaxe completada: %i"
 
-#: ../calendar/gui/print.c:2423
+#: ../calendar/gui/print.c:2421
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2437
+#: ../calendar/gui/print.c:2435
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorías: %s"
 
-#: ../calendar/gui/print.c:2448
+#: ../calendar/gui/print.c:2446
 msgid "Contacts: "
 msgstr "Contactos: "
 
-#: ../calendar/gui/print.c:2588 ../calendar/gui/print.c:2676
-#: ../calendar/gui/print.c:2802 ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2586 ../calendar/gui/print.c:2674
+#: ../calendar/gui/print.c:2800 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Previsualización da Impresión"
 
-#: ../calendar/gui/print.c:2623
+#: ../calendar/gui/print.c:2621
 msgid "Print Item"
 msgstr "Imprimir Elemento"
 
 #: ../calendar/gui/tasks-component.c:439
-msgid "_New Task List"
-msgstr "_Nova lista de notas"
+msgid "New Task List"
+msgstr "Nova Lista de Tarefas"
 
 #: ../calendar/gui/tasks-component.c:515
 #, c-format
@@ -8467,56 +8075,68 @@ msgid_plural "%d tasks"
 msgstr[0] "%d tarefa"
 msgstr[1] "%d tarefas"
 
+#: ../calendar/gui/tasks-component.c:517 ../mail/mail-component.c:548
+#, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] ", %d seleccionada"
+msgstr[1] ", %d seleccionadas"
+
 #: ../calendar/gui/tasks-component.c:564
 msgid "Failed upgrading tasks."
 msgstr "Fallou ao actualizar as tarefas."
 
-#: ../calendar/gui/tasks-component.c:875
+#: ../calendar/gui/tasks-component.c:872
 #, 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 xuntanzas"
+msgstr ""
+"Non é posible abrir a lista de tarefas '%s' para crear eventos e xuntanzas"
 
-#: ../calendar/gui/tasks-component.c:888
+#: ../calendar/gui/tasks-component.c:887
 msgid "There is no calendar available for creating tasks"
 msgstr "Non hai un calendario dispoñible para crear tarefas"
 
-#: ../calendar/gui/tasks-component.c:988
+#: ../calendar/gui/tasks-component.c:987
 msgid "Task Source Selector"
 msgstr "Selector de orixe de tarefas"
 
-#: ../calendar/gui/tasks-component.c:1171
+#: ../calendar/gui/tasks-component.c:1170
 msgid "New task"
 msgstr "Nova Tarefa"
 
-#: ../calendar/gui/tasks-component.c:1173
+#: ../calendar/gui/tasks-component.c:1171
+msgid "_Task"
+msgstr "_Tarefa"
+
+#: ../calendar/gui/tasks-component.c:1172
 msgid "Create a new task"
 msgstr "Crear unha nova tarefa"
 
-#: ../calendar/gui/tasks-component.c:1179
+#: ../calendar/gui/tasks-component.c:1178
 msgid "New assigned task"
 msgstr "Nova tarefas asignada"
 
-#: ../calendar/gui/tasks-component.c:1180
+#: ../calendar/gui/tasks-component.c:1179
 msgid "Assigne_d Task"
 msgstr "Tarefa asigna_da"
 
-#: ../calendar/gui/tasks-component.c:1181
+#: ../calendar/gui/tasks-component.c:1180
 msgid "Create a new assigned task"
 msgstr "Crear unha nova tarefa asignada"
 
-#: ../calendar/gui/tasks-component.c:1187
+#: ../calendar/gui/tasks-component.c:1186
 msgid "New task list"
 msgstr "Nova Lista de Tarefas"
 
-#: ../calendar/gui/tasks-component.c:1188
+#: ../calendar/gui/tasks-component.c:1187
 msgid "Task l_ist"
 msgstr "L_ista de Tarefas"
 
-#: ../calendar/gui/tasks-component.c:1189
+#: ../calendar/gui/tasks-component.c:1188
 msgid "Create a new task list"
 msgstr "Crear unha nova lista de tarefas"
 
-#: ../calendar/gui/tasks-control.c:429
+#: ../calendar/gui/tasks-control.c:419
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8528,11 +8148,11 @@ msgstr ""
 "\n"
 "Eliminar realmente estas tarefas?"
 
-#: ../calendar/gui/tasks-control.c:432
+#: ../calendar/gui/tasks-control.c:422
 msgid "Do not ask me again."
 msgstr "Non preguntar de novo."
 
-#: ../calendar/gui/tasks-control.c:466
+#: ../calendar/gui/tasks-control.c:456
 msgid "Print Tasks"
 msgstr "Imprimir tarefas"
 
@@ -10192,13 +9812,14 @@ msgstr "Publicar en:"
 msgid "A_ttach"
 msgstr "A_dxuntar"
 
-#: ../composer/e-msg-composer.c:832
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
+#: ../composer/e-msg-composer.c:738
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Non se pode asinar a mensaxe saínte: Non hai estabrecido un certificado de "
 "sinatura para esta conta"
 
-#: ../composer/e-msg-composer.c:839
+#: ../composer/e-msg-composer.c:745
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10206,47 +9827,47 @@ msgstr ""
 "Non se pode cifrar a mensaxe saínte: non hai estabrecido un certificado de "
 "cifrado para esta conta"
 
-#: ../composer/e-msg-composer.c:1322 ../composer/e-msg-composer.c:1356
+#: ../composer/e-msg-composer.c:1224 ../composer/e-msg-composer.c:1257
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Razón descoñecida"
 
-#: ../composer/e-msg-composer.c:1394
+#: ../composer/e-msg-composer.c:1294
 msgid "Could not open file"
 msgstr "Non se puido abrir o ficheiro"
 
-#: ../composer/e-msg-composer.c:1402
+#: ../composer/e-msg-composer.c:1302
 msgid "Unable to retrieve message from editor"
 msgstr "Non foi posible recibir a mensaxe do editor"
 
-#: ../composer/e-msg-composer.c:1677
+#: ../composer/e-msg-composer.c:1572
 msgid "Untitled Message"
 msgstr "Mensaxe sen título"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1712
+#: ../composer/e-msg-composer.c:1606
 msgid "Open File"
 msgstr "Abrir ficheiro"
 
-#: ../composer/e-msg-composer.c:2126 ../mail/em-account-editor.c:588
+#: ../composer/e-msg-composer.c:2006 ../mail/em-account-editor.c:588
 #: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:700
 msgid "Autogenerated"
 msgstr "Auto-xenerado"
 
-#: ../composer/e-msg-composer.c:2229
+#: ../composer/e-msg-composer.c:2105
 msgid "Si_gnature:"
 msgstr "Si_natura:"
 
-#: ../composer/e-msg-composer.c:2472 ../composer/e-msg-composer.c:3673
-#: ../composer/e-msg-composer.c:3676
+#: ../composer/e-msg-composer.c:2347 ../composer/e-msg-composer.c:3527
+#: ../composer/e-msg-composer.c:3528
 msgid "Compose a message"
 msgstr "Compoñer unha mensaxe"
 
-#: ../composer/e-msg-composer.c:3791
+#: ../composer/e-msg-composer.c:3643
 msgid "_Attachment Bar"
 msgstr "Barra de _adxuntos"
 
-#: ../composer/e-msg-composer.c:4881
+#: ../composer/e-msg-composer.c:4720
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10268,7 +9889,8 @@ msgstr "Tódalas contas foron eliminadas."
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
-msgstr "Seguro que quere descartar a mensaxe titulada '{0}', que está redactando?"
+msgstr ""
+"Seguro que quere descartar a mensaxe titulada '{0}', que está redactando?"
 
 #: ../composer/mail-composer.error.xml.h:4
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
@@ -10277,7 +9899,7 @@ msgstr ""
 "correo."
 
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:17
 msgid "Because &quot;{1}&quot;."
 msgstr "Porque &quot;{1}&quot;."
 
@@ -10345,7 +9967,8 @@ msgstr "Recuperar"
 
 #: ../composer/mail-composer.error.xml.h:19
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr "O ficheiro `{0}' non é un ficheiro regular e non pode enviarse nunha mensaxe."
+msgstr ""
+"O ficheiro `{0}' non é un ficheiro regular e non pode enviarse nunha mensaxe."
 
 #: ../composer/mail-composer.error.xml.h:20
 msgid ""
@@ -10386,6 +10009,10 @@ msgstr "Non pode adxuntar 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:29
+msgid "_Discard Changes"
+msgstr "_Descartar trocos"
+
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Save Message"
 msgstr "_Gardar Mensaxe"
@@ -10512,7 +10139,7 @@ msgstr ""
 "Cando reciba un correo cunha solicitude de notificación de lectura. qué "
 "debería facer Evolution?"
 
-#: ../e-util/e-dialog-utils.c:270
+#: ../e-util/e-dialog-utils.c:267
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10520,7 +10147,7 @@ msgstr ""
 "Xa existe un ficheiro con ese nome.\n"
 "¿Sobrescribilo?"
 
-#: ../e-util/e-dialog-utils.c:272 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:269 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Sobrescribir ficheiro?"
 
@@ -10543,7 +10170,8 @@ msgstr "Consulta de Evolution"
 #. setup a dummy error
 #: ../e-util/e-error.c:438
 #, c-format
-msgid "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
 msgstr ""
 "<span weight=\"bold\">Erro interno, solicitado un erro descoñecido '%s'</"
 "span>"
@@ -10564,7 +10192,7 @@ msgstr "Desexa sobrescribilo?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "O ficheiro existe &quot;{0}&quot;."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:128
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:122
 msgid "_Overwrite"
 msgstr "S_obrescribir"
 
@@ -10648,7 +10276,7 @@ msgstr "%H:%M:%S"
 #. without seconds.
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: ../e-util/e-time-utils.c:348 ../e-util/e-time-utils.c:435
-#: ../widgets/misc/e-dateedit.c:1447 ../widgets/misc/e-dateedit.c:1774
+#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1720
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -10657,7 +10285,7 @@ msgstr "%I:%M %p"
 #. without seconds.
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: ../e-util/e-time-utils.c:352 ../e-util/e-time-utils.c:427
-#: ../widgets/misc/e-dateedit.c:1444 ../widgets/misc/e-dateedit.c:1771
+#: ../widgets/misc/e-dateedit.c:1435 ../widgets/misc/e-dateedit.c:1717
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -10799,11 +10427,11 @@ msgid "Include threads"
 msgstr "Incluír conversacións"
 
 #: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:330
+#: ../mail/em-utils.c:291
 msgid "Incoming"
 msgstr "Entrante"
 
-#: ../filter/filter-rule.c:978 ../mail/em-utils.c:331
+#: ../filter/filter-rule.c:978 ../mail/em-utils.c:292
 msgid "Outgoing"
 msgstr "Saínte"
 
@@ -10827,7 +10455,7 @@ msgstr "Falta a data."
 msgid "Missing file name."
 msgstr "Falta o nome de ficheiro."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:67
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:65
 msgid "Missing name."
 msgstr "Falta o nome."
 
@@ -10899,6 +10527,10 @@ msgstr "atrás"
 msgid "months"
 msgstr "meses"
 
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:177
+msgid "seconds"
+msgstr "segundos"
+
 #: ../filter/filter.glade.h:19
 msgid "the current time"
 msgstr "a hora actual"
@@ -10928,7 +10560,8 @@ msgid "Composer Preferences"
 msgstr "Preferencias do editor"
 
 #: ../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 ""
 "Configure as preferencias de correo incluíndo seguranza e visualización de "
 "mensaxes, aquí"
@@ -11049,11 +10682,11 @@ msgstr "Opcións de Recepción"
 msgid "Checking for New Mail"
 msgstr "Comprobando o novo correo"
 
-#: ../mail/em-account-editor.c:2662 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2661 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Editor de contas"
 
-#: ../mail/em-account-editor.c:2662 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2661 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Asistente de Contas de Evolution"
 
@@ -11074,35 +10707,35 @@ msgstr "Protocolo"
 msgid "Mail Accounts Table"
 msgstr "Táboa de contas de correo"
 
-#: ../mail/em-composer-prefs.c:309 ../mail/em-composer-prefs.c:435
+#: ../mail/em-composer-prefs.c:307 ../mail/em-composer-prefs.c:430
 #: ../mail/mail-config.c:958
 msgid "Unnamed"
 msgstr "Sen Nome"
 
-#: ../mail/em-composer-prefs.c:925
+#: ../mail/em-composer-prefs.c:897
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
-#: ../mail/em-composer-prefs.c:968
+#: ../mail/em-composer-prefs.c:940
 msgid "Add signature script"
 msgstr "Engadir sinatura"
 
-#: ../mail/em-composer-prefs.c:988
+#: ../mail/em-composer-prefs.c:960
 msgid "Signature(s)"
 msgstr "Sinatura(s)"
 
-#: ../mail/em-composer-utils.c:862 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:853 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mensaxe reenviada --------"
 
-#: ../mail/em-composer-utils.c:1657
+#: ../mail/em-composer-utils.c:1648
 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:1704
+#: ../mail/em-composer-utils.c:1695
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11127,7 +10760,7 @@ msgstr "Asignar Cor"
 msgid "Assign Score"
 msgstr "Asignar Puntuación"
 
-#: ../mail/em-filter-i18n.h:5 ../ui/evolution-editor.xml.h:1
+#: ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "Anexos"
 
@@ -11240,7 +10873,7 @@ msgid "is not Flagged"
 msgstr "non está marcado"
 
 #: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
-#: ../ui/evolution-mail-message.xml.h:49
+#: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Spam"
 
@@ -11454,12 +11087,12 @@ msgstr "Movendo o cartafol %s"
 msgid "Copying folder %s"
 msgstr "Copiando cartafol %s"
 
-#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1623
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1613
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1625
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1615
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando as mensaxes ao cartafol %s"
@@ -11468,11 +11101,11 @@ msgstr "Copiando as mensaxes ao cartafol %s"
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Non se pode deixar a(s) mensaxe(s) no almacén de nivel superior"
 
-#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:104
 msgid "_Copy to Folder"
 msgstr "_Copiar ó Cartafol"
 
-#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:117
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:114
 msgid "_Move to Folder"
 msgstr "_Mover ó Cartafol"
 
@@ -11481,39 +11114,34 @@ msgstr "_Mover ó Cartafol"
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:44
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
+#: ../mail/em-folder-tree.c:2036 ../ui/evolution-addressbook.xml.h:44
+#: ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:48
 msgid "_View"
 msgstr "_Vista"
 
-#: ../mail/em-folder-tree.c:2043
+#: ../mail/em-folder-tree.c:2037
 msgid "Open in _New Window"
 msgstr "Abrir nunha _Nova Fiestra"
 
-#: ../mail/em-folder-tree.c:2047
+#: ../mail/em-folder-tree.c:2041
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ../mail/em-folder-tree.c:2048
+#: ../mail/em-folder-tree.c:2042
 msgid "_Move..."
 msgstr "_Mover..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2052
+#: ../mail/em-folder-tree.c:2046
 msgid "_New Folder..."
 msgstr "_Novo Cartafol..."
 
-#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:30
+#: ../mail/em-folder-tree.c:2049 ../ui/evolution-mail-list.xml.h:30
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:125
-msgid "_Empty Trash"
-msgstr "_Baleirar Lixo"
-
 #: ../mail/em-folder-utils.c:104
 #, c-format
 msgid "Copying `%s' to `%s'"
@@ -11560,20 +11188,20 @@ msgstr "Crear cartafol"
 msgid "Specify where to create the folder:"
 msgstr "Especifica ónde crear o cartafol:"
 
-#: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:558 ../mail/em-popup.c:569
+#: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:546 ../mail/em-popup.c:557
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#: ../mail/em-folder-view.c:1040 ../ui/evolution-mail-message.xml.h:126
+#: ../mail/em-folder-view.c:1040 ../ui/evolution-mail-message.xml.h:122
 msgid "_Reply to Sender"
 msgstr "_Responder ó Autor"
 
-#: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:560 ../mail/em-popup.c:571
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:548 ../mail/em-popup.c:559
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Forward"
 msgstr "_Remitir"
 
-#: ../mail/em-folder-view.c:1044 ../ui/evolution-mail-message.xml.h:108
+#: ../mail/em-folder-view.c:1044 ../ui/evolution-mail-message.xml.h:106
 msgid "_Edit as New Message..."
 msgstr "_Editar coma unha Nova Mensaxe"
 
@@ -11581,11 +11209,11 @@ msgstr "_Editar coma unha Nova Mensaxe"
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: ../mail/em-folder-view.c:1051 ../ui/evolution-addressbook.xml.h:37
+#: ../mail/em-folder-view.c:1051 ../ui/evolution-addressbook.xml.h:36
 msgid "_Move to Folder..."
 msgstr "_Mover ó Cartafol.."
 
-#: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:33
+#: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copiar a un Cartafol..."
 
@@ -11662,52 +11290,52 @@ msgid "Filter on _Mailing List"
 msgstr "Filtrar pola Lista de _Correo"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1922 ../mail/em-folder-view.c:1966
+#: ../mail/em-folder-view.c:1921 ../mail/em-folder-view.c:1965
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../mail/em-folder-view.c:2065
+#: ../mail/em-folder-view.c:2064
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: ../mail/em-folder-view.c:2221
+#: ../mail/em-folder-view.c:2220
 msgid "Unable to retrieve message"
 msgstr "Non se puido obter a mensaxe"
 
-#: ../mail/em-folder-view.c:2414
+#: ../mail/em-folder-view.c:2413
 msgid "_Copy Link Location"
 msgstr "_Copiar Localización da Ligazón"
 
-#: ../mail/em-folder-view.c:2416
+#: ../mail/em-folder-view.c:2415
 msgid "Create _Search Folder"
 msgstr "Crear cartafol de _busca"
 
-#: ../mail/em-folder-view.c:2417
+#: ../mail/em-folder-view.c:2416
 msgid "_From this Address"
 msgstr "_Desde este enderezo"
 
-#: ../mail/em-folder-view.c:2418
+#: ../mail/em-folder-view.c:2417
 msgid "_To this Address"
 msgstr "_A este enderezo"
 
-#: ../mail/em-folder-view.c:2699
+#: ../mail/em-folder-view.c:2698
 #, c-format
 msgid "Click to mail %s"
 msgstr "Prema para enviar correo a %s"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:461
+#: ../mail/em-format-html-display.c:445
 #, c-format
 msgid "Matches: %d"
 msgstr "Coincide con: %d"
 
-#: ../mail/em-format-html-display.c:712 ../mail/em-format-html.c:597
+#: ../mail/em-format-html-display.c:696 ../mail/em-format-html.c:597
 msgid "Unsigned"
 msgstr "Non asinado"
 
-#: ../mail/em-format-html-display.c:712
+#: ../mail/em-format-html-display.c:696
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11715,11 +11343,11 @@ msgstr ""
 "Esta mensaxe non está asinada. Non hai garantía de que a mensaxe sexa "
 "auténtica."
 
-#: ../mail/em-format-html-display.c:713 ../mail/em-format-html.c:598
+#: ../mail/em-format-html-display.c:697 ../mail/em-format-html.c:598
 msgid "Valid signature"
 msgstr "Sinatura válida"
 
-#: ../mail/em-format-html-display.c:713
+#: ../mail/em-format-html-display.c:697
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11727,11 +11355,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:714 ../mail/em-format-html.c:599
+#: ../mail/em-format-html-display.c:698 ../mail/em-format-html.c:599
 msgid "Invalid signature"
 msgstr "Sinatura inválida"
 
-#: ../mail/em-format-html-display.c:714
+#: ../mail/em-format-html-display.c:698
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11739,11 +11367,11 @@ msgstr ""
 "A sinatura desta mensaxe non se pode verificar, puido haber sido alterada en "
 "tránsito."
 
-#: ../mail/em-format-html-display.c:715
+#: ../mail/em-format-html-display.c:699
 msgid "Valid signature, cannot verify sender"
 msgstr "Sinatura válida, non se pode verificar o remitente"
 
-#: ../mail/em-format-html-display.c:715
+#: ../mail/em-format-html-display.c:699
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11751,11 +11379,11 @@ msgstr ""
 "Esta mensaxe está asinada cunha sinatura válida, pero o remitente da mensaxe "
 "non se puido verificar."
 
-#: ../mail/em-format-html-display.c:721 ../mail/em-format-html.c:606
+#: ../mail/em-format-html-display.c:705 ../mail/em-format-html.c:606
 msgid "Unencrypted"
 msgstr "Descifrado"
 
-#: ../mail/em-format-html-display.c:721
+#: ../mail/em-format-html-display.c:705
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -11763,11 +11391,11 @@ msgstr ""
 "Esta mensaxe non está cifrada. Seu contido pode verse en tránsito a través "
 "de Internet."
 
-#: ../mail/em-format-html-display.c:722 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:706 ../mail/em-format-html.c:607
 msgid "Encrypted, weak"
 msgstr "Cifrado, débil"
 
-#: ../mail/em-format-html-display.c:722
+#: ../mail/em-format-html-display.c:706
 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 "
@@ -11777,11 +11405,11 @@ msgstr ""
 "difícil, pero non imposible para un espía ver o contido desta mensaxe "
 "empleando algo de tempo."
 
-#: ../mail/em-format-html-display.c:723 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:707 ../mail/em-format-html.c:608
 msgid "Encrypted"
 msgstr "Cifrado"
 
-#: ../mail/em-format-html-display.c:723
+#: ../mail/em-format-html-display.c:707
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11789,11 +11417,11 @@ msgstr ""
 "Esta mensaxe está cifrada. Sería difícil para un espía ver o contido desta "
 "mensaxe."
 
-#: ../mail/em-format-html-display.c:724 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:708 ../mail/em-format-html.c:609
 msgid "Encrypted, strong"
 msgstr "Cifrado, forte"
 
-#: ../mail/em-format-html-display.c:724
+#: ../mail/em-format-html-display.c:708
 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 "
@@ -11802,67 +11430,71 @@ msgstr ""
 "Esta mensaxe está cifrada cun algoritmo de cifrado forte. Sería moi difícil "
 "que un espía vira o contido desta mensaxe empleando un tempo razoable."
 
-#: ../mail/em-format-html-display.c:825 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:809 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Ver certificado"
 
-#: ../mail/em-format-html-display.c:840
+#: ../mail/em-format-html-display.c:824
 msgid "This certificate is not viewable"
 msgstr "Este certificado non é visible"
 
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1106
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Rematado o %d de %B de %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1130
+#: ../mail/em-format-html-display.c:1114
 msgid "Overdue:"
 msgstr "Atrasado:"
 
-#: ../mail/em-format-html-display.c:1133
+#: ../mail/em-format-html-display.c:1117
 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:1193
+#: ../mail/em-format-html-display.c:1177
 msgid "_View Inline"
 msgstr "_Ver incluido"
 
-#: ../mail/em-format-html-display.c:1194
+#: ../mail/em-format-html-display.c:1178
 msgid "_Hide"
 msgstr "_Agochar"
 
-#: ../mail/em-format-html-display.c:1195
+#: ../mail/em-format-html-display.c:1179
 msgid "_Fit to Width"
 msgstr "_Axustar ao ancho"
 
-#: ../mail/em-format-html-display.c:1196
+#: ../mail/em-format-html-display.c:1180
 msgid "Show _Original Size"
 msgstr "Amosar tamaño _orixinal"
 
-#: ../mail/em-format-html-display.c:1566
+#: ../mail/em-format-html-display.c:1550
 msgid "Attachment Button"
 msgstr "Botón de adxunto"
 
-#: ../mail/em-format-html-display.c:1773
+#: ../mail/em-format-html-display.c:1757
 msgid "Select folder to save all attachments..."
 msgstr "Seleccione o cartafol onde gardar todos os adxuntos..."
 
-#: ../mail/em-format-html-display.c:1820
+#: ../mail/em-format-html-display.c:1796
+msgid "Select folder to save selected attachments..."
+msgstr "Seleccione o cartafol onde gardar os adxuntos seleccionados..."
+
+#: ../mail/em-format-html-display.c:1804
 msgid "Save Selected..."
 msgstr "Gardar seleccionados..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1887
+#: ../mail/em-format-html-display.c:1871
 #, c-format
 msgid "%d attachment"
 msgid_plural "%d attachments"
 msgstr[0] "%d adxunto"
 msgstr[1] "%d adxuntos"
 
-#: ../mail/em-format-html-display.c:1951
+#: ../mail/em-format-html-display.c:1935
 msgid "No Attachment"
 msgstr "Sen adxunto"
 
-#: ../mail/em-format-html-display.c:1954
+#: ../mail/em-format-html-display.c:1938
 msgid "Save All"
 msgstr "Gardar todo"
 
@@ -12072,27 +11704,45 @@ msgstr ""
 "Non se puido ler a configuración da instalación anterior de Evolution. "
 "`evolution/config.xmldb' non existe ou está corrompido."
 
-#: ../mail/em-popup.c:556 ../mail/em-popup.c:567
+#: ../mail/em-popup.c:399
+msgid "Save As..."
+msgstr "Gardar Como..."
+
+#: ../mail/em-popup.c:424
+#, c-format
+msgid "untitled_image.%s"
+msgstr "imaxe_sen-título.%s"
+
+#: ../mail/em-popup.c:542 ../mail/em-popup.c:553
+msgid "Set as _Background"
+msgstr "Establecer como _fondo"
+
+#: ../mail/em-popup.c:544 ../mail/em-popup.c:555
 msgid "_Reply to sender"
 msgstr "_Responder ao remitente"
 
-#: ../mail/em-popup.c:557 ../mail/em-popup.c:568
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../mail/em-popup.c:545 ../mail/em-popup.c:556
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Reply to _List"
 msgstr "Responder á _Lista"
 
-#: ../mail/em-popup.c:619
+#: ../mail/em-popup.c:607
 msgid "_Open Link in Browser"
 msgstr "_Abrir Ligazón no Navegador"
 
-#: ../mail/em-popup.c:620
+#: ../mail/em-popup.c:608
 msgid "_Send New Message To..."
 msgstr "_Enviar unha mensaxe nova a..."
 
-#: ../mail/em-popup.c:621
+#: ../mail/em-popup.c:609
 msgid "_Add to Addressbook"
 msgstr "_Engadir ao Libro de Enderezos"
 
+#: ../mail/em-popup.c:762
+#, c-format
+msgid "Open in %s..."
+msgstr "Abrir en %s..."
+
 #: ../mail/em-subscribe-editor.c:614
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Este almacén non soporta subscripcións, ou non están activadas."
@@ -12114,28 +11764,28 @@ msgstr "Seleccione un servidor."
 msgid "No server has been selected"
 msgstr "Non se seleccionou ningún servidor"
 
-#: ../mail/em-utils.c:106
+#: ../mail/em-utils.c:105
 msgid "Don't show this message again."
 msgstr "Non amosar esta mensaxe outra vez"
 
-#: ../mail/em-utils.c:338
+#: ../mail/em-utils.c:299
 msgid "Filters"
 msgstr "Filtros"
 
-#: ../mail/em-utils.c:481 ../mail/em-utils.c:518
+#: ../mail/em-utils.c:442 ../mail/em-utils.c:479
 msgid "message"
 msgstr "mensaxe"
 
-#: ../mail/em-utils.c:653
+#: ../mail/em-utils.c:614
 msgid "Save Message..."
 msgstr "Gardar mensaxe..."
 
-#: ../mail/em-utils.c:702
+#: ../mail/em-utils.c:663
 msgid "Add address"
 msgstr "Engadir enderezo"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1181
+#: ../mail/em-utils.c:1142
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensaxes de %s"
@@ -12226,7 +11876,8 @@ msgstr "Anchura predeterminada do diálogo de subscripción"
 
 #: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
-msgstr "Debuxar indicadores de erros tipográficos nas palabras mentras se escribe."
+msgstr ""
+"Debuxar indicadores de erros tipográficos nas palabras mentras se escribe."
 
 #: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
@@ -12399,7 +12050,8 @@ msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Preguntar ao usuario cando tente compactar un cartafol."
 
 #: ../mail/evolution-mail.schemas.in.in.h:57
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Preguntar ao usuario cando tente enviar unha mensaxe sen un asunto."
 
 #: ../mail/evolution-mail.schemas.in.in.h:58
@@ -12466,6 +12118,14 @@ msgstr "Amosar mensaxes borradas (riscadas) na lista de mensaxes."
 msgid "Show deleted messages in the message-list"
 msgstr "Amosar mensaxes borradas na lista de mensaxes"
 
+#: ../mail/evolution-mail.schemas.in.in.h:73
+msgid "Show the \"Preview\" pane"
+msgstr "Amosar o panel de \"Vista previa\""
+
+#: ../mail/evolution-mail.schemas.in.in.h:74
+msgid "Show the \"Preview\" pane."
+msgstr "Amosar o panel de \"Vista previa\"."
+
 #: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Reproducir un ficheiro de son cando chegue correo novo."
@@ -12893,7 +12553,8 @@ msgstr "<b>_Linguas</b>"
 
 #: ../mail/mail-config.glade.h:7
 msgid "<small>This will make the the filter more reliable, but slower</small>"
-msgstr "<small>Isto fará que o filtrado sexa máis exacto, pero máis lento</small>"
+msgstr ""
+"<small>Isto fará que o filtrado sexa máis exacto, pero máis lento</small>"
 
 #: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
@@ -13220,7 +12881,8 @@ msgstr "Editor de mensaxes"
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
-msgstr "Nota: Non se lle pedirá un contrasinal ata que conecte por primeira vez"
+msgstr ""
+"Nota: Non se lle pedirá un contrasinal ata que conecte por primeira vez"
 
 #: ../mail/mail-config.glade.h:102
 msgid "Or_ganization:"
@@ -13427,7 +13089,8 @@ msgstr "_Non notificarme cando chegue correo novo"
 
 #: ../mail/mail-config.glade.h:157
 msgid "_Don't sign meeting requests (for Outlook compatibility)"
-msgstr "Non a_sinar as solicitudes de xuntanza (para compatibilidade con Outlook)"
+msgstr ""
+"Non a_sinar as solicitudes de xuntanza (para compatibilidade con Outlook)"
 
 #: ../mail/mail-config.glade.h:159
 msgid "_Forward style:"
@@ -13459,7 +13122,8 @@ msgstr "_Ruta:"
 
 #: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
-msgstr "_Avisar cando se envíen mensaxes en HTML a contactos que non as queiran"
+msgstr ""
+"_Avisar cando se envíen mensaxes en HTML a contactos que non as queiran"
 
 #: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
@@ -13820,7 +13484,6 @@ msgid "Checking for new mail"
 msgstr "Comprobando o novo correo"
 
 #: ../mail/mail-session.c:207
-#: ../plugins/exchange-operations/exchange-config-listener.c:601
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduza o seu contrasinal para %s"
@@ -13833,20 +13496,20 @@ msgstr "Introduza o seu contrasinal"
 msgid "User canceled operation."
 msgstr "O usuario cancelou a operación."
 
-#: ../mail/mail-signature-editor.c:381
+#: ../mail/mail-signature-editor.c:372
 msgid "Edit signature"
 msgstr "Editar sinatura"
 
-#: ../mail/mail-signature-editor.c:423
+#: ../mail/mail-signature-editor.c:412
 msgid "Enter a name for this signature."
 msgstr "Introduza un nome para esta sinatura."
 
-#: ../mail/mail-signature-editor.c:426
+#: ../mail/mail-signature-editor.c:415
 #: ../plugins/groupwise-features/properties.glade.h:5
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../mail/mail-tools.c:115
+#: ../mail/mail-tools.c:116
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Non se puido crear o directorio spool `%s': %s"
@@ -13856,16 +13519,16 @@ msgstr "Non se puido crear o directorio spool `%s': %s"
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "Tentando mover correo desde un orixe que non é un buzón `%s'"
 
-#: ../mail/mail-tools.c:249
+#: ../mail/mail-tools.c:242
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensaxe remitida - %s"
 
-#: ../mail/mail-tools.c:251
+#: ../mail/mail-tools.c:244
 msgid "Forwarded message"
 msgstr "Mensaxe remitida"
 
-#: ../mail/mail-tools.c:291
+#: ../mail/mail-tools.c:284
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Cartafol inválido: `%s'"
@@ -13894,7 +13557,8 @@ msgid "New Search Folder"
 msgstr "Cartafol de busca novo"
 
 #: ../mail/mail.error.xml.h:1
-msgid "A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgid ""
+"A folder named &quot;{1}&quot; already exists. Please use a different name."
 msgstr ""
 "Xa existe un cartafol chamado &quot;{1}&quot;. Por favor use un nome "
 "diferente."
@@ -13921,33 +13585,25 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
-"A signature already exists with the name &quot;{0}&quot;. Please specify a "
-"different name."
-msgstr ""
-"Xa existe unha sinatura co nome &quot;{0}&quot;. Por favor, use un nome "
-"diferente."
-
-#: ../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 ""
 "Engadir unha liña de Asunto con significado á mensaxe dará a seus "
 "destinatarios unha idea de qué trata seu correo."
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:8
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Está seguro de que quere borrar esta conta e todos o seus proxies?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account?"
 msgstr "Está seguro de que quere borrar esta conta?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:10
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr "Está seguro de que quere abrir {0} mensaxes á vez?"
 
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:11
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -13955,7 +13611,7 @@ msgstr ""
 "Está seguro de que quere eliminar todas as mensaxes borradas en todos os "
 "cartafoles?"
 
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:12
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
@@ -13963,79 +13619,76 @@ msgstr ""
 "Está seguro de que quere eliminar permanentemente todas as mensaxes borradas "
 "no cartafol &quot;{0}&quot;?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:13
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Está seguro que quere enviar unha mensaxe en formato HTML?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:14
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Está seguro que quere enviar unha mensaxe con só destinatarios Cco?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Está seguro de que quere enviar unha mensaxe sen un asunto?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:16
 msgid "Because &quot;{0}&quot;."
 msgstr "Porque &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{2}&quot;."
 msgstr "Porque &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:20
-msgid "Blank Signature"
-msgstr "Sinatura en branco"
-
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:19
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "Non se pode engadir o cartafol de busca &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:20
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Non se pode copiar o cartafol &quot;{0}&quot; a &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:21
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "Non se pode crear o cartafol &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot create temporary save directory."
 msgstr "Non se pode crear o directorio de gardado temporal."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "Non se pode crear o directorio de gardado, porque &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "Non se pode borrar o cartafol &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "Non se pode borrar o cartafol de sistema &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
-msgstr "Non se pode editar o cartafol de busca &quot;{0}&quot; porque non existe."
+msgstr ""
+"Non se pode editar o cartafol de busca &quot;{0}&quot; porque non existe."
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Non se pode mover o cartafol &quot;{0}&quot; a &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "Non se puido abrir a orixe &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "Non se pode abrir a orixe &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "Non se pode abrir o destino &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:31
 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 "
@@ -14045,31 +13698,31 @@ msgstr ""
 "de instalación. Non será posible usar este servidor ata que poida aceptar "
 "esta licencia."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Non se pode renomear &quot;{0}&quot; a &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr "Non se pode renomear ou mover o cartafol de sistema &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot save changes to account."
 msgstr "Non se poden gardar os trocos na conta."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "Non se pode gardar ao directorio &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "Non se pode gardar ao ficheiro &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "Non se pode establecer o script de sinatura &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:38
 msgid ""
 "Check to make sure your password is spelled correctly.  Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14078,63 +13731,63 @@ msgstr ""
 "contrasinais distinguen as miúsculas, súa tecla de bloqueo de maiúsculas "
 "pode estar activada."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:39
 msgid "Could not save signature file."
 msgstr "Non se puido gardar o ficheiro de sinatura."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:40
 msgid "Delete &quot;{0}&quot;?"
 msgstr "Borrar &quot;{0}&quot;?"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:41
 msgid "Delete account?"
 msgstr "Borrar conta?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
 msgid "Discard changed?"
 msgstr "Descartar trocos?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr "Quere realizar esta operación nos subcartafoles?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid "Do you wish to save your changes?"
 msgstr "Desexa gardar os cambios?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:45
 msgid "Don't delete"
 msgstr "Non borrar"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:46
 msgid "Enter password."
 msgstr "Introduza o contrasinal."
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:47
 msgid "Error loading filter definitions."
 msgstr "Erro cargando as definicións de filtros."
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid "Error while performing operation."
 msgstr "Erro ao efectuar a operación."
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Error while {0}."
 msgstr "Erro ao {0}."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:50
 msgid "File exists but cannot overwrite it."
 msgstr "O ficheiro existe pero non se pode sobreescribir."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "File exists but is not a regular file."
 msgstr "O ficheiro existe pero non é un ficheiro regular."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Se continúa, non poderá recuperar estas mensaxes."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:53
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -14142,7 +13795,7 @@ msgstr ""
 "Se borra o cartafol, todo o seu contido e o dos seus subcartafoles borrarase "
 "permanentemente."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:54
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14150,11 +13803,11 @@ msgstr ""
 "Se continúa, a información da conta e toda a\n"
 "información do proxy borrarase permanentemente."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:56
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Se procede, a información da conta borrarase permanentemente."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:57
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -14162,19 +13815,19 @@ msgstr ""
 "Se sae, estas mensaxes non se enviarán ata que Evolution sexa iniciado de "
 "novo."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:58
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:59
 msgid "Invalid authentication"
 msgstr "Autenticación inválida"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:60
 msgid "Mail filters automatically updated."
 msgstr "Filtros de correo actualizados automaticamente."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:61
 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 "
@@ -14186,35 +13839,31 @@ msgstr ""
 "os destinatarios da súa mensaxe de todas maneiras. Para evitar isto debería "
 "engadir polo menos un destinatario Para: ou CC: ."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:62
 msgid "Mark all messages as read"
 msgstr "Marcar todas as mensaxes como lidas"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:63
 msgid "Mark all messages as read in the selected folder"
 msgstr "Marcar todas as mensaxes como listas no cartafol seleccionado"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:64
 msgid "Missing folder."
 msgstr "Falta o cartafol."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:66
 msgid "No sources selected."
 msgstr "Non se seleccionou ningunha orixe."
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:67
 msgid "Opening too many messages at once may take a long time."
 msgstr "Abrir demasiadas mensaxes á vez pode levar moito tempo."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:68
 msgid "Please check your account settings and try again."
 msgstr "Comprobe súa configuración da conta e inténteo outra vez."
 
-#: ../mail/mail.error.xml.h:71
-msgid "Please enable the account or send using another account."
-msgstr "Active a conta ou envíe empregando outra conta."
-
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:69
 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."
@@ -14223,7 +13872,7 @@ msgstr ""
 "buscar enderezos de correo premendo no botón Para: á beira da caixa de "
 "entrada."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:70
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14235,51 +13884,43 @@ msgstr ""
 "{0}\n"
 "Enviar de todas maneiras?"
 
-#: ../mail/mail.error.xml.h:76
-msgid "Please provide an unique name to identify this signature."
-msgstr "Introduza un nome único para identificar esta sinatura."
-
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:73
 msgid "Please wait."
 msgstr "Agarde, por favor."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:74
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Problema ao migrar o cartafol antigo de correo &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:75
 msgid "Querying server"
 msgstr "Consultando o servidor"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:76
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Se está consultado ao servidor por unha lista de mecanismos de autenticación "
 "soportados."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:77
 msgid "Read receipt requested."
 msgstr "Solicitouse unha notificación de lectura."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:78
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr ""
 "Seguro de quere borrar o cartafol &quot;{0}&quot; e todos o seus "
 "subcartafoles?"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:79
 msgid "Search Folders automatically updated."
 msgstr "Cartafoles de busca actualizados automaticamente."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:80
 msgid "Send Receipt"
 msgstr "Enviar confirmación"
 
-#: ../mail/mail.error.xml.h:85
-msgid "Signature Already Exists"
-msgstr "A sinatura xa existe"
-
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -14287,7 +13928,7 @@ msgstr ""
 "Ximian Evolution require os cartafoles de sistema para funcionar "
 "correctamente e non poden renomearse, moverse ou borrarse."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:82
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14304,7 +13945,7 @@ msgstr ""
 "destinatarios na súa mensaxe. Para evitar isto, debería engadir polo menos "
 "un destinatario a Para: ou Cc:"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:85
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14318,7 +13959,7 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "e hanse actualizar."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14332,7 +13973,7 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "e hanse actualizar."
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "The message was sent via the &quot;sendmail&quot; external application.  "
 "Sendmail reports the following error: status 67: mail not sent.\n"
@@ -14344,11 +13985,11 @@ msgstr ""
 "A mensaxe está almacenada no cartafol de saída. Comprobe se a mensaxe ten "
 "erros e reenvíe."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:97
 msgid "The script file must exist and be executable."
 msgstr "O ficheiro de script debe existir e ser executable."
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14357,21 +13998,14 @@ msgstr ""
 "vaia ao editor de cartafoles de busca para engadilo explicitamente, se é "
 "necesario."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:100
 msgid ""
-"This message cannot be sent because the account you chose to send with is "
-"not enabled"
-msgstr ""
-"Esta mensaxe non pode ser enviada porque a conta que escolleu para enviar "
-"non está activada"
-
-#: ../mail/mail.error.xml.h:106
-msgid "This message cannot be sent because you have not specified any Recipients"
+"This message cannot be sent because you have not specified any Recipients"
 msgstr ""
 "Esta mensaxe non pode ser enviada porque non se especificou ningún "
 "destinatario"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:101
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14379,15 +14013,15 @@ msgstr ""
 "Este servidor non soporta este tipo de autenticación e quizais non soporte "
 "ningún tipo de autenticación."
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:102
 msgid "This signature has been changed, but has not been saved."
 msgstr "Esta sinatura cambiou, pero non foi gardada."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:103
 msgid "Unable to connect to the GroupWise server."
 msgstr "Non se puido conectar ao servidor GroupWise."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "Unable to open the drafts folder for this account.  Use the system drafts "
 "folder instead?"
@@ -14395,39 +14029,39 @@ msgstr ""
 "Non se puido abrir o cartafol de borradores nesta conta. Quere usar o "
 "cartafol de borradores do sistema?"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:105
 msgid "Unable to read license file."
 msgstr "Non se puido ler o ficheiro de licencia."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:106
 msgid "Use _Default"
 msgstr "Usar _por defecto"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:107
 msgid "Use default drafts folder?"
 msgstr "Usar cartafol de borradores por defecto?"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:108
 msgid "You have not filled in all of the required information."
 msgstr "Non encheu toda a información requirida."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:109
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Ten mensaxes non enviadas, quere saír de todas maneiras?"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:110
 msgid "You may not create two accounts with the same name."
 msgstr "Non pode crear dúas contas co mesmo nome"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:111
 msgid "You must name this Search Folder."
 msgstr "Debe dar un nome a este cartafol de busca."
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:112
 msgid "You must specify a folder."
 msgstr "Debe especificar un cartafol."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14437,100 +14071,104 @@ msgstr ""
 "Fágao seleccionando os cartafoles individualmente, e/ou seleccionando todos "
 "os cartafoles locais, todos os cartafoles remotos, ou ambos."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:115
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr ""
 "Seu inicio de sesión no seu servidor &quot;{0}&quot; como &quot;{0}&quot; "
 "fallou."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:116
 msgid "Your message with the subject &quot;{0}&quot; was not delivered."
 msgstr "Súa mensaxe, co asunto &quot;{0}&quot; non foi entregado."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:117
 msgid "_Append"
 msgstr "_Agregar"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:118
 msgid "_Discard changes"
 msgstr "_Descartar cambios"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:119
+msgid "_Empty Trash"
+msgstr "_Baleirar Lixo"
+
+#: ../mail/mail.error.xml.h:120
 msgid "_Expunge"
 msgstr "_Compactar"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:121
 msgid "_Open Messages"
 msgstr "_Abrir Mensaxes"
 
-#: ../mail/message-list.c:1006
+#: ../mail/message-list.c:996
 msgid "Unseen"
 msgstr "Non vista"
 
-#: ../mail/message-list.c:1007
+#: ../mail/message-list.c:997
 msgid "Seen"
 msgstr "Vista"
 
-#: ../mail/message-list.c:1008
+#: ../mail/message-list.c:998
 msgid "Answered"
 msgstr "Respondida"
 
-#: ../mail/message-list.c:1009
+#: ../mail/message-list.c:999
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples Mensaxes Non Vistas"
 
-#: ../mail/message-list.c:1010
+#: ../mail/message-list.c:1000
 msgid "Multiple Messages"
 msgstr "Múltiples Mensaxes"
 
-#: ../mail/message-list.c:1014
+#: ../mail/message-list.c:1004
 msgid "Lowest"
 msgstr "A máis baixa"
 
-#: ../mail/message-list.c:1015
+#: ../mail/message-list.c:1005
 msgid "Lower"
 msgstr "Máis baixa"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1009
 msgid "Higher"
 msgstr "Máis alta"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1010
 msgid "Highest"
 msgstr "A máis alta"
 
-#: ../mail/message-list.c:1348 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1338 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1355 ../plugins/itip-formatter/itip-view.c:197
+#: ../mail/message-list.c:1345 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Hoxe ás %l:%M %p"
 
-#: ../mail/message-list.c:1364 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1354 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Onte ás %l:%M %p"
 
-#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1366 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "O %A ás %k:%M"
 
-#: ../mail/message-list.c:1384 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1374 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "O %d de %B ás %k:%M"
 
-#: ../mail/message-list.c:1386 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%d de %B de %Y"
 
-#: ../mail/message-list.c:2052
+#: ../mail/message-list.c:2042
 msgid "Message List"
 msgstr "Lista de mensaxes"
 
-#: ../mail/message-list.c:3397
+#: ../mail/message-list.c:3387
 msgid "Generating message list"
 msgstr "Xerando a lista de mensaxes"
 
@@ -14578,7 +14216,7 @@ msgstr "Seguemento"
 msgid "For Your Information"
 msgstr "Para a súa información"
 
-#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:43
+#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Remitir"
 
@@ -14586,11 +14224,11 @@ msgstr "Remitir"
 msgid "No Response Necessary"
 msgstr "Non é necesaria unha resposta"
 
-#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:83
+#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:82
 msgid "Reply"
 msgstr "Responder"
 
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:84
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to All"
 msgstr "Responder a Todos"
 
@@ -14689,27 +14327,28 @@ msgstr "Respaldar e restaurar os datos de Evolution e a configuración"
 msgid "Restore Settings..."
 msgstr "Configuración da restauración..."
 
-#: ../plugins/bbdb/bbdb.c:410
+#: ../plugins/bbdb/bbdb.c:404
 msgid "Automatic Contacts"
 msgstr "Contactos automáticos"
 
-#: ../plugins/bbdb/bbdb.c:419
+#: ../plugins/bbdb/bbdb.c:413
 msgid "<span weight=\"bold\">Automatic Contacts</span>"
 msgstr "<span weight=\"bold\">Contactos automáticos</span>"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:432
-msgid "_Automatically create entries in the addressbook when responding to mail"
+#: ../plugins/bbdb/bbdb.c:426
+msgid ""
+"_Automatically create entries in the addressbook when responding to mail"
 msgstr ""
 "Crear entradas _automaticamente no libro de enderezos cando se responda ao "
 "correo"
 
-#: ../plugins/bbdb/bbdb.c:450
+#: ../plugins/bbdb/bbdb.c:444
 msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
 msgstr "<span weight=\"bold\">Contactos de mensaxería instantánea</span>"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:463
+#: ../plugins/bbdb/bbdb.c:457
 msgid ""
 "Periodically synchronize contact information and images from my _instant "
 "messenger"
@@ -14718,7 +14357,7 @@ msgstr ""
 "miña mensaxería _instantánea"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:470
+#: ../plugins/bbdb/bbdb.c:464
 msgid "Synchronize with _buddy list now"
 msgstr "Sincronizar coa lista de _compañeiros agora"
 
@@ -14829,7 +14468,8 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "Comprobar se Evolution é a aplicación de correo predeterminada"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.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 ""
 "Cada vez que se inicie Evolution, comprobar se é ou non o cliente de correo "
 "predeterminado."
@@ -14968,16 +14608,6 @@ msgstr "Tipo de Autenticación"
 msgid "Ch_eck for Supported Types"
 msgstr "_Comprobar tipos soportados"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:192
-#: ../plugins/exchange-operations/exchange-contacts.c:162
-msgid ""
-"Evolution is in offline mode. You cannot create or modify folders now.\n"
-"Please switch to online mode for such operations."
-msgstr ""
-"Evolution está en modo desconectado. Non pode crear ou modificar cartafoles "
-"agora.\n"
-"Cambie o modo a conectado para ditas operacións."
-
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
@@ -15007,7 +14637,8 @@ msgstr "Novo Contrasinal:"
 
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:6
 msgid "Your current password has expired. Please change your password now."
-msgstr "Seu contrasinal actual expirou. Por favor cambie o seu contrasinal agora."
+msgstr ""
+"Seu contrasinal actual expirou. Por favor cambie o seu contrasinal agora."
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:144
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:576
@@ -15125,28 +14756,24 @@ msgstr "Nome do cartafol"
 msgid "Folder Size"
 msgstr "Tamaño do cartafol"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:180
-msgid "Subscribe to Other User's"
-msgstr "Subscribirse a outros usuarios"
-
 #: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
 msgid "Exchange Folder Tree"
 msgstr "Árbore de cartafoles de Exchange"
 
-#: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:227
-#: ../plugins/exchange-operations/exchange-folder.c:237
+#: ../plugins/exchange-operations/exchange-folder.c:62
+#: ../plugins/exchange-operations/exchange-folder.c:223
+#: ../plugins/exchange-operations/exchange-folder.c:233
 msgid "Unsubscribe Folder..."
 msgstr "Desubscribirse do cartafol..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:464
-#: ../plugins/exchange-operations/exchange-folder.c:524
+#: ../plugins/exchange-operations/exchange-folder.c:460
+#: ../plugins/exchange-operations/exchange-folder.c:520
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Seguro que quere desubscribirse do cartafol \"%s\"?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:476
-#: ../plugins/exchange-operations/exchange-folder.c:536
+#: ../plugins/exchange-operations/exchange-folder.c:472
+#: ../plugins/exchange-operations/exchange-folder.c:532
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Desubscribirse de \"%s\""
@@ -15391,7 +15018,8 @@ msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Make sure the username and password are correct and try again."
-msgstr "Asegúrese de que o usuario e contrasinal son correctos e inténteo de novo."
+msgstr ""
+"Asegúrese de que o usuario e contrasinal son correctos e inténteo de novo."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "No Global Catalog server configured for this account."
@@ -15485,7 +15113,8 @@ msgstr "Operación non soportada"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "You are nearing your quota available for storing mails on this server."
-msgstr "Está cerca da súa cuota dispoñible para almacenar correo neste servidor."
+msgstr ""
+"Está cerca da súa cuota dispoñible para almacenar correo neste servidor."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "You cannot make yourself your own delegate"
@@ -15503,13 +15132,15 @@ msgstr "Só pode configurar unha soa conta de Exchange."
 msgid ""
 "Your current usage is : {0}KB. Try to clear up some space by deleting some "
 "mails."
-msgstr "Seu uso actual é: {0}KB. Tente facer algo de espazo borrando algúns correos."
+msgstr ""
+"Seu uso actual é: {0}KB. Tente facer algo de espazo borrando algúns correos."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid ""
 "Your current usage is : {0}KB. You will not be able to either send or "
 "recieve mails now."
-msgstr "Seu uso actual é: {0}KB. Non poderá nin enviar nin recibir mensaxes agora."
+msgstr ""
+"Seu uso actual é: {0}KB. Non poderá nin enviar nin recibir mensaxes agora."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
@@ -15612,7 +15243,6 @@ msgid "Add Send Options to groupwise messages"
 msgstr "Engadir opcións de envío ás mensaxes de Groupwises"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:8
 #: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "Opcións de envío"
@@ -15703,7 +15333,7 @@ msgid "Subscribe to my _notifications"
 msgstr "Subscribirse ás miñas _notificacións"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Read"
 msgstr "_Lido"
 
@@ -15732,7 +15362,7 @@ msgstr "Sesión proxy"
 
 #: ../plugins/groupwise-features/proxy-login.c:219
 #: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:501
+#: ../plugins/groupwise-features/proxy.c:499
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -15742,11 +15372,7 @@ msgstr "%s Introduza o seu contrasinal para %s (usuario %s)"
 msgid "_Proxy Login..."
 msgstr "Sesión _proxy..."
 
-#: ../plugins/groupwise-features/proxy.c:690
-msgid "The Proxy tab will be available only when the account is online."
-msgstr "A solapa do Proxy estará dispoñible só cando a conta esté activada."
-
-#: ../plugins/groupwise-features/proxy.c:695
+#: ../plugins/groupwise-features/proxy.c:680
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "A solapa do Proxy estará dispoñible só cando a conta esté activada."
 
@@ -15770,65 +15396,6 @@ msgstr "Compartir"
 msgid "Track Message Status..."
 msgstr "Seguir o estado da mensaxe..."
 
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "Hula Account Setup"
-msgstr "Configuración da conta Hula"
-
-#: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:137
-msgid "iCalendar format (.ics)"
-msgstr "Formato iCalendar (.ics)"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
-msgstr "Sincronizar a tarefa/calendario/libro de enderezos con Apple iPod"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
-msgid "Synchronize to iPod"
-msgstr "Sincronizar con iPod"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
-msgid "iPod Synchronization"
-msgstr "Sincronización con iPod"
-
-#: ../plugins/ipod-sync/sync.c:158
-msgid "No output directory!"
-msgstr "Sen directorio de saída!"
-
-#: ../plugins/ipod-sync/sync.c:159
-msgid ""
-"The output directory was not found on iPod! Please ensure that iPod has been "
-"correctly set up and try again."
-msgstr ""
-"O directorio de saída non se atopou no iPod! Asegúrese de que o iPod "
-"configurouse correctamente e inténteo de novo."
-
-#: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
-msgid "Could not export data!"
-msgstr "Non se puido exportar datos!"
-
-#: ../plugins/ipod-sync/sync.c:203
-msgid "Exporting data failed."
-msgstr "Fallou a exportación dos datos."
-
-#: ../plugins/ipod-sync/sync.c:231
-msgid "Could not open addressbook!"
-msgstr "Non se puido abrir o libro de enderezos!"
-
-#: ../plugins/ipod-sync/sync.c:232
-msgid "Could not open the Evolution addressbook to export data."
-msgstr "Non se puido abrir o libro de enderezos de Evolution para exportar os datos."
-
-#: ../plugins/ipod-sync/sync.c:291
-msgid "Could not open calendar/todo!"
-msgstr "Non se puido abrir o calendario/tarefas!"
-
-#: ../plugins/ipod-sync/sync.c:292
-msgid "Could not open the Evolution calendar/todo list to export data."
-msgstr ""
-"Non se puido abrir a lista de calendario/tarefas de Evolution para exportar "
-"datos."
-
 #: ../plugins/itip-formatter/itip-formatter.c:724
 msgid "Unable to parse item"
 msgstr "Imposible analizar o elemento"
@@ -15926,6 +15493,10 @@ msgstr ""
 "Para procesar todos estos elementos, o ficheiro debería gardarse e o "
 "calendario importarse"
 
+#: ../plugins/itip-formatter/itip-formatter.c:1968
+msgid "Meetings and Tasks"
+msgstr "Xuntanzas e tarefas"
+
 #. Delete message after acting
 #. FIXME Need a schema for this
 #: ../plugins/itip-formatter/itip-formatter.c:1991
@@ -15946,311 +15517,313 @@ msgid "Conflict Search Table"
 msgstr "Táboa de buscas e conflictos"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:183 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:466
+#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:240 ../widgets/misc/e-dateedit.c:457
 msgid "Today"
 msgstr "Hoxe"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:188
+#: ../plugins/itip-formatter/itip-view.c:189
 msgid "Today %H:%M"
 msgstr "Hoxe ás %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:192
+#: ../plugins/itip-formatter/itip-view.c:193
 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:201
+#: ../plugins/itip-formatter/itip-view.c:202
 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:211
+#: ../plugins/itip-formatter/itip-view.c:212
 msgid "Tomorrow"
 msgstr "Mañán"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:216
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow %H:%M"
 msgstr "Mañán ás %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:221
 msgid "Tomorrow %H:%M:%S"
 msgstr "Mañán ás %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %l:%M %p"
 msgstr "Mañán ás %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:230
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Mañán ás %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:248
+#: ../plugins/itip-formatter/itip-view.c:249
 #, 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:253
+#: ../plugins/itip-formatter/itip-view.c:254
 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:257
+#: ../plugins/itip-formatter/itip-view.c:258
 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:262
+#: ../plugins/itip-formatter/itip-view.c:263
 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:266
+#: ../plugins/itip-formatter/itip-view.c:267
 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:275
+#: ../plugins/itip-formatter/itip-view.c:276
 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:281
+#: ../plugins/itip-formatter/itip-view.c:282
 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:285
+#: ../plugins/itip-formatter/itip-view.c:286
 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:290
+#: ../plugins/itip-formatter/itip-view.c:291
 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:294
+#: ../plugins/itip-formatter/itip-view.c:295
 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:300
+#: ../plugins/itip-formatter/itip-view.c:301
 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:305
+#: ../plugins/itip-formatter/itip-view.c:306
 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:309
+#: ../plugins/itip-formatter/itip-view.c:310
 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:314
+#: ../plugins/itip-formatter/itip-view.c:315
 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:318
+#: ../plugins/itip-formatter/itip-view.c:319
 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:343
+#: ../plugins/itip-formatter/itip-view.c:344
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> publicou información de reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:345
+#: ../plugins/itip-formatter/itip-view.c:346
 #, 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:350
+#: ../plugins/itip-formatter/itip-view.c:351
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> delegou a reunión seguinte a vostede:"
 
-#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:354
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> solicita súa presencia na seguinte xuntanza a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:355
+#: ../plugins/itip-formatter/itip-view.c:356
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> solicita a súa presencia na seguinte xuntanza:"
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:362
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> desexa apuntarse a unha xuntanza existente a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> desexa apuntarse a unha xuntanza existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:367
 #, 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> desexa recibir a última información da xuntanza seguinte:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> devolveu a seguinte resposta á xuntanza:"
 
-#: ../plugins/itip-formatter/itip-view.c:373
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> through %s has cancelled the following meeting:"
 msgstr "<b>%s</b> cancelou a seguinte xuntanza a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:375
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> has cancelled the following meeting."
 msgstr "<b>%s</b> cancelou a xuntanza seguinte."
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:379
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> propoñeu os trocos seguintes para a xuntanza."
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> declinou os seguintes trocos para a xuntanza a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:384
+#: ../plugins/itip-formatter/itip-view.c:385
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> declinou os trocos seguintes para a xuntanza."
 
-#: ../plugins/itip-formatter/itip-view.c:411
+#: ../plugins/itip-formatter/itip-view.c:412
 #, 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:413
+#: ../plugins/itip-formatter/itip-view.c:414
 #, 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:418
+#: ../plugins/itip-formatter/itip-view.c:419
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> solicita a asignación de %s para a seguinte tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:421
+#: ../plugins/itip-formatter/itip-view.c:422
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> a través de %s asignouselle unha tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:423
+#: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> asignoulle a vostede unha tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:429
+#: ../plugins/itip-formatter/itip-view.c:430
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> a través de %s desexa engadirse a unha tarefa existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:431
+#: ../plugins/itip-formatter/itip-view.c:432
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> desexa engadirse a unha tarefa existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:435
 #, c-format
 msgid ""
 "<b>%s</b> 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:"
+msgstr ""
+"<b>%s</b> quere recibir a última información para a seguinte tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:438
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> devolveu a seguinte resposta á tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:442
 #, c-format
 msgid "<b>%s</b> through %s has cancelled the following assigned task:"
 msgstr "<b>%s</b> cancelou a seguinte asignación de tarefa a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:443
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> has cancelled the following assigned task:"
 msgstr "<b>%s</b> cancelou a seguinte tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> propuxo os seguintes trocos na asignación de tarefas:"
 
-#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:451
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> declinou a seguinte tarefa asignada a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> declinou a seguinte tarefa asignada:"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:891
+#: ../plugins/itip-formatter/itip-view.c:892
 msgid "Start time:"
 msgstr "Hora de comezo:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:900
+#: ../plugins/itip-formatter/itip-view.c:901
 msgid "End time:"
 msgstr "Hora de finalización:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:916
-#: ../plugins/itip-formatter/itip-view.c:966
+#: ../plugins/itip-formatter/itip-view.c:917
+#: ../plugins/itip-formatter/itip-view.c:967
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: ../plugins/itip-formatter/itip-view.c:980
+#: ../plugins/itip-formatter/itip-view.c:981
 msgid "Send u_pdates to attendees"
 msgstr "Mandar _actualizacións aos participantes"
 
-#: ../plugins/itip-formatter/itip-view.c:989
+#: ../plugins/itip-formatter/itip-view.c:990
 msgid "A_pply to all instances"
 msgstr "_Aplicar a todas as instancias"
 
@@ -16275,7 +15848,8 @@ msgid "This meeting has been delegated"
 msgstr "Esta xuntanza delegouse"
 
 #: ../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 ""
 "Esta resposta non é dun participante actual. Desexa engadir ao remitente "
 "coma un participante?"
@@ -16311,7 +15885,8 @@ msgid "No store available"
 msgstr "Non hai almacén dispoñible"
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
-msgid "A plugin which implements a CORBA interface for accessing mail data remotely."
+msgid ""
+"A plugin which implements a CORBA interface for accessing mail data remotely."
 msgstr ""
 "Un complemento que implementa unha interface Corba para acceder aos datos de "
 "correo de forma remota."
@@ -16482,7 +16057,8 @@ msgstr "_Enviar mensaxe"
 
 #: ../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 "Contactar co responsable da lista de correo á que pertence esta mensaxe"
+msgstr ""
+"Contactar co responsable da lista de correo á que pertence esta mensaxe"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
 msgid "Get an archive of the list this message belongs to"
@@ -16632,9 +16208,8 @@ msgid "Gives an option to print mail from composer"
 msgstr "Da unha opción para imprimir o correo desde o editor"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:18 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:79 ../ui/evolution-memos.xml.h:12
-#: ../ui/evolution-tasks.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Pre_visualización da Impresión"
 
@@ -16656,7 +16231,8 @@ msgstr "aprende mensaxes de spam usando spamd."
 
 #: ../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 "Un complemento para gardar todos os adxuntos ou partes dunha mensaxe á vez."
+msgstr ""
+"Un complemento para gardar todos os adxuntos ou partes dunha mensaxe á vez."
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
@@ -16680,7 +16256,7 @@ msgid "MIME Type"
 msgstr "Tipo MIME"
 
 #: ../plugins/save-attachments/save-attachments.c:359
-#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:18
+#: ../ui/evolution-message-composer.xml.h:18
 msgid "Save"
 msgstr "Gardar"
 
@@ -16764,6 +16340,10 @@ msgstr "Encapsular valores con:"
 msgid "Comma separated value format (.csv)"
 msgstr "Formato de valores separados por comas (.csv)"
 
+#: ../plugins/save-calendar/ical-format.c:137
+msgid "iCalendar format (.ics)"
+msgstr "Formato iCalendar (.ics)"
+
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
 msgstr "Gardar seleccionados"
@@ -16886,7 +16466,8 @@ msgstr "Compoñente de Proba de Evolution"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "A GNOME Print description of the current printer settings"
-msgstr "Unha descrición de impresora de Gnome da configuración actual de impresora"
+msgstr ""
+"Unha descrición de impresora de Gnome da configuración actual de impresora"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:2
 msgid "Configuration version"
@@ -16913,7 +16494,8 @@ msgid "Last upgraded configuration version"
 msgstr "Última versión da configuración actualizada"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:8
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Lista de rutas aos cartafoles que se sincronizarán ao disco para usar "
 "desconectado"
@@ -16931,7 +16513,8 @@ msgid "Start in offline mode"
 msgstr "Iniciar en modo desconectado"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "The configuration version of Evolution, with major/minor/configuration level"
+msgid ""
+"The configuration version of Evolution, with major/minor/configuration level"
 msgstr ""
 "A versión de configuración de Evolution, co nivel de configuración maior/"
 "menor"
@@ -16981,7 +16564,8 @@ msgid "Whether the toolbar should be visible."
 msgstr "Indica se a barra de ferramentas debería ser visible."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:21
-msgid "Whether the warning dialog in development versions of Evolution is skipped."
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Indica se se salta o diálogo de advertencia nas versión de desenvolvemento "
 "de Evolution."
@@ -17097,49 +16681,50 @@ msgstr "O nome do cartafol non pode conter o carácter \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' e '..' son nomes de cartafol reservados."
 
-#: ../shell/e-shell-window-commands.c:71
+#: ../shell/e-shell-window-commands.c:70
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "As utilidades Gnome Pilot non parecen estar instaladas neste sistema."
 
-#: ../shell/e-shell-window-commands.c:79
+#: ../shell/e-shell-window-commands.c:78
 #, c-format
 msgid "Error executing %s."
 msgstr "Erro ao executar %s."
 
-#: ../shell/e-shell-window-commands.c:128
+#: ../shell/e-shell-window-commands.c:127
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy non está instalado."
 
-#: ../shell/e-shell-window-commands.c:136
+#: ../shell/e-shell-window-commands.c:135
 msgid "Bug buddy could not be run."
 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 box
-#: ../shell/e-shell-window-commands.c:533
+#: ../shell/e-shell-window-commands.c:532
 msgid "translator-credits"
 msgstr "Ignacio Casal Quinteiro <nacho.resa@gmail.com>"
 
-#: ../shell/e-shell-window-commands.c:547
+#: ../shell/e-shell-window-commands.c:546
 msgid "Groupware Suite"
 msgstr "Suite de traballo en grupo"
 
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:774
 msgid "_Work Online"
 msgstr "_Traballar Conectado"
 
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:52
+#: ../shell/e-shell-window-commands.c:787 ../ui/evolution.xml.h:50
 msgid "_Work Offline"
 msgstr "_Traballar Desconectado"
 
-#: ../shell/e-shell-window-commands.c:801
+#: ../shell/e-shell-window-commands.c:800
 msgid "Work Offline"
 msgstr "Traballar Desconectado"
 
 #: ../shell/e-shell-window.c:343
 msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr "Evolucion está conectado. Prema neste botón para traballar desconectado."
+msgstr ""
+"Evolucion está conectado. Prema neste botón para traballar desconectado."
 
 #: ../shell/e-shell-window.c:351
 msgid "Evolution is in the process of going offline."
@@ -17147,9 +16732,10 @@ msgstr "Evolution está en proceso de desconectarse."
 
 #: ../shell/e-shell-window.c:358
 msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr "Evolution está desconectado. Prema neste botón para traballar conectado."
+msgstr ""
+"Evolution está desconectado. Prema neste botón para traballar conectado."
 
-#: ../shell/e-shell-window.c:735
+#: ../shell/e-shell-window.c:724
 #, c-format
 msgid "Switch to %s"
 msgstr "Cambiar a %s"
@@ -17163,7 +16749,7 @@ msgstr "Erro de sistema descoñecido."
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1257 ../widgets/misc/e-cell-date-edit.c:257
+#: ../shell/e-shell.c:1257 ../widgets/misc/e-cell-date-edit.c:256
 msgid "OK"
 msgstr "Aceptar"
 
@@ -17246,7 +16832,7 @@ msgid ""
 "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"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
 "This product comes with no warranty and is not intended for\n"
 "individuals prone to violent fits of anger.\n"
 "\n"
@@ -17725,7 +17311,8 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "Ten certificados destas organizacións que o identifican:"
 
 #: ../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 ""
 "Ten nun ficheiro os certificados que identifican a estas autoridades de "
 "certificación:"
@@ -17999,113 +17586,103 @@ msgstr "Non se puido executar '%s': %s\n"
 msgid "Shutting down %s (%s)\n"
 msgstr "Pechando %s (%s)\n"
 
-#: ../ui/evolution-addressbook.xml.h:2
-msgid "Contact _Preview"
-msgstr "_Previsualización de contactos"
-
-#: ../ui/evolution-addressbook.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:3
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "Copia os contactos seleccionados a outro cartafol..."
 
-#: ../ui/evolution-addressbook.xml.h:5 ../ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:4 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Copiar a selección"
 
-#: ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-addressbook.xml.h:5
 msgid "Copy to Folder..."
 msgstr "Copiar ao Cartafol..."
 
-#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-memos.xml.h:4
-#: ../ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Cortar"
-
-#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Cortar a selección"
 
-#: ../ui/evolution-addressbook.xml.h:10
+#: ../ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Elimina-los contactos seleccionados"
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Forward Contact"
-msgstr "Remitir Contacto"
-
-#: ../ui/evolution-addressbook.xml.h:12
 msgid "Move Selected Contacts to Another Folder..."
 msgstr "Mover as mensaxes seleccionadas a outro cartafol..."
 
-#: ../ui/evolution-addressbook.xml.h:13
+#: ../ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr "Mover ao Cartafol.."
 
-#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-memos.xml.h:8
-#: ../ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Pegar"
-
-#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
 msgstr "Pegar o contido do portarretallos"
 
-#: ../ui/evolution-addressbook.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Previsualiza os contactos que se han imprimir"
 
-#: ../ui/evolution-addressbook.xml.h:19
+#: ../ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Imprimi-los contactos seleccionados"
 
-#: ../ui/evolution-addressbook.xml.h:21
+#: ../ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Garda-los contactos seleccionados coma unha VCard."
 
-#: ../ui/evolution-addressbook.xml.h:22 ../widgets/text/e-text.c:2684
+#: ../ui/evolution-addressbook.xml.h:21 ../widgets/text/e-text.c:2684
 msgid "Select All"
 msgstr "Seleccionar Todo"
 
-#: ../ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Seleccionar tódolos contactos"
 
-#: ../ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-addressbook.xml.h:23
 msgid "Send a message to the selected contacts."
 msgstr "Enviar unha mensaxe aos contactos seleccionados."
 
-#: ../ui/evolution-addressbook.xml.h:25
+#: ../ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Enviar mensaxe a un contacto"
 
-#: ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Envia-los contactos seleccionados a outra persoa."
 
-#: ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-addressbook.xml.h:26
 msgid "Show contact preview window"
 msgstr "Amosar a fiestra de previsualización de contactos"
 
-#: ../ui/evolution-addressbook.xml.h:28
+#: ../ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Parar"
 
-#: ../ui/evolution-addressbook.xml.h:29
+#: ../ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Parar a Carga"
 
-#: ../ui/evolution-addressbook.xml.h:30
+#: ../ui/evolution-addressbook.xml.h:29
 msgid "View the current contact"
 msgstr "Ver o contacto actual"
 
-#: ../ui/evolution-addressbook.xml.h:31 ../ui/evolution-calendar.xml.h:38
-#: ../ui/evolution-tasks.xml.h:21
+#: ../ui/evolution-addressbook.xml.h:30 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-tasks.xml.h:19
 msgid "_Actions"
 msgstr "_Accións"
 
-#: ../ui/evolution-addressbook.xml.h:36
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "_Forward Contact..."
 msgstr "_Remitir Contacto..."
 
+#: ../ui/evolution-addressbook.xml.h:39
+msgid "_Preview Pane"
+msgstr "_Panel de Previsualización"
+
+#: ../ui/evolution-addressbook.xml.h:41
+msgid "_Save as VCard..."
+msgstr "_Gardar coma VCard..."
+
 #: ../ui/evolution-addressbook.xml.h:42
 msgid "_Select All"
 msgstr "_Seleccionar Todo"
@@ -18154,7 +17731,7 @@ msgstr "Lista"
 msgid "Month"
 msgstr "Mes"
 
-#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:61
+#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:60
 msgid "Next"
 msgstr "Seguinte"
 
@@ -18162,7 +17739,7 @@ msgstr "Seguinte"
 msgid "Previews the calendar to be printed"
 msgstr "Previsualiza a axenda que se vai imprimir"
 
-#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:76
 msgid "Previous"
 msgstr "Anterior"
 
@@ -18186,10 +17763,6 @@ msgstr "Purgar xuntanzas e citas antigas"
 msgid "Select _Date"
 msgstr "Seleccionar _data"
 
-#: ../ui/evolution-calendar.xml.h:26
-msgid "Select _Today"
-msgstr "Seleccionar _hoxe"
-
 #: ../ui/evolution-calendar.xml.h:27
 msgid "Select a specific date"
 msgstr "Seleccionar unha data específica"
@@ -18234,191 +17807,30 @@ msgstr "Semana Laboral"
 msgid "_Open Appointment"
 msgstr "_Abrir cita"
 
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-editor.xml.h:7
+#: ../ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
 msgstr "Copiar o texto seleccionado ao portarretallos"
 
-#: ../ui/evolution-composer-entries.xml.h:3 ../ui/evolution-editor.xml.h:9
+#: ../ui/evolution-composer-entries.xml.h:2
+msgid "Cu_t"
+msgstr "Cor_tar"
+
+#: ../ui/evolution-composer-entries.xml.h:3
 msgid "Cut selected text to the clipboard"
 msgstr "Cortar o texto seleccionado ao portarretallos"
 
-#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:10
+#: ../ui/evolution-composer-entries.xml.h:4
 msgid "Paste text from the clipboard"
 msgstr "Pegar texto desde o portarretallos"
 
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-editor.xml.h:12
-#: ../ui/evolution-subscribe.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Seleccionar _Todo"
 
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:6
 msgid "Select all text"
 msgstr "Seleccionar todo o texto"
 
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "Prema aquí para adxuntar un ficheiro"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "Prema aquí para pechar a fiestra actual"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "Prema aquí para gardar a fiestra actual"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help availabe"
-msgstr "Prema aquí para ver a axuda dispoñible"
-
-#.
-#. <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:4
-#: ../ui/evolution-signature-editor.xml.h:7
-msgid "Close"
-msgstr "Pechar"
-
-#: ../ui/evolution-editor.xml.h:14
-msgid "_Attachments"
-msgstr "_Anexos"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:42 ../ui/evolution-subscribe.xml.h:9
-msgid "_Close"
-msgstr "_Pechar"
-
-#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:45
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:37
-msgid "_File"
-msgstr "_Ficheiro"
-
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:38
-msgid "_Help"
-msgstr "A_xuda"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-message-composer.xml.h:47
-#: ../ui/evolution-signature-editor.xml.h:25
-msgid "_Insert"
-msgstr "_Inserir"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "_Opcións"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All day Event"
-msgstr "Evento para todo o día"
-
-#: ../ui/evolution-event-editor.xml.h:3 ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "Clasificar como confidencial"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "Clasificar como privado"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "Clasificar como público"
-
-#: ../ui/evolution-event-editor.xml.h:7 ../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:8
-msgid "Make this a recurring event"
-msgstr "Convertir en evento repetitivo"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "Pú_blico"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Query free / busy information for the attendees"
-msgstr "Consultar información de dispoñibilidade para os participantes"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "Campo _rol"
-
-#: ../ui/evolution-event-editor.xml.h:14 ../ui/evolution-task-editor.xml.h:9
-msgid "Show Time _Zone"
-msgstr "Amosar fuso _horario"
-
-#: ../ui/evolution-event-editor.xml.h:15
-msgid "Show time as b_usy"
-msgstr "Amosar hora como _ocupada"
-
-#: ../ui/evolution-event-editor.xml.h:16 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "Conmuta cando se amosa o campo Tipo de participante"
-
-#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "Conmuta cando se amosa o campo RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "Conmuta cando se amosa o campo Rol"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "Conmuta cando se amosa o campo Estado"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "Conmuta cando se amosa o campo Fuso horario"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "Conmuta cando se amosan as categorías"
-
-#: ../ui/evolution-event-editor.xml.h:22
-msgid "Toggles whether to have All day Event"
-msgstr "Conmuta cando se ten un Evento para todo o día"
-
-#: ../ui/evolution-event-editor.xml.h:23
-msgid "Toggles whether to show time as busy"
-msgstr "Conmuta cando se deben amosar as horas como ocupadas"
-
-#: ../ui/evolution-event-editor.xml.h:24
-msgid "_Alarms"
-msgstr "_Alarmas"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "_All day Event"
-msgstr "Evento de día comp_leto"
-
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "_Clasificación"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "_Confidencial"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "_Privado"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Field"
-msgstr "Campo de e_stado"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:25
-msgid "_Type Field"
-msgstr "Campo _tipo"
-
 #: ../ui/evolution-executive-summary.xml.h:1
 msgid "Customize My Evolution"
 msgstr "Personalizar Meu Evolution"
@@ -18467,7 +17879,8 @@ msgstr "Mover o cartafol seleccionado a outro cartafol"
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-global.xml.h:13
 msgid "Permanently remove all deleted messages from all folders"
-msgstr "Eliminar tódalas mensaxes borradas en tódolos cartafoles de xeito permanente"
+msgstr ""
+"Eliminar tódalas mensaxes borradas en tódolos cartafoles de xeito permanente"
 
 #: ../ui/evolution-mail-global.xml.h:14
 msgid "Search F_olders"
@@ -18538,14 +17951,16 @@ msgid "Hide _Read Messages"
 msgstr "Agochar as Mensaxes _Lidas"
 
 #: ../ui/evolution-mail-list.xml.h:12
-msgid "Hide deleted messages rather than displaying them with a line through them"
-msgstr "Ocutar as mensaxes eliminadas no canto de amosalas cunha liña que as atravese"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
+"Ocutar as mensaxes eliminadas no canto de amosalas cunha liña que as atravese"
 
 #: ../ui/evolution-mail-list.xml.h:13
-msgid "Mar_k Messages as Read"
-msgstr "Marcar men_saxes como lidas"
+msgid "Mark Me_ssages as Read"
+msgstr "Marcar men_saxes como Lidas"
 
-#: ../ui/evolution-mail-list.xml.h:14 ../ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-mail-list.xml.h:14 ../ui/evolution-mail-message.xml.h:69
 msgid "Paste message(s) from the clipboard"
 msgstr "Pegar a(s) mensaxe(s) desde o portarretallos"
 
@@ -18567,7 +17982,8 @@ msgstr "Seleccionar _tódalas mensaxes"
 
 #: ../ui/evolution-mail-list.xml.h:19
 msgid "Select all and only the messages that are not currently selected"
-msgstr "Seleccionar todas e unicamente as mensaxes non seleccionadas actualmente"
+msgstr ""
+"Seleccionar todas e unicamente as mensaxes non seleccionadas actualmente"
 
 #: ../ui/evolution-mail-list.xml.h:20
 msgid "Select all messages in the same thread as the selected message"
@@ -18597,7 +18013,7 @@ msgstr "Agochar temporalmente as mensaxes seleccionadas"
 msgid "Threaded Message list"
 msgstr "Lista de Mensaxes por Fíos"
 
-#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:113
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Mensaxe"
@@ -18633,7 +18049,8 @@ msgstr "Redactar unha _Nova Mensaxe"
 
 #: ../ui/evolution-mail-message.xml.h:9
 msgid "Compose a reply to all of the recipients of the selected message"
-msgstr "Redactar unha resposta para tódolos destinatarios da mensaxe seleccionada"
+msgstr ""
+"Redactar unha resposta para tódolos destinatarios da mensaxe seleccionada"
 
 #: ../ui/evolution-mail-message.xml.h:10
 msgid "Compose a reply to the mailing list of the selected message"
@@ -18716,317 +18133,312 @@ msgid "Display the previous unread message"
 msgstr "Amosar a anterior mensaxe sen ler"
 
 #: ../ui/evolution-mail-message.xml.h:34
-msgid "F_orward As..."
-msgstr "_Remitir como..."
-
-#: ../ui/evolution-mail-message.xml.h:35
 msgid "Filter on Mailing _List..."
 msgstr "Filtrar pola _Lista de Correo..."
 
-#: ../ui/evolution-mail-message.xml.h:36
+#: ../ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
 msgstr "Filtrar polo A_utor..."
 
-#: ../ui/evolution-mail-message.xml.h:37
+#: ../ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
 msgstr "Filtrar polos _Destinatarios..."
 
-#: ../ui/evolution-mail-message.xml.h:38
+#: ../ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
 msgstr "Filtrar polo A_sunto..."
 
-#: ../ui/evolution-mail-message.xml.h:39
+#: ../ui/evolution-mail-message.xml.h:38
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrar as mensaxes seleccionadas polo estado de spam"
 
-#: ../ui/evolution-mail-message.xml.h:40
+#: ../ui/evolution-mail-message.xml.h:39
 msgid "Flag selected message(s) for follow-up"
 msgstr "Marca-la(s) mensaxe(s) seleccionada(s) para seguemento"
 
-#: ../ui/evolution-mail-message.xml.h:41
+#: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
 msgstr "Se_guemento..."
 
-#: ../ui/evolution-mail-message.xml.h:42
+#: ../ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
 msgstr "Forzar a carga das imaxes nas mensaxes HTML"
 
-#: ../ui/evolution-mail-message.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr "Remiti-lo correo seleccionado no corpo dunha nova mensaxe"
 
-#: ../ui/evolution-mail-message.xml.h:45
+#: ../ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr "Remiti-lo correo seleccionado citado coma unha resposta"
 
-#: ../ui/evolution-mail-message.xml.h:46
+#: ../ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr "Remiti-lo correo seleccionado a alguén"
 
-#: ../ui/evolution-mail-message.xml.h:47
+#: ../ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Remiti-lo correo seleccionado a alguén coma un anexo"
 
-#: ../ui/evolution-mail-message.xml.h:48
+#: ../ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr "Incrementar o tamaño do texto"
 
-#: ../ui/evolution-mail-message.xml.h:50
+#: ../ui/evolution-mail-message.xml.h:49
 msgid "Mar_k as"
 msgstr "Mar_car como"
 
-#: ../ui/evolution-mail-message.xml.h:51
+#: ../ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as having been read"
 msgstr "Marcar a(s) mensaxe(s) seleccionada(s) como se foran lidas"
 
-#: ../ui/evolution-mail-message.xml.h:52
+#: ../ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected message(s) as important"
 msgstr "Marcar a(s) mensaxe(s) seleccionada(s) coma importante"
 
-#: ../ui/evolution-mail-message.xml.h:53
+#: ../ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected message(s) as junk"
 msgstr "Marcar a(s) mensaxe(s) seleccionada(s) coma spam"
 
-#: ../ui/evolution-mail-message.xml.h:54
+#: ../ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected message(s) as not being junk"
 msgstr "Marcar a(s) mensaxe(s) seleccionada(s) coma non spam"
 
-#: ../ui/evolution-mail-message.xml.h:55
+#: ../ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Marcar a(s) mensaxe(s) seleccionada(s) como se non foran lidas"
 
-#: ../ui/evolution-mail-message.xml.h:56
+#: ../ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Marcar a(s) mensaxe(s) seleccionada(s) coma non importantes"
 
-#: ../ui/evolution-mail-message.xml.h:57
+#: ../ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar as mensaxes seleccionadas para borralas"
 
-#: ../ui/evolution-mail-message.xml.h:58
+#: ../ui/evolution-mail-message.xml.h:57
 msgid "Message Source"
 msgstr "Mensaxe en bruto"
 
-#: ../ui/evolution-mail-message.xml.h:59
+#: ../ui/evolution-mail-message.xml.h:58
 msgid "Move"
 msgstr "Mover"
 
-#: ../ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-mail-message.xml.h:59
 msgid "Move selected message(s) to another folder"
 msgstr "Mover a(s) mensaxe(s) seleccionada(s) a outro cartafol"
 
-#: ../ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Important Message"
 msgstr "Seguinte Mensaxe _Importante"
 
-#: ../ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:62
 msgid "Next _Thread"
 msgstr "Seguinte _Fío"
 
-#: ../ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:63
 msgid "Next _Unread Message"
 msgstr "Seguinte Mensaxe _Sen Ler"
 
-#: ../ui/evolution-mail-message.xml.h:65
+#: ../ui/evolution-mail-message.xml.h:64
 msgid "Not Junk"
 msgstr "Non é spam"
 
-#: ../ui/evolution-mail-message.xml.h:66
+#: ../ui/evolution-mail-message.xml.h:65
 msgid "Open a window for composing a mail message"
 msgstr "Abrir unha fiestra para compoñer unha mensaxe de correo"
 
-#: ../ui/evolution-mail-message.xml.h:67
+#: ../ui/evolution-mail-message.xml.h:66
 msgid "Open the selected message in a new window"
 msgstr "Abrir a mensaxe seleccionada nunha nova fiestra"
 
-#: ../ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-message.xml.h:67
 msgid "Open the selected message in the composer for editing"
 msgstr "Abri-la mensaxe seleccionada no compositor para editala"
 
-#: ../ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-message.xml.h:68
 msgid "P_revious Unread Message"
 msgstr "_Anterior Mensaxe Sen Ler"
 
-#: ../ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:70
 msgid "Pos_t New Message to Folder"
 msgstr "_Publicar unha mensaxe nova no cartafol"
 
-#: ../ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-mail-message.xml.h:71
 msgid "Post a Repl_y"
 msgstr "Publicar unha _resposta"
 
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:72
 msgid "Post a message to a Public folder"
 msgstr "Publicar unha mensaxe nun cartafol público"
 
-#: ../ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Post a reply to a message in a Public folder"
 msgstr "Publicar unha resposta a unha mensaxe nun cartafol público"
 
-#: ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-mail-message.xml.h:74
 msgid "Pr_evious Important Message"
 msgstr "_Anterior Mensaxe Importante"
 
-#: ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-mail-message.xml.h:75
 msgid "Preview the message to be printed"
 msgstr "Previsualizar a mensaxe que se vai imprimir"
 
-#: ../ui/evolution-mail-message.xml.h:80
+#: ../ui/evolution-mail-message.xml.h:79
 msgid "Print this message"
 msgstr "Imprimir esta mensaxe"
 
-#: ../ui/evolution-mail-message.xml.h:81
+#: ../ui/evolution-mail-message.xml.h:80
 msgid "Re_direct"
 msgstr "Re_dirixir"
 
-#: ../ui/evolution-mail-message.xml.h:82
+#: ../ui/evolution-mail-message.xml.h:81
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redirixir (rebotar) a mensaxe seleccionada a alguén"
 
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:85
 msgid "Reset the text to its original size"
 msgstr "Restablecer o texto a seu tamaño orixinal"
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Save the message as a text file"
 msgstr "Gardar a mensaxe coma un ficheiro de texto"
 
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Search Folder from Mailing _List..."
 msgstr "Cartafol de busca da _lista de correo..."
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Search Folder from Recipients..."
 msgstr "Cartafol de busca dos destinatarios..."
 
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:89
 msgid "Search Folder from S_ubject..."
 msgstr "Cartafol de busca según o as_unto..."
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Search Folder from Sen_der..."
 msgstr "Cartafol de busca según o _remitente..."
 
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Buscar texto no corpo da mensaxe amosada"
 
-#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Select _All Text"
 msgstr "Seleccionar _todo o texto"
 
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Select all the text in a message"
 msgstr "Seleccionar todo o texto dunha mensaxe"
 
-#: ../ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Set up the page settings for your current printer"
 msgstr "Establecer a configuración da páxina para a impresora actual"
 
-#: ../ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Amosa un cursor palpabrexante no corpo das mensaxes amosadas"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Amosa-la mensaxe no estilo normal"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Amosa-la mensaxe con tódalas cabeceiras"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Amosa-lo código fonte sen procesar da mensaxe"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Un-delete the selected messages"
 msgstr "Recuperar as mensaxes seleccionadas"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "Uni_mportant"
 msgstr "Non i_mportante"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "Zoom _Out"
 msgstr "_Reducir"
 
-#: ../ui/evolution-mail-message.xml.h:103
-msgid "_Attached"
-msgstr "_Anexar"
-
-#: ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Caret Mode"
 msgstr "Activar _cursor"
 
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "_Borrar mensaxe"
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
 msgstr "_Buscar na Mensaxe..."
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Go To"
 msgstr "_Ir A"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Important"
 msgstr "_Importante"
 
-#: ../ui/evolution-mail-message.xml.h:113
-msgid "_Inline"
-msgstr "_En liña"
-
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Junk"
 msgstr "_Spam"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Load Images"
 msgstr "_Cargar Imaxes"
 
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Next Message"
 msgstr "_Seguinte Mensaxe"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Normal Size"
 msgstr "Tamaño _normal"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Not Junk"
 msgstr "_Non é spam"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Open in New Window"
 msgstr "_Abrir nunha Nova Fiestra"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Previous Message"
 msgstr "_Anterior Mensaxe"
 
-#: ../ui/evolution-mail-message.xml.h:124
-msgid "_Quoted"
-msgstr "_Citado"
-
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:123
 msgid "_Save Message..."
 msgstr "_Gardar Mensaxe..."
 
-#: ../ui/evolution-mail-message.xml.h:128
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Undelete Message"
 msgstr "_Recuperar a mensaxe"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:125
 msgid "_Unread"
 msgstr "_Non lida"
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Zoom In"
 msgstr "_Ampliar"
 
+#.
+#. <cmd name="FileSave" _label="Save"
+#. _tip="Save the current file" pixtype="stock" pixname="Save"
+#. accel="*Ctrl*s"/>
+#.
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+#: ../ui/evolution-message-composer.xml.h:4
+#: ../ui/evolution-signature-editor.xml.h:7
+msgid "Close"
+msgstr "Pechar"
+
 #: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Pechar esta fiestra"
@@ -19035,37 +18447,17 @@ msgstr "Pechar esta fiestra"
 msgid "Main toolbar"
 msgstr "Barra de ferramentas principal"
 
-#: ../ui/evolution-memos.xml.h:3
-msgid "Copy selected memo"
-msgstr "Copia-la nota seleccionada"
-
-#: ../ui/evolution-memos.xml.h:5
-msgid "Cut selected memo"
-msgstr "Corta-la nota seleccionada"
-
-#: ../ui/evolution-memos.xml.h:7
-msgid "Delete selected memos"
-msgstr "Borrar as notas seleccionadas"
-
-#: ../ui/evolution-memos.xml.h:9
-msgid "Paste memo from the clipboard"
-msgstr "Pegar nota desde o portarretallos"
-
-#: ../ui/evolution-memos.xml.h:10
-msgid "Previews the list of memos to be printed"
-msgstr "Previsualiza a lista de notas a imprimir"
-
-#: ../ui/evolution-memos.xml.h:13
-msgid "Print the list of memos"
-msgstr "Imprimir a lista de notas"
-
-#: ../ui/evolution-memos.xml.h:14
-msgid "View the selected memo"
-msgstr "Ver a nota seleccionada"
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:42 ../ui/evolution-subscribe.xml.h:9
+msgid "_Close"
+msgstr "_Pechar"
 
-#: ../ui/evolution-memos.xml.h:18
-msgid "_Open Memo"
-msgstr "_Abrir nota"
+#: ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:45
+#: ../ui/evolution-signature-editor.xml.h:24
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:36
+msgid "_File"
+msgstr "_Ficheiro"
 
 #: ../ui/evolution-message-composer.xml.h:1
 msgid "Attach"
@@ -19077,7 +18469,8 @@ msgstr "Anexar un ficheiro"
 
 #: ../ui/evolution-message-composer.xml.h:3
 msgid "Check to get delivery notification when your message is read"
-msgstr "Marcar para obter unha notificación de entrega cando se lea a súa mensaxe"
+msgstr ""
+"Marcar para obter unha notificación de entrega cando se lea a súa mensaxe"
 
 #.
 #. <cmd name="FileSave" _label="Save"
@@ -19231,6 +18624,11 @@ msgstr "_Borrar todo"
 msgid "_From Field"
 msgstr "Campo _Desde"
 
+#: ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-signature-editor.xml.h:25
+msgid "_Insert"
+msgstr "_Inserir"
+
 #: ../ui/evolution-message-composer.xml.h:48
 msgid "_Open..."
 msgstr "_Abrir..."
@@ -19302,22 +18700,6 @@ msgstr "Desubscribir"
 msgid "_Invert Selection"
 msgstr "_Inverter Selección"
 
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "Prema para cambiar/ ver os detalles do estado da tarefa"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Status Details"
-msgstr "Detalles do estado"
-
-#: ../ui/evolution-task-editor.xml.h:11
-msgid "Time Zone"
-msgstr "Fuso horario"
-
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Status Details"
-msgstr "Detalles do e_stado"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Copia-la tarefa seleccionada"
@@ -19355,18 +18737,10 @@ msgid "Print the list of tasks"
 msgstr "Imprimir a lista de tarefas"
 
 #: ../ui/evolution-tasks.xml.h:18
-msgid "Show task preview window"
-msgstr "Amosar fiestra de previsualización de tarefas"
-
-#: ../ui/evolution-tasks.xml.h:19
-msgid "Task _Preview"
-msgstr "_Previsualizar tarefa"
-
-#: ../ui/evolution-tasks.xml.h:20
 msgid "View the selected task"
 msgstr "Ver a tarefa seleccionada"
 
-#: ../ui/evolution-tasks.xml.h:27
+#: ../ui/evolution-tasks.xml.h:25
 msgid "_Open Task"
 msgstr "_Abrir tarefa"
 
@@ -19481,58 +18855,58 @@ msgid "Tool_bar style"
 msgstr "Estilo da _barra de ferramentas"
 
 #: ../ui/evolution.xml.h:33
-msgid "View/Hide the Status Bar"
-msgstr "Ver/Agochar a barra de estado"
-
-#: ../ui/evolution.xml.h:34
 msgid "_About Evolution..."
 msgstr "_Acerca de Evolution..."
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:34
 msgid "_Close Window"
 msgstr "_Pechar fiestra"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:37
+msgid "_Help"
+msgstr "A_xuda"
+
+#: ../ui/evolution.xml.h:38
 msgid "_Hide buttons"
 msgstr "_Agochar botóns"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:39
 msgid "_Icons only"
 msgstr "Só _iconas"
 
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:40
 msgid "_Import..."
 msgstr "_Importar"
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:41
 msgid "_New"
 msgstr "_Novo"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:42
 msgid "_Quick Reference"
 msgstr "_Referencia rápida"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:43
+msgid "_Quit"
+msgstr "_Saír"
+
+#: ../ui/evolution.xml.h:44
 msgid "_Send / Receive"
 msgstr "_Enviar / Recibir"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:45
 msgid "_Switcher Appearance"
 msgstr "Aparencia do _conmutador"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:46
 msgid "_Synchronization Options..."
 msgstr "Opcións de _sincronización..."
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:47
 msgid "_Text only"
 msgstr "Só _texto"
 
-#: ../ui/evolution.xml.h:50
-msgid "_View Status Bar"
-msgstr "_Ver barra de estado"
-
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:49
 msgid "_Window"
 msgstr "_Fiestra"
 
@@ -19592,10 +18966,6 @@ msgstr "Por marca de _seguemento"
 msgid "_Messages"
 msgstr "_Mensaxes"
 
-#: ../views/memos/galview.xml.h:1
-msgid "_Memos"
-msgstr "_Notas"
-
 #: ../views/tasks/galview.xml.h:1
 msgid "With _Due Date"
 msgstr "Con _Data Límite"
@@ -19683,20 +19053,9 @@ msgstr "_Crear vista nova"
 msgid "_Replace existing view"
 msgstr "_Reemprazar vista existente"
 
-#. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:585
-#: ../widgets/menus/gal-view-menus.c:350
-msgid "Custom View"
-msgstr "Vista personalizada"
-
-#: ../widgets/menus/gal-view-instance.c:586
-msgid "Save Custom View"
-msgstr "Gardar vista personalizada"
-
-#: ../widgets/menus/gal-view-instance.c:590
-#: ../widgets/menus/gal-view-menus.c:372
-msgid "Define Views..."
-msgstr "Definir Vistas..."
+#: ../widgets/menus/gal-view-menus.c:291
+msgid "_Current View"
+msgstr "_Vista Actual"
 
 #: ../widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View..."
@@ -19805,11 +19164,11 @@ msgstr "Ancho mínimo"
 msgid "Spacing"
 msgstr "Espaciado"
 
-#: ../widgets/misc/e-cell-date-edit.c:233 ../widgets/misc/e-dateedit.c:460
+#: ../widgets/misc/e-cell-date-edit.c:232 ../widgets/misc/e-dateedit.c:451
 msgid "Now"
 msgstr "Agora"
 
-#: ../widgets/misc/e-cell-date-edit.c:802
+#: ../widgets/misc/e-cell-date-edit.c:801
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "A data ten que ser introducida no formato: %s"
@@ -19906,31 +19265,31 @@ msgstr "Outro..."
 msgid "..."
 msgstr "..."
 
-#: ../widgets/misc/e-dateedit.c:320
+#: ../widgets/misc/e-dateedit.c:316
 msgid "Date and Time Entry"
 msgstr "Entrada para a Data e Hora"
 
-#: ../widgets/misc/e-dateedit.c:339
+#: ../widgets/misc/e-dateedit.c:335
 msgid "Text entry to input date"
 msgstr "Entrada de texto para introducir a data"
 
-#: ../widgets/misc/e-dateedit.c:340
+#: ../widgets/misc/e-dateedit.c:336
 msgid "Text Date Entry"
 msgstr "Entrada de texto para a data"
 
-#: ../widgets/misc/e-dateedit.c:361
+#: ../widgets/misc/e-dateedit.c:353
 msgid "Click this button to show a calendar"
 msgstr "Prema este botón para amosar un calendario"
 
-#: ../widgets/misc/e-dateedit.c:362
+#: ../widgets/misc/e-dateedit.c:354
 msgid "Date Button"
 msgstr "Botón de data"
 
-#: ../widgets/misc/e-dateedit.c:383
+#: ../widgets/misc/e-dateedit.c:374
 msgid "Combo box to select time"
 msgstr "Caixa combo para seleccionar a hora"
 
-#: ../widgets/misc/e-dateedit.c:384
+#: ../widgets/misc/e-dateedit.c:375
 msgid "Time Combo Box"
 msgstr "Caixa combo da hora"
 
@@ -20054,41 +19413,41 @@ msgstr "Anchura de columna"
 
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:346
+#: ../widgets/misc/e-search-bar.c:345
 msgid "Search Text Entry"
 msgstr "Entrada de busca de texto"
 
-#: ../widgets/misc/e-search-bar.c:550
+#: ../widgets/misc/e-search-bar.c:549
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../widgets/misc/e-search-bar.c:556
+#: ../widgets/misc/e-search-bar.c:555
 msgid "_Find Now"
 msgstr "_Buscar Agora"
 
-#: ../widgets/misc/e-search-bar.c:557 ../widgets/misc/e-search-bar.c:944
+#: ../widgets/misc/e-search-bar.c:556 ../widgets/misc/e-search-bar.c:943
 msgid "_Clear"
 msgstr "_Limpar"
 
-#: ../widgets/misc/e-search-bar.c:648
+#: ../widgets/misc/e-search-bar.c:647
 msgid "Search Type"
 msgstr "Tipo de busca"
 
-#: ../widgets/misc/e-search-bar.c:852
+#: ../widgets/misc/e-search-bar.c:851
 msgid "Item ID"
 msgstr "ID de elemento"
 
-#: ../widgets/misc/e-search-bar.c:859
+#: ../widgets/misc/e-search-bar.c:858
 msgid "Subitem ID"
 msgstr "ID de subelemento"
 
-#: ../widgets/misc/e-search-bar.c:866 ../widgets/text/e-entry.c:1249
+#: ../widgets/misc/e-search-bar.c:865 ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3462
 #: ../widgets/text/e-text.c:3463
 msgid "Text"
 msgstr "Texto"
 
-#: ../widgets/misc/e-search-bar.c:946
+#: ../widgets/misc/e-search-bar.c:945
 msgid "Find _Now"
 msgstr "Buscar _Agora"
 
@@ -20793,3 +20152,9 @@ msgstr "Contexto MI"
 msgid "Handle Popup"
 msgstr "Tirador emerxente"
 
+#~ msgid ""
+#~ "The suggested filename extension of this filetype (%s) is unused in the "
+#~ "chosen filename. Do you want to continue?"
+#~ msgstr ""
+#~ "A extensión do nome de ficheiro suxerida deste tipo de ficheiro (%s) non "
+#~ "está usada no nome de ficheiro escollido. Quere continuar?"
diff --git a/po/hu.po b/po/hu.po
index 23ef73fe7c..bcfbe12e98 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution.gnome-2-10.hu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-11 17:30+0200\n"
-"PO-Revision-Date: 2005-08-23 20:53+0200\n"
+"POT-Creation-Date: 2005-09-26 04:57+0200\n"
+"PO-Revision-Date: 2005-09-26 13:40+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <gnome@gnome.hu>\n"
 "MIME-Version: 1.0\n"
@@ -395,8 +395,7 @@ msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Az Evolution címjegyzékkezelő váratlanul kilépett."
 
 #: ../addressbook/addressbook.error.xml.h:16
-msgid ""
-"The image you have selected is large. Do you want to resize and store it?"
+msgid "The image you have selected is large. Do you want to resize and store it?"
 msgstr "A kiválasztott kép túl nagy. Szeretné átméretezni és tárolni?"
 
 #: ../addressbook/addressbook.error.xml.h:17
@@ -479,8 +478,7 @@ msgstr ""
 "változtatásokat?"
 
 #: ../addressbook/addressbook.error.xml.h:30
-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 ""
 "A névjegyei a következőhöz: {0} nem lesznek elérhetők az Evolution "
 "újraindításáig."
@@ -783,12 +781,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Csatlakozás az LDAP-kiszolgálóhoz névtelenül"
 
 #: ../addressbook/gui/component/addressbook.c:191
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:485
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:490
 msgid "Failed to authenticate.\n"
 msgstr "Sikertelen hitelesítés.\n"
 
 #: ../addressbook/gui/component/addressbook.c:198
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:464
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:469
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Adja meg %s jelszavát (%s felhasználó)"
@@ -938,10 +936,8 @@ msgid "Email address"
 msgstr "E-mail cím"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
-msgid ""
-"Evolution will use this email address to authenticate you with the server."
-msgstr ""
-"Az Evolution ezt az e-mail címet használja majd hitelesítéshez a kiszolgálón."
+msgid "Evolution will use this email address to authenticate you with the server."
+msgstr "Az Evolution ezt az e-mail címet használja majd hitelesítéshez a kiszolgálón."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 msgid "Find Possible Search Bases"
@@ -1009,7 +1005,7 @@ msgid ""
 "searches will begin. If you leave this blank, the search will begin at the "
 "root of the directory tree."
 msgstr ""
-"A keresési alap a bejegyzésnek az a megkülönböztető neve, ahol a keresés "
+"A keresési alap a bejegyzésnek az a megkülönböztetett neve, ahol a keresés "
 "kezdődik majd. Amennyiben üresen hagyja, a keresés a gyökérkönyvtárban fog "
 "kezdődni."
 
@@ -1070,7 +1066,7 @@ msgstr ""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid "Using distinguished name (DN)"
-msgstr "Megkülönböztető névvel (DN)"
+msgstr "Megkülönböztetett névvel (DN)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid "Using email address"
@@ -2610,8 +2606,8 @@ msgstr "_IM szolgáltatás:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:215
-#: ../plugins/exchange-operations/exchange-contacts.c:193
+#: ../plugins/exchange-operations/exchange-calendar.c:224
+#: ../plugins/exchange-operations/exchange-contacts.c:203
 msgid "_Location:"
 msgstr "He_ly:"
 
@@ -2654,8 +2650,7 @@ msgstr "_Kijelölés"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr ""
-"Í_rjon be egy e-mail címet, vagy húzzon egy névjegyet az alábbi listába:"
+msgstr "Í_rjon be egy e-mail címet, vagy húzzon egy névjegyet az alábbi listába:"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
@@ -3405,8 +3400,7 @@ msgstr ""
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:157
 msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-"A háttér ehhez a címjegyzékhez alkalmatlan volt a lekérdezés elemzéséhez."
+msgstr "A háttér ehhez a címjegyzékhez alkalmatlan volt a lekérdezés elemzéséhez."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:160
 msgid "The backend for this addressbook refused to perform this query."
@@ -3767,9 +3761,9 @@ msgstr "Árnyalás"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:917
-#: ../plugins/exchange-operations/exchange-calendar.c:205
-#: ../plugins/exchange-operations/exchange-contacts.c:176
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
+#: ../plugins/exchange-operations/exchange-calendar.c:214
+#: ../plugins/exchange-operations/exchange-contacts.c:186
 msgid "Size:"
 msgstr "Méret:"
 
@@ -3858,8 +3852,7 @@ msgid "Export in asynchronous mode"
 msgstr "Exportálás aszinkron módban"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode, default size 100."
+msgid "The number of cards in one output file in asychronous mode, default size 100."
 msgstr ""
 "A kártyák száma egy kimeneti fájlban aszinkron módban, az alapértelmezett "
 "méret 100."
@@ -3869,8 +3862,7 @@ msgid "NUMBER"
 msgstr "NUMBER"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
+msgid "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Hiba a parancssori argumentumok feldolgozásakor, kérem indítsa --help "
 "paraméterrel a használat megjelenítéséhez."
@@ -3944,8 +3936,7 @@ msgstr ""
 "kerül."
 
 #: ../calendar/calendar.error.xml.h:6
-msgid ""
-"All information in this journal will be deleted and can not be restored."
+msgid "All information in this journal will be deleted and can not be restored."
 msgstr ""
 "Erről a naplóbejegyzésről minden információ visszavonhatatlanul törlésre "
 "kerül."
@@ -3954,19 +3945,15 @@ msgstr ""
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
-msgstr ""
-"Ezekről a találkozókról minden információ visszavonhatatlanul törlésre kerül."
+msgstr "Ezekről a találkozókról minden információ visszavonhatatlanul törlésre kerül."
 
 #: ../calendar/calendar.error.xml.h:8
 msgid "All information on these tasks will be deleted and can not be restored."
-msgstr ""
-"Ezekről a feladatokról minden információ visszavonhatatlanul törlésre kerül."
+msgstr "Ezekről a feladatokról minden információ visszavonhatatlanul törlésre kerül."
 
 #: ../calendar/calendar.error.xml.h:9
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
-msgstr ""
-"Erről a találkozóról minden információ visszavonhatatlanul törlésre kerül."
+msgid "All information on this appointment will be deleted and can not be restored."
+msgstr "Erről a találkozóról minden információ visszavonhatatlanul törlésre kerül."
 
 #: ../calendar/calendar.error.xml.h:10
 msgid ""
@@ -3977,15 +3964,12 @@ msgstr ""
 "kerül."
 
 #: ../calendar/calendar.error.xml.h:11
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
-msgstr ""
-"Erről a találkozóról minden információ visszavonhatatlanul törlésre kerül."
+msgid "All information on this meeting will be deleted and can not be restored."
+msgstr "Erről a találkozóról minden információ visszavonhatatlanul törlésre kerül."
 
 #: ../calendar/calendar.error.xml.h:12
 msgid "All information on this task will be deleted and can not be restored."
-msgstr ""
-"Erről a feladatról minden információ visszavonhatatlanul törlésre kerül."
+msgstr "Erről a feladatról minden információ visszavonhatatlanul törlésre kerül."
 
 #: ../calendar/calendar.error.xml.h:13
 msgid "Are you sure you want to delete the '{0}' task?"
@@ -4064,8 +4048,7 @@ msgid "Editor could not be loaded."
 msgstr "A szerkesztő nem tölthető be."
 
 #: ../calendar/calendar.error.xml.h:32
-msgid ""
-"Email invitations will be sent to all participants and allow them to RSVP."
+msgid "Email invitations will be sent to all participants and allow them to RSVP."
 msgstr ""
 "Minden résztvevőnek meghívó lesz küldve és jelezhetik részvételi szándékukat "
 "(RSVP)."
@@ -4074,8 +4057,7 @@ msgstr ""
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
-msgstr ""
-"Minden résztvevőnek meghívó lesz küldve, így elfogadhatják ezt a feladatot."
+msgstr "Minden résztvevőnek meghívó lesz küldve, így elfogadhatják ezt a feladatot."
 
 #: ../calendar/calendar.error.xml.h:34
 msgid "Error loading calendar"
@@ -4190,8 +4172,7 @@ msgstr "El szeretné küldeni ezt a feladatot a résztvevőknek?"
 
 #: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to send updated meeting information to participants?"
-msgstr ""
-"Szeretné elküldeni a találkozó frissített információit a résztvevőknek?"
+msgstr "Szeretné elküldeni a találkozó frissített információit a résztvevőknek?"
 
 #: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send updated task information to participants?"
@@ -4207,8 +4188,7 @@ msgstr "Változtatott ezen a feladaton, de még nem mentette."
 
 #: ../calendar/calendar.error.xml.h:62
 msgid "Your calendars will not be available until Evolution is restarted."
-msgstr ""
-"A naptárbejegyzések nem lesznek elérhetőek az Evolution újraindításáig."
+msgstr "A naptárbejegyzések nem lesznek elérhetőek az Evolution újraindításáig."
 
 #: ../calendar/calendar.error.xml.h:63
 msgid "Your tasks will not be available until Evolution is restarted."
@@ -4302,7 +4282,7 @@ msgstr "Evolution Feladatok rendszerkomponens"
 #: ../calendar/importers/icalendar-importer.c:79
 #: ../calendar/importers/icalendar-importer.c:707
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:582
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:589
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Feladatok"
@@ -4487,8 +4467,7 @@ msgid "Calendars to run alarms for"
 msgstr "Naptárak, amelyekhez a figyelmeztetőt futtatni kell"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.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 ""
 "A Marcus Bains vonal megrajzolása ezzel a színnel az Idő sávban (hagyja "
 "üresen az alapértelmezett színhez)."
@@ -4709,8 +4688,7 @@ msgstr ""
 "\"minutes\" (perc), \"hours\" (óra) vagy \"days\" (nap)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
-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 ""
 "A feladatok elrejtésének meghatározásához használt időegység, lehetséges "
 "értékek: \"minutes\" (perc), \"hours\" (óra) vagy \"days\" (nap)."
@@ -4748,8 +4726,7 @@ msgid "Whether to display the end time of events in the week and month views."
 msgstr "Események végének megjelenítése a heti és a hónapnézetekben."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
-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 ""
 "Megrajzolja-e a Marcus Bains vonalat (a jelenlegi időnél meghúzott vonal) a "
 "naptárban?"
@@ -4763,8 +4740,7 @@ msgid "Whether to set a default reminder for appointments."
 msgstr "Alapértelmezett figyelmeztetés beállítása a találkozókhoz ki/be."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
-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 "Időpontok megjelenítése 24 órás formátumban 12 órás helyett."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
@@ -4817,7 +4793,7 @@ msgstr "Ki nem válogatott"
 #: ../calendar/gui/gnome-cal.c:2094
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:581
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:588
 msgid "Calendar"
 msgstr "Naptár"
 
@@ -5126,7 +5102,7 @@ msgstr "E_ltávolítás"
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:474
 #: ../calendar/gui/dialogs/comp-editor.c:1084
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3401 ../mail/em-folder-tree.c:2047
+#: ../composer/e-msg-composer.c:3401 ../mail/em-folder-tree.c:2052
 #: ../ui/evolution-mail-list.xml.h:29
 msgid "_Properties"
 msgstr "T_ulajdonságok"
@@ -5294,8 +5270,7 @@ msgstr "<b>Munkahét</b>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #, 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 és %d a felhasználónévvel és a tartománnyal lesznek helyettesítve az e-"
 "mail címből.</i>"
@@ -5505,8 +5480,7 @@ msgstr "A mappa tartalmáról helyi másolat készítése kapcsolat nélküli mu
 
 #: ../calendar/gui/dialogs/calendar-setup.c:290
 msgid "Copy task list contents locally for offline operation"
-msgstr ""
-"A feladatlista elemeiről helyi másolat készítése kapcsolat nélküli munkához"
+msgstr "A feladatlista elemeiről helyi másolat készítése kapcsolat nélküli munkához"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:341
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
@@ -5654,7 +5628,7 @@ msgstr[1] "%d mellékelt üzenet"
 #: ../calendar/gui/dialogs/comp-editor.c:428
 #: ../calendar/gui/e-calendar-table.c:1162
 #: ../calendar/gui/e-calendar-view.c:1535 ../composer/e-msg-composer.c:2911
-#: ../mail/em-folder-tree.c:974 ../mail/em-folder-view.c:1035
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1035
 #: ../mail/message-list.c:1708 ../ui/evolution-addressbook.xml.h:31
 #: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
 #: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-tasks.xml.h:21
@@ -5662,13 +5636,13 @@ msgid "_Copy"
 msgstr "_Másolás"
 
 #: ../calendar/gui/dialogs/comp-editor.c:429 ../composer/e-msg-composer.c:2912
-#: ../mail/em-folder-tree.c:975 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
 #: ../mail/em-folder-view.c:931 ../mail/message-list.c:1709
 msgid "_Move"
 msgstr "Á_thelyezés"
 
 #: ../calendar/gui/dialogs/comp-editor.c:431 ../composer/e-msg-composer.c:2914
-#: ../mail/em-folder-tree.c:977 ../mail/message-list.c:1711
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1711
 msgid "Cancel _Drag"
 msgstr "_Mégsem mozgatom"
 
@@ -5777,8 +5751,7 @@ msgstr "A feladatot nem lehet törölni, mert a hozzáférés meg lett tagadva"
 
 #: ../calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
-msgstr ""
-"A naplóbejegyzést nem lehet törölni, mert a hozzáférés meg lett tagadva"
+msgstr "A naplóbejegyzést nem lehet törölni, mert a hozzáférés meg lett tagadva"
 
 #: ../calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
@@ -6176,8 +6149,7 @@ msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Egy ismétlődő feladatot módosít, mit szeretne módosítani?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:62
-msgid ""
-"You are modifying a recurring journal entry, what would you like to modify?"
+msgid "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr "Egy ismétlődő naplóbejegyzést módosít, mit szeretne módosítani?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:90
@@ -6578,7 +6550,7 @@ msgstr "Lejárat:"
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:222
 #: ../calendar/gui/e-itip-control.c:1134
-#: ../plugins/exchange-operations/exchange-account-setup.c:263
+#: ../plugins/exchange-operations/exchange-account-setup.c:265
 #: ../plugins/itip-formatter/itip-view.c:909
 msgid "Status:"
 msgstr "Állapot:"
@@ -6778,7 +6750,7 @@ msgstr "_Kijelölt feladatok megjelölése készként"
 
 #. FIXME: need to disable for undeletable folders
 #: ../calendar/gui/e-calendar-table.c:1174
-#: ../calendar/gui/e-calendar-view.c:1548 ../mail/em-folder-tree.c:2043
+#: ../calendar/gui/e-calendar-view.c:1548 ../mail/em-folder-tree.c:2048
 #: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:33
 #: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
 #: ../ui/evolution-tasks.xml.h:22
@@ -7085,8 +7057,7 @@ msgid ""
 msgstr "A találkozó le lett mondva, mégsem található a naptáraiban"
 
 #: ../calendar/gui/e-itip-control.c:1233
-msgid ""
-"The task has been cancelled, however it could not be found in your task lists"
+msgid "The task has been cancelled, however it could not be found in your task lists"
 msgstr "A feladat meg lett szakítva, mégsem található a feladatlistáiban"
 
 #: ../calendar/gui/e-itip-control.c:1312
@@ -7280,13 +7251,11 @@ msgstr "Az objektum érvénytelen és nem lehet frissíteni\n"
 
 #: ../calendar/gui/e-itip-control.c:1949
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr ""
-"A válasz olyantól érkezett, aki nem résztvevő. Hozzáadja a résztvevőkhöz?"
+msgstr "A válasz olyantól érkezett, aki nem résztvevő. Hozzáadja a résztvevőkhöz?"
 
 #: ../calendar/gui/e-itip-control.c:1961
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr ""
-"A résztvevő állapotát nem lehetett frissíteni, mert az állapot érvénytelen!\n"
+msgstr "A résztvevő állapotát nem lehetett frissíteni, mert az állapot érvénytelen!\n"
 
 #: ../calendar/gui/e-itip-control.c:1978
 msgid "Attendee status updated\n"
@@ -7295,8 +7264,7 @@ msgstr "A résztvevő állapota frissítve\n"
 #: ../calendar/gui/e-itip-control.c:1981
 #: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-"A résztvevő állapotát nem lehetett frissíteni, mert az elem nem létezik többé"
+msgstr "A résztvevő állapotát nem lehetett frissíteni, mert az elem nem létezik többé"
 
 #: ../calendar/gui/e-itip-control.c:2011
 msgid "Removal Complete"
@@ -7774,8 +7742,7 @@ msgstr ""
 #. FIXME: set proper domain/code
 #: ../calendar/gui/migration.c:748 ../calendar/gui/migration.c:915
 msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr ""
-"Nem lehet átköltöztetni a régi beállításokat az evolution/config.xmldb-ből"
+msgstr "Nem lehet átköltöztetni a régi beállításokat az evolution/config.xmldb-ből"
 
 #. FIXME: domain/code
 #: ../calendar/gui/migration.c:777
@@ -8047,8 +8014,7 @@ msgstr "Feladatok frissítése sikertelen."
 #: ../calendar/gui/tasks-component.c:872
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr ""
-"%s feladatlista nem nyitható meg események és találkozók létrehozásához"
+msgstr "%s feladatlista nem nyitható meg események és találkozók létrehozásához"
 
 #: ../calendar/gui/tasks-component.c:887
 msgid "There is no calendar available for creating tasks"
@@ -9771,8 +9737,7 @@ msgid "A_ttach"
 msgstr "_Csatolás"
 
 #: ../composer/e-msg-composer.c:738
-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 ""
 "Nem lehet aláírni a kimenő üzenetet: Nincs beállítva tanúsítvány az "
 "aláíráshoz ehhez a postafiókhoz"
@@ -10129,8 +10094,7 @@ msgstr "Evolution kérdés"
 #. setup a dummy error
 #: ../e-util/e-error.c:438
 #, c-format
-msgid ""
-"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgid "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
 msgstr "<span weight=\"bold\">Belső hiba, %s ismeretlen hibakérelem</span>"
 
 #: ../e-util/e-system.error.xml.h:2
@@ -10517,8 +10481,7 @@ msgid "Composer Preferences"
 msgstr "Levélszerkesztő beállításai"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+msgid "Configure mail preferences, including security and message display, here"
 msgstr ""
 "Itt állíthatja be a levelezés tulajdonságait, beleértve a biztonsági és "
 "üzenet képernyőket is"
@@ -10622,30 +10585,30 @@ msgstr "Az új _levelek automatikus lekérdezése"
 msgid "Sending Email"
 msgstr "Levél küldése"
 
-#: ../mail/em-account-editor.c:2162 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2165 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Alapértékek"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:122
-#: ../plugins/exchange-operations/exchange-account-setup.c:311
+#: ../mail/em-account-editor.c:2226 ../mail/mail-config.glade.h:122
+#: ../plugins/exchange-operations/exchange-account-setup.c:313
 msgid "Security"
 msgstr "Biztonság"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2260 ../mail/em-account-editor.c:2334
+#: ../mail/em-account-editor.c:2263 ../mail/em-account-editor.c:2337
 msgid "Receiving Options"
 msgstr "Fogadás beállításai"
 
-#: ../mail/em-account-editor.c:2261 ../mail/em-account-editor.c:2335
+#: ../mail/em-account-editor.c:2264 ../mail/em-account-editor.c:2338
 msgid "Checking for New Mail"
 msgstr "Új levelek keresése"
 
-#: ../mail/em-account-editor.c:2659 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2675 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Postafiók-szerkesztő"
 
-#: ../mail/em-account-editor.c:2659 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2675 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolution Postafiók varázsló"
 
@@ -11028,76 +10991,76 @@ msgstr "Postázandó"
 msgid "Sent"
 msgstr "Elküldött"
 
-#: ../mail/em-folder-tree-model.c:498 ../mail/em-folder-tree-model.c:802
+#: ../mail/em-folder-tree-model.c:499 ../mail/em-folder-tree-model.c:803
 msgid "Loading..."
 msgstr "Betöltés..."
 
-#: ../mail/em-folder-tree.c:689
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "Levélmappa-fa"
 
-#: ../mail/em-folder-tree.c:849
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "%s mappa áthelyezése"
 
-#: ../mail/em-folder-tree.c:851
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "%s mappa másolása"
 
-#: ../mail/em-folder-tree.c:858 ../mail/message-list.c:1613
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1613
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Levelek áthelyezése a(z) %s mappába"
 
-#: ../mail/em-folder-tree.c:860 ../mail/message-list.c:1615
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1615
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Levelek másolása a(z) %s mappába"
 
-#: ../mail/em-folder-tree.c:876
+#: ../mail/em-folder-tree.c:881
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Nem lehet leveleket egy felsőszintű tárolóba helyezni"
 
-#: ../mail/em-folder-tree.c:972 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:104
 msgid "_Copy to Folder"
 msgstr "Másolás ma_ppába"
 
-#: ../mail/em-folder-tree.c:973 ../ui/evolution-mail-message.xml.h:114
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:114
 msgid "_Move to Folder"
 msgstr "Át_helyezés mappába"
 
-#: ../mail/em-folder-tree.c:1678 ../mail/mail-ops.c:1057
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Mappák pásztázása a következőn: \"%s\""
 
-#: ../mail/em-folder-tree.c:2031 ../ui/evolution-addressbook.xml.h:44
+#: ../mail/em-folder-tree.c:2036 ../ui/evolution-addressbook.xml.h:44
 #: ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:48
 msgid "_View"
 msgstr "_Nézet"
 
-#: ../mail/em-folder-tree.c:2032
+#: ../mail/em-folder-tree.c:2037
 msgid "Open in _New Window"
 msgstr "Megnyitás ú_j ablakban"
 
-#: ../mail/em-folder-tree.c:2036
+#: ../mail/em-folder-tree.c:2041
 msgid "_Copy..."
 msgstr "_Másolás..."
 
-#: ../mail/em-folder-tree.c:2037
+#: ../mail/em-folder-tree.c:2042
 msgid "_Move..."
 msgstr "Á_thelyezés..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2041
+#: ../mail/em-folder-tree.c:2046
 msgid "_New Folder..."
 msgstr "Új _mappa..."
 
-#: ../mail/em-folder-tree.c:2044 ../ui/evolution-mail-list.xml.h:30
+#: ../mail/em-folder-tree.c:2049 ../ui/evolution-mail-list.xml.h:30
 msgid "_Rename..."
 msgstr "Á_tnevezés..."
 
@@ -11298,8 +11261,7 @@ msgstr "Aláíratlan"
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
-msgstr ""
-"Az üzenetet nem írták alá digitálisan, így nincs garancia arra, hogy hiteles."
+msgstr "Az üzenetet nem írták alá digitálisan, így nincs garancia arra, hogy hiteles."
 
 #: ../mail/em-format-html-display.c:697 ../mail/em-format-html.c:598
 msgid "Valid signature"
@@ -11702,8 +11664,7 @@ msgstr "Megnyitás ezzel: %s..."
 
 #: ../mail/em-subscribe-editor.c:614
 msgid "This store does not support subscriptions, or they are not enabled."
-msgstr ""
-"Ez a tároló nem támogatja az előfizetéseket vagy azok nincsenek engedélyezve."
+msgstr "Ez a tároló nem támogatja az előfizetéseket vagy azok nincsenek engedélyezve."
 
 #: ../mail/em-subscribe-editor.c:643
 msgid "Subscribed"
@@ -12010,8 +11971,7 @@ msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Kérdez mappatörléskor."
 
 #: ../mail/evolution-mail.schemas.in.in.h:57
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Kérdez, ha tárgy nélküli levelet próbál küldeni."
 
 #: ../mail/evolution-mail.schemas.in.in.h:58
@@ -12032,13 +11992,11 @@ msgstr ""
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
-msgstr ""
-"Kérdez, ha HTML levelet próbál küldeni olyan címre, aki nem akar ilyet kapni."
+msgstr "Kérdez, ha HTML levelet próbál küldeni olyan címre, aki nem akar ilyet kapni."
 
 #: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr ""
-"Kérdez, ha Címzett vagy Másolat címzett nélküli levelet próbál küldeni."
+msgstr "Kérdez, ha Címzett vagy Másolat címzett nélküli levelet próbál küldeni."
 
 #: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
@@ -12513,8 +12471,7 @@ msgstr "<b>Nye_lvek</b>"
 
 #: ../mail/mail-config.glade.h:7
 msgid "<small>This will make the the filter more reliable, but slower</small>"
-msgstr ""
-"<small>Ez a beállítás megbízhatóbbá, de lassabbá teszi a szűrőt</small>"
+msgstr "<small>Ez a beállítás megbízhatóbbá, de lassabbá teszi a szűrőt</small>"
 
 #: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
@@ -13049,8 +13006,7 @@ msgstr "_Ne értesítsen, ha új levél érkezik"
 
 #: ../mail/mail-config.glade.h:157
 msgid "_Don't sign meeting requests (for Outlook compatibility)"
-msgstr ""
-"_Ne írja alá az értekezlet-összehívási kérést (Outlook-kompatibilitáshoz)"
+msgstr "_Ne írja alá az értekezlet-összehívási kérést (Outlook-kompatibilitáshoz)"
 
 #: ../mail/mail-config.glade.h:159
 msgid "_Forward style:"
@@ -13516,8 +13472,7 @@ msgid "New Search Folder"
 msgstr "Új keresőmappa"
 
 #: ../mail/mail.error.xml.h:1
-msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgid "A folder named &quot;{1}&quot; already exists. Please use a different name."
 msgstr "Már létezik &quot;{1}&quot; nevű mappa. Kérem használjon más nevet."
 
 #: ../mail/mail.error.xml.h:2
@@ -13626,8 +13581,7 @@ msgstr "Nem lehet törölni a(z) &quot;{0}&quot; rendszermappát."
 
 #: ../mail/mail.error.xml.h:26
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
-msgstr ""
-"Nem lehet szerkeszteni a(z) &quot;{0}&quot; keresőmappát, mivel nem létezik."
+msgstr "Nem lehet szerkeszteni a(z) &quot;{0}&quot; keresőmappát, mivel nem létezik."
 
 #: ../mail/mail.error.xml.h:27
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
@@ -13817,8 +13771,7 @@ msgstr "Túl sok üzenet egyidejű megnyitása sokáig tarthat."
 
 #: ../mail/mail.error.xml.h:68
 msgid "Please check your account settings and try again."
-msgstr ""
-"Kérem ellenőrizze a felhasználói fiókjának beállításait és próbálja újra."
+msgstr "Kérem ellenőrizze a felhasználói fiókjának beállításait és próbálja újra."
 
 #: ../mail/mail.error.xml.h:69
 msgid ""
@@ -13952,10 +13905,8 @@ msgstr ""
 "nyissa meg a keresőmappa szerkesztőt és hozza létre közvetlenül."
 
 #: ../mail/mail.error.xml.h:100
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr ""
-"Ez az üzenet nem küldhető el, mivel nem adott meg egyetlen címzettet sem"
+msgid "This message cannot be sent because you have not specified any Recipients"
+msgstr "Ez az üzenet nem küldhető el, mivel nem adott meg egyetlen címzettet sem"
 
 #: ../mail/mail.error.xml.h:101
 msgid ""
@@ -14025,8 +13976,7 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:115
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
-msgstr ""
-"A belépése &quot;{0}&quot; kiszolgálóra &quot;{0}&quot; néven sikertelen."
+msgstr "A belépése &quot;{0}&quot; kiszolgálóra &quot;{0}&quot; néven sikertelen."
 
 #: ../mail/mail.error.xml.h:116
 msgid "Your message with the subject &quot;{0}&quot; was not delivered."
@@ -14272,8 +14222,7 @@ msgstr "Beállítások biztonsági mentése..."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
 msgid "Backup and restore Evolution data and settings"
-msgstr ""
-"Az Evolution adatainak és beállításainak biztonsági mentése és helyreállítása"
+msgstr "Az Evolution adatainak és beállításainak biztonsági mentése és helyreállítása"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
 msgid "Restore Settings..."
@@ -14289,8 +14238,7 @@ msgstr "<span weight=\"bold\">Automatikus névjegyek</span>"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:426
-msgid ""
-"_Automatically create entries in the addressbook when responding to mail"
+msgid "_Automatically create entries in the addressbook when responding to mail"
 msgstr "Válasz küldésekor névjegyek _automatikus létrehozása a címjegyzékben"
 
 #: ../plugins/bbdb/bbdb.c:444
@@ -14415,12 +14363,10 @@ msgstr "Másolóeszköz"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:1
 msgid "Check whether Evolution is the default mailer"
-msgstr ""
-"Annak ellenőrzése, hogy az Evolution-e az alapértelmezett levelezőkliens."
+msgstr "Annak ellenőrzése, hogy az Evolution-e az alapértelmezett levelezőkliens."
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.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 ""
 "Az Evolution minden indulásakor ellenőrizze, hogy az-e az alapértelmezett "
 "levelezőkliens."
@@ -14484,11 +14430,11 @@ msgstr ""
 "Ezen opció hatására szabvány egyszerű szöveges jelszóhitelesítéssel fog "
 "kapcsolódni az Exchange kiszolgálóhoz."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:251
+#: ../plugins/exchange-operations/exchange-account-setup.c:253
 msgid "Out Of Office"
 msgstr "Nincs bent"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:258
+#: ../plugins/exchange-operations/exchange-account-setup.c:260
 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."
@@ -14496,66 +14442,66 @@ msgstr ""
 "A lent megadott üzenetet mindenki automatikusan megkapja, aki akkor küld\n"
 "levelet Önnek, amikor házon kívül van."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:270
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:272
+#: ../plugins/exchange-operations/exchange-account-setup.c:277
 msgid "I am out of the office"
 msgstr "Jelenleg házon kívül vagyok"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:271
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:273
+#: ../plugins/exchange-operations/exchange-account-setup.c:276
 msgid "I am in the office"
 msgstr "Jelenleg a munkahelyemen vagyok"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:321
+#: ../plugins/exchange-operations/exchange-account-setup.c:324
 msgid "Change the password for Exchange account"
 msgstr "Az Exchange fiók jelszavának megváltoztatása"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:323
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Change Password"
 msgstr "Jelszó megváltoztatása"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:327
+#: ../plugins/exchange-operations/exchange-account-setup.c:331
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Az Exchange fiók meghatalmazott-beállításainak kezelése"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:329
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Delegation Assitant"
 msgstr "Meghatalmazási varázsló"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:339
+#: ../plugins/exchange-operations/exchange-account-setup.c:345
 msgid "Miscelleneous"
 msgstr "Egyebek"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:355
 msgid "View the size of all Exchange folders"
 msgstr "Az összes Exchange mappa méretének megjelenítése"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:351
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "Folders Size"
 msgstr "Mappák mérete"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:358
+#: ../plugins/exchange-operations/exchange-account-setup.c:364
 msgid "Exchange Settings"
 msgstr "Exchange beállításai"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:601
+#: ../plugins/exchange-operations/exchange-account-setup.c:607
 msgid "_OWA Url:"
 msgstr "_OWA Url:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:626
+#: ../plugins/exchange-operations/exchange-account-setup.c:632
 msgid "A_uthenticate"
 msgstr "_Hitelesítés"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:814
+#: ../plugins/exchange-operations/exchange-account-setup.c:820
 msgid "Authentication Type"
 msgstr "Hitelesítés típusa"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:828
+#: ../plugins/exchange-operations/exchange-account-setup.c:834
 msgid "Ch_eck for Supported Types"
 msgstr "_Támogatott típusok lekérdezése"
 
@@ -14963,13 +14909,11 @@ msgstr "Győződjön meg, hogy az URL helyes és próbálkozzon újra."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Make sure the server name is spelled correctly and try again."
-msgstr ""
-"Győződjön meg, hogy a kiszolgáló nevét nem gépelte el és próbálkozzon újra."
+msgstr "Győződjön meg, hogy a kiszolgáló nevét nem gépelte el és próbálkozzon újra."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Make sure the username and password are correct and try again."
-msgstr ""
-"Győződjön meg, hogy a felhasználónév és a jelszó helyes és próbálkozzon újra."
+msgstr "Győződjön meg, hogy a felhasználónév és a jelszó helyes és próbálkozzon újra."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "No Global Catalog server configured for this account."
@@ -15039,8 +14983,7 @@ msgstr "Próbálja újra egy másik jelszóval."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid "Unable to add user to access control list:"
-msgstr ""
-"A felhasználó nem adható hozzá a hozzáférés-szabályozási listához (ACL):"
+msgstr "A felhasználó nem adható hozzá a hozzáférés-szabályozási listához (ACL):"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
 msgid "Unable to edit delegates."
@@ -15074,8 +15017,7 @@ msgstr "Ön nem lehet a saját meghatalmazottja"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "You have exceeded your quota for storing mails on this server."
-msgstr ""
-"Túllépte az ezen a kiszolgálón levelek tárolására rendelkezésére álló kvótát."
+msgstr "Túllépte az ezen a kiszolgálón levelek tárolására rendelkezésére álló kvótát."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "You may only configure a single Exchange account."
@@ -15140,8 +15082,7 @@ msgstr "Leiratkozás a(z) \"%s\" mappáról"
 
 #: ../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 ""
-"Lehetővé teszi a leiratkozást levélmappákról a mappagyökér helyi menüjéből."
+msgstr "Lehetővé teszi a leiratkozást levélmappákról a mappagyökér helyi menüjéből."
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
@@ -15394,8 +15335,7 @@ msgstr "Nem sikerült elküldeni a lemondási értesítést a meghatalmazottnak"
 
 #: ../plugins/itip-formatter/itip-formatter.c:991
 msgid "Attendee status could not be updated because the status is invalid"
-msgstr ""
-"A résztvevő állapotát nem lehetett frissíteni, mert az állapot érvénytelen"
+msgstr "A résztvevő állapotát nem lehetett frissíteni, mert az állapot érvénytelen"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1017
 #, c-format
@@ -15644,8 +15584,7 @@ msgstr "<b>%s</b> arra kéri, hogy vegyen részt a következő értekezleten:"
 #: ../plugins/itip-formatter/itip-view.c:362
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
-msgstr ""
-"<b>%s</b> %s közvetítésével szeretné Önt hozzáadni egy létező értekezlethez:"
+msgstr "<b>%s</b> %s közvetítésével szeretné Önt hozzáadni egy létező értekezlethez:"
 
 #: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
@@ -15654,10 +15593,8 @@ msgstr "<b>%s</b> szeretné Önt hozzáadni egy létező értekezlethez:"
 
 #: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr ""
-"<b>%s</b> szeretné megkapni a legújabb adatokat a következő értekezletről:"
+msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgstr "<b>%s</b> szeretné megkapni a legújabb adatokat a következő értekezletről:"
 
 #: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
@@ -15753,14 +15690,12 @@ msgstr "<b>%s</b> törölte a következő kiosztott feladatot:"
 #: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
-msgstr ""
-"<b>%s</b> a következő változtatásokat javasolja a feladatok kiosztásában:"
+msgstr "<b>%s</b> a következő változtatásokat javasolja a feladatok kiosztásában:"
 
 #: ../plugins/itip-formatter/itip-view.c:451
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
-msgstr ""
-"<b>%s</b> %s közvetítésével elutasította a következő kiosztott feladatot:"
+msgstr "<b>%s</b> %s közvetítésével elutasította a következő kiosztott feladatot:"
 
 #: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
@@ -15812,8 +15747,7 @@ msgid "This meeting has been delegated"
 msgstr "A találkozó át lett ruházva"
 
 #: ../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 ""
 "Ez a válasz nem egy jelenlegi résztvevőtől érkezett. Hozzáadja a feladót a "
 "résztvevőkhöz?"
@@ -15849,8 +15783,7 @@ msgid "No store available"
 msgstr "Nem áll rendelkezésre tároló"
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
-msgid ""
-"A plugin which implements a CORBA interface for accessing mail data remotely."
+msgid "A plugin which implements a CORBA interface for accessing mail data remotely."
 msgstr ""
 "Egy, a levéladatok távoli eléréséhez használható CORBA felületet megvalósító "
 "bővítmény."
@@ -16080,8 +16013,7 @@ msgstr "Új levélről értesítés"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "A plugin for managing which plugins are enabled or disabled."
-msgstr ""
-"Bővítmény a bővítmények engedélyezett vagy letiltott állapotának kezelésére."
+msgstr "Bővítmény a bővítmények engedélyezett vagy letiltott állapotának kezelésére."
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
 msgid "Plugin manager"
@@ -16120,8 +16052,7 @@ msgstr "Bővítménykezelő"
 
 #: ../plugins/plugin-manager/plugin-manager.c:201
 msgid "Note: Some changes will not take effect until restart"
-msgstr ""
-"Megjegyzés: néhány változtatás csak a program újraindítása után lép életbe"
+msgstr "Megjegyzés: néhány változtatás csak a program újraindítása után lép életbe"
 
 #: ../plugins/plugin-manager/plugin-manager.c:210
 #: ../plugins/plugin-manager/plugin-manager.c:271
@@ -16405,8 +16336,7 @@ msgstr "Adatok importálása."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Indicates if threading of messages should fall back to subject."
-msgstr ""
-"Jelzi, hogy az üzenetek szálakra bontásához a tárgyat kell-e használni."
+msgstr "Jelzi, hogy az üzenetek szálakra bontásához a tárgyat kell-e használni."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
@@ -16459,16 +16389,14 @@ msgstr "Alapértelmezett ablakszélesség"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "ID or alias of the component to be shown by default at start-up."
-msgstr ""
-"Az indításkor alapértelmezésként megjelenő összetevő azonosítója vagy álneve."
+msgstr "Az indításkor alapértelmezésként megjelenő összetevő azonosítója vagy álneve."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:7
 msgid "Last upgraded configuration version"
 msgstr "Utoljára frissített konfiguráció verziója"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:8
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
+msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "A kapcsolat nélküli használatra szinkronizálandó mappák elérési útjainak "
 "listája"
@@ -16486,10 +16414,8 @@ msgid "Start in offline mode"
 msgstr "Indítás kapcsolat nélküli módban"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:12
-msgid ""
-"The configuration version of Evolution, with major/minor/configuration level"
-msgstr ""
-"Az Evolution konfiguráció verziója, major/minor/konfiguráció szintekkel"
+msgid "The configuration version of Evolution, with major/minor/configuration level"
+msgstr "Az Evolution konfiguráció verziója, major/minor/konfiguráció szintekkel"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "The default height for the main window, in pixels."
@@ -16536,8 +16462,7 @@ msgid "Whether the toolbar should be visible."
 msgstr "Az eszköztár látható legyen-e."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:21
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
+msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Ha be van állítva, az Evolution fejlesztői verzióiban nem jelenik meg a "
 "figyelmeztető ablak."
@@ -16655,8 +16580,7 @@ msgstr "A \".\" és a \"..\" fenntartott mappanevek."
 
 #: ../shell/e-shell-window-commands.c:70
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr ""
-"Úgy tűnik, hogy nincsenek telepítve a rendszerre a GNOME Pilot eszközök."
+msgstr "Úgy tűnik, hogy nincsenek telepítve a rendszerre a GNOME Pilot eszközök."
 
 #: ../shell/e-shell-window-commands.c:78
 #, c-format
@@ -16763,8 +16687,7 @@ msgstr "Új tesztelem létrehozása"
 
 #: ../shell/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr ""
-"A fájl importálásának megkezdéséhez kattintson az \"Importálás\" gombra. "
+msgstr "A fájl importálásának megkezdéséhez kattintson az \"Importálás\" gombra. "
 
 #: ../shell/import.glade.h:2
 msgid "Evolution Import Assistant"
@@ -17270,13 +17193,11 @@ msgstr "Megbízom ezen tanúsítvány hitelességében"
 
 #: ../smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify email users."
-msgstr ""
-"Ezen hitelesítésszolgáltató megbízása e-mail felhasználók azonosítására."
+msgstr "Ezen hitelesítésszolgáltató megbízása e-mail felhasználók azonosítására."
 
 #: ../smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify software developers."
-msgstr ""
-"Ezen hitelesítésszolgáltató megbízása szoftverfejlesztők azonosítására."
+msgstr "Ezen hitelesítésszolgáltató megbízása szoftverfejlesztők azonosítására."
 
 #: ../smime/gui/smime-ui.glade.h:41
 msgid "Trust this CA to identify web sites."
@@ -17288,12 +17209,10 @@ msgstr "Nézet"
 
 #: ../smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
-msgstr ""
-"A következő szervezetektől vannak tanúsítványai, melyek azonosítják Önt:"
+msgstr "A következő szervezetektől vannak tanúsítványai, melyek azonosítják Önt:"
 
 #: ../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 ""
 "Ön rendelkezik olyan tanúsítványokkal, melyek azonosítják a következő "
 "hitelesítésszolgáltatókat:"
@@ -17550,8 +17469,7 @@ msgstr "A melléklet leírása."
 
 #: ../tools/evolution-launch-composer.c:328
 msgid "Mark attachment to be shown inline by default."
-msgstr ""
-"A melléklet megjelölése, hogy alapértelmezésként beágyazva jelenjen meg."
+msgstr "A melléklet megjelölése, hogy alapértelmezésként beágyazva jelenjen meg."
 
 #: ../tools/evolution-launch-composer.c:329
 msgid "Default subject for the message."
@@ -17934,10 +17852,8 @@ msgid "Hide _Read Messages"
 msgstr "_Olvasott levelek elrejtése"
 
 #: ../ui/evolution-mail-list.xml.h:12
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
-"A törölt levelek elrejtése ahelyett, hogy vonallal áthúzottan jelenjenek meg"
+msgid "Hide deleted messages rather than displaying them with a line through them"
+msgstr "A törölt levelek elrejtése ahelyett, hogy vonallal áthúzottan jelenjenek meg"
 
 #: ../ui/evolution-mail-list.xml.h:13
 msgid "Mark Me_ssages as Read"
@@ -18073,13 +17989,11 @@ msgstr "Szabály alkotása, amely szűri az ettől feladótól érkező leveleke
 
 #: ../ui/evolution-mail-message.xml.h:21
 msgid "Create a rule to filter messages to these recipients"
-msgstr ""
-"Szabály alkotása, amely szűri az ezeknek a címzetteknek szóló leveleket"
+msgstr "Szabály alkotása, amely szűri az ezeknek a címzetteknek szóló leveleket"
 
 #: ../ui/evolution-mail-message.xml.h:22
 msgid "Create a rule to filter messages to this mailing list"
-msgstr ""
-"Szabály alkotása, amely szűri az erre a levelezőlistára érkező leveleket"
+msgstr "Szabály alkotása, amely szűri az erre a levelezőlistára érkező leveleket"
 
 #: ../ui/evolution-mail-message.xml.h:23
 msgid "Create a rule to filter messages with this subject"
@@ -20132,3 +20046,4 @@ msgstr "IM-kontextus"
 #: ../widgets/text/e-text.c:3683 ../widgets/text/e-text.c:3684
 msgid "Handle Popup"
 msgstr "Felugró kezelő"
+
diff --git a/po/it.po b/po/it.po
index 56013deb8f..c035c98e9b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,12 +1,15 @@
-# #-#-#-#-#  it.po (evolution 2.1.x)  #-#-#-#-#
-# oof Evolution
-#
+# Italian translation for Evolution
+# This file is distributed under the same license as evolution package
+# Based on translation of gal package too.
+# Copyright (C) 2000-2002 Free Software Foundation, Inc.
+# Christopher R. Gabriel <cgabriel@softwarelibero.org>, 2002
 # Clara Tattoni <clara.tattoni@libero.it>, 2000-2002
 # Ettore Perazzoli <ettore@ximian.com>, 2001
 # Marco Ciampa <ciampix@libero.it>, 2003-2005
 # Alessio Dessi <alessio.dessi@libero.it>, 2003
 # Monica Badia <Monica.Badia@Sun.COM>, 2003
-# Luca Ferretti <elle.uca@infinito.it>, 2005
+# Craig Jeffares <cjeffares@novell.com>, 2004.
+# Luca Ferretti <elle.uca@infinito.it>, 2003-2005.
 #
 # Convenzioni adottate:
 #
@@ -19,19 +22,12 @@
 # alarm = allarme 
 # reminder = promemoria
 # vFolder = cartella vFolder
-#
-# #-#-#-#-#  gal.po (gal)  #-#-#-#-#
-# Italian translation for the Gnome Application Library
-# Copyright (C) 2000-2002 Free Software Foundation, Inc.
-# Christopher R. Gabriel <cgabriel@softwarelibero.org>, 2002
-# Luca Ferretti <elle.uca@infinito.it>, 2003-2004.
-# Craig Jeffares <cjeffares@novell.com>, 2004
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-11 17:30+0200\n"
-"PO-Revision-Date: 2005-08-29 22:26+0200\n"
+"POT-Creation-Date: 2005-09-18 17:32+0200\n"
+"PO-Revision-Date: 2005-09-09 16:56+0200\n"
 "Last-Translator: Luca Ferretti <elle.uca@infinito.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
@@ -422,6 +418,8 @@ msgstr "La rubrica di Evolution è terminata in modo inatteso."
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
+"L'immagine selezionata è troppo grande. Ridimensionare tale immagine e "
+"memorizzarla?"
 
 #: ../addressbook/addressbook.error.xml.h:17
 msgid ""
@@ -809,12 +807,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Accesso anonimo al server LDAP"
 
 #: ../addressbook/gui/component/addressbook.c:191
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:485
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:490
 msgid "Failed to authenticate.\n"
 msgstr "Autenticazione fallita.\n"
 
 #: ../addressbook/gui/component/addressbook.c:198
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:464
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:469
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Inserire la password per %s (utente %s)"
@@ -2413,7 +2411,6 @@ msgstr "Servizio"
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:587
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../plugins/save-calendar/csv-format.c:400
-#, fuzzy
 msgid "Location"
 msgstr "Ubicazione"
 
@@ -2648,7 +2645,6 @@ msgstr "Servizio _IM:"
 #: ../plugins/calendar-weather/calendar-weather.c:409
 #: ../plugins/exchange-operations/exchange-calendar.c:215
 #: ../plugins/exchange-operations/exchange-contacts.c:193
-#, fuzzy
 msgid "_Location:"
 msgstr "_Ubicazione:"
 
@@ -3817,7 +3813,7 @@ msgstr "Ombreggiatura"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:917
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 #: ../plugins/exchange-operations/exchange-calendar.c:205
 #: ../plugins/exchange-operations/exchange-contacts.c:176
 msgid "Size:"
@@ -3960,12 +3956,16 @@ msgid ""
 " There are few attachments getting downloaded. Saving the appointment will "
 "cause the appointment to be saved without those pending attachments "
 msgstr ""
+" È in corso lo scaricamento di alcuni allegati. Salvando ora l'appuntamento, "
+"questo non includerà tali allegati non ancora disponibili "
 
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
 " There are few attachments getting downloaded. Saving the task will cause "
 "the task to be saved without those pending attachments "
 msgstr ""
+" È in corso lo scaricamento di alcuni allegati. Salvando ora il compito, "
+"questo non includerà tali allegati non ancora disponibili "
 
 #: ../calendar/calendar.error.xml.h:3
 msgid ""
@@ -4363,7 +4363,7 @@ msgstr "Componente dei compiti di Evolution"
 #: ../calendar/importers/icalendar-importer.c:79
 #: ../calendar/importers/icalendar-importer.c:707
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:582
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:589
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Compiti"
@@ -4433,7 +4433,6 @@ msgid "_Edit"
 msgstr "_Modifica"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
-#, fuzzy
 msgid "_Snooze"
 msgstr "_Suoneria"
 
@@ -4671,9 +4670,10 @@ msgstr "Posizione riquadro orizzontale vista mensile"
 msgid "Month view vertical pane position"
 msgstr "Posizione riquadro verticale vista mensile"
 
+# Da rivedere -Luca
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining for a default reminder."
-msgstr ""
+msgstr "Numero di unità per determinare per un promemoria predefinito."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
@@ -4904,7 +4904,7 @@ msgstr "Non corrispondenti"
 #: ../calendar/gui/gnome-cal.c:2094
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:581
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:588
 msgid "Calendar"
 msgstr "Calendario"
 
@@ -5137,9 +5137,8 @@ msgid "end of appointment"
 msgstr "termine dell'appuntamento"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
-#, fuzzy
 msgid "extra times every"
-msgstr "tempo in più ogni"
+msgstr "volte in più ogni"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
 msgid "hour(s)"
@@ -5161,9 +5160,8 @@ msgid "start of appointment"
 msgstr "inizio dell'appuntamento"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.c:199
-#, fuzzy
 msgid "Action/Trigger"
-msgstr "Azione/XXXXX"
+msgstr "Azione/Attivatore"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
 msgid "A_dd"
@@ -5443,7 +5441,6 @@ msgid "Monday"
 msgstr "Lunedì"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#, fuzzy
 msgid "Publishing Table"
 msgstr "Tabella di pubblicazione"
 
@@ -6682,7 +6679,7 @@ msgstr "Data di scadenza:"
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:222
 #: ../calendar/gui/e-itip-control.c:1134
-#: ../plugins/exchange-operations/exchange-account-setup.c:263
+#: ../plugins/exchange-operations/exchange-account-setup.c:265
 #: ../plugins/itip-formatter/itip-view.c:909
 msgid "Status:"
 msgstr "Stato:"
@@ -7185,20 +7182,18 @@ msgstr "Declinato"
 
 # ###########################################
 #: ../calendar/gui/e-itip-control.c:1231
-#, fuzzy
 msgid ""
 "The meeting has been cancelled, however it could not be found in your "
 "calendars"
 msgstr ""
-"La riunione è stata annullata, tuttavia potrebbe non essere trovata nei "
+"La riunione è stata annullata, tuttavia potrebbe non essere presente nei "
 "propri calendari"
 
 #: ../calendar/gui/e-itip-control.c:1233
-#, fuzzy
 msgid ""
 "The task has been cancelled, however it could not be found in your task lists"
 msgstr ""
-"Il compito è stato annullato, tuttavia potrebbe essere trovato nei propri "
+"Il compito è stato annullato, tuttavia potrebbe essere presente nei propri "
 "elenchi di compiti"
 
 #: ../calendar/gui/e-itip-control.c:1312
@@ -10198,9 +10193,8 @@ msgstr ""
 "quando qualcuno richiede una ricevuta.</small>"
 
 #: ../designs/read_receipts/read.glade.h:6
-#, fuzzy
 msgid "Always send back a read receipt"
-msgstr "Spedisci sempre una ricevuta di lettura"
+msgstr "Spedire sempre indietro una ricevuta di lettura"
 
 #: ../designs/read_receipts/read.glade.h:7
 msgid "Ask me if I want to send back a read receipt"
@@ -10280,7 +10274,6 @@ msgid "Do you wish to overwrite it?"
 msgstr "Sovrascriverlo?"
 
 #: ../e-util/e-system.error.xml.h:5
-#, fuzzy
 msgid "File exists &quot;{0}&quot;."
 msgstr "Il file esiste «{0}»."
 
@@ -10761,7 +10754,7 @@ msgstr "Predefiniti"
 
 #. Security settings
 #: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:122
-#: ../plugins/exchange-operations/exchange-account-setup.c:311
+#: ../plugins/exchange-operations/exchange-account-setup.c:313
 msgid "Security"
 msgstr "Sicurezza"
 
@@ -10842,7 +10835,7 @@ msgstr "_Regole dei filtri"
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:2
 msgid "Adjust Score"
-msgstr "Imposta punteggio"
+msgstr "Regola punteggio"
 
 #: ../mail/em-filter-i18n.h:3
 msgid "Assign Color"
@@ -10967,11 +10960,11 @@ msgstr "è senza segnalazione"
 #: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
-msgstr "Da scartare"
+msgstr "Spazzatura"
 
 #: ../mail/em-filter-i18n.h:36
 msgid "Junk Test"
-msgstr "Verifica da scartare"
+msgstr "Test spazzatura"
 
 #: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1063
 #: ../widgets/misc/e-expander.c:189
@@ -10988,19 +10981,19 @@ msgstr "Corrispondenza totale"
 
 #: ../mail/em-filter-i18n.h:40
 msgid "Message Body"
-msgstr "Corpo del messaggio"
+msgstr "Corpo messaggio"
 
 #: ../mail/em-filter-i18n.h:41
 msgid "Message Header"
-msgstr "Intestazione del messaggio"
+msgstr "Intestazione messaggio"
 
 #: ../mail/em-filter-i18n.h:42
 msgid "Message is Junk"
-msgstr "Il messaggio è da scartare"
+msgstr "Il messaggio è spazzatura"
 
 #: ../mail/em-filter-i18n.h:43
 msgid "Message is not Junk"
-msgstr "Il messaggio non è da scartare"
+msgstr "Il messaggio non è spazzatura"
 
 #: ../mail/em-filter-i18n.h:44
 msgid "Move to Folder"
@@ -11012,7 +11005,7 @@ msgstr "In pipe al programma"
 
 #: ../mail/em-filter-i18n.h:46
 msgid "Play Sound"
-msgstr "Emetti un suono"
+msgstr "Emetti suono"
 
 #: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:80
 msgid "Read"
@@ -11024,7 +11017,7 @@ msgstr "Destinatari"
 
 #: ../mail/em-filter-i18n.h:49
 msgid "Regex Match"
-msgstr "Corrispondenza espressione regolare"
+msgstr "Corrispondenza regexp"
 
 #: ../mail/em-filter-i18n.h:50
 msgid "Replied to"
@@ -11101,9 +11094,8 @@ msgid "<b>Then</b>"
 msgstr "<b>allora</b>"
 
 #: ../mail/em-folder-browser.c:134
-#, fuzzy
 msgid "C_reate Search Folder From Search..."
-msgstr "Crea cartella _vFolder da ricerca..."
+msgstr "_Crea cartella di ricerca da ricerca..."
 
 #. TODO: can this be done in a loop?
 #: ../mail/em-folder-properties.c:144
@@ -11137,9 +11129,8 @@ msgstr "_Nome della cartella:"
 
 #: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
 #: ../mail/mail-vfolder.c:937 ../mail/mail-vfolder.c:1007
-#, fuzzy
 msgid "Search Folders"
-msgstr "Ricerca c_artella"
+msgstr "Cartelle di ricerca"
 
 #. UNMATCHED is always last
 #: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
@@ -11317,9 +11308,8 @@ msgid "Mar_k as Read"
 msgstr "Segna come _letto"
 
 #: ../mail/em-folder-view.c:1056
-#, fuzzy
 msgid "Mark as _Unread"
-msgstr "Segna come _non letto"
+msgstr "Segna come non _letto"
 
 #: ../mail/em-folder-view.c:1057
 msgid "Mark as _Important"
@@ -11338,42 +11328,36 @@ msgid "Mark as _Not Junk"
 msgstr "Segna come non da _scartare"
 
 #: ../mail/em-folder-view.c:1061
-#, fuzzy
 msgid "Mark for Follo_w Up..."
-msgstr "Seg_ue..."
+msgstr "Segna come seg_ue..."
 
 #: ../mail/em-folder-view.c:1069
 msgid "Fla_g Completed"
 msgstr "Fla_g completata"
 
 #: ../mail/em-folder-view.c:1070
-#, fuzzy
 msgid "Cl_ear Flag"
-msgstr "Ca_ncella flag"
+msgstr "Pu_lisci flag"
 
 #: ../mail/em-folder-view.c:1073
 msgid "Crea_te Rule From Message"
 msgstr "Crea re_gola dal messaggio"
 
 #: ../mail/em-folder-view.c:1074
-#, fuzzy
 msgid "Search Folder from _Subject"
-msgstr "Cartella vFolder su _oggetto"
+msgstr "Cartella di ricerca da _oggetto"
 
 #: ../mail/em-folder-view.c:1075
-#, fuzzy
 msgid "Search Folder from Se_nder"
-msgstr "Cartella vFolder su _mittente"
+msgstr "Cartella di ricerca da _mittente"
 
 #: ../mail/em-folder-view.c:1076
-#, fuzzy
 msgid "Search Folder from _Recipients"
-msgstr "Cartella vFolder su _destinatari"
+msgstr "Cartella di ricerca da _destinatari"
 
 #: ../mail/em-folder-view.c:1077
-#, fuzzy
 msgid "Search Folder from Mailing _List"
-msgstr "Cartella vFolder su mailing _list"
+msgstr "Cartella di ricerca da mailing _list"
 
 #: ../mail/em-folder-view.c:1081
 msgid "Filter on Sub_ject"
@@ -11403,18 +11387,16 @@ msgid "Print Message"
 msgstr "Stampa messaggio"
 
 #: ../mail/em-folder-view.c:2220
-#, fuzzy
 msgid "Unable to retrieve message"
-msgstr "Impossibile recuperare il messaggio dall'editor"
+msgstr "Impossibile recuperare il messaggio"
 
 #: ../mail/em-folder-view.c:2413
 msgid "_Copy Link Location"
 msgstr "_Copia posizione collegamento"
 
 #: ../mail/em-folder-view.c:2415
-#, fuzzy
 msgid "Create _Search Folder"
-msgstr "Crea cartella _vFolder"
+msgstr "Crea car_tella di ricerca"
 
 #: ../mail/em-folder-view.c:2416
 msgid "_From this Address"
@@ -11591,7 +11573,7 @@ msgstr "Salva selezionati..."
 
 #. Cant i put in the number of attachments here ?
 #: ../mail/em-format-html-display.c:1871
-#, fuzzy, c-format
+#, c-format
 msgid "%d attachment"
 msgid_plural "%d attachments"
 msgstr[0] "%d allegato"
@@ -11899,14 +11881,12 @@ msgid "Messages from %s"
 msgstr "Messaggi da %s"
 
 #: ../mail/em-vfolder-editor.c:104
-#, fuzzy
 msgid "Search _Folders"
-msgstr "Ricerca c_artella"
+msgstr "C_artelle di ricerca"
 
 #: ../mail/em-vfolder-rule.c:574
-#, fuzzy
 msgid "Search Folder source"
-msgstr "Ricerca c_artella"
+msgstr "Origine cartella di ricerca"
 
 # #########################################
 #: ../mail/evolution-mail.schemas.in.in.h:1
@@ -12736,7 +12716,7 @@ msgstr "<span weight=\"bold\">Caratteri messaggio</span>"
 
 #: ../mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Receipts</span>"
-msgstr "<span weight=\"bold\">Destinatari messaggio</span>"
+msgstr "<span weight=\"bold\">Ricevute messaggi</span>"
 
 #: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">New Mail Notification</span>"
@@ -12807,9 +12787,8 @@ msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Sempre copia conforme _nascosta (BCC) a:"
 
 #: ../mail/mail-config.glade.h:42
-#, fuzzy
 msgid "Always _trust keys in my keyring when encrypting"
-msgstr "Sempre chiavi di fiducia nel mio mazzo di chiavi quando si cifra"
+msgstr "Dare sempre _fiducia alle chiavi nel portachiavi personali nel cifrare"
 
 #: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted mail"
@@ -13098,7 +13077,7 @@ msgstr "Seleziona carattere HTML a larghezza variabile per la stampa"
 
 #: ../mail/mail-config.glade.h:127
 msgid "Send message receipts:"
-msgstr ""
+msgstr "Invia ricezione messaggio:"
 
 #: ../mail/mail-config.glade.h:129
 msgid "Sending Mail"
@@ -13277,9 +13256,8 @@ msgid "description"
 msgstr "descrizione"
 
 #: ../mail/mail-dialogs.glade.h:2
-#, fuzzy
 msgid "<b>Search Folder Sources</b>"
-msgstr "<b>Origini cartella vFolder</b>"
+msgstr "<b>Origini cartella di ricerca</b>"
 
 #: ../mail/mail-dialogs.glade.h:3
 msgid "<span weight=\"bold\">Digital Signature</span>"
@@ -13654,29 +13632,27 @@ msgid "Invalid folder: `%s'"
 msgstr "Cartella non valida: «%s»"
 
 #: ../mail/mail-vfolder.c:91
-#, fuzzy, c-format
+#, c-format
 msgid "Setting up Search Folder: %s"
-msgstr "Impostazione cartella vFolder: %s"
+msgstr "Impostazione cartella di ricerca: %s"
 
 #: ../mail/mail-vfolder.c:240
-#, fuzzy, c-format
+#, c-format
 msgid "Updating Search Folders for '%s:%s'"
-msgstr "Aggiornamento cartelle vFolder per «%s:%s»"
+msgstr "Aggiornamento cartelle di ricerca per «%s:%s»"
 
 #: ../mail/mail-vfolder.c:247
-#, fuzzy, c-format
+#, c-format
 msgid "Updating Search Folders for '%s'"
-msgstr "Aggiornamento cartelle vFolder «%s»"
+msgstr "Aggiornamento cartelle di ricerca per «%s»"
 
 #: ../mail/mail-vfolder.c:1046
-#, fuzzy
 msgid "Edit Search Folder"
-msgstr "Ricerca c_artella"
+msgstr "Modifica cartella di ricerca"
 
 #: ../mail/mail-vfolder.c:1130
-#, fuzzy
 msgid "New Search Folder"
-msgstr "Ricerca c_artella"
+msgstr "Nuova cartella di ricerca"
 
 #: ../mail/mail.error.xml.h:1
 msgid ""
@@ -13700,6 +13676,8 @@ msgid ""
 "A read receipt notification has been requested for &quot;{1}&quot;.  Send "
 "the reciept notification to {0}?"
 msgstr ""
+"È stata richesta una notifica di ricezione e lettura per «{1}». Inviare la "
+"notifica di ricezione a {0}?"
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
@@ -13756,9 +13734,8 @@ msgid "Because &quot;{2}&quot;."
 msgstr "Motivazione: {2}."
 
 #: ../mail/mail.error.xml.h:19
-#, fuzzy
 msgid "Cannot add Search Folder &quot;{0}&quot;."
-msgstr "Impossibile aggiungere la cartella vFolder «{0}»."
+msgstr "Impossibile aggiungere la cartella di ricerca «{0}»."
 
 #: ../mail/mail.error.xml.h:20
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
@@ -13785,10 +13762,9 @@ msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "Impossibile eliminare la cartella di sistema «{0}»."
 
 #: ../mail/mail.error.xml.h:26
-#, fuzzy
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr ""
-"Impossibile modificare la cartella vFolder «{0}» perché questa non esiste."
+"Impossibile modificare la cartella di ricerca «{0}» perché questa non esiste."
 
 #: ../mail/mail.error.xml.h:27
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
@@ -14028,7 +14004,6 @@ msgstr ""
 "supportati"
 
 #: ../mail/mail.error.xml.h:77
-#, fuzzy
 msgid "Read receipt requested."
 msgstr "Richiesta risposta di lettura."
 
@@ -14037,14 +14012,12 @@ msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Eliminare veramente la cartella «{0}» e tutte le sue sotto-cartelle?"
 
 #: ../mail/mail.error.xml.h:79
-#, fuzzy
 msgid "Search Folders automatically updated."
-msgstr "Cartelle vFolder aggiornate automaticamente."
+msgstr "Cartelle di ricerca aggiornate automaticamente."
 
 #: ../mail/mail.error.xml.h:80
-#, fuzzy
 msgid "Send Receipt"
-msgstr "Ricevute di lettura"
+msgstr "Invia ricevuta"
 
 #: ../mail/mail.error.xml.h:81
 msgid ""
@@ -14072,7 +14045,6 @@ msgstr ""
 "dovrebbe aggiungere almeno un destinatario «A:» o «CC:»."
 
 #: ../mail/mail.error.xml.h:85
-#, fuzzy
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14080,11 +14052,11 @@ msgid ""
 "    &quot;{1}&quot;\n"
 "And have been updated."
 msgstr ""
-"Le seguenti cartelle vFolder:\n"
+"Le seguenti cartelle di ricerca:\n"
 "{0}\n"
-"fanno uso della cartellla ora rimossa:\n"
+"facevano uso della cartellla ora rimossa:\n"
 "    «{1}»\n"
-"Le cartelle vFolder sono state aggiornate."
+"Le cartelle di ricerca sono state aggiornate."
 
 #: ../mail/mail.error.xml.h:90
 msgid ""
@@ -14118,13 +14090,13 @@ msgid "The script file must exist and be executable."
 msgstr "Il file script deve esistere ed essere eseguibile."
 
 #: ../mail/mail.error.xml.h:98
-#, fuzzy
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
-"Questa cartella potrebbe essere stata aggiunta implicitamente; aprire "
-"l'editor delle cartelle vFolder ed aggiungerla esplicitamente, se richiesto."
+"Questa cartella potrebbe essere stata aggiunta implicitamente;\n"
+"aprire l'editor delle cartelle di ricerca ed aggiungerla esplicitamente, se "
+"richiesto."
 
 #: ../mail/mail.error.xml.h:100
 msgid ""
@@ -14182,9 +14154,8 @@ msgid "You may not create two accounts with the same name."
 msgstr "Non è possibile creare due account con lo stesso nome."
 
 #: ../mail/mail.error.xml.h:111
-#, fuzzy
 msgid "You must name this Search Folder."
-msgstr "È necessario assegnare un nome a questa cartella vFolder."
+msgstr "È necessario assegnare un nome a questa cartella di ricerca."
 
 #: ../mail/mail.error.xml.h:112
 msgid "You must specify a folder."
@@ -14393,12 +14364,11 @@ msgid "Subject or Sender contains"
 msgstr "Oggetto o mittente contengono"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-#, fuzzy
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
 "play them directly from evolution."
 msgstr ""
-"Un plugin ??formatter?? che mostra in linea gli audio allegati e consente di "
+"Un plugin formatter che mostra in linea gli allegati audio e consente di "
 "riprodurli direttamente in Evolution."
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
@@ -14500,18 +14470,17 @@ msgid "Automatic contacts"
 msgstr "Contatti automatici"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
-#, fuzzy
 msgid ""
 "Automatically fills your addressbook with names and email addresses as you "
 "reply to mails. Also fills in IM contact information from your buddy lists."
 msgstr ""
-"Riempie automaticamente la rubrica con nomi ed indririzzi email quando si "
-"risponde ai messaggi di posta. Inoltre riempie le informazioni di istant "
-"messagging del contatto dalla buddy list."
+"Riempie automaticamente la rubrica con i nome e gli indirizzi email a cui si "
+"risponde. Riempie anche le informazioni dei contatti di Istant Messaging "
+"dalla propria buddy list."
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
-msgstr ""
+msgstr "BBDB"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
 msgid "Local Calendars"
@@ -14582,11 +14551,14 @@ msgstr "Fornisce le funzionalità di base per calendari meteo."
 msgid "Weather Calendars"
 msgstr "Calendari meteo"
 
+# un po' infedele.... -Luca
 #: ../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 ""
+"Un plugin di test per mostrare un menù a comparsa che consente di copiare "
+"dagli appunti."
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
 msgid "Copy _Email Address"
@@ -14667,13 +14639,12 @@ msgstr ""
 "autenticazione standard con password in testo semplice."
 
 # questo è un Outlook-ismo. Qualcuno ne conosce la traduzione??
-#: ../plugins/exchange-operations/exchange-account-setup.c:251
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:253
 msgid "Out Of Office"
 msgstr "Fuori ufficio"
 
 # elegante modo per rendere impersonale -Luca
-#: ../plugins/exchange-operations/exchange-account-setup.c:258
+#: ../plugins/exchange-operations/exchange-account-setup.c:260
 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."
@@ -14681,66 +14652,66 @@ msgstr ""
 "Il messaggio specificato sarà automaticamente spedito ad ogni\n"
 "persona da cui si riceve posta mentre si è fuori dall'ufficio."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:270
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:272
+#: ../plugins/exchange-operations/exchange-account-setup.c:277
 msgid "I am out of the office"
 msgstr "Sono fuori ufficio"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:271
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:273
+#: ../plugins/exchange-operations/exchange-account-setup.c:276
 msgid "I am in the office"
 msgstr "Sono in ufficio"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:321
+#: ../plugins/exchange-operations/exchange-account-setup.c:324
 msgid "Change the password for Exchange account"
 msgstr "Cambia la password per l'account Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:323
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Change Password"
 msgstr "Cambia la password"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:327
+#: ../plugins/exchange-operations/exchange-account-setup.c:331
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Gestisce le impostazioni dei delegati per l'account Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:329
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Delegation Assitant"
-msgstr ""
+msgstr "Assistente di delegazione"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:339
+#: ../plugins/exchange-operations/exchange-account-setup.c:345
 msgid "Miscelleneous"
-msgstr ""
+msgstr "Varie"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:355
 msgid "View the size of all Exchange folders"
 msgstr "Visualizza la dimensione di tutte le cartelle Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:351
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "Folders Size"
 msgstr "Dimensione cartelle"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:358
+#: ../plugins/exchange-operations/exchange-account-setup.c:364
 msgid "Exchange Settings"
 msgstr "Impostazioni Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:601
+#: ../plugins/exchange-operations/exchange-account-setup.c:607
 msgid "_OWA Url:"
 msgstr "URL O_WA:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:626
+#: ../plugins/exchange-operations/exchange-account-setup.c:632
 msgid "A_uthenticate"
 msgstr "A_utentica"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:814
+#: ../plugins/exchange-operations/exchange-account-setup.c:820
 msgid "Authentication Type"
 msgstr "Tipo di autenticazione"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:828
+#: ../plugins/exchange-operations/exchange-account-setup.c:834
 msgid "Ch_eck for Supported Types"
 msgstr "Verifica _tipi supportati"
 
@@ -14752,10 +14723,12 @@ msgid ""
 "The current password does not match the existing password for your account. "
 "Please enter the correct password"
 msgstr ""
+"La password attuale non corrisponde alla password esistente per il proprio "
+"account. Inserire la password corretta"
 
 #: ../plugins/exchange-operations/exchange-change-password.c:122
 msgid "The two passwords do not match. Please re-enter the passwords."
-msgstr ""
+msgstr "Le due password non corrispondono. Re-inserire le password."
 
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:3
 msgid "Confirm Password:"
@@ -14883,12 +14856,10 @@ msgid "Permissions..."
 msgstr "Permessi..."
 
 #: ../plugins/exchange-operations/exchange-folder-size-display.c:136
-#, fuzzy
 msgid "Folder Name"
-msgstr "_Nome della cartella:"
+msgstr "Nome della cartella"
 
 #: ../plugins/exchange-operations/exchange-folder-size-display.c:140
-#, fuzzy
 msgid "Folder Size"
 msgstr "Dimensione cartelle"
 
@@ -14962,20 +14933,18 @@ msgstr "Modificare ogni ogetto"
 msgid "Edit Own Items"
 msgstr "Modificare oggetti personali"
 
+# non so se è giusta....
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
-#, fuzzy
 msgid "Folder contact"
 msgstr "Cartella contatti"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
-#, fuzzy
 msgid "Folder owner"
 msgstr "Proprietario cartella"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
-#, fuzzy
 msgid "Folder visible"
-msgstr "Dimensione cartelle"
+msgstr "Cartella visibile"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
 msgid "Read items"
@@ -14995,12 +14964,11 @@ msgstr "Rubrica..."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
 msgid "Subscribe to Other User's Contacts"
-msgstr ""
+msgstr "Sottoscrizione ai contatti di altro utente"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1
-#, fuzzy
 msgid "Subscribe to Other User's Calendar"
-msgstr "Apri cartella di altro utente"
+msgstr "Sottoscrizione al calendario di altro utente"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
 msgid "Cannot change password due to configuration problems."
@@ -15016,6 +14984,8 @@ msgid ""
 "Changes to Exchange account configuration will take place after you quit and "
 "restart Evolution."
 msgstr ""
+"Le modifiche alla configurazione dell'account Exchange avranno luogo solo "
+"dopo aver terminato e riavviato Evolution."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Could not authenticate to server."
@@ -15031,6 +15001,9 @@ msgid ""
 "an unknown error occurred. Check the URL, \n"
 "username, and password, and try again."
 msgstr ""
+"Impossibile configurare l'account Exchange a \n"
+"causa di un errore sconosciuto. Verificare URL, \n"
+"nome utente e password, quindi provare di nuovo"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
 msgid "Could not connect to server {0}."
@@ -15042,7 +15015,7 @@ msgstr "Impossibile determinare i permessi della cartella per i delegati."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not find Exchange Web Storage System."
-msgstr ""
+msgstr "Impossibile trovare il sistema di storage Web di Exchange."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not locate server {0}."
@@ -15073,9 +15046,8 @@ msgid "Could not update out-of-office state"
 msgstr "Impossibile aggiornare lo stato fuori-ufficio"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
-#, fuzzy
 msgid "Exchange Account is offline."
-msgstr "Exchange Account è fuori linea."
+msgstr "L'account Exchange è fuori linea."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Exchange Connector access error."
@@ -15097,6 +15069,19 @@ msgid ""
 "html\n"
 "  "
 msgstr ""
+"Exchange Connector richiede l'acceso ad una certa\n"
+"funzionalità su Exchange Server che sembra essere\n"
+"disabilitate o bloccata, di solito in modo non\n"
+"intenzionale. L'amministratore del proprio server\n"
+"Exchage dovrebbe abilitare tale funzionalità per\n"
+"consentire l'uso di Ximian Connector.\n"
+"\n"
+"Per le informazioni da fornire al proprio \n"
+"amministratore di Exchange, seguire questo collegamento:\n"
+"\n"
+"http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328."
+"html\n"
+"   "
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
 msgid "Failed to update delegates:"
@@ -15148,7 +15133,7 @@ msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "No Global Catalog server configured for this account."
-msgstr ""
+msgstr "Nessun server Global Catalog configurato per questo account."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "No mailbox for user {0} on {1}."
@@ -15202,24 +15187,27 @@ msgid ""
 "\n"
 "Or you might have just typed your password wrong."
 msgstr ""
+"Questo potrebbe indicare che il server in uso richiede\n"
+"di specificare il nome di dominio Windows come\n"
+"parte del proprio nome utente (p.e. &quot;DOMINIO\\utente&quot;).\n"
+"\n"
+"Oppure, semplicemente, che si è digitata la passwoed sbagliata."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid "Try again with a different password."
 msgstr "Provare di nuovo con una password diversa."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
-#, fuzzy
 msgid "Unable to add user to access control list:"
-msgstr "Non è possibile aggiungere %s alla ACL"
+msgstr "Impossibile aggiungere l'utente alla ACL:"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
 msgid "Unable to edit delegates."
 msgstr "Impossibile modificare i delegati."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
-#, fuzzy
 msgid "Unknown error looking up {0}"
-msgstr "Errore sconosciuto nel cercare %s"
+msgstr "Errore sconosciuto nel cercare {0}"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
 msgid "Unknown error."
@@ -15254,49 +15242,48 @@ msgid "You may only configure a single Exchange account."
 msgstr "È possibile configurare solo un singolo account Exchange."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
-#, fuzzy
 msgid ""
 "Your current usage is : {0}KB. Try to clear up some space by deleting some "
 "mails."
-msgstr "Provare a liberare dello spazio eliminando alcune email."
+msgstr ""
+"La porzione al momento in uso è {0} kB. Provare a liberare dello spazio "
+"eliminando alcune email."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid ""
 "Your current usage is : {0}KB. You will not be able to either send or "
 "recieve mails now."
 msgstr ""
+"La porzione al momento in uso è {0} kB. Non sarà possibile inviare o "
+"ricevere email per ora."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
-#, fuzzy
 msgid ""
 "Your current usage is : {0}KB. You will not be able to send mails till you "
 "clear up some space by deleting some mails."
 msgstr ""
-"Non sarà possibile inviare email prima di aver liberato dello spazio "
-"eliminando alcune email."
+"La porzione al momento in uso è {0} kB. Non sarà possibile inviare email "
+"prima di aver liberato dello spazio eliminando alcune email."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
 msgstr "La password è scaduta."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
-#, fuzzy
 msgid "{0} cannot be added to an access control list"
-msgstr "Non è possibile aggiungere %s alla ACL"
+msgstr "Non è possibile aggiungere {0} ad una ACL"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
-#, fuzzy
 msgid "{0} is already a delegate"
-msgstr "%s è già un delegato"
+msgstr "{0} è già un delegato"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
-#, fuzzy
 msgid "{0} is already in the list"
-msgstr "%s è già nell'elenco."
+msgstr "{0} è già nell'elenco."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
 msgid "Subscribe to Other User's Tasks"
-msgstr ""
+msgstr "Sottoscrizione ai compiti di altro utente"
 
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
 msgid "Check folder permissions"
@@ -15304,7 +15291,7 @@ msgstr "Verifica permessi della cartella"
 
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
-msgstr ""
+msgstr "Sottoscrizione alla cartella di altro utente"
 
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
 #, c-format
@@ -15314,6 +15301,8 @@ msgstr "Annullamento sottoscrizione cartella «%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 ""
+"Consente di annullare la sottoscrizione a cartelle di posta dal menù "
+"contestuale dell'albero delle cartelle."
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
@@ -15383,10 +15372,10 @@ msgstr "Un plugin per le funzionalità negli account GroupWise."
 msgid "Groupwise Features"
 msgstr "Funzionalità Groupwise"
 
+# credo che il senso sia quello, no? -Luca
 #: ../plugins/groupwise-features/process-meeting.c:49
-#, fuzzy
 msgid "Accept Tentatively"
-msgstr "Tentativo"
+msgstr "Accetta con riserva"
 
 #: ../plugins/groupwise-features/properties.glade.h:2
 msgid "<b>Users :</b>"
@@ -15447,28 +15436,31 @@ msgstr "Modifica car_telle/opzioni/regole/"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
 msgid "Read items marked _private"
-msgstr ""
+msgstr "Leggere gli oggetti segnati come _privati"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
 msgid "Reminder Notes"
-msgstr ""
+msgstr "Annotazioni promemoria"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
 msgid "Subscribe to my _alarms"
-msgstr ""
+msgstr "Sottoscrizione agli _allarmi personali"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
 msgid "Subscribe to my _notifications"
-msgstr ""
+msgstr "Sottoscrizione alle _notifiche personali"
 
+# Ahhhhhh due contesti diversi.
+# Nel file glade -> Lettura (permesso)
+# Nel file XML   -> Segna come -> Letto (messaggio)
+#
+# Do la precedenza al secondo visto che appare sempre nella UI, mentre il primo solo se si usa groupwise
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
 #: ../ui/evolution-mail-message.xml.h:121
-#, fuzzy
 msgid "_Read"
-msgstr "_Lettura"
+msgstr "_Letto"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:14
-#, fuzzy
 msgid "_Write"
 msgstr "_Scrittura"
 
@@ -15524,9 +15516,8 @@ msgid "Sharing"
 msgstr "Condivisione"
 
 #: ../plugins/groupwise-features/status-track.c:235
-#, fuzzy
 msgid "Track Message Status..."
-msgstr "Salva messaggio..."
+msgstr "Traccia stato messaggio..."
 
 #: ../plugins/itip-formatter/itip-formatter.c:724
 msgid "Unable to parse item"
@@ -15560,15 +15551,13 @@ msgstr "Inviata al calendario «%s» come annullata"
 #: ../plugins/itip-formatter/itip-formatter.c:898
 #, c-format
 msgid "Organizer has removed the delegate %s "
-msgstr ""
+msgstr "L'organizzatore ha rimosso il delegato %s"
 
 #: ../plugins/itip-formatter/itip-formatter.c:905
-#, fuzzy
 msgid "Sent a cancellation notice to the delegate"
 msgstr "Invia una notifica di annullamento al delegato"
 
 #: ../plugins/itip-formatter/itip-formatter.c:907
-#, fuzzy
 msgid "Could not send the cancellation notice to the delegate"
 msgstr "Impossibile inviare una notifica di annullamento al delegato"
 
@@ -15648,7 +15637,7 @@ msgstr "Seleziona i calendari per cercare gli appuntamenti in conflitto"
 
 #: ../plugins/itip-formatter/itip-formatter.c:2031
 msgid "Conflict Search Table"
-msgstr ""
+msgstr "Tavola ricerca conflitti"
 
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
@@ -15843,7 +15832,7 @@ msgstr ""
 "<b>%s</b> desidera ricevere le ultime informazioni sulla seguente riunione:"
 
 #: ../plugins/itip-formatter/itip-view.c:370
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> ha inviato indietro la seguente risposta di riunione:"
 
@@ -15974,14 +15963,13 @@ msgstr "Invia a_ggiornamenti ai partecipanti"
 
 #: ../plugins/itip-formatter/itip-view.c:990
 msgid "A_pply to all instances"
-msgstr ""
+msgstr "A_pplica a tutte le istanze"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
 msgid "Displays text/calendar parts in messages."
 msgstr "Mostra parti text/calendar nei messaggi."
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
-#, fuzzy
 msgid "Itip Formatter"
 msgstr "Formattatore Itip"
 
@@ -15990,9 +15978,10 @@ msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
 "&quot;{1}&quot; ?"
 msgstr ""
+"&quot;{0}&quot; ha delegato qualcuno per la riunione. Aggiungere il delegato "
+"&quot;{1}&quot;?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
-#, fuzzy
 msgid "This meeting has been delegated"
 msgstr "Questa riunione è stata delegata"
 
@@ -16005,7 +15994,7 @@ msgstr ""
 
 #: ../plugins/mail-account-disable/mail-account-disable.c:47
 msgid "Proxy _Logout"
-msgstr ""
+msgstr "Disconnessione pro_xy"
 
 #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
 msgid "Allows disabling of accounts."
@@ -16030,7 +16019,6 @@ msgid "Account cannot send e-mail"
 msgstr "L'account non può inviare email"
 
 #: ../plugins/mail-remote/evolution-mail-store.c:605
-#, fuzzy
 msgid "No store available"
 msgstr "Nessuno store disponibile"
 
@@ -16038,11 +16026,12 @@ msgstr "Nessuno store disponibile"
 msgid ""
 "A plugin which implements a CORBA interface for accessing mail data remotely."
 msgstr ""
+"Un plugin che implementa una interfaccia CORBA per accedere ai dati di email "
+"da remoto."
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
-#, fuzzy
 msgid "Mail Remote"
-msgstr "Filtri di posta"
+msgstr "Posta remota"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
 msgid ""
@@ -16326,6 +16315,10 @@ msgid ""
 "\n"
 "This plugin is unsupported demonstration code only.\n"
 msgstr ""
+"Un plugin di testo per dimostrare un plugin formattatore che consente di "
+"disabilitare le email in HTML.\n"
+"\n"
+"Questo plugin è solo una dimostrazione di codice non supportato.\n"
 
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
@@ -16334,7 +16327,7 @@ msgstr "Modalità testo semplice"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
 msgid "Prefer plain-text"
-msgstr ""
+msgstr "Preferisci il testo semplice"
 
 #: ../plugins/prefer-plain/prefer-plain.c:105
 msgid "Show HTML if present"
@@ -16354,7 +16347,7 @@ msgstr "Modalità HTML"
 
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
 msgid "Gives an option to print mail from composer"
-msgstr ""
+msgstr "Fornisce un'opzione per stampare le email dal compositore"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
 #: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
@@ -16372,17 +16365,17 @@ msgstr "Spamassassin (integrato)"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
 msgid "Sa junk-plugin"
-msgstr ""
+msgstr "Plugin junk SA"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
 msgid "learns junk messages using spamd."
-msgstr ""
+msgstr "Apprende i messaggi spazzatura usando spamd."
 
 #: ../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 ""
 "Un plugin per salvare tutti gli allegati o parti di un messaggio in una "
-"volta."
+"volta sola."
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
@@ -16416,7 +16409,7 @@ msgstr "Salva"
 #. *
 #: ../plugins/save-calendar/csv-format.c:171
 msgid "%F %T"
-msgstr ""
+msgstr "%F %T"
 
 #: ../plugins/save-calendar/csv-format.c:385
 msgid "Uid"
@@ -16513,7 +16506,7 @@ msgstr "Salva il calendario o gli elenchi di compiti selezionati su disco."
 #. *
 #: ../plugins/save-calendar/rdf-format.c:158
 msgid "%FT%T"
-msgstr ""
+msgstr "%FT%T"
 
 #: ../plugins/save-calendar/rdf-format.c:396
 msgid "RDF format (.rdf)"
@@ -16554,7 +16547,7 @@ msgstr "_Mostra solo questo elenco di compiti"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
 msgid "Startup wizard"
-msgstr ""
+msgstr "Assistente di avvio"
 
 # Novell Translation
 #: ../plugins/startup-wizard/startup-wizard.c:85
@@ -16600,20 +16593,20 @@ msgstr "Importazione dati."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Indicates if threading of messages should fall back to subject."
-msgstr ""
+msgstr "Indica se il raggruppamento dei messaggi debba ripiegare sull'oggetto."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
-msgstr ""
+msgstr "Raggruppamento per oggetto"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
 msgid "Thread messages by subject"
-msgstr ""
+msgstr "Raggruppa i messaggi per oggetto"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
 #: ../plugins/subject-thread/subject-thread.c:54
 msgid "Fall back to threading messages by sub_ject"
-msgstr ""
+msgstr "Ripiega su raggruppamento messaggi per o_ggetto"
 
 # Novell Translation
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
@@ -17142,9 +17135,8 @@ msgstr ""
 "Utilizzare la guida di %s per ulteriori informazioni.\n"
 
 #: ../shell/shell.error.xml.h:1
-#, fuzzy
 msgid "Are you sure you want to forget all remembered passwords?"
-msgstr "Eliminare veramente questi {0} compiti?"
+msgstr "Dimenticare veramente tutte le password memorizzate?"
 
 # Novell Translation
 #: ../shell/shell.error.xml.h:2
@@ -17161,12 +17153,12 @@ msgid "Evolution can not start."
 msgstr "Impossibile avviare Evolution."
 
 #: ../shell/shell.error.xml.h:5
-#, fuzzy
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed. "
 msgstr ""
-"Dimentica le password archiviate in modo che vengano richieste di nuovo"
+"Scegliendo di dimenticare le proprie password, verrano rimosse tutte le "
+"password memorizzate. Si dovrà reinserirle quando si rendano necessarie."
 
 # Novell Translation
 #: ../shell/shell.error.xml.h:7
@@ -17261,9 +17253,8 @@ msgstr ""
 "Fare clic su Aiuto per informazioni."
 
 #: ../shell/shell.error.xml.h:31
-#, fuzzy
 msgid "_Forget"
-msgstr "_Porta:"
+msgstr "_Dimentica"
 
 # Novell Translation
 #: ../shell/shell.error.xml.h:32
@@ -17835,9 +17826,8 @@ msgid "Shutting down %s (%s)\n"
 msgstr "Chiusura %s (%s)\n"
 
 #: ../ui/evolution-addressbook.xml.h:3
-#, fuzzy
 msgid "Copy Selected Contacts to Another Folder..."
-msgstr "Copia contatti in altra cartella..."
+msgstr "Copia contatti selezionati su un'altra cartella..."
 
 #: ../ui/evolution-addressbook.xml.h:4 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
@@ -17856,9 +17846,8 @@ msgid "Delete selected contacts"
 msgstr "Elimina contatti selezionati"
 
 #: ../ui/evolution-addressbook.xml.h:11
-#, fuzzy
 msgid "Move Selected Contacts to Another Folder..."
-msgstr "Sposta contatti in altra cartella..."
+msgstr "Sposta contatti selezionati su un'altra cartella..."
 
 #: ../ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
@@ -18098,9 +18087,8 @@ msgid "Create a new folder for storing mail"
 msgstr "Crea una cartella per memorizzare la posta"
 
 #: ../ui/evolution-mail-global.xml.h:5
-#, fuzzy
 msgid "Create or edit Search Folder definitions"
-msgstr "Crea o modifica le definizioni di cartella vFolder"
+msgstr "Crea o modifica le definizioni di cartella di ricerca"
 
 #: ../ui/evolution-mail-global.xml.h:6
 msgid "Create or edit rules for filtering new mail"
@@ -18108,7 +18096,7 @@ msgstr "Crea o modifica le regole per filtrare la nuova posta"
 
 #: ../ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
-msgstr "Svuota _cestino"
+msgstr "S_vuota cestino"
 
 #: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:7
 #: ../ui/evolution-subscribe.xml.h:2
@@ -18135,7 +18123,7 @@ msgstr ""
 
 #: ../ui/evolution-mail-global.xml.h:14
 msgid "Search F_olders"
-msgstr "Ricerca c_artella"
+msgstr "C_artelle di ricerca"
 
 #: ../ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
@@ -18223,9 +18211,8 @@ msgid "Permanently remove this folder"
 msgstr "Rimuove permanentemente questa cartella"
 
 #: ../ui/evolution-mail-list.xml.h:17
-#, fuzzy
 msgid "Select Message _Thread"
-msgstr "Tutte intestazioni _messaggio"
+msgstr "Seleziona _discussione messaggio"
 
 #: ../ui/evolution-mail-list.xml.h:18
 msgid "Select _All Messages"
@@ -18320,24 +18307,20 @@ msgid "Create R_ule"
 msgstr "Crea _regola"
 
 #: ../ui/evolution-mail-message.xml.h:16
-#, fuzzy
 msgid "Create a Search Folder for these recipients"
-msgstr "Crea una cartella vFolder per questi destinatari"
+msgstr "Crea una cartella di ricerca per questi destinatari"
 
 #: ../ui/evolution-mail-message.xml.h:17
-#, fuzzy
 msgid "Create a Search Folder for this mailing list"
-msgstr "Crea una cartella vFolder per questa mailing list"
+msgstr "Crea una cartella di ricerca per questa mailing list"
 
 #: ../ui/evolution-mail-message.xml.h:18
-#, fuzzy
 msgid "Create a Search Folder for this sender"
-msgstr "Crea una cartella vFolder per queato mittente"
+msgstr "Crea una cartella di ricerca per queato mittente"
 
 #: ../ui/evolution-mail-message.xml.h:19
-#, fuzzy
 msgid "Create a Search Folder for this subject"
-msgstr "Crea una cartella vFolder per questo oggetto"
+msgstr "Crea una cartella di ricerca per questo oggetto"
 
 #: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a rule to filter messages from this sender"
@@ -18473,7 +18456,7 @@ msgstr "Segna i messaggi selezionati per l'eliminazione"
 
 #: ../ui/evolution-mail-message.xml.h:57
 msgid "Message Source"
-msgstr ""
+msgstr "Sorgente messaggio"
 
 #: ../ui/evolution-mail-message.xml.h:58
 msgid "Move"
@@ -18516,9 +18499,8 @@ msgid "P_revious Unread Message"
 msgstr "Messaggio non letto p_recedente"
 
 #: ../ui/evolution-mail-message.xml.h:70
-#, fuzzy
 msgid "Pos_t New Message to Folder"
-msgstr "Pubblica un messaggio su una cartella pubblica"
+msgstr "Pu_bblica nuovo messaggio su cartella"
 
 #: ../ui/evolution-mail-message.xml.h:71
 msgid "Post a Repl_y"
@@ -18561,24 +18543,20 @@ msgid "Save the message as a text file"
 msgstr "Salva il messaggio come un file di testo"
 
 #: ../ui/evolution-mail-message.xml.h:87
-#, fuzzy
 msgid "Search Folder from Mailing _List..."
-msgstr "Cartella vFolder su mailing _list..."
+msgstr "Cartella di ricerca da mailing _list..."
 
 #: ../ui/evolution-mail-message.xml.h:88
-#, fuzzy
 msgid "Search Folder from Recipients..."
-msgstr "Cartella vFolder su _destinatari..."
+msgstr "Cartella di ricerca da _destinatari..."
 
 #: ../ui/evolution-mail-message.xml.h:89
-#, fuzzy
 msgid "Search Folder from S_ubject..."
-msgstr "Cartella vFolder su _oggetto..."
+msgstr "Cartella di ricerca da _oggetto..."
 
 #: ../ui/evolution-mail-message.xml.h:90
-#, fuzzy
 msgid "Search Folder from Sen_der..."
-msgstr "Cartella vFolder su _mittente..."
+msgstr "Cartella di ricerca da _mittente..."
 
 #: ../ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
@@ -18625,7 +18603,6 @@ msgid "Zoom _Out"
 msgstr "Rid_uci ingrandimento"
 
 #: ../ui/evolution-mail-message.xml.h:102
-#, fuzzy
 msgid "_Caret Mode"
 msgstr "_Modalità visualizzazione cursore"
 
@@ -18731,6 +18708,8 @@ msgstr "Allega un file"
 #: ../ui/evolution-message-composer.xml.h:3
 msgid "Check to get delivery notification when your message is read"
 msgstr ""
+"Attivare per ottenere una notifica di consegna quando il proprio messaggio "
+"viene letto"
 
 #.
 #. <cmd name="FileSave" _label="Save"
@@ -18777,9 +18756,8 @@ msgid "PGP Sign"
 msgstr "Firma PGP"
 
 #: ../ui/evolution-message-composer.xml.h:15
-#, fuzzy
 msgid "Request read receipt"
-msgstr "Ricevute di lettura"
+msgstr "Richiesta ricevute di lettura"
 
 #: ../ui/evolution-message-composer.xml.h:16
 msgid "S/MIME Encrypt"
@@ -18794,9 +18772,8 @@ msgid "Save As"
 msgstr "Salva come"
 
 #: ../ui/evolution-message-composer.xml.h:20
-#, fuzzy
 msgid "Save Draft"
-msgstr "Salva _bozza"
+msgstr "Salva bozza"
 
 #: ../ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
@@ -19140,7 +19117,7 @@ msgstr "Solo _icone"
 
 #: ../ui/evolution.xml.h:40
 msgid "_Import..."
-msgstr "_Importa..."
+msgstr "Im_porta..."
 
 #: ../ui/evolution.xml.h:41
 msgid "_New"
@@ -19156,7 +19133,7 @@ msgstr "_Esci"
 
 #: ../ui/evolution.xml.h:44
 msgid "_Send / Receive"
-msgstr "_Invia/Ricevi"
+msgstr "Invia/_Ricevi"
 
 #: ../ui/evolution.xml.h:45
 msgid "_Switcher Appearance"
@@ -19338,9 +19315,8 @@ msgid "Name of new view:"
 msgstr "Nome della nuova vista:"
 
 #: ../widgets/menus/gal-view-new-dialog.glade.h:3
-#, fuzzy
 msgid "Type of View"
-msgstr "Tipo di vista:"
+msgstr "Tipo di vista"
 
 #: ../widgets/menus/gal-view-new-dialog.glade.h:4
 msgid "Type of view:"
@@ -20039,9 +20015,8 @@ msgid "No grouping"
 msgstr "Non raggruppato"
 
 #: ../widgets/table/e-table-config.c:584
-#, fuzzy
 msgid "Available Fields"
-msgstr "Campi _disponibili:"
+msgstr "Campi disponibili"
 
 #: ../widgets/table/e-table-config.glade.h:17
 msgid "_Group By..."
@@ -20283,16 +20258,15 @@ msgstr "Disegna linee ed espansori +/-."
 
 #: ../widgets/text/e-entry-test.c:49
 msgid "Minicard Test"
-msgstr ""
+msgstr "Test minicard"
 
 #: ../widgets/text/e-entry-test.c:50
 msgid "Copyright (C) 2000, Helix Code, Inc."
 msgstr "Copyright (C) 2000, Helix Code, Inc."
 
 #: ../widgets/text/e-entry-test.c:52
-#, fuzzy
 msgid "This should test the minicard canvas item"
-msgstr "Questo dovrebbe controllare il codice di stampa contatti"
+msgstr "Questo dovrebbe verificare gli oggetti di tela minicard"
 
 #: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
 #: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
@@ -20365,7 +20339,7 @@ msgstr "Posizione cursore"
 
 #: ../widgets/text/e-entry.c:1389 ../widgets/text/e-entry.c:1390
 msgid "Emulate label resize"
-msgstr ""
+msgstr "Emula ridimensionamento etichetta"
 
 #: ../widgets/text/e-text.c:2696
 msgid "Input Methods"
diff --git a/po/ko.po b/po/ko.po
index 12849301a7..1755469df3 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,10 +5,10 @@
 # Changwoo Ryu <cwryu@debian.org>, 2003-2005.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.1.5\n"
+"Project-Id-Version: evolution 2.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-11 17:30+0200\n"
-"PO-Revision-Date: 2005-02-21 23:58+0900\n"
+"POT-Creation-Date: 2005-11-29 22:36+0900\n"
+"PO-Revision-Date: 2005-11-30 01:08+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"
@@ -39,7 +39,7 @@ msgid_plural "current addressbook folder has %d cards"
 msgstr[0] "현재 주소록 폴더에 카드 %d개가 들어 있습니다"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../calendar/gui/alarm-notify/alarm-queue.c:953
+#: ../calendar/gui/alarm-notify/alarm-queue.c:965
 #: ../ui/evolution-message-composer.xml.h:11
 msgid "Open"
 msgstr "열기"
@@ -97,7 +97,7 @@ msgstr "새 약속"
 msgid "New All Day Event"
 msgstr "새 하루 종일 행사"
 
-#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1505
+#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1522
 msgid "New Meeting"
 msgstr "새 모임"
 
@@ -292,9 +292,8 @@ msgid "click"
 msgstr "클릭"
 
 #: ../a11y/e-table/gal-a11y-e-table-column-header.c:135
-#, fuzzy
 msgid "sort"
-msgstr "정렬 안함"
+msgstr "정렬"
 
 #: ../a11y/widgets/ea-calendar-item.c:296
 #: ../a11y/widgets/ea-calendar-item.c:302
@@ -323,13 +322,12 @@ msgid "Popup Menu"
 msgstr "팝업 메뉴"
 
 #: ../addressbook/addressbook.error.xml.h:1
-#, fuzzy
 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:2
 msgid "Address '{0}' already exists."
@@ -370,9 +368,8 @@ msgid "Error loading addressbook."
 msgstr "주소록을 읽어들이는 데 오류가 발생했습니다."
 
 #: ../addressbook/addressbook.error.xml.h:10
-#, fuzzy
 msgid "Error saving {0} to {1}: {2}"
-msgstr "연락처를 {0}에 저장하는 데 오류가 발생했습니다: {1}"
+msgstr "{0}을(를) {1}에 저장하는 데 오류가 발생했습니다: {2}"
 
 #: ../addressbook/addressbook.error.xml.h:11
 msgid "Failed to authenticate with LDAP server."
@@ -388,9 +385,8 @@ msgstr "서버 버전"
 
 #: ../addressbook/addressbook.error.xml.h:14
 #: ../calendar/calendar.error.xml.h:44
-#, fuzzy
 msgid "Some features may not work properly with your current server"
-msgstr "이 서버 버전으로는 일부 기능이 제대로 동작하지 않을 수도 있습니다"
+msgstr "이 서버에서는 일부 기능이 제대로 동작하지 않을 수도 있습니다"
 
 #: ../addressbook/addressbook.error.xml.h:15
 msgid "The Evolution addressbook has quit unexpectedly."
@@ -399,7 +395,7 @@ msgstr "Evolution 주소록이 갑자기 끝났습니다."
 #: ../addressbook/addressbook.error.xml.h:16
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
-msgstr ""
+msgstr "선택한 그림 크기가 큽니다. 크기를 조정해서 저장하시겠습니까?"
 
 #: ../addressbook/addressbook.error.xml.h:17
 msgid ""
@@ -443,9 +439,8 @@ msgid "Unable to perform search."
 msgstr "찾기를 수행할 수 없습니다."
 
 #: ../addressbook/addressbook.error.xml.h:25
-#, fuzzy
 msgid "Unable to save {0}."
-msgstr "연락처를 저장할 수 없습니다."
+msgstr "{0}을(를) 저장할 수 없습니다."
 
 #: ../addressbook/addressbook.error.xml.h:26
 msgid "Would you like to save your changes?"
@@ -466,6 +461,9 @@ msgid ""
 "problems using Evolution. For best results the server should be upgraded to "
 "a supported version"
 msgstr ""
+"지원하지 않는 GroupWise 서버에 연결되어 있기 때문에 Evolution을 사용하면서 문"
+"제가 발생할 수도 있습니다. 서버를 지원하는 버전으로 업그레이드하는 게 가장 좋"
+"습니다."
 
 #: ../addressbook/addressbook.error.xml.h:29
 msgid ""
@@ -479,7 +477,7 @@ msgid ""
 msgstr ""
 "Evolution을 다시 시작할 때 까지는 {0}에 대한 연락처를 사용할 수 없습니다."
 
-#: ../addressbook/addressbook.error.xml.h:31 ../mail/em-vfolder-rule.c:494
+#: ../addressbook/addressbook.error.xml.h:31 ../mail/em-vfolder-rule.c:495
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
@@ -646,7 +644,7 @@ msgstr "종류(_T):"
 
 #: ../addressbook/gui/component/addressbook-config.c:607
 msgid "Copy book content locally for offline operation"
-msgstr "오프라인 작업을 위해 주소록 내용을 로컬에서 복사합니다"
+msgstr "오프라인 작업을 위해 주소록 내용을 로컬에 복사합니다"
 
 #: ../addressbook/gui/component/addressbook-config.c:902
 #: ../addressbook/gui/component/ldap-config.glade.h:23
@@ -774,12 +772,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "익명으로 LDAP 서버 사용"
 
 #: ../addressbook/gui/component/addressbook.c:191
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:485
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:490
 msgid "Failed to authenticate.\n"
 msgstr "인증하는 데 실패했습니다.\n"
 
 #: ../addressbook/gui/component/addressbook.c:198
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:464
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:469
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s(사용자 %s)의 열쇠글을 입력하십시오"
@@ -1072,7 +1070,6 @@ msgid "_Find Possible Search Bases"
 msgstr "가능한 찾기 기준 찾기(_F)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:46
-#, fuzzy
 msgid "_Login method:"
 msgstr "로그인 방법(_L):"
 
@@ -2417,9 +2414,9 @@ msgstr "바뀜"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:535
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:2348
-#, fuzzy, c-format
+#, c-format
 msgid "Contact Editor - %s"
-msgstr "연락처 편집기"
+msgstr "연락처 편집 - %s"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:2661
 msgid "Please select an image for this contact"
@@ -2458,30 +2455,29 @@ msgid "E-_mail:"
 msgstr "전자메일(_M):"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:323
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Are you sure you want\n"
 "to delete contact list (%s) ?"
 msgstr ""
-"정말로 이 계정을\n"
+"정말로 연락처 목록을 (%s)\n"
 "지우시겠습니까?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:326
-#, fuzzy
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
 msgstr ""
-"정말로 이 계정을\n"
+"정말로 이 연락처 목록을\n"
 "지우시겠습니까?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:331
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Are you sure you want\n"
 "to delete contact (%s) ?"
 msgstr ""
-"정말로 이 계정을\n"
+"정말로 이 연락처를 (%s)\n"
 "지우시겠습니까?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:334
@@ -2592,8 +2588,8 @@ msgstr "메신저 서비스(_I):"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:215
-#: ../plugins/exchange-operations/exchange-contacts.c:193
+#: ../plugins/exchange-operations/exchange-calendar.c:224
+#: ../plugins/exchange-operations/exchange-contacts.c:203
 msgid "_Location:"
 msgstr "위치(_L):"
 
@@ -2611,7 +2607,6 @@ msgid "Contact List Editor"
 msgstr "연락처 목록 편집기"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#, fuzzy
 msgid "Insert email addresses from Address Book"
 msgstr "주소록에서 전자메일 주소를 가져와 넣습니다"
 
@@ -2782,14 +2777,14 @@ msgstr "주소록"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:807
 #: ../addressbook/gui/widgets/e-addressbook-view.c:936
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2011
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ../ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "VCard로 저장..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:930
-#: ../calendar/gui/e-calendar-table.c:1154
-#: ../calendar/gui/e-calendar-view.c:1528 ../ui/evolution-addressbook.xml.h:37
+#: ../calendar/gui/e-calendar-table.c:1167
+#: ../calendar/gui/e-calendar-view.c:1545 ../ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "열기(_O)"
 
@@ -2807,26 +2802,23 @@ msgid "Forward Contact"
 msgstr "주소 전달"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:938
-#, fuzzy
 msgid "Forward Contacts"
-msgstr "주소 전달"
+msgstr "연락처 전달"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "Send Message to Contact"
 msgstr "연락처로 메세지 보내기"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:940
-#, fuzzy
 msgid "Send Message to List"
-msgstr "연락처로 메세지 보내기"
+msgstr "리스트로 메세지 보내기"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:941
-#, fuzzy
 msgid "Send Message to Contacts"
 msgstr "연락처로 메세지 보내기"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:942
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2501
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2510
 #: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
 #: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
@@ -2858,12 +2850,12 @@ msgid "Paste"
 msgstr "붙여 넣기"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1562
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1565
 #: ../calendar/gui/cal-search-bar.c:346
 msgid "Any Category"
 msgstr "모든 분류"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1761
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1766
 msgid "Print cards"
 msgstr "카드 인쇄"
 
@@ -2907,7 +2899,7 @@ msgid "Company Phone"
 msgstr "회사 전화"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:564
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 #: ../smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "전자메일"
@@ -3205,7 +3197,7 @@ msgid "WWW"
 msgstr "WWW"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:378
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
 msgid "Blog"
 msgstr "블로그"
 
@@ -3213,11 +3205,11 @@ msgstr "블로그"
 msgid "personal"
 msgstr "개인"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "직함"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "홈페이지"
 
@@ -3276,7 +3268,7 @@ msgstr "프로토콜이 지원되지 않습니다"
 #: ../calendar/gui/e-cal-component-preview.c:232
 #: ../calendar/gui/e-cal-model-tasks.c:348
 #: ../calendar/gui/e-cal-model-tasks.c:661
-#: ../calendar/gui/e-calendar-table.c:456 ../calendar/gui/print.c:2364
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2373
 msgid "Cancelled"
 msgstr "취소됨"
 
@@ -3309,20 +3301,18 @@ msgstr "그런 소스가 없습니다"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
 #: ../addressbook/gui/widgets/eab-gui-util.c:68
-#, fuzzy
 msgid "Not available in offline mode"
-msgstr "오프라인 모드에서 시작"
+msgstr "오프라인 모드에서는 사용할 수 없습니다"
 
 #. E_BOOK_ERROR_OTHER_ERROR
 #: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Other error"
-msgstr "다른 오류"
+msgstr "기타 오류"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
 #: ../addressbook/gui/widgets/eab-gui-util.c:70
-#, fuzzy
 msgid "Invalid server version"
-msgstr "서버 버전"
+msgstr "서버 버전이 잘못되었습니다"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:93
 msgid ""
@@ -3335,13 +3325,13 @@ msgstr ""
 "드에서 주소록을 다시 읽어들여서 그 내용을 내려 받으십시오."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy, c-format
+#, 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 ""
-"이 주소록을 열 수 없습니다.  해당 경로가 있고 그 경로에 접근할 권한이 있는 "
-"지 확인하십시오."
+"이 주소록을 열 수 없습니다.  해당 경로가 (%s) 있고 그 경로에 접근할 권한이 있"
+"는 지 확인하십시오."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:110
 msgid ""
@@ -3459,7 +3449,6 @@ msgstr "덮어 쓰기"
 #.
 #: ../addressbook/gui/widgets/eab-gui-util.c:368
 #: ../addressbook/gui/widgets/eab-gui-util.c:371
-#, fuzzy
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "연락처"
@@ -3566,21 +3555,20 @@ msgstr "카드: "
 msgid "GTK Tree View"
 msgstr "GTk 트리 뷰"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:486
+#: ../addressbook/importers/evolution-ldif-importer.c:582
 #: ../addressbook/importers/evolution-vcard-importer.c:249
 #: ../calendar/importers/icalendar-importer.c:311
 #: ../calendar/importers/icalendar-importer.c:643 ../shell/shell.error.xml.h:6
-#, fuzzy
 msgid "Importing ..."
 msgstr "가져오는 중..."
 
-#: ../addressbook/importers/evolution-ldif-importer.c:652
+#: ../addressbook/importers/evolution-ldif-importer.c:748
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP 데이터 교환 형식 (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:653
+#: ../addressbook/importers/evolution-ldif-importer.c:749
 msgid "Evolution LDIF importer"
-msgstr "Evolution LDIF 가져오기"
+msgstr "Evolution LDIF 가져오기 프로그램"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:529
 msgid "VCard (.vcf, .gcrd)"
@@ -3588,19 +3576,19 @@ msgstr "vcard (.vcf, .gcrd)"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:530
 msgid "Evolution VCard Importer"
-msgstr "Evolution VCard 가져오기"
+msgstr "Evolution VCard 가져오기 프로그램"
 
 #: ../addressbook/printing/e-contact-print-envelope.c:213
 #: ../addressbook/printing/e-contact-print-envelope.c:234
 msgid "Print envelope"
 msgstr "봉투 인쇄"
 
-#: ../addressbook/printing/e-contact-print.c:1001
+#: ../addressbook/printing/e-contact-print.c:1026
 msgid "Print contacts"
 msgstr "연락처 인쇄"
 
-#: ../addressbook/printing/e-contact-print.c:1066
-#: ../addressbook/printing/e-contact-print.c:1093
+#: ../addressbook/printing/e-contact-print.c:1116
+#: ../addressbook/printing/e-contact-print.c:1144
 msgid "Print contact"
 msgstr "연락처 인쇄"
 
@@ -3753,9 +3741,9 @@ msgstr "명암"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:917
-#: ../plugins/exchange-operations/exchange-calendar.c:205
-#: ../plugins/exchange-operations/exchange-contacts.c:176
+#: ../plugins/exchange-operations/exchange-account-setup.c:939
+#: ../plugins/exchange-operations/exchange-calendar.c:214
+#: ../plugins/exchange-operations/exchange-contacts.c:186
 msgid "Size:"
 msgstr "크기:"
 
@@ -3894,12 +3882,16 @@ msgid ""
 " There are few attachments getting downloaded. Saving the appointment will "
 "cause the appointment to be saved without those pending attachments "
 msgstr ""
+"내려받는 중인 첨부가 있습니다. 약속을 지금 저장하면 내려받는 중인 첨부 없이 "
+"저장하게 됩니다."
 
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
 " There are few attachments getting downloaded. Saving the task will cause "
 "the task to be saved without those pending attachments "
 msgstr ""
+"내려받는 중인 첨부가 있습니다. 작업을 지금 저장하면 내려받는 중인 첨부 없이 "
+"저장하게 됩니다."
 
 #: ../calendar/calendar.error.xml.h:3
 msgid ""
@@ -4026,18 +4018,16 @@ msgid "Don't Send"
 msgstr "보내지 않음"
 
 #: ../calendar/calendar.error.xml.h:29
-#, fuzzy
 msgid "Download in progress. Do you want to save the appointment?"
-msgstr "정말로 이 약속을 지우시겠습니까?"
+msgstr "내려받는 중입니다. 이 약속을 저장하시겠습니까?"
 
 #: ../calendar/calendar.error.xml.h:30
 msgid "Download in progress. Do you want to save the task?"
-msgstr ""
+msgstr "내려받는 중입니다. 이 작업을 저장하시겠습니까?"
 
 #: ../calendar/calendar.error.xml.h:31
-#, fuzzy
 msgid "Editor could not be loaded."
-msgstr "주소록을 열 수 없습니다."
+msgstr "편집 창을 읽어들일 수 없습니다."
 
 #: ../calendar/calendar.error.xml.h:32
 msgid ""
@@ -4200,7 +4190,7 @@ msgstr "보내기(_S)"
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:301
+#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:322
 #: ../smime/gui/component.c:48
 msgid "Enter password"
 msgstr "열쇠글을 입력하십시오"
@@ -4210,15 +4200,15 @@ msgstr "열쇠글을 입력하십시오"
 msgid "Split Multi-Day Events:"
 msgstr "여러 날에 걸친 행사 분리:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1365
-#: ../calendar/conduits/calendar/calendar-conduit.c:1366
+#: ../calendar/conduits/calendar/calendar-conduit.c:1377
+#: ../calendar/conduits/calendar/calendar-conduit.c:1378
 #: ../calendar/conduits/todo/todo-conduit.c:879
 #: ../calendar/conduits/todo/todo-conduit.c:880
 msgid "Could not start evolution-data-server"
 msgstr "evolution-data-server를 시작할 수 없습니다"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1474
-#: ../calendar/conduits/calendar/calendar-conduit.c:1477
+#: ../calendar/conduits/calendar/calendar-conduit.c:1486
+#: ../calendar/conduits/calendar/calendar-conduit.c:1489
 msgid "Could not read pilot's Calendar application block"
 msgstr "파일롯의 Calendar 프로그램 블록을 읽을 수 없습니다"
 
@@ -4269,13 +4259,13 @@ msgid "Evolution's Tasks component"
 msgstr "Evolution 작업 컴포넌트"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#: ../calendar/gui/e-tasks.c:1257 ../calendar/gui/print.c:1822
+#: ../calendar/gui/e-tasks.c:1282 ../calendar/gui/print.c:1831
 #: ../calendar/gui/tasks-component.c:519
-#: ../calendar/gui/tasks-component.c:1006 ../calendar/gui/tasks-control.c:457
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:456
 #: ../calendar/importers/icalendar-importer.c:79
 #: ../calendar/importers/icalendar-importer.c:707
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:582
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:589
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "작업"
@@ -4299,21 +4289,21 @@ msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "분"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:248
-#, fuzzy
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:250
 msgid "Start time"
-msgstr "시작 시각:"
+msgstr "시작 시각"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:349
 #, c-format
 msgid ""
 "<big><b>%s</b></big>\n"
 "%s until %s"
 msgstr ""
+"<big><b>%s</b></big>\n"
+"%s부터 %s까지"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
-#, fuzzy
 msgid "Appointments"
 msgstr "약속"
 
@@ -4352,33 +4342,32 @@ msgid "description of appointment"
 msgstr "약속 설명"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
-#, fuzzy
 msgid "location of appointment"
-msgstr "약속 설명"
+msgstr "약속 장소"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:954
+#: ../calendar/gui/alarm-notify/alarm-queue.c:966
 msgid "Dismiss"
 msgstr "없애기"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:955
+#: ../calendar/gui/alarm-notify/alarm-queue.c:967
 msgid "Dismiss All"
 msgstr "모두 없애기"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1037
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1049
 msgid "No summary available."
 msgstr "요약이 없습니다."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1046
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1048
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1058
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1060
 msgid "No description available."
 msgstr "설명이 없습니다."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1056
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1068
 msgid "No location information available."
 msgstr "위치 정보가 없습니다."
 
 # Alarm -> 알림, Microsoft Office XP 참고
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1072
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1084
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -4391,13 +4380,13 @@ msgstr ""
 "시작: %s\n"
 "끝: %s"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1175
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1199
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1187
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1211
 msgid "Warning"
 msgstr "경고"
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1179
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1191
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4410,7 +4399,7 @@ msgstr ""
 "보내는 대신 일반적인 미리 알림 대화 상자를 표시합니다."
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1205
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1217
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4427,15 +4416,15 @@ msgstr ""
 "\n"
 "정말로 이 프로그램을 실행하시겠습니까?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1219
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1231
 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:147
 msgid "Could not initialize Bonobo"
 msgstr "보노보를 초기화 할 수 없습니다"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:151
+#: ../calendar/gui/alarm-notify/notify-main.c:158
 msgid "Could not create the alarm notify service factory"
 msgstr "알림 기능 서비스 팩토리를 만들 수가 없습니다"
 
@@ -4466,11 +4455,11 @@ msgstr "알림을 실행할 달력"
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
-msgstr ""
+msgstr "시간 막대에 마커스 베인스 라인을 그릴 색 (기본값은 비어 있음)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
 msgid "Color to draw the Marcus Bains line in the Day View."
-msgstr ""
+msgstr "하루씩 볼 때 마커스 베인스 라인을 그릴 색."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
 msgid "Compress weekends in month view"
@@ -4548,15 +4537,15 @@ msgstr "약속 있음/없음 정보를 게시할 서버 URL 목록."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
-msgstr ""
+msgstr "마커스 베인 라인"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
-msgstr ""
+msgstr "마커스 베인 라인 색 - 날짜별 보기"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
-msgstr ""
+msgstr "마커스 베인 라인 색 - 시간 막대"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
@@ -4604,7 +4593,6 @@ msgstr ""
 "단위."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
-#, fuzzy
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -4664,9 +4652,7 @@ msgstr ""
 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 ""
-"약속 있음/없음 데이터 대체품으로 사용할 URL 템플리트, %u는 전자메일 주소의 사"
-"용자 부분, %d는 도메인으로 바뀝니다."
+msgstr "약속 있음/없음 데이터 대체품으로 사용할 URL 템플리트, %u은(는) 전자메일 주소의 사용자 부분, %d은(는) 도메인으로 바뀝니다."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Time divisions"
@@ -4728,7 +4714,7 @@ msgstr "한 주씩 보거나 한 달씩 볼 때 행사 끝나는 시간 표시�
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-msgstr ""
+msgstr "달력에 마커스 베인스 라인을 (해당 시간대에 직선) 그릴 지 여부."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Whether to hide completed tasks in the tasks view."
@@ -4791,10 +4777,10 @@ msgstr "맞지 않음"
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:708
 #: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/gnome-cal.c:2094
+#: ../calendar/gui/gnome-cal.c:2116
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:581
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:588
 msgid "Calendar"
 msgstr "달력"
 
@@ -5113,7 +5099,7 @@ msgstr "지우기(_R)"
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:474
 #: ../calendar/gui/dialogs/comp-editor.c:1084
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3401 ../mail/em-folder-tree.c:2047
+#: ../composer/e-msg-composer.c:3401 ../mail/em-folder-tree.c:2052
 #: ../ui/evolution-mail-list.xml.h:29
 msgid "_Properties"
 msgstr "등록 정보(_P)"
@@ -5203,29 +5189,29 @@ msgstr "MIME 형식:"
 msgid "Enabled"
 msgstr "사용"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:733
 msgid "Are you sure you want to remove this URL?"
 msgstr "정말로 이 URL을 지우시겠습니까?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:736
 msgid "Remove"
 msgstr "지우기"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:738
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:741
 msgid "Don't Remove"
 msgstr "지우지 않기"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:853
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:823
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:856
 #: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
 #: ../mail/em-account-prefs.c:406
 msgid "Disable"
 msgstr "사용 않기"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:855
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:823
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:858
 #: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
 #: ../mail/em-account-prefs.c:408
 msgid "Enable"
@@ -5322,7 +5308,7 @@ msgid "Free/Busy"
 msgstr "약속 있음/없음"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/dialogs/recurrence-page.c:1049
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Friday"
 msgstr "금요일"
@@ -5336,23 +5322,21 @@ msgid "Minutes"
 msgstr "분"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Monday"
 msgstr "월요일"
 
-# free/busy -> 약속 있음/없음, Microsoft Office XP 참고
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#, fuzzy
 msgid "Publishing Table"
-msgstr "<b>게시</b>"
+msgstr "게시 테이블"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "S_un"
 msgstr "일(_U)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
+#: ../calendar/gui/dialogs/recurrence-page.c:1050
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Saturday"
 msgstr "토요일"
@@ -5368,7 +5352,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "날짜 선택할 때 몇 번째 주인지 표시(_N)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1051
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Sunday"
 msgstr "일요일"
@@ -5386,7 +5370,7 @@ msgid "Template:"
 msgstr "템플리트:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1048
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Thursday"
 msgstr "목요일"
@@ -5400,7 +5384,7 @@ msgid "Time format:"
 msgstr "시간 형식:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Tuesday"
 msgstr "화요일"
@@ -5410,7 +5394,7 @@ msgid "W_eek starts:"
 msgstr "시작 요일(_E):"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 #: ../calendar/gui/e-itip-control.c:732
 msgid "Wednesday"
 msgstr "수요일"
@@ -5496,12 +5480,11 @@ msgstr "시간 단위를 결정하는 옵션 메뉴"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:287
 msgid "Copy calendar contents locally for offline operation"
-msgstr "오프라인 작업을 위해 달력 내용을 로컬에서 복사합니다"
+msgstr "오프라인 작업을 위해 달력 내용을 로컬에 복사합니다"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:290
-#, fuzzy
 msgid "Copy task list contents locally for offline operation"
-msgstr "오프라인 작업을 위해 주소록 내용을 로컬에서 복사합니다"
+msgstr "오프라인 작업을 위해 작업 목록 내용을 로컬에 복사합니다"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:341
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
@@ -5616,27 +5599,27 @@ 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:2261
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2270
 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:2265
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2274
 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:2267
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2276
 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:2272
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2281
 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:2274
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2283
 msgid "Due "
 msgstr "기한 "
 
@@ -5655,9 +5638,9 @@ msgid_plural "%d attached messages"
 msgstr[0] "첨부한 메세지 %d개"
 
 #: ../calendar/gui/dialogs/comp-editor.c:428
-#: ../calendar/gui/e-calendar-table.c:1162
-#: ../calendar/gui/e-calendar-view.c:1535 ../composer/e-msg-composer.c:2911
-#: ../mail/em-folder-tree.c:974 ../mail/em-folder-view.c:1035
+#: ../calendar/gui/e-calendar-table.c:1175
+#: ../calendar/gui/e-calendar-view.c:1552 ../composer/e-msg-composer.c:2911
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1035
 #: ../mail/message-list.c:1708 ../ui/evolution-addressbook.xml.h:31
 #: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
 #: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-tasks.xml.h:21
@@ -5665,13 +5648,13 @@ msgid "_Copy"
 msgstr "복사(_C)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:429 ../composer/e-msg-composer.c:2912
-#: ../mail/em-folder-tree.c:975 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
 #: ../mail/em-folder-view.c:931 ../mail/message-list.c:1709
 msgid "_Move"
 msgstr "이동(_M)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:431 ../composer/e-msg-composer.c:2914
-#: ../mail/em-folder-tree.c:977 ../mail/message-list.c:1711
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1711
 msgid "Cancel _Drag"
 msgstr "드래그 취소(_D)"
 
@@ -5680,15 +5663,14 @@ msgid "Could not update object"
 msgstr "오브젝트를 업데이트할 수 없습니다"
 
 #: ../calendar/gui/dialogs/comp-editor.c:977 ../composer/e-msg-composer.c:2318
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
-msgstr[0] "<b>%d</b>개의 파일이 첨부되었습니다"
+msgstr[0] "<b>%d</b>개 첨부"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1249
-#, fuzzy
 msgid "_Attachment Bar (drop attachments here)"
-msgstr "첨부 모음 숨기기 (여기에 첨부를 끌어옵니다)(_A)"
+msgstr "첨부 모음 (여기에 첨부를 끌어옵니다)(_A)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1850
 #: ../calendar/gui/dialogs/comp-editor.c:1893
@@ -5731,13 +5713,13 @@ msgstr "일지 항목 - %s"
 msgid "No summary"
 msgstr "요약 없음"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2528
-#: ../calendar/gui/dialogs/comp-editor.c:2561
-#: ../calendar/gui/dialogs/comp-editor.c:2585
+#: ../calendar/gui/dialogs/comp-editor.c:2532
+#: ../calendar/gui/dialogs/comp-editor.c:2565
+#: ../calendar/gui/dialogs/comp-editor.c:2589
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "업데이트가 도착하면 이 항목에 대해 바뀐 사항을 버립니다."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2609
+#: ../calendar/gui/dialogs/comp-editor.c:2613
 msgid "Unable to use current version!"
 msgstr "현재 버전을 사용할 수 없습니다!"
 
@@ -5821,7 +5803,7 @@ msgstr "대리인:"
 msgid "Enter Delegate"
 msgstr "대리인을 입력하십오"
 
-#: ../calendar/gui/dialogs/event-editor.c:141 ../calendar/gui/print.c:2298
+#: ../calendar/gui/dialogs/event-editor.c:141 ../calendar/gui/print.c:2307
 msgid "Appointment"
 msgstr "약속"
 
@@ -5836,12 +5818,10 @@ msgid "Scheduling"
 msgstr "계획"
 
 #: ../calendar/gui/dialogs/event-editor.c:174
-#, fuzzy
 msgid "Delegatees"
-msgstr "대리"
+msgstr "대리인"
 
 #: ../calendar/gui/dialogs/event-editor.c:178
-#, fuzzy
 msgid "Attendees"
 msgstr "참석자"
 
@@ -5966,7 +5946,7 @@ msgstr "분류(_F):"
 #: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:8
 #: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:360
+#: ../calendar/gui/e-calendar-table.c:364
 msgid "Confidential"
 msgstr "비밀"
 
@@ -5981,14 +5961,14 @@ msgstr "위치(_I):"
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 #: ../calendar/gui/dialogs/task-page.glade.h:10
 #: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:359
+#: ../calendar/gui/e-calendar-table.c:363
 msgid "Private"
 msgstr "개인"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:18
 #: ../calendar/gui/dialogs/task-page.glade.h:11
 #: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:358
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:362
 msgid "Public"
 msgstr "공개"
 
@@ -6024,14 +6004,12 @@ msgid "_Start time:"
 msgstr "시작 시각(_S):"
 
 #: ../calendar/gui/dialogs/meeting-page.c:303
-#, fuzzy
 msgid "<b>Dele_gatees</b>"
-msgstr "<b>서명(_I)</b>"
+msgstr "<b>대리인(_G)</b>"
 
 #: ../calendar/gui/dialogs/meeting-page.c:307
-#, fuzzy
 msgid "<b>From:</b>"
-msgstr "<b>집</b> "
+msgstr "<b>보낸 사람:</b>"
 
 #. an empty string is the same as 'None'
 #. Put the "None" and "UTC" entries at the top of the combo's list.
@@ -6090,12 +6068,12 @@ msgstr "공통 이름"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:4
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated From"
-msgstr "위임한 사람"
+msgstr "대리한 사람"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:5
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Delegated To"
-msgstr "위임받은 사람"
+msgstr "대리받은 사람"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:6
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
@@ -6114,7 +6092,7 @@ msgid "RSVP"
 msgstr "응답바람"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
-#: ../calendar/gui/dialogs/task-editor.c:147
+#: ../calendar/gui/dialogs/task-editor.c:146
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/e-meeting-list-view.c:394
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
@@ -6191,10 +6169,10 @@ msgstr "되풀이 행사를 고치려고 합니다. 무엇을 고치시겠습니
 
 # event -> 행사, Microsoft Office XP 참고
 #: ../calendar/gui/dialogs/recur-comp.c:54
-#, fuzzy
 msgid "You are delegating a recurring event, what would like to delegate?"
-msgstr "되풀이 행사를 고치려고 합니다. 무엇을 고치시겠습니까?"
+msgstr "되풀이 행사를 대리하려고 합니다. 무엇을 대리하시겠습니까?"
 
+# event -> 행사, Microsoft Office XP 참고
 #: ../calendar/gui/dialogs/recur-comp.c:58
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "되풀이 작업을 고치려고 합니다. 무엇을 고치시겠습니까?"
@@ -6221,55 +6199,55 @@ msgstr "이 경우 및 앞으로의 경우"
 msgid "All Instances"
 msgstr "모든 경우"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:496
+#: ../calendar/gui/dialogs/recurrence-page.c:497
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "이 약속에는 Evolution에서 편집할 수 있는 되풀이가 들어 있습니다."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:817
+#: ../calendar/gui/dialogs/recurrence-page.c:818
 msgid "Recurrence date is invalid"
 msgstr "되풀이되는 날짜가 잘못되었습니다"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:928
+#: ../calendar/gui/dialogs/recurrence-page.c:929
 msgid "on"
 msgstr "요일"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:988
+#: ../calendar/gui/dialogs/recurrence-page.c:989
 msgid "first"
 msgstr "첫번째"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:989
+#: ../calendar/gui/dialogs/recurrence-page.c:990
 msgid "second"
 msgstr "두번째"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:990
+#: ../calendar/gui/dialogs/recurrence-page.c:991
 msgid "third"
 msgstr "세번째"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:991
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "fourth"
 msgstr "네번째"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#: ../calendar/gui/dialogs/recurrence-page.c:993
 msgid "last"
 msgstr "마지막"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1015
+#: ../calendar/gui/dialogs/recurrence-page.c:1016
 msgid "Other Date"
 msgstr "기타 날짜"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "day"
 msgstr "일"
 
 # FIXME - hard to translate UI + string based on English grammar
 # "on the <month_menu>"
-#: ../calendar/gui/dialogs/recurrence-page.c:1180
+#: ../calendar/gui/dialogs/recurrence-page.c:1181
 msgid "on the"
 msgstr "달:"
 
 # FIXME - hard to translate UI + string based on English grammar
 # "for ... occurrences"
-#: ../calendar/gui/dialogs/recurrence-page.c:1369
+#: ../calendar/gui/dialogs/recurrence-page.c:1370
 msgid "occurrences"
 msgstr "번"
 
@@ -6345,15 +6323,15 @@ msgstr "<span weight=\"bold\">상태</span>"
 #: ../calendar/gui/e-cal-component-preview.c:229
 #: ../calendar/gui/e-cal-model-tasks.c:346
 #: ../calendar/gui/e-cal-model-tasks.c:659
-#: ../calendar/gui/e-calendar-table.c:455 ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/e-itip-control.c:898
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../calendar/gui/print.c:2361 ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/print.c:2370 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "완료됨"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-calendar-table.c:380 ../mail/message-list.c:1008
+#: ../calendar/gui/e-calendar-table.c:384 ../mail/message-list.c:1008
 msgid "High"
 msgstr "높음"
 
@@ -6362,19 +6340,19 @@ msgstr "높음"
 #: ../calendar/gui/e-cal-model-tasks.c:344
 #: ../calendar/gui/e-cal-model-tasks.c:657
 #: ../calendar/gui/e-cal-model-tasks.c:732
-#: ../calendar/gui/e-calendar-table.c:454 ../calendar/gui/print.c:2358
+#: ../calendar/gui/e-calendar-table.c:458 ../calendar/gui/print.c:2367
 msgid "In Progress"
 msgstr "진행중"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1006
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1006
 msgid "Low"
 msgstr "낮음"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:381
+#: ../calendar/gui/e-cal-model.c:920 ../calendar/gui/e-calendar-table.c:385
 #: ../mail/message-list.c:1007
 msgid "Normal"
 msgstr "보통"
@@ -6383,7 +6361,7 @@ msgstr "보통"
 #: ../calendar/gui/e-cal-component-preview.c:236
 #: ../calendar/gui/e-cal-model-tasks.c:342
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:453 ../calendar/gui/print.c:2355
+#: ../calendar/gui/e-calendar-table.c:457 ../calendar/gui/print.c:2364
 msgid "Not Started"
 msgstr "시작 안함"
 
@@ -6392,7 +6370,7 @@ msgid "P_ercent complete:"
 msgstr "퍼센트 완료(_E):"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:11
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:387
 msgid "Undefined"
 msgstr "정의안됨"
 
@@ -6413,13 +6391,13 @@ msgstr "상태(_S):"
 msgid "_Web Page:"
 msgstr "웹 페이지(_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:138 ../calendar/gui/print.c:2300
+#: ../calendar/gui/dialogs/task-editor.c:137 ../calendar/gui/print.c:2309
 msgid "Task"
 msgstr "작업"
 
-#: ../calendar/gui/dialogs/task-editor.c:162
-#: ../calendar/gui/dialogs/task-editor.c:224
-#: ../calendar/gui/dialogs/task-editor.c:378
+#: ../calendar/gui/dialogs/task-editor.c:161
+#: ../calendar/gui/dialogs/task-editor.c:223
+#: ../calendar/gui/dialogs/task-editor.c:380
 msgid "Assignment"
 msgstr "할당"
 
@@ -6604,7 +6582,7 @@ msgstr "마감 날짜:"
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:222
 #: ../calendar/gui/e-itip-control.c:1134
-#: ../plugins/exchange-operations/exchange-account-setup.c:263
+#: ../plugins/exchange-operations/exchange-account-setup.c:265
 #: ../plugins/itip-formatter/itip-view.c:909
 msgid "Status:"
 msgstr "상태:"
@@ -6632,12 +6610,12 @@ msgid "Summary"
 msgstr "요약"
 
 #: ../calendar/gui/e-cal-model-calendar.c:180
-#: ../calendar/gui/e-calendar-table.c:432
+#: ../calendar/gui/e-calendar-table.c:436
 msgid "Free"
 msgstr "약속 없음"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:433
+#: ../calendar/gui/e-calendar-table.c:437
 #: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Busy"
 msgstr "약속 있음"
@@ -6652,7 +6630,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:926
 #: ../calendar/gui/e-meeting-list-view.c:192
 #: ../calendar/gui/e-meeting-store.c:168 ../calendar/gui/e-meeting-store.c:178
 #: ../calendar/gui/e-meeting-store.c:808
@@ -6660,7 +6638,7 @@ msgstr ""
 msgid "Yes"
 msgstr "예"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:926
 #: ../calendar/gui/e-meeting-list-view.c:193
 #: ../calendar/gui/e-meeting-store.c:180
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
@@ -6682,140 +6660,140 @@ msgstr "아니오"
 msgid "Unknown"
 msgstr "알 수 없음"
 
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Recurring"
 msgstr "반복됨"
 
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:924
 msgid "Assigned"
 msgstr "예약됨"
 
-#: ../calendar/gui/e-calendar-table.c:402
+#: ../calendar/gui/e-calendar-table.c:406
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:403
+#: ../calendar/gui/e-calendar-table.c:407
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:404
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:405
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:407
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:514
+#: ../calendar/gui/e-calendar-table.c:518
 msgid "Task Table"
 msgstr "작업 표"
 
-#: ../calendar/gui/e-calendar-table.c:692
-#: ../calendar/gui/e-calendar-view.c:661
+#: ../calendar/gui/e-calendar-table.c:696
+#: ../calendar/gui/e-calendar-view.c:671
 msgid "Deleting selected objects"
 msgstr "선택한 오브젝트를 지우는 중입니다"
 
-#: ../calendar/gui/e-calendar-table.c:871
-#: ../calendar/gui/e-calendar-view.c:789
+#: ../calendar/gui/e-calendar-table.c:875
+#: ../calendar/gui/e-calendar-view.c:799
 msgid "Updating objects"
 msgstr "오브젝트를 업데이트하는 중입니다"
 
-#: ../calendar/gui/e-calendar-table.c:1012
-#: ../calendar/gui/e-calendar-view.c:1105 ../composer/e-msg-composer.c:1243
+#: ../calendar/gui/e-calendar-table.c:1025
+#: ../calendar/gui/e-calendar-view.c:1122 ../composer/e-msg-composer.c:1243
 msgid "Save as..."
 msgstr "다른 이름으로 저장..."
 
-#: ../calendar/gui/e-calendar-table.c:1155
+#: ../calendar/gui/e-calendar-table.c:1168
 msgid "Open _Web Page"
 msgstr "웹 페이지 열기(_W)"
 
-#: ../calendar/gui/e-calendar-table.c:1156
-#: ../calendar/gui/e-calendar-view.c:1529 ../mail/em-folder-view.c:1045
+#: ../calendar/gui/e-calendar-table.c:1169
+#: ../calendar/gui/e-calendar-view.c:1546 ../mail/em-folder-view.c:1045
 #: ../mail/em-popup.c:541 ../mail/em-popup.c:552
 msgid "_Save As..."
 msgstr "다른 이름으로 저장(_S)..."
 
-#: ../calendar/gui/e-calendar-table.c:1157
-#: ../calendar/gui/e-calendar-view.c:1509
-#: ../calendar/gui/e-calendar-view.c:1530 ../mail/em-folder-view.c:1046
+#: ../calendar/gui/e-calendar-table.c:1170
+#: ../calendar/gui/e-calendar-view.c:1526
+#: ../calendar/gui/e-calendar-view.c:1547 ../mail/em-folder-view.c:1046
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:120 ../ui/evolution-tasks.xml.h:27
 msgid "_Print..."
 msgstr "인쇄(_P)..."
 
-#: ../calendar/gui/e-calendar-table.c:1161
-#: ../calendar/gui/e-calendar-view.c:1534 ../ui/evolution-addressbook.xml.h:1
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1551 ../ui/evolution-addressbook.xml.h:1
 #: ../ui/evolution-calendar.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "잘라내기(_U)"
 
-#: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:1512
-#: ../calendar/gui/e-calendar-view.c:1536 ../ui/evolution-addressbook.xml.h:38
+#: ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1529
+#: ../calendar/gui/e-calendar-view.c:1553 ../ui/evolution-addressbook.xml.h:38
 #: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Paste"
 msgstr "붙여 넣기(_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1167 ../ui/evolution-tasks.xml.h:20
+#: ../calendar/gui/e-calendar-table.c:1180 ../ui/evolution-tasks.xml.h:20
 msgid "_Assign Task"
 msgstr "작업 할당(_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1168 ../ui/evolution-tasks.xml.h:24
+#: ../calendar/gui/e-calendar-table.c:1181 ../ui/evolution-tasks.xml.h:24
 msgid "_Forward as iCalendar"
 msgstr "iCalendar로 전달(_F)"
 
-#: ../calendar/gui/e-calendar-table.c:1169
+#: ../calendar/gui/e-calendar-table.c:1182
 msgid "_Mark as Complete"
 msgstr "작업 완료 표시(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1170
+#: ../calendar/gui/e-calendar-table.c:1183
 msgid "_Mark Selected Tasks as Complete"
 msgstr "선택한 작업을 마친 작업으로 표시(_M)"
 
 #. FIXME: need to disable for undeletable folders
-#: ../calendar/gui/e-calendar-table.c:1174
-#: ../calendar/gui/e-calendar-view.c:1548 ../mail/em-folder-tree.c:2043
+#: ../calendar/gui/e-calendar-table.c:1187
+#: ../calendar/gui/e-calendar-view.c:1565 ../mail/em-folder-tree.c:2048
 #: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:33
 #: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
 #: ../ui/evolution-tasks.xml.h:22
 msgid "_Delete"
 msgstr "지우기(_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1175
+#: ../calendar/gui/e-calendar-table.c:1188
 msgid "_Delete Selected Tasks"
 msgstr "선택한 작업 지우기(_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1326
+#: ../calendar/gui/e-calendar-table.c:1407
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "작업을 더하려면 누르십시오"
@@ -6850,76 +6828,75 @@ msgstr "시작 날짜"
 msgid "Task sort"
 msgstr "작업 정렬"
 
-#: ../calendar/gui/e-calendar-view.c:1231
+#: ../calendar/gui/e-calendar-view.c:1248
 msgid "Moving items"
 msgstr "항목을 옮기는 중입니다"
 
-#: ../calendar/gui/e-calendar-view.c:1233
+#: ../calendar/gui/e-calendar-view.c:1250
 msgid "Copying items"
 msgstr "항목을 복사하는 중입니다"
 
-#: ../calendar/gui/e-calendar-view.c:1503
+#: ../calendar/gui/e-calendar-view.c:1520
 msgid "New _Appointment..."
 msgstr "새 약속(_A)..."
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/e-calendar-view.c:1504
+#: ../calendar/gui/e-calendar-view.c:1521
 msgid "New All Day _Event"
 msgstr "새 하루 종일 행사(_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1506
+#: ../calendar/gui/e-calendar-view.c:1523
 msgid "New Task"
 msgstr "새 작업"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1516
+#: ../calendar/gui/e-calendar-view.c:1533
 msgid "Current View"
 msgstr "현재 보기"
 
-#: ../calendar/gui/e-calendar-view.c:1518 ../ui/evolution-calendar.xml.h:26
+#: ../calendar/gui/e-calendar-view.c:1535 ../ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "오늘 선택(_T)"
 
-#: ../calendar/gui/e-calendar-view.c:1519
+#: ../calendar/gui/e-calendar-view.c:1536
 msgid "_Select Date..."
 msgstr "날짜 선택(_S)..."
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
 #. TODO: Why is this in a context menu when it applies globally?
-#: ../calendar/gui/e-calendar-view.c:1524 ../ui/evolution-calendar.xml.h:45
+#: ../calendar/gui/e-calendar-view.c:1541 ../ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "약속 있음/없음 정보 게시(_P)"
 
-#: ../calendar/gui/e-calendar-view.c:1540
+#: ../calendar/gui/e-calendar-view.c:1557
 msgid "Cop_y to Calendar..."
 msgstr "달력으로 복사(_Y)..."
 
-#: ../calendar/gui/e-calendar-view.c:1541
+#: ../calendar/gui/e-calendar-view.c:1558
 msgid "Mo_ve to Calendar..."
 msgstr "달력으로 이동(_V)..."
 
-#: ../calendar/gui/e-calendar-view.c:1542
-#, fuzzy
+#: ../calendar/gui/e-calendar-view.c:1559
 msgid "_Delegate Meeting..."
-msgstr "모임 일정(_S)..."
+msgstr "모임 대리(_D)..."
 
-#: ../calendar/gui/e-calendar-view.c:1543
+#: ../calendar/gui/e-calendar-view.c:1560
 msgid "_Schedule Meeting..."
 msgstr "모임 일정(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1544
+#: ../calendar/gui/e-calendar-view.c:1561
 msgid "_Forward as iCalendar..."
 msgstr "iCalendar로 전달(_F)..."
 
-#: ../calendar/gui/e-calendar-view.c:1549
+#: ../calendar/gui/e-calendar-view.c:1566
 msgid "Make this Occurrence _Movable"
 msgstr "이 경우를 옮길 수 있게 합니다(_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1550
+#: ../calendar/gui/e-calendar-view.c:1567
 msgid "Delete this _Occurrence"
 msgstr "이 경우를 지웁니다(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1551
+#: ../calendar/gui/e-calendar-view.c:1568
 msgid "Delete _All Occurrences"
 msgstr "모든 경우를 지웁니다(_A)"
 
@@ -6966,7 +6943,7 @@ msgstr "%02i분 단위"
 #. order but don't change the specifiers or add
 #. anything.
 #: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1493
-#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1517
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1526
 msgid "%A %d %B"
 msgstr "%b %e일 %A"
 
@@ -7593,12 +7570,12 @@ msgstr "필요한 사람(_R)"
 msgid "Required people and _one resource"
 msgstr "필요한 사람과 자원 한 개(_O)"
 
-#: ../calendar/gui/e-pub-utils.c:300
+#: ../calendar/gui/e-pub-utils.c:321
 #, c-format
 msgid "Enter the password for %s"
 msgstr "%s의 열쇠글을 입력하십시오"
 
-#: ../calendar/gui/e-tasks.c:798 ../calendar/gui/gnome-cal.c:2532
+#: ../calendar/gui/e-tasks.c:820 ../calendar/gui/gnome-cal.c:2554
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7607,24 +7584,24 @@ msgstr ""
 "%s에서 오류 발생:\n"
 " %s"
 
-#: ../calendar/gui/e-tasks.c:846
+#: ../calendar/gui/e-tasks.c:868
 msgid "Loading tasks"
 msgstr "작업을 읽어들이는 중입니다"
 
-#: ../calendar/gui/e-tasks.c:930
+#: ../calendar/gui/e-tasks.c:952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s에 있는 작업을 여는 중입니다"
 
-#: ../calendar/gui/e-tasks.c:1126
+#: ../calendar/gui/e-tasks.c:1151
 msgid "Completing tasks..."
 msgstr "작업을 완료하는 중입니다..."
 
-#: ../calendar/gui/e-tasks.c:1149
+#: ../calendar/gui/e-tasks.c:1174
 msgid "Deleting selected objects..."
 msgstr "선택한 오브젝트를 지웁니다..."
 
-#: ../calendar/gui/e-tasks.c:1176
+#: ../calendar/gui/e-tasks.c:1201
 msgid "Expunging"
 msgstr "지운 메세지 비우는 중"
 
@@ -7635,45 +7612,45 @@ 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:329 ../calendar/gui/print.c:1501
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1510
 msgid "%d %B"
 msgstr "%b %e일"
 
-#: ../calendar/gui/gnome-cal.c:789
+#: ../calendar/gui/gnome-cal.c:791
 msgid "Updating query"
 msgstr "질의를 업데이트하는 중입니다"
 
 #. bonobo displays this string so it must be in locale
-#: ../calendar/gui/gnome-cal.c:2209 ../widgets/menus/gal-view-instance.c:585
+#: ../calendar/gui/gnome-cal.c:2231 ../widgets/menus/gal-view-instance.c:585
 #: ../widgets/menus/gal-view-menus.c:350
 msgid "Custom View"
 msgstr "사용자 보기"
 
-#: ../calendar/gui/gnome-cal.c:2210 ../widgets/menus/gal-view-instance.c:586
+#: ../calendar/gui/gnome-cal.c:2232 ../widgets/menus/gal-view-instance.c:586
 msgid "Save Custom View"
 msgstr "사용자 보기 저장"
 
-#: ../calendar/gui/gnome-cal.c:2215 ../widgets/menus/gal-view-instance.c:590
+#: ../calendar/gui/gnome-cal.c:2237 ../widgets/menus/gal-view-instance.c:590
 #: ../widgets/menus/gal-view-menus.c:372
 msgid "Define Views..."
 msgstr "보기 지정..."
 
-#: ../calendar/gui/gnome-cal.c:2378
+#: ../calendar/gui/gnome-cal.c:2400
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "%s의 약속을 읽어들이는 중입니다"
 
-#: ../calendar/gui/gnome-cal.c:2397
+#: ../calendar/gui/gnome-cal.c:2419
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%s의 작업을 읽어들이는 중입니다"
 
-#: ../calendar/gui/gnome-cal.c:2498
+#: ../calendar/gui/gnome-cal.c:2520
 #, c-format
 msgid "Opening %s"
 msgstr "%s 여는 중입니다"
 
-#: ../calendar/gui/gnome-cal.c:3388
+#: ../calendar/gui/gnome-cal.c:3437
 msgid "Purging"
 msgstr "비우는 중"
 
@@ -7984,83 +7961,83 @@ msgid "Sa"
 msgstr "토"
 
 #. Day
-#: ../calendar/gui/print.c:1917
+#: ../calendar/gui/print.c:1926
 msgid "Selected day (%a %b %d %Y)"
 msgstr "선택된 날(%Y년 %b %e일 (%a))"
 
-#: ../calendar/gui/print.c:1942 ../calendar/gui/print.c:1946
+#: ../calendar/gui/print.c:1951 ../calendar/gui/print.c:1955
 msgid "%a %b %d"
 msgstr "%b %e일 (%a)"
 
-#: ../calendar/gui/print.c:1943
+#: ../calendar/gui/print.c:1952
 msgid "%a %d %Y"
 msgstr "%Y년 %e일 (%a)"
 
-#: ../calendar/gui/print.c:1947 ../calendar/gui/print.c:1949
-#: ../calendar/gui/print.c:1950
+#: ../calendar/gui/print.c:1956 ../calendar/gui/print.c:1958
+#: ../calendar/gui/print.c:1959
 msgid "%a %b %d %Y"
 msgstr "%Y년 %b %e일 (%a)"
 
-#: ../calendar/gui/print.c:1954
+#: ../calendar/gui/print.c:1963
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "선택된 주 (%s - %s)"
 
 #. Month
-#: ../calendar/gui/print.c:1962
+#: ../calendar/gui/print.c:1971
 msgid "Selected month (%b %Y)"
 msgstr "선택된 달 (%Y년 %b)"
 
 #. Year
-#: ../calendar/gui/print.c:1969
+#: ../calendar/gui/print.c:1978
 msgid "Selected year (%Y)"
 msgstr "선택한 년도 (%Y년)"
 
-#: ../calendar/gui/print.c:2320
-#, fuzzy, c-format
+#: ../calendar/gui/print.c:2329
+#, c-format
 msgid "Summary: %s"
-msgstr "요약:"
+msgstr "요약: %s"
 
-#: ../calendar/gui/print.c:2328
-#, fuzzy, c-format
+#: ../calendar/gui/print.c:2337
+#, c-format
 msgid "Location: %s"
-msgstr "위치:"
+msgstr "위치: %s"
 
-#: ../calendar/gui/print.c:2371
+#: ../calendar/gui/print.c:2380
 #, c-format
 msgid "Status: %s"
 msgstr "상태: %s"
 
-#: ../calendar/gui/print.c:2388
+#: ../calendar/gui/print.c:2397
 #, c-format
 msgid "Priority: %s"
 msgstr "우선순위: %s"
 
-#: ../calendar/gui/print.c:2400
+#: ../calendar/gui/print.c:2409
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "퍼센트 완료: %i"
 
-#: ../calendar/gui/print.c:2412
+#: ../calendar/gui/print.c:2421
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2426
+#: ../calendar/gui/print.c:2435
 #, c-format
 msgid "Categories: %s"
 msgstr "분류: %s"
 
-#: ../calendar/gui/print.c:2437
+#: ../calendar/gui/print.c:2446
 msgid "Contacts: "
 msgstr "연락처:"
 
-#: ../calendar/gui/print.c:2577 ../calendar/gui/print.c:2665
-#: ../calendar/gui/print.c:2791 ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2586 ../calendar/gui/print.c:2674
+#: ../calendar/gui/print.c:2800 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "인쇄 미리 보기"
 
-#: ../calendar/gui/print.c:2612
+#: ../calendar/gui/print.c:2621
 msgid "Print Item"
 msgstr "항목 인쇄"
 
@@ -8094,43 +8071,43 @@ msgstr "행사와 모임을 만드는 데 쓸 '%s' 작업 목록을 열 수 없�
 msgid "There is no calendar available for creating tasks"
 msgstr "작업을 만들 때 쓸 수 있는 달력이 없습니다"
 
-#: ../calendar/gui/tasks-component.c:981
+#: ../calendar/gui/tasks-component.c:987
 msgid "Task Source Selector"
 msgstr "작업 원본 선택"
 
-#: ../calendar/gui/tasks-component.c:1164
+#: ../calendar/gui/tasks-component.c:1170
 msgid "New task"
 msgstr "새 작업"
 
-#: ../calendar/gui/tasks-component.c:1165
+#: ../calendar/gui/tasks-component.c:1171
 msgid "_Task"
 msgstr "작업(_T)"
 
-#: ../calendar/gui/tasks-component.c:1166
+#: ../calendar/gui/tasks-component.c:1172
 msgid "Create a new task"
 msgstr "새 작업을 만듭니다"
 
-#: ../calendar/gui/tasks-component.c:1172
+#: ../calendar/gui/tasks-component.c:1178
 msgid "New assigned task"
 msgstr "새로 할당한 작업"
 
-#: ../calendar/gui/tasks-component.c:1173
+#: ../calendar/gui/tasks-component.c:1179
 msgid "Assigne_d Task"
 msgstr "할당한 작업(_D)"
 
-#: ../calendar/gui/tasks-component.c:1174
+#: ../calendar/gui/tasks-component.c:1180
 msgid "Create a new assigned task"
 msgstr "새로 할당한 작업을 만듭니다"
 
-#: ../calendar/gui/tasks-component.c:1180
+#: ../calendar/gui/tasks-component.c:1186
 msgid "New task list"
 msgstr "새 작업 목록"
 
-#: ../calendar/gui/tasks-component.c:1181
+#: ../calendar/gui/tasks-component.c:1187
 msgid "Task l_ist"
 msgstr "작업 목록(_I)"
 
-#: ../calendar/gui/tasks-component.c:1182
+#: ../calendar/gui/tasks-component.c:1188
 msgid "Create a new task list"
 msgstr "새 작업 목록을 만듭니다"
 
@@ -8150,7 +8127,7 @@ msgstr ""
 msgid "Do not ask me again."
 msgstr "다시 묻지 않습니다."
 
-#: ../calendar/gui/tasks-control.c:457
+#: ../calendar/gui/tasks-control.c:456
 msgid "Print Tasks"
 msgstr "작업 인쇄"
 
@@ -8165,9 +8142,8 @@ msgstr "약속 및 모임"
 
 #: ../calendar/importers/icalendar-importer.c:336
 #: ../calendar/importers/icalendar-importer.c:586
-#, fuzzy
 msgid "Opening calendar"
-msgstr "새 달력"
+msgstr "달력을 여는 중입니다"
 
 #: ../calendar/importers/icalendar-importer.c:429
 msgid "iCalendar files (.ics)"
@@ -8175,7 +8151,7 @@ msgstr "iCalendar 파일 (.ics)"
 
 #: ../calendar/importers/icalendar-importer.c:430
 msgid "Evolution iCalendar importer"
-msgstr "Evolution iCalendar 가져오기"
+msgstr "Evolution iCalendar 가져오기 프로그램"
 
 # Reminder -> 미리 알림, Microsoft Office XP
 #: ../calendar/importers/icalendar-importer.c:494
@@ -8188,7 +8164,7 @@ msgstr "vCalendar 파일 (.vcf)"
 
 #: ../calendar/importers/icalendar-importer.c:540
 msgid "Evolution vCalendar importer"
-msgstr "Evolution vCalendar 가져오기"
+msgstr "Evolution vCalendar 가져오기 프로그램"
 
 # event -> 행사, Microsoft Office XP 참고
 #: ../calendar/importers/icalendar-importer.c:702
@@ -8197,7 +8173,7 @@ msgstr "달력 행사"
 
 #: ../calendar/importers/icalendar-importer.c:739
 msgid "Evolution Calendar intelligent importer"
-msgstr "Evolution 달력 똑똑한 가져오기"
+msgstr "Evolution 달력 똑똑한 가져오기 프로그램"
 
 #.
 #. * These are the timezone names from the Olson timezone data.
@@ -9815,9 +9791,8 @@ msgid "Post To:"
 msgstr "게시 위치:"
 
 #: ../composer/e-msg-composer-select-file.c:82
-#, fuzzy
 msgid "A_ttach"
-msgstr "첨부"
+msgstr "첨부(_T)"
 
 #: ../composer/e-msg-composer.c:738
 msgid ""
@@ -9871,11 +9846,10 @@ msgid "Compose a message"
 msgstr "메일 메세지를 작성합니다"
 
 #: ../composer/e-msg-composer.c:3643
-#, fuzzy
 msgid "_Attachment Bar"
-msgstr "첨부 모음"
+msgstr "첨부 모음(_A)"
 
-#: ../composer/e-msg-composer.c:4718
+#: ../composer/e-msg-composer.c:4720
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -9888,10 +9862,12 @@ 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 "모든 계정이 지워졌습니다."
+msgstr "모든 계정을 지웠습니다."
 
 #: ../composer/mail-composer.error.xml.h:3
 msgid ""
@@ -9900,15 +9876,13 @@ msgid ""
 msgstr "정말로 제목이 '{0}'인, 작성중이었던 메세지를 버리시겠습니까?"
 
 #: ../composer/mail-composer.error.xml.h:4
-#, fuzzy
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
-msgstr "\"{0}\" 때문에, 다른 메일 옵션을 선택해야 할 수도 있습니다."
+msgstr "&quot;{0}&quot; 때문에, 다른 메일 옵션을 선택해야 할 수도 있습니다."
 
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
 #: ../mail/mail.error.xml.h:17
-#, fuzzy
 msgid "Because &quot;{1}&quot;."
-msgstr "\"{1}\" 때문입니다."
+msgstr "&quot;{1}&quot; 때문입니다."
 
 #: ../composer/mail-composer.error.xml.h:6
 msgid ""
@@ -9929,18 +9903,16 @@ msgid "Could not create message."
 msgstr "메세지를 만들 수 없습니다."
 
 #: ../composer/mail-composer.error.xml.h:9
-#, fuzzy
 msgid "Could not read signature file &quot;{0}&quot;."
-msgstr "서명 파일 \"{0}\" 파일을 읽을 수 없습니다."
+msgstr "&quot;{0}&quot; 서명 파일을 읽을 수 없습니다."
 
 #: ../composer/mail-composer.error.xml.h:10
 msgid "Could not retrieve messages to attach from {0}."
 msgstr "{0}에서 첨부할 메세지를 가져올 수 없습니다."
 
 #: ../composer/mail-composer.error.xml.h:11
-#, fuzzy
 msgid "Could not save to autosave file &quot;{0}&quot;."
-msgstr "자동 저장 파일을 \"{0}\" 파일을 저장할 수 없습니다."
+msgstr "&quot;{0}&quot; 자동 저장 파일을 저장할 수 없습니다."
 
 #: ../composer/mail-composer.error.xml.h:12
 msgid "Directories can not be attached to Messages."
@@ -9956,12 +9928,12 @@ msgstr "복구하지 않음"
 
 #: ../composer/mail-composer.error.xml.h:15
 msgid "Download in progress. Do you want to send the mail?"
-msgstr ""
+msgstr "내려받기가 진행중입니다. 메일을 보내시겠습니까?"
 
 #: ../composer/mail-composer.error.xml.h:16
-#, fuzzy
 msgid "Error saving to autosave because &quot;{1}&quot;."
-msgstr "\"{1}\" 때문에 자동 저장 파일에 저장하는 데 오류가 발생했습니다."
+msgstr ""
+"&quot;{1}&quot; 때문에 자동 저장 파일에 저장하는 데 오류가 발생했습니다."
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid ""
@@ -10118,9 +10090,8 @@ msgstr ""
 
 # read receipt -> 내용 읽음 확인, Microsoft Office XP 참고
 #: ../designs/read_receipts/read.glade.h:6
-#, fuzzy
 msgid "Always send back a read receipt"
-msgstr "언제나 내용 읽음 확인을 보냄"
+msgstr "언제나 내용 읽음 확인을 보내기"
 
 # read receipt -> 내용 읽음 확인, Microsoft Office XP 참고
 #: ../designs/read_receipts/read.glade.h:7
@@ -10191,23 +10162,20 @@ msgstr ""
 "<span weight=\"bold\">내부 오류, 알 수 없는 '%s' 오류가 발생했습니다</span>"
 
 #: ../e-util/e-system.error.xml.h:2
-#, fuzzy
 msgid "Cannot open file &quot;{0}&quot;."
-msgstr "\"{0}:\" 파일을 열 수 없습니다."
+msgstr "&quot;{0}&quot; 파일을 열 수 없습니다."
 
 #: ../e-util/e-system.error.xml.h:3
-#, fuzzy
 msgid "Cannot save file &quot;{0}&quot;."
-msgstr "\"{0}:\" 파일을 저장할 수 없습니다."
+msgstr "&quot;{0}&quot; 파일을 저장할 수 없습니다."
 
 #: ../e-util/e-system.error.xml.h:4
 msgid "Do you wish to overwrite it?"
 msgstr "덮어 쓰시겠습니까?"
 
 #: ../e-util/e-system.error.xml.h:5
-#, fuzzy
 msgid "File exists &quot;{0}&quot;."
-msgstr "\"{0}\" 파일이 있습니다."
+msgstr "&quot;{0}&quot; 파일이 있습니다."
 
 #: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:122
 msgid "_Overwrite"
@@ -10405,9 +10373,8 @@ msgid "_Rule name:"
 msgstr "규칙 이름(_R):"
 
 #: ../filter/filter-rule.c:819
-#, fuzzy
 msgid "If"
-msgstr "I"
+msgstr "조건"
 
 #: ../filter/filter-rule.c:858
 msgid "if all criteria are met"
@@ -10447,19 +10414,16 @@ msgid "Outgoing"
 msgstr "보내는 메일"
 
 #: ../filter/filter.error.xml.h:1
-#, fuzzy
 msgid "Bad regular expression &quot;{0}&quot;."
-msgstr "\"{0}\" 정규식이 틀렸습니다."
+msgstr "&quot;{0}&quot; 정규식이 틀렸습니다."
 
 #: ../filter/filter.error.xml.h:2
-#, fuzzy
 msgid "Could not compile regular expression &quot;{1}&quot;."
-msgstr "\"{1}\" 정규식을 컴파일할 수 없습니다."
+msgstr "&quot;{1}&quot; 정규식을 컴파일할 수 없습니다."
 
 #: ../filter/filter.error.xml.h:3
-#, fuzzy
 msgid "File &quot;{0}&quot; does not exist or is not a regular file."
-msgstr "\"{0}\" 파일이 없거나 일반 파일이 아닙니다."
+msgstr "&quot;{0}&quot; 파일이 없거나 일반 파일이 아닙니다."
 
 #: ../filter/filter.error.xml.h:4
 msgid "Missing date."
@@ -10474,9 +10438,8 @@ msgid "Missing name."
 msgstr "이름이 빠졌습니다."
 
 #: ../filter/filter.error.xml.h:7
-#, fuzzy
 msgid "Name &quot;{0}&quot; already used."
-msgstr "\"{0}\" 이름은 이미 사용하고 있습니다."
+msgstr "&quot;{0}&quot;(이)라는 이름은 이미 사용하고 있습니다."
 
 #: ../filter/filter.error.xml.h:8
 msgid "Please choose another name."
@@ -10651,14 +10614,13 @@ msgstr ""
 "동의하실 경우 체크 단추에 체크하십시오.\n"
 
 #: ../mail/em-account-editor.c:464 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:494
+#: ../mail/em-vfolder-rule.c:495
 msgid "Select Folder"
 msgstr "폴더 선택"
 
 #: ../mail/em-account-editor.c:760
-#, fuzzy
 msgid "Ask for each message"
-msgstr "첨부한 메세지 %d개"
+msgstr "메세지마다 물어보기"
 
 #: ../mail/em-account-editor.c:1724 ../mail/mail-config.glade.h:90
 msgid "Identity"
@@ -10677,30 +10639,30 @@ msgstr "새 메일을 자동으로 확인(_N), 매"
 msgid "Sending Email"
 msgstr "메일을 보냄"
 
-#: ../mail/em-account-editor.c:2162 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2165 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "기본값"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:122
-#: ../plugins/exchange-operations/exchange-account-setup.c:311
+#: ../mail/em-account-editor.c:2226 ../mail/mail-config.glade.h:122
+#: ../plugins/exchange-operations/exchange-account-setup.c:313
 msgid "Security"
 msgstr "보안"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2260 ../mail/em-account-editor.c:2334
+#: ../mail/em-account-editor.c:2263 ../mail/em-account-editor.c:2337
 msgid "Receiving Options"
 msgstr "받기 옵션"
 
-#: ../mail/em-account-editor.c:2261 ../mail/em-account-editor.c:2335
+#: ../mail/em-account-editor.c:2264 ../mail/em-account-editor.c:2338
 msgid "Checking for New Mail"
 msgstr "새 메일을 확인하는 중입니다"
 
-#: ../mail/em-account-editor.c:2659 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2661 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "계정 편집기"
 
-#: ../mail/em-account-editor.c:2659 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2661 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolution 계정 도우미"
 
@@ -10718,9 +10680,8 @@ msgid "Protocol"
 msgstr "프로토콜"
 
 #: ../mail/em-account-prefs.c:517
-#, fuzzy
 msgid "Mail Accounts Table"
-msgstr "메일 계정"
+msgstr "메일 계정 표"
 
 #: ../mail/em-composer-prefs.c:307 ../mail/em-composer-prefs.c:430
 #: ../mail/mail-config.c:958
@@ -11047,9 +11008,8 @@ msgid "<b>Then</b>"
 msgstr "<b>동작</b> "
 
 #: ../mail/em-folder-browser.c:134
-#, fuzzy
 msgid "C_reate Search Folder From Search..."
-msgstr "찾은 것에서 가상 폴더 만들기(_V)..."
+msgstr "찾은 것에서 찾기 폴더 만들기(_R)..."
 
 #. TODO: can this be done in a loop?
 #: ../mail/em-folder-properties.c:144
@@ -11081,9 +11041,8 @@ msgstr "폴더 이름(_N):"
 
 #: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
 #: ../mail/mail-vfolder.c:937 ../mail/mail-vfolder.c:1007
-#, fuzzy
 msgid "Search Folders"
-msgstr "폴더 선택"
+msgstr "찾기 폴더"
 
 # VFolder에서 맞는 게 아무것도 없을 경우 마지막 fallback
 #. UNMATCHED is always last
@@ -11108,76 +11067,76 @@ msgstr "보낼 편지함"
 msgid "Sent"
 msgstr "보낸 편지함"
 
-#: ../mail/em-folder-tree-model.c:498 ../mail/em-folder-tree-model.c:802
+#: ../mail/em-folder-tree-model.c:499 ../mail/em-folder-tree-model.c:803
 msgid "Loading..."
 msgstr "읽어들이는 중..."
 
-#: ../mail/em-folder-tree.c:689
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "메일 폴더 트리"
 
-#: ../mail/em-folder-tree.c:849
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "%s 폴더를 옮기는 중"
 
-#: ../mail/em-folder-tree.c:851
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "%s 폴더를 복사하는 중"
 
-#: ../mail/em-folder-tree.c:858 ../mail/message-list.c:1613
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1613
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "메시지를 %s 폴더로 옮기는 중입니다"
 
-#: ../mail/em-folder-tree.c:860 ../mail/message-list.c:1615
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1615
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "메시지를 %s 폴더로 복사하는 중입니다"
 
-#: ../mail/em-folder-tree.c:876
+#: ../mail/em-folder-tree.c:881
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "메세지를 맨 위의 저장고에 넣을 수 없습니다"
 
-#: ../mail/em-folder-tree.c:972 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:104
 msgid "_Copy to Folder"
 msgstr "폴더로 복사(_C)"
 
-#: ../mail/em-folder-tree.c:973 ../ui/evolution-mail-message.xml.h:114
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:114
 msgid "_Move to Folder"
 msgstr "폴더로 이동(_M)"
 
-#: ../mail/em-folder-tree.c:1678 ../mail/mail-ops.c:1057
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\"의 폴더를 찾는 중"
 
-#: ../mail/em-folder-tree.c:2031 ../ui/evolution-addressbook.xml.h:44
+#: ../mail/em-folder-tree.c:2036 ../ui/evolution-addressbook.xml.h:44
 #: ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:48
 msgid "_View"
 msgstr "보기(_V)"
 
-#: ../mail/em-folder-tree.c:2032
+#: ../mail/em-folder-tree.c:2037
 msgid "Open in _New Window"
 msgstr "새 창에서 열기(_N)"
 
-#: ../mail/em-folder-tree.c:2036
+#: ../mail/em-folder-tree.c:2041
 msgid "_Copy..."
 msgstr "복사(_C)..."
 
-#: ../mail/em-folder-tree.c:2037
+#: ../mail/em-folder-tree.c:2042
 msgid "_Move..."
 msgstr "이동(_M)..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2041
+#: ../mail/em-folder-tree.c:2046
 msgid "_New Folder..."
 msgstr "새 폴더(_N)..."
 
-#: ../mail/em-folder-tree.c:2044 ../ui/evolution-mail-list.xml.h:30
+#: ../mail/em-folder-tree.c:2049 ../ui/evolution-mail-list.xml.h:30
 msgid "_Rename..."
 msgstr "이름 바꾸기(_R)..."
 
@@ -11217,13 +11176,13 @@ msgstr "`%s' 폴더를 만드는 중입니다"
 
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../plugins/groupwise-features/share-folder-common.c:384
 msgid "Create folder"
 msgstr "폴더를 만듭니다"
 
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../plugins/groupwise-features/share-folder-common.c:384
 msgid "Specify where to create the folder:"
 msgstr "폴더 만들 곳을 지정하십시오:"
 
@@ -11261,9 +11220,8 @@ msgid "Mar_k as Read"
 msgstr "읽은 것으로 표시(_K)"
 
 #: ../mail/em-folder-view.c:1056
-#, fuzzy
 msgid "Mark as _Unread"
-msgstr "읽지 않은 것으로 표시(_N)"
+msgstr "읽지 않은 것으로 표시(_U)"
 
 #: ../mail/em-folder-view.c:1057
 msgid "Mark as _Important"
@@ -11298,24 +11256,20 @@ msgid "Crea_te Rule From Message"
 msgstr "메시지로부터 거르게 만들기(_T)"
 
 #: ../mail/em-folder-view.c:1074
-#, fuzzy
 msgid "Search Folder from _Subject"
-msgstr "제목에 따른 가상폴더(_S)"
+msgstr "제목에 따른 찾기 폴더(_S)"
 
 #: ../mail/em-folder-view.c:1075
-#, fuzzy
 msgid "Search Folder from Se_nder"
-msgstr "보낸 사람에 따른 가상폴더(_N)"
+msgstr "보낸 사람에 따른 찾기 폴더(_N)"
 
 #: ../mail/em-folder-view.c:1076
-#, fuzzy
 msgid "Search Folder from _Recipients"
-msgstr "받은 사람에 따른 가상폴더(_R)"
+msgstr "받은 사람에 따른 찾기 폴더(_R)"
 
 #: ../mail/em-folder-view.c:1077
-#, fuzzy
 msgid "Search Folder from Mailing _List"
-msgstr "메일링 리스트에 대한 가상폴더(_L)"
+msgstr "메일링 리스트에 대한 찾기 폴더(_L)"
 
 #: ../mail/em-folder-view.c:1081
 msgid "Filter on Sub_ject"
@@ -11345,18 +11299,16 @@ msgid "Print Message"
 msgstr "메세지 인쇄"
 
 #: ../mail/em-folder-view.c:2220
-#, fuzzy
 msgid "Unable to retrieve message"
-msgstr "편집기에서 메세지를 가져올 수 없습니다"
+msgstr "메세지를 가져올 수 없습니다"
 
 #: ../mail/em-folder-view.c:2413
 msgid "_Copy Link Location"
 msgstr "링크 위치 복사(_C)"
 
 #: ../mail/em-folder-view.c:2415
-#, fuzzy
 msgid "Create _Search Folder"
-msgstr "새 폴더 만들기"
+msgstr "찾기 폴더 만들기(_S)"
 
 #: ../mail/em-folder-view.c:2416
 msgid "_From this Address"
@@ -11506,49 +11458,43 @@ msgid "_Hide"
 msgstr "숨기기(_H)"
 
 #: ../mail/em-format-html-display.c:1179
-#, fuzzy
 msgid "_Fit to Width"
-msgstr "자르기 너비"
+msgstr "너비에 맞추기(_F)"
 
 #: ../mail/em-format-html-display.c:1180
-#, fuzzy
 msgid "Show _Original Size"
-msgstr "원래 크기(_Z)"
+msgstr "원래 크기로 표시(_O)"
 
 #: ../mail/em-format-html-display.c:1550
 msgid "Attachment Button"
 msgstr "첨부 단추"
 
 #: ../mail/em-format-html-display.c:1757
-#, fuzzy
 msgid "Select folder to save all attachments..."
-msgstr "모든 첨부 저장"
+msgstr "모든 첨부를 저장할 폴더 선택..."
 
 #: ../mail/em-format-html-display.c:1796
 msgid "Select folder to save selected attachments..."
-msgstr ""
+msgstr "선택한 첨부를 저장할 폴더 선택..."
 
 #: ../mail/em-format-html-display.c:1804
-#, fuzzy
 msgid "Save Selected..."
-msgstr "선택하지 않았습니다"
+msgstr "선택한 것 저장..."
 
 #. Cant i put in the number of attachments here ?
 #: ../mail/em-format-html-display.c:1871
-#, fuzzy, c-format
+#, c-format
 msgid "%d attachment"
 msgid_plural "%d attachments"
-msgstr[0] "%s 첨부"
+msgstr[0] "%d개 첨부"
 
 #: ../mail/em-format-html-display.c:1935
-#, fuzzy
 msgid "No Attachment"
-msgstr "첨부"
+msgstr "첨부 없음"
 
 #: ../mail/em-format-html-display.c:1938
-#, fuzzy
 msgid "Save All"
-msgstr "다른 이름으로 저장"
+msgstr "모두 저장"
 
 #: ../mail/em-format-html-print.c:130
 #, c-format
@@ -11626,7 +11572,7 @@ msgstr "숨은 참조"
 
 #. pseudo-header
 #: ../mail/em-format-html.c:1576 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:987
+#: ../mail/em-mailer-prefs.c:992
 msgid "Mailer"
 msgstr "메일 프로그램"
 
@@ -11845,14 +11791,12 @@ msgid "Messages from %s"
 msgstr "%s에서 온 메일"
 
 #: ../mail/em-vfolder-editor.c:104
-#, fuzzy
 msgid "Search _Folders"
-msgstr "폴더 선택"
+msgstr "폴더 찾기(_F)"
 
-#: ../mail/em-vfolder-rule.c:574
-#, fuzzy
+#: ../mail/em-vfolder-rule.c:575
 msgid "Search Folder source"
-msgstr "폴더 선택"
+msgstr "폴더 원본 찾기"
 
 #: ../mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
@@ -12023,15 +11967,14 @@ msgid "Load images for HTML messages over http"
 msgstr "http로 HTML 메세지의 그림을 읽어들입니다"
 
 #: ../mail/evolution-mail.schemas.in.in.h:39
-#, fuzzy
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images in mail from contacts 2 - Always "
 "load images off the net"
 msgstr ""
-"http로 HTML 메세지의 그림을 읽어들입니다. 사용 가능한 값은: 0 - 그림을 전혀 "
-"읽어들이지 않습니다 2 - 보낸 사람이 주소록에 들어 있으면 그림을 읽어들입니다 "
-"2 - 항상 네트워크에서 그림을 읽어들입니다"
+"HTTP(S)로 HTML 메세지의 그림을 읽어들입니다. 사용 가능한 값은: 0 - 네트워크에"
+"서 그림을 하나도 읽어들이지 않습니다 1 - 보낸 사람이 주소록에 들어 있으면 그"
+"림을 읽어들입니다 2 - 항상 네트워크에서 그림을 읽어들입니다"
 
 #: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
@@ -12330,12 +12273,11 @@ msgstr "ELM 데이터 가져오기"
 
 #: ../mail/importers/elm-importer.c:382
 msgid "Evolution Elm importer"
-msgstr "Evolution ELM 가져오기"
+msgstr "Evolution ELM 가져오기 프로그램"
 
 #: ../mail/importers/elm-importer.c:383
-#, fuzzy
 msgid "Import mail from Elm."
-msgstr "메일함 가져오기"
+msgstr "ELM에서 메일을 가져옵니다."
 
 #: ../mail/importers/evolution-mbox-importer.c:82
 #: ../mail/importers/evolution-outlook-importer.c:131
@@ -12349,11 +12291,11 @@ msgstr "어느 폴더로 가져올 지 선택하십시오"
 
 #: ../mail/importers/evolution-mbox-importer.c:216
 msgid "Berkeley Mailbox (mbox)"
-msgstr ""
+msgstr "버클리 메일박스 (mbox)"
 
 #: ../mail/importers/evolution-mbox-importer.c:217
 msgid "Importer Berkeley Mailbox format folders"
-msgstr ""
+msgstr "버클리 메일박스 형식 폴더 가져오기"
 
 #: ../mail/importers/evolution-outlook-importer.c:257
 #: ../mail/importers/mail-importer.c:230 ../shell/e-shell-importer.c:516
@@ -12468,12 +12410,11 @@ msgstr "PINE 데이터 가져오기"
 
 #: ../mail/importers/pine-importer.c:434
 msgid "Evolution Pine importer"
-msgstr "Evolution Pine 가져오기"
+msgstr "Evolution PINE 가져오기 프로그램"
 
 #: ../mail/importers/pine-importer.c:435
-#, fuzzy
 msgid "Import mail from Pine."
-msgstr "파일 한 개 가져오기(_S)"
+msgstr "PINE에서 메일을 가져옵니다."
 
 #: ../mail/mail-autofilter.c:78
 #, c-format
@@ -12657,9 +12598,8 @@ msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">메세지 글꼴</span>"
 
 #: ../mail/mail-config.glade.h:23
-#, fuzzy
 msgid "<span weight=\"bold\">Message Receipts</span>"
-msgstr "<span weight=\"bold\">메세지 글꼴</span>"
+msgstr "<span weight=\"bold\">메세지 수신 확인</span>"
 
 #: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">New Mail Notification</span>"
@@ -12898,18 +12838,16 @@ msgid "Inline"
 msgstr "포함"
 
 #: ../mail/mail-config.glade.h:94
-#, fuzzy
 msgid "Languages Table"
-msgstr "언어"
+msgstr "언어 표"
 
 #: ../mail/mail-config.glade.h:96
 msgid "Mail Configuration"
 msgstr "메일 설정"
 
 #: ../mail/mail-config.glade.h:97
-#, fuzzy
 msgid "Mail Headers Table"
-msgstr "메일 폴더 트리"
+msgstr "메일 헤더 표"
 
 #: ../mail/mail-config.glade.h:99
 msgid "Mailbox location"
@@ -13019,9 +12957,8 @@ msgid "Select HTML variable width font for printing"
 msgstr "인쇄에 사용할 HTML 가변폭 글꼴을 선택하십시오"
 
 #: ../mail/mail-config.glade.h:127
-#, fuzzy
 msgid "Send message receipts:"
-msgstr "메세지 보내기(_S)"
+msgstr "메세지 수신 확인 보내기:"
 
 #: ../mail/mail-config.glade.h:129
 msgid "Sending Mail"
@@ -13052,9 +12989,8 @@ msgid "Signatures"
 msgstr "서명"
 
 #: ../mail/mail-config.glade.h:136
-#, fuzzy
 msgid "Signatures Table"
-msgstr "서명"
+msgstr "서명 표"
 
 #: ../mail/mail-config.glade.h:137
 msgid "Specify _filename:"
@@ -13139,7 +13075,7 @@ msgstr "전체 이름(_F):"
 
 #: ../mail/mail-config.glade.h:161
 msgid "_Load images in mail from contacts"
-msgstr ""
+msgstr "주소록에 있는 사람이 보낸 메일의 그림 읽어들이기(_L)"
 
 #: ../mail/mail-config.glade.h:162
 msgid "_Make this my default account"
@@ -13196,9 +13132,8 @@ msgid "description"
 msgstr "설명"
 
 #: ../mail/mail-dialogs.glade.h:2
-#, fuzzy
 msgid "<b>Search Folder Sources</b>"
-msgstr "<b>가상 폴더 원본</b>"
+msgstr "<b>찾기 폴더 원본</b>"
 
 #: ../mail/mail-dialogs.glade.h:3
 msgid "<span weight=\"bold\">Digital Signature</span>"
@@ -13517,7 +13452,6 @@ msgid "Waiting..."
 msgstr "기다리는 중..."
 
 #: ../mail/mail-send-recv.c:699
-#, fuzzy
 msgid "Checking for new mail"
 msgstr "새 메일을 확인하는 중입니다"
 
@@ -13572,45 +13506,43 @@ msgid "Invalid folder: `%s'"
 msgstr "잘못된 폴더: `%s'"
 
 #: ../mail/mail-vfolder.c:91
-#, fuzzy, c-format
+#, c-format
 msgid "Setting up Search Folder: %s"
-msgstr "가상 폴더 설정: %s"
+msgstr "찾기 폴더 설정: %s"
 
 #: ../mail/mail-vfolder.c:240
-#, fuzzy, c-format
+#, c-format
 msgid "Updating Search Folders for '%s:%s'"
-msgstr "'%s:%s'에 대한 가상폴더를 업데이트하는 중입니다"
+msgstr "'%s:%s'에 대한 찾기 폴더를 업데이트하는 중입니다"
 
 #: ../mail/mail-vfolder.c:247
-#, fuzzy, c-format
+#, c-format
 msgid "Updating Search Folders for '%s'"
-msgstr "'%s에 대한 가상폴더를 업데이트하는 중입니다"
+msgstr "'%s에 대한 찾기 폴더를 업데이트하는 중입니다"
 
 #: ../mail/mail-vfolder.c:1046
-#, fuzzy
 msgid "Edit Search Folder"
-msgstr "폴더 선택"
+msgstr "찾기 폴더 편집"
 
 #: ../mail/mail-vfolder.c:1130
-#, fuzzy
 msgid "New Search Folder"
-msgstr "폴더 선택"
+msgstr "새 찾기 폴더"
 
 #: ../mail/mail.error.xml.h:1
-#, fuzzy
 msgid ""
 "A folder named &quot;{1}&quot; already exists. Please use a different name."
-msgstr "\"{1}\"(이)라는 이름의 폴더가 이미 있습니다. 다른 이름을 사용하십시오."
+msgstr ""
+"&quot;{1}&quot;(이)라는 이름의 폴더가 이미 있습니다. 다른 이름을 사용하십시"
+"오."
 
 #: ../mail/mail.error.xml.h:2
-#, fuzzy
 msgid ""
 "A non-empty folder at &quot;{1}&quot; already exists.\n"
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit.\n"
 msgstr ""
-"\"{1}\"에 비어 있지 않은 폴더가 있습니다.\n"
+"&quot;{1}&quot;에 비어 있지 않은 폴더가 있습니다.\n"
 "\n"
 "이 폴더를 무시할 수도 있고, 덮어 쓰거나, 그 내용 뒤에 덧붙이거나, 끝낼 수 있"
 "습니다.\n"
@@ -13619,7 +13551,7 @@ msgstr ""
 msgid ""
 "A read receipt notification has been requested for &quot;{1}&quot;.  Send "
 "the reciept notification to {0}?"
-msgstr ""
+msgstr "&quot;{1}&quot;에 대해 내용 읽음 확인을 요청받았습니다.  {0}에게 읽음 확인을 보내시겠습니까?"
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
@@ -13630,9 +13562,8 @@ msgstr ""
 "있습니다."
 
 #: ../mail/mail.error.xml.h:8
-#, fuzzy
 msgid "Are you sure you want to delete this account and all its proxies?"
-msgstr "정말로 이 계정을 지우시겠습니까?"
+msgstr "정말로 이 계정과 그 프록시를 모두 지우시겠습니까?"
 
 #: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account?"
@@ -13649,11 +13580,10 @@ msgid ""
 msgstr "모든 폴더의 지워진 메세지를 완전히 지우시겠습니까?"
 
 #: ../mail/mail.error.xml.h:12
-#, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
-msgstr "\"{0}\" 폴더의 지워진 메세지를 완전히 지우시겠습니까?"
+msgstr "정말로 &quot;{0}&quot; 폴더의 지운 메세지를 완전히 비우시겠습니까?"
 
 #: ../mail/mail.error.xml.h:13
 msgid "Are you sure you want to send a message in HTML format?"
@@ -13668,113 +13598,93 @@ msgid "Are you sure you want to send a message without a subject?"
 msgstr "정말로 제목 없는 메세지를 보내시겠습니까?"
 
 #: ../mail/mail.error.xml.h:16
-#, fuzzy
 msgid "Because &quot;{0}&quot;."
-msgstr "\"{0}\" 때문에."
+msgstr "&quot;{0}&quot; 때문입니다."
 
 #: ../mail/mail.error.xml.h:18
-#, fuzzy
 msgid "Because &quot;{2}&quot;."
-msgstr "\"{2}\" 때문입니다."
+msgstr "&quot;{2}&quot; 때문입니다."
 
 #: ../mail/mail.error.xml.h:19
-#, fuzzy
 msgid "Cannot add Search Folder &quot;{0}&quot;."
-msgstr "\"{0}\" 가상 폴더를 더할 수 없습니다."
+msgstr "&quot;{0}&quot; 찾기 폴더를 더할 수 없습니다."
 
 #: ../mail/mail.error.xml.h:20
-#, fuzzy
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "\"{0}\" 폴더를 \"{1}\"에 복사할 수 없습니다."
+msgstr "&quot;{0}&quot; 폴더를 &quot;{1}&quot;에 복사할 수 없습니다."
 
 #: ../mail/mail.error.xml.h:21
-#, fuzzy
 msgid "Cannot create folder &quot;{0}&quot;."
-msgstr "\"{0}\" 폴더를 만들 수 없습니다."
+msgstr "&quot;{0}&quot; 폴더를 만들 수 없습니다."
 
 #: ../mail/mail.error.xml.h:22
 msgid "Cannot create temporary save directory."
 msgstr "임시 저장 디렉토리를 만들 수가 없습니다."
 
 #: ../mail/mail.error.xml.h:23
-#, fuzzy
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
-msgstr "\"{1}\" 때문에 디렉토리를 만들 수 없습니다."
+msgstr "&quot;{1}&quot; 때문에 디렉토리를 저장할 수 없습니다."
 
 #: ../mail/mail.error.xml.h:24
-#, fuzzy
 msgid "Cannot delete folder &quot;{0}&quot;."
-msgstr "\"{0}\" 폴더를 지울 수 없습니다."
+msgstr "&quot;{0}&quot; 폴더를 지울 수 없습니다."
 
 #: ../mail/mail.error.xml.h:25
-#, fuzzy
 msgid "Cannot delete system folder &quot;{0}&quot;."
-msgstr "\"{0}\" 시스템 폴더를 지울 수 없습니다."
+msgstr "&quot;{0}&quot; 시스템 폴더를 지울 수 없습니다."
 
 #: ../mail/mail.error.xml.h:26
-#, fuzzy
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
-msgstr "\"{0}\" 가상 폴더를 편집할 수 없습니다: 폴더가 없습니다."
+msgstr "&quot;{0}&quot; 찾기 폴더를 편집할 수 없습니다: 폴더가 없습니다."
 
 #: ../mail/mail.error.xml.h:27
-#, fuzzy
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "\"{0}\" 폴더를 \"{1}\"에 옮기지 못했습니다."
+msgstr "&quot;{0}&quot; 폴더를 &quot;{1}&quot;에 옮기지 못했습니다."
 
 #: ../mail/mail.error.xml.h:28
-#, fuzzy
 msgid "Cannot open source &quot;{1}&quot;"
-msgstr "\"{1}\" 소스를 열 수 없습니다"
+msgstr "&quot;{1}&quot; 소스를 열 수 없습니다"
 
 #: ../mail/mail.error.xml.h:29
-#, fuzzy
 msgid "Cannot open source &quot;{2}&quot;."
-msgstr "\"{2}\" 소스를 열 수 없습니다."
+msgstr "&quot;{2}&quot; 소스를 열 수 없습니다."
 
 #: ../mail/mail.error.xml.h:30
-#, fuzzy
 msgid "Cannot open target &quot;{2}&quot;."
-msgstr "\"{2}\" 대상을 열 수 없습니다."
+msgstr "&quot;{2}&quot; 대상을 열 수 없습니다."
 
 #: ../mail/mail.error.xml.h:31
-#, fuzzy
 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."
 msgstr ""
-"\"{0}\" 라이선스 파일을 읽을 수 없습니다, 설치\n"
-"      문제 때문입니다.  이 라이선스에 동의하기 전에는 이 제공자를\n"
-"      사용할 수 없습니다."
+"&quot;{0}&quot; 라이선스 파일을 읽을 수 없습니다, 설치 문제 때문입니다.  이 "
+"라이선스에 동의하기 전에는 이 제공자를 사용할 수 없습니다."
 
 #: ../mail/mail.error.xml.h:32
-#, fuzzy
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "\"{0}\"을(를) \"{1}\"(으)로 이름을 바꾸지 못했습니다."
+msgstr "&quot;{0}&quot;을(를) &quot;{1}&quot;(으)로 이름을 바꾸지 못했습니다."
 
 #: ../mail/mail.error.xml.h:33
-#, fuzzy
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
-msgstr "\"{0}\" 시스템 폴더의 이름을 바꾸거나 옮길 수 없습니다."
+msgstr "&quot;{0}&quot; 시스템 폴더의 이름을 바꾸거나 옮길 수 없습니다."
 
 #: ../mail/mail.error.xml.h:34
 msgid "Cannot save changes to account."
 msgstr "바뀐 사항을 계정에 저장할 수 없습니다."
 
 #: ../mail/mail.error.xml.h:35
-#, fuzzy
 msgid "Cannot save to directory &quot;{0}&quot;."
-msgstr "\"{0}\" 디렉토리에 저장할 수 없습니다."
+msgstr "&quot;{0}&quot; 디렉토리에 저장할 수 없습니다."
 
 #: ../mail/mail.error.xml.h:36
-#, fuzzy
 msgid "Cannot save to file &quot;{0}&quot;."
-msgstr "\"{0}\" 파일에 저장할 수 없습니다."
+msgstr "&quot;{0}&quot; 파일에 저장할 수 없습니다."
 
 #: ../mail/mail.error.xml.h:37
-#, fuzzy
 msgid "Cannot set signature script &quot;{0}&quot;."
-msgstr "\"{0}\" 서명 스크립트를 설정할 수 없습니다."
+msgstr "&quot;{0}&quot; 서명 스크립트를 설정할 수 없습니다."
 
 #: ../mail/mail.error.xml.h:38
 msgid ""
@@ -13789,9 +13699,8 @@ msgid "Could not save signature file."
 msgstr "서명 파일을 저장할 수 없습니다."
 
 #: ../mail/mail.error.xml.h:40
-#, fuzzy
 msgid "Delete &quot;{0}&quot;?"
-msgstr "\"{0}\"을(를) 지우시겠습니까?"
+msgstr "&quot;{0}&quot;을(를) 지우시겠습니까?"
 
 #: ../mail/mail.error.xml.h:41
 msgid "Delete account?"
@@ -13803,7 +13712,7 @@ msgstr "바뀐 내용을 버리시겠습니까?"
 
 #: ../mail/mail.error.xml.h:43
 msgid "Do you want the operation to be performed in the subfolders?"
-msgstr ""
+msgstr "하위 폴더에서도 해당 작업을 수행하시겠습니까?"
 
 #: ../mail/mail.error.xml.h:44
 msgid "Do you wish to save your changes?"
@@ -13850,11 +13759,10 @@ msgstr ""
 "니다."
 
 #: ../mail/mail.error.xml.h:54
-#, fuzzy
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
-msgstr "계속 하시면, 계정 정보를 영원히 지우게 됩니다."
+msgstr "계속 하시면, 계정과 모든 프록시의 정보를 영원히 지우게 됩니다."
 
 #: ../mail/mail.error.xml.h:56
 msgid "If you proceed, the account information will be deleted permanently."
@@ -13892,16 +13800,14 @@ msgstr ""
 "조:\"에 쓰십시오."
 
 #: ../mail/mail.error.xml.h:62
-#, fuzzy
 msgid "Mark all messages as read"
-msgstr "보이는 모든 메세지를 읽은 것으로 표시합니다"
+msgstr "모든 메세지를 읽은 것으로 표시합니다"
 
 # FIXME - hard to translate UI + string based on English grammar
 # "Mark messages as read after <seconds> seconds"
 #: ../mail/mail.error.xml.h:63
-#, fuzzy
 msgid "Mark all messages as read in the selected folder"
-msgstr "다음 시간이 지나면 읽은 것으로 표시(_M):"
+msgstr "선택한 폴더의 모든 메세지를 읽은 것으로 표시"
 
 #: ../mail/mail.error.xml.h:64
 msgid "Missing folder."
@@ -13916,11 +13822,8 @@ msgid "Opening too many messages at once may take a long time."
 msgstr "여러 개의 메세지를 한꺼번에 열면 시간이 오래 걸릴 수도 있습니다."
 
 #: ../mail/mail.error.xml.h:68
-#, fuzzy
 msgid "Please check your account settings and try again."
-msgstr ""
-"\n"
-"계정 설정을 확인하고 다시 시도해 보십시오.\n"
+msgstr "계정 설정을 확인하고 다시 시도해 보십시오."
 
 #: ../mail/mail.error.xml.h:69
 msgid ""
@@ -13947,9 +13850,8 @@ msgid "Please wait."
 msgstr "잠시 기다리십시오."
 
 #: ../mail/mail.error.xml.h:74
-#, fuzzy
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
-msgstr "과거의 \"{0}\" 메일 폴더에서 옮겨오는 데 문제가 발생했습니다."
+msgstr "과거의 &quot;{0}&quot; 메일 폴더에서 옮겨오는 데 문제가 발생했습니다."
 
 #: ../mail/mail.error.xml.h:75
 msgid "Querying server"
@@ -13961,25 +13863,21 @@ msgstr "서버에 지원하는 인증 방식 목록 물어보기."
 
 # read receipt -> 내용 읽음 확인, Microsoft Office XP 참고
 #: ../mail/mail.error.xml.h:77
-#, fuzzy
 msgid "Read receipt requested."
-msgstr "내용 읽음 확인"
+msgstr "내용 읽음 확인을 요청했습니다."
 
 #: ../mail/mail.error.xml.h:78
-#, fuzzy
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
-msgstr "정말로 \"{0}\" 폴더와 그 아래 폴더를 모두 지우시겠습니까?"
+msgstr "정말로 &quot;{0}&quot; 폴더와 그 아래 폴더를 모두 지우시겠습니까?"
 
 #: ../mail/mail.error.xml.h:79
-#, fuzzy
 msgid "Search Folders automatically updated."
-msgstr "가상 폴더를 자동으로 업데이트했습니다."
+msgstr "찾기 폴더를 자동으로 업데이트했습니다."
 
 # read receipt -> 내용 읽음 확인, Microsoft Office XP 참고
 #: ../mail/mail.error.xml.h:80
-#, fuzzy
 msgid "Send Receipt"
-msgstr "내용 읽음 확인"
+msgstr "내용 읽음 확인 보내기"
 
 #: ../mail/mail.error.xml.h:81
 msgid ""
@@ -14007,7 +13905,6 @@ msgstr ""
 "조:\"에 쓰십시오."
 
 #: ../mail/mail.error.xml.h:85
-#, fuzzy
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14017,12 +13914,11 @@ msgid ""
 msgstr ""
 "다음:\n"
 "{0}\n"
-"가상폴더는 다음 지워진 폴더를 사용합니다:\n"
-"    \"{1}\"\n"
+"찾기 폴더는 다음 지워진 폴더를 사용합니다:\n"
+"    &quot;{1}&quot;\n"
 "업데이트했습니다."
 
 #: ../mail/mail.error.xml.h:90
-#, fuzzy
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14033,19 +13929,18 @@ msgstr ""
 "다음:\n"
 "{0}\n"
 "필터 규칙은 다음 지워진 폴더를 사용합니다:\n"
-"    \"{1}\"\n"
+"    &quot;{1}&quot;\n"
 "업데이트했습니다."
 
 #: ../mail/mail.error.xml.h:95
-#, fuzzy
 msgid ""
 "The message was sent via the &quot;sendmail&quot; external application.  "
 "Sendmail reports the following error: status 67: mail not sent.\n"
 "The message is stored in the Outbox folder.  Check the message for errors "
 "and resend."
 msgstr ""
-"메세지는 \"sendmail\" 외부 프로그램을 이용해 보냈습니다. sendmail에서 다음 오"
-"류가 발생했습니다: status 67: 메일을 보내지 않았습니다.\n"
+"메세지를 &quot;sendmail&quot; 외부 프로그램을 이용해 보냈습니다. sendmail에"
+"서 다음 오류가 발생했습니다: status 67: 메일을 보내지 않았습니다.\n"
 "메세지는 보낸 편지함 폴더에 저장해 둡니다.  무슨 오류인지 확인하시고 다시 보"
 "내십시오."
 
@@ -14054,13 +13949,12 @@ msgid "The script file must exist and be executable."
 msgstr "스크립트 파일이 있어야 하고 실행할 수 있어야 합니다."
 
 #: ../mail/mail.error.xml.h:98
-#, fuzzy
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
-"묵시적으로 더한 폴더일 수도 있습니다. 필요하다면, 가상 폴더 편집 창으로 가서 "
-"직접 더하십시오."
+"이 폴더는 묵시적으로 더한 폴더일 수도 있습니다.\n"
+"필요하다면, 찾기 폴더 편집 창으로 가서 직접 더하십시오."
 
 #: ../mail/mail.error.xml.h:100
 msgid ""
@@ -14079,9 +13973,8 @@ msgid "This signature has been changed, but has not been saved."
 msgstr "서명이 바뀌었지만, 저장하지 않았습니다."
 
 #: ../mail/mail.error.xml.h:103
-#, fuzzy
 msgid "Unable to connect to the GroupWise server."
-msgstr "GroupWise 서버에 연결할 수 없습니다"
+msgstr "GroupWise 서버에 연결할 수 없습니다."
 
 #: ../mail/mail.error.xml.h:104
 msgid ""
@@ -14116,16 +14009,14 @@ msgid "You may not create two accounts with the same name."
 msgstr "같은 이름으로 두 개의 계정을 만들 수 없습니다."
 
 #: ../mail/mail.error.xml.h:111
-#, fuzzy
 msgid "You must name this Search Folder."
-msgstr "이 가상폴더의 이름을 지정해야 합니다."
+msgstr "이 찾기 폴더의 이름을 정해야 합니다."
 
 #: ../mail/mail.error.xml.h:112
 msgid "You must specify a folder."
 msgstr "폴더를 지정해야 합니다."
 
 #: ../mail/mail.error.xml.h:113
-#, fuzzy
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14136,14 +14027,13 @@ msgstr ""
 "부를 선택할 수 있습니다."
 
 #: ../mail/mail.error.xml.h:115
-#, fuzzy
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
-msgstr "\"{0}\" 서버에 \"{0}\" 사용자로 로그인하는 데 실패했습니다."
+msgstr ""
+"&quot;{0}&quot; 서버에 &quot;{0}&quot; 사용자로 로그인하는 데 실패했습니다."
 
 #: ../mail/mail.error.xml.h:116
-#, fuzzy
 msgid "Your message with the subject &quot;{0}&quot; was not delivered."
-msgstr "제목이 \"{0}\"인 메세지를 배달하지 않았습니다."
+msgstr "제목이 &quot;{0}&quot;인 메세지를 배달하지 않았습니다."
 
 #: ../mail/mail.error.xml.h:117
 msgid "_Append"
@@ -14330,11 +14220,11 @@ msgstr "제목이나 보낸 사람에 포함"
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
 "play them directly from evolution."
-msgstr ""
+msgstr "오디오 인라인 첨부를 표시하고 Evolution에서 직접 플레이할 수 있는 포매터 플러그인."
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
 msgid "Audio inline plugin"
-msgstr ""
+msgstr "오디오 인라인 플러그인"
 
 #: ../plugins/backup-restore/backup-restore.c:51
 msgid "Select name of Evolution archive"
@@ -14369,15 +14259,13 @@ msgid "Restart Evolution"
 msgstr "Evolution 다시 시작"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
-#, fuzzy
 msgid "A plugin for backing up and restore Evolution data and settings."
-msgstr "Evolution 데이터 및 설정을 백업하거나 복구합니다"
+msgstr "Evolution 데이터 및 설정을 백업하고 복구합니다."
 
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-#, fuzzy
 msgid "Backup and restore plugin"
-msgstr "Evolution 데이터 및 설정을 백업하거나 복구합니다"
+msgstr "백업 및 복구 플러그인"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup Settings..."
@@ -14422,7 +14310,6 @@ msgid "Synchronize with _buddy list now"
 msgstr "지금 친구 목록과 동기화(_B)"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
-#, fuzzy
 msgid "Automatic contacts"
 msgstr "자동 연락처"
 
@@ -14430,29 +14317,27 @@ msgstr "자동 연락처"
 msgid ""
 "Automatically fills your addressbook with names and email addresses as you "
 "reply to mails. Also fills in IM contact information from your buddy lists."
-msgstr ""
+msgstr "메일에 답장할 때마다 자동으로 이름과 전자메일 주소를 주소록에 넣습니다. 또 친구 목록에서 IM 연락처 정보를 채워 넣습니다."
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
-msgstr ""
+msgstr "BBDB"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-#, fuzzy
 msgid "Local Calendars"
-msgstr "달력 불러들이기"
+msgstr "로컬 달력"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
 msgid "Provides core functionality for local calendars."
-msgstr ""
+msgstr "로컬 달력의 주요 기능을 제공합니다."
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-#, fuzzy
 msgid "HTTP Calendars"
-msgstr "달력"
+msgstr "HTTP 달력"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
 msgid "Provides core functionality for webcal and http calendars."
-msgstr ""
+msgstr "webcal 및 HTTP 달력의 주요 기능을 제공합니다."
 
 #: ../plugins/calendar-weather/calendar-weather.c:54
 #: ../plugins/calendar-weather/calendar-weather.c:60
@@ -14501,50 +14386,46 @@ msgstr "임페리얼 단위 (화씨, 인치 등)"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
 msgid "Provides core functionality for weather calendars."
-msgstr ""
+msgstr "날씨 달력의 주요 기능을 제공합니다."
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
-#, fuzzy
 msgid "Weather Calendars"
-msgstr "달별 달력"
+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 ""
+msgstr "팝업 메뉴 플러그인 데모 테스트 플러그인. 클립보드로 복사합니다."
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-#, fuzzy
 msgid "Copy _Email Address"
-msgstr "전자메일 주소(_A):"
+msgstr "전자메일 주소 복사(_E)"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-#, fuzzy
 msgid "Copy tool"
-msgstr "폴더로 복사"
+msgstr "복사 도구"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:1
 msgid "Check whether Evolution is the default mailer"
-msgstr ""
+msgstr "Evolution이 기본 메일 프로그램인지 검사"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
 msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
-msgstr ""
+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 ""
+msgstr "시작할 때 Evolution이 기본 메일 프로그램인지 확인합니다."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-#, fuzzy
 msgid "Default Mail Client "
-msgstr "기본 회신 모양새"
+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 "Evolution을 기본 전자메일 프로그램으로 하시겠습니까?"
 
 #: ../plugins/default-source/default-source.c:82
 #: ../plugins/default-source/default-source.c:109
@@ -14552,24 +14433,20 @@ msgid "Mark as default folder"
 msgstr "기본 폴더로 표시"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
-#, fuzzy
 msgid "Open Other User's Folder"
-msgstr "보낸 편지함 폴더(_M):"
+msgstr "다른 사용자 폴더 열기"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
-#, fuzzy
 msgid "_Account:"
-msgstr "계정 이름(_A):"
+msgstr "계정(_A):"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3
-#, fuzzy
 msgid "_Folder Name:"
-msgstr "폴더 이름(_N):"
+msgstr "폴더 이름(_F):"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4
-#, fuzzy
 msgid "_User:"
-msgstr "사용자이름(_U):"
+msgstr "사용자(_U):"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
 #: ../plugins/exchange-operations/exchange-account-setup.c:63
@@ -14595,12 +14472,11 @@ msgid ""
 msgstr ""
 "이 옵션을 켜면 일반 텍스트 열쇠글 인증을 사용해 Exchange 서버에 연결합니다."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:251
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:253
 msgid "Out Of Office"
 msgstr "부재 중"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:258
+#: ../plugins/exchange-operations/exchange-account-setup.c:260
 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."
@@ -14608,72 +14484,66 @@ msgstr ""
 "아래에 지정된 메세지는 부재 중에 메일을 보낸 각 사람들에게\n"
 "자동으로 전달됩니다."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:270
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:272
+#: ../plugins/exchange-operations/exchange-account-setup.c:277
 msgid "I am out of the office"
 msgstr "현재 외부에 있음"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:271
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:273
+#: ../plugins/exchange-operations/exchange-account-setup.c:276
 msgid "I am in the office"
 msgstr "현재 내부에 있음"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:321
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:324
 msgid "Change the password for Exchange account"
-msgstr "%s의 열쇠글을 입력하십시오"
+msgstr "Exchange 계정의 열쇠글 바꾸기"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:323
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:2
-#, fuzzy
 msgid "Change Password"
-msgstr "열쇠글 입력"
+msgstr "열쇠글 바꾸기"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:327
+#: ../plugins/exchange-operations/exchange-account-setup.c:331
 msgid "Manage the delegate settings for Exchange account"
-msgstr ""
+msgstr "Exchange 계정의 대리인 설정을 관리합니다"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:329
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Delegation Assitant"
-msgstr "Evolution 설정 도우미"
+msgstr "대리인 도우미"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:339
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:345
 msgid "Miscelleneous"
-msgstr "<b>기타</b>"
+msgstr "기타"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:355
 msgid "View the size of all Exchange folders"
-msgstr "모든 로컬 폴더에"
+msgstr "모든 Exchange 폴더의 크기 보기"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:351
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "Folders Size"
-msgstr "가상 폴더"
+msgstr "폴더 크기"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:358
+#: ../plugins/exchange-operations/exchange-account-setup.c:364
 msgid "Exchange Settings"
 msgstr "Exchange 설정"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:601
+#: ../plugins/exchange-operations/exchange-account-setup.c:611
 msgid "_OWA Url:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:626
+#: ../plugins/exchange-operations/exchange-account-setup.c:636
 msgid "A_uthenticate"
 msgstr "인증(_U)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:814
+#: ../plugins/exchange-operations/exchange-account-setup.c:823
 msgid "Authentication Type"
 msgstr "인증 방법"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:828
+#: ../plugins/exchange-operations/exchange-account-setup.c:837
 msgid "Ch_eck for Supported Types"
 msgstr "지원하는 방법인지 확인(_E) "
 
@@ -14684,311 +14554,269 @@ msgstr "지원하는 방법인지 확인(_E) "
 msgid ""
 "The current password does not match the existing password for your account. "
 "Please enter the correct password"
-msgstr ""
+msgstr "현재 열쇠글이 계정의 열쇠글과 맞지 않습니다. 올바른 열쇠글을 입력하십시오"
 
 #: ../plugins/exchange-operations/exchange-change-password.c:122
 msgid "The two passwords do not match. Please re-enter the passwords."
-msgstr ""
+msgstr "두 열쇠글이 맞지 않습니다. 열쇠글을 다시 입력하십시오."
 
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:3
-#, fuzzy
 msgid "Confirm Password:"
-msgstr "열쇠글 입력"
+msgstr "열쇠글 확인:"
 
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:4
-#, fuzzy
 msgid "Current Password:"
-msgstr "보안 열쇠글"
+msgstr "현재 열쇠글:"
 
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:5
-#, fuzzy
 msgid "New Password:"
-msgstr "열쇠글(_P):"
+msgstr "새 열쇠글:"
 
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:6
 msgid "Your current password has expired. Please change your password now."
-msgstr ""
+msgstr "현재의 열쇠글이 사용 만료되었습니다. 지금 열쇠글을 바꾸십시오."
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:144
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:576
-#, fuzzy
 msgid "Custom"
-msgstr "사용자 보기"
+msgstr "사용자 설정"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:191
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
-#, fuzzy, c-format
+#, c-format
 msgid "Permissions for %s"
-msgstr "권한이 거부되었습니다"
+msgstr "%s에 대한 권한"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:421
-#, fuzzy
 msgid "Delegate To"
-msgstr "대리인:"
+msgstr "대리"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:562
 #, c-format
 msgid "Remove the delegate %s?"
-msgstr ""
+msgstr "대리인 %s을(를) 지우시겠습니까?"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:679
-#, fuzzy
 msgid "Could not access Active Directory"
-msgstr "스풀 디렉토리 `%s'을(를) 만들 수 없습니다: %s"
+msgstr "액티브 디렉토리에 접근할 수 없습니다"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:694
 msgid "Could not find self in Active Directory"
-msgstr ""
+msgstr "액티브 디렉토리에서 자신을 찾을 수 없습니다"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:707
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
-msgstr ""
+msgstr "액티브 디렉토리에서 %s 대리를 찾을 수 없습니다"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:719
-#, fuzzy, c-format
+#, c-format
 msgid "Could not remove delegate %s"
-msgstr "데이터를 쓸 수가 없습니다: %s"
+msgstr "%s 대리를 지울 수 없습니다"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:779
-#, fuzzy
 msgid "Could not update list of delegates."
-msgstr "오브젝트를 업데이트할 수 없습니다"
+msgstr "대리 목록을 업데이트할 수 없습니다."
 
 #: ../plugins/exchange-operations/exchange-delegates.c:797
-#, fuzzy, c-format
+#, c-format
 msgid "Could not add delegate %s"
-msgstr "데이터를 쓸 수가 없습니다: %s"
+msgstr "%s 대리를 더할 수 없습니다"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:965
-#, fuzzy
 msgid "Error reading delegates list."
-msgstr "작업 목록을 읽어들이는 데 오류"
+msgstr "대리 목록을 읽어들이는 데 오류."
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
-msgstr ""
+msgstr "저자 (읽기, 만들기)"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:2
-#, fuzzy
 msgid "C_alendar:"
-msgstr "달력(_C):"
+msgstr "달력(_A):"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:3
-#, fuzzy
 msgid "Co_ntacts:"
-msgstr "연락처:"
+msgstr "연락처(_N):"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:4
-#, fuzzy
 msgid "Delegate Permissions"
-msgstr "대리"
+msgstr "대리 권한"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:5
-#, fuzzy
 msgid "Delegates"
 msgstr "대리"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Editor (read, create, edit)"
-msgstr ""
+msgstr "편집자 (읽기, 만들기, 편집)"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
-#, fuzzy
 msgid "Permissions for"
-msgstr "권한이 거부되었습니다"
+msgstr "다음에 대한 권한:"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
 msgid "Reviewer (read-only)"
-msgstr ""
+msgstr "검토자 (읽기전용)"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:10
 msgid ""
 "These users will be able to send mail on your behalf\n"
 "and access your folders with the permissions you give them."
-msgstr ""
+msgstr "다음 사용자는 부여한 권한에 따라 귀하를 대신해서 메일을 보낼 수 있고 귀하의 폴더에 접근할 수 있습니다."
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:12
-#, fuzzy
 msgid "_Delegate can see private items"
-msgstr "새 테스트 항목을 만듭니다"
+msgstr "대리인이 개인 항목을 볼 수 있음(_D)"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:14
-#, fuzzy
 msgid "_Inbox:"
-msgstr "받은 편지함"
+msgstr "받은 편지함(_I):"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#, fuzzy
 msgid "_Tasks:"
-msgstr "작업(_T)"
+msgstr "작업(_T):"
 
 #: ../plugins/exchange-operations/exchange-folder-permission.c:58
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
-#, fuzzy
 msgid "Permissions..."
-msgstr "권한이 거부되었습니다"
+msgstr "권한..."
 
 #: ../plugins/exchange-operations/exchange-folder-size-display.c:136
-#, fuzzy
 msgid "Folder Name"
-msgstr "폴더 이름(_N):"
+msgstr "폴더 이름"
 
 #: ../plugins/exchange-operations/exchange-folder-size-display.c:140
-#, fuzzy
 msgid "Folder Size"
-msgstr "폴더"
+msgstr "폴더 크기"
 
 #: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
-#, fuzzy
 msgid "Exchange Folder Tree"
-msgstr "메일 폴더 트리"
+msgstr "Exchange 폴더 트리"
 
 #: ../plugins/exchange-operations/exchange-folder.c:62
 #: ../plugins/exchange-operations/exchange-folder.c:223
 #: ../plugins/exchange-operations/exchange-folder.c:233
-#, fuzzy
 msgid "Unsubscribe Folder..."
-msgstr "폴더 구독(_U)..."
+msgstr "폴더 구독 해제..."
 
 #: ../plugins/exchange-operations/exchange-folder.c:460
 #: ../plugins/exchange-operations/exchange-folder.c:520
-#, fuzzy, c-format
+#, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
-msgstr "\"%s\" 폴더를 구독 해제하는 중"
+msgstr "정말로 \"%s\" 폴더를 구독 해제하시겠습니까?"
 
 #: ../plugins/exchange-operations/exchange-folder.c:472
 #: ../plugins/exchange-operations/exchange-folder.c:532
-#, fuzzy, c-format
+#, c-format
 msgid "Unsubscribe from \"%s\""
-msgstr "\"%s\" 폴더를 구독 해제하는 중"
+msgstr "\"%s\"에서 구독 해제"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:301
-#, fuzzy
 msgid "(Permission denied.)"
-msgstr "권한이 거부되었습니다"
+msgstr "(권한이 거부되었습니다.)"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
 msgid "Add User:"
-msgstr ""
+msgstr "사용자 더하기:"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
-#, fuzzy
 msgid "Add User"
-msgstr "URL 더하기(_A)"
+msgstr "사용자 더하기"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
-#, fuzzy
 msgid "<b>Permissions</b>"
-msgstr "<b>옵션</b>"
+msgstr "<b>권한</b>"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
-#, fuzzy
 msgid "Cannot Delete"
-msgstr "대리인을 입력하십오"
+msgstr "지울 수 없음"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
-#, fuzzy
 msgid "Cannot Edit"
-msgstr "연락처 편집기"
+msgstr "편집할 수 없음"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
-#, fuzzy
 msgid "Create items"
-msgstr "가상 폴더 만들기(_V)"
+msgstr "항목을 만듦"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
-#, fuzzy
 msgid "Create subfolders"
-msgstr "폴더를 만듭니다"
+msgstr "서브폴더 만듦"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
-#, fuzzy
 msgid "Delete Any Items"
-msgstr "대리"
+msgstr "아무 항목이나 지움"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
-#, fuzzy
 msgid "Delete Own Items"
-msgstr "대리"
+msgstr "자기 항목 지움"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
-#, fuzzy
 msgid "Edit Any Items"
-msgstr "약속 편집"
+msgstr "아무 항목이나 편집"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
 msgid "Edit Own Items"
-msgstr ""
+msgstr "자기 항목 편집"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
-#, fuzzy
 msgid "Folder contact"
-msgstr "연락처 %d개"
+msgstr "폴더 연락처"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
-#, fuzzy
 msgid "Folder owner"
-msgstr "보낸 사람에 따른 가상폴더(_N)"
+msgstr "폴더 소유자"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
-#, fuzzy
 msgid "Folder visible"
-msgstr "도구 모음을 표시합니다"
+msgstr "폴더 표시"
 
-# read receipt -> 내용 읽음 확인, Microsoft Office XP 참고
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
-#, fuzzy
 msgid "Read items"
-msgstr "내용 읽음 확인"
+msgstr "항목 읽음"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
-#, fuzzy
 msgid "Role: "
-msgstr "역할"
+msgstr "역할: "
 
 #: ../plugins/exchange-operations/exchange-user-dialog.c:144
-#, fuzzy
 msgid "Select User"
-msgstr "폴더 선택"
+msgstr "사용자 선택"
 
 #: ../plugins/exchange-operations/exchange-user-dialog.c:182
-#, fuzzy
 msgid "Addressbook..."
-msgstr "주소록"
+msgstr "주소록..."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
 msgid "Subscribe to Other User's Contacts"
-msgstr ""
+msgstr "다른 사용자의 연락처 구독"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1
 msgid "Subscribe to Other User's Calendar"
-msgstr ""
+msgstr "다른 사용자의 달력 구독"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
 msgid "Cannot change password due to configuration problems."
-msgstr ""
+msgstr "설정 문제때문에 열쇠글을 바꿀 수 없습니다."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
-#, fuzzy
 msgid "Cannot display folders."
-msgstr "이 폴더를 표시하는 새 창을 만듭니다"
+msgstr "폴더를 표시할 수 없습니다."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
 msgid ""
 "Changes to Exchange account configuration will take place after you quit and "
 "restart Evolution."
-msgstr ""
+msgstr "Exchange 계정 설정에 바꾼 사항들은 Evolution을 끝내고 다시 시작해야 적용됩니다."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
-#, fuzzy
 msgid "Could not authenticate to server."
-msgstr "LDAP 서버에서 인증이 실패했습니다."
+msgstr "서버에 인증할 수 없습니다."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
-#, fuzzy
 msgid "Could not change password."
-msgstr "메세지를 만들 수 없습니다."
+msgstr "열쇠글을 바꿀 수 없습니다."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid ""
@@ -14996,62 +14824,57 @@ msgid ""
 "an unknown error occurred. Check the URL, \n"
 "username, and password, and try again."
 msgstr ""
+"알 수 없는 오류가 발생해서 Exchange\n"
+"계정을 설정할 수 없습니다. URL, 사용자 이름,\n"
+"열쇠글을 확인하시고, 다시 시도하십시오."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
-#, fuzzy
 msgid "Could not connect to server {0}."
-msgstr "메일 작성 창을 만들 수 없습니다."
+msgstr "{0} 서버에 연결할 수 없습니다."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
-#, fuzzy
 msgid "Could not determine folder permissions for delegates."
-msgstr "LDAP 서버에서 스키마 정보를 가져올 수 없습니다."
+msgstr "대리인의 폴더 권한을 지정할 수 없습니다."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not find Exchange Web Storage System."
-msgstr ""
+msgstr "Exchange 웹 스토리지 시스템을 찾을 수 없습니다."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
-#, fuzzy
 msgid "Could not locate server {0}."
-msgstr "메세지를 만들 수 없습니다."
+msgstr "{0} 서버를 찾을 수 없습니다."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not make {0} a delegate"
-msgstr ""
+msgstr "{0}을(를) 대리로 만들 수 없습니다"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
-#, fuzzy
 msgid "Could not read folder permissions"
-msgstr "주소록을 지울 수 없습니다."
+msgstr "폴더 권한을 읽을 수 없습니다"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
-#, fuzzy
 msgid "Could not read folder permissions."
-msgstr "주소록을 지울 수 없습니다."
+msgstr "폴더 권한을 읽을 수 없습니다."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
-#, fuzzy
 msgid "Could not read out-of-office state"
-msgstr "메세지를 만들 수 없습니다."
+msgstr "부재중 상태를 읽을 수 없습니다"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
-#, fuzzy
 msgid "Could not update folder permissions."
-msgstr "오브젝트를 업데이트할 수 없습니다"
+msgstr "폴더 권한을 업데이트할 수 없습니다."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
-#, fuzzy
 msgid "Could not update out-of-office state"
-msgstr "오브젝트를 업데이트할 수 없습니다"
+msgstr "부재중 상태를 업데이트할 수 없습니다"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Exchange Account is offline."
-msgstr ""
+msgstr "Exchange 계정이 오프라인입니다."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Exchange Connector access error."
-msgstr ""
+msgstr "Exchange Connector 접근 오류."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid ""
@@ -15069,26 +14892,34 @@ msgid ""
 "html\n"
 "  "
 msgstr ""
+"Exchange 커넥터는 Exchange 서버의 특정 기능에\n"
+"접근해야 하지만, 이 서버에서 사용하지 않도록\n"
+"설정되거나 막혀 있는 것으로 보입니다. (보통\n"
+"고의적으로 막은 것은 아닙니다.)  Exchange 관리자가\n"
+"이 기능을 사용해야 Ximian 커넥터를 사용할 수\n"
+"있스니다.\n"
+"\n"
+"Exchange 관리자에게 보여줄 정보는, 아래의\n"
+"바로가기를 참고하십시오:\n"
+"\n"
+"http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328.html\n"
+"  "
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
-#, fuzzy
 msgid "Failed to update delegates:"
-msgstr "참석자를 업데이트할 수 없습니다. %s"
+msgstr "대리자를 업데이트하는 데 실패했습니다:"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
-#, fuzzy
 msgid "Folder already exists"
-msgstr "인증서가 이미 있습니다"
+msgstr "폴더가 이미 있습니다"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
-#, fuzzy
 msgid "Folder does not exist"
-msgstr "%s 파일이 없습니다."
+msgstr "폴더가 없습니다"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
-#, fuzzy
 msgid "Folder offline"
-msgstr "오프라인에서 작업"
+msgstr "폴더 오프라인"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 #: ../shell/e-shell.c:1265
@@ -15099,72 +14930,71 @@ msgstr "일반 오류"
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
-msgstr ""
+msgstr "다른 경로에서 OWA가 실행하고 있다면, 계정 설정 대화 상자에서 그 경로를 지정해야 합니다."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Mailbox for {0} is not on this server."
-msgstr ""
+msgstr "{0}에 대한 메일 박스는 이 서버에 없습니다."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Make sure the URL is correct and try again."
-msgstr ""
+msgstr "URL이 올바른 지 확인하시고 다시 시도하십시오."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Make sure the server name is spelled correctly and try again."
-msgstr ""
+msgstr "서버 이름의 철자가 맞는 지 확인하시고 다시 시도하십시오."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Make sure the username and password are correct and try again."
-msgstr ""
+msgstr "사용자 이름과 열쇠글이 올바른 지 확인하시고 다시 시도하십시오."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "No Global Catalog server configured for this account."
-msgstr ""
+msgstr "이 계정에서 Global Catalog 서버를 설정하지 않았습니다."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "No mailbox for user {0} on {1}."
-msgstr ""
+msgstr "{0} 사용자의 메일박스가 {1}에 없습니다."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
-#, fuzzy
 msgid "No such user {0}"
-msgstr "그런 소스가 없습니다"
+msgstr "{0} 사용자가 없습니다"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Password successfully changed."
-msgstr ""
+msgstr "열쇠글을 성공적으로 바꿨습니다."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
-#, fuzzy
 msgid "Please restart Evolution"
-msgstr "Evolution 다시 시작"
+msgstr "Evolution을 다시 시작해 주십시오"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
-#, fuzzy
 msgid "Please select a user."
-msgstr "서버를 선택하십시오."
+msgstr "사용자를 선택하십시오."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Server rejected password because it is too weak."
-msgstr ""
+msgstr "열쇠글이 너무 취약하기 때문에 서버에서 거부했습니다."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "The Exchange account will be disabled when you quit Evolution"
-msgstr ""
+msgstr "Evolution을 끝내면 Exchange 계정을 사용하지 않게 됩니다"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "The Exchange account will be removed when you quit Evolution"
-msgstr ""
+msgstr "Evolution을 끝내면 Exchange 계정을 지우게 됩니다"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "The Exchange server is not compatible with Exchange Connector."
-msgstr ""
+msgstr "이 Exchange 서버는 Exchange 커넥터와 호환되지 않습니다."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid ""
 "The server is runinng Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
 msgstr ""
+"서버가 Exchange 5.5를 실행하고 있습니다. Exchange Connector는 Microsoft "
+"Exchange 2000 및 2003만 지원합니다."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid ""
@@ -15174,102 +15004,101 @@ msgid ""
 "\n"
 "Or you might have just typed your password wrong."
 msgstr ""
+"이것은 서버 설정이 사용자 이름의 일부에 Windows \n"
+"도메인 이름을 지정해야 하도록 되어 있기 때문일\n"
+"수도 있습니다. (예를 들어, &quot;DOMAIN\\user&quot;)\n"
+"\n"
+"아니면 단순히 열쇠글을 잘못 입력했을 수도 있습니다."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid "Try again with a different password."
-msgstr ""
+msgstr "다른 열쇠글로 다시 시도해 보십시오."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
-#, fuzzy
 msgid "Unable to add user to access control list:"
-msgstr "주소 선택 컨트롤을 활성화할 수 없습니다."
+msgstr "사용자를 접근권한 컨트롤 목록에 더할 수 없습니다:"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
-#, fuzzy
 msgid "Unable to edit delegates."
-msgstr "사용권한 파일을 읽을 수 없습니다."
+msgstr "위임자를 편집할 수 없습니다."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
-#, fuzzy
 msgid "Unknown error looking up {0}"
-msgstr "알 수 없는 오류가 발생했습니다"
+msgstr "{0}을(를) 찾아보는 데 알 수 없는 오류"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
-#, fuzzy
 msgid "Unknown error."
-msgstr "알 수 없는 오류가 발생했습니다"
+msgstr "알 수 없는 오류."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
-#, fuzzy
 msgid "Unknown type"
-msgstr "알 수 없음"
+msgstr "알 수 없는 종류"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
-#, fuzzy
 msgid "Unsupported operation"
-msgstr "사용자가 취소한 동작."
+msgstr "지원하지 않는 동작"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "You are nearing your quota available for storing mails on this server."
-msgstr ""
+msgstr "이 서버에서 사용할 수 있는 메일 저장 한계 용량에 가까워져 있습니다."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "You cannot make yourself your own delegate"
-msgstr ""
+msgstr "자기 자신을 자신의 대리인으로 만들 수 없습니다"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "You have exceeded your quota for storing mails on this server."
-msgstr ""
+msgstr "이 서버에 메일을 저장할 수 있는 제한 용량을 넘어갔습니다."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "You may only configure a single Exchange account."
-msgstr ""
+msgstr "한 개의 Exchange 계정만 설정할 수 있습니다."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid ""
 "Your current usage is : {0}KB. Try to clear up some space by deleting some "
 "mails."
-msgstr ""
+msgstr "현재 사용량은: {0}KB입니다. 메일을 지워서 공간을 더 확보해 보십시오."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid ""
 "Your current usage is : {0}KB. You will not be able to either send or "
 "recieve mails now."
-msgstr ""
+msgstr "현재 사용량은: {0}KB입니다. 현재 메일을 보내거나 받지 못할 것입니다."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "Your current usage is : {0}KB. You will not be able to send mails till you "
 "clear up some space by deleting some mails."
-msgstr ""
+msgstr "현재 사용량은: {0}KB입니다. 메일을 지워서 공간을 더 확보하지 않으면 메일을 보내지 못할 것입니다."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
-msgstr ""
+msgstr "열쇠글이 만료되었습니다."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "{0} cannot be added to an access control list"
-msgstr ""
+msgstr "{0}을(를) 접근 권한 조정 목록에 더할 수 없습니다"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "{0} is already a delegate"
-msgstr ""
+msgstr "{0}은(는) 이미 대리인입니다"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0} is already in the list"
-msgstr ""
+msgstr "{0}은(는) 이미 목록에 있습니다"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
 msgid "Subscribe to Other User's Tasks"
-msgstr ""
+msgstr "다른 사용자의 작업에 구독"
 
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
 msgid "Check folder permissions"
-msgstr ""
+msgstr "폴더 권한 검사"
 
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
-msgstr ""
+msgstr "다른 사용자의 폴더에 구독"
 
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
 #, c-format
@@ -15278,71 +15107,60 @@ 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
-#, fuzzy
 msgid "Unsubscribe Folders"
-msgstr "폴더 구독(_U)..."
+msgstr "폴더 구독 해제"
 
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
 msgid "Checklist"
 msgstr "확인목록"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-#, fuzzy
 msgid "Groupwise Account Setup"
-msgstr "그룹웨어 모음"
+msgstr "그룹웨어 계정 설정"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:77
-#, fuzzy
 msgid "Junk Settings"
-msgstr "설정"
+msgstr "정크메일 설정"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:90
-#, fuzzy
 msgid "<b>Junk Mail Settings</b>"
-msgstr "<b>작업 목록 옵션</b>"
+msgstr "<b>정크메일 설정</b>"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:112
-#, fuzzy
 msgid "Junk Mail Settings..."
-msgstr "파일롯 설정(_L)..."
+msgstr "정크 메일 설정..."
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:1
-#, fuzzy
 msgid "<b>Junk List :</b>"
-msgstr "<b>작업 목록</b>"
+msgstr "<b>정크메일 목록 :</b>"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:2
-#, fuzzy
 msgid "Email:"
-msgstr "전자메일"
+msgstr "전자메일:"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:3
-#, fuzzy
 msgid "Junk Mail Settings"
-msgstr "설정"
+msgstr "정크메일 설정"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
 #: ../plugins/mail-account-disable/mail-account-disable.c:46
-#, fuzzy
 msgid "_Disable"
-msgstr "사용 않기"
+msgstr "사용 않음(_D)"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:6
-#, fuzzy
 msgid "_Enable"
-msgstr "사용"
+msgstr "사용(_E)"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:7
-#, fuzzy
 msgid "_Junk List"
-msgstr "정크메일 테스트"
+msgstr "정크메일 목록(_J)"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
-msgstr "groupwise 메세지에 보내기 옵션 더하기"
+msgstr "Groupwise 메세지에 보내기 옵션 더하기"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../widgets/misc/e-send-options.glade.h:17
@@ -15351,17 +15169,15 @@ msgstr "보내기 옵션"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
-msgstr ""
+msgstr "Groupwise 계정 기능에 대한 플러그인."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-#, fuzzy
 msgid "Groupwise Features"
-msgstr "그룹웨어 모음"
+msgstr "그룹웨어 기능"
 
 #: ../plugins/groupwise-features/process-meeting.c:49
-#, fuzzy
 msgid "Accept Tentatively"
-msgstr "잠정적"
+msgstr "시험 삼아 허용"
 
 #: ../plugins/groupwise-features/properties.glade.h:2
 msgid "<b>Users :</b>"
@@ -15401,63 +15217,54 @@ msgid "_Sharing"
 msgstr "공유(_S)"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:1
-#, fuzzy
 msgid "<b>Name</b>"
-msgstr "<b>집</b> "
+msgstr "<b>이름</b> "
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:2
 msgid "Access Rights"
-msgstr ""
+msgstr "접근 권한"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
-#, fuzzy
 msgid "Add/Edit"
-msgstr "편집"
+msgstr "더하기/편집"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5
-#, fuzzy
 msgid "Con_tacts"
-msgstr "연락처"
+msgstr "연락처(_T)"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
 msgid "Modify _folders/options/rules/"
-msgstr ""
+msgstr "폴더/옵션/규칙 고치기(_F)"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
 msgid "Read items marked _private"
-msgstr ""
+msgstr "개인으로 표시된 항목 읽기(_P)"
 
 # Reminder -> 미리 알림, Microsoft Office XP
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
-#, fuzzy
 msgid "Reminder Notes"
-msgstr "나중에 알림(_R)"
+msgstr "나중에 알림"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
-#, fuzzy
 msgid "Subscribe to my _alarms"
-msgstr "구독(_S)"
+msgstr "내 알림에 구독(_A)"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
-#, fuzzy
 msgid "Subscribe to my _notifications"
-msgstr "구독(_S)"
+msgstr "내 공지사항에 구독(_N)"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
 #: ../ui/evolution-mail-message.xml.h:121
-#, fuzzy
 msgid "_Read"
-msgstr "읽음"
+msgstr "읽기(_R)"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:14
-#, fuzzy
 msgid "_Write"
-msgstr "인쇄(_P)"
+msgstr "쓰기(_W)"
 
 #: ../plugins/groupwise-features/proxy-listing.glade.h:1
-#, fuzzy
 msgid "Proxy"
-msgstr "우선순위"
+msgstr "프록시"
 
 #: ../plugins/groupwise-features/proxy-listing.glade.h:2
 #: ../smime/gui/smime-ui.glade.h:49
@@ -15467,30 +15274,28 @@ msgid "dialog1"
 msgstr "dialog1"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
-#, fuzzy
 msgid "<b>Account Name</b>"
-msgstr "계정 이름"
+msgstr "<b>계정 이름</b>"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
 msgid "Proxy Login"
-msgstr ""
+msgstr "프록시 로그인"
 
 #: ../plugins/groupwise-features/proxy-login.c:219
-#: ../plugins/groupwise-features/proxy-login.c:261
-#: ../plugins/groupwise-features/proxy.c:490
+#: ../plugins/groupwise-features/proxy-login.c:262
+#: ../plugins/groupwise-features/proxy.c:499
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s%s(사용자 %s)의 열쇠글을 입력하십시오"
 
-#: ../plugins/groupwise-features/proxy-login.c:484
-#, fuzzy
+#: ../plugins/groupwise-features/proxy-login.c:497
 msgid "_Proxy Login..."
-msgstr "인쇄(_P)..."
+msgstr "프록시 로그인(_P)..."
 
-#: ../plugins/groupwise-features/proxy.c:672
+#: ../plugins/groupwise-features/proxy.c:680
 msgid "The Proxy tab will be available only when the account is enabled."
-msgstr ""
+msgstr "해당 계정을 사용할 경우에만 프록시 탭을 사용할 수 있습니다."
 
 #: ../plugins/groupwise-features/share-folder-common.c:318
 msgid "Users"
@@ -15501,18 +15306,16 @@ msgid "Enter the users and set permissions"
 msgstr "사용자를 입력하시고 권한을 설정하십시오"
 
 #: ../plugins/groupwise-features/share-folder-common.c:338
-#, fuzzy
 msgid "New _Shared Folder..."
-msgstr "새 폴더(_N)..."
+msgstr "새 공유 폴더(_S)..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:453
+#: ../plugins/groupwise-features/share-folder-common.c:446
 msgid "Sharing"
 msgstr "공유"
 
 #: ../plugins/groupwise-features/status-track.c:235
-#, fuzzy
 msgid "Track Message Status..."
-msgstr "메세지 저장..."
+msgstr "메세지 상태 추적..."
 
 #: ../plugins/itip-formatter/itip-formatter.c:724
 msgid "Unable to parse item"
@@ -15546,16 +15349,15 @@ msgstr "'%s' 달력에 취소라고 보냄"
 #: ../plugins/itip-formatter/itip-formatter.c:898
 #, c-format
 msgid "Organizer has removed the delegate %s "
-msgstr ""
+msgstr "주최자가 대리인 %s을(를) 지웠습니다"
 
 #: ../plugins/itip-formatter/itip-formatter.c:905
 msgid "Sent a cancellation notice to the delegate"
-msgstr ""
+msgstr "대리인에게 취소 공지를 보냈습니다"
 
 #: ../plugins/itip-formatter/itip-formatter.c:907
-#, fuzzy
 msgid "Could not send the cancellation notice to the delegate"
-msgstr "이 일지 항목에 대한 취소 공지를 보내시겠습니까?"
+msgstr "위임자에게 취소 공지를 보낼 수 없습니다"
 
 #: ../plugins/itip-formatter/itip-formatter.c:991
 msgid "Attendee status could not be updated because the status is invalid"
@@ -15630,7 +15432,7 @@ msgstr "충돌하는 모임을 찾을 달력을 선택하십시오"
 
 #: ../plugins/itip-formatter/itip-formatter.c:2031
 msgid "Conflict Search Table"
-msgstr ""
+msgstr "충돌 찾기 표"
 
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
@@ -15786,9 +15588,9 @@ msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b>님이 다음 모임 정보를 게시했습니다:"
 
 #: ../plugins/itip-formatter/itip-view.c:351
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
-msgstr "<b>%s</b>님이 다음 모임을 취소했습니다."
+msgstr "<b>%s</b>님이 다음 모임을 위임했습니다:"
 
 #: ../plugins/itip-formatter/itip-view.c:354
 #, c-format
@@ -15935,168 +15737,147 @@ msgid "Comment:"
 msgstr "설명:"
 
 #: ../plugins/itip-formatter/itip-view.c:981
-#, fuzzy
 msgid "Send u_pdates to attendees"
-msgstr "참석자를 업데이트할 수 없습니다. %s"
+msgstr "참석자에게 업데이트 보내기(_P)"
 
 #: ../plugins/itip-formatter/itip-view.c:990
-#, fuzzy
 msgid "A_pply to all instances"
-msgstr "모든 경우"
+msgstr "모든 경우에 적용(_P)"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-#, fuzzy
 msgid "Displays text/calendar parts in messages."
-msgstr "다음의 중요한 메세지를 보여줍니다"
+msgstr "메세지의 텍스트/달력 부분을 표시합니다."
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
-#, fuzzy
 msgid "Itip Formatter"
-msgstr "가져오기"
+msgstr "ITIP 포매터"
 
 #: ../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 ""
+msgstr "&quot;{0}&quot;이(가) 모임을 위임했습니다. {1} 대리인을 더하시겠습니까?"
 
-# event -> 행사, Microsoft Office XP 참고
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
-#, fuzzy
 msgid "This meeting has been delegated"
-msgstr "이 행사는 지워졌습니다."
+msgstr "이 모임은 위임되었습니다"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-#, fuzzy
 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 ""
+msgstr "프록시 로그아웃(_L)"
 
 #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
-#, fuzzy
 msgid "Allows disabling of accounts."
-msgstr "계정 목록"
+msgstr "계정을 사용하지 않을 수 있습니다."
 
 #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
-#, fuzzy
 msgid "Disable Account"
-msgstr "메일 계정"
+msgstr "계정 사용 않음"
 
 #: ../plugins/mail-remote/client.c:30
-#, fuzzy, c-format
+#, c-format
 msgid "System error: %s"
-msgstr "유효성 검사 오류: %s"
+msgstr "시스템 오류: %s"
 
 #: ../plugins/mail-remote/client.c:32
-#, fuzzy, c-format
+#, c-format
 msgid "Camel error: %s"
-msgstr "유효성 검사 오류: %s"
+msgstr "Camel 오류: %s"
 
 #: ../plugins/mail-remote/evolution-mail-store.c:476
 msgid "Account cannot send e-mail"
-msgstr ""
+msgstr "전자메일을 보낼 수 없는 계정입니다"
 
 #: ../plugins/mail-remote/evolution-mail-store.c:605
-#, fuzzy
 msgid "No store available"
-msgstr "요약이 없습니다."
+msgstr "저장소가 없습니다"
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
 msgid ""
 "A plugin which implements a CORBA interface for accessing mail data remotely."
-msgstr ""
+msgstr "원격에서 메일 데이터를 접근하는 CORBA 인터페이스를 구현하는 플러그인."
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
-#, fuzzy
 msgid "Mail Remote"
-msgstr "메일 거르게"
+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 ""
+msgstr "메일 메세지 내용에서 모임을 만드는 플러그인."
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
-#, fuzzy
 msgid "Con_vert to Meeting"
-msgstr "선택 반전(_I)"
+msgstr "모임으로 변환(_V)"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
-#, fuzzy
 msgid "Mail to meeting"
-msgstr "모임."
+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 ""
+msgstr "메일 메세지 내용에서 작업을 만드는 플러그인."
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
 msgid "Con_vert to Task"
-msgstr ""
+msgstr "작업으로 변환(_V)"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-#, fuzzy
 msgid "Mail to task"
-msgstr "%s에 보내는 메일"
+msgstr "메일에서 작업으로"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
-#, fuzzy
 msgid "Contact list _owner"
-msgstr "연락처 목록 편집기"
+msgstr "리스트 담당자에게 연락(_O)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get list _archive"
-msgstr ""
+msgstr "리스트 아카이브 받기(_A)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
-#, fuzzy
 msgid "Get list _usage information"
-msgstr "모임 정보"
+msgstr "리스트 사용 정보 받기(_U)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
-#, fuzzy
 msgid "Mailing List Actions"
-msgstr "메일링 리스트"
+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
-#, fuzzy
 msgid "Mailing _List"
-msgstr "메일링 리스트"
+msgstr "메일링 리스트(_L)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
 msgid ""
 "Provide actions for common mailing list commands (subscribe, "
 "unsubscribe, ...)."
-msgstr ""
+msgstr "일반적인 메일링 리스트 명령을 제공합니다 (가입, 탈퇴 등)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
-#, fuzzy
 msgid "_Post message to list"
-msgstr "메시지들을 %s(으)로 옮기는 중"
+msgstr "리스트에 메세지 보내기(_P)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
-#, fuzzy
 msgid "_Subscribe to list"
-msgstr "구독(_S)"
+msgstr "리스트에 가입(_S)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
-#, fuzzy
 msgid "_Un-subscribe to list"
-msgstr "구독 중지(_U)"
+msgstr "리스트에 탈퇴(_U)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 msgid "Action not available"
@@ -16177,79 +15958,69 @@ msgstr "메세지 보내기(_S)"
 
 #: ../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 an archive of the list this message belongs to"
-msgstr ""
+msgstr "이 메세지가 속한 메일링 리스트의 아카이브 받기"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
 msgid "Get information about the usage of the list this message belongs to"
-msgstr ""
+msgstr "이 메세지가 속한 메일링 리스트의 사용방법 정보 받기"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
-#, fuzzy
 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
-#, fuzzy
 msgid "Subscribe to the mailing list this message belongs to"
-msgstr "선택한 메세지의 메일링 리스트로 회신을 만듭니다"
+msgstr "이 메세지가 속한 메일링 리스트에 가입"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
-#, fuzzy
 msgid "Unsubscribe to the mailing list this message belongs to"
-msgstr "선택한 메세지의 메일링 리스트로 회신을 만듭니다"
+msgstr "이 메세지가 속한 메일링 리스트에서 탈퇴"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
 msgid "Mark calendar offline"
-msgstr ""
+msgstr "달력을 오프라인으로 표시"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
-#, fuzzy
 msgid "Marks the selected calendar for offline viewing."
-msgstr "선택한 메세지를 지운 것으로 표시합니다"
+msgstr "선택한 달력을 오프라인에서 볼 수 있도록 표시합니다."
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
 msgid "_Do not make this available offline"
-msgstr ""
+msgstr "오프라인에서는 사용할 수 없음(_D)"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-#, fuzzy
 msgid "_Mark Calendar for offline use"
-msgstr "이 달력은 오프라인에서 사용할 수 있게 표시하지 않았습니다"
+msgstr "달력을 오프라인 사용으로 표시(_M)"
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
-msgstr ""
+msgstr "Mono 플러그인을 구현하는 플러그인."
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
-#, fuzzy
 msgid "Mono Loader"
-msgstr "폴더로 이동"
+msgstr "Mono 로더"
 
 #: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:1
-#, fuzzy
 msgid "Generates a D-BUS message when new mail arrives."
-msgstr "새 메일이 도착하면 D-BUS 메세지 발생(_G)"
+msgstr "새 메일이 도착하면 D-BUS 메세지가 발생합니다."
 
 #: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:2
-#, fuzzy
 msgid "New Mail Notification"
-msgstr "새 메일 알림 종류"
+msgstr "새 메일 알림"
 
 #: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:3
-#, fuzzy
 msgid "New mail notify"
-msgstr "새 메일 알림 종류"
+msgstr "새 메일 알림"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "A plugin for managing which plugins are enabled or disabled."
-msgstr ""
+msgstr "어느 플러그인을 사용하고 사용하지 않을 지 관리하는 플러그인."
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#, fuzzy
 msgid "Plugin manager"
 msgstr "플러그인 관리자"
 
@@ -16258,7 +16029,6 @@ msgid "Enable and disable plugins"
 msgstr "플러그인 사용 여부"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
-#, fuzzy
 msgid "Plugins"
 msgstr "플러그인"
 
@@ -16301,16 +16071,18 @@ msgid ""
 "\n"
 "This plugin is unsupported demonstration code only.\n"
 msgstr ""
+"HTML 메일을 사용하지 않도록 하는 포매터 플러그인 데모 테스트 플러그인.\n"
+"\n"
+"이 플러그인은 데모 코드 전용이고 지원하지 않습니다.\n"
 
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
-#, fuzzy
 msgid "Plain Text Mode"
-msgstr "텍스트 모델"
+msgstr "일반 텍스트 모드"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
 msgid "Prefer plain-text"
-msgstr ""
+msgstr "일반 텍스트 선호"
 
 #: ../plugins/prefer-plain/prefer-plain.c:105
 msgid "Show HTML if present"
@@ -16330,7 +16102,7 @@ msgstr "HTML 모드"
 
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
 msgid "Gives an option to print mail from composer"
-msgstr ""
+msgstr "편지 작성 창에서 메일을 인쇄할 수 있는 옵션 사용"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
 #: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
@@ -16339,31 +16111,29 @@ msgid "Print Pre_view"
 msgstr "인쇄 미리 보기(_V)"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:2
-#, fuzzy
 msgid "Prints the message"
-msgstr "이 메세지를 인쇄합니다"
+msgstr "메세지를 인쇄합니다"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:98
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:99
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (내부에 포함)"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
 msgid "Sa junk-plugin"
-msgstr ""
+msgstr "SA 정크메일 플러그인"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
 msgid "learns junk messages using spamd."
-msgstr ""
+msgstr "spamd로 정크메일 메세지 학습."
 
 #: ../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 ""
+msgstr "메세지의 모든 첨부물이나 그 일부를 한 번에 저장하는 플러그인."
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#, fuzzy
 msgid "Save attachments"
-msgstr "모든 첨부 저장"
+msgstr "첨부 저장"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
 msgid "Save Attachments ..."
@@ -16392,64 +16162,55 @@ msgstr "저장"
 #. *
 #: ../plugins/save-calendar/csv-format.c:171
 msgid "%F %T"
-msgstr ""
+msgstr "%F %T"
 
 #: ../plugins/save-calendar/csv-format.c:385
 msgid "Uid"
-msgstr ""
+msgstr "UID"
 
 #: ../plugins/save-calendar/csv-format.c:387
-#, fuzzy
 msgid "Description List"
-msgstr "설명"
+msgstr "설명 목록"
 
 #: ../plugins/save-calendar/csv-format.c:388
-#, fuzzy
 msgid "Categories List"
-msgstr "분류: %s"
+msgstr "분류 목록"
 
 #: ../plugins/save-calendar/csv-format.c:389
-#, fuzzy
 msgid "Comment List"
-msgstr "연락처 목록(_L)"
+msgstr "메모 목록"
 
 #: ../plugins/save-calendar/csv-format.c:391
-#, fuzzy
 msgid "Created"
-msgstr "만들기"
+msgstr "만듦"
 
 #: ../plugins/save-calendar/csv-format.c:392
-#, fuzzy
 msgid "Contact List"
-msgstr "연락처 목록(_L)"
+msgstr "연락처 목록"
 
 #: ../plugins/save-calendar/csv-format.c:393
-#, fuzzy
 msgid "Start"
 msgstr "시작"
 
 #: ../plugins/save-calendar/csv-format.c:394
-#, fuzzy
 msgid "End"
 msgstr "끝"
 
 #: ../plugins/save-calendar/csv-format.c:396
 msgid "percent Done"
-msgstr ""
+msgstr "퍼센트 완료"
 
 #: ../plugins/save-calendar/csv-format.c:398
 msgid "Url"
-msgstr ""
+msgstr "URL"
 
 #: ../plugins/save-calendar/csv-format.c:399
-#, fuzzy
 msgid "Attendees List"
-msgstr "참석자"
+msgstr "참석자 목록"
 
 #: ../plugins/save-calendar/csv-format.c:401
-#, fuzzy
 msgid "Modified"
-msgstr "모델"
+msgstr "수정함"
 
 #: ../plugins/save-calendar/csv-format.c:552
 msgid "Advanced options for the CSV format"
@@ -16480,19 +16241,16 @@ msgid "iCalendar format (.ics)"
 msgstr "iCalendar 형식 (.ics)"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
-#, fuzzy
 msgid "Save Selected"
-msgstr "선택하지 않았습니다"
+msgstr "선택한 것 저장"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-#, fuzzy
 msgid "Save to _Disk"
-msgstr "작업 저장"
+msgstr "디스크에 저장(_D)"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
-#, fuzzy
 msgid "Saves selected calendar or tasks list to disk."
-msgstr "선택한 연락처를 VCard로 저장합니다."
+msgstr "선택한 달력이나 작업 목록을 디스크에 저장합니다."
 
 #.
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
@@ -16501,48 +16259,36 @@ msgstr "선택한 연락처를 VCard로 저장합니다."
 #. *
 #: ../plugins/save-calendar/rdf-format.c:158
 msgid "%FT%T"
-msgstr ""
+msgstr "%FT%T"
 
 #: ../plugins/save-calendar/rdf-format.c:396
 msgid "RDF format (.rdf)"
 msgstr "RDF 형식 (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:171
-#: ../plugins/save-calendar/save-calendar.c:181
+#: ../plugins/save-calendar/save-calendar.c:170
+#: ../plugins/save-calendar/save-calendar.c:180
 msgid "Select destination file"
 msgstr "대상 파일 선택"
 
-#: ../plugins/save-calendar/save-calendar.c:216
-#, c-format
-msgid ""
-"The suggested filename extension of this filetype (%s) is unused in the "
-"chosen filename. Do you want to continue?"
-msgstr ""
-"이런 종류의 파일에 사용하는 파일이름 확장자(%s)를 파일 이름에 사용하지 않았습"
-"니다. 그래도 계속 하시겠습니까?"
-
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
-#, fuzzy
 msgid "Select one source"
-msgstr "선택 모드"
+msgstr "한 원본 선택"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-#, fuzzy
 msgid "Selects a single calendar or task source for viewing."
-msgstr "충돌하는 모임을 찾을 달력을 선택하십시오"
+msgstr "한 개의 달력이나 작업 원본을 본다고 선택합니다."
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
-#, fuzzy
 msgid "_Show only this Calendar"
-msgstr "달별 달력"
+msgstr "이 달력만 표시(_S)"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
 msgid "_Show only this Task List"
-msgstr ""
+msgstr "이 작업 목록만 표시(_S)"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
 msgid "Startup wizard"
-msgstr ""
+msgstr "시작 마법사"
 
 #: ../plugins/startup-wizard/startup-wizard.c:85
 msgid "Evolution Setup Assistant"
@@ -16578,23 +16324,20 @@ msgstr "%s에서:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:234
 #: ../shell/e-shell-importer.c:509
-#, fuzzy
 msgid "Importing data."
-msgstr "ELM 데이터 가져오기"
+msgstr "데이터를 가져오는 중입니다."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Indicates if threading of messages should fall back to subject."
-msgstr ""
+msgstr "메세지 글타래로 만들 때 글타래가 없으면 제목에 따라서 글타래를 만들 지 나타냅니다."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
-#, fuzzy
 msgid "Subject Threading"
-msgstr "글타래 선택(_T)"
+msgstr "제목 글타래"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
-#, fuzzy
 msgid "Thread messages by subject"
-msgstr "제목에 따라 메세지 목록을 쓰레드 표시합니다"
+msgstr "제목에 따라 메세지를 글타래로 표시합니다"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
 #: ../plugins/subject-thread/subject-thread.c:54
@@ -16606,9 +16349,8 @@ msgid "Evolution Shell"
 msgstr "Evolution 쉘"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
 msgid "Evolution Shell Config factory"
-msgstr "Evolution 쉘"
+msgstr "Evolution 쉘 설정 팩토리"
 
 #: ../shell/GNOME_Evolution_Test.server.in.in.h:1
 msgid "Evolution Test"
@@ -16765,7 +16507,6 @@ msgid "Choose the destination for this import"
 msgstr "어디로 가져올 지를 고르십시오"
 
 #: ../shell/e-shell-importer.c:148
-#, fuzzy
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -16773,7 +16514,7 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 "Evolution에서 다음 프로그램에서 가져올 수 있는 설정을 검사했습니다:\n"
-"Pine, 넷스케이프, Elm, iCalendar. 가져올 수 있는 설정을 찾을 수\n"
+"PINE, 넷스케이프, ELM, iCalendar. 가져올 수 있는 설정을 찾을 수\n"
 "없었습니다. 다시 시도하려면 \"뒤로\" 단추를 누르십시오.\n"
 
 #: ../shell/e-shell-importer.c:283
@@ -17045,9 +16786,8 @@ msgstr ""
 "  자세한 정보를 %s --help를 실행하십시오.\n"
 
 #: ../shell/shell.error.xml.h:1
-#, fuzzy
 msgid "Are you sure you want to forget all remembered passwords?"
-msgstr "정말로 '{0}' 작업을 지우시겠습니까?"
+msgstr "정말로 기억했던 모든 열쇠글을 초기화하시겠습니까?"
 
 #: ../shell/shell.error.xml.h:2
 msgid "Continue"
@@ -17062,11 +16802,10 @@ msgid "Evolution can not start."
 msgstr "Evolution을 시작할 수 없습니다."
 
 #: ../shell/shell.error.xml.h:5
-#, fuzzy
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed. "
-msgstr "기억한 열쇠글을 버리고 다음에 다시 물어보게 합니다"
+msgstr "열쇠글을 초기화하면 기억햇던 모든 열쇠글을 지웁니다. 다음에 열쇠글이 필요할 때 다시 물어보게 됩니다."
 
 #: ../shell/shell.error.xml.h:7
 msgid "Insufficient disk space for upgrade."
@@ -17077,7 +16816,6 @@ msgid "Really delete old data?"
 msgstr "정말로 과거의 데이터를 지우시겠습니까?"
 
 #: ../shell/shell.error.xml.h:9
-#, fuzzy
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory is about to be be "
 "permanently removed.\n"
@@ -17089,17 +16827,16 @@ msgid ""
 "Once deleted, you cannot downgrade to the previous version of Evolution "
 "without manual intervention.\n"
 msgstr ""
-"\"evolution\" 디렉토리의 전체 내용을 지우게 됩니다.\n"
+"&quot;evolution&quot; 디렉토리의 전체 내용을 지우게 됩니다.\n"
 "\n"
-"수동으로 모든 메일, 연락처, 달력 데이터가 온전하게 남아 있는 지 확인하는 게 "
-"좋습니다.  이 Evolution 버전은 과거 데이터를 지우지 않아도 문제 없이 동작합니"
-"다.\n"
+"수동으로 모든 메일, 연락처, 달력 데이터가 온전하게 남아 있는 지, 그리고 이 "
+"Evolution 버전이 과거 데이터를 지우기 전에 올바르게 동작하는 지 확인하는 게 "
+"좋습니다.\n"
 "\n"
 "일단 데이터를 지우면 수동으로 조작하지 않고서는 과거 버전 Evolution으로 다운"
 "그레이드할 수 없습니다.\n"
 
 #: ../shell/shell.error.xml.h:15
-#, fuzzy
 msgid ""
 "The previous version of evolution stored its data in a different location.\n"
 "\n"
@@ -17110,16 +16847,13 @@ msgid ""
 msgstr ""
 "이전 버전의 Evolution에서 데이터를 지금 버전과는 다른 위치에 저장했습니다.\n"
 "\n"
-"이 데이터를 지운다면, \"evolution\" 디렉토리의 모든 내용을 완전히 지우게 됩니"
-"다. 이 데이터를 유지한다면, 나중에 지우고 싶을 때 수동으로 \"evolution\"의 내"
-"용을 지울 수 있습니다.\n"
+"이 데이터를 지운다면, &quot;evolution&quot; 디렉토리의 모든 내용을 완전히 지"
+"우게 됩니다. 이 데이터를 유지한다면, 나중에 지우고 싶을 때 수동으로 &quot;"
+"evolution*&quot;의 내용을 지울 수 있습니다.\n"
 
 #: ../shell/shell.error.xml.h:19
-#, fuzzy
 msgid "Upgrade from previous version failed: {0}"
-msgstr ""
-"이전 버전에서 업그레이드하는 데 실패했습니다:\n"
-"{0}"
+msgstr "이전 버전에서 업그레이드하는 데 실패했습니다: {0}"
 
 #: ../shell/shell.error.xml.h:20
 msgid ""
@@ -17159,9 +16893,8 @@ msgstr ""
 "자세한 정보는 도움말을 클릭하십시오."
 
 #: ../shell/shell.error.xml.h:31
-#, fuzzy
 msgid "_Forget"
-msgstr "포트(_P):"
+msgstr "열쇠글 초기화(_F)"
 
 #: ../shell/shell.error.xml.h:32
 msgid "_Keep Data"
@@ -17218,7 +16951,6 @@ msgstr ""
 #: ../smime/gui/certificate-manager.c:385
 #: ../smime/gui/certificate-manager.c:597
 #: ../smime/gui/certificate-manager.c:605
-#, fuzzy
 msgid "Select a certificate to import..."
 msgstr "가져올 인증서를 선택하십시오..."
 
@@ -17357,9 +17089,8 @@ msgid "Certificate details"
 msgstr "인증서 상세 정보"
 
 #: ../smime/gui/smime-ui.glade.h:17
-#, fuzzy
 msgid "Certificates Table"
-msgstr "인증서 이름"
+msgstr "인증서 표"
 
 #: ../smime/gui/smime-ui.glade.h:18
 msgid "Common Name (CN)"
@@ -17729,9 +17460,8 @@ msgid "Shutting down %s (%s)\n"
 msgstr "%s (%s) 프로그램을 강제로 종료하는 중입니다\n"
 
 #: ../ui/evolution-addressbook.xml.h:3
-#, fuzzy
 msgid "Copy Selected Contacts to Another Folder..."
-msgstr "연락처를 다른 폴더로 복사..."
+msgstr "선택한 연락처를 다른 폴더로 복사..."
 
 #: ../ui/evolution-addressbook.xml.h:4 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
@@ -17750,9 +17480,8 @@ msgid "Delete selected contacts"
 msgstr "선택한 연락처를 지웁니다"
 
 #: ../ui/evolution-addressbook.xml.h:11
-#, fuzzy
 msgid "Move Selected Contacts to Another Folder..."
-msgstr "연락처를 다른 폴더로 옮깁니다..."
+msgstr "선택한 연락처를 다른 폴더로 옮기기..."
 
 #: ../ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
@@ -17985,19 +17714,16 @@ msgid "Cancel the current mail operation"
 msgstr "현재 메일 동작을 취소합니다"
 
 #: ../ui/evolution-mail-global.xml.h:3
-#, fuzzy
 msgid "Copy the selected folder into another folder"
-msgstr "선택한 메세지를 다른 폴더로 복사합니다"
+msgstr "선택한 폴더를 다른 폴더로 복사합니다"
 
 #: ../ui/evolution-mail-global.xml.h:4
-#, fuzzy
 msgid "Create a new folder for storing mail"
-msgstr "이 메일링 리스트로 가상 폴더를 만듭니다"
+msgstr "메일을 저장하는 새 폴더를 만듭니다"
 
 #: ../ui/evolution-mail-global.xml.h:5
-#, fuzzy
 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"
@@ -18013,19 +17739,16 @@ msgid "F_older"
 msgstr "폴더(_O)"
 
 #: ../ui/evolution-mail-global.xml.h:9
-#, fuzzy
 msgid "Message F_ilters"
-msgstr "메일 거르게"
+msgstr "메세지 거르게(_I)"
 
 #: ../ui/evolution-mail-global.xml.h:10
-#, fuzzy
 msgid "Message _Preview"
-msgstr "메세지 머리말"
+msgstr "메세지 미리보기(_P)"
 
 #: ../ui/evolution-mail-global.xml.h:11
-#, fuzzy
 msgid "Move the selected folder into another folder"
-msgstr "선택한 메세지를 다른 폴더로 옮깁니다"
+msgstr "선택한 폴더를 다른 폴더로 옮깁니다"
 
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-global.xml.h:13
@@ -18033,9 +17756,8 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "모든 폴더의 지워진 메세지를 완전히 지웁니다"
 
 #: ../ui/evolution-mail-global.xml.h:14
-#, fuzzy
 msgid "Search F_olders"
-msgstr "폴더 선택"
+msgstr "찾기 폴더(_O)"
 
 #: ../ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
@@ -18046,32 +17768,27 @@ msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "원격 서버의 폴더를 구독/구독해지 합니다"
 
 #: ../ui/evolution-mail-global.xml.h:17
-#, fuzzy
 msgid "_Copy Folder To..."
-msgstr "폴더로 복사(_C)..."
+msgstr "폴더를 복사(_C)..."
 
 #: ../ui/evolution-mail-global.xml.h:18
-#, fuzzy
 msgid "_Move Folder To..."
-msgstr "폴더로 이동(_M)..."
+msgstr "폴더를 이동(_M)..."
 
 #: ../ui/evolution-mail-global.xml.h:19
-#, fuzzy
 msgid "_New..."
-msgstr "새로 만들기(_N)"
+msgstr "새로 만들기(_N)..."
 
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
 #: ../ui/evolution-mail-global.xml.h:23
-#, fuzzy
 msgid "_Subscriptions"
-msgstr "폴더 구독"
+msgstr "구독(_S)"
 
 #: ../ui/evolution-mail-list.xml.h:1
-#, fuzzy
 msgid "Change the name of this folder"
-msgstr "이 폴더의 등록 정보를 바꿉니다"
+msgstr "이 폴더의 이름을 바꿉니다"
 
 #: ../ui/evolution-mail-list.xml.h:2
 msgid "Change the properties of this folder"
@@ -18091,14 +17808,12 @@ msgid "E_xpunge"
 msgstr "지운 메세지 비우기(_X)"
 
 #: ../ui/evolution-mail-list.xml.h:8
-#, fuzzy
 msgid "Group By _Threads"
-msgstr "이 범위로 묶음"
+msgstr "글타래로 묶음(_T)"
 
 #: ../ui/evolution-mail-list.xml.h:9
-#, fuzzy
 msgid "Hide S_elected Messages"
-msgstr "지운 메세지 숨기기(_D)"
+msgstr "선택한 메세지 숨기기(_E)"
 
 #: ../ui/evolution-mail-list.xml.h:10
 msgid "Hide _Deleted Messages"
@@ -18113,12 +17828,9 @@ msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr "지운 메세지를 취소선을 긋는 대신 숨깁니다"
 
-# FIXME - hard to translate UI + string based on English grammar
-# "Mark messages as read after <seconds> seconds"
 #: ../ui/evolution-mail-list.xml.h:13
-#, fuzzy
 msgid "Mark Me_ssages as Read"
-msgstr "다음 시간이 지나면 읽은 것으로 표시(_M):"
+msgstr "메세지를 읽은 것으로 표시(_S)"
 
 #: ../ui/evolution-mail-list.xml.h:14 ../ui/evolution-mail-message.xml.h:69
 msgid "Paste message(s) from the clipboard"
@@ -18129,19 +17841,16 @@ msgid "Permanently remove all deleted messages from this folder"
 msgstr "이 폴더의 지워진 모든 메세지를 완전히 지웁니다"
 
 #: ../ui/evolution-mail-list.xml.h:16
-#, fuzzy
 msgid "Permanently remove this folder"
-msgstr "이 폴더의 지워진 모든 메세지를 완전히 지웁니다"
+msgstr "이 폴더를 완전히 지웁니다"
 
 #: ../ui/evolution-mail-list.xml.h:17
-#, fuzzy
 msgid "Select Message _Thread"
-msgstr "선택한 메세지 숨기기(_E)"
+msgstr "메세지 글타래 선택(_T)"
 
 #: ../ui/evolution-mail-list.xml.h:18
-#, fuzzy
 msgid "Select _All Messages"
-msgstr "모든 보이는 메세지 선택"
+msgstr "모든 메세지 선택(_A)"
 
 #: ../ui/evolution-mail-list.xml.h:19
 msgid "Select all and only the messages that are not currently selected"
@@ -18177,7 +17886,6 @@ msgstr "연관된 메세지 목록"
 
 #: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:113
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
-#, fuzzy
 msgid "_Message"
 msgstr "메세지(_M)"
 
@@ -18195,9 +17903,8 @@ msgid "Add Sender to Address Book"
 msgstr "보낸 사람을 주소록에 더합니다"
 
 #: ../ui/evolution-mail-message.xml.h:5
-#, fuzzy
 msgid "All Message _Headers"
-msgstr "메세지 머리말"
+msgstr "모든 메세지 머리말(_H)"
 
 #: ../ui/evolution-mail-message.xml.h:6
 msgid "Apply filter rules to the selected messages"
@@ -18205,7 +17912,7 @@ msgstr "선택한 메세지에 거르게 규칙을 적용합니다"
 
 #: ../ui/evolution-mail-message.xml.h:7
 msgid "Check for _Junk"
-msgstr ""
+msgstr "정크메일 검사(_J)"
 
 #: ../ui/evolution-mail-message.xml.h:8
 msgid "Compose _New Message"
@@ -18228,29 +17935,24 @@ msgid "Copy selected messages to another folder"
 msgstr "선택한 메세지를 다른 폴더로 복사합니다"
 
 #: ../ui/evolution-mail-message.xml.h:15
-#, fuzzy
 msgid "Create R_ule"
-msgstr "가상 폴더 만들기(_V)"
+msgstr "규칙 만들기(_U)"
 
 #: ../ui/evolution-mail-message.xml.h:16
-#, fuzzy
 msgid "Create a Search Folder for these recipients"
-msgstr "이 받는 사람으로 가상폴더를 만듭니다"
+msgstr "이 받는 사람으로 찾기 폴더를 만듭니다"
 
 #: ../ui/evolution-mail-message.xml.h:17
-#, fuzzy
 msgid "Create a Search Folder for this mailing list"
-msgstr "이 메일링 리스트로 가상 폴더를 만듭니다"
+msgstr "이 메일링 리스트로 찾기 폴더를 만듭니다"
 
 #: ../ui/evolution-mail-message.xml.h:18
-#, fuzzy
 msgid "Create a Search Folder for this sender"
-msgstr "이 보낸 사람으로 가상 폴더를 만듭니다"
+msgstr "이 보낸 사람으로 찾기 폴더를 만듭니다"
 
 #: ../ui/evolution-mail-message.xml.h:19
-#, fuzzy
 msgid "Create a Search Folder for this subject"
-msgstr "이 제목으로 가상 폴더를 만듭니다"
+msgstr "이 제목으로 찾기 폴더를 만듭니다"
 
 #: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a rule to filter messages from this sender"
@@ -18353,9 +18055,8 @@ msgid "Increase the text size"
 msgstr "글자 크기를 키웁니다"
 
 #: ../ui/evolution-mail-message.xml.h:49
-#, fuzzy
 msgid "Mar_k as"
-msgstr "읽은 것으로 표시(_K)"
+msgstr "표시(_K)"
 
 #: ../ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as having been read"
@@ -18386,9 +18087,8 @@ msgid "Mark the selected messages for deletion"
 msgstr "선택한 메세지를 지운 것으로 표시합니다"
 
 #: ../ui/evolution-mail-message.xml.h:57
-#, fuzzy
 msgid "Message Source"
-msgstr "메세지 본문"
+msgstr "메세지 원본"
 
 #: ../ui/evolution-mail-message.xml.h:58
 msgid "Move"
@@ -18432,9 +18132,8 @@ msgstr "이전에 읽지 않은 메세지(_R)"
 
 # post -> 게시, Microsoft Office XP 참고
 #: ../ui/evolution-mail-message.xml.h:70
-#, fuzzy
 msgid "Pos_t New Message to Folder"
-msgstr "새 메세지 게시(_W)"
+msgstr "폴더에 새 메세지 게시(_T)"
 
 # post -> 게시, Microsoft Office XP 참고
 #: ../ui/evolution-mail-message.xml.h:71
@@ -18482,38 +18181,32 @@ msgid "Save the message as a text file"
 msgstr "메세지를 텍스트 파일로 저장합니다"
 
 #: ../ui/evolution-mail-message.xml.h:87
-#, fuzzy
 msgid "Search Folder from Mailing _List..."
-msgstr "메일링 리스트에 대한 가상폴더(_L)..."
+msgstr "메일링 리스트에 대한 찾기 폴더(_L)..."
 
 #: ../ui/evolution-mail-message.xml.h:88
-#, fuzzy
 msgid "Search Folder from Recipients..."
-msgstr "받는 사람에 대한 가상폴더(_R)..."
+msgstr "받는 사람에 대한 찾기 폴더..."
 
 #: ../ui/evolution-mail-message.xml.h:89
-#, fuzzy
 msgid "Search Folder from S_ubject..."
-msgstr "제목에 대한 가상폴더(_S)..."
+msgstr "제목에 대한 찾기 폴더(_U)..."
 
 #: ../ui/evolution-mail-message.xml.h:90
-#, fuzzy
 msgid "Search Folder from Sen_der..."
-msgstr "보낸 사람에 대한 가상폴더(_N)..."
+msgstr "보낸 사람에 대한 찾기 폴더(_D)..."
 
 #: ../ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "보이는 메세지의 본문에서 텍스트를 찾습니다"
 
 #: ../ui/evolution-mail-message.xml.h:92
-#, fuzzy
 msgid "Select _All Text"
-msgstr "모든 텍스트 선택"
+msgstr "모든 텍스트 선택(_A)"
 
 #: ../ui/evolution-mail-message.xml.h:93
-#, fuzzy
 msgid "Select all the text in a message"
-msgstr "모든 보이는 메세지 선택"
+msgstr "메세지의 모든 텍스트를 선택합니다"
 
 #: ../ui/evolution-mail-message.xml.h:94
 msgid "Set up the page settings for your current printer"
@@ -18540,89 +18233,76 @@ msgid "Un-delete the selected messages"
 msgstr "선택한 메세지를 되살립니다"
 
 #: ../ui/evolution-mail-message.xml.h:100
-#, fuzzy
 msgid "Uni_mportant"
-msgstr "중요"
+msgstr "중요하지 않음(_M)"
 
 #: ../ui/evolution-mail-message.xml.h:101
 msgid "Zoom _Out"
-msgstr ""
+msgstr "축소(_O)"
 
 #: ../ui/evolution-mail-message.xml.h:102
-#, fuzzy
 msgid "_Caret Mode"
-msgstr "캐릿 모드(_M)"
+msgstr "캐릿 모드(_C)"
 
 #: ../ui/evolution-mail-message.xml.h:105
-#, fuzzy
 msgid "_Delete Message"
-msgstr "지운 메세지 숨기기(_D)"
+msgstr "메세지 지우기(_D)"
 
 #: ../ui/evolution-mail-message.xml.h:107
-#, fuzzy
 msgid "_Find in Message..."
-msgstr "메세지에서 찾음"
+msgstr "메세지에서 찾기(_F)..."
 
 #: ../ui/evolution-mail-message.xml.h:109
 msgid "_Go To"
 msgstr "이동(_G)"
 
 #: ../ui/evolution-mail-message.xml.h:110
-#, fuzzy
 msgid "_Important"
-msgstr "중요"
+msgstr "중요(_I)"
 
 #: ../ui/evolution-mail-message.xml.h:111
-#, fuzzy
 msgid "_Junk"
-msgstr "정크메일"
+msgstr "정크메일(_J)"
 
 #: ../ui/evolution-mail-message.xml.h:112
-#, fuzzy
 msgid "_Load Images"
-msgstr "그림 읽어들이기(_I)"
+msgstr "그림 읽어들이기(_L)"
 
 #: ../ui/evolution-mail-message.xml.h:115
 msgid "_Next Message"
 msgstr "다음 메세지(_N)"
 
 #: ../ui/evolution-mail-message.xml.h:116
-#, fuzzy
 msgid "_Normal Size"
-msgstr "보통"
+msgstr "보통 크기(_N)"
 
 #: ../ui/evolution-mail-message.xml.h:117
-#, fuzzy
 msgid "_Not Junk"
-msgstr "정크 아님"
+msgstr "정크메일 아님(_N)"
 
 #: ../ui/evolution-mail-message.xml.h:118
-#, fuzzy
 msgid "_Open in New Window"
-msgstr "새 창에서 열기(_N)"
+msgstr "새 창에서 열기(_O)"
 
 #: ../ui/evolution-mail-message.xml.h:119
 msgid "_Previous Message"
 msgstr "이전 메세지(_P)"
 
 #: ../ui/evolution-mail-message.xml.h:123
-#, fuzzy
 msgid "_Save Message..."
-msgstr "메세지 저장..."
+msgstr "메세지 저장(_S)..."
 
 #: ../ui/evolution-mail-message.xml.h:124
-#, fuzzy
 msgid "_Undelete Message"
-msgstr "다음 메세지(_N)"
+msgstr "메세지 되살리기(_U)"
 
 #: ../ui/evolution-mail-message.xml.h:125
-#, fuzzy
 msgid "_Unread"
-msgstr "읽지 않은 것으로 표시(_U)"
+msgstr "읽음 취소(_U)"
 
 #: ../ui/evolution-mail-message.xml.h:126
 msgid "_Zoom In"
-msgstr ""
+msgstr "확대(_Z)"
 
 #.
 #. <cmd name="FileSave" _label="Save"
@@ -18665,7 +18345,7 @@ msgstr "파일을 첨부합니다"
 
 #: ../ui/evolution-message-composer.xml.h:3
 msgid "Check to get delivery notification when your message is read"
-msgstr ""
+msgstr "보낸 메세지를 읽을 때 배달 확인을 받을 지 검사"
 
 #.
 #. <cmd name="FileSave" _label="Save"
@@ -18686,9 +18366,8 @@ msgid "Encrypt this message with PGP"
 msgstr "이 메세지를 PGP로 암호화합니다"
 
 #: ../ui/evolution-message-composer.xml.h:8
-#, fuzzy
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "이 메세지를 S/MIME 암호화 증명으로 암호화합니다"
+msgstr "이 메세지를 S/MIME 암호화 인증서로 암호화합니다"
 
 #: ../ui/evolution-message-composer.xml.h:9
 #: ../ui/evolution-signature-editor.xml.h:14
@@ -18713,9 +18392,8 @@ msgstr "PGP 서명"
 
 # read receipt -> 내용 읽음 확인, Microsoft Office XP 참고
 #: ../ui/evolution-message-composer.xml.h:15
-#, fuzzy
 msgid "Request read receipt"
-msgstr "내용 읽음 확인"
+msgstr "내용 읽음 확인 요청"
 
 #: ../ui/evolution-message-composer.xml.h:16
 msgid "S/MIME Encrypt"
@@ -18730,9 +18408,8 @@ msgid "Save As"
 msgstr "다른 이름으로 저장"
 
 #: ../ui/evolution-message-composer.xml.h:20
-#, fuzzy
 msgid "Save Draft"
-msgstr "임시 보관함에 저장(_D)"
+msgstr "임시 보관함에 저장"
 
 #: ../ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
@@ -18743,9 +18420,8 @@ msgid "Save _Draft"
 msgstr "임시 보관함에 저장(_D)"
 
 #: ../ui/evolution-message-composer.xml.h:23
-#, fuzzy
 msgid "Save as draft"
-msgstr "임시 보관함에 저장(_D)"
+msgstr "임시 보관함에 저장"
 
 #: ../ui/evolution-message-composer.xml.h:24
 msgid "Save in folder..."
@@ -19057,9 +18733,8 @@ msgid "_About Evolution..."
 msgstr "Evolution 정보(_A)..."
 
 #: ../ui/evolution.xml.h:34
-#, fuzzy
 msgid "_Close Window"
-msgstr "이 창을 닫습니다"
+msgstr "창 닫기(_C)"
 
 #: ../ui/evolution.xml.h:37
 msgid "_Help"
@@ -19086,9 +18761,8 @@ msgid "_Quick Reference"
 msgstr "간단한 참조 문서(_Q)"
 
 #: ../ui/evolution.xml.h:43
-#, fuzzy
 msgid "_Quit"
-msgstr "잘라내기(_U)"
+msgstr "끝내기(_Q)"
 
 #: ../ui/evolution.xml.h:44
 msgid "_Send / Receive"
@@ -19096,11 +18770,11 @@ msgstr "보내고 받기(_S)"
 
 #: ../ui/evolution.xml.h:45
 msgid "_Switcher Appearance"
-msgstr ""
+msgstr "전환버튼 모양(_S)"
 
 #: ../ui/evolution.xml.h:46
 msgid "_Synchronization Options..."
-msgstr ""
+msgstr "동기화 옵션(_S)..."
 
 #: ../ui/evolution.xml.h:47
 msgid "_Text only"
@@ -19206,31 +18880,28 @@ msgstr ""
 
 #: ../widgets/menus/gal-define-views-dialog.c:76
 #: ../widgets/menus/gal-define-views-model.c:188
-#, fuzzy
 msgid "Collection"
-msgstr "위치"
+msgstr "모음"
 
 #: ../widgets/menus/gal-define-views-dialog.c:325
 #: ../widgets/menus/gal-define-views.glade.h:4
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Define Views for %s"
-msgstr "보기 지정..."
+msgstr "%s에 대한 뷰 정의"
 
 #: ../widgets/menus/gal-define-views-dialog.c:333
 #: ../widgets/menus/gal-define-views-dialog.c:335
-#, fuzzy
 msgid "Define Views"
-msgstr "보기 지정..."
+msgstr "뷰 정의"
 
 #: ../widgets/menus/gal-define-views.glade.h:2
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Define Views for \"%s\""
-msgstr "보기 지정..."
+msgstr "\"%s\"에 대한 뷰 정의"
 
 #: ../widgets/menus/gal-define-views.glade.h:5
-#, fuzzy
 msgid "_Edit..."
-msgstr "편집(_E)"
+msgstr "편집(_E)..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
 #: ../widgets/table/e-table-header-item.c:1845
@@ -19239,32 +18910,30 @@ msgstr "편집(_E)"
 msgid "Table"
 msgstr "도표"
 
+# NOTE: 겉으로 나오는 번역이 아니므로 번역이 별로 의미없음.  view의 instance.
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:182
-#, fuzzy
 msgid "Instance"
-msgstr "모든 경우"
+msgstr "인스턴스"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:232
-#, fuzzy
 msgid "Save Current View"
-msgstr "현재 보기"
+msgstr "현재 뷰 저장"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
-#, fuzzy
 msgid "_Create new view"
-msgstr "새 테스트 항목을 만듭니다"
+msgstr "새 뷰 만들기(_C)"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
 msgid "_Replace existing view"
-msgstr ""
+msgstr "현재 뷰 바꾸기(_R)"
 
 #: ../widgets/menus/gal-view-menus.c:291
 msgid "_Current View"
-msgstr "현재 보기(_C)"
+msgstr "현재 뷰(_C)"
 
 #: ../widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View..."
-msgstr "사용자 보기 저장..."
+msgstr "사용자 뷰 저장..."
 
 #: ../widgets/menus/gal-view-new-dialog.c:80
 msgid "Factory"
@@ -19276,16 +18945,15 @@ msgstr "새 뷰 정의"
 
 #: ../widgets/menus/gal-view-new-dialog.glade.h:2
 msgid "Name of new view:"
-msgstr ""
+msgstr "새 뷰의 이름:"
 
 #: ../widgets/menus/gal-view-new-dialog.glade.h:3
-#, fuzzy
 msgid "Type of View"
-msgstr "일별 보기"
+msgstr "뷰 종류"
 
 #: ../widgets/menus/gal-view-new-dialog.glade.h:4
 msgid "Type of view:"
-msgstr ""
+msgstr "뷰 종류:"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
@@ -19333,25 +19001,23 @@ msgstr "스티플 채우기"
 
 #: ../widgets/misc/e-canvas-background.c:484
 #: ../widgets/misc/e-canvas-background.c:485
-#, fuzzy
 msgid "X1"
-msgstr "1"
+msgstr "X1"
 
 #: ../widgets/misc/e-canvas-background.c:491
 #: ../widgets/misc/e-canvas-background.c:492
 msgid "X2"
-msgstr ""
+msgstr "X2"
 
 #: ../widgets/misc/e-canvas-background.c:498
 #: ../widgets/misc/e-canvas-background.c:499
-#, fuzzy
 msgid "Y1"
-msgstr "1"
+msgstr "Y1"
 
 #: ../widgets/misc/e-canvas-background.c:505
 #: ../widgets/misc/e-canvas-background.c:506
 msgid "Y2"
-msgstr ""
+msgstr "Y2"
 
 #: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1430
 #: ../widgets/table/e-table-group-container.c:978
@@ -19574,9 +19240,8 @@ msgid "_Edit Saved Searches..."
 msgstr "저장된 찾기 편집(_E)..."
 
 #: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
-#, fuzzy
 msgid "_Advanced Search..."
-msgstr "고급 찾기"
+msgstr "고급 찾기(_A)..."
 
 #: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
@@ -19607,17 +19272,14 @@ msgid "Sync Categories:"
 msgstr "동기화 분류:"
 
 #: ../widgets/misc/e-reflow.c:1452 ../widgets/misc/e-reflow.c:1453
-#, fuzzy
 msgid "Empty message"
-msgstr "메세지 편집(_E)"
+msgstr "빈 메세지"
 
 #: ../widgets/misc/e-reflow.c:1459 ../widgets/misc/e-reflow.c:1460
-#, fuzzy
 msgid "Reflow model"
-msgstr "선택 모델"
+msgstr "리플로우 모델"
 
 #: ../widgets/misc/e-reflow.c:1466 ../widgets/misc/e-reflow.c:1467
-#, fuzzy
 msgid "Column width"
 msgstr "열 너비"
 
@@ -19747,7 +19409,6 @@ msgid "R_eply requested"
 msgstr "답장 요청(_E)"
 
 #: ../widgets/misc/e-send-options.glade.h:18
-#, fuzzy
 msgid "Sta_tus Tracking"
 msgstr "상태 추적(_T)"
 
@@ -19768,7 +19429,6 @@ msgid "W_ithin"
 msgstr "다음 기한 안에(_I):"
 
 #: ../widgets/misc/e-send-options.glade.h:24
-#, fuzzy
 msgid "When acce_pted:"
 msgstr "받아들여지면(_P):"
 
@@ -19777,7 +19437,6 @@ msgid "When co_mpleted:"
 msgstr "완성되면(_M):"
 
 #: ../widgets/misc/e-send-options.glade.h:26
-#, fuzzy
 msgid "When decli_ned:"
 msgstr "거부당하면(_N):"
 
@@ -19799,9 +19458,8 @@ msgid "_Delivered"
 msgstr "배달됨(_D)"
 
 #: ../widgets/misc/e-send-options.glade.h:32
-#, fuzzy
 msgid "_Set expiration date"
-msgstr "만료 기한 설정(_S)"
+msgstr "만료 날짜 설정(_S)"
 
 #: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Until:"
@@ -19812,9 +19470,8 @@ msgid "_When convenient"
 msgstr "편리한 때에(_W)"
 
 #: ../widgets/misc/e-send-options.glade.h:35
-#, fuzzy
 msgid "_When opened:"
-msgstr "열리면(_W):"
+msgstr "열면(_W):"
 
 #: ../widgets/misc/e-task-widget.c:208
 #, c-format
@@ -19832,19 +19489,17 @@ msgstr "URL을 보려면 여기를 누르십시오"
 
 #: ../widgets/misc/gal-categories.glade.h:2
 msgid "Edit Master Category List..."
-msgstr ""
+msgstr "주 분류 목록 편집..."
 
 #: ../widgets/misc/gal-categories.glade.h:3
 msgid "Item(s) belong to these _categories:"
-msgstr ""
+msgstr "이 분류에 속한 항목(_C):"
 
 #: ../widgets/misc/gal-categories.glade.h:4
-#, fuzzy
 msgid "_Available Categories:"
-msgstr "분류(_C)"
+msgstr "사용 가능한 분류(_A):"
 
 #: ../widgets/misc/gal-categories.glade.h:5
-#, fuzzy
 msgid "categories"
 msgstr "분류"
 
@@ -19889,15 +19544,13 @@ msgid "BG Color Column"
 msgstr "배경색 열"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:1
-#, fuzzy
 msgid "<- _Remove"
-msgstr "지우기(_R)"
+msgstr "<- 지우기(_R)"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:2
 #: ../widgets/table/e-table-config.glade.h:1
-#, fuzzy
 msgid "A_vailable Fields:"
-msgstr "쓰기 가능한 필드"
+msgstr "사용 가능한 필드(_V):"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:3
 #: ../widgets/table/e-table-config.glade.h:2
@@ -19906,9 +19559,8 @@ msgstr "증가"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:4
 #: ../widgets/table/e-table-config.glade.h:3
-#, fuzzy
 msgid "Clear All"
-msgstr "표시 비우기(_E)"
+msgstr "모두 지우기"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:5
 #: ../widgets/table/e-table-config.glade.h:4
@@ -19917,69 +19569,62 @@ msgstr "감소"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:8
 #: ../widgets/table/e-table-config.glade.h:7
-#, fuzzy
 msgid "Group Items By"
-msgstr "묶음(_G)..."
+msgstr "항목 모음 기준"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:9
 #: ../widgets/table/e-table-config.glade.h:8
 msgid "Move _Down"
-msgstr ""
+msgstr "아래로 이동(_D)"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:9
-#, fuzzy
 msgid "Move _Up"
-msgstr "이동"
+msgstr "위로 이동(_U)"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:11
 msgid "Sh_ow these fields in order:"
-msgstr ""
+msgstr "다음 필드를 순서대로 표시(_O):"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:12
 #: ../widgets/table/e-table-config.c:563
 #: ../widgets/table/e-table-config.glade.h:10
-#, fuzzy
 msgid "Show Fields"
-msgstr "받는 이 항목(_T)"
+msgstr "필드 표시"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:11
 msgid "Show field in View"
-msgstr ""
+msgstr "뷰에서 필드 표시"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:12
-#, fuzzy
 msgid "Sort"
 msgstr "정렬"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:15
 #: ../widgets/table/e-table-config.glade.h:13
-#, fuzzy
 msgid "Sort Items By"
-msgstr "정렬"
+msgstr "항목 정렬 기준"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:16
 #: ../widgets/table/e-table-config.glade.h:14
 msgid "Then By"
-msgstr "그리고 다음에 따라"
+msgstr "다음 기준"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:17
-#, fuzzy
 msgid "_Add ->"
-msgstr "더하기(_A)"
+msgstr "더하기(_A) ->"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:18
 #: ../widgets/table/e-table-config.glade.h:16
 msgid "_Fields Shown..."
-msgstr ""
+msgstr "표시할 필드(_F)..."
 
 #: ../widgets/table/e-table-config-no-group.glade.h:19
 #: ../widgets/table/e-table-config.glade.h:20
-#, fuzzy
 msgid "_Sort..."
-msgstr "가져오기(_I)..."
+msgstr "정렬(_S)..."
 
 #: ../widgets/table/e-table-config.c:150
 msgid "State"
@@ -20002,18 +19647,16 @@ msgid "No grouping"
 msgstr "묶지 않음"
 
 #: ../widgets/table/e-table-config.c:584
-#, fuzzy
 msgid "Available Fields"
-msgstr "쓰기 가능한 필드"
+msgstr "사용 가능한 필드"
 
 #: ../widgets/table/e-table-config.glade.h:17
-#, fuzzy
 msgid "_Group By..."
-msgstr "묶음(_G)..."
+msgstr "모으기(_G)..."
 
 #: ../widgets/table/e-table-config.glade.h:19
 msgid "_Show these fields in order:"
-msgstr ""
+msgstr "다음 필드를 순서대로 표시(_S):"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:646
@@ -20034,35 +19677,36 @@ msgid "Add a column..."
 msgstr "열 더하기..."
 
 #: ../widgets/table/e-table-field-chooser.glade.h:1
-#, fuzzy
 msgid "Field Chooser"
-msgstr "항목 이름"
+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 ""
+"표에 열을 더하려면, 열을 표시할\n"
+"위치에 열을 끌어 놓으십시오."
 
 #: ../widgets/table/e-table-group-container.c:350
 #, c-format
 msgid "%s : %s (%d item)"
-msgstr ""
+msgstr "%s : %s (%d개 항목)"
 
 #: ../widgets/table/e-table-group-container.c:351
 #, c-format
 msgid "%s : %s (%d items)"
-msgstr ""
+msgstr "%s : %s (%d개 항목)"
 
 #: ../widgets/table/e-table-group-container.c:356
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%d item)"
-msgstr "%s (%d%% 완료)"
+msgstr "%s (%d개 항목)"
 
 #: ../widgets/table/e-table-group-container.c:357
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%d items)"
-msgstr "%s (%d%% 완료)"
+msgstr "%s (%d개 항목)"
 
 #: ../widgets/table/e-table-group-container.c:901
 #: ../widgets/table/e-table-group-container.c:902
@@ -20207,17 +19851,14 @@ msgid "Tree"
 msgstr "트리"
 
 #: ../widgets/table/e-table-item.c:2942 ../widgets/table/e-table-item.c:2943
-#, fuzzy
 msgid "Table header"
-msgstr "헤더 형식 잘못됨"
+msgstr "테이블 헤더"
 
 #: ../widgets/table/e-table-item.c:2949 ../widgets/table/e-table-item.c:2950
-#, fuzzy
 msgid "Table model"
-msgstr "테이블 셀"
+msgstr "테이블 모델"
 
 #: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
-#, fuzzy
 msgid "Cursor row"
 msgstr "커서 행"
 
@@ -20247,18 +19888,16 @@ msgstr "선과 +/- 확장 버튼을 그립니다."
 
 #: ../widgets/text/e-entry-test.c:49
 msgid "Minicard Test"
-msgstr ""
+msgstr "미니카드 테스트"
 
 # 테스트 프로그램
 #: ../widgets/text/e-entry-test.c:50
-#, fuzzy
 msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "Copyright (C) 2000, Ximian, Inc."
+msgstr "Copyright (C) 2000, Helix Code, Inc."
 
 #: ../widgets/text/e-entry-test.c:52
-#, fuzzy
 msgid "This should test the minicard canvas item"
-msgstr "연락처 인쇄 코드를 테스트합니다"
+msgstr "미니카드 캔버스 아이템을 테스트합니다"
 
 #: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
 #: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
@@ -20266,14 +19905,12 @@ msgid "Event Processor"
 msgstr "이벤트 처리기"
 
 #: ../widgets/text/e-entry.c:1256 ../widgets/text/e-entry.c:1257
-#, fuzzy
 msgid "Font"
 msgstr "글꼴"
 
 #: ../widgets/text/e-entry.c:1270 ../widgets/text/e-entry.c:1271
-#, fuzzy
 msgid "GDKFont"
-msgstr "글꼴"
+msgstr "GDK글꼴"
 
 #: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
 #: ../widgets/text/e-text.c:3491 ../widgets/text/e-text.c:3492
@@ -20332,7 +19969,7 @@ msgstr "커서 위치"
 
 #: ../widgets/text/e-entry.c:1389 ../widgets/text/e-entry.c:1390
 msgid "Emulate label resize"
-msgstr ""
+msgstr "레이블 크기 바꾸기 에뮬레이션"
 
 #: ../widgets/text/e-text.c:2696
 msgid "Input Methods"
diff --git a/po/lt.po b/po/lt.po
index 0db9cdb7a8..0a99a88c2d 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-01 00:15+0200\n"
-"PO-Revision-Date: 2005-11-01 13:57+0200\n"
+"POT-Creation-Date: 2005-10-01 14:37+0300\n"
+"PO-Revision-Date: 2005-10-01 14:38+0300\n"
 "Last-Translator: Žygimantas Beručka <uid0@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
 "MIME-Version: 1.0\n"
@@ -43,7 +43,7 @@ msgstr[1] "esamame adresų knygos aplanke yra %d kortelės"
 msgstr[2] "esamame adresų knygos aplanke yra %d kortelių"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../calendar/gui/alarm-notify/alarm-queue.c:968
+#: ../calendar/gui/alarm-notify/alarm-queue.c:965
 #: ../ui/evolution-message-composer.xml.h:11
 msgid "Open"
 msgstr "Atverti"
@@ -97,7 +97,7 @@ msgstr "Naujas paskyrimas"
 msgid "New All Day Event"
 msgstr "Naujas visos dienos įvykis"
 
-#: ../a11y/calendar/ea-cal-view.c:308
+#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1522
 msgid "New Meeting"
 msgstr "Naujas susitikimas"
 
@@ -458,7 +458,7 @@ msgstr ""
 "būti pašalintas iš dabartinės vietos. Gal vietoj to norite išsaugoti kopiją?"
 
 #: ../addressbook/addressbook.error.xml.h:28
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:59
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -533,7 +533,7 @@ msgstr "Čia konfigūruojamas automatinis užbaigimas"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1180
+#: ../addressbook/gui/component/addressbook-view.c:1133
 #: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:388
 msgid "Contacts"
 msgstr "Kontaktai"
@@ -574,12 +574,10 @@ msgstr "Čia valdykite Jūsų S/Mime sertifikatus"
 #. On This Computer is always first and Search Folders is always last
 #: ../addressbook/gui/component/addressbook-component.c:137
 #: ../addressbook/gui/component/addressbook-migrate.c:502
-#: ../calendar/gui/calendar-component.c:208
-#: ../calendar/gui/memos-component.c:192 ../calendar/gui/migration.c:462
-#: ../calendar/gui/migration.c:555 ../calendar/gui/migration.c:1057
-#: ../calendar/gui/tasks-component.c:188 ../mail/em-folder-tree-model.c:197
-#: ../mail/em-folder-tree-model.c:199 ../mail/mail-component.c:292
-#: ../mail/mail-vfolder.c:223
+#: ../calendar/gui/calendar-component.c:208 ../calendar/gui/migration.c:462
+#: ../calendar/gui/migration.c:555 ../calendar/gui/tasks-component.c:188
+#: ../mail/em-folder-tree-model.c:197 ../mail/em-folder-tree-model.c:199
+#: ../mail/mail-component.c:292 ../mail/mail-vfolder.c:223
 msgid "On This Computer"
 msgstr "Šiame kompiuteryje"
 
@@ -591,12 +589,10 @@ msgstr "Šiame kompiuteryje"
 #: ../addressbook/gui/component/addressbook-component.c:145
 #: ../addressbook/gui/component/addressbook-migrate.c:510
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../calendar/gui/calendar-component.c:216
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:470
-#: ../calendar/gui/migration.c:563 ../calendar/gui/migration.c:1065
-#: ../calendar/gui/tasks-component.c:196 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1043 ../mail/mail-config.c:78
-#: ../mail/mail-config.glade.h:104
+#: ../calendar/gui/calendar-component.c:216 ../calendar/gui/migration.c:470
+#: ../calendar/gui/migration.c:563 ../calendar/gui/tasks-component.c:196
+#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1043
+#: ../mail/mail-config.c:78 ../mail/mail-config.glade.h:104
 msgid "Personal"
 msgstr "Asmeninis"
 
@@ -623,7 +619,7 @@ msgid "Create a new contact list"
 msgstr "Sukurti naują kontaktų sąrašą"
 
 #: ../addressbook/gui/component/addressbook-component.c:241
-#: ../addressbook/gui/component/addressbook-config.c:1149
+#: ../addressbook/gui/component/addressbook-config.c:1118
 #: ../addressbook/gui/component/addressbook-view.c:763
 msgid "New Address Book"
 msgstr "Nauja adresų knyga"
@@ -640,60 +636,59 @@ msgstr "Sukurti naują adresų knygą"
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "Nepavyko atnaujinti adresų knygos nustatymų ar aplankų."
 
-#: ../addressbook/gui/component/addressbook-config.c:316
+#: ../addressbook/gui/component/addressbook-config.c:313
 msgid "Base"
 msgstr "Pagrindas"
 
-#: ../addressbook/gui/component/addressbook-config.c:511
+#: ../addressbook/gui/component/addressbook-config.c:508
 #: ../calendar/gui/dialogs/calendar-setup.c:192
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Tipas:"
 
-#: ../addressbook/gui/component/addressbook-config.c:610
+#: ../addressbook/gui/component/addressbook-config.c:607
 msgid "Copy book content locally for offline operation"
 msgstr "Nukopijuoti knygos turinį į nuosavą kompiuterį darbui neprisijungus"
 
-#: ../addressbook/gui/component/addressbook-config.c:933
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/addressbook-config.c:902
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:366
+#: ../calendar/gui/dialogs/calendar-setup.c:377
 #: ../mail/em-folder-properties.c:215 ../mail/mail-config.glade.h:85
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Esmė"
 
-#: ../addressbook/gui/component/addressbook-config.c:934
+#: ../addressbook/gui/component/addressbook-config.c:903
 #: ../mail/importers/pine-importer.c:393
 msgid "Addressbook"
 msgstr "Adresų knygelė"
 
-#: ../addressbook/gui/component/addressbook-config.c:938
+#: ../addressbook/gui/component/addressbook-config.c:907
 msgid "Server Information"
 msgstr "Serverio informacija"
 
-#: ../addressbook/gui/component/addressbook-config.c:940
+#: ../addressbook/gui/component/addressbook-config.c:909
 msgid "Authentication"
 msgstr "Autentikacija"
 
-#: ../addressbook/gui/component/addressbook-config.c:943
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/addressbook-config.c:912
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 #: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detalės"
 
-#: ../addressbook/gui/component/addressbook-config.c:944
+#: ../addressbook/gui/component/addressbook-config.c:913
 msgid "Searching"
 msgstr "Paieška"
 
-#: ../addressbook/gui/component/addressbook-config.c:946
+#: ../addressbook/gui/component/addressbook-config.c:915
 msgid "Downloading"
 msgstr "Parsiuntimas"
 
-#: ../addressbook/gui/component/addressbook-config.c:1147
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/addressbook-config.c:1116
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Adresų knygos savybės"
 
@@ -760,19 +755,20 @@ msgstr ""
 
 #: ../addressbook/gui/component/addressbook-view.c:764
 #: ../addressbook/gui/widgets/e-addressbook-view.c:952
-#: ../calendar/gui/memos-component.c:450 ../mail/em-filter-i18n.h:11
-#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:26 ../ui/evolution-memos.xml.h:6
-#: ../ui/evolution-tasks.xml.h:6
+#: ../calendar/gui/calendar-component.c:537
+#: ../calendar/gui/tasks-component.c:441 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:26 ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Ištrinti"
 
 #: ../addressbook/gui/component/addressbook-view.c:766
-#: ../calendar/gui/memos-component.c:451
+#: ../calendar/gui/calendar-component.c:538
+#: ../calendar/gui/tasks-component.c:442
 msgid "Properties..."
 msgstr "Savybės..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1191
+#: ../addressbook/gui/component/addressbook-view.c:1144
 msgid "Contact Source Selector"
 msgstr "Kontaktų šaltinio parinkiklis"
 
@@ -832,7 +828,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "Aplanko, paskutinį kartą naudoto vardų parinkimo dialoge, adresas."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 msgid "Vertical pane position"
 msgstr "Vertikalaus skydelio pozicija"
 
@@ -841,124 +837,128 @@ msgid "Whether to show the preview pane."
 msgstr "Ar rodyti peržiūros skydelį."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:1
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/event-page.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../mail/message-tags.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:1
+msgid "*"
+msgstr "*"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr "1"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:2
+#: ../addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:3
+#: ../addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:5
+#: ../addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:6
+#: ../addressbook/gui/component/ldap-config.glade.h:7
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Autentikacija</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:7
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Display</b>"
 msgstr "<b>Rodymas</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:8
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Downloading</b>"
 msgstr "<b>Parsiuntimas</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Searching</b>"
 msgstr "<b>Paieška</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Server Information</b>"
 msgstr "<b>Serverio informacija</>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:12
 msgid "<b>Type:</b>"
 msgstr "<b>Tipas:</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add Address Book"
 msgstr "Pridėti adresų knygą"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 #: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:759
 msgid "Always"
 msgstr "Visada"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonimiškai"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 msgid "Basic"
 msgstr "Pagrindas"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr "Išskirtinis vardas"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid "Email address"
 msgstr "El.pašto adresas"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution naudos šį el. pašto adresą autentikuoti jus su pašto serveriu."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:22
 msgid "Find Possible Search Bases"
 msgstr "Surasti galimas paieškos bazes"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "Lo_gin:"
 msgstr "Prisijun_gimo vardas:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 #: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:758
 msgid "Never"
 msgstr "Niekada"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "Viena"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
-msgid "Search Filter"
-msgstr "Paieškos filtras"
-
 #: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid "Search _base:"
 msgstr "Paieškos _bazė:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:28
-msgid "Search _filter:"
-msgstr "Paieškos _filtras:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:29
-msgid "Search filter"
-msgstr "Paieškos filtras"
-
-#: ../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 ""
-"Paieškos filtras yra ieškomų objektų tipas atliekant paiešką. Jei jis "
-"nepakeistas, bus ieškoma objekto klasėje, kurios tipas „person“."
-
-#: ../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 or TLS."
@@ -966,7 +966,7 @@ msgstr ""
 "Pasirinkus šį nustatymą Evolution jungsis į Jūsų LDAP serverį tik jeigu Jūsų "
 "LDAP serveris palaiko SSL arba TLS."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a insecure environment. For example, if you and your LDAP server "
@@ -978,7 +978,7 @@ msgstr ""
 "už ugniasienės, tada Evolution nereikia naudoti SSL/TLS, nes Jūsų "
 "prisijungimas ir taip yra saugus."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 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 "
@@ -988,15 +988,15 @@ msgstr ""
 "TLS. Tai reiškia, kad Jūsų prisijungimas bus nesaugus ir, kad Jums gali "
 "grėsti duomenų ar jungties perėmimas."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Sub"
 msgstr "Sub"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid "Supported Search Bases"
 msgstr "Palaikomos paieškos bazės"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 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 "
@@ -1006,7 +1006,7 @@ msgstr ""
 "pradėtos Jūsų paieškos. Neužpildžius šio laukelio paieška bus vykdoma nuo "
 "aplankų medžio pradžios."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 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 "
@@ -1018,7 +1018,7 @@ msgstr ""
 "paieškos bazės. Paieškos sritis „one“ pateiks tik pirmame paieškos bazės "
 "lygyje esančius įrašus."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -1026,7 +1026,7 @@ msgstr ""
 "Čia nurodomas pilnas Jūsų LDAP serverio vardas. Pavyzdžiui „ldap.pavyzdys."
 "com“."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1034,7 +1034,7 @@ msgstr ""
 "Čia yra nurodomas didžiasias atsiunčiamų įrašų kiekis. Nustačius per didelę "
 "reikšmę gali sulėtėti Jūsų adresų knygos darbas."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1044,7 +1044,7 @@ msgstr ""
 "omenyje, kad norint pasinaudoti „El. pašto adreso“ metodu būtinas anoniminis "
 "prisijungimas prie Jūsų LDAP serverio."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1052,7 +1052,7 @@ msgstr ""
 "Šis vardas bus priskirtas serveriui Evolution aplankų sąraše. Jis skirtas "
 "tiktai pavaizdavimo tikslais."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 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 "
@@ -1062,36 +1062,36 @@ msgstr ""
 "Standartinių prievadų sąrašas yra pateiktas. Pasiteiraukite savo sistemos "
 "administratoriaus, jei nežinote, kurį prievadą reikia nurodyti."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid "Using distinguished name (DN)"
 msgstr "Naudojamas skirtinis vardas (DN)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid "Using email address"
 msgstr "Naudojamas el. pašto adresas"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 #: ../mail/em-account-editor.c:301
 msgid "Whenever Possible"
 msgstr "Kai tik imanoma"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid "_Add Address Book"
 msgstr "_Pridėti adresų knygą"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "_Download limit:"
 msgstr "_Leistinas atsiuntimo greitis:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid "_Find Possible Search Bases"
 msgstr "_Rasti įmanomas paieškos bazes"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "_Login method:"
 msgstr "_Prisijungimo metodas:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 #: ../calendar/gui/dialogs/calendar-setup.c:244
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:8
 #: ../mail/mail-config.glade.h:164
@@ -1099,32 +1099,32 @@ msgstr "_Prisijungimo metodas:"
 msgid "_Name:"
 msgstr "_Vardas:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Port:"
 msgstr "_Prievadas:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Search scope:"
 msgstr "_Paieškos sritis:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 #: ../mail/mail-config.glade.h:171
 msgid "_Server:"
 msgstr "_Serveris:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Timeout:"
 msgstr "Per_traukėlė:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Use secure connection:"
 msgstr "Na_udoti saugią jungtį:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 msgid "cards"
 msgstr "kortelės"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
@@ -1134,31 +1134,6 @@ msgstr "kortelės"
 msgid "minutes"
 msgstr "minučių"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-#: ../calendar/gui/dialogs/event-page.glade.h:1
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../mail/message-tags.glade.h:1
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
-#: ../plugins/groupwise-features/properties.glade.h:1
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>El. paštas</b>"
@@ -1212,7 +1187,7 @@ msgstr "Kontaktas"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:525
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:540
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2372
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2353
 msgid "Contact Editor"
 msgstr "Kontaktų redaktorius"
 
@@ -2455,20 +2430,20 @@ msgid "Changed"
 msgstr "Pakeista"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:535
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2367
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2348
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktų redaktorius - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2680
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2661
 msgid "Please select an image for this contact"
 msgstr "Prašau parinkti šiam kontaktui paveikslėlį"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2681
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2662
 msgid "No image"
 msgstr "Nėra paveikslėlio"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2960
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2941
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2476,7 +2451,7 @@ msgstr ""
 "Kontakto duomenys netinkami:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3012
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2993
 msgid "Invalid contact."
 msgstr "Netinkamas kontaktas."
 
@@ -2629,8 +2604,8 @@ msgstr "_SŽ paslauga:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:234
-#: ../plugins/exchange-operations/exchange-contacts.c:214
+#: ../plugins/exchange-operations/exchange-calendar.c:224
+#: ../plugins/exchange-operations/exchange-contacts.c:203
 msgid "_Location:"
 msgstr "_Vieta:"
 
@@ -2809,9 +2784,8 @@ msgstr "Šaltinis"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:377
+#: ../calendar/gui/e-meeting-list-view.c:370
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Tipas"
 
@@ -2821,16 +2795,14 @@ msgstr "Adresų knyga"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:807
 #: ../addressbook/gui/widgets/e-addressbook-view.c:936
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2018
-#: ../ui/evolution-addressbook.xml.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2014
+#: ../ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Išsaugoti kaip VCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:930
-#: ../calendar/gui/dialogs/comp-editor.c:1119
-#: ../calendar/gui/e-calendar-table.c:1167
-#: ../calendar/gui/e-calendar-view.c:1549 ../calendar/gui/e-memo-table.c:845
-#: ../ui/evolution-addressbook.xml.h:38
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:1545 ../ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "Ati_daryti"
 
@@ -2843,7 +2815,7 @@ msgid "New Contact List..."
 msgstr "Naujas kontaktų sąrašas..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:937
-#: ../ui/evolution-addressbook.xml.h:11
+#: ../ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Persiųsti kontaktą"
 
@@ -2864,10 +2836,9 @@ msgid "Send Message to Contacts"
 msgstr "Siųsti laišką kontaktams"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:942
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2512
-#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-memos.xml.h:11
-#: ../ui/evolution-tasks.xml.h:14
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2501
+#: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Spausdinti"
 
@@ -2880,21 +2851,19 @@ msgid "Move to Address Book..."
 msgstr "Perkelti į adresų knygelę..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:949
-#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-memos.xml.h:4
-#: ../ui/evolution-tasks.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Iškirpti"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:950
-#: ../calendar/gui/memos-component.c:449 ../ui/evolution-addressbook.xml.h:3
-#: ../ui/evolution-mail-message.xml.h:12 ../ui/evolution-memos.xml.h:2
-#: ../ui/evolution-tasks.xml.h:2
+#: ../calendar/gui/calendar-component.c:536
+#: ../calendar/gui/tasks-component.c:440 ../ui/evolution-addressbook.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:12 ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopijuoti"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:951
-#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-memos.xml.h:8
-#: ../ui/evolution-tasks.xml.h:11
+#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Įdėti"
 
@@ -2904,8 +2873,7 @@ msgstr "Įdėti"
 msgid "Any Category"
 msgstr "Bet kuri kategorija"
 
-#. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1767
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1764
 msgid "Print cards"
 msgstr "Spausdinti korteles"
 
@@ -2941,7 +2909,6 @@ msgstr "Automobilio telefonas"
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 #: ../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 "Kategorijos"
 
@@ -3046,7 +3013,7 @@ msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:388
+#: ../calendar/gui/e-meeting-list-view.c:378
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
 msgid "Role"
@@ -3315,7 +3282,7 @@ msgstr "Protokolas nepalaikomas"
 #: ../calendar/gui/e-cal-component-preview.c:232
 #: ../calendar/gui/e-cal-model-tasks.c:348
 #: ../calendar/gui/e-cal-model-tasks.c:661
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2375
+#: ../calendar/gui/e-calendar-table.c:456 ../calendar/gui/print.c:2364
 msgid "Cancelled"
 msgstr "Nutraukta"
 
@@ -3538,7 +3505,7 @@ msgstr "Nukopijuoti kontaktus į"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:764
 msgid "Select target addressbook."
-msgstr "Pasirinkite paskirties adresų knygą."
+msgstr "Pasirinkit tikslinę adresų knygą."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:987
 msgid "Multiple VCards"
@@ -3549,16 +3516,6 @@ msgstr "Keletas VCard kortelių"
 msgid "VCard for %s"
 msgstr "%s VCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1031
-#: ../addressbook/gui/widgets/eab-gui-util.c:1049
-msgid "Contact information"
-msgstr "Kontakto informacija"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:1051
-#, c-format
-msgid "Contact information for %s"
-msgstr "%s kontakto informacija"
-
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -3651,12 +3608,12 @@ msgstr "Evolution VCard importavimo priemonė"
 msgid "Print envelope"
 msgstr "Spausdinti voką"
 
-#: ../addressbook/printing/e-contact-print.c:1014
+#: ../addressbook/printing/e-contact-print.c:1001
 msgid "Print contacts"
 msgstr "Spausdinti kontaktus"
 
-#: ../addressbook/printing/e-contact-print.c:1105
-#: ../addressbook/printing/e-contact-print.c:1133
+#: ../addressbook/printing/e-contact-print.c:1066
+#: ../addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "Spausdinti kontaktą"
 
@@ -3810,8 +3767,8 @@ msgstr "Pustoniai"
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
 #: ../plugins/exchange-operations/exchange-account-setup.c:940
-#: ../plugins/exchange-operations/exchange-calendar.c:224
-#: ../plugins/exchange-operations/exchange-contacts.c:197
+#: ../plugins/exchange-operations/exchange-calendar.c:214
+#: ../plugins/exchange-operations/exchange-contacts.c:186
 msgid "Size:"
 msgstr "Dydis:"
 
@@ -4077,12 +4034,12 @@ msgid "Delete calendar '{0}'?"
 msgstr "Ištrinti kalendorių „{0}“?"
 
 #: ../calendar/calendar.error.xml.h:26
-msgid "Delete memo list '{0}'?"
-msgstr "Ištrinti užrašų sąrašą „{0}“?"
+msgid "Delete task list '{0}'?"
+msgstr "Ištrinti užduočių sąrašą „{0}“"
 
 #: ../calendar/calendar.error.xml.h:27
-msgid "Delete task list '{0}'?"
-msgstr "Ištrinti užduočių sąrašą „{0}“?"
+msgid "Discard Changes"
+msgstr "Atsisakyti pakeitimų"
 
 #: ../calendar/calendar.error.xml.h:28
 msgid "Don't Send"
@@ -4119,14 +4076,10 @@ msgid "Error loading calendar"
 msgstr "Klaida įkeliant kalendorių"
 
 #: ../calendar/calendar.error.xml.h:35
-msgid "Error loading memo list"
-msgstr "Klaida įkeliant užrašų sąrašą"
-
-#: ../calendar/calendar.error.xml.h:36
 msgid "Error loading task list"
 msgstr "Klaida įkeliant užduočių sąrašą"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:36
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the journal has been deleted."
@@ -4134,7 +4087,7 @@ msgstr ""
 "Jeigu neišsiųsite įspėjimo apie atšaukimą, kiti dalyviai gali nežinoti, kad "
 "šis žurnalas buvo ištrintas."
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:37
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the meeting is canceled."
@@ -4142,7 +4095,7 @@ msgstr ""
 "Jeigu neišsiųsite perspėjimo apie atšaukimą, kiti dalyviai gali nežinoti, "
 "kad susitikimas yra atšauktas."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the task has been deleted."
@@ -4150,6 +4103,10 @@ msgstr ""
 "Jeigu neišsiųsite įspėjimo apie atšaukimą, kiti dalyviai gali nežinoti, kad "
 "ši užduotis buvo ištrinta."
 
+#: ../calendar/calendar.error.xml.h:39
+msgid "Save Changes"
+msgstr "Išsaugoti pakeitimus"
+
 #: ../calendar/calendar.error.xml.h:40
 #: ../ui/evolution-message-composer.xml.h:28
 msgid "Send"
@@ -4188,99 +4145,81 @@ msgid "The calendar is not marked for offline usage"
 msgstr "Kalendorius nepažymėtas naudojimui atsijungus"
 
 #: ../calendar/calendar.error.xml.h:48
-msgid "The memo list is not marked for offline usage"
-msgstr "Užrašų sąrašas nepažymėtas naudojimui atsijungus"
-
-#: ../calendar/calendar.error.xml.h:49
 msgid "The task list is not marked for offline usage"
 msgstr "Užduočių sąrašas nepažymėtas naudojimui atsijungus"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:49
 msgid "This calendar will be removed permanently."
 msgstr "Šis kalendorius bus ištrintas visam laikui."
 
-#: ../calendar/calendar.error.xml.h:51
-msgid "This memo list will be removed permanently."
-msgstr "Šis užrašų sąrašas bus ištrintas visam laikui."
-
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:50
 msgid "This task list will be removed permanently."
 msgstr "Šis užduočių sąrašas bus ištrintas visam laikui."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:51
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Ar norite išsaugoti pakeitimus atliktus šiam įvykiui?"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:52
 msgid "Would you like to save your changes to this task?"
 msgstr "Ar norite išsaugoti pakeitimus atliktus šiai užduočiai?"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:53
 msgid "Would you like to send a cancellation notice for this journal entry?"
 msgstr "Ar norite išsiųsti įspėjimą apie šio žurnalo įrašo atšaukimą?"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:54
 msgid "Would you like to send all the participants a cancellation notice?"
 msgstr "Ar norite išsiųsti visiems dalyviams perspėjimą apie atšaukimą?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:55
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Ar norite išsiųsti susitikimo dalyviams pakvietimus?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:56
 msgid "Would you like to send this task to participants?"
 msgstr "Ar norite dalyviams išsiųsti šią užduotį?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Ar norite dalyviams išsiųsti atnaujintą susitikimo informaciją?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send updated task information to participants?"
 msgstr "Ar norite dalyviams išsiųsti atnaujintą užduoties informaciją?"
 
-#: ../calendar/calendar.error.xml.h:62
-#, fuzzy
-msgid "You have changed this appointment, but not yet saved them."
+#: ../calendar/calendar.error.xml.h:60
+msgid "You have made changes to this appointment, but not yet saved them."
 msgstr "Jūs pakeitėte šį įvykį, bet pakeitimų dar neišsaugojote."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:61
 msgid "You have made changes to this task, but not yet saved them."
 msgstr "Jūs pakeitėte šią užduotį, bet pakeitimų dar neišsaugojote."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:62
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Jūsų kalendoriai bus neprieinami kol Evolution nebus paleista iš naujo."
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:63
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Jūsų užduotys nebus prieinamos kol Evolution nebus paleista iš naujo."
 
-#: ../calendar/calendar.error.xml.h:66
-#: ../composer/mail-composer.error.xml.h:29
-msgid "_Discard Changes"
-msgstr "_Atsisakyti pakeitimų"
-
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:64
 #: ../ui/evolution-message-composer.xml.h:51
 msgid "_Save"
 msgstr "Iš_saugoti"
 
-#: ../calendar/calendar.error.xml.h:68
-msgid "_Save Changes"
-msgstr "Iš_saugoti pakeitimus"
-
-#: ../calendar/calendar.error.xml.h:69
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:127
+#: ../calendar/calendar.error.xml.h:65
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:123
 msgid "_Send"
 msgstr "_Siųsti"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:66
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:312
+#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:301
 #: ../smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Įveskite slaptažodį"
@@ -4291,8 +4230,6 @@ msgstr "Išskaidyti kelių dienų įvykius:"
 
 #: ../calendar/conduits/calendar/calendar-conduit.c:1377
 #: ../calendar/conduits/calendar/calendar-conduit.c:1378
-#: ../calendar/conduits/memo/memo-conduit.c:854
-#: ../calendar/conduits/memo/memo-conduit.c:855
 #: ../calendar/conduits/todo/todo-conduit.c:879
 #: ../calendar/conduits/todo/todo-conduit.c:880
 msgid "Could not start evolution-data-server"
@@ -4303,19 +4240,9 @@ msgstr "Nepavyko paleisti evolution-data-server"
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nepavyko perskaityti piloto Calendar programos bloko"
 
-#: ../calendar/conduits/memo/memo-conduit.c:937
-#: ../calendar/conduits/memo/memo-conduit.c:940
-msgid "Could not read pilot's Memo application block"
-msgstr "Nepavyko perskaityti piloto Memo programos bloko"
-
-#: ../calendar/conduits/memo/memo-conduit.c:976
-#: ../calendar/conduits/memo/memo-conduit.c:979
-msgid "Could not write pilot's Memo application block"
-msgstr "Nepavyko įrašyti piloto Memo programos bloko"
-
 #: ../calendar/conduits/todo/todo-conduit.c:234
 msgid "Default Priority:"
-msgstr "Numatytasis prioritetas:"
+msgstr "Įprastas prioritetas:"
 
 #: ../calendar/conduits/todo/todo-conduit.c:959
 #: ../calendar/conduits/todo/todo-conduit.c:962
@@ -4357,27 +4284,13 @@ msgid "Evolution's Calendar component"
 msgstr "Evolution kalendoriaus komponentas"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution's Memos component"
-msgstr "Evolution užrašų komponentas"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Tasks component"
 msgstr "Evolution užduočių komponentas"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Memo_s"
-msgstr "_Užrašai"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memos.c:1091 ../calendar/gui/memos-component.c:528
-#: ../calendar/gui/memos-component.c:998 ../calendar/gui/memos-control.c:334
-msgid "Memos"
-msgstr "Užrašai"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-tasks.c:1333 ../calendar/gui/print.c:1831
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#: ../calendar/gui/e-tasks.c:1260 ../calendar/gui/print.c:1822
 #: ../calendar/gui/tasks-component.c:519
-#: ../calendar/gui/tasks-component.c:1013 ../calendar/gui/tasks-control.c:466
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:456
 #: ../calendar/importers/icalendar-importer.c:79
 #: ../calendar/importers/icalendar-importer.c:707
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
@@ -4386,11 +4299,11 @@ msgstr "Užrašai"
 msgid "Tasks"
 msgstr "Užduotys"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 msgid "_Calendars"
 msgstr "_Kalendoriai"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
 #: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Užduotys"
@@ -4426,7 +4339,7 @@ msgstr "Paskyrimai"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/e-itip-control.c:1117
+#: ../calendar/gui/e-itip-control.c:1120
 #: ../plugins/itip-formatter/itip-view.c:884
 msgid "Location:"
 msgstr "Vieta:"
@@ -4440,13 +4353,13 @@ msgstr "Snūs_telėjimo laikas:"
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:6
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:13
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-addressbook.xml.h:34 ../ui/evolution-calendar.xml.h:41
 #: ../ui/evolution-composer-entries.xml.h:8
-#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:5
 #: ../ui/evolution-message-composer.xml.h:44
 #: ../ui/evolution-signature-editor.xml.h:23
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution.xml.h:35
 msgid "_Edit"
 msgstr "K_eisti"
 
@@ -4462,28 +4375,28 @@ msgstr "paskyrimo aprašymas"
 msgid "location of appointment"
 msgstr "paskyrimo vieta"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:969
+#: ../calendar/gui/alarm-notify/alarm-queue.c:966
 msgid "Dismiss"
 msgstr "Nutraukti"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:970
+#: ../calendar/gui/alarm-notify/alarm-queue.c:967
 msgid "Dismiss All"
 msgstr "Nutraukti visus"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1052
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1049
 msgid "No summary available."
 msgstr "Nėra jokios santraukos."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1061
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1063
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1058
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1060
 msgid "No description available."
 msgstr "Nėra jokio aprašymo."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1071
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1068
 msgid "No location information available."
 msgstr "Nėra vietos informacijos."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1087
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1084
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -4496,12 +4409,12 @@ msgstr ""
 "Prasideda %s\n"
 "Baigiasi %s"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1190
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1214
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1187
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1211
 msgid "Warning"
 msgstr "Įspėjimas"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1194
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1191
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4513,7 +4426,7 @@ msgstr ""
 "siųstų laišką.  Evolution vietoj to parodys normalų\n"
 "užuominos dialogą."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1220
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1217
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4530,15 +4443,15 @@ msgstr ""
 "\n"
 "Ar esate tikri, kad ši komanda turi būti paleista?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1234
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1231
 msgid "Do not ask me about this program again."
 msgstr "Kitą kartą nebeklausti apie šią programą."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:147
+#: ../calendar/gui/alarm-notify/notify-main.c:140
 msgid "Could not initialize Bonobo"
 msgstr "Nepavyko inicializuoti Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:158
+#: ../calendar/gui/alarm-notify/notify-main.c:151
 msgid "Could not create the alarm notify service factory"
 msgstr "Nepavyko sukurti perspėjimo pranešimų tarnybos gamyklos"
 
@@ -4740,28 +4653,18 @@ msgid "Show display alarms in notification tray"
 msgstr "Rodyti ekrano perspėjimus perspėjimų skydelyje"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
-#: ../mail/evolution-mail.schemas.in.in.h:73
-msgid "Show the \"Preview\" pane"
-msgstr "Rodyti „Peržiūros“ skyrių"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
-#: ../mail/evolution-mail.schemas.in.in.h:74
-msgid "Show the \"Preview\" pane."
-msgstr "Rodyti „Peržiūros“ skyrių."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show week numbers in date navigator"
 msgstr "Rodyti savaičių numerius datos navigatoriuje"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Tasks due today color"
 msgstr "Užduočių, kurias reikia atlikti iki šiandien, spalva"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Tasks vertical pane position"
 msgstr "Užduočių vertikalaus skydelio pozicija"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -4769,7 +4672,7 @@ msgstr ""
 "Įprasta laiko juosta naudojama datoms ir laikui kalendoriuje, taip kaip yra "
 "neišverstoje Olseno laiko juostų duomenų bazėje. Pvz. „America/New York“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
 #, no-c-format
 msgid ""
 "The url template to use as a free/busy data fallback, %u is replaced by the "
@@ -4779,52 +4682,52 @@ msgstr ""
 "skelbimo variantas, %u yra pakeičiama naudotojo el. pašto adreso dalimi ir %"
 "d yra pakeičiama domenu."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Time divisions"
 msgstr "Laiko atkarpos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Time the last alarm ran, in time_t."
 msgstr "Paskutinio įvykdyto perspėjimo data, time_t vienetais."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Timezone"
 msgstr "Laiko juosta"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Twenty four hour time format"
 msgstr "Dvidešimt keturių valandų laiko formatas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Įprasto priminimo vienetai, „minutes“, „hours“ arba „days“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "Vienetai užduočių paslėpimo nurodymui, „minutes“, „hours“, „days“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid "Week start"
 msgstr "Savaitės pradžia"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Savaitės pradžios diena, nuo sekmadienio (0) iki šeštadienio (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Ar perspėjimų rodymui naudoti pranešimų vietą."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Ar klausti patvirtinimo trinant paskyrimus ar užduotis."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Ar klausti patvirtinimo išvalant paskyrimus ar užduotis."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -4832,49 +4735,49 @@ msgstr ""
 "Ar suspausti savaitgalius mėnesio rodinyje. Nustačius, rodomi šeštadienis ir "
 "sekmadienis užima vienos dienos vietą."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "Ar rodyti įvykių pabaigos laikus savaitės ir mėnesio rodiniuose."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "Ar piešti kalendoriuje Marko Beinso liniją (dabarties laiko linija)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Ar užduočių rodinyje paslėpti atliktas užduotis."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Whether to set a default reminder for appointments."
 msgstr "Ar nurodyti įprastą paskyrimų priminimą."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Ar laikas turi būti rodomas 24 valandų formate vietoje am/pm formato."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Ar datos navigatoriuje rodyti savaičių numerius."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Work days"
 msgstr "Darbo dienos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid "Workday end hour"
 msgstr "Paskutinė darbo dienos valanda"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Workday end minute"
 msgstr "Paskutinė darbo dienos minutė"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid "Workday start hour"
 msgstr "Pirma darbo dienos valanda"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Workday start minute"
 msgstr "Pirma darbo dienos minutė"
 
@@ -4900,8 +4803,8 @@ msgstr "Neatitinkantys"
 
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2116
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/gnome-cal.c:2094
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:588
@@ -4931,13 +4834,10 @@ msgid "days"
 msgstr "dienų"
 
 #. 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:234
-#: ../calendar/gui/memos-component.c:219 ../calendar/gui/migration.c:489
-#: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1084
-#: ../calendar/gui/tasks-component.c:215
+#: ../calendar/gui/calendar-component.c:234 ../calendar/gui/migration.c:489
+#: ../calendar/gui/migration.c:582 ../calendar/gui/tasks-component.c:215
 msgid "On The Web"
 msgstr "Tinkle"
 
@@ -4952,43 +4852,15 @@ msgid "Weather"
 msgstr "Oras"
 
 #: ../calendar/gui/calendar-component.c:535
-msgid "_New Calendar"
-msgstr "_Naujas kalendorius"
-
-#: ../calendar/gui/calendar-component.c:536
-#: ../calendar/gui/dialogs/comp-editor.c:429
-#: ../calendar/gui/e-calendar-table.c:1175
-#: ../calendar/gui/e-calendar-view.c:1556 ../calendar/gui/e-memo-table.c:853
-#: ../calendar/gui/tasks-component.c:440 ../composer/e-msg-composer.c:3049
-#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1035
-#: ../mail/message-list.c:1718 ../ui/evolution-addressbook.xml.h:32
-#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
-#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
-msgid "_Copy"
-msgstr "_Kopijuoti"
-
-#. FIXME: need to disable for undeletable folders
-#: ../calendar/gui/calendar-component.c:537
-#: ../calendar/gui/e-calendar-table.c:1187
-#: ../calendar/gui/e-calendar-view.c:1569 ../calendar/gui/e-memo-table.c:862
-#: ../calendar/gui/tasks-component.c:441 ../mail/em-folder-tree.c:2054
-#: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:34
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
-#: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
-msgid "_Delete"
-msgstr "_Ištrinti"
-
-#: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/tasks-component.c:442
-msgid "_Properties..."
-msgstr "_Savybės..."
+#: ../calendar/gui/dialogs/calendar-setup.c:449
+msgid "New Calendar"
+msgstr "Naujas kalendorius"
 
 #: ../calendar/gui/calendar-component.c:858
 msgid "Failed upgrading calendars."
 msgstr "Nepavyko atnaujinti kalendorių."
 
-#: ../calendar/gui/calendar-component.c:1157
+#: ../calendar/gui/calendar-component.c:1154
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Nepavyko atverti kalendoriaus „%s“ įvykių bei susitikimų įrašymui"
@@ -5224,18 +5096,17 @@ msgstr "%.0fG"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:311
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
-#: ../calendar/gui/dialogs/comp-editor.c:2483
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:138
-#: ../mail/em-utils.c:483 ../mail/em-utils.c:520
-#: ../widgets/misc/e-attachment-bar.c:341
+#: ../calendar/gui/dialogs/comp-editor.c:2440
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:444
+#: ../mail/em-utils.c:481 ../widgets/misc/e-attachment-bar.c:341
 msgid "attachment"
 msgstr "priedas"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:473
-#: ../calendar/gui/dialogs/comp-editor.c:1120
-#: ../calendar/gui/dialogs/meeting-page.c:908
+#: ../calendar/gui/dialogs/comp-editor.c:1083
+#: ../calendar/gui/dialogs/meeting-page.c:887
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3545
+#: ../composer/e-msg-composer.c:3400
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
@@ -5243,23 +5114,23 @@ msgid "_Remove"
 msgstr "_Pašalinti"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:474
-#: ../calendar/gui/dialogs/comp-editor.c:1121
+#: ../calendar/gui/dialogs/comp-editor.c:1084
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3546 ../mail/em-folder-tree.c:2058
+#: ../composer/e-msg-composer.c:3401 ../mail/em-folder-tree.c:2052
 #: ../ui/evolution-mail-list.xml.h:29
 msgid "_Properties"
 msgstr "_Savybės"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:476
-#: ../calendar/gui/dialogs/comp-editor.c:1123
+#: ../calendar/gui/dialogs/comp-editor.c:1086
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3548
+#: ../composer/e-msg-composer.c:3403
 msgid "_Add attachment..."
 msgstr "_Prisegti priedą..."
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:736
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:969
+#: ../widgets/misc/e-attachment-bar.c:963
 msgid "Attachment Bar"
 msgstr "Priedų juosta"
 
@@ -5274,7 +5145,7 @@ msgid "Suggest automatic display of attachment"
 msgstr "Pasiūlyti automatinį priedo parodymą"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
-#: ../composer/e-msg-composer-select-file.c:239
+#: ../composer/e-msg-composer-select-file.c:241
 msgid "Attach file(s)"
 msgstr "Prisegti bylą(as)"
 
@@ -5309,7 +5180,7 @@ msgstr "Priedo savybės"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:267
-#: ../calendar/gui/e-itip-control.c:1163
+#: ../calendar/gui/e-itip-control.c:1166
 #: ../calendar/gui/e-itip-control.glade.h:6
 #: ../composer/e-msg-composer-attachment.glade.h:3
 #: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
@@ -5330,7 +5201,7 @@ msgstr "MIME tipas:"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:576
-#: ../mail/em-account-prefs.c:504 ../mail/em-composer-prefs.c:919
+#: ../mail/em-account-prefs.c:504 ../mail/em-composer-prefs.c:891
 #: ../plugins/plugin-manager/plugin-manager.c:213
 msgid "Enabled"
 msgstr "Įjungta"
@@ -5453,7 +5324,7 @@ msgstr "Laisvas/užsiėmęs"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: ../calendar/gui/dialogs/recurrence-page.c:1049
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Friday"
 msgstr "Penktadienis"
 
@@ -5467,7 +5338,7 @@ msgstr "Minučių"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: ../calendar/gui/dialogs/recurrence-page.c:1045
-#: ../calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Monday"
 msgstr "Pirmadienis"
 
@@ -5481,7 +5352,7 @@ msgstr "S_ek"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ../calendar/gui/dialogs/recurrence-page.c:1050
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Saturday"
 msgstr "Šeštadienis"
 
@@ -5495,7 +5366,7 @@ msgstr "Rodyti savaičių _numerius datos navigatoriuje"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: ../calendar/gui/dialogs/recurrence-page.c:1051
-#: ../calendar/gui/e-itip-control.c:726
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Sunday"
 msgstr "Sekmadienis"
 
@@ -5513,7 +5384,7 @@ msgstr "Šablonas:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 #: ../calendar/gui/dialogs/recurrence-page.c:1048
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Thursday"
 msgstr "Ketvirtadienis"
 
@@ -5527,7 +5398,7 @@ msgstr "Laiko formatas:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/dialogs/recurrence-page.c:1046
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Tuesday"
 msgstr "Antradienis"
 
@@ -5537,7 +5408,7 @@ msgstr "Sa_vaitė prasideda:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #: ../calendar/gui/dialogs/recurrence-page.c:1047
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Wednesday"
 msgstr "Trečiadienis"
 
@@ -5625,40 +5496,23 @@ msgstr "Nukopijuoti aplanko turinį į nuosavą kompiuterį darbui neprisijungus
 msgid "Copy task list contents locally for offline operation"
 msgstr "Nukopijuoti užduočių sąrašą į nuosavą kompiuterį darbui neprisijungus"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-msgid "Copy memo list contents locally for offline operation"
-msgstr "Nukopijuoti užrašų sąrašo turinį į savo kompiuterį darbui neprisijungus"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:341
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "Sp_alva:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:378
 msgid "Tasks List"
 msgstr "Užduočių sąrašas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-msgid "Memos List"
-msgstr "Užrašų sąrašas"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:460
+#: ../calendar/gui/dialogs/calendar-setup.c:447
 msgid "Calendar Properties"
 msgstr "Kalendoriaus savybės"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:462
-msgid "New Calendar"
-msgstr "Naujas kalendorius"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:528
+#: ../calendar/gui/dialogs/calendar-setup.c:515
 msgid "Task List Properties"
 msgstr "Užduočių sąrašo savybės"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:594
-#: ../calendar/gui/memos-component.c:448
-msgid "New Memo List"
-msgstr "Naujas užrašų sąrašas"
-
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
 msgstr "Pridėti kalendorių"
@@ -5746,35 +5600,35 @@ msgstr "%s  Jūs nieko nepakeitėte, atnaujinti redaktorių?"
 msgid "Validation error: %s"
 msgstr "Tikrinimo klaida: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2270
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2261
 msgid " to "
 msgstr " iki "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2274
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2265
 msgid " (Completed "
 msgstr " (Užbaigta "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2276
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2267
 msgid "Completed "
 msgstr "Užbaigta "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2281
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2272
 msgid " (Due "
 msgstr " (Iki "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2283
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2274
 msgid "Due "
 msgstr "Iki"
 
-#: ../calendar/gui/dialogs/comp-editor.c:191 ../composer/e-msg-composer.c:2800
+#: ../calendar/gui/dialogs/comp-editor.c:190 ../composer/e-msg-composer.c:2664
 #, c-format
 msgid "Attached message - %s"
 msgstr "Prisegtas laiškas - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:196
-#: ../calendar/gui/dialogs/comp-editor.c:366 ../composer/e-msg-composer.c:2805
-#: ../composer/e-msg-composer.c:2984
+#: ../calendar/gui/dialogs/comp-editor.c:195
+#: ../calendar/gui/dialogs/comp-editor.c:365 ../composer/e-msg-composer.c:2669
+#: ../composer/e-msg-composer.c:2846
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
@@ -5782,22 +5636,32 @@ msgstr[0] "Prisegtas laiškas"
 msgstr[1] "%d prisegti laiškai"
 msgstr[2] "%d prisegtų laiškų"
 
-#: ../calendar/gui/dialogs/comp-editor.c:430 ../composer/e-msg-composer.c:3050
+#: ../calendar/gui/dialogs/comp-editor.c:428
+#: ../calendar/gui/e-calendar-table.c:1171
+#: ../calendar/gui/e-calendar-view.c:1552 ../composer/e-msg-composer.c:2911
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1035
+#: ../mail/message-list.c:1708 ../ui/evolution-addressbook.xml.h:31
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-tasks.xml.h:21
+msgid "_Copy"
+msgstr "_Kopijuoti"
+
+#: ../calendar/gui/dialogs/comp-editor.c:429 ../composer/e-msg-composer.c:2912
 #: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1719
+#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1709
 msgid "_Move"
 msgstr "_Perkelti"
 
-#: ../calendar/gui/dialogs/comp-editor.c:432 ../composer/e-msg-composer.c:3052
-#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1721
+#: ../calendar/gui/dialogs/comp-editor.c:431 ../composer/e-msg-composer.c:2914
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1711
 msgid "Cancel _Drag"
 msgstr "Atšaukti _tempimą"
 
-#: ../calendar/gui/dialogs/comp-editor.c:775
+#: ../calendar/gui/dialogs/comp-editor.c:774
 msgid "Could not update object"
 msgstr "Nepavyko atnaujinti objekto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:978 ../composer/e-msg-composer.c:2443
+#: ../calendar/gui/dialogs/comp-editor.c:977 ../composer/e-msg-composer.c:2318
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5805,67 +5669,58 @@ msgstr[0] "<b>%d</b> priedas"
 msgstr[1] "<b>%d</b> priedai"
 msgstr[2] "<b>%d</b> priedų"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1008
-msgid "Hide Attachment _Bar"
-msgstr "Paslėpti prie_dų juostą"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1011
-#: ../calendar/gui/dialogs/comp-editor.c:1289
-msgid "Show Attachment _Bar"
-msgstr "Rodyti prie_dų juostą"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1313
-msgid "Attachment Button: Press space key to toggle attachment bar"
-msgstr "Prisegimo mygtukas: norėdami perjungti prisegimų skydelį paspauskite tarpą"
+#: ../calendar/gui/dialogs/comp-editor.c:1249
+msgid "_Attachment Bar (drop attachments here)"
+msgstr "_Priedų juosta (čia meskite priedus)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1892
-#: ../calendar/gui/dialogs/comp-editor.c:1935
+#: ../calendar/gui/dialogs/comp-editor.c:1850
+#: ../calendar/gui/dialogs/comp-editor.c:1893
 msgid "Edit Appointment"
 msgstr "Keisti paskyrimą"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1898
-#: ../calendar/gui/dialogs/comp-editor.c:1941
+#: ../calendar/gui/dialogs/comp-editor.c:1856
+#: ../calendar/gui/dialogs/comp-editor.c:1899
 #, c-format
 msgid "Meeting - %s"
 msgstr "Susitikimas - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1900
-#: ../calendar/gui/dialogs/comp-editor.c:1943
+#: ../calendar/gui/dialogs/comp-editor.c:1858
+#: ../calendar/gui/dialogs/comp-editor.c:1901
 #, c-format
 msgid "Appointment - %s"
 msgstr "Paskyrimas -- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1904
-#: ../calendar/gui/dialogs/comp-editor.c:1947
+#: ../calendar/gui/dialogs/comp-editor.c:1862
+#: ../calendar/gui/dialogs/comp-editor.c:1905
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Priskirta užduotis - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1906
-#: ../calendar/gui/dialogs/comp-editor.c:1949
+#: ../calendar/gui/dialogs/comp-editor.c:1864
+#: ../calendar/gui/dialogs/comp-editor.c:1907
 #, c-format
 msgid "Task - %s"
 msgstr "Užduotis -- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1909
-#: ../calendar/gui/dialogs/comp-editor.c:1952
+#: ../calendar/gui/dialogs/comp-editor.c:1867
+#: ../calendar/gui/dialogs/comp-editor.c:1910
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Žurnalo įrašas -- %s"
 
+#: ../calendar/gui/dialogs/comp-editor.c:1878
 #: ../calendar/gui/dialogs/comp-editor.c:1920
-#: ../calendar/gui/dialogs/comp-editor.c:1962
 msgid "No summary"
 msgstr "Nėra apžvalgos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2575
-#: ../calendar/gui/dialogs/comp-editor.c:2608
-#: ../calendar/gui/dialogs/comp-editor.c:2632
+#: ../calendar/gui/dialogs/comp-editor.c:2532
+#: ../calendar/gui/dialogs/comp-editor.c:2565
+#: ../calendar/gui/dialogs/comp-editor.c:2589
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Pakeitimai padaryti šiame punkte bus prarasti, jei atsiras atnaujinimai"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2656
+#: ../calendar/gui/dialogs/comp-editor.c:2613
 msgid "Unable to use current version!"
 msgstr "Nepavyko paleisti turimos versijos!"
 
@@ -5942,33 +5797,32 @@ msgstr "Pavesti kam:"
 msgid "Enter Delegate"
 msgstr "Įvesti, kam pavedama"
 
-#: ../calendar/gui/dialogs/event-editor.c:141
-#, fuzzy
-msgid "Appoint_ment"
-msgstr "Paskyri_mas"
+#: ../calendar/gui/dialogs/event-editor.c:141 ../calendar/gui/print.c:2298
+msgid "Appointment"
+msgstr "Paskyrimas"
 
 #: ../calendar/gui/dialogs/event-editor.c:150
-msgid "_Recurrence"
-msgstr "_Pasikartojimas"
+msgid "Recurrence"
+msgstr "Pasikartojimas"
 
 #: ../calendar/gui/dialogs/event-editor.c:164
 #: ../calendar/gui/dialogs/event-editor.c:248
 #: ../calendar/gui/dialogs/event-editor.c:422
-msgid "Schedulin_g"
-msgstr "Dienotvar_kė"
+msgid "Scheduling"
+msgstr "Dienotvarkė"
 
 #: ../calendar/gui/dialogs/event-editor.c:174
-msgid "_Delegatees"
-msgstr "_Delegatai"
+msgid "Delegatees"
+msgstr "Delegatai"
 
 #: ../calendar/gui/dialogs/event-editor.c:178
-msgid "_Attendees"
-msgstr "D_alyviai"
+msgid "Attendees"
+msgstr "Dalyviai"
 
 #: ../calendar/gui/dialogs/event-editor.c:251
 #: ../calendar/gui/dialogs/event-editor.c:425
-msgid "In_vitations"
-msgstr "Pak_vietimai"
+msgid "Invitations"
+msgstr "Pakvietimai"
 
 #: ../calendar/gui/dialogs/event-page.c:731
 msgid "Event with no start date"
@@ -5995,12 +5849,12 @@ msgstr "Klaidingas pradžios laikas"
 msgid "End time is wrong"
 msgstr "Klaidingas pabaigos laikas"
 
-#: ../calendar/gui/dialogs/event-page.c:1693
+#: ../calendar/gui/dialogs/event-page.c:1686
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Nepavyko atverti kalendoriaus „%s“."
 
-#: ../calendar/gui/dialogs/event-page.c:1894
+#: ../calendar/gui/dialogs/event-page.c:1892
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -6008,7 +5862,7 @@ msgstr[0] "%d dieną prieš paskyrimą"
 msgstr[1] "%d dienas prieš paskyrimą"
 msgstr[2] "%d dienų prieš paskyrimą"
 
-#: ../calendar/gui/dialogs/event-page.c:1902
+#: ../calendar/gui/dialogs/event-page.c:1900
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -6016,7 +5870,7 @@ msgstr[0] "%d valandą prieš paskyrimą"
 msgstr[1] "%d valandas prieš paskyrimą"
 msgstr[2] "%d valandų prieš paskyrimą"
 
-#: ../calendar/gui/dialogs/event-page.c:1910
+#: ../calendar/gui/dialogs/event-page.c:1908
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
@@ -6061,92 +5915,88 @@ msgid "Ad_vanced send options"
 msgstr "Iš_samūs siuntimo nustatymai"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:10
-msgid "Ala_rm"
-msgstr "Pe_rspėjimas"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:11
 msgid "C_ustomize..."
 msgstr "Prisitaik_yti..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
+#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/task-page.glade.h:5
 msgid "Ca_tegories..."
 msgstr "Ka_tegorijos..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Cale_ndar:"
 msgstr "Kale_ndorius:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Classi_fication:"
 msgstr "Klasi_fikacija:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:8
 #: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:364
+#: ../calendar/gui/e-calendar-table.c:360
 msgid "Confidential"
 msgstr "Konfidencialus"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:16
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Event Description"
 msgstr "Įvykio aprašymas"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:17
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "Locat_ion:"
 msgstr "V_ieta:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.glade.h:17
 #: ../calendar/gui/dialogs/task-page.glade.h:10
 #: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:359
 msgid "Private"
 msgstr "Asmeniškas"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:19
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
+#: ../calendar/gui/dialogs/event-page.glade.h:18
 #: ../calendar/gui/dialogs/task-page.glade.h:11
 #: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:362
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:358
 msgid "Public"
 msgstr "Viešas"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:20
-msgid "Show time as bus_y"
+#: ../calendar/gui/dialogs/event-page.glade.h:19
+msgid "Show time as _busy"
 msgstr "Rodyti laiką kaip _užimtą"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:21
+#: ../calendar/gui/dialogs/event-page.glade.h:20
 #: ../calendar/gui/dialogs/task-page.glade.h:13
 msgid "Su_mmary:"
 msgstr "S_uvestinė:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:22
+#: ../calendar/gui/dialogs/event-page.glade.h:21
 msgid "This appointment has customized alarms"
 msgstr "Šiam paskyrimui yra priskirti tinkinti perspėjimai"
 
+#: ../calendar/gui/dialogs/event-page.glade.h:22
+msgid "_Alarm"
+msgstr "_Perspėti"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:23
 msgid "_Description:"
 msgstr "_Aprašymas:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:24
-#: ../calendar/gui/e-meeting-time-sel.c:645
+#: ../calendar/gui/e-meeting-time-sel.c:642
 msgid "_End time:"
 msgstr "P_abaigos laikas:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:25
-#: ../calendar/gui/e-meeting-time-sel.c:618
+#: ../calendar/gui/e-meeting-time-sel.c:615
 msgid "_Start time:"
 msgstr "_Pradžios laikas:"
 
-#: ../calendar/gui/dialogs/meeting-page.c:305
+#: ../calendar/gui/dialogs/meeting-page.c:303
 msgid "<b>Dele_gatees</b>"
 msgstr "<b>Dele_gatai</b>"
 
-#: ../calendar/gui/dialogs/meeting-page.c:309
+#: ../calendar/gui/dialogs/meeting-page.c:307
 msgid "<b>From:</b>"
 msgstr "<b>Iš:</b>"
 
@@ -6155,10 +6005,10 @@ msgstr "<b>Iš:</b>"
 #. When "None" is selected we want the field to be cleared.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../calendar/gui/dialogs/meeting-page.c:315
+#: ../calendar/gui/dialogs/meeting-page.c:313
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:653
-#: ../calendar/gui/e-itip-control.c:1103 ../composer/e-msg-composer.c:2246
+#: ../calendar/gui/e-itip-control.c:1106 ../composer/e-msg-composer.c:2122
 #: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
 #: ../mail/em-account-editor.c:1348 ../mail/em-account-prefs.c:464
 #: ../mail/em-folder-view.c:1064 ../mail/em-junk-hook.c:78
@@ -6172,23 +6022,24 @@ msgstr "<b>Iš:</b>"
 msgid "None"
 msgstr "Nėra"
 
-#: ../calendar/gui/dialogs/meeting-page.c:463
+#: ../calendar/gui/dialogs/meeting-page.c:461
 msgid "The organizer selected no longer has an account."
 msgstr "Pasirinktas organizatorius nebeturi sąskaitos."
 
-#: ../calendar/gui/dialogs/meeting-page.c:469
+#: ../calendar/gui/dialogs/meeting-page.c:467
 msgid "An organizer is required."
 msgstr "Organizatorius yra būtinas."
 
-#: ../calendar/gui/dialogs/meeting-page.c:484
+#: ../calendar/gui/dialogs/meeting-page.c:482
 msgid "At least one attendee is required."
 msgstr "Būtinas bent vienas dalyvis."
 
-#: ../calendar/gui/dialogs/meeting-page.c:909
-msgid "_Add "
-msgstr "_Pridėti"
+#: ../calendar/gui/dialogs/meeting-page.c:884
+msgid "_Delegate To..."
+msgstr "_Pavesti kam..."
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
+#: ../calendar/gui/e-meeting-list-view.c:358
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Dalyvis"
@@ -6224,14 +6075,15 @@ msgid "Member"
 msgstr "Narys"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:399
+#: ../calendar/gui/e-meeting-list-view.c:386
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
+#: ../calendar/gui/dialogs/task-editor.c:146
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:410
+#: ../calendar/gui/e-meeting-list-view.c:394
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
 #: ../mail/message-list.etspec.h:12
 msgid "Status"
@@ -6246,8 +6098,9 @@ msgid "C_hange Organizer"
 msgstr "_Keisti organizatorių"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Co_ntacts..."
-msgstr "Ko_ntaktai..."
+#: ../calendar/gui/e-meeting-time-sel.c:428
+msgid "Con_tacts..."
+msgstr "Kon_taktai..."
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 msgid "Or_ganizer:"
@@ -6262,28 +6115,6 @@ msgstr "Organizatorius"
 msgid "Organizer:"
 msgstr "Organizatorius:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:130 ../calendar/gui/print.c:2311
-msgid "Memo"
-msgstr "Užrašas"
-
-#: ../calendar/gui/dialogs/memo-page.c:489
-#, c-format
-msgid "Unable to open memos in '%s'."
-msgstr "Nepavyko atverti „%s“ užrašų."
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:2
-msgid "<span weight=\"bold\">Basics</span>"
-msgstr "<span weight=\"bold\">Pagrindai</span>"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:8
-#: ../calendar/gui/dialogs/task-page.glade.h:16
-msgid "_Group:"
-msgstr "_Grupė:"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:9
-msgid "_Memo Content:"
-msgstr "_Užrašo turinys:"
-
 #: ../calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Kalendoriaus nustatymai</b>"
@@ -6473,15 +6304,15 @@ msgstr "<span weight=\"bold\">Būsena</span>"
 #: ../calendar/gui/e-cal-component-preview.c:229
 #: ../calendar/gui/e-cal-model-tasks.c:346
 #: ../calendar/gui/e-cal-model-tasks.c:659
-#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/e-itip-control.c:895
+#: ../calendar/gui/e-calendar-table.c:455 ../calendar/gui/e-itip-control.c:898
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../calendar/gui/print.c:2372 ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/print.c:2361 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Užbaigta"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-calendar-table.c:384 ../mail/message-list.c:1018
+#: ../calendar/gui/e-calendar-table.c:380 ../mail/message-list.c:1008
 msgid "High"
 msgstr "Aukštas"
 
@@ -6490,20 +6321,20 @@ msgstr "Aukštas"
 #: ../calendar/gui/e-cal-model-tasks.c:344
 #: ../calendar/gui/e-cal-model-tasks.c:657
 #: ../calendar/gui/e-cal-model-tasks.c:732
-#: ../calendar/gui/e-calendar-table.c:458 ../calendar/gui/print.c:2369
+#: ../calendar/gui/e-calendar-table.c:454 ../calendar/gui/print.c:2358
 msgid "In Progress"
 msgstr "Vykdoma"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1016
+#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1006
 msgid "Low"
 msgstr "Žemas"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model.c:920 ../calendar/gui/e-calendar-table.c:385
-#: ../mail/message-list.c:1017
+#: ../calendar/gui/e-cal-model.c:920 ../calendar/gui/e-calendar-table.c:381
+#: ../mail/message-list.c:1007
 msgid "Normal"
 msgstr "Normalus"
 
@@ -6511,7 +6342,7 @@ msgstr "Normalus"
 #: ../calendar/gui/e-cal-component-preview.c:236
 #: ../calendar/gui/e-cal-model-tasks.c:342
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:457 ../calendar/gui/print.c:2366
+#: ../calendar/gui/e-calendar-table.c:453 ../calendar/gui/print.c:2355
 msgid "Not Started"
 msgstr "Nepradėta"
 
@@ -6520,55 +6351,46 @@ msgid "P_ercent complete:"
 msgstr "Įvykdymo proc_entas:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:11
-msgid "Stat_us:"
-msgstr "Būs_ena:"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:383
 msgid "Undefined"
 msgstr "Nenurodyta"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "_Date completed:"
 msgstr "Pabaigimo _data:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:14
+#: ../calendar/gui/dialogs/task-details-page.glade.h:13
 #: ../widgets/misc/e-send-options.glade.h:31
 msgid "_Priority:"
 msgstr "_Svarbumas:"
 
+#: ../calendar/gui/dialogs/task-details-page.glade.h:14
+msgid "_Status:"
+msgstr "_Būsena:"
+
 #: ../calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Web Page:"
 msgstr "_Tinklalapis:"
 
-#: ../calendar/gui/dialogs/task-editor.c:137
-#: ../calendar/gui/tasks-component.c:1172
-msgid "_Task"
-msgstr "_Užduotis"
-
-#: ../calendar/gui/dialogs/task-editor.c:146
-msgid "_Status"
-msgstr "_Būsena"
+#: ../calendar/gui/dialogs/task-editor.c:137 ../calendar/gui/print.c:2300
+msgid "Task"
+msgstr "Užduotis"
 
 #: ../calendar/gui/dialogs/task-editor.c:161
 #: ../calendar/gui/dialogs/task-editor.c:223
 #: ../calendar/gui/dialogs/task-editor.c:380
-msgid "Assig_nment"
-msgstr "Priskyri_mas"
+msgid "Assignment"
+msgstr "Priskyrimas"
 
 #: ../calendar/gui/dialogs/task-page.c:529
 msgid "Due date is wrong"
 msgstr "Galutinio termino data klaidinga"
 
-#: ../calendar/gui/dialogs/task-page.c:880
+#: ../calendar/gui/dialogs/task-page.c:873
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nepavyko atverti „%s“ užduočių."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:5
-msgid "Categor_ies..."
-msgstr "Kategor_ijos..."
-
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "D_escription:"
 msgstr "A_prašymas:"
@@ -6585,6 +6407,10 @@ msgstr "Užduoties aprašymas:"
 msgid "_Due date:"
 msgstr "_Reikia iki:"
 
+#: ../calendar/gui/dialogs/task-page.glade.h:16
+msgid "_Group:"
+msgstr "_Grupė:"
+
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Free/Busy C_alendars</b>"
 msgstr "<b>Laisvas/užsiėmęs k_alendoriai</b>"
@@ -6715,27 +6541,17 @@ msgstr "%s esantis %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s yra skirtas nežinomam daviklio tipui"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2704
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2703
 #, c-format
 msgid "Click to open %s"
-msgstr "Spragtelėkite norėdami atverti %s"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:199
-msgid "Memo:"
-msgstr "Užrašas:"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:232
-#: ../calendar/gui/e-cal-component-preview.c:299
-msgid "Web Page:"
-msgstr "Tinklalapis:"
+msgstr "Norėdami atverti %s, paspauskite čia"
 
 #: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:796
 msgid "Untitled"
 msgstr "Bevardė"
 
 #: ../calendar/gui/e-cal-component-preview.c:186
-#: ../calendar/gui/e-itip-control.c:1107
+#: ../calendar/gui/e-itip-control.c:1110
 #: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Apžvalga:"
@@ -6752,7 +6568,7 @@ msgstr "Kada reikia:"
 #. write status
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:222
-#: ../calendar/gui/e-itip-control.c:1131
+#: ../calendar/gui/e-itip-control.c:1134
 #: ../plugins/exchange-operations/exchange-account-setup.c:265
 #: ../plugins/itip-formatter/itip-view.c:909
 msgid "Status:"
@@ -6762,6 +6578,10 @@ msgstr "Būsena:"
 msgid "Priority:"
 msgstr "Prioritetas:"
 
+#: ../calendar/gui/e-cal-component-preview.c:299
+msgid "Web Page:"
+msgstr "Tinklalapis:"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Pabaigos data"
@@ -6772,19 +6592,18 @@ msgstr "Pradžios data"
 
 #: ../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:16
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../mail/mail-dialogs.glade.h:16 ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "Apžvalga"
 
 #: ../calendar/gui/e-cal-model-calendar.c:180
-#: ../calendar/gui/e-calendar-table.c:436
+#: ../calendar/gui/e-calendar-table.c:432
 msgid "Free"
 msgstr "Laisvas"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:437
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-calendar-table.c:433
+#: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Busy"
 msgstr "Užimtas"
 
@@ -6815,17 +6634,15 @@ msgstr "Ne"
 
 #. This is the default filename used for temporary file creation
 #: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-model.c:330
-#: ../calendar/gui/e-cal-popup.c:106 ../calendar/gui/e-cal-popup.c:121
-#: ../calendar/gui/e-cal-popup.c:165 ../calendar/gui/e-itip-control.c:1148
-#: ../calendar/gui/e-itip-control.c:1289
+#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.c:1292
 #: ../calendar/gui/e-meeting-list-view.c:168
 #: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1283
+#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1244
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1652
 #: ../plugins/plugin-manager/plugin-manager.c:72
-#: ../widgets/misc/e-attachment-bar.c:665
+#: ../widgets/misc/e-attachment-bar.c:659
 #: ../widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "Nežinomas"
@@ -6838,157 +6655,132 @@ msgstr "Pasikartojantis"
 msgid "Assigned"
 msgstr "Priskirtas"
 
-#: ../calendar/gui/e-cal-popup.c:171 ../mail/em-popup.c:411
-msgid "Save As..."
-msgstr "Išsaugoti kaip..."
-
-#: ../calendar/gui/e-cal-popup.c:187 ../mail/em-format-html-display.c:1812
-msgid "Select folder to save selected attachments..."
-msgstr "Pasirinkite aplanką, kuriame išsaugoti pasirinktus priedus..."
-
-#: ../calendar/gui/e-cal-popup.c:216 ../mail/em-popup.c:436
-#, c-format
-msgid "untitled_image.%s"
-msgstr "neįvardintas_paveikslėlis.%s"
-
-#: ../calendar/gui/e-cal-popup.c:270 ../calendar/gui/e-calendar-table.c:1169
-#: ../calendar/gui/e-calendar-view.c:1550 ../calendar/gui/e-memo-table.c:847
-#: ../mail/em-folder-view.c:1045 ../mail/em-popup.c:553 ../mail/em-popup.c:564
-msgid "_Save As..."
-msgstr "Iš_saugoti kaip..."
-
-#: ../calendar/gui/e-cal-popup.c:271 ../mail/em-popup.c:554
-#: ../mail/em-popup.c:565
-msgid "Set as _Background"
-msgstr "Nustatyti kaip _foną"
-
-#: ../calendar/gui/e-cal-popup.c:272
-#, fuzzy
-msgid "_Save Selected"
-msgstr "_Išsaugoti pažymėtą"
-
-#: ../calendar/gui/e-cal-popup.c:394 ../mail/em-popup.c:774
-#, c-format
-msgid "Open in %s..."
-msgstr "Atverti su %s..."
-
-#: ../calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:402
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:407
+#: ../calendar/gui/e-calendar-table.c:403
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:404
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:405
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:406
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:407
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:518
+#: ../calendar/gui/e-calendar-table.c:514
 msgid "Task Table"
 msgstr "Užduočių lentelė"
 
-#: ../calendar/gui/e-calendar-table.c:696
-#: ../calendar/gui/e-calendar-view.c:671 ../calendar/gui/e-memo-table.c:426
+#: ../calendar/gui/e-calendar-table.c:692
+#: ../calendar/gui/e-calendar-view.c:671
 msgid "Deleting selected objects"
 msgstr "Trinami pasirinkti objektai"
 
-#: ../calendar/gui/e-calendar-table.c:875
-#: ../calendar/gui/e-calendar-view.c:799 ../calendar/gui/e-memo-table.c:603
+#: ../calendar/gui/e-calendar-table.c:871
+#: ../calendar/gui/e-calendar-view.c:799
 msgid "Updating objects"
 msgstr "Atnaujinami objektai"
 
-#: ../calendar/gui/e-calendar-table.c:1025
-#: ../calendar/gui/e-calendar-view.c:1126 ../calendar/gui/e-memo-table.c:735
-#: ../composer/e-msg-composer.c:1341
+#: ../calendar/gui/e-calendar-table.c:1021
+#: ../calendar/gui/e-calendar-view.c:1122 ../composer/e-msg-composer.c:1243
 msgid "Save as..."
 msgstr "Išsaugoti kaip..."
 
-#: ../calendar/gui/e-calendar-table.c:1168 ../calendar/gui/e-memo-table.c:846
+#: ../calendar/gui/e-calendar-table.c:1164
 msgid "Open _Web Page"
 msgstr "Atverti Tinklapį"
 
-#: ../calendar/gui/e-calendar-table.c:1170
-#: ../calendar/gui/e-calendar-view.c:1530
-#: ../calendar/gui/e-calendar-view.c:1551 ../calendar/gui/e-memo-table.c:848
-#: ../mail/em-folder-view.c:1046
+#: ../calendar/gui/e-calendar-table.c:1165
+#: ../calendar/gui/e-calendar-view.c:1546 ../mail/em-folder-view.c:1045
+#: ../mail/em-popup.c:541 ../mail/em-popup.c:552
+msgid "_Save As..."
+msgstr "Iš_saugoti kaip..."
+
+#: ../calendar/gui/e-calendar-table.c:1166
+#: ../calendar/gui/e-calendar-view.c:1526
+#: ../calendar/gui/e-calendar-view.c:1547 ../mail/em-folder-view.c:1046
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:120 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:120 ../ui/evolution-tasks.xml.h:27
 msgid "_Print..."
 msgstr "S_pausdinti..."
 
-#: ../calendar/gui/e-calendar-table.c:1174
-#: ../calendar/gui/e-calendar-view.c:1555 ../calendar/gui/e-memo-table.c:852
-#: ../ui/evolution-addressbook.xml.h:1 ../ui/evolution-calendar.xml.h:1
-#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-table.c:1170
+#: ../calendar/gui/e-calendar-view.c:1551 ../ui/evolution-addressbook.xml.h:1
+#: ../ui/evolution-calendar.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Iškirpti"
 
-#: ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:1533
-#: ../calendar/gui/e-calendar-view.c:1557 ../calendar/gui/e-memo-table.c:854
-#: ../ui/evolution-addressbook.xml.h:39 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-composer-entries.xml.h:9 ../ui/evolution-memos.xml.h:19
-#: ../ui/evolution-tasks.xml.h:28
+#: ../calendar/gui/e-calendar-table.c:1172
+#: ../calendar/gui/e-calendar-view.c:1529
+#: ../calendar/gui/e-calendar-view.c:1553 ../ui/evolution-addressbook.xml.h:38
+#: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
+#: ../ui/evolution-tasks.xml.h:26
 msgid "_Paste"
 msgstr "Į_dėti"
 
-#: ../calendar/gui/e-calendar-table.c:1180 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1176 ../ui/evolution-tasks.xml.h:20
 msgid "_Assign Task"
 msgstr "_Priskirti užduotį"
 
-#: ../calendar/gui/e-calendar-table.c:1181 ../calendar/gui/e-memo-table.c:858
-#: ../ui/evolution-tasks.xml.h:26
+#: ../calendar/gui/e-calendar-table.c:1177 ../ui/evolution-tasks.xml.h:24
 msgid "_Forward as iCalendar"
 msgstr "_Persiųsti kaip iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-table.c:1178
 msgid "_Mark as Complete"
 msgstr "_Pažymėti užbaigta"
 
-#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-table.c:1179
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Pažymėti Pasirinktas Užduotis kaip Užbaigtas"
 
-#: ../calendar/gui/e-calendar-table.c:1188
+#. FIXME: need to disable for undeletable folders
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1565 ../mail/em-folder-tree.c:2048
+#: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:33
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
+#: ../ui/evolution-tasks.xml.h:22
+msgid "_Delete"
+msgstr "_Ištrinti"
+
+#: ../calendar/gui/e-calendar-table.c:1184
 msgid "_Delete Selected Tasks"
 msgstr "_Ištrinti pažymėtas užduotis"
 
-#: ../calendar/gui/e-calendar-table.c:1421
+#: ../calendar/gui/e-calendar-table.c:1335
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Norėdami pridėti užduotį, spauskite čia"
@@ -7023,78 +6815,73 @@ msgstr "Pradžios data"
 msgid "Task sort"
 msgstr "Užduočių rikiavimas"
 
-#: ../calendar/gui/e-calendar-view.c:1252
+#: ../calendar/gui/e-calendar-view.c:1248
 msgid "Moving items"
 msgstr "Perkeliami elementai"
 
-#: ../calendar/gui/e-calendar-view.c:1254
+#: ../calendar/gui/e-calendar-view.c:1250
 msgid "Copying items"
 msgstr "Kopijuojami elementai"
 
-#: ../calendar/gui/e-calendar-view.c:1524
+#: ../calendar/gui/e-calendar-view.c:1520
 msgid "New _Appointment..."
 msgstr "Naujas į_vykis..."
 
-#: ../calendar/gui/e-calendar-view.c:1525
+#: ../calendar/gui/e-calendar-view.c:1521
 msgid "New All Day _Event"
 msgstr "Naujas visos _dienos įvykis"
 
-#: ../calendar/gui/e-calendar-view.c:1526
-msgid "New _Meeting"
-msgstr "Naujas _susitikimas"
-
-#: ../calendar/gui/e-calendar-view.c:1527
-msgid "New _Task"
-msgstr "Nauja _užduotis"
+#: ../calendar/gui/e-calendar-view.c:1523
+msgid "New Task"
+msgstr "Nauja užduotis"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1537
-#: ../widgets/menus/gal-view-menus.c:291
-msgid "_Current View"
-msgstr "_Esamas vaizdas"
+#: ../calendar/gui/e-calendar-view.c:1533
+msgid "Current View"
+msgstr "Esamas vaizdas"
 
-#: ../calendar/gui/e-calendar-view.c:1539
-msgid "Select T_oday"
-msgstr "Pažymėti šian_dieną"
+#: ../calendar/gui/e-calendar-view.c:1535 ../ui/evolution-calendar.xml.h:26
+msgid "Select _Today"
+msgstr "Pažymė_ti šiandieną"
 
-#: ../calendar/gui/e-calendar-view.c:1540
+#: ../calendar/gui/e-calendar-view.c:1536
 msgid "_Select Date..."
 msgstr "Pa_sirinkite datą..."
 
 #. TODO: Why is this in a context menu when it applies globally?
-#: ../calendar/gui/e-calendar-view.c:1545 ../ui/evolution-calendar.xml.h:45
+#: ../calendar/gui/e-calendar-view.c:1541 ../ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Skelbti laisvas/užimtas informaciją"
 
-#: ../calendar/gui/e-calendar-view.c:1561
+#: ../calendar/gui/e-calendar-view.c:1557
 msgid "Cop_y to Calendar..."
 msgstr "Kopi_juoti į kalendorių..."
 
-#: ../calendar/gui/e-calendar-view.c:1562
+#: ../calendar/gui/e-calendar-view.c:1558
 msgid "Mo_ve to Calendar..."
 msgstr "Per_kelti į kalendorių..."
 
-#: ../calendar/gui/e-calendar-view.c:1563
+#: ../calendar/gui/e-calendar-view.c:1559
 msgid "_Delegate Meeting..."
 msgstr "_Paskirti susitikimą..."
 
-#: ../calendar/gui/e-calendar-view.c:1564
+#: ../calendar/gui/e-calendar-view.c:1560
 msgid "_Schedule Meeting..."
 msgstr "_Suplanuoti susitikimą..."
 
-#: ../calendar/gui/e-calendar-view.c:1565
+#: ../calendar/gui/e-calendar-view.c:1561
 msgid "_Forward as iCalendar..."
 msgstr "_Persiųsti kaip iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1570
+#: ../calendar/gui/e-calendar-view.c:1566
 msgid "Make this Occurrence _Movable"
 msgstr "Padaryti šį pasitaikymą perkelia_mu"
 
-#: ../calendar/gui/e-calendar-view.c:1571
+#: ../calendar/gui/e-calendar-view.c:1567
 msgid "Delete this _Occurrence"
 msgstr "Ištrinti šį _pasitaikymą"
 
-#: ../calendar/gui/e-calendar-view.c:1572
+#: ../calendar/gui/e-calendar-view.c:1568
 msgid "Delete _All Occurrences"
 msgstr "Ištrinti _visus pasitaikymus"
 
@@ -7141,7 +6928,7 @@ msgstr "%02i minučių padalos"
 #. order but don't change the specifiers or add
 #. anything.
 #: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1493
-#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1526
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1517
 msgid "%A %d %B"
 msgstr "%A, %B %e"
 
@@ -7157,11 +6944,11 @@ msgstr " "
 msgid "pm"
 msgstr " "
 
-#: ../calendar/gui/e-itip-control.c:760
+#: ../calendar/gui/e-itip-control.c:763
 msgid "Yes. (Complex Recurrence)"
 msgstr "Taip. (Sudėtingas pasikartojimas)"
 
-#: ../calendar/gui/e-itip-control.c:771
+#: ../calendar/gui/e-itip-control.c:774
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -7169,7 +6956,7 @@ msgstr[0] "Kasdien"
 msgstr[1] "Kas %d dienas"
 msgstr[2] "Kas %d dienų"
 
-#: ../calendar/gui/e-itip-control.c:776
+#: ../calendar/gui/e-itip-control.c:779
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
@@ -7177,7 +6964,7 @@ msgstr[0] "Kiekvieną savaitę"
 msgstr[1] "Kas %d savaites"
 msgstr[2] "Kas %d savaičių"
 
-#: ../calendar/gui/e-itip-control.c:778
+#: ../calendar/gui/e-itip-control.c:781
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7185,21 +6972,21 @@ msgstr[0] "Kiekvienos savaitės dieną"
 msgstr[1] "Kiekvienos %d savaitės dieną"
 msgstr[2] "Kiekvienos %d savaitės dieną"
 
-#: ../calendar/gui/e-itip-control.c:786
+#: ../calendar/gui/e-itip-control.c:789
 msgid " and "
 msgstr " ir "
 
-#: ../calendar/gui/e-itip-control.c:793
+#: ../calendar/gui/e-itip-control.c:796
 #, c-format
 msgid "The %s day of "
 msgstr "%s dieną iš  "
 
-#: ../calendar/gui/e-itip-control.c:806
+#: ../calendar/gui/e-itip-control.c:809
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s iš "
 
-#: ../calendar/gui/e-itip-control.c:813
+#: ../calendar/gui/e-itip-control.c:816
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -7207,7 +6994,7 @@ msgstr[0] "kiekvieną mėnesį"
 msgstr[1] "kas %d mėnesius"
 msgstr[2] "kas %d mėnesių"
 
-#: ../calendar/gui/e-itip-control.c:817
+#: ../calendar/gui/e-itip-control.c:820
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
@@ -7215,7 +7002,7 @@ msgstr[0] "Kasmet"
 msgstr[1] "Kas %d matus"
 msgstr[2] "Kas %d metų"
 
-#: ../calendar/gui/e-itip-control.c:828
+#: ../calendar/gui/e-itip-control.c:831
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7223,34 +7010,34 @@ msgstr[0] " iš viso %d kartą"
 msgstr[1] " iš viso %d kartus"
 msgstr[2] " iš viso %d kartų"
 
-#: ../calendar/gui/e-itip-control.c:837
+#: ../calendar/gui/e-itip-control.c:840
 msgid ", ending on "
 msgstr ", pabaigiant "
 
-#: ../calendar/gui/e-itip-control.c:861
+#: ../calendar/gui/e-itip-control.c:864
 msgid "Starts"
 msgstr "Prasideda"
 
-#: ../calendar/gui/e-itip-control.c:874
+#: ../calendar/gui/e-itip-control.c:877
 msgid "Ends"
 msgstr "Baigiasi"
 
-#: ../calendar/gui/e-itip-control.c:908
+#: ../calendar/gui/e-itip-control.c:911
 #: ../plugins/save-calendar/csv-format.c:395
 msgid "Due"
 msgstr "Iki"
 
-#: ../calendar/gui/e-itip-control.c:948 ../calendar/gui/e-itip-control.c:1005
+#: ../calendar/gui/e-itip-control.c:951 ../calendar/gui/e-itip-control.c:1008
 msgid "iCalendar Information"
 msgstr "iCalendar informacija"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:965
+#: ../calendar/gui/e-itip-control.c:968
 msgid "iCalendar Error"
 msgstr "iCalendar klaida"
 
-#: ../calendar/gui/e-itip-control.c:1037 ../calendar/gui/e-itip-control.c:1053
-#: ../calendar/gui/e-itip-control.c:1064 ../calendar/gui/e-itip-control.c:1081
+#: ../calendar/gui/e-itip-control.c:1040 ../calendar/gui/e-itip-control.c:1056
+#: ../calendar/gui/e-itip-control.c:1067 ../calendar/gui/e-itip-control.c:1084
 #: ../plugins/itip-formatter/itip-view.c:338
 #: ../plugins/itip-formatter/itip-view.c:339
 #: ../plugins/itip-formatter/itip-view.c:406
@@ -7259,7 +7046,7 @@ msgid "An unknown person"
 msgstr "Nežinomas asmuo"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1088
+#: ../calendar/gui/e-itip-control.c:1091
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7267,297 +7054,297 @@ msgstr ""
 "<br> Peržiūrėkite žemiau esančią informaciją ir tada pasirinkite reikiamą "
 "apatinio meniu punktą."
 
-#: ../calendar/gui/e-itip-control.c:1136
+#: ../calendar/gui/e-itip-control.c:1139
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:546
+#: ../calendar/gui/itip-utils.c:548
 #: ../plugins/itip-formatter/itip-formatter.c:1640
 msgid "Accepted"
 msgstr "Priimtas"
 
-#: ../calendar/gui/e-itip-control.c:1140 ../calendar/gui/itip-utils.c:549
+#: ../calendar/gui/e-itip-control.c:1143 ../calendar/gui/itip-utils.c:551
 #: ../plugins/itip-formatter/itip-formatter.c:1643
 msgid "Tentatively Accepted"
 msgstr "Negalutinis sutikimas"
 
-#: ../calendar/gui/e-itip-control.c:1144
+#: ../calendar/gui/e-itip-control.c:1147
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/itip-utils.c:552 ../calendar/gui/itip-utils.c:581
+#: ../calendar/gui/itip-utils.c:554 ../calendar/gui/itip-utils.c:583
 #: ../plugins/itip-formatter/itip-formatter.c:1646
 msgid "Declined"
 msgstr "Atmestas"
 
-#: ../calendar/gui/e-itip-control.c:1228
+#: ../calendar/gui/e-itip-control.c:1231
 msgid ""
 "The meeting has been cancelled, however it could not be found in your "
 "calendars"
 msgstr "Šis susitikimas buvo atšauktas, tačiau jo Jūsų kalendoriuose nėra"
 
-#: ../calendar/gui/e-itip-control.c:1230
+#: ../calendar/gui/e-itip-control.c:1233
 msgid ""
 "The task has been cancelled, however it could not be found in your task lists"
 msgstr "Ši užduotis buvo atšaukta, tačiau jos Jūsų kalendoriuose nėra"
 
-#: ../calendar/gui/e-itip-control.c:1309
+#: ../calendar/gui/e-itip-control.c:1312
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> paskelbė susitikimo informaciją."
 
-#: ../calendar/gui/e-itip-control.c:1310
+#: ../calendar/gui/e-itip-control.c:1313
 msgid "Meeting Information"
 msgstr "Susitikimo informacija"
 
-#: ../calendar/gui/e-itip-control.c:1316
+#: ../calendar/gui/e-itip-control.c:1319
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> norėtų, kad %s dalyvautų susitikime."
 
-#: ../calendar/gui/e-itip-control.c:1318
+#: ../calendar/gui/e-itip-control.c:1321
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> norėtų, kad Jūs dalyvautumėte susitikime."
 
-#: ../calendar/gui/e-itip-control.c:1319
+#: ../calendar/gui/e-itip-control.c:1322
 msgid "Meeting Proposal"
 msgstr "Susitikimo pasiūlymas"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1325
+#: ../calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> nori papildyti esamą susitikimą."
 
-#: ../calendar/gui/e-itip-control.c:1326
+#: ../calendar/gui/e-itip-control.c:1329
 msgid "Meeting Update"
 msgstr "Susitikimo atnaujinimas"
 
-#: ../calendar/gui/e-itip-control.c:1330
+#: ../calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> norėtų gauti paskutinę informaciją apie susitikimą."
 
-#: ../calendar/gui/e-itip-control.c:1331
+#: ../calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update Request"
 msgstr "Prašymas pakeisti susitikimo informaciją"
 
-#: ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-itip-control.c:1341
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> atsakė į susitikimo užklausą."
 
-#: ../calendar/gui/e-itip-control.c:1339
+#: ../calendar/gui/e-itip-control.c:1342
 msgid "Meeting Reply"
 msgstr "Susitikimo atsakas"
 
-#: ../calendar/gui/e-itip-control.c:1346
+#: ../calendar/gui/e-itip-control.c:1349
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> atšaukė susitikimą."
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1350
 msgid "Meeting Cancellation"
 msgstr "Susitikimo atšaukimas"
 
-#: ../calendar/gui/e-itip-control.c:1357 ../calendar/gui/e-itip-control.c:1434
-#: ../calendar/gui/e-itip-control.c:1474
+#: ../calendar/gui/e-itip-control.c:1360 ../calendar/gui/e-itip-control.c:1437
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> atsiuntė nesuprantamą atsakymą į užklausimą."
 
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1361
 msgid "Bad Meeting Message"
 msgstr "Blogas susitikimo pranešimas"
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1388
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> paskelbė užduoties informaciją."
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1389
 msgid "Task Information"
 msgstr "Užduoties informacija"
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1396
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> prašo %s atlikti šią užduotį."
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1398
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> prašo Jus atlikti užduotį."
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1399
 msgid "Task Proposal"
 msgstr "Užduoties pasiūlymas"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1402
+#: ../calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> nori papildyti esamą užduotį."
 
-#: ../calendar/gui/e-itip-control.c:1403
+#: ../calendar/gui/e-itip-control.c:1406
 msgid "Task Update"
 msgstr "Užduoties atnaujinimas"
 
-#: ../calendar/gui/e-itip-control.c:1407
+#: ../calendar/gui/e-itip-control.c:1410
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> nori gauti paskutinę užduoties informaciją."
 
-#: ../calendar/gui/e-itip-control.c:1408
+#: ../calendar/gui/e-itip-control.c:1411
 msgid "Task Update Request"
 msgstr "Užduoties atnaujinimo užklausa"
 
-#: ../calendar/gui/e-itip-control.c:1415
+#: ../calendar/gui/e-itip-control.c:1418
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> atsakė į užduoties priskyrimą."
 
-#: ../calendar/gui/e-itip-control.c:1416
+#: ../calendar/gui/e-itip-control.c:1419
 msgid "Task Reply"
 msgstr "Užduoties atsakas"
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1426
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> atšaukė užduotį."
 
-#: ../calendar/gui/e-itip-control.c:1424
+#: ../calendar/gui/e-itip-control.c:1427
 msgid "Task Cancellation"
 msgstr "Užduoties atšaukimas"
 
-#: ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1438
 msgid "Bad Task Message"
 msgstr "Blogas užduoties pranešimas"
 
-#: ../calendar/gui/e-itip-control.c:1459
+#: ../calendar/gui/e-itip-control.c:1462
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> paskelbė laisvas/užimtas informaciją."
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Free/Busy Information"
 msgstr "Laisvas/užimtas informacija"
 
-#: ../calendar/gui/e-itip-control.c:1464
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> paprašė Jūsų pateikti laisvas/užimtas informaciją."
 
-#: ../calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Free/Busy Request"
 msgstr "Informacijos „laisvas/užimtas“ prašymas"
 
-#: ../calendar/gui/e-itip-control.c:1469
+#: ../calendar/gui/e-itip-control.c:1472
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> atsakė į laisvas/užimtas prašymą."
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1473
 msgid "Free/Busy Reply"
 msgstr "Laisvas/užimtas atsakas"
 
-#: ../calendar/gui/e-itip-control.c:1475
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Bad Free/Busy Message"
 msgstr "Blogas informacijos „laisvas/užimtas“ pranešimas"
 
-#: ../calendar/gui/e-itip-control.c:1550
+#: ../calendar/gui/e-itip-control.c:1553
 msgid "The message does not appear to be properly formed"
 msgstr "Pranešimas nėra teisingai suformuotas"
 
-#: ../calendar/gui/e-itip-control.c:1609
+#: ../calendar/gui/e-itip-control.c:1612
 msgid "The message contains only unsupported requests."
 msgstr "Pranešime yra išvardinti tik nepalaikomi prašymai."
 
-#: ../calendar/gui/e-itip-control.c:1642
+#: ../calendar/gui/e-itip-control.c:1645
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Priede nėra tvarkingo kalendoriaus pranešimo"
 
-#: ../calendar/gui/e-itip-control.c:1674
+#: ../calendar/gui/e-itip-control.c:1677
 msgid "The attachment has no viewable calendar items"
 msgstr "Priede nėra peržiūrimų kalendoriaus elementų"
 
-#: ../calendar/gui/e-itip-control.c:1908
+#: ../calendar/gui/e-itip-control.c:1911
 msgid "Update complete\n"
 msgstr "Atnaujinimas užbaigtas\n"
 
-#: ../calendar/gui/e-itip-control.c:1936
+#: ../calendar/gui/e-itip-control.c:1939
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektas yra nepriimtinas ir negali būti atnaujintas\n"
 
-#: ../calendar/gui/e-itip-control.c:1946
+#: ../calendar/gui/e-itip-control.c:1949
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Šis atsakymas yra ne nuo esamo dalyvio. Ar įtraukti siuntėją į dalyvių "
 "sąrašą?"
 
-#: ../calendar/gui/e-itip-control.c:1958
+#: ../calendar/gui/e-itip-control.c:1961
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Dalyvio statusas negali būti atnaujintas, nes nurodytas neteisingas "
 "statusas!\n"
 
-#: ../calendar/gui/e-itip-control.c:1975
+#: ../calendar/gui/e-itip-control.c:1978
 msgid "Attendee status updated\n"
 msgstr "Dalyvio būsena atnaujinta\n"
 
-#: ../calendar/gui/e-itip-control.c:1978
+#: ../calendar/gui/e-itip-control.c:1981
 #: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Dalyvio statusas negali būti atnaujintas, nes pasirinktas elementas "
 "nebeegzistuoja"
 
-#: ../calendar/gui/e-itip-control.c:2008
+#: ../calendar/gui/e-itip-control.c:2011
 msgid "Removal Complete"
 msgstr "Pašalinimas užbaigtas"
 
-#: ../calendar/gui/e-itip-control.c:2031 ../calendar/gui/e-itip-control.c:2079
+#: ../calendar/gui/e-itip-control.c:2034 ../calendar/gui/e-itip-control.c:2082
 msgid "Item sent!\n"
 msgstr "Elementas išsiųstas!\n"
 
-#: ../calendar/gui/e-itip-control.c:2033 ../calendar/gui/e-itip-control.c:2083
+#: ../calendar/gui/e-itip-control.c:2036 ../calendar/gui/e-itip-control.c:2086
 msgid "The item could not be sent!\n"
 msgstr "Elementas negalėjo būti išsiųstas!\n"
 
-#: ../calendar/gui/e-itip-control.c:2163
+#: ../calendar/gui/e-itip-control.c:2166
 msgid "Choose an action:"
 msgstr "Pasirinkti veiksmą:"
 
-#: ../calendar/gui/e-itip-control.c:2234
+#: ../calendar/gui/e-itip-control.c:2237
 msgid "Update"
 msgstr "Atnaujinti"
 
-#: ../calendar/gui/e-itip-control.c:2262
+#: ../calendar/gui/e-itip-control.c:2265
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Priimti"
 
-#: ../calendar/gui/e-itip-control.c:2263
+#: ../calendar/gui/e-itip-control.c:2266
 msgid "Tentatively accept"
 msgstr "Sutikti, bet negarantuoti"
 
-#: ../calendar/gui/e-itip-control.c:2264
+#: ../calendar/gui/e-itip-control.c:2267
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr " Atmesti "
 
-#: ../calendar/gui/e-itip-control.c:2293
+#: ../calendar/gui/e-itip-control.c:2296
 msgid "Send Free/Busy Information"
 msgstr "Siųsti Laisvas/Užimtas Informaciją"
 
-#: ../calendar/gui/e-itip-control.c:2321
+#: ../calendar/gui/e-itip-control.c:2324
 msgid "Update respondent status"
 msgstr "Atnaujinti gavėjų statusą"
 
-#: ../calendar/gui/e-itip-control.c:2349
+#: ../calendar/gui/e-itip-control.c:2352
 msgid "Send Latest Information"
 msgstr "Nusiųsti Paskutinę Informaciją"
 
-#: ../calendar/gui/e-itip-control.c:2377 ../calendar/gui/itip-utils.c:569
+#: ../calendar/gui/e-itip-control.c:2380 ../calendar/gui/itip-utils.c:571
 #: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
@@ -7669,22 +7456,17 @@ msgstr "Reikalauja veiksmo"
 
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Tentative"
 msgstr "Negalutinis"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
 #: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/itip-utils.c:555
+#: ../calendar/gui/itip-utils.c:557
 #: ../plugins/itip-formatter/itip-formatter.c:1649
 msgid "Delegated"
 msgstr "Pavestas"
 
-#. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:361
-msgid "Attendee                          "
-msgstr "Dalyvis"
-
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
 msgid "In Process"
 msgstr "Vykdomas"
@@ -7692,7 +7474,7 @@ msgstr "Vykdomas"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:444
-#: ../calendar/gui/e-meeting-time-sel.c:2105
+#: ../calendar/gui/e-meeting-time-sel.c:2102
 msgid "%A, %B %d, %Y"
 msgstr "%A, %Y m. %B %e"
 
@@ -7703,7 +7485,7 @@ msgstr "%A, %Y m. %B %e"
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
 #: ../calendar/gui/e-meeting-time-sel-item.c:448
-#: ../calendar/gui/e-meeting-time-sel.c:2138 ../e-util/e-time-utils.c:203
+#: ../calendar/gui/e-meeting-time-sel.c:2135 ../e-util/e-time-utils.c:203
 #: ../e-util/e-time-utils.c:296 ../e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y"
 msgstr "%a %Y-%m-%d"
@@ -7719,80 +7501,64 @@ msgstr "%a %Y-%m-%d"
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:416 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Nesu darbe"
 
-#: ../calendar/gui/e-meeting-time-sel.c:417
+#: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "No Information"
 msgstr "Nėra informacijos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:431
-msgid "Con_tacts..."
-msgstr "Kon_taktai..."
-
-#: ../calendar/gui/e-meeting-time-sel.c:448
+#: ../calendar/gui/e-meeting-time-sel.c:445
 msgid "O_ptions"
 msgstr "N_ustatymai"
 
-#: ../calendar/gui/e-meeting-time-sel.c:465
+#: ../calendar/gui/e-meeting-time-sel.c:462
 msgid "Show _only working hours"
 msgstr "Rodyti tik _darbo valandas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:475
+#: ../calendar/gui/e-meeting-time-sel.c:472
 msgid "Show _zoomed out"
 msgstr "Rodyti _atitrauktą"
 
-#: ../calendar/gui/e-meeting-time-sel.c:490
+#: ../calendar/gui/e-meeting-time-sel.c:487
 msgid "_Update free/busy"
 msgstr "_Atnaujinti laisvas/užimtas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:505
+#: ../calendar/gui/e-meeting-time-sel.c:502
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:523
+#: ../calendar/gui/e-meeting-time-sel.c:520
 msgid "_Autopick"
 msgstr "_Automatiškai parinkti"
 
-#: ../calendar/gui/e-meeting-time-sel.c:538
+#: ../calendar/gui/e-meeting-time-sel.c:535
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:555
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "_All people and resources"
 msgstr "_Visi žmonės ir resursai"
 
-#: ../calendar/gui/e-meeting-time-sel.c:564
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "All _people and one resource"
 msgstr "Visi ž_monės ir vienas resursas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:573
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "_Required people"
 msgstr "_Būtini žmonės"
 
-#: ../calendar/gui/e-meeting-time-sel.c:582
+#: ../calendar/gui/e-meeting-time-sel.c:579
 msgid "Required people and _one resource"
 msgstr "Būtini žmonės ir _vienas resursas"
 
-#: ../calendar/gui/e-memo-table.c:267
-msgid "Memo Table"
-msgstr "Užrašų lentelė"
-
-#: ../calendar/gui/e-memo-table.c:863
-msgid "_Delete Selected Memos"
-msgstr "_Ištrinti pažymėtus užrašus"
-
-#: ../calendar/gui/e-memo-table.c:986 ../calendar/gui/e-memo-table.etspec.h:2
-msgid "Click to add a memo"
-msgstr "Spragtelėkite norėdami pridėti užrašą"
-
-#: ../calendar/gui/e-memo-table.etspec.h:3
-msgid "Memo sort"
-msgstr "Užrašų rūšiavimas"
+#: ../calendar/gui/e-pub-utils.c:300
+#, c-format
+msgid "Enter the password for %s"
+msgstr "Įveskite „%s“ slaptažodį"
 
-#: ../calendar/gui/e-memos.c:727 ../calendar/gui/e-tasks.c:822
-#: ../calendar/gui/gnome-cal.c:2556
+#: ../calendar/gui/e-tasks.c:798 ../calendar/gui/gnome-cal.c:2532
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7801,38 +7567,24 @@ msgstr ""
 "%s klaida:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:775
-msgid "Loading memos"
-msgstr "Įkeliami užrašai"
-
-#: ../calendar/gui/e-memos.c:860
-#, c-format
-msgid "Opening memos at %s"
-msgstr "Atveriami %s užrašai"
-
-#: ../calendar/gui/e-memos.c:1033 ../calendar/gui/e-tasks.c:1225
-msgid "Deleting selected objects..."
-msgstr "Trinami pasirinkti objektai..."
-
-#: ../calendar/gui/e-pub-utils.c:311
-#, c-format
-msgid "Enter the password for %s"
-msgstr "Įveskite „%s“ slaptažodį"
-
-#: ../calendar/gui/e-tasks.c:870
+#: ../calendar/gui/e-tasks.c:846
 msgid "Loading tasks"
 msgstr "Įkeliamos užduotys"
 
-#: ../calendar/gui/e-tasks.c:957
+#: ../calendar/gui/e-tasks.c:930
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Atidaromos užduotys %s"
 
-#: ../calendar/gui/e-tasks.c:1202
+#: ../calendar/gui/e-tasks.c:1129
 msgid "Completing tasks..."
 msgstr "Užbaigiamos užduotys..."
 
-#: ../calendar/gui/e-tasks.c:1252
+#: ../calendar/gui/e-tasks.c:1152
+msgid "Deleting selected objects..."
+msgstr "Trinami pasirinkti objektai..."
+
+#: ../calendar/gui/e-tasks.c:1179
 msgid "Expunging"
 msgstr "Išvaloma"
 
@@ -7843,42 +7595,45 @@ msgstr "Laiko juostos mygtukas"
 #. 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:329 ../calendar/gui/print.c:1510
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1501
 msgid "%d %B"
 msgstr "%B %d"
 
-#: ../calendar/gui/gnome-cal.c:791
+#: ../calendar/gui/gnome-cal.c:789
 msgid "Updating query"
 msgstr "Atnaujinama užklausa"
 
-#: ../calendar/gui/gnome-cal.c:2231
-msgid "_Custom View"
-msgstr "_Kitoks vaizdas"
+#. bonobo displays this string so it must be in locale
+#: ../calendar/gui/gnome-cal.c:2209 ../widgets/menus/gal-view-instance.c:585
+#: ../widgets/menus/gal-view-menus.c:350
+msgid "Custom View"
+msgstr "Naudotojo pritaikytas vaizdas"
 
-#: ../calendar/gui/gnome-cal.c:2232
-msgid "_Save Custom View"
-msgstr "Iš_saugoti kitokį vaizdą"
+#: ../calendar/gui/gnome-cal.c:2210 ../widgets/menus/gal-view-instance.c:586
+msgid "Save Custom View"
+msgstr "Išsaugoti naudotojo pritaikytą vaizdą"
 
-#: ../calendar/gui/gnome-cal.c:2237
-msgid "_Define Views..."
-msgstr "_Nurodyti vaizdus..."
+#: ../calendar/gui/gnome-cal.c:2215 ../widgets/menus/gal-view-instance.c:590
+#: ../widgets/menus/gal-view-menus.c:372
+msgid "Define Views..."
+msgstr "Nurodyti vaizdus..."
 
-#: ../calendar/gui/gnome-cal.c:2399
+#: ../calendar/gui/gnome-cal.c:2378
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Įkeliami %s paskyrimai"
 
-#: ../calendar/gui/gnome-cal.c:2418
+#: ../calendar/gui/gnome-cal.c:2397
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Įkeliamos %s užduotys"
 
-#: ../calendar/gui/gnome-cal.c:2522
+#: ../calendar/gui/gnome-cal.c:2498
 #, c-format
 msgid "Opening %s"
 msgstr "Atidaroma %s"
 
-#: ../calendar/gui/gnome-cal.c:3440
+#: ../calendar/gui/gnome-cal.c:3389
 msgid "Purging"
 msgstr "Išvaloma"
 
@@ -7938,123 +7693,60 @@ msgstr "Rugsėjis"
 msgid "_Select Today"
 msgstr "Pa_sirinkti šiandieną"
 
-#: ../calendar/gui/itip-utils.c:351 ../calendar/gui/itip-utils.c:400
-#: ../calendar/gui/itip-utils.c:440
+#: ../calendar/gui/itip-utils.c:353 ../calendar/gui/itip-utils.c:402
+#: ../calendar/gui/itip-utils.c:442
 msgid "An organizer must be set."
 msgstr "Turi būti nurodytas organizatorius."
 
-#: ../calendar/gui/itip-utils.c:387
+#: ../calendar/gui/itip-utils.c:389
 msgid "At least one attendee is necessary"
 msgstr "Reikalingas bent vienas dalyvis"
 
-#: ../calendar/gui/itip-utils.c:508 ../calendar/gui/itip-utils.c:630
+#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:632
 msgid "Event information"
 msgstr "Įvykio informacija"
 
-#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:632
+#: ../calendar/gui/itip-utils.c:512 ../calendar/gui/itip-utils.c:634
 msgid "Task information"
 msgstr "Užduoties informacija"
 
-#: ../calendar/gui/itip-utils.c:512 ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:514 ../calendar/gui/itip-utils.c:636
 msgid "Journal information"
 msgstr "Žurnalo informacija"
 
-#: ../calendar/gui/itip-utils.c:514 ../calendar/gui/itip-utils.c:652
+#: ../calendar/gui/itip-utils.c:516 ../calendar/gui/itip-utils.c:654
 msgid "Free/Busy information"
 msgstr "Laisvas/užsiėmęs informacija"
 
-#: ../calendar/gui/itip-utils.c:516
+#: ../calendar/gui/itip-utils.c:518
 msgid "Calendar information"
 msgstr "Kalendoriaus informacija"
 
-#: ../calendar/gui/itip-utils.c:565
+#: ../calendar/gui/itip-utils.c:567
 msgid "Updated"
 msgstr "Atnaujinta"
 
-#: ../calendar/gui/itip-utils.c:573
+#: ../calendar/gui/itip-utils.c:575
 msgid "Refresh"
 msgstr "Atnaujinti"
 
-#: ../calendar/gui/itip-utils.c:577
+#: ../calendar/gui/itip-utils.c:579
 msgid "Counter-proposal"
 msgstr "Priešpasiūlymas"
 
-#: ../calendar/gui/itip-utils.c:648
+#: ../calendar/gui/itip-utils.c:650
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Laisvas/užsiėmęs informacija (nuo %s iki %s)"
 
-#: ../calendar/gui/itip-utils.c:658
+#: ../calendar/gui/itip-utils.c:660
 msgid "iCalendar information"
 msgstr "iCalendar informacija"
 
-#: ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:815
 msgid "You must be an attendee of the event."
 msgstr "Jūs turite būti įvykio dalyvis."
 
-#: ../calendar/gui/memos-component.c:524
-#, c-format
-msgid "%d memo"
-msgid_plural "%d memos"
-msgstr[0] "%d užrašas"
-msgstr[1] "%d užrašai"
-msgstr[2] "%d užrašų"
-
-#: ../calendar/gui/memos-component.c:526 ../calendar/gui/tasks-component.c:517
-#: ../mail/mail-component.c:548
-#, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] ", pasirinkta %d"
-msgstr[1] ", pasirinkta %d"
-msgstr[2] ", pasirinkta %d"
-
-#: ../calendar/gui/memos-component.c:573
-msgid "Failed upgrading memos."
-msgstr "Nepavyko atnaujinti užrašų."
-
-#: ../calendar/gui/memos-component.c:869
-#, c-format
-msgid "Unable to open the memo list '%s' for creating events and meetings"
-msgstr "Nepavyko atverti užrašų sąrašo „%s“ įvykių ir susitikimų kūrimui"
-
-#: ../calendar/gui/memos-component.c:882
-#, fuzzy
-msgid "There is no calendar available for creating memos"
-msgstr "Nėra kalendoriaus, kuriame galima būtų kurti užduotis"
-
-#: ../calendar/gui/memos-component.c:973
-msgid "Memo Source Selector"
-msgstr "Užrašų šaltinio parinkiklis"
-
-#: ../calendar/gui/memos-component.c:1156
-msgid "New memo"
-msgstr "Naujas užrašas"
-
-#: ../calendar/gui/memos-component.c:1157
-msgid "_Memo"
-msgstr "_Užrašas"
-
-#: ../calendar/gui/memos-component.c:1158
-msgid "Create a new memo"
-msgstr "Sukurti naują užrašą"
-
-#: ../calendar/gui/memos-component.c:1164
-msgid "New memo list"
-msgstr "Naujas užrašų sąrašas"
-
-#: ../calendar/gui/memos-component.c:1165
-msgid "Memo l_ist"
-msgstr "Už_rašų sąrašas"
-
-#: ../calendar/gui/memos-component.c:1166
-msgid "Create a new memo list"
-msgstr "Sukurti naują užrašų sąrašą"
-
-#: ../calendar/gui/memos-control.c:334
-msgid "Print Memos"
-msgstr "Spausdinti užrašus"
-
 #: ../calendar/gui/migration.c:151
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
@@ -8249,97 +7941,89 @@ msgid "Sa"
 msgstr "Št"
 
 #. Day
-#: ../calendar/gui/print.c:1926
+#: ../calendar/gui/print.c:1917
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Pasirinkta diena (%a, %Y %d %b)"
 
-#: ../calendar/gui/print.c:1951 ../calendar/gui/print.c:1955
+#: ../calendar/gui/print.c:1942 ../calendar/gui/print.c:1946
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: ../calendar/gui/print.c:1952
+#: ../calendar/gui/print.c:1943
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: ../calendar/gui/print.c:1956 ../calendar/gui/print.c:1958
-#: ../calendar/gui/print.c:1959
+#: ../calendar/gui/print.c:1947 ../calendar/gui/print.c:1949
+#: ../calendar/gui/print.c:1950
 msgid "%a %b %d %Y"
 msgstr "%a, %Y %b %d"
 
-#: ../calendar/gui/print.c:1963
+#: ../calendar/gui/print.c:1954
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Pasirinkta savaitė (%s - %s)"
 
 #. Month
-#: ../calendar/gui/print.c:1971
+#: ../calendar/gui/print.c:1962
 msgid "Selected month (%b %Y)"
 msgstr "Pasirinktas mėnuo (%Y %b)"
 
 #. Year
-#: ../calendar/gui/print.c:1978
+#: ../calendar/gui/print.c:1969
 msgid "Selected year (%Y)"
 msgstr "Pasirinkti metai (%Y)"
 
-#: ../calendar/gui/print.c:2307
-msgid "Appointment"
-msgstr "Paskyrimas"
-
-#: ../calendar/gui/print.c:2309
-msgid "Task"
-msgstr "Užduotis"
-
-#: ../calendar/gui/print.c:2331
+#: ../calendar/gui/print.c:2320
 #, c-format
 msgid "Summary: %s"
 msgstr "Apžvalga: %s"
 
-#: ../calendar/gui/print.c:2339
+#: ../calendar/gui/print.c:2328
 #, c-format
 msgid "Location: %s"
 msgstr "Vieta: %s"
 
-#: ../calendar/gui/print.c:2382
+#: ../calendar/gui/print.c:2371
 #, c-format
 msgid "Status: %s"
 msgstr "Būklė: %s"
 
-#: ../calendar/gui/print.c:2399
+#: ../calendar/gui/print.c:2388
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritetas: %s"
 
-#: ../calendar/gui/print.c:2411
+#: ../calendar/gui/print.c:2400
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Įvykdymo Procentas: %i"
 
-#: ../calendar/gui/print.c:2423
+#: ../calendar/gui/print.c:2412
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2437
+#: ../calendar/gui/print.c:2426
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorijos: %s"
 
-#: ../calendar/gui/print.c:2448
+#: ../calendar/gui/print.c:2437
 msgid "Contacts: "
 msgstr "Kontaktai: "
 
-#: ../calendar/gui/print.c:2588 ../calendar/gui/print.c:2676
-#: ../calendar/gui/print.c:2802 ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2577 ../calendar/gui/print.c:2665
+#: ../calendar/gui/print.c:2791 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Spaudinio peržiūra"
 
-#: ../calendar/gui/print.c:2623
+#: ../calendar/gui/print.c:2612
 msgid "Print Item"
 msgstr "Spausdinti elementą"
 
 #: ../calendar/gui/tasks-component.c:439
-msgid "_New Task List"
-msgstr "_Naujas užduočių sąrašas"
+msgid "New Task List"
+msgstr "Naujas užduočių sąrašas"
 
 #: ../calendar/gui/tasks-component.c:515
 #, c-format
@@ -8349,56 +8033,68 @@ msgstr[0] "%d užduotis"
 msgstr[1] "%d užduotys"
 msgstr[2] "%d užduočių"
 
+#: ../calendar/gui/tasks-component.c:517 ../mail/mail-component.c:548
+#, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] ", pasirinkta %d"
+msgstr[1] ", pasirinkta %d"
+msgstr[2] ", pasirinkta %d"
+
 #: ../calendar/gui/tasks-component.c:564
 msgid "Failed upgrading tasks."
 msgstr "Nepavyko atnaujinti užduočių."
 
-#: ../calendar/gui/tasks-component.c:875
+#: ../calendar/gui/tasks-component.c:872
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Nepavyko atverti užduočių sąrašo „%s“ įvykių ir susitikimų kūrimui"
 
-#: ../calendar/gui/tasks-component.c:888
+#: ../calendar/gui/tasks-component.c:887
 msgid "There is no calendar available for creating tasks"
 msgstr "Nėra kalendoriaus, kuriame galima būtų kurti užduotis"
 
-#: ../calendar/gui/tasks-component.c:988
+#: ../calendar/gui/tasks-component.c:987
 msgid "Task Source Selector"
 msgstr "Užduočių šaltinio parinkiklis"
 
-#: ../calendar/gui/tasks-component.c:1171
+#: ../calendar/gui/tasks-component.c:1170
 msgid "New task"
 msgstr "Nauja užduotis"
 
-#: ../calendar/gui/tasks-component.c:1173
+#: ../calendar/gui/tasks-component.c:1171
+msgid "_Task"
+msgstr "_Užduotis"
+
+#: ../calendar/gui/tasks-component.c:1172
 msgid "Create a new task"
 msgstr "Sukurti naują užduotį"
 
-#: ../calendar/gui/tasks-component.c:1179
+#: ../calendar/gui/tasks-component.c:1178
 msgid "New assigned task"
 msgstr "Nauja priskirta užduotis"
 
-#: ../calendar/gui/tasks-component.c:1180
+#: ../calendar/gui/tasks-component.c:1179
 msgid "Assigne_d Task"
 msgstr "Priskirta už_duotis"
 
-#: ../calendar/gui/tasks-component.c:1181
+#: ../calendar/gui/tasks-component.c:1180
 msgid "Create a new assigned task"
 msgstr "Sukurti naują priskirtą užduotį"
 
-#: ../calendar/gui/tasks-component.c:1187
+#: ../calendar/gui/tasks-component.c:1186
 msgid "New task list"
 msgstr "Naujas užduočių sąrašas"
 
-#: ../calendar/gui/tasks-component.c:1188
+#: ../calendar/gui/tasks-component.c:1187
 msgid "Task l_ist"
 msgstr "Užduoč_ių sąrašas"
 
-#: ../calendar/gui/tasks-component.c:1189
+#: ../calendar/gui/tasks-component.c:1188
 msgid "Create a new task list"
 msgstr "Sukurti naują užduočių sąrašą"
 
-#: ../calendar/gui/tasks-control.c:429
+#: ../calendar/gui/tasks-control.c:419
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8410,11 +8106,11 @@ msgstr ""
 "\n"
 "Tikrai ištrinti šias užduotis?"
 
-#: ../calendar/gui/tasks-control.c:432
+#: ../calendar/gui/tasks-control.c:422
 msgid "Do not ask me again."
 msgstr "Daugiau nebeklausti."
 
-#: ../calendar/gui/tasks-control.c:466
+#: ../calendar/gui/tasks-control.c:456
 msgid "Print Tasks"
 msgstr "Spausdinti užduotis"
 
@@ -10074,14 +9770,14 @@ msgstr "Skelbti į:"
 msgid "A_ttach"
 msgstr "Prise_gti"
 
-#: ../composer/e-msg-composer.c:832
+#: ../composer/e-msg-composer.c:738
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Nepavyko pasirašyti išsiunčiamo laiško: Nenustatytas šio abonento parašo "
 "sertifikatas"
 
-#: ../composer/e-msg-composer.c:839
+#: ../composer/e-msg-composer.c:745
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10089,47 +9785,47 @@ msgstr ""
 "Nepavyko užšifruoti išsiunčiamo laiško: Nenustatytas šio abonento šifravimo "
 "sertifikatas"
 
-#: ../composer/e-msg-composer.c:1322 ../composer/e-msg-composer.c:1356
+#: ../composer/e-msg-composer.c:1224 ../composer/e-msg-composer.c:1257
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Nežinomas priežastis"
 
-#: ../composer/e-msg-composer.c:1394
+#: ../composer/e-msg-composer.c:1294
 msgid "Could not open file"
 msgstr "Nepavyko atverti bylos"
 
-#: ../composer/e-msg-composer.c:1402
+#: ../composer/e-msg-composer.c:1302
 msgid "Unable to retrieve message from editor"
 msgstr "Nepavyko gauti laiško iš redaktoriaus"
 
-#: ../composer/e-msg-composer.c:1677
+#: ../composer/e-msg-composer.c:1572
 msgid "Untitled Message"
 msgstr "Neužvardintas laiškas"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1712
+#: ../composer/e-msg-composer.c:1606
 msgid "Open File"
 msgstr "Atverti bylą"
 
-#: ../composer/e-msg-composer.c:2126 ../mail/em-account-editor.c:588
+#: ../composer/e-msg-composer.c:2006 ../mail/em-account-editor.c:588
 #: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:700
 msgid "Autogenerated"
 msgstr "Autogeneruotas"
 
-#: ../composer/e-msg-composer.c:2229
+#: ../composer/e-msg-composer.c:2105
 msgid "Si_gnature:"
 msgstr "Pa_rašas:"
 
-#: ../composer/e-msg-composer.c:2472 ../composer/e-msg-composer.c:3673
-#: ../composer/e-msg-composer.c:3676
+#: ../composer/e-msg-composer.c:2347 ../composer/e-msg-composer.c:3527
+#: ../composer/e-msg-composer.c:3528
 msgid "Compose a message"
 msgstr "Sukurti laišką"
 
-#: ../composer/e-msg-composer.c:3791
+#: ../composer/e-msg-composer.c:3643
 msgid "_Attachment Bar"
 msgstr "_Priedų juosta"
 
-#: ../composer/e-msg-composer.c:4881
+#: ../composer/e-msg-composer.c:4720
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10160,7 +9856,7 @@ msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "Dėl „{0}“, Jums gali reikti pasirinkti kitus pašto nustatymus."
 
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:17
 msgid "Because &quot;{1}&quot;."
 msgstr "Dėl „{1}“."
 
@@ -10272,6 +9968,10 @@ msgstr ""
 "Prieš pradėdami rašyti laiškus Jūs turite nustatyti savo pašto abonento "
 "parametrus."
 
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Discard Changes"
+msgstr "_Atsisakyti pakeitimų"
+
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Save Message"
 msgstr "Iš_saugoti laišką"
@@ -10395,7 +10095,7 @@ msgstr ""
 "Ką Evolution turi daryti Jums gavus laišką su prašymu patvirtinti "
 "perskaitymą?"
 
-#: ../e-util/e-dialog-utils.c:270
+#: ../e-util/e-dialog-utils.c:267
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10403,7 +10103,7 @@ msgstr ""
 "Byla tokiu vardu jau yra.\n"
 "Perrašyti ją?"
 
-#: ../e-util/e-dialog-utils.c:272 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:269 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Perrašyti bylą?"
 
@@ -10447,7 +10147,7 @@ msgstr "Ar norite ją perrašyti?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "Byla egzistuoja „{0}“."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:126
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:122
 msgid "_Overwrite"
 msgstr "_Perrašyti"
 
@@ -10689,11 +10389,11 @@ msgid "Include threads"
 msgstr "Įtraukti gijas"
 
 #: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:330
+#: ../mail/em-utils.c:291
 msgid "Incoming"
 msgstr "Gaunamas"
 
-#: ../filter/filter-rule.c:978 ../mail/em-utils.c:331
+#: ../filter/filter-rule.c:978 ../mail/em-utils.c:292
 msgid "Outgoing"
 msgstr "Išsiunčiamas"
 
@@ -10717,7 +10417,7 @@ msgstr "Trūksta datos."
 msgid "Missing file name."
 msgstr "Trūksta bylos pavadinimo."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:67
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:65
 msgid "Missing name."
 msgstr "Trūksta vardo."
 
@@ -10946,11 +10646,11 @@ msgstr "Gavimo nustatymai"
 msgid "Checking for New Mail"
 msgstr "Tikrinama, ar yra naujų laiškų"
 
-#: ../mail/em-account-editor.c:2662 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2661 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Abonementų tvarkyklė"
 
-#: ../mail/em-account-editor.c:2662 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2661 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolution abonementų padėjėjas"
 
@@ -10971,35 +10671,35 @@ msgstr "Protokolas"
 msgid "Mail Accounts Table"
 msgstr "Pašto abonementų lentelė"
 
-#: ../mail/em-composer-prefs.c:309 ../mail/em-composer-prefs.c:435
+#: ../mail/em-composer-prefs.c:307 ../mail/em-composer-prefs.c:430
 #: ../mail/mail-config.c:958
 msgid "Unnamed"
 msgstr "Bevardis"
 
-#: ../mail/em-composer-prefs.c:925
+#: ../mail/em-composer-prefs.c:897
 msgid "Language(s)"
 msgstr "Kalba(os)"
 
-#: ../mail/em-composer-prefs.c:968
+#: ../mail/em-composer-prefs.c:940
 msgid "Add signature script"
 msgstr "Pridėti parašo scenarijų"
 
-#: ../mail/em-composer-prefs.c:988
+#: ../mail/em-composer-prefs.c:960
 msgid "Signature(s)"
 msgstr "Parašas(ai)"
 
-#: ../mail/em-composer-utils.c:855 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:853 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Persiųstas laiškas --------"
 
-#: ../mail/em-composer-utils.c:1650
+#: ../mail/em-composer-utils.c:1648
 msgid "an unknown sender"
 msgstr "nežinomas siuntėjas"
 
 #. 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:1697
+#: ../mail/em-composer-utils.c:1695
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11353,12 +11053,12 @@ msgstr "Perkialiamas aplankas %s"
 msgid "Copying folder %s"
 msgstr "Kopijuojamas aplankas %s"
 
-#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1623
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1613
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Laiškai perkeliami į aplanką %s"
 
-#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1625
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1615
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Laiškai kopijuojami į aplanką %s"
@@ -11380,39 +11080,34 @@ msgstr "_Perkelti į aplanką"
 msgid "Scanning folders in \"%s\""
 msgstr "Skanuojami aplankai, esantys „%s“"
 
-#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:44
+#: ../mail/em-folder-tree.c:2036 ../ui/evolution-addressbook.xml.h:44
 #: ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:48
 msgid "_View"
 msgstr "_Rodyti"
 
-#: ../mail/em-folder-tree.c:2043
+#: ../mail/em-folder-tree.c:2037
 msgid "Open in _New Window"
 msgstr "Atverti _naujame lange"
 
-#: ../mail/em-folder-tree.c:2047
+#: ../mail/em-folder-tree.c:2041
 msgid "_Copy..."
 msgstr "_Kopijuoti..."
 
-#: ../mail/em-folder-tree.c:2048
+#: ../mail/em-folder-tree.c:2042
 msgid "_Move..."
 msgstr "_Perkelti..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2052
+#: ../mail/em-folder-tree.c:2046
 msgid "_New Folder..."
 msgstr "_Naujas aplankas..."
 
-#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:30
+#: ../mail/em-folder-tree.c:2049 ../ui/evolution-mail-list.xml.h:30
 msgid "_Rename..."
 msgstr "Pe_rvadinti..."
 
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:123
-msgid "_Empty Trash"
-msgstr "Išt_uštinti šiukšlinę"
-
 #: ../mail/em-folder-utils.c:104
 #, c-format
 msgid "Copying `%s' to `%s'"
@@ -11459,7 +11154,7 @@ msgstr "Sukurti aplanką"
 msgid "Specify where to create the folder:"
 msgstr "Nurodykite, kur sukurti aplanką:"
 
-#: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:558 ../mail/em-popup.c:569
+#: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:546 ../mail/em-popup.c:557
 msgid "Reply to _All"
 msgstr "Atsakyti _visiems"
 
@@ -11467,7 +11162,7 @@ msgstr "Atsakyti _visiems"
 msgid "_Reply to Sender"
 msgstr "_Atsakyti siuntėjui"
 
-#: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:560 ../mail/em-popup.c:571
+#: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:548 ../mail/em-popup.c:559
 #: ../ui/evolution-mail-message.xml.h:108
 msgid "_Forward"
 msgstr "P_ersiųsti"
@@ -11480,11 +11175,11 @@ msgstr "K_eisti kaip naują laišką..."
 msgid "U_ndelete"
 msgstr "S_ugrąžinti"
 
-#: ../mail/em-folder-view.c:1051 ../ui/evolution-addressbook.xml.h:37
+#: ../mail/em-folder-view.c:1051 ../ui/evolution-addressbook.xml.h:36
 msgid "_Move to Folder..."
 msgstr "Pe_rkelti į aplanką..."
 
-#: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:33
+#: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "K_opijuoti į aplanką..."
 
@@ -11561,52 +11256,52 @@ msgid "Filter on _Mailing List"
 msgstr "Filtruoti pagal k_onferenciją"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1922 ../mail/em-folder-view.c:1966
+#: ../mail/em-folder-view.c:1921 ../mail/em-folder-view.c:1965
 msgid "Default"
 msgstr "Įprastas"
 
-#: ../mail/em-folder-view.c:2065
+#: ../mail/em-folder-view.c:2064
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Spausdinti laišką"
 
-#: ../mail/em-folder-view.c:2221
+#: ../mail/em-folder-view.c:2220
 msgid "Unable to retrieve message"
 msgstr "Nepavyko gauti laiško"
 
-#: ../mail/em-folder-view.c:2414
+#: ../mail/em-folder-view.c:2413
 msgid "_Copy Link Location"
 msgstr "_Kopijuoti nuorodą"
 
-#: ../mail/em-folder-view.c:2416
+#: ../mail/em-folder-view.c:2415
 msgid "Create _Search Folder"
 msgstr "Sukurti _paieškos aplanką"
 
-#: ../mail/em-folder-view.c:2417
+#: ../mail/em-folder-view.c:2416
 msgid "_From this Address"
 msgstr "_Iš šio adreso"
 
-#: ../mail/em-folder-view.c:2418
+#: ../mail/em-folder-view.c:2417
 msgid "_To this Address"
 msgstr "Ši_uo adresu"
 
-#: ../mail/em-folder-view.c:2699
+#: ../mail/em-folder-view.c:2698
 #, c-format
 msgid "Click to mail %s"
 msgstr "Norėdami išsiųsti %s, paspauskite čia"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:461
+#: ../mail/em-format-html-display.c:445
 #, c-format
 msgid "Matches: %d"
 msgstr "Atitinka: %d"
 
-#: ../mail/em-format-html-display.c:712 ../mail/em-format-html.c:597
+#: ../mail/em-format-html-display.c:696 ../mail/em-format-html.c:597
 msgid "Unsigned"
 msgstr "Nepasirašytas"
 
-#: ../mail/em-format-html-display.c:712
+#: ../mail/em-format-html-display.c:696
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11614,11 +11309,11 @@ msgstr ""
 "Šis laiškas nepasirašytas. Nėra jokių garantijų, kad šis laiškas yra "
 "autentiškas."
 
-#: ../mail/em-format-html-display.c:713 ../mail/em-format-html.c:598
+#: ../mail/em-format-html-display.c:697 ../mail/em-format-html.c:598
 msgid "Valid signature"
 msgstr "Tvarkingas parašas"
 
-#: ../mail/em-format-html-display.c:713
+#: ../mail/em-format-html-display.c:697
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11626,11 +11321,11 @@ msgstr ""
 "Šis laiškas yra pasirašytas ir yra geras, kas reiškia, jog šis laiškas yra "
 "autentiškas."
 
-#: ../mail/em-format-html-display.c:714 ../mail/em-format-html.c:599
+#: ../mail/em-format-html-display.c:698 ../mail/em-format-html.c:599
 msgid "Invalid signature"
 msgstr "Blogas parašas"
 
-#: ../mail/em-format-html-display.c:714
+#: ../mail/em-format-html-display.c:698
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11638,11 +11333,11 @@ msgstr ""
 "Laiško parašas negali būti patikrintas, laiškas galėjo būti pakeistas "
 "persiuntimo metu."
 
-#: ../mail/em-format-html-display.c:715
+#: ../mail/em-format-html-display.c:699
 msgid "Valid signature, cannot verify sender"
 msgstr "Parašas geras, negalima patikrinti siuntėjo"
 
-#: ../mail/em-format-html-display.c:715
+#: ../mail/em-format-html-display.c:699
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11650,11 +11345,11 @@ msgstr ""
 "Laiškas pasirašytas su tvarkingu parašu, bet siuntėjas negali būti "
 "patikrintas."
 
-#: ../mail/em-format-html-display.c:721 ../mail/em-format-html.c:606
+#: ../mail/em-format-html-display.c:705 ../mail/em-format-html.c:606
 msgid "Unencrypted"
 msgstr "Neužšifruotas"
 
-#: ../mail/em-format-html-display.c:721
+#: ../mail/em-format-html-display.c:705
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -11662,11 +11357,11 @@ msgstr ""
 "Šis laiškas nėra šifruotas. Jo turinys gali būti perskaitytas siuntimo "
 "Internetu metu."
 
-#: ../mail/em-format-html-display.c:722 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:706 ../mail/em-format-html.c:607
 msgid "Encrypted, weak"
 msgstr "Silpnai šifruotas"
 
-#: ../mail/em-format-html-display.c:722
+#: ../mail/em-format-html-display.c:706
 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 "
@@ -11675,11 +11370,11 @@ msgstr ""
 "Laiškas yra šifruotas, bet naudoja silpną kriptografinį algoritmą. "
 "Įsilaužėlis gali per pakankamai trumpą laiką iššifruoti laiško turinį."
 
-#: ../mail/em-format-html-display.c:723 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:707 ../mail/em-format-html.c:608
 msgid "Encrypted"
 msgstr "Užšifruotas"
 
-#: ../mail/em-format-html-display.c:723
+#: ../mail/em-format-html-display.c:707
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11687,11 +11382,11 @@ msgstr ""
 "Šis laiškas yra užšifruotas. Įsilaužėliui būtų sunku perskaityti laiško "
 "turinį."
 
-#: ../mail/em-format-html-display.c:724 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:708 ../mail/em-format-html.c:609
 msgid "Encrypted, strong"
 msgstr "Stipriai užšifruotas"
 
-#: ../mail/em-format-html-display.c:724
+#: ../mail/em-format-html-display.c:708
 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 "
@@ -11701,56 +11396,60 @@ msgstr ""
 "Įsilaužėliui yra labai sunku atkoduoti tokį laišką naudojant šiuo metu "
 "prieinamas priemones."
 
-#: ../mail/em-format-html-display.c:825 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:809 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Peržiūrėti sertifikatą"
 
-#: ../mail/em-format-html-display.c:840
+#: ../mail/em-format-html-display.c:824
 msgid "This certificate is not viewable"
 msgstr "Negalima peržiūrėti šio sertifikato"
 
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1106
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Baigta %Y %B %d, %k:%M"
 
-#: ../mail/em-format-html-display.c:1130
+#: ../mail/em-format-html-display.c:1114
 msgid "Overdue:"
 msgstr "Pavėluotos:"
 
-#: ../mail/em-format-html-display.c:1133
+#: ../mail/em-format-html-display.c:1117
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "pagal %Y %B %d, %k:%M"
 
-#: ../mail/em-format-html-display.c:1193
+#: ../mail/em-format-html-display.c:1177
 msgid "_View Inline"
 msgstr "Žiūrėti _kontekste"
 
-#: ../mail/em-format-html-display.c:1194
+#: ../mail/em-format-html-display.c:1178
 msgid "_Hide"
 msgstr "_Slėpti"
 
-#: ../mail/em-format-html-display.c:1195
+#: ../mail/em-format-html-display.c:1179
 msgid "_Fit to Width"
 msgstr "_Atitikti plotį"
 
-#: ../mail/em-format-html-display.c:1196
+#: ../mail/em-format-html-display.c:1180
 msgid "Show _Original Size"
 msgstr "Rodyti _originalų dydį"
 
-#: ../mail/em-format-html-display.c:1566
+#: ../mail/em-format-html-display.c:1550
 msgid "Attachment Button"
 msgstr "Priedo mygtukas"
 
-#: ../mail/em-format-html-display.c:1773
+#: ../mail/em-format-html-display.c:1757
 msgid "Select folder to save all attachments..."
 msgstr "Pasirinkite aplanką, kuriame išsaugoti visus priedus..."
 
-#: ../mail/em-format-html-display.c:1820
+#: ../mail/em-format-html-display.c:1796
+msgid "Select folder to save selected attachments..."
+msgstr "Pasirinkite aplanką, kuriame išsaugoti pasirinktus priedus..."
+
+#: ../mail/em-format-html-display.c:1804
 msgid "Save Selected..."
 msgstr "Išsaugoti pasirinktus..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1887
+#: ../mail/em-format-html-display.c:1871
 #, c-format
 msgid "%d attachment"
 msgid_plural "%d attachments"
@@ -11758,11 +11457,11 @@ msgstr[0] "%d priedas"
 msgstr[1] "%d priedai"
 msgstr[2] "%d priedų"
 
-#: ../mail/em-format-html-display.c:1951
+#: ../mail/em-format-html-display.c:1935
 msgid "No Attachment"
 msgstr "Nėra priedų"
 
-#: ../mail/em-format-html-display.c:1954
+#: ../mail/em-format-html-display.c:1938
 msgid "Save All"
 msgstr "Išsaugoti visus"
 
@@ -11972,27 +11671,45 @@ msgstr ""
 "Nepavyko perskaityti nustatymų iš ankstesnės Evolution instaliacijos, "
 "„evolution/config.xmldb“ neegzistuoja arba yra sugadinta."
 
-#: ../mail/em-popup.c:556 ../mail/em-popup.c:567
+#: ../mail/em-popup.c:399
+msgid "Save As..."
+msgstr "Išsaugoti kaip..."
+
+#: ../mail/em-popup.c:424
+#, c-format
+msgid "untitled_image.%s"
+msgstr "neįvardintas_paveikslėlis.%s"
+
+#: ../mail/em-popup.c:542 ../mail/em-popup.c:553
+msgid "Set as _Background"
+msgstr "Nustatyti kaip _foną"
+
+#: ../mail/em-popup.c:544 ../mail/em-popup.c:555
 msgid "_Reply to sender"
 msgstr "_Atsakyti siuntėjui"
 
-#: ../mail/em-popup.c:557 ../mail/em-popup.c:568
+#: ../mail/em-popup.c:545 ../mail/em-popup.c:556
 #: ../ui/evolution-mail-message.xml.h:84
 msgid "Reply to _List"
 msgstr "Atsakyti į _konferenciją"
 
-#: ../mail/em-popup.c:619
+#: ../mail/em-popup.c:607
 msgid "_Open Link in Browser"
 msgstr "Atverti nu_orodą naršyklėje"
 
-#: ../mail/em-popup.c:620
+#: ../mail/em-popup.c:608
 msgid "_Send New Message To..."
 msgstr "_Siųsti naują laišką adresatui..."
 
-#: ../mail/em-popup.c:621
+#: ../mail/em-popup.c:609
 msgid "_Add to Addressbook"
 msgstr "Įtraukti į adresų knygą"
 
+#: ../mail/em-popup.c:762
+#, c-format
+msgid "Open in %s..."
+msgstr "Atverti su %s..."
+
 #: ../mail/em-subscribe-editor.c:614
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Ši saugykla nepalaiko užsakymų arba jie yra neįjungti."
@@ -12014,28 +11731,28 @@ msgstr "Prašom pasirinkti serverį."
 msgid "No server has been selected"
 msgstr "Nepasirinktas joks serveris"
 
-#: ../mail/em-utils.c:106
+#: ../mail/em-utils.c:105
 msgid "Don't show this message again."
 msgstr "Kitą kartą neberodyti šios žinutės."
 
-#: ../mail/em-utils.c:338
+#: ../mail/em-utils.c:299
 msgid "Filters"
 msgstr "Filtrai"
 
-#: ../mail/em-utils.c:481 ../mail/em-utils.c:518
+#: ../mail/em-utils.c:442 ../mail/em-utils.c:479
 msgid "message"
 msgstr "laiškas"
 
-#: ../mail/em-utils.c:653
+#: ../mail/em-utils.c:614
 msgid "Save Message..."
 msgstr "Išsaugoti laišką..."
 
-#: ../mail/em-utils.c:702
+#: ../mail/em-utils.c:663
 msgid "Add address"
 msgstr "Išsaugoti adresą"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1181
+#: ../mail/em-utils.c:1142
 #, c-format
 msgid "Messages from %s"
 msgstr "Laiškai nuo %s"
@@ -12371,6 +12088,14 @@ msgstr "Laiškų sąraše rodyti ištrintus laiškus (su perbraukimu)."
 msgid "Show deleted messages in the message-list"
 msgstr "Laiškų sąraše rodyti ištrintus laiškus"
 
+#: ../mail/evolution-mail.schemas.in.in.h:73
+msgid "Show the \"Preview\" pane"
+msgstr "Rodyti „Peržiūros“ skyrių"
+
+#: ../mail/evolution-mail.schemas.in.in.h:74
+msgid "Show the \"Preview\" pane."
+msgstr "Rodyti „Peržiūros“ skyrių."
+
 #: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Grojama garso byla, kai gaunamas naujas paštas."
@@ -12994,7 +12719,7 @@ msgstr "Išv_alyti"
 
 #: ../mail/mail-config.glade.h:56
 msgid "Clea_r"
-msgstr "Išval_yti"
+msgstr "Iš_valyti"
 
 #: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
@@ -13730,7 +13455,6 @@ msgid "Checking for new mail"
 msgstr "Ieškoma naujo pašto"
 
 #: ../mail/mail-session.c:207
-#: ../plugins/exchange-operations/exchange-config-listener.c:601
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Įvesk %s slaptažodį"
@@ -13743,20 +13467,20 @@ msgstr "Įvesk slaptažodį"
 msgid "User canceled operation."
 msgstr "Vartotojas nutraukė veiksmą."
 
-#: ../mail/mail-signature-editor.c:381
+#: ../mail/mail-signature-editor.c:372
 msgid "Edit signature"
 msgstr "Keisti parašą"
 
-#: ../mail/mail-signature-editor.c:423
+#: ../mail/mail-signature-editor.c:412
 msgid "Enter a name for this signature."
 msgstr "Įveskite šio parašo vardą."
 
-#: ../mail/mail-signature-editor.c:426
+#: ../mail/mail-signature-editor.c:415
 #: ../plugins/groupwise-features/properties.glade.h:5
 msgid "Name:"
 msgstr "Vardas:"
 
-#: ../mail/mail-tools.c:115
+#: ../mail/mail-tools.c:116
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Nepavyko sukurti kaupo aplanko „%s“: %s"
@@ -13766,16 +13490,16 @@ msgstr "Nepavyko sukurti kaupo aplanko „%s“: %s"
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "Bandoma perkelti paštą į ne mbox šaltinį „%s“"
 
-#: ../mail/mail-tools.c:249
+#: ../mail/mail-tools.c:242
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Persiųstas laiškas - %s"
 
-#: ../mail/mail-tools.c:251
+#: ../mail/mail-tools.c:244
 msgid "Forwarded message"
 msgstr "Persiųstas laiškas"
 
-#: ../mail/mail-tools.c:291
+#: ../mail/mail-tools.c:284
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Netinkamas aplankas: „%s“"
@@ -13829,32 +13553,25 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
-"A signature already exists with the name &quot;{0}&quot;. Please specify a "
-"different name."
-msgstr ""
-"Parašas pavadinimu „{0}“ jau yra. Nurodykite kitą pavadinimą."
-
-#: ../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 ""
 "Pridėdami reikšmingą temos eilutę Jūs padėsite gavėjams suprasti apie ką yra "
 "Jūsų laiškas."
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:8
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Ar tikrai norite ištrinti šį abonementą ir visus jo tarpininkus?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account?"
 msgstr "Ar tikrai norite ištrinti šį abonementą?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:10
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr "Ar tikrai norite tuo pačiu metu atverti {0} laiškų?"
 
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:11
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -13862,7 +13579,7 @@ msgstr ""
 "Ar tikrai norite visam laikui pašalinti visus laiškus ištrintus visuose "
 "aplankuose?"
 
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:12
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
@@ -13870,79 +13587,75 @@ msgstr ""
 "Ar tikrai norite visam laikui pašalinti visus laiškus ištrintus iš aplanko "
 "„{0}“?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:13
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Ar tikrai norite išsiųsti laišką HTML formatu?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:14
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Ar tikrai norite išsiųsti laišką vien tik su BCC gavėjais?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Ar tikrai norite išsiųsti laišką neparašę temos?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:16
 msgid "Because &quot;{0}&quot;."
 msgstr "Dėl „{0}“."
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{2}&quot;."
 msgstr "Nes „{2}“."
 
-#: ../mail/mail.error.xml.h:20
-msgid "Blank Signature"
-msgstr "Tuščias parašas"
-
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:19
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "Nepavyko pridėti paieškos aplanko „{0}“."
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:20
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Nepavyko nukopijuoti aplanko „{0}“ į „{1}“."
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:21
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "Nepavyko sukurti aplanko „{0}“."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot create temporary save directory."
 msgstr "Nepavyko sukurti laikino saugojimo aplanko."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "Nepavyko sukurti aplanko saugojimui, nes „{1}“."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "Negalima ištrinti aplanko „{0}“."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "Negalima ištrinti sisteminio aplanko „{0}“."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr "Nepavyko pakeisti paieškos aplanko „{0}“, nes tokio aplanko nėra."
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Nepavyko perkelti aplanko „{0}“ į „{1}“."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "Nepavyko atverti šaltinio „{1}“"
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "Nepavyko atverti šaltinio „{2}“."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "Nepavyko atverti tikslo „{2}“."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:31
 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 "
@@ -13952,31 +13665,31 @@ msgstr ""
 "negalėsite naudotis šiuo tiekėju tol, kol nesutiksite su licencijos "
 "sąlygomis."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Nepavyko pervadinti „{0}“ į „{1}“."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr "Nepavyko pervadinti ar perkelti sisteminio aplanko „{0}“."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot save changes to account."
 msgstr "Nepavyko išsaugoti abonemento pakeitimų."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "Nepavyko išsaugoti į aplanką „{0}“."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "Nepavyko išsaugoti į bylą „{0}“."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "Nepavyko nustatyti parašo scenarijaus „{0}“."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:38
 msgid ""
 "Check to make sure your password is spelled correctly.  Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -13985,63 +13698,63 @@ msgstr ""
 "daugumoje slaptažodių yra skirtumas tarp raidžių registro; gali būti "
 "įjungtas Jūsų „CapsLock“ klavišas."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:39
 msgid "Could not save signature file."
 msgstr "Nepavyko išsaugoti parašo bylos."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:40
 msgid "Delete &quot;{0}&quot;?"
 msgstr "Ištrinti „{0}“?"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:41
 msgid "Delete account?"
 msgstr "Ištrinti abonementą?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
 msgid "Discard changed?"
 msgstr "Atsisakyti pakeitimų?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr "Ar norite, kad operacija būtų vykdoma poaplankiuose?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid "Do you wish to save your changes?"
 msgstr "Ar norite išsaugoti pakeitimus?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:45
 msgid "Don't delete"
 msgstr "Netrinti"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:46
 msgid "Enter password."
 msgstr "Įveskite slaptažodį."
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:47
 msgid "Error loading filter definitions."
 msgstr "Įvyko klaida, įkeliant filtro informaciją."
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid "Error while performing operation."
 msgstr "Klaida vykdant operaciją."
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Error while {0}."
 msgstr "Klaida kol {0}."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:50
 msgid "File exists but cannot overwrite it."
 msgstr "Byla egzistuoja, bet negalima jos perrašyti."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "File exists but is not a regular file."
 msgstr "Byla egzistuoja, bet nėra standartinė byla."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Jeigu nuspręsite tęsti, Jūs nebegalėsite atkurti šių žinučių."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:53
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -14049,7 +13762,7 @@ msgstr ""
 "Jeigu ištrinsite šį aplanką, visas jo turinys ir jo dukterinių aplankų "
 "turinys bus iš karto ištrintas."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:54
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14057,11 +13770,11 @@ msgstr ""
 "Jeigu tęsite, abonemento informacija ir visa\n"
 "tarpinė informacija bus visam laikui ištrinta."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:56
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Jeigu tęsite, abonemento informacija bus visam laikui ištrinta."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:57
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -14069,19 +13782,19 @@ msgstr ""
 "Jeigu išeisite, šios žinutės bus neišiųstos kol Evolution nebus paleistą dar "
 "kartą."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:58
 msgid "Ignore"
 msgstr "Ignoruoti"
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:59
 msgid "Invalid authentication"
 msgstr "Netinkama autentikacija"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:60
 msgid "Mail filters automatically updated."
 msgstr "Pašto filtrai automatiškai atnaujinami."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:61
 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 "
@@ -14093,31 +13806,31 @@ msgstr ""
 "laiško gavėjai. Norėdami to išvengti, Jūs turėtumėte pridėti bent vieną Kam: "
 "arba CC: gavėją."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:62
 msgid "Mark all messages as read"
 msgstr "Pažymėti visus laiškus perskaitytais"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:63
 msgid "Mark all messages as read in the selected folder"
 msgstr "Pažymėti laiškus, pasirinktame aplanke, perskaitytais"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:64
 msgid "Missing folder."
 msgstr "Trūkstamas aplankas."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:66
 msgid "No sources selected."
 msgstr "Nepasirinkta jokių šaltinių."
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:67
 msgid "Opening too many messages at once may take a long time."
 msgstr "Didelio laiškų kiekio atidarymas tuo pačiu metu gali ilgai užtrukti."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:68
 msgid "Please check your account settings and try again."
 msgstr "Patikrinkite Jūsų abonemento nustatymus ir bandykite dar kartą."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:69
 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."
@@ -14125,7 +13838,7 @@ msgstr ""
 "Prašom įvesti tinkamą el. pašto adresą laukelyje Kam:. Jūs galite ieškoti "
 "el. pašto adresų paspausdami šalia įvedimo laukelio esantį mygtuką Kam:."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:70
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14136,49 +13849,41 @@ msgstr ""
 "sugebės juos perskaityti:\n"
 "{0}Vistiek išsiųsti?"
 
-#: ../mail/mail.error.xml.h:75
-msgid "Please provide an unique name to identify this signature."
-msgstr "Įveskite unikalų šio parašo pavadinimą."
-
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:73
 msgid "Please wait."
 msgstr "Palaukite."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:74
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Perkelinėjant seną pašto aplanką „{0}“ iškilo problema."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:75
 msgid "Querying server"
 msgstr "Užklausiamas serveris"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:76
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Serveriui siunčiama užklausa dėl palaikomų autentifikacijos mechanizmų "
 "sąrašo."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:77
 msgid "Read receipt requested."
 msgstr "Paprašyta perskaitymo patvirtinimo."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:78
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Tikrai ištrinti aplanką „{0}“ ir visus poaplankius?"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:79
 msgid "Search Folders automatically updated."
 msgstr "Paieškos aplankai automatiškai atnaujinami."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:80
 msgid "Send Receipt"
 msgstr "Siųsti patvirtinimą"
 
-#: ../mail/mail.error.xml.h:84
-msgid "Signature Already Exists"
-msgstr "Toks parašas jau yra"
-
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -14186,7 +13891,7 @@ msgstr ""
 "Sisteminiai aplankai yra reikalingi korektiškam Ximian Evolution "
 "funkcionavimui ir negali būti pervadinti, perkelti ar pašalinti."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:82
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14203,7 +13908,7 @@ msgstr ""
 "laiško gavėjai. Norėdami to išvengti, Jūs turėtumėte pridėti bent vieną Kam: "
 "arba CC: gavėją."
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:85
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14217,7 +13922,7 @@ msgstr ""
 "    „{1}“\n"
 "Ir buvo atnaujinti."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14231,7 +13936,7 @@ msgstr ""
 "    „{1}“\n"
 "Ir buvo atnaujintos."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "The message was sent via the &quot;sendmail&quot; external application.  "
 "Sendmail reports the following error: status 67: mail not sent.\n"
@@ -14243,11 +13948,11 @@ msgstr ""
 "Laiškas išsaugotas aplanke „Paruošti siųsti“. Patikrinkite ar laiške nėra "
 "klaidų ir siųskite iš naujo."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:97
 msgid "The script file must exist and be executable."
 msgstr "Scenarijaus byla turi egzistuoti ir būti vykdomoji."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14255,12 +13960,12 @@ msgstr ""
 "Šis aplankas galėjo būti pridėtas aklai, paleiskite\n"
 "paieškos aplankų redaktorių ir pridėkite jį tiksliai, jeigu reikia."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:100
 msgid ""
 "This message cannot be sent because you have not specified any Recipients"
 msgstr "Nepavyko išsiųsti šio laiško, nes JŪs nenurodėte jokių gavėjų"
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:101
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14268,15 +13973,15 @@ msgstr ""
 "Ši tarnybinė stotis nepalaiko šio autentikacijos tipo ir gali būt, kad "
 "nepalaiko jos išvis."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:102
 msgid "This signature has been changed, but has not been saved."
 msgstr "Šis parašas buvo pakeistas, tačiau neišsaugotas."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:103
 msgid "Unable to connect to the GroupWise server."
 msgstr "Nepavyko prisijungti prie GroupWise serverio."
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "Unable to open the drafts folder for this account.  Use the system drafts "
 "folder instead?"
@@ -14284,39 +13989,39 @@ msgstr ""
 "Nepavyko atverti šios abonemento juodraščių aplanko. Ar vietoj to naudoti "
 "sistemos juodraščių aplanką?"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:105
 msgid "Unable to read license file."
 msgstr "Nepavyko perskaityti licencijos bylos."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:106
 msgid "Use _Default"
 msgstr "Nau_doti įprastą"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:107
 msgid "Use default drafts folder?"
 msgstr "Naudoti įprastą juodraščių aplanką?"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:108
 msgid "You have not filled in all of the required information."
 msgstr "Jūs neįvedėte visos būtinos informacijos."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:109
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Jūs turite neišsiųstų laiškų, vistiek norite išeiti?"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:110
 msgid "You may not create two accounts with the same name."
 msgstr "Jūs negalite sukurti dviejų abonementų tuo pačiu vardu."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:111
 msgid "You must name this Search Folder."
 msgstr "Jūs turite pavadinti ši paieškos aplanką."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:112
 msgid "You must specify a folder."
 msgstr "Jūs turite nurodyti aplanką."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14326,98 +14031,102 @@ msgstr ""
 "Pasirinkdami aplankus individualiai, ir/arba pasirinkdami visus vietinius "
 "aplankus, visus nuotolinius aplankus, arba ir tuos, ir tuos."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:115
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "Jūsų prisijungimas į serverį „{0}“ kaip „{0}“ nepavyko."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:116
 msgid "Your message with the subject &quot;{0}&quot; was not delivered."
 msgstr "Jūsų laiškas su tema „{0}“ buvo nepristatytas."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:117
 msgid "_Append"
 msgstr "_Pridėti"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:118
 msgid "_Discard changes"
 msgstr "A_tsisakyti pakeitimų"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:119
+msgid "_Empty Trash"
+msgstr "Išt_uštinti šiukšlinę"
+
+#: ../mail/mail.error.xml.h:120
 msgid "_Expunge"
-msgstr "Išval_yti"
+msgstr "Iš_valyti"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:121
 msgid "_Open Messages"
 msgstr "_Atverti laiškus"
 
-#: ../mail/message-list.c:1006
+#: ../mail/message-list.c:996
 msgid "Unseen"
 msgstr "Nematytas"
 
-#: ../mail/message-list.c:1007
+#: ../mail/message-list.c:997
 msgid "Seen"
 msgstr "Matytas"
 
-#: ../mail/message-list.c:1008
+#: ../mail/message-list.c:998
 msgid "Answered"
 msgstr "Atsakytas"
 
-#: ../mail/message-list.c:1009
+#: ../mail/message-list.c:999
 msgid "Multiple Unseen Messages"
 msgstr "Keletas nematytų laiškų"
 
-#: ../mail/message-list.c:1010
+#: ../mail/message-list.c:1000
 msgid "Multiple Messages"
 msgstr "Keletas laiškų"
 
-#: ../mail/message-list.c:1014
+#: ../mail/message-list.c:1004
 msgid "Lowest"
 msgstr "Žemiausias"
 
-#: ../mail/message-list.c:1015
+#: ../mail/message-list.c:1005
 msgid "Lower"
 msgstr "Žemesnis"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1009
 msgid "Higher"
 msgstr "Aukštesnis"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1010
 msgid "Highest"
 msgstr "Aukščiausias"
 
-#: ../mail/message-list.c:1348 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1338 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1355 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1345 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Šiandien %H:%M"
 
-#: ../mail/message-list.c:1364 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1354 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Vakar %H:%M"
 
-#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1366 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: ../mail/message-list.c:1384 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1374 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %H:%M"
 
-#: ../mail/message-list.c:1386 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: ../mail/message-list.c:2052
+#: ../mail/message-list.c:2042
 msgid "Message List"
 msgstr "Laiškų sąrašas"
 
-#: ../mail/message-list.c:3397
+#: ../mail/message-list.c:3387
 msgid "Generating message list"
 msgstr "Generuojamas laiškų sąrašas"
 
@@ -14576,26 +14285,26 @@ msgstr "Padaryti atsarginę Evolution duomenų nustatymų kopiją ir atstatyti"
 msgid "Restore Settings..."
 msgstr "Atstatyti nustatymus..."
 
-#: ../plugins/bbdb/bbdb.c:410
+#: ../plugins/bbdb/bbdb.c:404
 msgid "Automatic Contacts"
 msgstr "Automatiniai kontaktai"
 
-#: ../plugins/bbdb/bbdb.c:419
+#: ../plugins/bbdb/bbdb.c:413
 msgid "<span weight=\"bold\">Automatic Contacts</span>"
 msgstr "<span weight=\"bold\">Automatiniai kontaktai</span>"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:432
+#: ../plugins/bbdb/bbdb.c:426
 msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
 msgstr "_Atsakant į laiškus automatiškai sukurti įrašus adresų knygoje"
 
-#: ../plugins/bbdb/bbdb.c:450
+#: ../plugins/bbdb/bbdb.c:444
 msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
 msgstr "<span weight=\"bold\">Greitų žinučių kontaktai</span>"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:463
+#: ../plugins/bbdb/bbdb.c:457
 msgid ""
 "Periodically synchronize contact information and images from my _instant "
 "messenger"
@@ -14604,7 +14313,7 @@ msgstr ""
 "_greitų žinučių programa"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:470
+#: ../plugins/bbdb/bbdb.c:464
 msgid "Synchronize with _buddy list now"
 msgstr "Sinchronizuoti su _bičiulių sąrašu dabar"
 
@@ -14855,16 +14564,6 @@ msgstr "Autentikacijos tipas"
 msgid "Ch_eck for Supported Types"
 msgstr "Pati_krinti kokie tipai palaikomi"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:192
-#: ../plugins/exchange-operations/exchange-contacts.c:162
-msgid ""
-"Evolution is in offline mode. You cannot create or modify folders now.\n"
-"Please switch to online mode for such operations."
-msgstr ""
-"Evolution yra atsijungimo režime. Šiuo metu negalite kurti ar modifikuoti\n"
-"aplankų. Norėdami atlikti šias operacijas persijunkite į prisijungimo "
-"režimą."
-
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
@@ -15012,28 +14711,24 @@ msgstr "Aplanko pavadinimas"
 msgid "Folder Size"
 msgstr "Aplanko dydis"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:180
-msgid "Subscribe to Other User's"
-msgstr "Užsisakyti kito naudotojo"
-
 #: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
 msgid "Exchange Folder Tree"
 msgstr "Exchange aplankų medis"
 
-#: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:227
-#: ../plugins/exchange-operations/exchange-folder.c:237
+#: ../plugins/exchange-operations/exchange-folder.c:62
+#: ../plugins/exchange-operations/exchange-folder.c:223
+#: ../plugins/exchange-operations/exchange-folder.c:233
 msgid "Unsubscribe Folder..."
 msgstr "Atsisakyti aplanko..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:464
-#: ../plugins/exchange-operations/exchange-folder.c:524
+#: ../plugins/exchange-operations/exchange-folder.c:460
+#: ../plugins/exchange-operations/exchange-folder.c:520
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Tikrai atsisakyti aplanko „%s“?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:476
-#: ../plugins/exchange-operations/exchange-folder.c:536
+#: ../plugins/exchange-operations/exchange-folder.c:472
+#: ../plugins/exchange-operations/exchange-folder.c:532
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Atsisakyti „%s“"
@@ -15623,23 +15318,18 @@ msgid "Proxy Login"
 msgstr "Tarpinio serverio prisijungimo vardas"
 
 #: ../plugins/groupwise-features/proxy-login.c:219
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:501
+#: ../plugins/groupwise-features/proxy-login.c:261
+#: ../plugins/groupwise-features/proxy.c:499
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sĮveskite %s slaptažodį (naudotojas %s)"
 
-#: ../plugins/groupwise-features/proxy-login.c:497
+#: ../plugins/groupwise-features/proxy-login.c:484
 msgid "_Proxy Login..."
 msgstr "_Tarpinio serverio prisijungimo vardas..."
 
-#: ../plugins/groupwise-features/proxy.c:690
-msgid "The Proxy tab will be available only when the account is online."
-msgstr ""
-"Tarpinio serverio kortelė bus prieinama tik tada, kai abonementas prisijungęs."
-
-#: ../plugins/groupwise-features/proxy.c:695
+#: ../plugins/groupwise-features/proxy.c:680
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 "Tarpinio serverio kortelė bus prieinama tik tada, kai abonementas įjungtas."
@@ -15664,60 +15354,6 @@ msgstr "Viešinimas"
 msgid "Track Message Status..."
 msgstr "Sekti laiško būseną..."
 
-#: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:137
-msgid "iCalendar format (.ics)"
-msgstr "iCalendar formatas (.ics)"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
-msgstr ""
-"Sinchronizuoti pasirinktas užduotis/kalendorių/adresų knygą su Apple iPod"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
-msgid "Synchronize to iPod"
-msgstr "Sinchronizuoti su iPod"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
-msgid "iPod Synchronization"
-msgstr "iPod sinchronizacija"
-
-#: ../plugins/ipod-sync/sync.c:158
-msgid "No output directory!"
-msgstr "Nėra išvesties aplanko!"
-
-#: ../plugins/ipod-sync/sync.c:159
-msgid ""
-"The output directory was not found on iPod! Please ensure that iPod has been "
-"correctly set up and try again."
-msgstr ""
-"iPod'e nerastas išvesties aplankas! Įsitikinkite, kad iPod teisingai "
-"sukonfigūruotas ir bandykite dar kartą."
-
-#: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
-msgid "Could not export data!"
-msgstr "Nepavyko eksportuoti duomenų!"
-
-#: ../plugins/ipod-sync/sync.c:203
-msgid "Exporting data failed."
-msgstr "Eksportuoti duomenų nepavyko."
-
-#: ../plugins/ipod-sync/sync.c:231
-msgid "Could not open addressbook!"
-msgstr "Nepavyko atverti adresų knygos!"
-
-#: ../plugins/ipod-sync/sync.c:232
-msgid "Could not open the Evolution addressbook to export data."
-msgstr "Nepavyko atverti Evolution adresų knygos duomenų eksportavimui."
-
-#: ../plugins/ipod-sync/sync.c:291
-msgid "Could not open calendar/todo!"
-msgstr "Nepavyko atverti kalendoriaus!"
-
-#: ../plugins/ipod-sync/sync.c:292
-msgid "Could not open the Evolution calendar/todo list to export data."
-msgstr "Nepavyko atverti Evolution kalendoriaus duomenų eksportavimui."
-
 #: ../plugins/itip-formatter/itip-formatter.c:724
 msgid "Unable to parse item"
 msgstr "Nepavyko apdoroti elemento"
@@ -16523,9 +16159,8 @@ msgid "Gives an option to print mail from composer"
 msgstr "Leidžia spausdinti laišką iš jo kūrimo lango"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:18 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-memos.xml.h:12
-#: ../ui/evolution-tasks.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Spa_udinio peržiūra"
 
@@ -16533,7 +16168,7 @@ msgstr "Spa_udinio peržiūra"
 msgid "Prints the message"
 msgstr "Spausdinti laišką"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:99
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:98
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (vidinis)"
 
@@ -16655,6 +16290,10 @@ msgstr "Atskirti reikšmes su:"
 msgid "Comma separated value format (.csv)"
 msgstr "Kableliu atskirtų reikšmių formatas (.csv)"
 
+#: ../plugins/save-calendar/ical-format.c:137
+msgid "iCalendar format (.ics)"
+msgstr "iCalendar formatas (.ics)"
+
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
 msgstr "Išsaugoti pažymėtą"
@@ -16997,27 +16636,27 @@ msgstr "Aplanko varde negali būti simbolio „#“."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' ir '..' yra rezervuoti aplankų vardai."
 
-#: ../shell/e-shell-window-commands.c:71
+#: ../shell/e-shell-window-commands.c:70
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Atrodo, kad GNOME Pilot įrankiai nėra įdiegti šioje sistemoje."
 
-#: ../shell/e-shell-window-commands.c:79
+#: ../shell/e-shell-window-commands.c:78
 #, c-format
 msgid "Error executing %s."
 msgstr "Klaida vykdant %s."
 
-#: ../shell/e-shell-window-commands.c:128
+#: ../shell/e-shell-window-commands.c:127
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy neįdiegtas."
 
-#: ../shell/e-shell-window-commands.c:136
+#: ../shell/e-shell-window-commands.c:135
 msgid "Bug buddy could not be run."
 msgstr "Nepavyko paleisti Bug buddy."
 
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
 #. * about box
-#: ../shell/e-shell-window-commands.c:533
+#: ../shell/e-shell-window-commands.c:532
 msgid "translator-credits"
 msgstr ""
 "Paskutinysis vertėjas:\n"
@@ -17027,19 +16666,19 @@ msgstr ""
 "Gediminas Paulauskas <menesis@chatsubo.lt>,\n"
 "Tomas Kuliavas <tokul@users.sf.net>"
 
-#: ../shell/e-shell-window-commands.c:547
+#: ../shell/e-shell-window-commands.c:546
 msgid "Groupware Suite"
 msgstr "Grupinio darbo įrankis"
 
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:774
 msgid "_Work Online"
 msgstr "_Dirbti prisijungus"
 
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:52
+#: ../shell/e-shell-window-commands.c:787 ../ui/evolution.xml.h:50
 msgid "_Work Offline"
 msgstr "_Dirbti atsijungus"
 
-#: ../shell/e-shell-window-commands.c:801
+#: ../shell/e-shell-window-commands.c:800
 msgid "Work Offline"
 msgstr "Dirbti atsijungus"
 
@@ -17059,7 +16698,7 @@ msgstr ""
 "Evolution dabar yra atsijungusi. Norėdami dirbti atsijungimo veiksenoje, "
 "paspauskite šį mygtuką."
 
-#: ../shell/e-shell-window.c:735
+#: ../shell/e-shell-window.c:724
 #, c-format
 msgid "Switch to %s"
 msgstr "Perjungti į %s"
@@ -17156,29 +16795,29 @@ msgid ""
 "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"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
 "This product comes with no warranty and is not intended for\n"
 "individuals prone to violent fits of anger.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 msgstr ""
-"Sveiki. Ačiū už Jūsų laiką, skirtą parsisiųsti šį Evolution\n"
+"Sveiki. Ačiū už laiką, sugaištą parsisiųsti šį Evolution\n"
 "grupinio darbo rinkinio bandomąjį leidimą.\n"
 "\n"
-"Ši Evolution versija dar nėra baigta. Prie to artėjama, tačiau\n"
-"dar trūksta kai kurių funkcijų ar jos veiki tik iš dalies.\n"
+"Evolution dar nėra baigta. Ji artėja prie to, tačiau yra vietų,\n"
+"kur ypatybių trūksta arba jos tik pusiau veikia.\n"
 "\n"
 "Jeigu Jums reikia stabilios Evolution versijos, siūlome pašalinti\n"
-"šią versiją ir įdiegti Evolution versiją %s.\n"
+"šią versiją ir įdiegti Evolution versiją %s .\n"
 "\n"
 "Jeigu šiame produkte rasite klaidų, praneškite apie jas mums\n"
-"adresu bugzilla.gnome.org. Mes neteikiame jokių šio produkto\n"
-"naudojimo garantijų ir jis nėra skirtas žmonėms kenčiantiems nuo\n"
+"adresu bugzilla.ximian.com. Mes neteikiame jokių šio produkto\n"
+"naudojimo garantijų. Jis nėra skirtas žmonėms kenčiantiems nuo\n"
 "netikėtų pykčio protrūkių.\n"
 "\n"
-"Tikimės, kad Jums patiks mūsų sunkaus darbo vaisiai, ir mes\n"
-"nekantriai laukiame Jūsų pagalbos tobulinant šį produktą!\n"
+"Mes tikimės, kad Jums patiks mūsų sunkaus darbo vaisiai, ir\n"
+"mes nekantriai laukiame Jūsų prisidėjimo prie šio produkto tobulinimo!\n"
 
 #: ../shell/main.c:254
 msgid ""
@@ -17904,99 +17543,99 @@ msgstr "Nepavyko paleisti „%s“: %s\n"
 msgid "Shutting down %s (%s)\n"
 msgstr "Išsijungiama %s (%s)\n"
 
-#: ../ui/evolution-addressbook.xml.h:2
-msgid "Contact _Preview"
-msgstr "Kontaktų _peržiūra"
-
-#: ../ui/evolution-addressbook.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:3
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "Kopijuoti pasirinktus kontaktus į kitą aplanką..."
 
-#: ../ui/evolution-addressbook.xml.h:5 ../ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:4 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Kopijuoti pažymėjimą"
 
-#: ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-addressbook.xml.h:5
 msgid "Copy to Folder..."
 msgstr "Kopijuoti į aplanką..."
 
-#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Iškirpti pažymėjimą"
 
-#: ../ui/evolution-addressbook.xml.h:10
+#: ../ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Ištrinti pažymėtus kontaktus"
 
-#: ../ui/evolution-addressbook.xml.h:12
+#: ../ui/evolution-addressbook.xml.h:11
 msgid "Move Selected Contacts to Another Folder..."
 msgstr "Perkelti pasirinktus kontaktus į kitą aplanką..."
 
-#: ../ui/evolution-addressbook.xml.h:13
+#: ../ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr "Perkelti į aplanką..."
 
-#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
 msgstr "Įdėti iš krepšio"
 
-#: ../ui/evolution-addressbook.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Peržiūrėti kontaktus prieš spausdinant"
 
-#: ../ui/evolution-addressbook.xml.h:19
+#: ../ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Spausdinti pažymėtus kontaktus"
 
-#: ../ui/evolution-addressbook.xml.h:21
+#: ../ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Išsaugoti pažymėtus kontaktus kaip VCard."
 
-#: ../ui/evolution-addressbook.xml.h:22 ../widgets/text/e-text.c:2684
+#: ../ui/evolution-addressbook.xml.h:21 ../widgets/text/e-text.c:2684
 msgid "Select All"
 msgstr "Pažymėti visus"
 
-#: ../ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Pažymėti visus kontaktus"
 
-#: ../ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-addressbook.xml.h:23
 msgid "Send a message to the selected contacts."
 msgstr "Siųsti laišką nurodytiems kontaktams."
 
-#: ../ui/evolution-addressbook.xml.h:25
+#: ../ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Siųsti laišką kontaktui"
 
-#: ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Siųsti pažymėtus kontaktus kitam asmeniui."
 
-#: ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-addressbook.xml.h:26
 msgid "Show contact preview window"
 msgstr "Rodyti kontaktų peržiūros langą"
 
-#: ../ui/evolution-addressbook.xml.h:28
+#: ../ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Stop"
 
-#: ../ui/evolution-addressbook.xml.h:29
+#: ../ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Sustabdyti įkėlimą"
 
-#: ../ui/evolution-addressbook.xml.h:30
+#: ../ui/evolution-addressbook.xml.h:29
 msgid "View the current contact"
 msgstr "Rodyti esamą kontaktą"
 
-#: ../ui/evolution-addressbook.xml.h:31 ../ui/evolution-calendar.xml.h:38
-#: ../ui/evolution-tasks.xml.h:21
+#: ../ui/evolution-addressbook.xml.h:30 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-tasks.xml.h:19
 msgid "_Actions"
 msgstr "_Veiksmai"
 
-#: ../ui/evolution-addressbook.xml.h:36
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "_Forward Contact..."
 msgstr "_Persiųsti kontaktą..."
 
+#: ../ui/evolution-addressbook.xml.h:39
+msgid "_Preview Pane"
+msgstr "_Peržiūros sritis"
+
 #: ../ui/evolution-addressbook.xml.h:41
 msgid "_Save as VCard..."
 msgstr "Iš_saugoti kaip VCard..."
@@ -18081,10 +17720,6 @@ msgstr "Pašalinti visus paskyrimus ir susitikimus"
 msgid "Select _Date"
 msgstr "Pasirinkite _datą"
 
-#: ../ui/evolution-calendar.xml.h:26
-msgid "Select _Today"
-msgstr "Pažymė_ti šiandieną"
-
 #: ../ui/evolution-calendar.xml.h:27
 msgid "Select a specific date"
 msgstr "Pasirinkti specifinę datą"
@@ -18221,7 +17856,7 @@ msgstr "_Kopijuoti aplanką į..."
 
 #: ../ui/evolution-mail-global.xml.h:18
 msgid "_Move Folder To..."
-msgstr "P_erkelti aplanką į..."
+msgstr "_Perkelti aplanką į..."
 
 #: ../ui/evolution-mail-global.xml.h:19
 msgid "_New..."
@@ -18253,7 +17888,7 @@ msgstr "Nukelti pažymėtą laišką(us) į atmintinę"
 
 #: ../ui/evolution-mail-list.xml.h:6
 msgid "E_xpunge"
-msgstr "Išval_yti"
+msgstr "Iš_valyti"
 
 #: ../ui/evolution-mail-list.xml.h:8
 msgid "Group By _Threads"
@@ -18277,8 +17912,8 @@ msgid ""
 msgstr "Paslėpti ištrintus laiškus, o ne rodyti juos perbrauktus"
 
 #: ../ui/evolution-mail-list.xml.h:13
-msgid "Mar_k Messages as Read"
-msgstr "Pažymėti laišk_us skaitytais"
+msgid "Mark Me_ssages as Read"
+msgstr "Pažymėti _laiškus skaitytais"
 
 #: ../ui/evolution-mail-list.xml.h:14 ../ui/evolution-mail-message.xml.h:69
 msgid "Paste message(s) from the clipboard"
@@ -18773,42 +18408,10 @@ msgstr "_Uždaryti"
 #: ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:45
 #: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:37
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Byla"
 
-#: ../ui/evolution-memos.xml.h:3
-msgid "Copy selected memo"
-msgstr "Kopijuoti pasirinktą užrašą"
-
-#: ../ui/evolution-memos.xml.h:5
-msgid "Cut selected memo"
-msgstr "Iškirpti pasirinktą užrašą"
-
-#: ../ui/evolution-memos.xml.h:7
-msgid "Delete selected memos"
-msgstr "Ištrinti pažymėtus užrašus"
-
-#: ../ui/evolution-memos.xml.h:9
-msgid "Paste memo from the clipboard"
-msgstr "Įdėti užrašą iš atmintinės"
-
-#: ../ui/evolution-memos.xml.h:10
-msgid "Previews the list of memos to be printed"
-msgstr "Parodo spausdintinų užrašų sąrašą"
-
-#: ../ui/evolution-memos.xml.h:13
-msgid "Print the list of memos"
-msgstr "Spausdinti užrašų sąrašą"
-
-#: ../ui/evolution-memos.xml.h:14
-msgid "View the selected memo"
-msgstr "Žiūrėti pažymėtą užrašą"
-
-#: ../ui/evolution-memos.xml.h:18
-msgid "_Open Memo"
-msgstr "_Atverti užrašą"
-
 #: ../ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Prisegti"
@@ -19087,18 +18690,10 @@ msgid "Print the list of tasks"
 msgstr "Spausdinti užduočių sąrašą"
 
 #: ../ui/evolution-tasks.xml.h:18
-msgid "Show task preview window"
-msgstr "Rodyti užduočių peržiūros langą"
-
-#: ../ui/evolution-tasks.xml.h:19
-msgid "Task _Preview"
-msgstr "Užduočių _peržiūra"
-
-#: ../ui/evolution-tasks.xml.h:20
 msgid "View the selected task"
 msgstr "Peržiūrėti pasirinktą užduotį"
 
-#: ../ui/evolution-tasks.xml.h:27
+#: ../ui/evolution-tasks.xml.h:25
 msgid "_Open Task"
 msgstr "_Atverti užduotį"
 
@@ -19211,66 +18806,58 @@ msgid "Tool_bar style"
 msgstr "Įrankinės s_tilius"
 
 #: ../ui/evolution.xml.h:33
-msgid "View/Hide the Status Bar"
-msgstr "Rodyti/slėpti būsenos juostą"
-
-#: ../ui/evolution.xml.h:34
 msgid "_About Evolution..."
 msgstr "_Apie Evolution..."
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:34
 msgid "_Close Window"
 msgstr "_Užverti langą"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:37
 msgid "_Help"
 msgstr "_Pagalba"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:38
 msgid "_Hide buttons"
 msgstr "_Slėpti mygtukus"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:39
 msgid "_Icons only"
 msgstr "_Tik ikonos"
 
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:40
 msgid "_Import..."
 msgstr "_Importuoti..."
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:41
 msgid "_New"
 msgstr "_Naujas"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:42
 msgid "_Quick Reference"
 msgstr "_Trumpa apžvalga"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:43
 msgid "_Quit"
 msgstr "Iš_eiti"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:44
 msgid "_Send / Receive"
 msgstr "_Siųsti / gauti"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:45
 msgid "_Switcher Appearance"
 msgstr "_Perjungiklio išvaizda"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:46
 msgid "_Synchronization Options..."
-msgstr "_Sinchronizavimo nustatymai..."
+msgstr "_Sinchronizacimo nustatymai..."
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:47
 msgid "_Text only"
 msgstr "Tik _tekstas"
 
-#: ../ui/evolution.xml.h:50
-msgid "_View Status Bar"
-msgstr "_Rodyti būsenos juostą"
-
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:49
 msgid "_Window"
 msgstr "_Langas"
 
@@ -19330,10 +18917,6 @@ msgstr "Pagal tęsinio ž_ymę"
 msgid "_Messages"
 msgstr "_Laiškai"
 
-#: ../views/memos/galview.xml.h:1
-msgid "_Memos"
-msgstr "_Užrašai"
-
 #: ../views/tasks/galview.xml.h:1
 msgid "With _Due Date"
 msgstr "Su _data iki kada reikia"
@@ -19421,20 +19004,9 @@ msgstr "_Sukurti naują vaizdą"
 msgid "_Replace existing view"
 msgstr "_Perrašyti esamą vaizdą"
 
-#. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:585
-#: ../widgets/menus/gal-view-menus.c:350
-msgid "Custom View"
-msgstr "Naudotojo pritaikytas vaizdas"
-
-#: ../widgets/menus/gal-view-instance.c:586
-msgid "Save Custom View"
-msgstr "Išsaugoti naudotojo pritaikytą vaizdą"
-
-#: ../widgets/menus/gal-view-instance.c:590
-#: ../widgets/menus/gal-view-menus.c:372
-msgid "Define Views..."
-msgstr "Nurodyti vaizdus..."
+#: ../widgets/menus/gal-view-menus.c:291
+msgid "_Current View"
+msgstr "_Esamas vaizdas"
 
 #: ../widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View..."
@@ -19792,41 +19364,41 @@ msgstr "Stulpelio plotis"
 
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:346
+#: ../widgets/misc/e-search-bar.c:345
 msgid "Search Text Entry"
 msgstr "Paieškos teksto įvedimas"
 
-#: ../widgets/misc/e-search-bar.c:550
+#: ../widgets/misc/e-search-bar.c:549
 msgid "_Search"
 msgstr "_Paieška"
 
-#: ../widgets/misc/e-search-bar.c:556
+#: ../widgets/misc/e-search-bar.c:555
 msgid "_Find Now"
 msgstr "_Surasti"
 
-#: ../widgets/misc/e-search-bar.c:557 ../widgets/misc/e-search-bar.c:944
+#: ../widgets/misc/e-search-bar.c:556 ../widgets/misc/e-search-bar.c:943
 msgid "_Clear"
-msgstr "Išval_yti"
+msgstr "Iš_valyti"
 
-#: ../widgets/misc/e-search-bar.c:648
+#: ../widgets/misc/e-search-bar.c:647
 msgid "Search Type"
 msgstr "Paieškos tipas"
 
-#: ../widgets/misc/e-search-bar.c:852
+#: ../widgets/misc/e-search-bar.c:851
 msgid "Item ID"
 msgstr "Elemento ID"
 
-#: ../widgets/misc/e-search-bar.c:859
+#: ../widgets/misc/e-search-bar.c:858
 msgid "Subitem ID"
 msgstr "Antrinio elemento ID"
 
-#: ../widgets/misc/e-search-bar.c:866 ../widgets/text/e-entry.c:1249
+#: ../widgets/misc/e-search-bar.c:865 ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3462
 #: ../widgets/text/e-text.c:3463
 msgid "Text"
 msgstr "Tekstas"
 
-#: ../widgets/misc/e-search-bar.c:946
+#: ../widgets/misc/e-search-bar.c:945
 msgid "Find _Now"
 msgstr "_Surasti"
 
@@ -20531,24 +20103,6 @@ msgstr "IM turinys"
 msgid "Handle Popup"
 msgstr "Išsiskleidžianti rodyklė"
 
-#~ msgid "Discard Changes"
-#~ msgstr "Atsisakyti pakeitimų"
-
-#~ msgid "_Attachment Bar (drop attachments here)"
-#~ msgstr "_Priedų juosta (čia meskite priedus)"
-
-#~ msgid "_Alarm"
-#~ msgstr "_Perspėti"
-
-#~ msgid "_Delegate To..."
-#~ msgstr "_Pavesti kam..."
-
-#~ msgid "Current View"
-#~ msgstr "Esamas vaizdas"
-
-#~ msgid "_Preview Pane"
-#~ msgstr "_Peržiūros sritis"
-
 #~ msgid "Unknown error verifying signed messaage"
 #~ msgstr "Nežinoma klaida tikrinant pasirašytą laišką"
 
diff --git a/po/ru.po b/po/ru.po
index c33f0558ac..2ed0b5034d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,16 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-30 01:31+0400\n"
-"PO-Revision-Date: 2005-09-30 01:38+0400\n"
+"POT-Creation-Date: 2005-08-25 18:20+0300\n"
+"PO-Revision-Date: 2005-09-30 01:43+0400\n"
 "Last-Translator: Leonid Kanter <leon@asplinux.ru>\n"
 "Language-Team:  <gnome-cyr@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.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"
+"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"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
@@ -99,7 +98,7 @@ msgstr "Новая встреча"
 msgid "New All Day Event"
 msgstr "Новое ежедневное событие"
 
-#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1505
+#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1506
 msgid "New Meeting"
 msgstr "Новое собрание"
 
@@ -159,7 +158,7 @@ msgstr "%A, %d %b %Y"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:190
 #: ../calendar/gui/calendar-component.c:663
-#: ../calendar/gui/e-day-view-top-item.c:719 ../calendar/gui/e-day-view.c:1510
+#: ../calendar/gui/e-day-view-top-item.c:719 ../calendar/gui/e-day-view.c:1514
 #: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a, %d %b"
@@ -191,7 +190,7 @@ msgstr "%d %b %Y"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:220
 #: ../calendar/gui/calendar-component.c:689
-#: ../calendar/gui/e-day-view-top-item.c:723 ../calendar/gui/e-day-view.c:1526
+#: ../calendar/gui/e-day-view-top-item.c:723 ../calendar/gui/e-day-view.c:1530
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
@@ -394,10 +393,8 @@ msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Работа компонента адресной книги Evolution неожиданно завершилась."
 
 #: ../addressbook/addressbook.error.xml.h:16
-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:17
 msgid ""
@@ -476,11 +473,10 @@ msgid ""
 msgstr "Этот контакт содержит несохраненные изменения. Сохранить изменения?"
 
 #: ../addressbook/addressbook.error.xml.h:30
-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:31 ../mail/em-vfolder-rule.c:495
+#: ../addressbook/addressbook.error.xml.h:31 ../mail/em-vfolder-rule.c:494
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
@@ -532,7 +528,7 @@ msgstr "Здесь настраивается автозавершение"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1180
+#: ../addressbook/gui/component/addressbook-view.c:1133
 #: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:388
 msgid "Contacts"
 msgstr "Контакты"
@@ -652,8 +648,8 @@ msgstr "Скопировать книгу локально для автоном
 #: ../addressbook/gui/component/addressbook-config.c:902
 #: ../addressbook/gui/component/ldap-config.glade.h:23
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/calendar-setup.c:366
-#: ../calendar/gui/dialogs/calendar-setup.c:377
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 #: ../mail/em-folder-properties.c:215 ../mail/mail-config.glade.h:85
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
@@ -753,7 +749,7 @@ msgstr ""
 "Производится преобразование ваших данных Pilot Sync..."
 
 #: ../addressbook/gui/component/addressbook-view.c:764
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:951
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/tasks-component.c:441 ../mail/em-filter-i18n.h:11
 #: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:5
@@ -767,7 +763,7 @@ msgstr "Удалить"
 msgid "Properties..."
 msgstr "Свойства..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1191
+#: ../addressbook/gui/component/addressbook-view.c:1144
 msgid "Contact Source Selector"
 msgstr "Выбор источника контактов"
 
@@ -775,13 +771,13 @@ msgstr "Выбор источника контактов"
 msgid "Accessing LDAP Server anonymously"
 msgstr "Анонимное подключение к серверу LDAP"
 
-#: ../addressbook/gui/component/addressbook.c:191
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:490
+#: ../addressbook/gui/component/addressbook.c:193
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:485
 msgid "Failed to authenticate.\n"
 msgstr "Ошибка проверки подлинности.\n"
 
-#: ../addressbook/gui/component/addressbook.c:198
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:469
+#: ../addressbook/gui/component/addressbook.c:200
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:464
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Введите пароль для %s (пользователь %s)"
@@ -931,8 +927,7 @@ msgid "Email address"
 msgstr "Электронная почта"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
-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:22
@@ -1175,14 +1170,14 @@ msgstr "AIM"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:272
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: ../addressbook/gui/widgets/e-minicard.c:182
+#: ../addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Контакт"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:525
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:540
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2353
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2349
 msgid "Contact Editor"
 msgstr "Редактор контактов"
 
@@ -1247,7 +1242,7 @@ msgid "_Birthday:"
 msgstr "_День рождения:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../plugins/itip-formatter/itip-view.c:1662
+#: ../plugins/itip-formatter/itip-view.c:1660
 msgid "_Calendar:"
 msgstr "_Календарь:"
 
@@ -1354,8 +1349,8 @@ msgstr "Адрес"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:520
-#: ../addressbook/gui/widgets/e-minicard.c:175
+#: ../addressbook/gui/widgets/e-minicard-view.c:519
+#: ../addressbook/gui/widgets/e-minicard.c:174
 #: ../widgets/menus/gal-define-views-model.c:181
 #: ../widgets/table/e-cell-text.c:1768 ../widgets/text/e-entry.c:1312
 #: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3584
@@ -2333,7 +2328,7 @@ msgstr "Зимбабве"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
 #: ../plugins/exchange-operations/exchange-delegates.c:936
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:717
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:714
 #: ../plugins/plugin-manager/plugin-manager.c:44
 #: ../plugins/save-attachments/save-attachments.c:362
 #: ../widgets/menus/gal-view-new-dialog.c:73
@@ -2425,20 +2420,20 @@ msgid "Changed"
 msgstr "Изменено"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:535
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2348
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2344
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Редактор контактов - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2661
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2659
 msgid "Please select an image for this contact"
 msgstr "Выберите изображение для этого контакта"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2662
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2660
 msgid "No image"
 msgstr "Нет изображения"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2941
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2936
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2446,7 +2441,7 @@ msgstr ""
 "Данные контакта неверны:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2993
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2988
 msgid "Invalid contact."
 msgstr "Неверный контакт."
 
@@ -2599,8 +2594,8 @@ msgstr "Служба сообщений:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:234
-#: ../plugins/exchange-operations/exchange-contacts.c:214
+#: ../plugins/exchange-operations/exchange-calendar.c:215
+#: ../plugins/exchange-operations/exchange-contacts.c:193
 msgid "_Location:"
 msgstr "_Расположение:"
 
@@ -2648,9 +2643,9 @@ msgstr "_Введите эл.адрес или перетащите контак
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:223
+#: ../addressbook/gui/widgets/e-addressbook-view.c:222
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:506
+#: ../addressbook/gui/widgets/e-minicard-view.c:505
 msgid "Book"
 msgstr "Книга"
 
@@ -2723,9 +2718,9 @@ msgstr[2] "%d контактов"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:303
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:237
+#: ../addressbook/gui/widgets/e-addressbook-view.c:236
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:513
+#: ../addressbook/gui/widgets/e-minicard-view.c:512
 msgid "Query"
 msgstr "Запрос"
 
@@ -2747,35 +2742,35 @@ msgstr "Модель"
 msgid "Error modifying card"
 msgstr "Ошибка при изменении карточки"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:169
+#: ../addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Name begins with"
 msgstr "Имя начинается с"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:170
+#: ../addressbook/gui/widgets/e-addressbook-view.c:169
 msgid "Email begins with"
 msgstr "Почтовый адрес начинается с"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../addressbook/gui/widgets/e-addressbook-view.c:170
 #: ../calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Категории "
 
 #. We attach subitems below
-#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
 #: ../calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Любое поле содержит"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:173
-#: ../addressbook/gui/widgets/e-addressbook-view.c:178
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../addressbook/gui/widgets/e-addressbook-view.c:177
 msgid "Advanced..."
 msgstr "Дополнительно..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:230
+#: ../addressbook/gui/widgets/e-addressbook-view.c:229
 msgid "Source"
 msgstr "Источник"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:244
+#: ../addressbook/gui/widgets/e-addressbook-view.c:243
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-meeting-list-view.c:370
@@ -2783,91 +2778,91 @@ msgstr "Источник"
 msgid "Type"
 msgstr "Тип"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:544
+#: ../addressbook/gui/widgets/e-addressbook-view.c:543
 msgid "Address Book"
 msgstr "Адресная книга"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:807
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2014
+#: ../addressbook/gui/widgets/e-addressbook-view.c:806
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2010
 #: ../ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Сохранить как VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:930
-#: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:1528 ../ui/evolution-addressbook.xml.h:37
+#: ../addressbook/gui/widgets/e-addressbook-view.c:929
+#: ../calendar/gui/e-calendar-table.c:1154
+#: ../calendar/gui/e-calendar-view.c:1529 ../ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Открыть"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:932
+#: ../addressbook/gui/widgets/e-addressbook-view.c:931
 msgid "New Contact..."
 msgstr "Создать контакт..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
+#: ../addressbook/gui/widgets/e-addressbook-view.c:932
 msgid "New Contact List..."
 msgstr "Создать список контактов..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 #: ../ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Переслать контакт"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
 msgid "Forward Contacts"
 msgstr "Переслать контакты"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
+#: ../addressbook/gui/widgets/e-addressbook-view.c:938
 msgid "Send Message to Contact"
 msgstr "Отправить сообщение к контакту"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "Send Message to List"
 msgstr "Отправить сообщение в список"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "Send Message to Contacts"
 msgstr "Отправить сообщение к контактам"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 #: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2501
 #: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
 #: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Печать"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Copy to Address Book..."
 msgstr "Копировать в адресную книгу..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "Move to Address Book..."
 msgstr "Переместить в адресную книгу..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 #: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Вырезать"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 #: ../calendar/gui/calendar-component.c:536
 #: ../calendar/gui/tasks-component.c:440 ../ui/evolution-addressbook.xml.h:2
 #: ../ui/evolution-mail-message.xml.h:11 ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Копировать"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 #: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Вставить"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1565
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1561
 #: ../calendar/gui/cal-search-bar.c:346
 msgid "Any Category"
 msgstr "Любая категория"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1764
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1760
 msgid "Print cards"
 msgstr "Напечатать карточки"
 
@@ -2911,7 +2906,7 @@ msgid "Company Phone"
 msgstr "Телефон компании"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:567
+#: ../addressbook/gui/widgets/eab-contact-display.c:564
 #: ../smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "Эл. почта"
@@ -3009,7 +3004,7 @@ msgstr "Радио"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
 #: ../calendar/gui/e-meeting-list-view.c:378
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:718
 msgid "Role"
 msgstr "Должность"
 
@@ -3044,7 +3039,7 @@ msgid "Web Site"
 msgstr "Веб-сайт"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:138
+#: ../addressbook/gui/widgets/e-minicard.c:137
 #: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
 #: ../widgets/misc/e-reflow.c:1437 ../widgets/misc/e-reflow.c:1438
 #: ../widgets/table/e-table-click-to-add.c:517
@@ -3054,13 +3049,13 @@ msgstr "Веб-сайт"
 #: ../widgets/table/e-table-group-container.c:972
 #: ../widgets/table/e-table-group-leaf.c:629
 #: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3012 ../widgets/table/e-table-item.c:3013
+#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
 #: ../widgets/text/e-text.c:3626 ../widgets/text/e-text.c:3627
 msgid "Width"
 msgstr "Ширина"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:145
+#: ../addressbook/gui/widgets/e-minicard.c:144
 #: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
 #: ../widgets/misc/e-reflow.c:1445 ../widgets/misc/e-reflow.c:1446
 #: ../widgets/table/e-table-click-to-add.c:524
@@ -3069,13 +3064,13 @@ msgstr "Ширина"
 #: ../widgets/table/e-table-group-container.c:965
 #: ../widgets/table/e-table-group-leaf.c:622
 #: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
+#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
 #: ../widgets/text/e-text.c:3634 ../widgets/text/e-text.c:3635
 msgid "Height"
 msgstr "Высота"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:153
+#: ../addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr "Имеет фокус"
 
@@ -3099,7 +3094,7 @@ msgstr "Максимальная длина имени поля"
 msgid "Column Width"
 msgstr "Ширина столбца"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:172
+#: ../addressbook/gui/widgets/e-minicard-view.c:171
 msgid ""
 "\n"
 "\n"
@@ -3113,7 +3108,7 @@ msgstr ""
 "\n"
 "Или дважды щелкните здесь, чтобы создать новый контакт."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:175
+#: ../addressbook/gui/widgets/e-minicard-view.c:174
 msgid ""
 "\n"
 "\n"
@@ -3127,7 +3122,7 @@ msgstr ""
 "\n"
 "Дважды щелкните здесь, чтобы создать новый контакт."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:180
+#: ../addressbook/gui/widgets/e-minicard-view.c:179
 msgid ""
 "\n"
 "\n"
@@ -3137,7 +3132,7 @@ msgstr ""
 "\n"
 "Поиск контакта."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -3147,15 +3142,15 @@ msgstr ""
 "\n"
 "Нет элементов для отображения в этом окне."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:499
+#: ../addressbook/gui/widgets/e-minicard-view.c:498
 msgid "Adapter"
 msgstr "Адаптер"
 
-#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../addressbook/gui/widgets/e-minicard.c:160
 msgid "Selected"
 msgstr "Выбрано"
 
-#: ../addressbook/gui/widgets/e-minicard.c:168
+#: ../addressbook/gui/widgets/e-minicard.c:167
 msgid "Has Cursor"
 msgstr "Имеет курсор"
 
@@ -3205,7 +3200,7 @@ msgid "WWW"
 msgstr "WWW"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:378
-#: ../addressbook/gui/widgets/eab-contact-display.c:602
+#: ../addressbook/gui/widgets/eab-contact-display.c:599
 msgid "Blog"
 msgstr "Блог"
 
@@ -3213,11 +3208,11 @@ msgstr "Блог"
 msgid "personal"
 msgstr "личный"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:563
+#: ../addressbook/gui/widgets/eab-contact-display.c:560
 msgid "Job Title"
 msgstr "Должность"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:594
+#: ../addressbook/gui/widgets/eab-contact-display.c:591
 msgid "Home page"
 msgstr "Домашняя страничка"
 
@@ -3396,13 +3391,11 @@ msgstr ""
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:157
 msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-"База данных для этой адресной книги не смогла обработать текущий запрос."
+msgstr "База данных для этой адресной книги не смогла обработать текущий запрос."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:160
 msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-"База данных для этой адресной книги отказалась обрабатывать текущий запрос."
+msgstr "База данных для этой адресной книги отказалась обрабатывать текущий запрос."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:163
 msgid "This query did not complete successfully."
@@ -3413,7 +3406,7 @@ msgid "Error adding list"
 msgstr "Ошибка добавления списка"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:185
-#: ../addressbook/gui/widgets/eab-gui-util.c:693
+#: ../addressbook/gui/widgets/eab-gui-util.c:687
 msgid "Error adding contact"
 msgstr "Ошибка добавления контакта"
 
@@ -3430,7 +3423,7 @@ msgid "Error removing list"
 msgstr "Ошибка удаления списка"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:208
-#: ../addressbook/gui/widgets/eab-gui-util.c:648
+#: ../addressbook/gui/widgets/eab-gui-util.c:642
 msgid "Error removing contact"
 msgstr "Ошибка удаления контакта"
 
@@ -3481,35 +3474,35 @@ msgstr[2] "контактов"
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:594
+#: ../addressbook/gui/widgets/eab-gui-util.c:588
 msgid "list"
 msgstr "список"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:754
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Move contact to"
 msgstr "Переместить контакт в"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:756
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
 msgid "Copy contact to"
 msgstr "Копировать контакт в"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:759
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Move contacts to"
 msgstr "Переместить контакты в"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:761
+#: ../addressbook/gui/widgets/eab-gui-util.c:755
 msgid "Copy contacts to"
 msgstr "Копировать контакты в"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:764
+#: ../addressbook/gui/widgets/eab-gui-util.c:758
 msgid "Select target addressbook."
 msgstr "Выберите целевую адресную книгу."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:987
+#: ../addressbook/gui/widgets/eab-gui-util.c:982
 msgid "Multiple VCards"
 msgstr "Множество VCards"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:990
+#: ../addressbook/gui/widgets/eab-gui-util.c:985
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard для %s"
@@ -3545,7 +3538,7 @@ msgstr "Добавить адрес к существующему контакт
 msgid "Querying Address Book..."
 msgstr "Запрашивается адресная книга..."
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:968
+#: ../addressbook/gui/widgets/eab-popup-control.c:970
 msgid "Merge E-Mail Address"
 msgstr "Объединить эл.адреса"
 
@@ -3764,9 +3757,9 @@ msgstr "С тенью"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:940
-#: ../plugins/exchange-operations/exchange-calendar.c:224
-#: ../plugins/exchange-operations/exchange-contacts.c:197
+#: ../plugins/exchange-operations/exchange-account-setup.c:927
+#: ../plugins/exchange-operations/exchange-calendar.c:205
+#: ../plugins/exchange-operations/exchange-contacts.c:176
 msgid "Size:"
 msgstr "Размер:"
 
@@ -3855,8 +3848,7 @@ msgid "Export in asynchronous mode"
 msgstr "Экспорт в асинхронном режиме"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode, default size 100."
+msgid "The number of cards in one output file in asychronous mode, default size 100."
 msgstr ""
 "Количество карточек в одном файле вывода в асинхронном режиме, размер по "
 "умолчанию 100"
@@ -3866,8 +3858,7 @@ msgid "NUMBER"
 msgstr "NUMBER"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
+msgid "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Ошибка аргументов командной строки, используйте параметр --help, чтобы "
 "просмотреть доступные аргументы."
@@ -3939,8 +3930,7 @@ msgid ""
 msgstr "Вся информация из этих записей журнала будет безвозвратно удалена."
 
 #: ../calendar/calendar.error.xml.h:6
-msgid ""
-"All information in this journal will be deleted and can not be restored."
+msgid "All information in this journal will be deleted and can not be restored."
 msgstr "Вся информация из этого журнала будет удалена безвозвратно."
 
 #: ../calendar/calendar.error.xml.h:7
@@ -3954,8 +3944,7 @@ msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "Вся информация о этих задачах будет безвозвратно удалена."
 
 #: ../calendar/calendar.error.xml.h:9
-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:10
@@ -3965,8 +3954,7 @@ msgid ""
 msgstr "Вся информация об этом журнале будет окончательно удалена."
 
 #: ../calendar/calendar.error.xml.h:11
-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:12
@@ -4050,8 +4038,7 @@ msgid "Editor could not be loaded."
 msgstr "Реактор не может быть загружен."
 
 #: ../calendar/calendar.error.xml.h:32
-msgid ""
-"Email invitations will be sent to all participants and allow them to RSVP."
+msgid "Email invitations will be sent to all participants and allow them to RSVP."
 msgstr ""
 "Сообщения будут разосланы по эл. почте всем участникам, чтобы разрешить им "
 "RSVP."
@@ -4247,7 +4234,7 @@ msgid "Calendar and Tasks"
 msgstr "Календарь и задачи"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1309
+#: ../calendar/gui/calendar-component.c:1307
 msgid "Calendars"
 msgstr "Календари"
 
@@ -4280,13 +4267,13 @@ msgid "Evolution's Tasks component"
 msgstr "Компонент задач Evolution"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#: ../calendar/gui/e-tasks.c:1260 ../calendar/gui/print.c:1822
+#: ../calendar/gui/e-tasks.c:1256 ../calendar/gui/print.c:1822
 #: ../calendar/gui/tasks-component.c:519
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:457
+#: ../calendar/gui/tasks-component.c:1006 ../calendar/gui/tasks-control.c:457
 #: ../calendar/importers/icalendar-importer.c:79
 #: ../calendar/importers/icalendar-importer.c:707
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:589
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:582
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Задачи"
@@ -4331,8 +4318,8 @@ msgstr "Встречи"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/e-itip-control.c:1120
-#: ../plugins/itip-formatter/itip-view.c:884
+#: ../calendar/gui/e-itip-control.c:1118
+#: ../plugins/itip-formatter/itip-view.c:882
 msgid "Location:"
 msgstr "Адрес:"
 
@@ -4351,7 +4338,7 @@ msgstr "Напомнить _через:"
 #: ../ui/evolution-message-composer.xml.h:44
 #: ../ui/evolution-signature-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:23
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:32
 msgid "_Edit"
 msgstr "_Правка"
 
@@ -4439,11 +4426,11 @@ msgstr ""
 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:139
 msgid "Could not initialize Bonobo"
 msgstr "Не удается инициализировать Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:151
+#: ../calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Не удается создать фабрику сервиса уведомления о сигнале"
 
@@ -4472,11 +4459,8 @@ msgid "Calendars to run alarms for"
 msgstr "Календари для запуска напоминаний"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
-msgstr ""
-"Цвет маркера времени в расписании (для значения по умолчанию оставьте "
-"пустым)."
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr "Цвет маркера времени в расписании (для значения по умолчанию оставьте пустым)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
 msgid "Color to draw the Marcus Bains line in the Day View."
@@ -4540,8 +4524,7 @@ msgstr "Час начала рабочего дня, в 24-часовом фор
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr ""
-"Интервалы, отображаемые в режимах \"День\" и \"Рабочая неделя\", в минутах."
+msgstr "Интервалы, отображаемые в режимах \"День\" и \"Рабочая неделя\", в минутах."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
@@ -4694,8 +4677,7 @@ msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Единицы напоминания по умолчанию, \"minutes\", \"hours\" или \"days\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
-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\"."
@@ -4733,8 +4715,7 @@ msgid "Whether to display the end time of events in the week and month views."
 msgstr "Показывать ли время завершения событий в обзоре недели и месяца."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
-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.in.h:64
@@ -4746,8 +4727,7 @@ msgid "Whether to set a default reminder for appointments."
 msgstr "Устанавливать ли напоминание для событий по умолчанию."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
-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.in.h:67
@@ -4796,11 +4776,11 @@ msgstr "Прочее"
 
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/dialogs/calendar-setup.c:369
 #: ../calendar/gui/gnome-cal.c:2094
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:588
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:581
 msgid "Calendar"
 msgstr "Календарь"
 
@@ -4845,7 +4825,7 @@ msgid "Weather"
 msgstr "Погода"
 
 #: ../calendar/gui/calendar-component.c:535
-#: ../calendar/gui/dialogs/calendar-setup.c:449
+#: ../calendar/gui/dialogs/calendar-setup.c:451
 msgid "New Calendar"
 msgstr "Новый календарь"
 
@@ -4862,55 +4842,55 @@ msgstr "Не удаётся открыть календарь '%s' для соз
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Нет доступного календаря для создания событий и совещаний"
 
-#: ../calendar/gui/calendar-component.c:1284
+#: ../calendar/gui/calendar-component.c:1282
 msgid "Calendar Source Selector"
 msgstr "Выбор источника календаря"
 
-#: ../calendar/gui/calendar-component.c:1475
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New appointment"
 msgstr "Новая встреча"
 
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1474
 msgid "_Appointment"
 msgstr "_Встреча"
 
-#: ../calendar/gui/calendar-component.c:1477
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new appointment"
 msgstr "Создать новую встречу"
 
-#: ../calendar/gui/calendar-component.c:1483
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New meeting"
 msgstr "Новое собрание"
 
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1482
 msgid "M_eeting"
 msgstr "_Собрание"
 
-#: ../calendar/gui/calendar-component.c:1485
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new meeting request"
 msgstr "Создать новое приглашение на собрание"
 
-#: ../calendar/gui/calendar-component.c:1491
+#: ../calendar/gui/calendar-component.c:1489
 msgid "New all day appointment"
 msgstr "Новая встреча на весь день"
 
-#: ../calendar/gui/calendar-component.c:1492
+#: ../calendar/gui/calendar-component.c:1490
 msgid "All Day A_ppointment"
 msgstr "_Ежедневная встреча"
 
-#: ../calendar/gui/calendar-component.c:1493
+#: ../calendar/gui/calendar-component.c:1491
 msgid "Create a new all-day appointment"
 msgstr "Создать новую ежедневную встречу"
 
-#: ../calendar/gui/calendar-component.c:1499
+#: ../calendar/gui/calendar-component.c:1497
 msgid "New calendar"
 msgstr "Новый календарь"
 
-#: ../calendar/gui/calendar-component.c:1500
+#: ../calendar/gui/calendar-component.c:1498
 msgid "Cale_ndar"
 msgstr "Кале_ндарь"
 
-#: ../calendar/gui/calendar-component.c:1501
+#: ../calendar/gui/calendar-component.c:1499
 msgid "Create a new calendar"
 msgstr "Создать новый календарь"
 
@@ -5089,17 +5069,17 @@ msgstr "%.0fГБ"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:311
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
-#: ../calendar/gui/dialogs/comp-editor.c:2440
+#: ../calendar/gui/dialogs/comp-editor.c:2438
 #: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:444
 #: ../mail/em-utils.c:481 ../widgets/misc/e-attachment-bar.c:341
 msgid "attachment"
 msgstr "вложение"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:473
-#: ../calendar/gui/dialogs/comp-editor.c:1083
+#: ../calendar/gui/dialogs/comp-editor.c:1080
 #: ../calendar/gui/dialogs/meeting-page.c:887
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3400
+#: ../composer/e-msg-composer.c:3398
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
@@ -5107,23 +5087,23 @@ msgid "_Remove"
 msgstr "Удалить"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:474
-#: ../calendar/gui/dialogs/comp-editor.c:1084
+#: ../calendar/gui/dialogs/comp-editor.c:1081
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3401 ../mail/em-folder-tree.c:2058
+#: ../composer/e-msg-composer.c:3399 ../mail/em-folder-tree.c:2047
 #: ../ui/evolution-mail-list.xml.h:29
 msgid "_Properties"
 msgstr "_Свойства"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:476
-#: ../calendar/gui/dialogs/comp-editor.c:1086
+#: ../calendar/gui/dialogs/comp-editor.c:1083
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3403
+#: ../composer/e-msg-composer.c:3401
 msgid "_Add attachment..."
 msgstr "_Добавить вложение..."
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:736
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:963
+#: ../widgets/misc/e-attachment-bar.c:958
 msgid "Attachment Bar"
 msgstr "Панель вложений"
 
@@ -5131,14 +5111,14 @@ msgstr "Панель вложений"
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:6
 #: ../composer/e-msg-composer-attachment.glade.h:6
-#: ../composer/e-msg-composer-select-file.c:97
-#: ../composer/e-msg-composer-select-file.c:117
+#: ../composer/e-msg-composer-select-file.c:96
+#: ../composer/e-msg-composer-select-file.c:116
 #: ../widgets/misc/e-attachment.glade.h:6
 msgid "Suggest automatic display of attachment"
 msgstr "Предполагать автоматическое отображение вложения"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
-#: ../composer/e-msg-composer-select-file.c:241
+#: ../composer/e-msg-composer-select-file.c:238
 msgid "Attach file(s)"
 msgstr "Вложить файл(ы)"
 
@@ -5173,7 +5153,7 @@ msgstr "Свойства вложения"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:267
-#: ../calendar/gui/e-itip-control.c:1166
+#: ../calendar/gui/e-itip-control.c:1164
 #: ../calendar/gui/e-itip-control.glade.h:6
 #: ../composer/e-msg-composer-attachment.glade.h:3
 #: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
@@ -5277,8 +5257,7 @@ msgstr "<b>Рабочая неделя</b> "
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #, 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>"
@@ -5318,7 +5297,7 @@ msgstr "Cвободен/занят"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: ../calendar/gui/dialogs/recurrence-page.c:1048
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Friday"
 msgstr "Пятница"
 
@@ -5332,7 +5311,7 @@ msgstr "Минут"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: ../calendar/gui/dialogs/recurrence-page.c:1044
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Monday"
 msgstr "Понедельник"
 
@@ -5346,7 +5325,7 @@ msgstr "Вск"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ../calendar/gui/dialogs/recurrence-page.c:1049
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Saturday"
 msgstr "Суббота"
 
@@ -5360,7 +5339,7 @@ msgstr "Показывать номера недель в навигаторе �
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: ../calendar/gui/dialogs/recurrence-page.c:1050
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Sunday"
 msgstr "Воскресенье"
 
@@ -5378,7 +5357,7 @@ msgstr "Шаблон:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 #: ../calendar/gui/dialogs/recurrence-page.c:1047
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Thursday"
 msgstr "Четверг"
 
@@ -5392,7 +5371,7 @@ msgstr "Формат времени:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/dialogs/recurrence-page.c:1045
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Tuesday"
 msgstr "Вторник"
 
@@ -5402,7 +5381,7 @@ msgstr "Начало недели:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #: ../calendar/gui/dialogs/recurrence-page.c:1046
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Wednesday"
 msgstr "Среда"
 
@@ -5490,20 +5469,20 @@ msgstr "Скопировать содержимое календаря лока�
 msgid "Copy task list contents locally for offline operation"
 msgstr "Скопировать содержимое списка задач локально для автономной работы"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:341
+#: ../calendar/gui/dialogs/calendar-setup.c:343
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "_Цвет:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:380
 msgid "Tasks List"
 msgstr "Список задач"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:447
+#: ../calendar/gui/dialogs/calendar-setup.c:449
 msgid "Calendar Properties"
 msgstr "Свойства календаря"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:515
+#: ../calendar/gui/dialogs/calendar-setup.c:517
 msgid "Task List Properties"
 msgstr "Свойства списка задач"
 
@@ -5614,15 +5593,15 @@ msgstr " (к дате"
 msgid "Due "
 msgstr "К дате"
 
-#: ../calendar/gui/dialogs/comp-editor.c:190 ../composer/e-msg-composer.c:2664
+#: ../calendar/gui/dialogs/comp-editor.c:190 ../composer/e-msg-composer.c:2663
 #, c-format
 msgid "Attached message - %s"
 msgstr "Вложенное сообщение - %s"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:195
-#: ../calendar/gui/dialogs/comp-editor.c:365 ../composer/e-msg-composer.c:2669
-#: ../composer/e-msg-composer.c:2846
+#: ../calendar/gui/dialogs/comp-editor.c:365 ../composer/e-msg-composer.c:2668
+#: ../composer/e-msg-composer.c:2845
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
@@ -5631,23 +5610,23 @@ msgstr[1] "%d вложенных сообщения"
 msgstr[2] "%d вложенных сообщений"
 
 #: ../calendar/gui/dialogs/comp-editor.c:428
-#: ../calendar/gui/e-calendar-table.c:1171
-#: ../calendar/gui/e-calendar-view.c:1535 ../composer/e-msg-composer.c:2911
-#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1035
-#: ../mail/message-list.c:1718 ../ui/evolution-addressbook.xml.h:31
+#: ../calendar/gui/e-calendar-table.c:1162
+#: ../calendar/gui/e-calendar-view.c:1536 ../composer/e-msg-composer.c:2909
+#: ../mail/em-folder-tree.c:974 ../mail/em-folder-view.c:1035
+#: ../mail/message-list.c:1708 ../ui/evolution-addressbook.xml.h:31
 #: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
 #: ../ui/evolution-mail-message.xml.h:102 ../ui/evolution-tasks.xml.h:21
 msgid "_Copy"
 msgstr "_Копировать"
 
-#: ../calendar/gui/dialogs/comp-editor.c:429 ../composer/e-msg-composer.c:2912
-#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1719
+#: ../calendar/gui/dialogs/comp-editor.c:429 ../composer/e-msg-composer.c:2910
+#: ../mail/em-folder-tree.c:975 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1709
 msgid "_Move"
 msgstr "Пере_местить"
 
-#: ../calendar/gui/dialogs/comp-editor.c:431 ../composer/e-msg-composer.c:2914
-#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1721
+#: ../calendar/gui/dialogs/comp-editor.c:431 ../composer/e-msg-composer.c:2912
+#: ../mail/em-folder-tree.c:977 ../mail/message-list.c:1711
 msgid "Cancel _Drag"
 msgstr "Отменить _перенос"
 
@@ -5655,7 +5634,7 @@ msgstr "Отменить _перенос"
 msgid "Could not update object"
 msgstr "Не удается обновить объект"
 
-#: ../calendar/gui/dialogs/comp-editor.c:977 ../composer/e-msg-composer.c:2318
+#: ../calendar/gui/dialogs/comp-editor.c:974 ../composer/e-msg-composer.c:2317
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5663,59 +5642,59 @@ msgstr[0] "<b>%d</b> вложение"
 msgstr[1] "<b>%d</b> вложения"
 msgstr[2] "<b>%d</b> вложений"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1249
+#: ../calendar/gui/dialogs/comp-editor.c:1246
 msgid "_Attachment Bar (drop attachments here)"
 msgstr "_Панель вложений (для перетаскивания вложений)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1850
-#: ../calendar/gui/dialogs/comp-editor.c:1893
+#: ../calendar/gui/dialogs/comp-editor.c:1847
+#: ../calendar/gui/dialogs/comp-editor.c:1890
 msgid "Edit Appointment"
 msgstr "Изменить встречу"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1856
-#: ../calendar/gui/dialogs/comp-editor.c:1899
+#: ../calendar/gui/dialogs/comp-editor.c:1853
+#: ../calendar/gui/dialogs/comp-editor.c:1896
 #, c-format
 msgid "Meeting - %s"
 msgstr "Собрание - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1858
-#: ../calendar/gui/dialogs/comp-editor.c:1901
+#: ../calendar/gui/dialogs/comp-editor.c:1855
+#: ../calendar/gui/dialogs/comp-editor.c:1898
 #, c-format
 msgid "Appointment - %s"
 msgstr "Встреча - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1862
-#: ../calendar/gui/dialogs/comp-editor.c:1905
+#: ../calendar/gui/dialogs/comp-editor.c:1859
+#: ../calendar/gui/dialogs/comp-editor.c:1902
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Назначенная задача - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1864
-#: ../calendar/gui/dialogs/comp-editor.c:1907
+#: ../calendar/gui/dialogs/comp-editor.c:1861
+#: ../calendar/gui/dialogs/comp-editor.c:1904
 #, c-format
 msgid "Task - %s"
 msgstr "Задача - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1867
-#: ../calendar/gui/dialogs/comp-editor.c:1910
+#: ../calendar/gui/dialogs/comp-editor.c:1864
+#: ../calendar/gui/dialogs/comp-editor.c:1907
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Запись в журнале - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1878
-#: ../calendar/gui/dialogs/comp-editor.c:1920
+#: ../calendar/gui/dialogs/comp-editor.c:1875
+#: ../calendar/gui/dialogs/comp-editor.c:1917
 msgid "No summary"
 msgstr "Нет Краткого описания"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2528
-#: ../calendar/gui/dialogs/comp-editor.c:2561
-#: ../calendar/gui/dialogs/comp-editor.c:2585
+#: ../calendar/gui/dialogs/comp-editor.c:2526
+#: ../calendar/gui/dialogs/comp-editor.c:2559
+#: ../calendar/gui/dialogs/comp-editor.c:2583
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Изменения этого элемента будут отвергнуты, если по эл. почте придет "
 "обновление."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2609
+#: ../calendar/gui/dialogs/comp-editor.c:2607
 msgid "Unable to use current version!"
 msgstr "Не удается использовать текущую версию!"
 
@@ -5929,7 +5908,7 @@ msgstr "Класси_фикация:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:8
-#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:324
 #: ../calendar/gui/e-calendar-table.c:360
 msgid "Confidential"
 msgstr "Конфиденциальное"
@@ -5944,15 +5923,15 @@ msgstr "Располо_жение:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 #: ../calendar/gui/dialogs/task-page.glade.h:10
-#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:323
+#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:322
 #: ../calendar/gui/e-calendar-table.c:359
 msgid "Private"
 msgstr "Личное"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:18
 #: ../calendar/gui/dialogs/task-page.glade.h:11
-#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:358
+#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:313
+#: ../calendar/gui/e-cal-model.c:320 ../calendar/gui/e-calendar-table.c:358
 msgid "Public"
 msgstr "Общее"
 
@@ -6003,7 +5982,7 @@ msgstr "<b>От:</b>"
 #: ../calendar/gui/dialogs/meeting-page.c:313
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:653
-#: ../calendar/gui/e-itip-control.c:1106 ../composer/e-msg-composer.c:2122
+#: ../calendar/gui/e-itip-control.c:1104 ../composer/e-msg-composer.c:2121
 #: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
 #: ../mail/em-account-editor.c:1348 ../mail/em-account-prefs.c:464
 #: ../mail/em-folder-view.c:1064 ../mail/em-junk-hook.c:78
@@ -6076,7 +6055,7 @@ msgid "RSVP"
 msgstr "Заинтересованное лицо"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
-#: ../calendar/gui/dialogs/task-editor.c:146
+#: ../calendar/gui/dialogs/task-editor.c:147
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/e-meeting-list-view.c:394
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
@@ -6159,10 +6138,8 @@ msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Вы изменяете повторяющуюся задачу, что именно вы хотите изменить?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:62
-msgid ""
-"You are modifying a recurring journal entry, what would you like to modify?"
-msgstr ""
-"Вы изменяете повторяющуюся запись в журнале, что именно вы хотите изменить?"
+msgid "You are modifying a recurring journal entry, what would you like to modify?"
+msgstr "Вы изменяете повторяющуюся запись в журнале, что именно вы хотите изменить?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
@@ -6300,7 +6277,7 @@ msgstr "<span weight=\"bold\">Состояние</span>"
 #: ../calendar/gui/e-cal-component-preview.c:229
 #: ../calendar/gui/e-cal-model-tasks.c:346
 #: ../calendar/gui/e-cal-model-tasks.c:659
-#: ../calendar/gui/e-calendar-table.c:455 ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-calendar-table.c:455 ../calendar/gui/e-itip-control.c:896
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
 #: ../calendar/gui/print.c:2361 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
@@ -6308,7 +6285,7 @@ msgstr "Завершена"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-calendar-table.c:380 ../mail/message-list.c:1018
+#: ../calendar/gui/e-calendar-table.c:380 ../mail/message-list.c:1008
 msgid "High"
 msgstr "Высокий"
 
@@ -6323,14 +6300,14 @@ msgstr "Выполняется"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1016
+#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1006
 msgid "Low"
 msgstr "Низкий"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:381
-#: ../mail/message-list.c:1017
+#: ../calendar/gui/e-cal-model.c:918 ../calendar/gui/e-calendar-table.c:381
+#: ../mail/message-list.c:1007
 msgid "Normal"
 msgstr "Нормальный"
 
@@ -6368,13 +6345,13 @@ msgstr "Состояние:"
 msgid "_Web Page:"
 msgstr "_Веб-страница:"
 
-#: ../calendar/gui/dialogs/task-editor.c:137 ../calendar/gui/print.c:2300
+#: ../calendar/gui/dialogs/task-editor.c:138 ../calendar/gui/print.c:2300
 msgid "Task"
 msgstr "Задание"
 
-#: ../calendar/gui/dialogs/task-editor.c:161
-#: ../calendar/gui/dialogs/task-editor.c:223
-#: ../calendar/gui/dialogs/task-editor.c:380
+#: ../calendar/gui/dialogs/task-editor.c:162
+#: ../calendar/gui/dialogs/task-editor.c:224
+#: ../calendar/gui/dialogs/task-editor.c:378
 msgid "Assignment"
 msgstr "Назначение"
 
@@ -6547,7 +6524,7 @@ msgid "Untitled"
 msgstr "Неозаглавленное"
 
 #: ../calendar/gui/e-cal-component-preview.c:186
-#: ../calendar/gui/e-itip-control.c:1110
+#: ../calendar/gui/e-itip-control.c:1108
 #: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Сводка:"
@@ -6564,9 +6541,9 @@ msgstr "Дата выполнения:"
 #. write status
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:222
-#: ../calendar/gui/e-itip-control.c:1134
-#: ../plugins/exchange-operations/exchange-account-setup.c:265
-#: ../plugins/itip-formatter/itip-view.c:909
+#: ../calendar/gui/e-itip-control.c:1132
+#: ../plugins/exchange-operations/exchange-account-setup.c:269
+#: ../plugins/itip-formatter/itip-view.c:907
 msgid "Status:"
 msgstr "Состояние:"
 
@@ -6613,7 +6590,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:192
 #: ../calendar/gui/e-meeting-store.c:168 ../calendar/gui/e-meeting-store.c:178
 #: ../calendar/gui/e-meeting-store.c:808
@@ -6621,7 +6598,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Да"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
 #: ../calendar/gui/e-meeting-store.c:180
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
@@ -6629,8 +6606,8 @@ msgid "No"
 msgstr "Нет"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-model.c:330
-#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.c:1292
+#: ../calendar/gui/e-cal-model.c:326 ../calendar/gui/e-cal-model.c:329
+#: ../calendar/gui/e-itip-control.c:1149 ../calendar/gui/e-itip-control.c:1290
 #: ../calendar/gui/e-meeting-list-view.c:168
 #: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
@@ -6638,16 +6615,16 @@ msgstr "Нет"
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1652
 #: ../plugins/plugin-manager/plugin-manager.c:72
-#: ../widgets/misc/e-attachment-bar.c:659
+#: ../widgets/misc/e-attachment-bar.c:654
 #: ../widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "Повторение"
 
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "Назначено"
 
@@ -6709,74 +6686,74 @@ msgstr "Удаление выделенных объектов"
 msgid "Updating objects"
 msgstr "Обновление объектов"
 
-#: ../calendar/gui/e-calendar-table.c:1021
-#: ../calendar/gui/e-calendar-view.c:1105 ../composer/e-msg-composer.c:1243
+#: ../calendar/gui/e-calendar-table.c:1012
+#: ../calendar/gui/e-calendar-view.c:1105 ../composer/e-msg-composer.c:1242
 msgid "Save as..."
 msgstr "Сохранить как..."
 
-#: ../calendar/gui/e-calendar-table.c:1164
+#: ../calendar/gui/e-calendar-table.c:1155
 msgid "Open _Web Page"
 msgstr "Открыть _веб-страницу"
 
-#: ../calendar/gui/e-calendar-table.c:1165
-#: ../calendar/gui/e-calendar-view.c:1529 ../mail/em-folder-view.c:1045
+#: ../calendar/gui/e-calendar-table.c:1156
+#: ../calendar/gui/e-calendar-view.c:1530 ../mail/em-folder-view.c:1045
 #: ../mail/em-popup.c:541 ../mail/em-popup.c:552
 msgid "_Save As..."
 msgstr "Со_хранить как..."
 
-#: ../calendar/gui/e-calendar-table.c:1166
-#: ../calendar/gui/e-calendar-view.c:1509
-#: ../calendar/gui/e-calendar-view.c:1530 ../mail/em-folder-view.c:1046
+#: ../calendar/gui/e-calendar-table.c:1157
+#: ../calendar/gui/e-calendar-view.c:1510
+#: ../calendar/gui/e-calendar-view.c:1531 ../mail/em-folder-view.c:1046
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-tasks.xml.h:27
 msgid "_Print..."
 msgstr "_Печать..."
 
-#: ../calendar/gui/e-calendar-table.c:1170
-#: ../calendar/gui/e-calendar-view.c:1534 ../ui/evolution-addressbook.xml.h:1
+#: ../calendar/gui/e-calendar-table.c:1161
+#: ../calendar/gui/e-calendar-view.c:1535 ../ui/evolution-addressbook.xml.h:1
 #: ../ui/evolution-calendar.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Вырезать"
 
-#: ../calendar/gui/e-calendar-table.c:1172
-#: ../calendar/gui/e-calendar-view.c:1512
-#: ../calendar/gui/e-calendar-view.c:1536 ../ui/evolution-addressbook.xml.h:38
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:1513
+#: ../calendar/gui/e-calendar-view.c:1537 ../ui/evolution-addressbook.xml.h:38
 #: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Paste"
 msgstr "Вст_авить"
 
-#: ../calendar/gui/e-calendar-table.c:1176 ../ui/evolution-tasks.xml.h:20
+#: ../calendar/gui/e-calendar-table.c:1167 ../ui/evolution-tasks.xml.h:20
 msgid "_Assign Task"
 msgstr "_Назначить задачу"
 
-#: ../calendar/gui/e-calendar-table.c:1177 ../ui/evolution-tasks.xml.h:24
+#: ../calendar/gui/e-calendar-table.c:1168 ../ui/evolution-tasks.xml.h:24
 msgid "_Forward as iCalendar"
 msgstr "_Переслать как iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1178
+#: ../calendar/gui/e-calendar-table.c:1169
 msgid "_Mark as Complete"
 msgstr "По_метить как выполненное"
 
-#: ../calendar/gui/e-calendar-table.c:1179
+#: ../calendar/gui/e-calendar-table.c:1170
 msgid "_Mark Selected Tasks as Complete"
 msgstr "По_метить выбранную задачу как выполненную"
 
 #. FIXME: need to disable for undeletable folders
-#: ../calendar/gui/e-calendar-table.c:1183
-#: ../calendar/gui/e-calendar-view.c:1548 ../mail/em-folder-tree.c:2054
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1549 ../mail/em-folder-tree.c:2043
 #: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:33
 #: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
 #: ../ui/evolution-tasks.xml.h:22
 msgid "_Delete"
 msgstr "_Удалить"
 
-#: ../calendar/gui/e-calendar-table.c:1184
+#: ../calendar/gui/e-calendar-table.c:1175
 msgid "_Delete Selected Tasks"
 msgstr "У_далить выделенные задачи"
 
-#: ../calendar/gui/e-calendar-table.c:1335
+#: ../calendar/gui/e-calendar-table.c:1326
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Щёлкните здесь, чтобы добавить задачу"
@@ -6819,65 +6796,65 @@ msgstr "Перемещение элементов"
 msgid "Copying items"
 msgstr "Копирование элементов"
 
-#: ../calendar/gui/e-calendar-view.c:1503
+#: ../calendar/gui/e-calendar-view.c:1504
 msgid "New _Appointment..."
 msgstr "Новая _встреча..."
 
-#: ../calendar/gui/e-calendar-view.c:1504
+#: ../calendar/gui/e-calendar-view.c:1505
 msgid "New All Day _Event"
 msgstr "Новое ежедневное событие"
 
-#: ../calendar/gui/e-calendar-view.c:1506
+#: ../calendar/gui/e-calendar-view.c:1507
 msgid "New Task"
 msgstr "Новая задача"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1516
+#: ../calendar/gui/e-calendar-view.c:1517
 msgid "Current View"
 msgstr "Текущий вид"
 
-#: ../calendar/gui/e-calendar-view.c:1518 ../ui/evolution-calendar.xml.h:26
+#: ../calendar/gui/e-calendar-view.c:1519 ../ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Выделить _сегодняшний день"
 
-#: ../calendar/gui/e-calendar-view.c:1519
+#: ../calendar/gui/e-calendar-view.c:1520
 msgid "_Select Date..."
 msgstr "_Выделить дату..."
 
 #. TODO: Why is this in a context menu when it applies globally?
-#: ../calendar/gui/e-calendar-view.c:1524 ../ui/evolution-calendar.xml.h:45
+#: ../calendar/gui/e-calendar-view.c:1525 ../ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "Опубликовать информацию о занятости"
 
-#: ../calendar/gui/e-calendar-view.c:1540
+#: ../calendar/gui/e-calendar-view.c:1541
 msgid "Cop_y to Calendar..."
 msgstr "Коп_ировать в календарь..."
 
-#: ../calendar/gui/e-calendar-view.c:1541
+#: ../calendar/gui/e-calendar-view.c:1542
 msgid "Mo_ve to Calendar..."
 msgstr "Пере_местить в Календарь..."
 
-#: ../calendar/gui/e-calendar-view.c:1542
+#: ../calendar/gui/e-calendar-view.c:1543
 msgid "_Delegate Meeting..."
 msgstr "_Поручить собрание..."
 
-#: ../calendar/gui/e-calendar-view.c:1543
+#: ../calendar/gui/e-calendar-view.c:1544
 msgid "_Schedule Meeting..."
 msgstr "_Назначить собрание..."
 
-#: ../calendar/gui/e-calendar-view.c:1544
+#: ../calendar/gui/e-calendar-view.c:1545
 msgid "_Forward as iCalendar..."
 msgstr "_Переслать как iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1549
+#: ../calendar/gui/e-calendar-view.c:1550
 msgid "Make this Occurrence _Movable"
 msgstr "Сделать это вхождение пере_мещаемым"
 
-#: ../calendar/gui/e-calendar-view.c:1550
+#: ../calendar/gui/e-calendar-view.c:1551
 msgid "Delete this _Occurrence"
 msgstr "Удалить это вхождение"
 
-#: ../calendar/gui/e-calendar-view.c:1551
+#: ../calendar/gui/e-calendar-view.c:1552
 msgid "Delete _All Occurrences"
 msgstr "Удалить все вхождения"
 
@@ -6923,28 +6900,28 @@ 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:715 ../calendar/gui/e-day-view.c:1493
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1497
 #: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1517
 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:748 ../calendar/gui/e-week-view.c:512
+#: ../calendar/gui/e-day-view.c:750 ../calendar/gui/e-week-view.c:512
 #: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:751 ../calendar/gui/e-week-view.c:515
+#: ../calendar/gui/e-day-view.c:753 ../calendar/gui/e-week-view.c:515
 #: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:763
+#: ../calendar/gui/e-itip-control.c:761
 msgid "Yes. (Complex Recurrence)"
 msgstr "Да. (Сложное повторение)"
 
-#: ../calendar/gui/e-itip-control.c:774
+#: ../calendar/gui/e-itip-control.c:772
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -6952,7 +6929,7 @@ msgstr[0] "Каждый %d день"
 msgstr[1] "Каждые %d дня"
 msgstr[2] "Каждые %d дней"
 
-#: ../calendar/gui/e-itip-control.c:779
+#: ../calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
@@ -6960,7 +6937,7 @@ msgstr[0] "Каждую %d неделю"
 msgstr[1] "Каждые %d недели"
 msgstr[2] "Каждые %d недель"
 
-#: ../calendar/gui/e-itip-control.c:781
+#: ../calendar/gui/e-itip-control.c:779
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -6968,21 +6945,21 @@ msgstr[0] "Каждую %d неделю в "
 msgstr[1] "Каждые %d недели в "
 msgstr[2] "Каждые %d недель в "
 
-#: ../calendar/gui/e-itip-control.c:789
+#: ../calendar/gui/e-itip-control.c:787
 msgid " and "
 msgstr " и "
 
-#: ../calendar/gui/e-itip-control.c:796
+#: ../calendar/gui/e-itip-control.c:794
 #, c-format
 msgid "The %s day of "
 msgstr "%s дней "
 
-#: ../calendar/gui/e-itip-control.c:809
+#: ../calendar/gui/e-itip-control.c:807
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s "
 
-#: ../calendar/gui/e-itip-control.c:816
+#: ../calendar/gui/e-itip-control.c:814
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -6990,7 +6967,7 @@ msgstr[0] "каждый %d месяц"
 msgstr[1] "каждые %d месяца"
 msgstr[2] "каждые %d месяцев"
 
-#: ../calendar/gui/e-itip-control.c:820
+#: ../calendar/gui/e-itip-control.c:818
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
@@ -6998,7 +6975,7 @@ msgstr[0] "Каждый %d год"
 msgstr[1] "Каждые %d года"
 msgstr[2] "Каждые %d лет"
 
-#: ../calendar/gui/e-itip-control.c:831
+#: ../calendar/gui/e-itip-control.c:829
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7006,43 +6983,43 @@ msgstr[0] " всего %d раз"
 msgstr[1] " всего %d раза"
 msgstr[2] " всего %d раз"
 
-#: ../calendar/gui/e-itip-control.c:840
+#: ../calendar/gui/e-itip-control.c:838
 msgid ", ending on "
 msgstr ", заканчивается на"
 
-#: ../calendar/gui/e-itip-control.c:864
+#: ../calendar/gui/e-itip-control.c:862
 msgid "Starts"
 msgstr "Начинается"
 
-#: ../calendar/gui/e-itip-control.c:877
+#: ../calendar/gui/e-itip-control.c:875
 msgid "Ends"
 msgstr "Заканчивается"
 
-#: ../calendar/gui/e-itip-control.c:911
+#: ../calendar/gui/e-itip-control.c:909
 #: ../plugins/save-calendar/csv-format.c:395
 msgid "Due"
 msgstr "Срок завершения"
 
-#: ../calendar/gui/e-itip-control.c:951 ../calendar/gui/e-itip-control.c:1008
+#: ../calendar/gui/e-itip-control.c:949 ../calendar/gui/e-itip-control.c:1006
 msgid "iCalendar Information"
 msgstr "Сведения iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:968
+#: ../calendar/gui/e-itip-control.c:966
 msgid "iCalendar Error"
 msgstr "Ошибка iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1040 ../calendar/gui/e-itip-control.c:1056
-#: ../calendar/gui/e-itip-control.c:1067 ../calendar/gui/e-itip-control.c:1084
-#: ../plugins/itip-formatter/itip-view.c:338
-#: ../plugins/itip-formatter/itip-view.c:339
-#: ../plugins/itip-formatter/itip-view.c:406
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../calendar/gui/e-itip-control.c:1038 ../calendar/gui/e-itip-control.c:1054
+#: ../calendar/gui/e-itip-control.c:1065 ../calendar/gui/e-itip-control.c:1082
+#: ../plugins/itip-formatter/itip-view.c:336
+#: ../plugins/itip-formatter/itip-view.c:337
+#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:405
 msgid "An unknown person"
 msgstr "Неизвестное лицо"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1091
+#: ../calendar/gui/e-itip-control.c:1089
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7050,7 +7027,7 @@ msgstr ""
 "<b> Пересмотрите следующую информацию и выберите действие из расположенного "
 "ниже меню."
 
-#: ../calendar/gui/e-itip-control.c:1139
+#: ../calendar/gui/e-itip-control.c:1137
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
 #: ../calendar/gui/itip-utils.c:548
@@ -7058,12 +7035,12 @@ msgstr ""
 msgid "Accepted"
 msgstr "Принято"
 
-#: ../calendar/gui/e-itip-control.c:1143 ../calendar/gui/itip-utils.c:551
+#: ../calendar/gui/e-itip-control.c:1141 ../calendar/gui/itip-utils.c:551
 #: ../plugins/itip-formatter/itip-formatter.c:1643
 msgid "Tentatively Accepted"
 msgstr "Экспериментально принятый"
 
-#: ../calendar/gui/e-itip-control.c:1147
+#: ../calendar/gui/e-itip-control.c:1145
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
 #: ../calendar/gui/itip-utils.c:554 ../calendar/gui/itip-utils.c:583
@@ -7071,276 +7048,271 @@ msgstr "Экспериментально принятый"
 msgid "Declined"
 msgstr "Отклонено"
 
-#: ../calendar/gui/e-itip-control.c:1231
+#: ../calendar/gui/e-itip-control.c:1229
 msgid ""
 "The meeting has been cancelled, however it could not be found in your "
 "calendars"
-msgstr ""
-"Собрание было отменено, но оно не может быть найдено в ваших календарях"
+msgstr "Собрание было отменено, но оно не может быть найдено в ваших календарях"
 
-#: ../calendar/gui/e-itip-control.c:1233
-msgid ""
-"The task has been cancelled, however it could not be found in your task lists"
-msgstr ""
-"Задача была отменена, но она не может быть найдена в ваших списках задач"
+#: ../calendar/gui/e-itip-control.c:1231
+msgid "The task has been cancelled, however it could not be found in your task lists"
+msgstr "Задача была отменена, но она не может быть найдена в ваших списках задач"
 
-#: ../calendar/gui/e-itip-control.c:1312
+#: ../calendar/gui/e-itip-control.c:1310
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> опубликовал последнюю информацию о собрании."
 
-#: ../calendar/gui/e-itip-control.c:1313
+#: ../calendar/gui/e-itip-control.c:1311
 msgid "Meeting Information"
 msgstr "Информация о собрании"
 
-#: ../calendar/gui/e-itip-control.c:1319
+#: ../calendar/gui/e-itip-control.c:1317
 #, 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:1321
+#: ../calendar/gui/e-itip-control.c:1319
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> запрашивает ваше присутствие на собрании."
 
-#: ../calendar/gui/e-itip-control.c:1322
+#: ../calendar/gui/e-itip-control.c:1320
 msgid "Meeting Proposal"
 msgstr "Предложение собрания"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1328
+#: ../calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> желает добавить к существующему собранию."
 
-#: ../calendar/gui/e-itip-control.c:1329
+#: ../calendar/gui/e-itip-control.c:1327
 msgid "Meeting Update"
 msgstr "Обновление собрания"
 
-#: ../calendar/gui/e-itip-control.c:1333
+#: ../calendar/gui/e-itip-control.c:1331
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> желает получить последнюю информацию о собрании."
 
-#: ../calendar/gui/e-itip-control.c:1334
+#: ../calendar/gui/e-itip-control.c:1332
 msgid "Meeting Update Request"
 msgstr "Запрос обновления собрания"
 
-#: ../calendar/gui/e-itip-control.c:1341
+#: ../calendar/gui/e-itip-control.c:1339
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> ответил на приглашение на собрание."
 
-#: ../calendar/gui/e-itip-control.c:1342
+#: ../calendar/gui/e-itip-control.c:1340
 msgid "Meeting Reply"
 msgstr "Ответ собрания"
 
-#: ../calendar/gui/e-itip-control.c:1349
+#: ../calendar/gui/e-itip-control.c:1347
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> отменил собрание."
 
-#: ../calendar/gui/e-itip-control.c:1350
+#: ../calendar/gui/e-itip-control.c:1348
 msgid "Meeting Cancellation"
 msgstr "Отмена собрания"
 
-#: ../calendar/gui/e-itip-control.c:1360 ../calendar/gui/e-itip-control.c:1437
-#: ../calendar/gui/e-itip-control.c:1477
+#: ../calendar/gui/e-itip-control.c:1358 ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1475
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> отправил невразумительное сообщение."
 
-#: ../calendar/gui/e-itip-control.c:1361
+#: ../calendar/gui/e-itip-control.c:1359
 msgid "Bad Meeting Message"
 msgstr "Неверное сообщение собрания"
 
-#: ../calendar/gui/e-itip-control.c:1388
+#: ../calendar/gui/e-itip-control.c:1386
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> опубликовал информацию о задаче"
 
-#: ../calendar/gui/e-itip-control.c:1389
+#: ../calendar/gui/e-itip-control.c:1387
 msgid "Task Information"
 msgstr "Информация о задаче"
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1394
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> запрашивает %s для выполнения задачи."
 
-#: ../calendar/gui/e-itip-control.c:1398
+#: ../calendar/gui/e-itip-control.c:1396
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> запрашивает, чтобы вы выполнили задачу."
 
-#: ../calendar/gui/e-itip-control.c:1399
+#: ../calendar/gui/e-itip-control.c:1397
 msgid "Task Proposal"
 msgstr "Предложение задачи"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1403
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> желает добавить к существующей задаче."
 
-#: ../calendar/gui/e-itip-control.c:1406
+#: ../calendar/gui/e-itip-control.c:1404
 msgid "Task Update"
 msgstr "Обновление задачи"
 
-#: ../calendar/gui/e-itip-control.c:1410
+#: ../calendar/gui/e-itip-control.c:1408
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> желает получить последнюю информацию о задаче."
 
-#: ../calendar/gui/e-itip-control.c:1411
+#: ../calendar/gui/e-itip-control.c:1409
 msgid "Task Update Request"
 msgstr "Запрос обновления задачи"
 
-#: ../calendar/gui/e-itip-control.c:1418
+#: ../calendar/gui/e-itip-control.c:1416
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> ответил на назначение задачи."
 
-#: ../calendar/gui/e-itip-control.c:1419
+#: ../calendar/gui/e-itip-control.c:1417
 msgid "Task Reply"
 msgstr "Ответ собрания"
 
-#: ../calendar/gui/e-itip-control.c:1426
+#: ../calendar/gui/e-itip-control.c:1424
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> отменил задачу."
 
-#: ../calendar/gui/e-itip-control.c:1427
+#: ../calendar/gui/e-itip-control.c:1425
 msgid "Task Cancellation"
 msgstr "Отмена задачи"
 
-#: ../calendar/gui/e-itip-control.c:1438
+#: ../calendar/gui/e-itip-control.c:1436
 msgid "Bad Task Message"
 msgstr "Сообщение календаря"
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1460
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> опубликовал информацию о занятости."
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1461
 msgid "Free/Busy Information"
 msgstr "Информация о занятости"
 
-#: ../calendar/gui/e-itip-control.c:1467
+#: ../calendar/gui/e-itip-control.c:1465
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> запрашивает информацию о вашей занятости."
 
-#: ../calendar/gui/e-itip-control.c:1468
+#: ../calendar/gui/e-itip-control.c:1466
 msgid "Free/Busy Request"
 msgstr "Запрос информации о занятости"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1470
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> ответил на запрос информации о занятости."
 
-#: ../calendar/gui/e-itip-control.c:1473
+#: ../calendar/gui/e-itip-control.c:1471
 msgid "Free/Busy Reply"
 msgstr "Ответ занятости"
 
-#: ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1476
 msgid "Bad Free/Busy Message"
 msgstr "Неверное сообщение о занятости"
 
-#: ../calendar/gui/e-itip-control.c:1553
+#: ../calendar/gui/e-itip-control.c:1551
 msgid "The message does not appear to be properly formed"
 msgstr "Похоже что сообщение не было правильно сформировано"
 
-#: ../calendar/gui/e-itip-control.c:1612
+#: ../calendar/gui/e-itip-control.c:1610
 msgid "The message contains only unsupported requests."
 msgstr "Это сообщение содержит только неподдерживаемые запросы"
 
-#: ../calendar/gui/e-itip-control.c:1645
+#: ../calendar/gui/e-itip-control.c:1643
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Вложение не содержит правильного сообщения календаря."
 
-#: ../calendar/gui/e-itip-control.c:1677
+#: ../calendar/gui/e-itip-control.c:1675
 msgid "The attachment has no viewable calendar items"
 msgstr "Вложение не содержит пригодных для просмотра элементов календаря."
 
-#: ../calendar/gui/e-itip-control.c:1911
+#: ../calendar/gui/e-itip-control.c:1909
 msgid "Update complete\n"
 msgstr "Обновление закончено\n"
 
-#: ../calendar/gui/e-itip-control.c:1939
+#: ../calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Объект некорректен и не может быть обновлен\n"
 
-#: ../calendar/gui/e-itip-control.c:1949
+#: ../calendar/gui/e-itip-control.c:1947
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr ""
-"Этот ответ пришел не от текущего участника.  Добавить его, как участника?"
+msgstr "Этот ответ пришел не от текущего участника.  Добавить его, как участника?"
 
-#: ../calendar/gui/e-itip-control.c:1961
+#: ../calendar/gui/e-itip-control.c:1959
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr ""
-"Статус участника не может быть обновлён из-за неверного текущего статуса!\n"
+msgstr "Статус участника не может быть обновлён из-за неверного текущего статуса!\n"
 
-#: ../calendar/gui/e-itip-control.c:1978
+#: ../calendar/gui/e-itip-control.c:1976
 msgid "Attendee status updated\n"
 msgstr "Статус участника обновлён!\n"
 
-#: ../calendar/gui/e-itip-control.c:1981
+#: ../calendar/gui/e-itip-control.c:1979
 #: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Статус участника не может быть обновлён, потому что элемент больше не "
 "существует"
 
-#: ../calendar/gui/e-itip-control.c:2011
+#: ../calendar/gui/e-itip-control.c:2009
 msgid "Removal Complete"
 msgstr "Удаление завершено"
 
-#: ../calendar/gui/e-itip-control.c:2034 ../calendar/gui/e-itip-control.c:2082
+#: ../calendar/gui/e-itip-control.c:2032 ../calendar/gui/e-itip-control.c:2080
 msgid "Item sent!\n"
 msgstr "Элемент отправлен!\n"
 
-#: ../calendar/gui/e-itip-control.c:2036 ../calendar/gui/e-itip-control.c:2086
+#: ../calendar/gui/e-itip-control.c:2034 ../calendar/gui/e-itip-control.c:2084
 msgid "The item could not be sent!\n"
 msgstr "Элемент не может быть послан!\n"
 
-#: ../calendar/gui/e-itip-control.c:2166
+#: ../calendar/gui/e-itip-control.c:2164
 msgid "Choose an action:"
 msgstr "Выберите действие:"
 
-#: ../calendar/gui/e-itip-control.c:2237
+#: ../calendar/gui/e-itip-control.c:2235
 msgid "Update"
 msgstr "Обновить"
 
-#: ../calendar/gui/e-itip-control.c:2265
+#: ../calendar/gui/e-itip-control.c:2263
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Принять"
 
-#: ../calendar/gui/e-itip-control.c:2266
+#: ../calendar/gui/e-itip-control.c:2264
 msgid "Tentatively accept"
 msgstr "Принять экспериментально"
 
-#: ../calendar/gui/e-itip-control.c:2267
+#: ../calendar/gui/e-itip-control.c:2265
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Отклонить"
 
-#: ../calendar/gui/e-itip-control.c:2296
+#: ../calendar/gui/e-itip-control.c:2294
 msgid "Send Free/Busy Information"
 msgstr "Отправить информацию о занятости"
 
-#: ../calendar/gui/e-itip-control.c:2324
+#: ../calendar/gui/e-itip-control.c:2322
 msgid "Update respondent status"
 msgstr "Обновить состояние"
 
-#: ../calendar/gui/e-itip-control.c:2352
+#: ../calendar/gui/e-itip-control.c:2350
 msgid "Send Latest Information"
 msgstr "Отправить последнюю информацию"
 
-#: ../calendar/gui/e-itip-control.c:2380 ../calendar/gui/itip-utils.c:571
+#: ../calendar/gui/e-itip-control.c:2378 ../calendar/gui/itip-utils.c:571
 #: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
@@ -7470,7 +7442,7 @@ 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:444
-#: ../calendar/gui/e-meeting-time-sel.c:2102
+#: ../calendar/gui/e-meeting-time-sel.c:2104
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B %Y"
 
@@ -7481,7 +7453,7 @@ msgstr "%A, %d %B %Y"
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
 #: ../calendar/gui/e-meeting-time-sel-item.c:448
-#: ../calendar/gui/e-meeting-time-sel.c:2135 ../e-util/e-time-utils.c:203
+#: ../calendar/gui/e-meeting-time-sel.c:2137 ../e-util/e-time-utils.c:203
 #: ../e-util/e-time-utils.c:296 ../e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y"
 msgstr "%a, %d.%m.%Y"
@@ -7554,7 +7526,7 @@ msgstr "Требуемые люди и _один ресурс"
 msgid "Enter the password for %s"
 msgstr "Введите пароль для %s"
 
-#: ../calendar/gui/e-tasks.c:798 ../calendar/gui/gnome-cal.c:2532
+#: ../calendar/gui/e-tasks.c:797 ../calendar/gui/gnome-cal.c:2532
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7563,24 +7535,24 @@ msgstr ""
 "Ошибка в \"%s\":\n"
 "%s"
 
-#: ../calendar/gui/e-tasks.c:846
+#: ../calendar/gui/e-tasks.c:845
 msgid "Loading tasks"
 msgstr "Загрузка задач"
 
-#: ../calendar/gui/e-tasks.c:930
+#: ../calendar/gui/e-tasks.c:929
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Открытие задач %s"
 
-#: ../calendar/gui/e-tasks.c:1129
+#: ../calendar/gui/e-tasks.c:1125
 msgid "Completing tasks..."
 msgstr "Завершение выполнения задач..."
 
-#: ../calendar/gui/e-tasks.c:1152
+#: ../calendar/gui/e-tasks.c:1148
 msgid "Deleting selected objects..."
 msgstr "Удаление выделенных объектов..."
 
-#: ../calendar/gui/e-tasks.c:1179
+#: ../calendar/gui/e-tasks.c:1175
 msgid "Expunging"
 msgstr "Очистка папки"
 
@@ -7629,7 +7601,7 @@ msgstr "Загрузка задач на %s"
 msgid "Opening %s"
 msgstr "Открывается %s"
 
-#: ../calendar/gui/gnome-cal.c:3389
+#: ../calendar/gui/gnome-cal.c:3388
 msgid "Purging"
 msgstr "Очистка"
 
@@ -8050,43 +8022,43 @@ msgstr "Не удается открыть список задач '%s' для �
 msgid "There is no calendar available for creating tasks"
 msgstr "Нет календаря, доступного для создания задач"
 
-#: ../calendar/gui/tasks-component.c:987
+#: ../calendar/gui/tasks-component.c:981
 msgid "Task Source Selector"
 msgstr "Выбор источника задач"
 
-#: ../calendar/gui/tasks-component.c:1170
+#: ../calendar/gui/tasks-component.c:1164
 msgid "New task"
 msgstr "Новая задача"
 
-#: ../calendar/gui/tasks-component.c:1171
+#: ../calendar/gui/tasks-component.c:1165
 msgid "_Task"
 msgstr "_Задача"
 
-#: ../calendar/gui/tasks-component.c:1172
+#: ../calendar/gui/tasks-component.c:1166
 msgid "Create a new task"
 msgstr "Создать новую задачу"
 
-#: ../calendar/gui/tasks-component.c:1178
+#: ../calendar/gui/tasks-component.c:1172
 msgid "New assigned task"
 msgstr "Новая назначенная задача"
 
-#: ../calendar/gui/tasks-component.c:1179
+#: ../calendar/gui/tasks-component.c:1173
 msgid "Assigne_d Task"
 msgstr "Назначенная за_дача"
 
-#: ../calendar/gui/tasks-component.c:1180
+#: ../calendar/gui/tasks-component.c:1174
 msgid "Create a new assigned task"
 msgstr "Создать новую назначенную задачу"
 
-#: ../calendar/gui/tasks-component.c:1186
+#: ../calendar/gui/tasks-component.c:1180
 msgid "New task list"
 msgstr "Новый список задач"
 
-#: ../calendar/gui/tasks-component.c:1187
+#: ../calendar/gui/tasks-component.c:1181
 msgid "Task l_ist"
 msgstr "Сп_исок задач"
 
-#: ../calendar/gui/tasks-component.c:1188
+#: ../calendar/gui/tasks-component.c:1182
 msgid "Create a new task list"
 msgstr "Создать новый список задач"
 
@@ -9682,15 +9654,15 @@ msgstr "Pacific/Wallis"
 msgid "Pacific/Yap"
 msgstr "Тихий океан/о-в Яп"
 
-#: ../composer/e-msg-composer-hdrs.c:558
+#: ../composer/e-msg-composer-hdrs.c:559
 msgid "Posting destination"
 msgstr "Назначение:"
 
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../composer/e-msg-composer-hdrs.c:560
 msgid "Choose folders to post the message to."
 msgstr "Выберите папки для помещения в них сообщений."
 
-#: ../composer/e-msg-composer-hdrs.c:593
+#: ../composer/e-msg-composer-hdrs.c:594
 msgid "Click here for the address book"
 msgstr "Щёлкните здесь, чтобы создать адресную книгу"
 
@@ -9701,45 +9673,45 @@ msgstr "Щёлкните здесь, чтобы создать адресную
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:623
+#: ../composer/e-msg-composer-hdrs.c:624
 msgid "_Reply-To:"
 msgstr "Об_ратный адрес:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:630
+#: ../composer/e-msg-composer-hdrs.c:631
 msgid "Fr_om:"
 msgstr "_От кого:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:637
+#: ../composer/e-msg-composer-hdrs.c:638
 msgid "S_ubject:"
 msgstr "_Тема:"
 
-#: ../composer/e-msg-composer-hdrs.c:646
+#: ../composer/e-msg-composer-hdrs.c:648
 msgid "_To:"
 msgstr "_Кому:"
 
-#: ../composer/e-msg-composer-hdrs.c:647
+#: ../composer/e-msg-composer-hdrs.c:649
 msgid "Enter the recipients of the message"
 msgstr "Перечислите получателей сообщения"
 
-#: ../composer/e-msg-composer-hdrs.c:650
+#: ../composer/e-msg-composer-hdrs.c:652
 msgid "_Cc:"
 msgstr "Ко_пия:"
 
-#: ../composer/e-msg-composer-hdrs.c:651
+#: ../composer/e-msg-composer-hdrs.c:653
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Введите адреса, получающие копию сообщения"
 
-#: ../composer/e-msg-composer-hdrs.c:654
+#: ../composer/e-msg-composer-hdrs.c:656
 msgid "_Bcc:"
 msgstr "_Скр.копия:"
 
-#: ../composer/e-msg-composer-hdrs.c:655
+#: ../composer/e-msg-composer-hdrs.c:657
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9750,25 +9722,24 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-msg-composer-hdrs.c:664
 msgid "_Post To:"
 msgstr "По_местить в:"
 
-#: ../composer/e-msg-composer-hdrs.c:667
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Click here to select folders to post to"
 msgstr "Нажмите, чтобы выбрать папки для помещения в них сообщений"
 
-#: ../composer/e-msg-composer-hdrs.c:673
+#: ../composer/e-msg-composer-hdrs.c:675
 msgid "Post To:"
 msgstr "Отправить на:"
 
-#: ../composer/e-msg-composer-select-file.c:82
+#: ../composer/e-msg-composer-select-file.c:81
 msgid "A_ttach"
 msgstr "В_ложить"
 
 #: ../composer/e-msg-composer.c:738
-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 ""
 "Не удается подписать исходящее сообщение: нет сертификата подписи для этой "
 "учетной записи"
@@ -9781,47 +9752,47 @@ msgstr ""
 "Не удается зашифровать исходящее сообщение: нет сертификата шифрования для "
 "этой учетной записи"
 
-#: ../composer/e-msg-composer.c:1224 ../composer/e-msg-composer.c:1257
+#: ../composer/e-msg-composer.c:1223 ../composer/e-msg-composer.c:1256
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Неизвестная причина"
 
-#: ../composer/e-msg-composer.c:1294
+#: ../composer/e-msg-composer.c:1293
 msgid "Could not open file"
 msgstr "Не удается открыть файл"
 
-#: ../composer/e-msg-composer.c:1302
+#: ../composer/e-msg-composer.c:1301
 msgid "Unable to retrieve message from editor"
 msgstr "Не удается получить сообщение из редактора"
 
-#: ../composer/e-msg-composer.c:1572
+#: ../composer/e-msg-composer.c:1571
 msgid "Untitled Message"
 msgstr "Неозаглавленное сообщение"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1606
+#: ../composer/e-msg-composer.c:1605
 msgid "Open File"
 msgstr "Открыть файл"
 
-#: ../composer/e-msg-composer.c:2006 ../mail/em-account-editor.c:588
+#: ../composer/e-msg-composer.c:2005 ../mail/em-account-editor.c:588
 #: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:700
 msgid "Autogenerated"
 msgstr "Создана автоматически"
 
-#: ../composer/e-msg-composer.c:2105
+#: ../composer/e-msg-composer.c:2104
 msgid "Si_gnature:"
 msgstr "По_дпись:"
 
-#: ../composer/e-msg-composer.c:2347 ../composer/e-msg-composer.c:3527
-#: ../composer/e-msg-composer.c:3528
+#: ../composer/e-msg-composer.c:2346 ../composer/e-msg-composer.c:3525
+#: ../composer/e-msg-composer.c:3526
 msgid "Compose a message"
 msgstr "Новое сообщение"
 
-#: ../composer/e-msg-composer.c:3643
+#: ../composer/e-msg-composer.c:3641
 msgid "_Attachment Bar"
 msgstr "Панель _вложений"
 
-#: ../composer/e-msg-composer.c:4720
+#: ../composer/e-msg-composer.c:4716
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -9923,8 +9894,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 ""
@@ -10128,8 +10098,7 @@ msgstr "Запрос Evolution"
 #. setup a dummy error
 #: ../e-util/e-error.c:438
 #, c-format
-msgid ""
-"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgid "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
 msgstr ""
 "<span weight=\"bold\">Внутренняя ошибка, неизвестная ошибка '%s' requested</"
 "span>"
@@ -10525,8 +10494,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 ""
 "Тут настраиваются параметры почты, включая безопасность и отображение "
 "сообщений"
@@ -10604,7 +10572,7 @@ msgstr ""
 "и установите флажок, чтобы принять его\n"
 
 #: ../mail/em-account-editor.c:464 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:495
+#: ../mail/em-vfolder-rule.c:494
 msgid "Select Folder"
 msgstr "Выбрать папку"
 
@@ -10628,30 +10596,30 @@ msgstr "Автоматически проверять _новую почту к�
 msgid "Sending Email"
 msgstr "Отправка эл.почты"
 
-#: ../mail/em-account-editor.c:2165 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2162 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "По умолчанию"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2226 ../mail/mail-config.glade.h:122
-#: ../plugins/exchange-operations/exchange-account-setup.c:313
+#: ../mail/em-account-editor.c:2221 ../mail/mail-config.glade.h:122
+#: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "Безопасность"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2263 ../mail/em-account-editor.c:2337
+#: ../mail/em-account-editor.c:2258 ../mail/em-account-editor.c:2332
 msgid "Receiving Options"
 msgstr "Параметры получения"
 
-#: ../mail/em-account-editor.c:2264 ../mail/em-account-editor.c:2338
+#: ../mail/em-account-editor.c:2259 ../mail/em-account-editor.c:2333
 msgid "Checking for New Mail"
 msgstr "Проверка новой почты"
 
-#: ../mail/em-account-editor.c:2662 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2657 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Редактор учетных записей"
 
-#: ../mail/em-account-editor.c:2662 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2657 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Помощник по учетным записям Evolution"
 
@@ -10955,7 +10923,7 @@ msgstr "начинается с"
 msgid "Stop Processing"
 msgstr "Остановить обработку"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1572
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1557
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
 #: ../mail/em-mailer-prefs.c:88 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:330
@@ -11036,83 +11004,79 @@ msgstr "Исходящие"
 msgid "Sent"
 msgstr "Отправленные"
 
-#: ../mail/em-folder-tree-model.c:499 ../mail/em-folder-tree-model.c:803
+#: ../mail/em-folder-tree-model.c:498 ../mail/em-folder-tree-model.c:802
 msgid "Loading..."
 msgstr "Загрузка..."
 
-#: ../mail/em-folder-tree.c:694
+#: ../mail/em-folder-tree.c:689
 msgid "Mail Folder Tree"
 msgstr "Дерево почтовых папок"
 
-#: ../mail/em-folder-tree.c:854
+#: ../mail/em-folder-tree.c:849
 #, c-format
 msgid "Moving folder %s"
 msgstr "Перемещение папки %s"
 
-#: ../mail/em-folder-tree.c:856
+#: ../mail/em-folder-tree.c:851
 #, c-format
 msgid "Copying folder %s"
 msgstr "Копирование папки %s"
 
-#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1623
+#: ../mail/em-folder-tree.c:858 ../mail/message-list.c:1613
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Перемещение сообщений в папку %s"
 
-#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1625
+#: ../mail/em-folder-tree.c:860 ../mail/message-list.c:1615
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Копирование сообщений в папку %s"
 
-#: ../mail/em-folder-tree.c:881
+#: ../mail/em-folder-tree.c:876
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Нельзя перетащить сообщение в хранилище верхнего уровня"
 
-#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:103
+#: ../mail/em-folder-tree.c:972 ../ui/evolution-mail-message.xml.h:103
 msgid "_Copy to Folder"
 msgstr "_Копировать в папку"
 
-#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:113
+#: ../mail/em-folder-tree.c:973 ../ui/evolution-mail-message.xml.h:113
 msgid "_Move to Folder"
 msgstr "Переместить в папку"
 
-#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1057
+#: ../mail/em-folder-tree.c:1678 ../mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканирование папок на \"%s\""
 
-#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:44
+#: ../mail/em-folder-tree.c:2031 ../ui/evolution-addressbook.xml.h:44
 #: ../ui/evolution-mail-global.xml.h:22
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:46
+#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:45
 msgid "_View"
 msgstr "_Вид"
 
-#: ../mail/em-folder-tree.c:2043
+#: ../mail/em-folder-tree.c:2032
 msgid "Open in _New Window"
 msgstr "Открыть в _новом окне"
 
-#: ../mail/em-folder-tree.c:2047
+#: ../mail/em-folder-tree.c:2036
 msgid "_Copy..."
 msgstr "_Копировать..."
 
-#: ../mail/em-folder-tree.c:2048
+#: ../mail/em-folder-tree.c:2037
 msgid "_Move..."
 msgstr "Пере_местить..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2052
+#: ../mail/em-folder-tree.c:2041
 msgid "_New Folder..."
 msgstr "_Создать папку..."
 
-#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:30
+#: ../mail/em-folder-tree.c:2044 ../ui/evolution-mail-list.xml.h:30
 msgid "_Rename..."
 msgstr "Пе_реименовать..."
 
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:119
-msgid "_Empty Trash"
-msgstr "О_чистить корзину"
-
 #: ../mail/em-folder-utils.c:104
 #, c-format
 msgid "Copying `%s' to `%s'"
@@ -11142,20 +11106,20 @@ msgid "Folder names cannot contain '/'"
 msgstr "Имена папок не может содержать '/'"
 
 #: ../mail/em-folder-utils.c:581
-#: ../plugins/groupwise-features/share-folder-common.c:141
+#: ../plugins/groupwise-features/share-folder-common.c:140
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Создание папки `%s'"
 
 #: ../mail/em-folder-utils.c:730
-#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../plugins/groupwise-features/install-shared.c:156
+#: ../plugins/groupwise-features/share-folder-common.c:386
 msgid "Create folder"
 msgstr "Создать новую папку"
 
 #: ../mail/em-folder-utils.c:730
-#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../plugins/groupwise-features/install-shared.c:156
+#: ../plugins/groupwise-features/share-folder-common.c:386
 msgid "Specify where to create the folder:"
 msgstr "Укажите, где создать папку:"
 
@@ -11267,7 +11231,7 @@ msgstr "По умолчанию"
 
 #: ../mail/em-folder-view.c:2064
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-#: ../plugins/print-message/print-message.c:87
+#: ../plugins/print-message/print-message.c:83
 msgid "Print Message"
 msgstr "Напечатать сообщение"
 
@@ -11297,27 +11261,26 @@ msgid "Click to mail %s"
 msgstr "Нажмите, чтобы написать письмо %s"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:455
+#: ../mail/em-format-html-display.c:445
 #, c-format
 msgid "Matches: %d"
 msgstr "Совпадения: %d"
 
-#: ../mail/em-format-html-display.c:706 ../mail/em-format-html.c:597
+#: ../mail/em-format-html-display.c:697 ../mail/em-format-html.c:595
 msgid "Unsigned"
 msgstr "Не подписано"
 
-#: ../mail/em-format-html-display.c:706
+#: ../mail/em-format-html-display.c:697
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
-msgstr ""
-"Это сообщение не подписано. Отправитель не может быть аутентифицирован."
+msgstr "Это сообщение не подписано. Отправитель не может быть аутентифицирован."
 
-#: ../mail/em-format-html-display.c:707 ../mail/em-format-html.c:598
+#: ../mail/em-format-html-display.c:698 ../mail/em-format-html.c:596
 msgid "Valid signature"
 msgstr "Подпись действительна"
 
-#: ../mail/em-format-html-display.c:707
+#: ../mail/em-format-html-display.c:698
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11325,11 +11288,11 @@ msgstr ""
 "Это сообщение подписано действительной подписью, что удостоверяет "
 "подлинность отправителя."
 
-#: ../mail/em-format-html-display.c:708 ../mail/em-format-html.c:599
+#: ../mail/em-format-html-display.c:699 ../mail/em-format-html.c:597
 msgid "Invalid signature"
 msgstr "Подпись недействительна"
 
-#: ../mail/em-format-html-display.c:708
+#: ../mail/em-format-html-display.c:699
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11337,11 +11300,11 @@ msgstr ""
 "Подпись этого сообщения не может быть проверена. Возможно, сообщение было "
 "изменено по дороге."
 
-#: ../mail/em-format-html-display.c:709
+#: ../mail/em-format-html-display.c:700
 msgid "Valid signature, cannot verify sender"
 msgstr "Подпись действительна, не удается проверить отправителя"
 
-#: ../mail/em-format-html-display.c:709
+#: ../mail/em-format-html-display.c:700
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11349,11 +11312,11 @@ msgstr ""
 "Это сообщение подписано действительной подписью, но отправитель сообщения не "
 "может быть проверен."
 
-#: ../mail/em-format-html-display.c:715 ../mail/em-format-html.c:606
+#: ../mail/em-format-html-display.c:706 ../mail/em-format-html.c:604
 msgid "Unencrypted"
 msgstr "Не зашифровано"
 
-#: ../mail/em-format-html-display.c:715
+#: ../mail/em-format-html-display.c:706
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -11361,11 +11324,11 @@ msgstr ""
 "Это сообщение не зашифровано. Его содержимое может быть просмотрено в "
 "процессе передачи по Интернету."
 
-#: ../mail/em-format-html-display.c:716 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:707 ../mail/em-format-html.c:605
 msgid "Encrypted, weak"
 msgstr "Зашифровано, уязвимый шифр"
 
-#: ../mail/em-format-html-display.c:716
+#: ../mail/em-format-html-display.c:707
 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 "
@@ -11375,11 +11338,11 @@ msgstr ""
 "Посторонние лица могут, хотя и с определенными трудностями, получить доступ "
 "к содержимому письма за разумное время."
 
-#: ../mail/em-format-html-display.c:717 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:708 ../mail/em-format-html.c:606
 msgid "Encrypted"
 msgstr "Зашифровано"
 
-#: ../mail/em-format-html-display.c:717
+#: ../mail/em-format-html-display.c:708
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11387,11 +11350,11 @@ msgstr ""
 "Это сообщение зашифровано. Посторонним лицам будет очень сложно просмотреть "
 "содержимое этого сообщения."
 
-#: ../mail/em-format-html-display.c:718 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:709 ../mail/em-format-html.c:607
 msgid "Encrypted, strong"
 msgstr "Зашифровано, стойкий шифр"
 
-#: ../mail/em-format-html-display.c:718
+#: ../mail/em-format-html-display.c:709
 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 "
@@ -11401,60 +11364,60 @@ msgstr ""
 "Для постороннего будет очень сложным просмотреть содержимое этого сообщения "
 "в разумный период времени."
 
-#: ../mail/em-format-html-display.c:819 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:810 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Просмотреть сертификат"
 
-#: ../mail/em-format-html-display.c:834
+#: ../mail/em-format-html-display.c:825
 msgid "This certificate is not viewable"
 msgstr "Этот сертификат нельзя просмотреть"
 
-#: ../mail/em-format-html-display.c:1116
+#: ../mail/em-format-html-display.c:1107
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Выполнено %d %b %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1124
+#: ../mail/em-format-html-display.c:1115
 msgid "Overdue:"
 msgstr "Просрочена:"
 
-#: ../mail/em-format-html-display.c:1127
+#: ../mail/em-format-html-display.c:1118
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "от %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1187
+#: ../mail/em-format-html-display.c:1178
 msgid "_View Inline"
 msgstr "_Встроенный просмотр"
 
-#: ../mail/em-format-html-display.c:1188
+#: ../mail/em-format-html-display.c:1179
 msgid "_Hide"
 msgstr "_Скрыть"
 
-#: ../mail/em-format-html-display.c:1189
+#: ../mail/em-format-html-display.c:1180
 msgid "_Fit to Width"
 msgstr "_Уместить по ширине"
 
-#: ../mail/em-format-html-display.c:1190
+#: ../mail/em-format-html-display.c:1181
 msgid "Show _Original Size"
 msgstr "Показать _исходный размер"
 
-#: ../mail/em-format-html-display.c:1560
+#: ../mail/em-format-html-display.c:1551
 msgid "Attachment Button"
 msgstr "Кнопка вложения"
 
-#: ../mail/em-format-html-display.c:1767
+#: ../mail/em-format-html-display.c:1758
 msgid "Select folder to save all attachments..."
 msgstr "Выберите папку для сохранения всех вложений..."
 
-#: ../mail/em-format-html-display.c:1806
+#: ../mail/em-format-html-display.c:1797
 msgid "Select folder to save selected attachments..."
 msgstr "Выберите папку для сохранения выделенных вложений..."
 
-#: ../mail/em-format-html-display.c:1814
+#: ../mail/em-format-html-display.c:1805
 msgid "Save Selected..."
 msgstr "Сохранить выделенные..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1881
+#: ../mail/em-format-html-display.c:1872
 #, c-format
 msgid "%d attachment"
 msgid_plural "%d attachments"
@@ -11462,11 +11425,11 @@ msgstr[0] "%d вложение"
 msgstr[1] "%d вложения"
 msgstr[2] "%d вложений"
 
-#: ../mail/em-format-html-display.c:1945
+#: ../mail/em-format-html-display.c:1938
 msgid "No Attachment"
 msgstr "Нет вложений"
 
-#: ../mail/em-format-html-display.c:1948
+#: ../mail/em-format-html-display.c:1941
 msgid "Save All"
 msgstr "Сохранить все"
 
@@ -11480,93 +11443,93 @@ msgstr "Страница %d из %d"
 msgid "Retrieving `%s'"
 msgstr "Получение '%s'"
 
-#: ../mail/em-format-html.c:600
+#: ../mail/em-format-html.c:598
 msgid "Valid signature but cannot verify sender"
 msgstr "Подпись действительна, но проверить отправителя не удается"
 
-#: ../mail/em-format-html.c:870
+#: ../mail/em-format-html.c:855
 msgid "Malformed external-body part."
 msgstr "Часть external-body неверно сформирована"
 
-#: ../mail/em-format-html.c:900
+#: ../mail/em-format-html.c:885
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Указатель на FTP сайт (%s)"
 
-#: ../mail/em-format-html.c:911
+#: ../mail/em-format-html.c:896
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Указатель на локальный файл (%s), доступный на сайте \"%s\""
 
-#: ../mail/em-format-html.c:913
+#: ../mail/em-format-html.c:898
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Указатель на локальный файл (%s)"
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:919
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Указатель на удаленные данные (%s)"
 
-#: ../mail/em-format-html.c:945
+#: ../mail/em-format-html.c:930
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Указатель на неизвестные внешние данные (типа \"%s\")"
 
-#: ../mail/em-format-html.c:1171
+#: ../mail/em-format-html.c:1156
 msgid "Formatting message"
 msgstr "Форматирование сообщения"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1449 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:83
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:326
 msgid "From"
 msgstr "От"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1449 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:84
 msgid "Reply-To"
 msgstr "Обратный адрес"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1449 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:85
 #: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Кому"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1449 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:86
 msgid "Cc"
 msgstr "Копия"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1449 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:87
 msgid "Bcc"
 msgstr "Скр.копия"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1576 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:990
+#: ../mail/em-format-html.c:1561 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:987
 msgid "Mailer"
 msgstr "Почтовый клиент"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1603
+#: ../mail/em-format-html.c:1588
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1606
+#: ../mail/em-format-html.c:1591
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1616 ../mail/em-format-quote.c:329
+#: ../mail/em-format-html.c:1601 ../mail/em-format-quote.c:329
 #: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:89
 #: ../mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Дата"
 
-#: ../mail/em-format-html.c:1639 ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1624 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:90
 msgid "Newsgroups"
 msgstr "Группы новостей"
@@ -11651,8 +11614,7 @@ msgstr "Не удается открыть сохраненные на серв�
 #: ../mail/em-migrate.c:2061
 #, 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:2090
 #, c-format
@@ -11767,7 +11729,7 @@ msgstr "Сообщения от %s"
 msgid "Search _Folders"
 msgstr "_Папки поиска"
 
-#: ../mail/em-vfolder-rule.c:575
+#: ../mail/em-vfolder-rule.c:574
 msgid "Search Folder source"
 msgstr "Источник папок поиска"
 
@@ -11861,8 +11823,7 @@ msgstr "Очищать все корзины при выходе из Evolution.
 
 #: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr ""
-"Включить режим каретки, то есть вы сможете видеть курсор при чтении почты."
+msgstr "Включить режим каретки, то есть вы сможете видеть курсор при чтении почты."
 
 #: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
@@ -12025,8 +11986,7 @@ msgstr ""
 "папке."
 
 #: ../mail/evolution-mail.schemas.in.in.h:57
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Предупреждать, если пользователь пытается отправить сообщение с пустым полем "
 "Subject."
@@ -12049,18 +12009,15 @@ msgstr ""
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
-msgstr ""
-"Предупреждать при отправке сообщений в формате HTML тем, кто не желает этого."
+msgstr "Предупреждать при отправке сообщений в формате HTML тем, кто не желает этого."
 
 #: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr ""
-"Предупреждать при попытке отправить сообщение с пустыми полями To и Cc."
+msgstr "Предупреждать при попытке отправить сообщение с пустыми полями To и Cc."
 
 #: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-"Предупреждать, когда пользователь пытается отправить нежелательный HTML"
+msgstr "Предупреждать, когда пользователь пытается отправить нежелательный HTML"
 
 #: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
@@ -13106,8 +13063,7 @@ msgstr "Путь:"
 
 #: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
-msgstr ""
-"П_редупреждать при отправке сообщений в формате HTML тем, кто не желает этого"
+msgstr "П_редупреждать при отправке сообщений в формате HTML тем, кто не желает этого"
 
 #: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
@@ -13243,7 +13199,7 @@ msgstr "со всеми локальными и активными удалён�
 msgid "with all local folders"
 msgstr "со всеми локальными папками"
 
-#: ../mail/mail-folder-cache.c:855
+#: ../mail/mail-folder-cache.c:853
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping на %s"
@@ -13495,7 +13451,7 @@ msgstr "Введите имя для этой подписи."
 msgid "Name:"
 msgstr "Имя:"
 
-#: ../mail/mail-tools.c:115
+#: ../mail/mail-tools.c:116
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Не удается создать каталог очереди '%s': %s"
@@ -13505,16 +13461,16 @@ msgstr "Не удается создать каталог очереди '%s': %
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "Попытка переместить почту из не-mbox источника `%s'"
 
-#: ../mail/mail-tools.c:249
+#: ../mail/mail-tools.c:242
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Пересланное сообщение - %s"
 
-#: ../mail/mail-tools.c:251
+#: ../mail/mail-tools.c:244
 msgid "Forwarded message"
 msgstr "Пересланные сообщения"
 
-#: ../mail/mail-tools.c:291
+#: ../mail/mail-tools.c:284
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Неверная папка: '%s'"
@@ -13543,8 +13499,7 @@ msgid "New Search Folder"
 msgstr "Новая папка поиска"
 
 #: ../mail/mail.error.xml.h:1
-msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgid "A folder named &quot;{1}&quot; already exists. Please use a different name."
 msgstr "Папка с именем &quot;{1}&quot; уже существует. Используйте другое имя."
 
 #: ../mail/mail.error.xml.h:2
@@ -13563,9 +13518,7 @@ msgstr ""
 msgid ""
 "A read receipt notification has been requested for &quot;{1}&quot;.  Send "
 "the reciept notification to {0}?"
-msgstr ""
-"Было запрошено уведомление о прочтении для &quot;{1}&quot;. Послать "
-"уведомление к {0}?"
+msgstr "Было запрошено уведомление о прочтении для &quot;{1}&quot;. Послать уведомление к {0}?"
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
@@ -13609,8 +13562,7 @@ msgstr "Вы действительно хотите отправить сооб
 
 #: ../mail/mail.error.xml.h:14
 msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr ""
-"Вы действительно хотите отправить сообщение получателям только слепой копии?"
+msgstr "Вы действительно хотите отправить сообщение получателям только слепой копии?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message without a subject?"
@@ -13690,8 +13642,7 @@ msgstr "Не удается переименовать &quot;{0}&quot; в &quot;
 
 #: ../mail/mail.error.xml.h:33
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
-msgstr ""
-"Не удается переименовать или переместить системную папку &quot;{0}&quot;."
+msgstr "Не удается переименовать или переместить системную папку &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:34
 msgid "Cannot save changes to account."
@@ -13792,8 +13743,7 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:56
 msgid "If you proceed, the account information will be deleted permanently."
-msgstr ""
-"Если вы продолжите, сведения о учетной записи будут окончательно удалены."
+msgstr "Если вы продолжите, сведения о учетной записи будут окончательно удалены."
 
 #: ../mail/mail.error.xml.h:57
 msgid ""
@@ -13986,10 +13936,8 @@ msgstr ""
 " перейдите в редактор виртуальных папок и добавьте её, если требуется."
 
 #: ../mail/mail.error.xml.h:100
-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:101
 msgid ""
@@ -14059,8 +14007,7 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:115
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
-msgstr ""
-"Ошибка регистрации на сервере &quot;{0}&quot; под именем &quot;{0}&quot;."
+msgstr "Ошибка регистрации на сервере &quot;{0}&quot; под именем &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:116
 msgid "Your message with the subject &quot;{0}&quot; was not delivered."
@@ -14074,6 +14021,10 @@ msgstr "_Добавить"
 msgid "_Discard changes"
 msgstr "_Отклонить изменения"
 
+#: ../mail/mail.error.xml.h:119
+msgid "_Empty Trash"
+msgstr "О_чистить корзину"
+
 #: ../mail/mail.error.xml.h:120
 msgid "_Expunge"
 msgstr "Уни_чтожить удаленные"
@@ -14082,74 +14033,74 @@ msgstr "Уни_чтожить удаленные"
 msgid "_Open Messages"
 msgstr "_Открыть сообщения"
 
-#: ../mail/message-list.c:1006
+#: ../mail/message-list.c:996
 msgid "Unseen"
 msgstr "Непрочитано"
 
-#: ../mail/message-list.c:1007
+#: ../mail/message-list.c:997
 msgid "Seen"
 msgstr "Прочитано"
 
-#: ../mail/message-list.c:1008
+#: ../mail/message-list.c:998
 msgid "Answered"
 msgstr "Отвечено"
 
-#: ../mail/message-list.c:1009
+#: ../mail/message-list.c:999
 msgid "Multiple Unseen Messages"
 msgstr "Множество непрочитанных сообщений"
 
-#: ../mail/message-list.c:1010
+#: ../mail/message-list.c:1000
 msgid "Multiple Messages"
 msgstr "Множество сообщений"
 
-#: ../mail/message-list.c:1014
+#: ../mail/message-list.c:1004
 msgid "Lowest"
 msgstr "Самый низкий"
 
-#: ../mail/message-list.c:1015
+#: ../mail/message-list.c:1005
 msgid "Lower"
 msgstr "Низкий"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1009
 msgid "Higher"
 msgstr "Высокий"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1010
 msgid "Highest"
 msgstr "Самый высокий"
 
-#: ../mail/message-list.c:1348 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1338 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1355 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1345 ../plugins/itip-formatter/itip-view.c:196
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Сегодня %I:%M %p"
 
-#: ../mail/message-list.c:1364 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1354 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Вчера %l:%M %p"
 
-#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1366 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1384 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1374 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1386 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2052
+#: ../mail/message-list.c:2042
 msgid "Message List"
 msgstr "Список сообщений"
 
-#: ../mail/message-list.c:3397
+#: ../mail/message-list.c:3387
 msgid "Generating message list"
 msgstr "Создание списка сообщений"
 
@@ -14305,26 +14256,25 @@ msgstr "Сохранение и восстановление данных и п�
 msgid "Restore Settings..."
 msgstr "Восстановить параметры..."
 
-#: ../plugins/bbdb/bbdb.c:410
+#: ../plugins/bbdb/bbdb.c:404
 msgid "Automatic Contacts"
 msgstr "Автоматические контакты"
 
-#: ../plugins/bbdb/bbdb.c:419
+#: ../plugins/bbdb/bbdb.c:413
 msgid "<span weight=\"bold\">Automatic Contacts</span>"
 msgstr "<span weight=\"bold\">Автоматические контакты</span>"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:432
-msgid ""
-"_Automatically create entries in the addressbook when responding to mail"
+#: ../plugins/bbdb/bbdb.c:426
+msgid "_Automatically create entries in the addressbook when responding to mail"
 msgstr "_Автоматически создает записи в адресной книге при ответе на сообщения"
 
-#: ../plugins/bbdb/bbdb.c:450
+#: ../plugins/bbdb/bbdb.c:444
 msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
 msgstr "<span weight=\"bold\">Контакты мгновенных сообщений</span>"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:463
+#: ../plugins/bbdb/bbdb.c:457
 msgid ""
 "Periodically synchronize contact information and images from my _instant "
 "messenger"
@@ -14333,7 +14283,7 @@ msgstr ""
 "обмена мгновенными сообщениями Gaim"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:470
+#: ../plugins/bbdb/bbdb.c:464
 msgid "Synchronize with _buddy list now"
 msgstr "Синхронизировать со списком контактов сейчас"
 
@@ -14444,16 +14394,14 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "Проверять, является ли Evolution почтовой программой по умолчанию"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.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 "
@@ -14464,7 +14412,7 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Сделать Evolution вашим почтовым клиентом по умолчанию?"
 
 #: ../plugins/default-source/default-source.c:82
-#: ../plugins/default-source/default-source.c:109
+#: ../plugins/default-source/default-source.c:108
 msgid "Mark as default folder"
 msgstr "Пометить как папку по умолчанию"
 
@@ -14510,11 +14458,11 @@ msgstr ""
 "Этот параметр позволит подключиться к серверу Exchange средствами "
 "стандартной аутентификации (незащищенный текстовый пароль)."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:253
+#: ../plugins/exchange-operations/exchange-account-setup.c:257
 msgid "Out Of Office"
 msgstr "Не на работе"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:260
+#: ../plugins/exchange-operations/exchange-account-setup.c:264
 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."
@@ -14522,32 +14470,32 @@ msgstr ""
 "Сообщение, указанное ниже, будет автоматически отправлено\n"
 "всем лицам, приславшим вам почту во время вашего отсутствия на работе."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:272
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
+#: ../plugins/exchange-operations/exchange-account-setup.c:276
+#: ../plugins/exchange-operations/exchange-account-setup.c:281
 msgid "I am out of the office"
 msgstr "Я сейчас на работе"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:273
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
+#: ../plugins/exchange-operations/exchange-account-setup.c:277
+#: ../plugins/exchange-operations/exchange-account-setup.c:280
 msgid "I am in the office"
 msgstr "Я сейчас на работе"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:324
+#: ../plugins/exchange-operations/exchange-account-setup.c:327
 msgid "Change the password for Exchange account"
 msgstr "Изменить пароль учетной записи Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:326
+#: ../plugins/exchange-operations/exchange-account-setup.c:329
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Change Password"
 msgstr "Изменить пароль"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:331
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Управление параметрами поручения для учетной записи Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:333
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assitant"
 msgstr "Помощник по поручению"
 
@@ -14569,11 +14517,11 @@ msgstr "Размер папок"
 msgid "Exchange Settings"
 msgstr "Параметры Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:611
+#: ../plugins/exchange-operations/exchange-account-setup.c:607
 msgid "_OWA Url:"
 msgstr "URL _OWA:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:636
+#: ../plugins/exchange-operations/exchange-account-setup.c:632
 msgid "A_uthenticate"
 msgstr "А_утентификация"
 
@@ -14585,16 +14533,6 @@ msgstr "Тип аутентификации"
 msgid "Ch_eck for Supported Types"
 msgstr "Пров_ерить поддерживаемые типы"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:192
-#: ../plugins/exchange-operations/exchange-contacts.c:162
-msgid ""
-"Evolution is in offline mode. You cannot create or modify folders now.\n"
-"Please switch to online mode for such operations."
-msgstr ""
-"Evolution работает в автономном режиме. Невозожно создать или удалить "
-"папку.\n"
-"Для выполнения этих действий переключитесь в обычный режим."
-
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
@@ -14627,7 +14565,7 @@ msgid "Your current password has expired. Please change your password now."
 msgstr "Срок действия вашего текущего пароля истёк. Измените пароль."
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:144
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:576
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:573
 msgid "Custom"
 msgstr "Настраиваемый"
 
@@ -14747,20 +14685,20 @@ msgstr "Размер папки"
 msgid "Exchange Folder Tree"
 msgstr "Дерево папок Exchange"
 
-#: ../plugins/exchange-operations/exchange-folder.c:62
-#: ../plugins/exchange-operations/exchange-folder.c:223
-#: ../plugins/exchange-operations/exchange-folder.c:233
+#: ../plugins/exchange-operations/exchange-folder.c:57
+#: ../plugins/exchange-operations/exchange-folder.c:100
+#: ../plugins/exchange-operations/exchange-folder.c:110
 msgid "Unsubscribe Folder..."
 msgstr "Отписаться от папки..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:460
-#: ../plugins/exchange-operations/exchange-folder.c:520
+#: ../plugins/exchange-operations/exchange-folder.c:337
+#: ../plugins/exchange-operations/exchange-folder.c:397
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Действительно отписаться от папки \"%s\"?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:472
-#: ../plugins/exchange-operations/exchange-folder.c:532
+#: ../plugins/exchange-operations/exchange-folder.c:349
+#: ../plugins/exchange-operations/exchange-folder.c:409
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Отписаться от \"%s\""
@@ -14769,11 +14707,11 @@ msgstr "Отписаться от \"%s\""
 msgid "(Permission denied.)"
 msgstr "(Доступ запрещен.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:407
 msgid "Add User:"
 msgstr "Добавить пользователя:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:407
 msgid "Add User"
 msgstr "Добавить пользователя"
 
@@ -15171,8 +15109,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"
@@ -15345,37 +15282,41 @@ msgstr "<b>Имя учётной записи</b>"
 msgid "Proxy Login"
 msgstr "Учетная запись прокси"
 
-#: ../plugins/groupwise-features/proxy-login.c:219
-#: ../plugins/groupwise-features/proxy-login.c:261
-#: ../plugins/groupwise-features/proxy.c:497
+#: ../plugins/groupwise-features/proxy-login.c:221
+#: ../plugins/groupwise-features/proxy-login.c:263
+#: ../plugins/groupwise-features/proxy.c:492
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sВведите пароль для %s (пользователь %s)"
 
-#: ../plugins/groupwise-features/proxy-login.c:484
+#: ../plugins/groupwise-features/proxy-login.c:485
 msgid "_Proxy Login..."
 msgstr "Учетная запись _прокси..."
 
-#: ../plugins/groupwise-features/proxy.c:679
+#: ../plugins/groupwise-features/proxy.c:681
+msgid "The Proxy tab will be available only when the account is online."
+msgstr "Вкладка \"Прокси\" будет доступна только в том случае, когда учетная запись подключана к серверу."
+
+#: ../plugins/groupwise-features/proxy.c:687
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 "Вкладка \"Прокси\" будет доступна только в том случае, когда учетная запись "
 "включена."
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:317
 msgid "Users"
 msgstr "Пользователи"
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder-common.c:318
 msgid "Enter the users and set permissions"
 msgstr "Введите пользователей и установите права"
 
-#: ../plugins/groupwise-features/share-folder-common.c:338
+#: ../plugins/groupwise-features/share-folder-common.c:337
 msgid "New _Shared Folder..."
 msgstr "Новая _общая папка..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:453
+#: ../plugins/groupwise-features/share-folder-common.c:452
 msgid "Sharing"
 msgstr "Общий доступ"
 
@@ -15427,8 +15368,7 @@ msgstr "Невозможно отправить уведомление об от
 
 #: ../plugins/itip-formatter/itip-formatter.c:991
 msgid "Attendee status could not be updated because the status is invalid"
-msgstr ""
-"Статус участника не может быть обновлён из-за неверного текущего статуса"
+msgstr "Статус участника не может быть обновлён из-за неверного текущего статуса"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1017
 #, c-format
@@ -15503,255 +15443,254 @@ msgid "Conflict Search Table"
 msgstr "Таблица поиска конфликтов"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
+#: ../plugins/itip-formatter/itip-view.c:182 ../ui/evolution-calendar.xml.h:34
 #: ../widgets/misc/e-cell-date-edit.c:240 ../widgets/misc/e-dateedit.c:457
 msgid "Today"
 msgstr "Сегодня"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:189
+#: ../plugins/itip-formatter/itip-view.c:187
 msgid "Today %H:%M"
 msgstr "Сегодня в %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:193
+#: ../plugins/itip-formatter/itip-view.c:191
 msgid "Today %H:%M:%S"
 msgstr "Сегодня в %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:202
+#: ../plugins/itip-formatter/itip-view.c:200
 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:212
+#: ../plugins/itip-formatter/itip-view.c:210
 msgid "Tomorrow"
 msgstr "Завтра"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:217
+#: ../plugins/itip-formatter/itip-view.c:215
 msgid "Tomorrow %H:%M"
 msgstr "Завтра в %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:221
+#: ../plugins/itip-formatter/itip-view.c:219
 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:226
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %l:%M %p"
 msgstr "Завтра в %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:230
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Завтра в %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:249
+#: ../plugins/itip-formatter/itip-view.c:247
 #, 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:254
+#: ../plugins/itip-formatter/itip-view.c:252
 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:258
+#: ../plugins/itip-formatter/itip-view.c:256
 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:263
+#: ../plugins/itip-formatter/itip-view.c:261
 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:267
+#: ../plugins/itip-formatter/itip-view.c:265
 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:276
+#: ../plugins/itip-formatter/itip-view.c:274
 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:282
+#: ../plugins/itip-formatter/itip-view.c:280
 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:286
+#: ../plugins/itip-formatter/itip-view.c:284
 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:291
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e %b %I:%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:295
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e %b %I:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:301
+#: ../plugins/itip-formatter/itip-view.c:299
 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:306
+#: ../plugins/itip-formatter/itip-view.c:304
 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:310
+#: ../plugins/itip-formatter/itip-view.c:308
 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:315
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e %b %Y %I:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:319
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e %b %Y %I:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:344
+#: ../plugins/itip-formatter/itip-view.c:342
 #, 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:346
+#: ../plugins/itip-formatter/itip-view.c:344
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> опубликовал следующую информацию о собрании:"
 
-#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:349
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> делегировал вам следующее собрание:"
 
-#: ../plugins/itip-formatter/itip-view.c:354
+#: ../plugins/itip-formatter/itip-view.c:352
 #, 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:356
+#: ../plugins/itip-formatter/itip-view.c:354
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> запрашивает ваше присутствие на следующем собрании:"
 
-#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:360
 #, 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:364
+#: ../plugins/itip-formatter/itip-view.c:362
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> желает добавить к существующему собранию:"
 
-#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:365
 #, 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:370
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> вернул следующий ответ на собрание:"
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:372
 #, c-format
 msgid "<b>%s</b> through %s has cancelled the following meeting:"
 msgstr "<b>%s</b> через %s отменил следующее собрание:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> has cancelled the following meeting."
 msgstr "<b>%s</b> отменил следующее собрание."
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:377
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 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 has declined the following meeting changes:"
 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> has declined the following meeting changes."
 msgstr "<b>%s</b> отклонил следующие изменения собрания."
 
-#: ../plugins/itip-formatter/itip-view.c:412
+#: ../plugins/itip-formatter/itip-view.c:410
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> через %s опубликовал следующую задачу:"
 
-#: ../plugins/itip-formatter/itip-view.c:414
+#: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> опубликовал следующую задачу:"
 
-#: ../plugins/itip-formatter/itip-view.c:419
+#: ../plugins/itip-formatter/itip-view.c:417
 #, 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:422
+#: ../plugins/itip-formatter/itip-view.c:420
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> через %s назначил вам задачу:"
 
-#: ../plugins/itip-formatter/itip-view.c:424
+#: ../plugins/itip-formatter/itip-view.c:422
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> назначил вам задачу:"
 
-#: ../plugins/itip-formatter/itip-view.c:430
+#: ../plugins/itip-formatter/itip-view.c:428
 #, 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:432
+#: ../plugins/itip-formatter/itip-view.c:430
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> желает добавить к существующей задаче:"
 
-#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:433
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -15760,57 +15699,57 @@ msgstr ""
 "<b>%s</b> желает получить последнюю информацию о следующей назначенной "
 "задаче:"
 
-#: ../plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:436
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> вернул следующий ответ на назначенную задачу:"
 
-#: ../plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:440
 #, c-format
 msgid "<b>%s</b> through %s has cancelled the following assigned task:"
 msgstr "<b>%s</b> через %s отменил следующую назначенную задачу:"
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:442
 #, c-format
 msgid "<b>%s</b> has cancelled the following assigned task:"
 msgstr "<b>%s</b> отменил следующую назначенную задачу:"
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:445
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> предложил следующие изменения назначения задачи:"
 
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:449
 #, 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:453
+#: ../plugins/itip-formatter/itip-view.c:451
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> отклонил следующие назначенные задачи:"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:892
+#: ../plugins/itip-formatter/itip-view.c:890
 msgid "Start time:"
 msgstr "Время начала:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:901
+#: ../plugins/itip-formatter/itip-view.c:899
 msgid "End time:"
 msgstr "Время завершения:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:917
-#: ../plugins/itip-formatter/itip-view.c:967
+#: ../plugins/itip-formatter/itip-view.c:915
+#: ../plugins/itip-formatter/itip-view.c:965
 msgid "Comment:"
 msgstr "Комментарий:"
 
-#: ../plugins/itip-formatter/itip-view.c:981
+#: ../plugins/itip-formatter/itip-view.c:979
 msgid "Send u_pdates to attendees"
 msgstr "Отправить о_бновления к участникам"
 
-#: ../plugins/itip-formatter/itip-view.c:990
+#: ../plugins/itip-formatter/itip-view.c:988
 msgid "A_pply to all instances"
 msgstr "П_рименить ко всем записям"
 
@@ -15835,8 +15774,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 ""
 "Этот ответ пришел не от текущего участника.  Добавить отправителя как "
 "участника?"
@@ -15872,8 +15810,7 @@ msgid "No store available"
 msgstr "Нет доступного хранилища"
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
-msgid ""
-"A plugin which implements a CORBA interface for accessing mail data remotely."
+msgid "A plugin which implements a CORBA interface for accessing mail data remotely."
 msgstr ""
 "Модуль, который реализует интерфейс CORBA для удаленного доступа к почтовым "
 "данным."
@@ -15902,8 +15839,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
 msgid "Con_vert to Task"
@@ -16028,8 +15964,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"
@@ -16041,8 +15976,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 an archive of the list this message belongs to"
@@ -16056,8 +15990,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"
@@ -16202,7 +16135,7 @@ msgstr "Пред_варительный просмотр"
 msgid "Prints the message"
 msgstr "Печатает сообщение"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:98
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:97
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (встроенный)"
 
@@ -16324,7 +16257,7 @@ msgstr "Инкапсулировать значения в:"
 msgid "Comma separated value format (.csv)"
 msgstr "Значения, разделенные запятыми (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:137
+#: ../plugins/save-calendar/ical-format.c:136
 msgid "iCalendar format (.ics)"
 msgstr "Формат iCalendar (.ics)"
 
@@ -16489,8 +16422,7 @@ msgid "Last upgraded configuration version"
 msgstr "Версия последней обновленной конфигурации"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:8
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
+msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Список путей для папок, которые будут синхронизироваться на диск для "
 "автономной работы"
@@ -16508,8 +16440,7 @@ msgid "Start in offline mode"
 msgstr "Запуск в автономном режиме"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:12
-msgid ""
-"The configuration version of Evolution, with major/minor/configuration level"
+msgid "The configuration version of Evolution, with major/minor/configuration level"
 msgstr "Версия конфигурации Evolution, с уровнями major/minor/configuration"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:13
@@ -16548,16 +16479,14 @@ msgstr "Панель инструментов видимая"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr ""
-"Если этот ключ установлен, Evolution будет запускаться в автономном режиме."
+msgstr "Если этот ключ установлен, Evolution будет запускаться в автономном режиме."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Whether the toolbar should be visible."
 msgstr "Должна ли панель инструментов быть видимой."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:21
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
+msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Если этот ключ установлен, диалог предупреждения в тестовых версиях "
 "Evolution не отображается."
@@ -16674,27 +16603,27 @@ msgstr "Имя папки не может содержать символ \"#\".
 msgid "'.' and '..' are reserved folder names."
 msgstr "\".\" и \"..\" -- зарезервированные имена папок."
 
-#: ../shell/e-shell-window-commands.c:71
+#: ../shell/e-shell-window-commands.c:69
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Похоже, утилита GNOME Pilot не установлена в этой системе"
 
-#: ../shell/e-shell-window-commands.c:79
+#: ../shell/e-shell-window-commands.c:77
 #, c-format
 msgid "Error executing %s."
 msgstr "Ошибка выполнения %s."
 
-#: ../shell/e-shell-window-commands.c:128
+#: ../shell/e-shell-window-commands.c:126
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy не установлен."
 
-#: ../shell/e-shell-window-commands.c:136
+#: ../shell/e-shell-window-commands.c:134
 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 box
-#: ../shell/e-shell-window-commands.c:533
+#: ../shell/e-shell-window-commands.c:507
 msgid "translator-credits"
 msgstr ""
 "Valek Filippov <frob@df.ru>\n"
@@ -16702,19 +16631,19 @@ msgstr ""
 "Leonid Kanter <leon@asplinux.ru>\n"
 "Michael Yakhontov <mvy@asplinux.ru>"
 
-#: ../shell/e-shell-window-commands.c:547
+#: ../shell/e-shell-window-commands.c:521
 msgid "Groupware Suite"
 msgstr "Пакет для групповой работы"
 
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:749
 msgid "_Work Online"
 msgstr "Перейти в сетевой режим"
 
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:49
+#: ../shell/e-shell-window-commands.c:762 ../ui/evolution.xml.h:47
 msgid "_Work Offline"
 msgstr "Ав_тономная работа"
 
-#: ../shell/e-shell-window-commands.c:801
+#: ../shell/e-shell-window-commands.c:775
 msgid "Work Offline"
 msgstr "Перейти в режим работы вне сети"
 
@@ -16734,7 +16663,7 @@ msgstr ""
 "Evolution сейчас работает в автономном режиме. Нажмите на эту кнопку для "
 "перехода в режим работы в сети."
 
-#: ../shell/e-shell-window.c:735
+#: ../shell/e-shell-window.c:724
 #, c-format
 msgid "Switch to %s"
 msgstr "Переключиться в %s"
@@ -16782,8 +16711,7 @@ msgstr "Создать новый тестовый элемент"
 
 #: ../shell/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr ""
-"Нажмите \"Импортировать\" для начала импортирования файлов в Evolution."
+msgstr "Нажмите \"Импортировать\" для начала импортирования файлов в Evolution."
 
 #: ../shell/import.glade.h:2
 msgid "Evolution Import Assistant"
@@ -17306,16 +17234,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"
@@ -17563,8 +17489,7 @@ msgstr "Описание вложения."
 
 #: ../tools/evolution-launch-composer.c:328
 msgid "Mark attachment to be shown inline by default."
-msgstr ""
-"Пометить вложение, чтобы оно отображалось в теле сообщения по умолчанию."
+msgstr "Пометить вложение, чтобы оно отображалось в теле сообщения по умолчанию."
 
 #: ../tools/evolution-launch-composer.c:329
 msgid "Default subject for the message."
@@ -17867,7 +17792,7 @@ msgstr "Ф_ильтры сообщений"
 
 #: ../ui/evolution-mail-global.xml.h:10
 msgid "Message _List As"
-msgstr "Список сообщений _как"
+msgstr "Список сообщений как"
 
 #: ../ui/evolution-mail-global.xml.h:11
 msgid "Message _Preview"
@@ -17903,7 +17828,7 @@ msgstr "Пере_местить папку в..."
 
 #: ../ui/evolution-mail-global.xml.h:19
 msgid "_New Search _Folder (FIXME)"
-msgstr "Новая папка _поиска (ИСПРАВИТЬ)"
+msgstr "_Создать папку поиска"
 
 #: ../ui/evolution-mail-global.xml.h:20
 msgid "_New..."
@@ -17950,13 +17875,12 @@ msgid "Hide _Read Messages"
 msgstr "Скрыть п_рочитанные сообщения"
 
 #: ../ui/evolution-mail-list.xml.h:11
-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:12
-msgid "Mar_k Messages as Read"
-msgstr "Пометить сообщения как \"_Прочитанные\""
+msgid "Mark Me_ssages as Read"
+msgstr "Пометить сообщения как \"Прочитанные\""
 
 #: ../ui/evolution-mail-list.xml.h:13 ../ui/evolution-mail-message.xml.h:68
 msgid "Paste message(s) from the clipboard"
@@ -18445,7 +18369,7 @@ msgstr "_Закрыть"
 #: ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:45
 #: ../ui/evolution-signature-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:34
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:33
 msgid "_File"
 msgstr "_Файл"
 
@@ -18762,7 +18686,7 @@ msgstr "Отображать кнопки окна только с тексто�
 
 #: ../ui/evolution.xml.h:10
 msgid "Evolution _FAQ"
-msgstr "Evolution _ЧАВО"
+msgstr "_Часто задаваемые вопросы по Evolution"
 
 #: ../ui/evolution.xml.h:11
 msgid "Exit the program"
@@ -18837,66 +18761,58 @@ msgid "Tool_bar style"
 msgstr "Стиль панели _инструментов"
 
 #: ../ui/evolution.xml.h:30
-msgid "View/Hide the Status Bar"
-msgstr "Показать или спрятать строку состояния."
-
-#: ../ui/evolution.xml.h:31
 msgid "_About Evolution..."
 msgstr "_О программе Ximian Evolution"
 
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:31
 msgid "_Close Window"
 msgstr "_Закрыть окно"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:34
 msgid "_Help"
 msgstr "_Справка"
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:35
 msgid "_Hide buttons"
 msgstr "_Скрыть кнопки"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:36
 msgid "_Icons only"
 msgstr "Только _значки"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:37
 msgid "_Import..."
 msgstr "_Импорт..."
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:38
 msgid "_New"
 msgstr "_Создать"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:39
 msgid "_Quick Reference"
 msgstr "_Быстрая справка"
 
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:40
 msgid "_Quit"
 msgstr "В_ыход"
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:41
 msgid "_Send / Receive"
 msgstr "_Отправить / Получить"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:42
 msgid "_Switcher Appearance"
 msgstr "Вид _переключателя"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:43
 msgid "_Synchronization Options..."
 msgstr "Параметры _синхронизации..."
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:44
 msgid "_Text only"
 msgstr "_Только текст"
 
-#: ../ui/evolution.xml.h:47
-msgid "_View Status Bar"
-msgstr "_Строка состояния"
-
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:46
 msgid "_Window"
 msgstr "_Окно"
 
@@ -19078,7 +18994,7 @@ msgid "MTWTFSS"
 msgstr "ПВСЧПСВ"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1097
+#: ../widgets/misc/e-calendar-item.c:1099
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -19138,14 +19054,14 @@ msgstr "Y2"
 #: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1430
 #: ../widgets/table/e-table-group-container.c:978
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3005
+#: ../widgets/table/e-table-item.c:3001
 msgid "Minimum width"
 msgstr "Минимальная ширина"
 
 #: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1431
 #: ../widgets/table/e-table-group-container.c:979
 #: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-item.c:3006
+#: ../widgets/table/e-table-item.c:3002
 msgid "Minimum Width"
 msgstr "Минимальная ширина"
 
@@ -19402,41 +19318,41 @@ msgstr "Ширина столбца"
 
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:346
+#: ../widgets/misc/e-search-bar.c:345
 msgid "Search Text Entry"
 msgstr "Поиск текста"
 
-#: ../widgets/misc/e-search-bar.c:550
+#: ../widgets/misc/e-search-bar.c:549
 msgid "_Search"
 msgstr "П_оиск"
 
-#: ../widgets/misc/e-search-bar.c:556
+#: ../widgets/misc/e-search-bar.c:555
 msgid "_Find Now"
 msgstr "_Найти сейчас"
 
-#: ../widgets/misc/e-search-bar.c:557 ../widgets/misc/e-search-bar.c:944
+#: ../widgets/misc/e-search-bar.c:556 ../widgets/misc/e-search-bar.c:943
 msgid "_Clear"
 msgstr "О_чистить"
 
-#: ../widgets/misc/e-search-bar.c:648
+#: ../widgets/misc/e-search-bar.c:647
 msgid "Search Type"
 msgstr "Тип поиска"
 
-#: ../widgets/misc/e-search-bar.c:852
+#: ../widgets/misc/e-search-bar.c:851
 msgid "Item ID"
 msgstr "ID элемента"
 
-#: ../widgets/misc/e-search-bar.c:859
+#: ../widgets/misc/e-search-bar.c:858
 msgid "Subitem ID"
 msgstr "ID субэлемента"
 
-#: ../widgets/misc/e-search-bar.c:866 ../widgets/text/e-entry.c:1249
+#: ../widgets/misc/e-search-bar.c:865 ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3462
 #: ../widgets/text/e-text.c:3463
 msgid "Text"
 msgstr "Текст"
 
-#: ../widgets/misc/e-search-bar.c:946
+#: ../widgets/misc/e-search-bar.c:945
 msgid "Find _Now"
 msgstr "Найти _сейчас"
 
@@ -19827,7 +19743,7 @@ msgstr "%s (%d элементов)"
 #: ../widgets/table/e-table-group-container.c:902
 #: ../widgets/table/e-table-group-leaf.c:573
 #: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2963 ../widgets/table/e-table-item.c:2964
+#: ../widgets/table/e-table-item.c:2959 ../widgets/table/e-table-item.c:2960
 msgid "Alternating Row Colors"
 msgstr "Альтернативные цвета строки"
 
@@ -19835,7 +19751,7 @@ msgstr "Альтернативные цвета строки"
 #: ../widgets/table/e-table-group-container.c:909
 #: ../widgets/table/e-table-group-leaf.c:580
 #: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2970 ../widgets/table/e-table-item.c:2971
+#: ../widgets/table/e-table-item.c:2966 ../widgets/table/e-table-item.c:2967
 #: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
 msgid "Horizontal Draw Grid"
 msgstr "Горизонтальная таблица для рисования"
@@ -19844,7 +19760,7 @@ msgstr "Горизонтальная таблица для рисования"
 #: ../widgets/table/e-table-group-container.c:916
 #: ../widgets/table/e-table-group-leaf.c:587
 #: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2977 ../widgets/table/e-table-item.c:2978
+#: ../widgets/table/e-table-item.c:2973 ../widgets/table/e-table-item.c:2974
 #: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
 msgid "Vertical Draw Grid"
 msgstr "Вертикальная таблица для рисования"
@@ -19853,7 +19769,7 @@ msgstr "Вертикальная таблица для рисования"
 #: ../widgets/table/e-table-group-container.c:923
 #: ../widgets/table/e-table-group-leaf.c:594
 #: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2984 ../widgets/table/e-table-item.c:2985
+#: ../widgets/table/e-table-item.c:2980 ../widgets/table/e-table-item.c:2981
 #: ../widgets/table/e-tree.c:3283 ../widgets/table/e-tree.c:3284
 msgid "Draw focus"
 msgstr "Фокус рисования"
@@ -19862,7 +19778,7 @@ msgstr "Фокус рисования"
 #: ../widgets/table/e-table-group-container.c:930
 #: ../widgets/table/e-table-group-leaf.c:601
 #: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:2991 ../widgets/table/e-table-item.c:2992
+#: ../widgets/table/e-table-item.c:2987 ../widgets/table/e-table-item.c:2988
 msgid "Cursor mode"
 msgstr "Режим курсора"
 
@@ -19870,7 +19786,7 @@ msgstr "Режим курсора"
 #: ../widgets/table/e-table-group-container.c:937
 #: ../widgets/table/e-table-group-leaf.c:615
 #: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2956 ../widgets/table/e-table-item.c:2957
+#: ../widgets/table/e-table-item.c:2952 ../widgets/table/e-table-item.c:2953
 msgid "Selection model"
 msgstr "Модель выделения"
 
@@ -19878,7 +19794,7 @@ msgstr "Модель выделения"
 #: ../widgets/table/e-table-group-container.c:944
 #: ../widgets/table/e-table-group-leaf.c:608
 #: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:2998 ../widgets/table/e-table-item.c:2999
+#: ../widgets/table/e-table-item.c:2994 ../widgets/table/e-table-item.c:2995
 #: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3265
 #: ../widgets/table/e-tree.c:3266
 msgid "Length Threshold"
@@ -19888,7 +19804,7 @@ msgstr "Порог длины"
 #: ../widgets/table/e-table-group-container.c:951
 #: ../widgets/table/e-table-group-leaf.c:650
 #: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
 #: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3297
 #: ../widgets/table/e-tree.c:3298
 msgid "Uniform row height"
@@ -19965,15 +19881,15 @@ msgstr "Информация по сортировке"
 msgid "Tree"
 msgstr "Дерево"
 
-#: ../widgets/table/e-table-item.c:2942 ../widgets/table/e-table-item.c:2943
+#: ../widgets/table/e-table-item.c:2938 ../widgets/table/e-table-item.c:2939
 msgid "Table header"
 msgstr "Заголовок таблицы"
 
-#: ../widgets/table/e-table-item.c:2949 ../widgets/table/e-table-item.c:2950
+#: ../widgets/table/e-table-item.c:2945 ../widgets/table/e-table-item.c:2946
 msgid "Table model"
 msgstr "Модель таблицы"
 
-#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
+#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
 msgid "Cursor row"
 msgstr "Строка с курсором"
 
@@ -20140,3 +20056,4 @@ msgstr "Контест метода ввода (IM)"
 #: ../widgets/text/e-text.c:3683 ../widgets/text/e-text.c:3684
 msgid "Handle Popup"
 msgstr "Обрабатывать всплывающие окна"
+
diff --git a/po/sv.po b/po/sv.po
index 4506bbc623..df6f9ab069 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -11,13 +11,13 @@
 # meeting = sammanträde
 # event = evenemang
 #
-# $Id: sv.po,v 1.217 2005/09/29 21:00:58 menthos Exp $
+# $Id: sv.po,v 1.215.2.1 2005/09/29 21:05:48 menthos Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-29 22:43+0200\n"
+"POT-Creation-Date: 2005-09-29 23:04+0200\n"
 "PO-Revision-Date: 2005-09-29 22:43+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -543,7 +543,7 @@ msgstr "Konfigurera automatisk ifyllning här"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1180
+#: ../addressbook/gui/component/addressbook-view.c:1133
 #: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:388
 msgid "Contacts"
 msgstr "Kontakter"
@@ -778,7 +778,7 @@ msgstr "Ta bort"
 msgid "Properties..."
 msgstr "Egenskaper..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1191
+#: ../addressbook/gui/component/addressbook-view.c:1144
 msgid "Contact Source Selector"
 msgstr "Väljare för kontaktkälla"
 
@@ -2615,8 +2615,8 @@ msgstr "_Snabbmeddelandetjänst:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:234
-#: ../plugins/exchange-operations/exchange-contacts.c:214
+#: ../plugins/exchange-operations/exchange-calendar.c:224
+#: ../plugins/exchange-operations/exchange-contacts.c:203
 msgid "_Location:"
 msgstr "_Plats:"
 
@@ -3775,8 +3775,8 @@ msgstr "Skuggning"
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
 #: ../plugins/exchange-operations/exchange-account-setup.c:940
-#: ../plugins/exchange-operations/exchange-calendar.c:224
-#: ../plugins/exchange-operations/exchange-contacts.c:197
+#: ../plugins/exchange-operations/exchange-calendar.c:214
+#: ../plugins/exchange-operations/exchange-contacts.c:186
 msgid "Size:"
 msgstr "Storlek:"
 
@@ -4377,7 +4377,7 @@ msgstr "Slumringsti_d:"
 #: ../ui/evolution-message-composer.xml.h:44
 #: ../ui/evolution-signature-editor.xml.h:23
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:23
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:35
 msgid "_Edit"
 msgstr "_Redigera"
 
@@ -5166,7 +5166,7 @@ msgstr "_Ta bort"
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:474
 #: ../calendar/gui/dialogs/comp-editor.c:1084
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3401 ../mail/em-folder-tree.c:2058
+#: ../composer/e-msg-composer.c:3401 ../mail/em-folder-tree.c:2052
 #: ../ui/evolution-mail-list.xml.h:29
 msgid "_Properties"
 msgstr "_Egenskaper"
@@ -5694,7 +5694,7 @@ msgstr[1] "%d bifogade meddelanden"
 #: ../calendar/gui/e-calendar-table.c:1171
 #: ../calendar/gui/e-calendar-view.c:1535 ../composer/e-msg-composer.c:2911
 #: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1035
-#: ../mail/message-list.c:1718 ../ui/evolution-addressbook.xml.h:31
+#: ../mail/message-list.c:1708 ../ui/evolution-addressbook.xml.h:31
 #: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
 #: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-tasks.xml.h:21
 msgid "_Copy"
@@ -5702,12 +5702,12 @@ msgstr "_Kopiera"
 
 #: ../calendar/gui/dialogs/comp-editor.c:429 ../composer/e-msg-composer.c:2912
 #: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1719
+#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1709
 msgid "_Move"
 msgstr "_Flytta"
 
 #: ../calendar/gui/dialogs/comp-editor.c:431 ../composer/e-msg-composer.c:2914
-#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1721
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1711
 msgid "Cancel _Drag"
 msgstr "Avbryt _dragning"
 
@@ -6367,7 +6367,7 @@ msgstr "Färdigt"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-calendar-table.c:380 ../mail/message-list.c:1018
+#: ../calendar/gui/e-calendar-table.c:380 ../mail/message-list.c:1008
 msgid "High"
 msgstr "Hög"
 
@@ -6382,14 +6382,14 @@ msgstr "Pågår"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1016
+#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1006
 msgid "Low"
 msgstr "Låg"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:381
-#: ../mail/message-list.c:1017
+#: ../mail/message-list.c:1007
 msgid "Normal"
 msgstr "Normal"
 
@@ -6821,7 +6821,7 @@ msgstr "_Markera markerade uppgifter som färdiga"
 
 #. FIXME: need to disable for undeletable folders
 #: ../calendar/gui/e-calendar-table.c:1183
-#: ../calendar/gui/e-calendar-view.c:1548 ../mail/em-folder-tree.c:2054
+#: ../calendar/gui/e-calendar-view.c:1548 ../mail/em-folder-tree.c:2048
 #: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:33
 #: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
 #: ../ui/evolution-tasks.xml.h:22
@@ -10706,11 +10706,11 @@ msgstr "Alternativ för mottagning"
 msgid "Checking for New Mail"
 msgstr "Kontroll av ny e-post"
 
-#: ../mail/em-account-editor.c:2662 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2661 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Kontoredigerare"
 
-#: ../mail/em-account-editor.c:2662 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2661 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolutions kontoassistent"
 
@@ -11113,12 +11113,12 @@ msgstr "Flyttar mappen %s"
 msgid "Copying folder %s"
 msgstr "Kopierar mappen %s"
 
-#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1623
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1613
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flyttar meddelanden till mappen %s"
 
-#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1625
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1615
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierar meddelanden till mappen %s"
@@ -11140,38 +11140,34 @@ msgstr "_Flytta till mapp"
 msgid "Scanning folders in \"%s\""
 msgstr "Genomsöker mappar i \"%s\""
 
-#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:44
+#: ../mail/em-folder-tree.c:2036 ../ui/evolution-addressbook.xml.h:44
 #: ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:48
 msgid "_View"
 msgstr "_Visa"
 
-#: ../mail/em-folder-tree.c:2043
+#: ../mail/em-folder-tree.c:2037
 msgid "Open in _New Window"
 msgstr "Öppna i _nytt fönster"
 
-#: ../mail/em-folder-tree.c:2047
+#: ../mail/em-folder-tree.c:2041
 msgid "_Copy..."
 msgstr "_Kopiera..."
 
-#: ../mail/em-folder-tree.c:2048
+#: ../mail/em-folder-tree.c:2042
 msgid "_Move..."
 msgstr "_Flytta..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2052
+#: ../mail/em-folder-tree.c:2046
 msgid "_New Folder..."
 msgstr "_Ny mapp..."
 
-#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:30
+#: ../mail/em-folder-tree.c:2049 ../ui/evolution-mail-list.xml.h:30
 msgid "_Rename..."
 msgstr "_Byt namn..."
 
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:119
-msgid "_Empty Trash"
-msgstr "_Töm papperskorgen"
-
 #: ../mail/em-folder-utils.c:104
 #, c-format
 msgid "Copying `%s' to `%s'"
@@ -11356,16 +11352,16 @@ msgid "Click to mail %s"
 msgstr "Klicka för att skicka e-post till %s"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:455
+#: ../mail/em-format-html-display.c:445
 #, c-format
 msgid "Matches: %d"
 msgstr "Träffar: %d"
 
-#: ../mail/em-format-html-display.c:706 ../mail/em-format-html.c:597
+#: ../mail/em-format-html-display.c:696 ../mail/em-format-html.c:597
 msgid "Unsigned"
 msgstr "Osignerat"
 
-#: ../mail/em-format-html-display.c:706
+#: ../mail/em-format-html-display.c:696
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11373,11 +11369,11 @@ msgstr ""
 "Detta meddelande är inte signerat. Det finns ingen garanti att detta "
 "meddelande är autentiskt."
 
-#: ../mail/em-format-html-display.c:707 ../mail/em-format-html.c:598
+#: ../mail/em-format-html-display.c:697 ../mail/em-format-html.c:598
 msgid "Valid signature"
 msgstr "Giltig signatur"
 
-#: ../mail/em-format-html-display.c:707
+#: ../mail/em-format-html-display.c:697
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11385,11 +11381,11 @@ msgstr ""
 "Detta meddelande är signerat och giltigt, vilket betyder att det är mycket "
 "sannolikt att meddelandet är autentiskt."
 
-#: ../mail/em-format-html-display.c:708 ../mail/em-format-html.c:599
+#: ../mail/em-format-html-display.c:698 ../mail/em-format-html.c:599
 msgid "Invalid signature"
 msgstr "Ogiltig signatur"
 
-#: ../mail/em-format-html-display.c:708
+#: ../mail/em-format-html-display.c:698
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11397,11 +11393,11 @@ msgstr ""
 "Signaturen för detta meddelande kan inte verifieras. Den kan ha ändrats "
 "under överföringen."
 
-#: ../mail/em-format-html-display.c:709
+#: ../mail/em-format-html-display.c:699
 msgid "Valid signature, cannot verify sender"
 msgstr "Giltig signatur, kan inte verifiera avsändaren"
 
-#: ../mail/em-format-html-display.c:709
+#: ../mail/em-format-html-display.c:699
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11409,11 +11405,11 @@ msgstr ""
 "Detta meddelande är signerat med en giltig signatur, men meddelandets "
 "avsändare kan inte verifieras."
 
-#: ../mail/em-format-html-display.c:715 ../mail/em-format-html.c:606
+#: ../mail/em-format-html-display.c:705 ../mail/em-format-html.c:606
 msgid "Unencrypted"
 msgstr "Okrypterat"
 
-#: ../mail/em-format-html-display.c:715
+#: ../mail/em-format-html-display.c:705
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -11421,11 +11417,11 @@ msgstr ""
 "Detta meddelande är inte krypterat. Dess innehåll kan ses i överföringen på "
 "Internet."
 
-#: ../mail/em-format-html-display.c:716 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:706 ../mail/em-format-html.c:607
 msgid "Encrypted, weak"
 msgstr "Krypterat, svagt"
 
-#: ../mail/em-format-html-display.c:716
+#: ../mail/em-format-html-display.c:706
 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 "
@@ -11435,11 +11431,11 @@ msgstr ""
 "skulle vara svårt men inte omöjligt för en utomstående att se innehållet i "
 "detta meddelande inom en rimlig tid."
 
-#: ../mail/em-format-html-display.c:717 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:707 ../mail/em-format-html.c:608
 msgid "Encrypted"
 msgstr "Krypterat"
 
-#: ../mail/em-format-html-display.c:717
+#: ../mail/em-format-html-display.c:707
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11447,11 +11443,11 @@ msgstr ""
 "Detta meddelande är krypterat. Det skulle vara svårt för en utomstående att "
 "se innehållet i detta meddelande."
 
-#: ../mail/em-format-html-display.c:718 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:708 ../mail/em-format-html.c:609
 msgid "Encrypted, strong"
 msgstr "Krypterat, starkt"
 
-#: ../mail/em-format-html-display.c:718
+#: ../mail/em-format-html-display.c:708
 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 "
@@ -11461,71 +11457,71 @@ msgstr ""
 "vara mycket svårt för en utomstående att se innehållet i detta meddelande "
 "inom en rimlig tid."
 
-#: ../mail/em-format-html-display.c:819 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:809 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Visa certifikat"
 
-#: ../mail/em-format-html-display.c:834
+#: ../mail/em-format-html-display.c:824
 msgid "This certificate is not viewable"
 msgstr "Detta certifikatet är inte visningsbart"
 
-#: ../mail/em-format-html-display.c:1116
+#: ../mail/em-format-html-display.c:1106
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Färdigställt den %d %B %Y %k.%M"
 
-#: ../mail/em-format-html-display.c:1124
+#: ../mail/em-format-html-display.c:1114
 msgid "Overdue:"
 msgstr "Skulle ha utförts:"
 
-#: ../mail/em-format-html-display.c:1127
+#: ../mail/em-format-html-display.c:1117
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "den %d %B %Y %k.%M"
 
-#: ../mail/em-format-html-display.c:1187
+#: ../mail/em-format-html-display.c:1177
 msgid "_View Inline"
 msgstr "_Visa inuti"
 
-#: ../mail/em-format-html-display.c:1188
+#: ../mail/em-format-html-display.c:1178
 msgid "_Hide"
 msgstr "_Dölj"
 
-#: ../mail/em-format-html-display.c:1189
+#: ../mail/em-format-html-display.c:1179
 msgid "_Fit to Width"
 msgstr "_Anpassa till bredden"
 
-#: ../mail/em-format-html-display.c:1190
+#: ../mail/em-format-html-display.c:1180
 msgid "Show _Original Size"
 msgstr "Visa _originalstorlek"
 
-#: ../mail/em-format-html-display.c:1560
+#: ../mail/em-format-html-display.c:1550
 msgid "Attachment Button"
 msgstr "Bilageknapp"
 
-#: ../mail/em-format-html-display.c:1767
+#: ../mail/em-format-html-display.c:1757
 msgid "Select folder to save all attachments..."
 msgstr "Välj mapp att spara alla bilagor i..."
 
-#: ../mail/em-format-html-display.c:1806
+#: ../mail/em-format-html-display.c:1796
 msgid "Select folder to save selected attachments..."
 msgstr "Välj mapp att spara markerade bilagor i..."
 
-#: ../mail/em-format-html-display.c:1814
+#: ../mail/em-format-html-display.c:1804
 msgid "Save Selected..."
 msgstr "Spara markerade..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1881
+#: ../mail/em-format-html-display.c:1871
 #, c-format
 msgid "%d attachment"
 msgid_plural "%d attachments"
 msgstr[0] "%d bilaga"
 msgstr[1] "%d bilagor"
 
-#: ../mail/em-format-html-display.c:1945
+#: ../mail/em-format-html-display.c:1935
 msgid "No Attachment"
 msgstr "Ingen bilaga"
 
-#: ../mail/em-format-html-display.c:1948
+#: ../mail/em-format-html-display.c:1938
 msgid "Save All"
 msgstr "Spara alla"
 
@@ -13544,7 +13540,7 @@ msgstr "Ange ett namn för denna signatur."
 msgid "Name:"
 msgstr "Namn:"
 
-#: ../mail/mail-tools.c:115
+#: ../mail/mail-tools.c:116
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Kunde inte skapa spool-katalogen \"%s\": %s"
@@ -13554,16 +13550,16 @@ msgstr "Kunde inte skapa spool-katalogen \"%s\": %s"
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "Försöker att movemail:a en källa \"%s\" som inte är en mbox"
 
-#: ../mail/mail-tools.c:249
+#: ../mail/mail-tools.c:242
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Vidarebefordrat meddelande - %s"
 
-#: ../mail/mail-tools.c:251
+#: ../mail/mail-tools.c:244
 msgid "Forwarded message"
 msgstr "Vidarebefordrat meddelande"
 
-#: ../mail/mail-tools.c:291
+#: ../mail/mail-tools.c:284
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Ogiltig mapp: \"%s\""
@@ -14121,6 +14117,10 @@ msgstr "_Lägg till"
 msgid "_Discard changes"
 msgstr "_Förkasta ändringar"
 
+#: ../mail/mail.error.xml.h:119
+msgid "_Empty Trash"
+msgstr "_Töm papperskorgen"
+
 #: ../mail/mail.error.xml.h:120
 msgid "_Expunge"
 msgstr "_Töm"
@@ -14129,74 +14129,74 @@ msgstr "_Töm"
 msgid "_Open Messages"
 msgstr "_Öppna meddelanden"
 
-#: ../mail/message-list.c:1006
+#: ../mail/message-list.c:996
 msgid "Unseen"
 msgstr "Oläst"
 
-#: ../mail/message-list.c:1007
+#: ../mail/message-list.c:997
 msgid "Seen"
 msgstr "Läst"
 
-#: ../mail/message-list.c:1008
+#: ../mail/message-list.c:998
 msgid "Answered"
 msgstr "Besvarad"
 
-#: ../mail/message-list.c:1009
+#: ../mail/message-list.c:999
 msgid "Multiple Unseen Messages"
 msgstr "Flera olästa meddelanden"
 
-#: ../mail/message-list.c:1010
+#: ../mail/message-list.c:1000
 msgid "Multiple Messages"
 msgstr "Flera meddelanden"
 
-#: ../mail/message-list.c:1014
+#: ../mail/message-list.c:1004
 msgid "Lowest"
 msgstr "Lägsta"
 
-#: ../mail/message-list.c:1015
+#: ../mail/message-list.c:1005
 msgid "Lower"
 msgstr "Lägre"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1009
 msgid "Higher"
 msgstr "Högre"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1010
 msgid "Highest"
 msgstr "Högsta"
 
-#: ../mail/message-list.c:1348 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1338 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1355 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1345 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Idag %l.%M"
 
-#: ../mail/message-list.c:1364 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1354 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Igår %H.%M"
 
-#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1366 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: ../mail/message-list.c:1384 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1374 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: ../mail/message-list.c:1386 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2052
+#: ../mail/message-list.c:2042
 msgid "Message List"
 msgstr "Meddelandelista"
 
-#: ../mail/message-list.c:3397
+#: ../mail/message-list.c:3387
 msgid "Generating message list"
 msgstr "Genererar meddelandelista"
 
@@ -14355,26 +14355,26 @@ msgstr "Säkerhetskopiera och återställ data och inställningar i Evolution"
 msgid "Restore Settings..."
 msgstr "Återställ inställningar..."
 
-#: ../plugins/bbdb/bbdb.c:410
+#: ../plugins/bbdb/bbdb.c:404
 msgid "Automatic Contacts"
 msgstr "Automatiska kontakter"
 
-#: ../plugins/bbdb/bbdb.c:419
+#: ../plugins/bbdb/bbdb.c:413
 msgid "<span weight=\"bold\">Automatic Contacts</span>"
 msgstr "<span weight=\"bold\">Automatiska kontakter</span>"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:432
+#: ../plugins/bbdb/bbdb.c:426
 msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
 msgstr "Skapa _automatiskt poster i adressboken då e-post besvaras"
 
-#: ../plugins/bbdb/bbdb.c:450
+#: ../plugins/bbdb/bbdb.c:444
 msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
 msgstr "<span weight=\"bold\">Kontakter för snabbmeddelanden</span>"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:463
+#: ../plugins/bbdb/bbdb.c:457
 msgid ""
 "Periodically synchronize contact information and images from my _instant "
 "messenger"
@@ -14383,7 +14383,7 @@ msgstr ""
 "snabb_meddelandeprogram"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:470
+#: ../plugins/bbdb/bbdb.c:464
 msgid "Synchronize with _buddy list now"
 msgstr "Synkronisera med _kompislistan nu"
 
@@ -14639,15 +14639,6 @@ msgstr "Autentiseringstyp"
 msgid "Ch_eck for Supported Types"
 msgstr "_Kontrollera vilka typer som stöds"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:192
-#: ../plugins/exchange-operations/exchange-contacts.c:162
-msgid ""
-"Evolution is in offline mode. You cannot create or modify folders now.\n"
-"Please switch to online mode for such operations."
-msgstr ""
-"Evolution är i frånkopplat läge. Du kan inte skapa eller ändra mappar nu.\n"
-"Växla till anslutet läge för sådana åtgärder."
-
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
@@ -16734,27 +16725,27 @@ msgstr "Mappnamnet kan inte innehålla tecknet \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "\".\" och \"..\" är reserverade mappnamn."
 
-#: ../shell/e-shell-window-commands.c:71
+#: ../shell/e-shell-window-commands.c:70
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot-verktygen verkar inte vara installerade på detta system."
 
-#: ../shell/e-shell-window-commands.c:79
+#: ../shell/e-shell-window-commands.c:78
 #, c-format
 msgid "Error executing %s."
 msgstr "Fel vid körning av %s."
 
-#: ../shell/e-shell-window-commands.c:128
+#: ../shell/e-shell-window-commands.c:127
 msgid "Bug buddy is not installed."
 msgstr "Bug-buddy är inte installerat."
 
-#: ../shell/e-shell-window-commands.c:136
+#: ../shell/e-shell-window-commands.c:135
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy kunde inte köras."
 
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
 #. * about box
-#: ../shell/e-shell-window-commands.c:533
+#: ../shell/e-shell-window-commands.c:532
 msgid "translator-credits"
 msgstr ""
 "Christian Rose\n"
@@ -16764,19 +16755,19 @@ msgstr ""
 "Andreas Hydén\n"
 "Skicka synpunkter på översättningen till sv@li.org"
 
-#: ../shell/e-shell-window-commands.c:547
+#: ../shell/e-shell-window-commands.c:546
 msgid "Groupware Suite"
 msgstr "Grupprogramvarusvit"
 
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:774
 msgid "_Work Online"
 msgstr "A_rbeta ansluten"
 
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:52
+#: ../shell/e-shell-window-commands.c:787 ../ui/evolution.xml.h:50
 msgid "_Work Offline"
 msgstr "A_rbeta frånkopplad"
 
-#: ../shell/e-shell-window-commands.c:801
+#: ../shell/e-shell-window-commands.c:800
 msgid "Work Offline"
 msgstr "Arbeta frånkopplad"
 
@@ -16795,7 +16786,7 @@ msgstr ""
 "Evolution är just nu frånkopplad. Klicka på denna knapp för att arbeta "
 "ansluten."
 
-#: ../shell/e-shell-window.c:735
+#: ../shell/e-shell-window.c:724
 #, c-format
 msgid "Switch to %s"
 msgstr "Växla till %s"
@@ -18019,8 +18010,8 @@ msgid ""
 msgstr "Dölj borttagna meddelanden istället för att visa dem överstrukna"
 
 #: ../ui/evolution-mail-list.xml.h:13
-msgid "Mar_k Messages as Read"
-msgstr "_Markera meddelanden som lästa"
+msgid "Mark Me_ssages as Read"
+msgstr "Markera me_ddelanden som lästa"
 
 #: ../ui/evolution-mail-list.xml.h:14 ../ui/evolution-mail-message.xml.h:69
 msgid "Paste message(s) from the clipboard"
@@ -18517,7 +18508,7 @@ msgstr "S_täng"
 #: ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:45
 #: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:37
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Arkiv"
 
@@ -18914,67 +18905,59 @@ msgid "Tool_bar style"
 msgstr "Stil på verktygs_rad"
 
 #: ../ui/evolution.xml.h:33
-msgid "View/Hide the Status Bar"
-msgstr "Visa/Dölj statusraden"
-
-#: ../ui/evolution.xml.h:34
 msgid "_About Evolution..."
 msgstr "_Om Evolution..."
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:34
 msgid "_Close Window"
 msgstr "S_täng fönster"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:37
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:38
 msgid "_Hide buttons"
 msgstr "_Dölj knappar"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:39
 msgid "_Icons only"
 msgstr "Endast _ikoner"
 
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:40
 msgid "_Import..."
 msgstr "_Importera..."
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:41
 msgid "_New"
 msgstr "_Nytt"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:42
 msgid "_Quick Reference"
 msgstr "_Snabbreferens"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:43
 msgid "_Quit"
 msgstr "_Avsluta"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:44
 msgid "_Send / Receive"
 msgstr "_Skicka / Ta emot"
 
 # Osäker.
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:45
 msgid "_Switcher Appearance"
 msgstr "_Växlarutseende"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:46
 msgid "_Synchronization Options..."
 msgstr "_Synkroniseringsalternativ..."
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:47
 msgid "_Text only"
 msgstr "Endast _text"
 
-#: ../ui/evolution.xml.h:50
-msgid "_View Status Bar"
-msgstr "_Visa statusrad"
-
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:49
 msgid "_Window"
 msgstr "_Fönster"
 
@@ -19481,41 +19464,41 @@ msgstr "Kolumnbredd"
 
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:346
+#: ../widgets/misc/e-search-bar.c:345
 msgid "Search Text Entry"
 msgstr "Söktextfält"
 
-#: ../widgets/misc/e-search-bar.c:550
+#: ../widgets/misc/e-search-bar.c:549
 msgid "_Search"
 msgstr "_Sök"
 
-#: ../widgets/misc/e-search-bar.c:556
+#: ../widgets/misc/e-search-bar.c:555
 msgid "_Find Now"
 msgstr "_Sök nu"
 
-#: ../widgets/misc/e-search-bar.c:557 ../widgets/misc/e-search-bar.c:944
+#: ../widgets/misc/e-search-bar.c:556 ../widgets/misc/e-search-bar.c:943
 msgid "_Clear"
 msgstr "_Töm"
 
-#: ../widgets/misc/e-search-bar.c:648
+#: ../widgets/misc/e-search-bar.c:647
 msgid "Search Type"
 msgstr "Sökningstyp"
 
-#: ../widgets/misc/e-search-bar.c:852
+#: ../widgets/misc/e-search-bar.c:851
 msgid "Item ID"
 msgstr "Objekt-ID"
 
-#: ../widgets/misc/e-search-bar.c:859
+#: ../widgets/misc/e-search-bar.c:858
 msgid "Subitem ID"
 msgstr "Underobjekt-ID"
 
-#: ../widgets/misc/e-search-bar.c:866 ../widgets/text/e-entry.c:1249
+#: ../widgets/misc/e-search-bar.c:865 ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3462
 #: ../widgets/text/e-text.c:3463
 msgid "Text"
 msgstr "Text"
 
-#: ../widgets/misc/e-search-bar.c:946
+#: ../widgets/misc/e-search-bar.c:945
 msgid "Find _Now"
 msgstr "Sök _nu"
 
@@ -20220,6 +20203,23 @@ msgstr "IM-sammanhang"
 msgid "Handle Popup"
 msgstr "Handtagspopupfönster"
 
+#~ msgid ""
+#~ "Evolution is in offline mode. You cannot create or modify folders now.\n"
+#~ "Please switch to online mode for such operations."
+#~ msgstr ""
+#~ "Evolution är i frånkopplat läge. Du kan inte skapa eller ändra mappar "
+#~ "nu.\n"
+#~ "Växla till anslutet läge för sådana åtgärder."
+
+#~ msgid "Mar_k Messages as Read"
+#~ msgstr "_Markera meddelanden som lästa"
+
+#~ msgid "View/Hide the Status Bar"
+#~ msgstr "Visa/Dölj statusraden"
+
+#~ msgid "_View Status Bar"
+#~ msgstr "_Visa statusrad"
+
 #~ msgid "Mo_ve to Folder..."
 #~ msgstr "Fl_ytta till mapp..."
 
@@ -20237,9 +20237,6 @@ msgstr "Handtagspopupfönster"
 #~ msgid "Unknown error decrypting messaage"
 #~ msgstr "Okänt fel vid dekryptering av meddelande"
 
-#~ msgid "Mark Me_ssages as Read"
-#~ msgstr "Markera me_ddelanden som lästa"
-
 # Osäker
 #~ msgid "FIll stipple"
 #~ msgstr "FYll stöppling"
diff --git a/po/th.po b/po/th.po
index 69427ada13..b3eb1c2bd6 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution-2.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-27 16:34+0700\n"
-"PO-Revision-Date: 2005-11-28 20:06+0700\n"
+"POT-Creation-Date: 2005-09-18 15:40+0700\n"
+"PO-Revision-Date: 2005-09-05 00:43+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
 "Language-Team: Thai <L10N@opentle.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=0;"
+"Plural-Forms: nplurals=2; plural=0;\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
@@ -41,6 +41,7 @@ msgstr[0] "โฟลเดอร์สมุดที่อยู่ปัจจ
 msgstr[1] "โฟลเดอร์สมุดที่อยู่ปัจจุบันมีนามบัตร %d ใบ"
 
 #: ../a11y/addressbook/ea-minicard.c:31
+#: ../calendar/gui/alarm-notify/alarm-queue.c:953
 #: ../ui/evolution-message-composer.xml.h:11
 msgid "Open"
 msgstr "เปิด"
@@ -94,7 +95,7 @@ msgstr "นัดหมายใหม่"
 msgid "New All Day Event"
 msgstr "เหตุการณ์ตลอดทั้งวันใหม่"
 
-#: ../a11y/calendar/ea-cal-view.c:308
+#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1505
 msgid "New Meeting"
 msgstr "ประชุมใหม่"
 
@@ -274,7 +275,7 @@ msgstr ""
 
 #: ../a11y/e-table/gal-a11y-e-cell.c:107
 msgid "Table Cell"
-msgstr "ช่องตาราง"
+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
@@ -284,7 +285,7 @@ msgstr "คลิกเพื่อเพิ่ม"
 
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:53
 msgid "click"
-msgstr "คลิก"
+msgstr ""
 
 #: ../a11y/e-table/gal-a11y-e-table-column-header.c:135
 msgid "sort"
@@ -352,56 +353,44 @@ msgid "Could not remove addressbook."
 msgstr "ไม่สามารถลบสมุดที่อยู่"
 
 #: ../addressbook/addressbook.error.xml.h:8
-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:9
 msgid "Delete address book '{0}'?"
 msgstr "ลบสมุดที่อยู่ '{0}' หรือไม่?"
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Error loading addressbook."
 msgstr "เกิดข้อผิดพลาดขณะโหลดสมุดที่อยู่"
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:10
 msgid "Error saving {0} to {1}: {2}"
 msgstr "เกิดข้อผิดพลาดขณะบันทึก {0} ไปยัง {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:11
 msgid "Failed to authenticate with LDAP server."
 msgstr "ตรวจสอบสิทธิ์ด้วยเซิร์ฟเวอร์ LDAP ล้มเหลว"
 
-#: ../addressbook/addressbook.error.xml.h:13
-msgid "GroupWise Address book creation:"
-msgstr ""
-
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "LDAP server did not respond with valid schema information."
 msgstr "เซิร์ฟเวอร์ LDAP ไม่ตอบสนองกับข้อมูล schema ที่ถูกต้อง"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:13
 msgid "Server Version"
 msgstr "รุ่นเซิร์ฟเวอร์"
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:14
 #: ../calendar/calendar.error.xml.h:44
 msgid "Some features may not work properly with your current server"
 msgstr "คุณลักษณะบางอย่างอาจจะไม่เหมาะกับเซิร์ฟเวอร์ปัจจุบันของคุณ"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "สมุดที่อยู่ Evolution หยุดทำงานโดยไม่ได้คาดหมาย"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:16
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
-"รูปภาพที่คุณเลือกมีขนาดใหญ่ คุณต้องการปรับขนาดก่อนหรือไม่?"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:17
 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 "
@@ -411,19 +400,19 @@ msgstr ""
 "หรืออาจจะมีการกำหนดค่าผิดพลาด คุณจะต้องสอบถามข้อมูลกับผู้ดูแลระบบของคุณ "
 "เพื่อให้สนับสนุนระบบจุดเริ่มต้นค้นหา"
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "This address book will be removed permanently."
 msgstr "สมุดที่อยู่นี้จะถูกลบไปแบบถาวร"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "This addressbook could not be opened."
 msgstr "สมุดที่อยู่นี้ไม่สามารถเปิดได้"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "This addressbook server does not have any suggested search bases."
-msgstr "เซิร์ฟเวอร์สมุดที่อยู่ไม่มีฐานการค้นที่แนะนำเลย"
+msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:21
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -431,27 +420,27 @@ msgstr ""
 "สมุดที่อยู่นี้อาจจะไม่สามารถเข้าถึงได้ หรืออาจจะสะกดชื่อเซิร์ฟเวอร์ผิด "
 "หรือการเชื่อมต่อเครือข่ายของคุณหลุดไป"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "This server does not support LDAPv3 schema information."
 msgstr "เซิร์ฟเวอร์นี้ไม่สนับสนุนข้อมูล schema ของ LDAPv3"
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "Unable to open addressbook"
 msgstr "ไม่สามารถเปิดสมุดที่อยู่"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "Unable to perform search."
 msgstr "ไม่สามารถดำเนินการค้นหา"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "Unable to save {0}."
 msgstr "ไม่สามารถบันทึก {0}"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "Would you like to save your changes?"
 msgstr "คุณต้องการบันทึกการเปลี่ยนแปลงหรือไม่?"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:27
 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?"
@@ -459,8 +448,8 @@ msgstr ""
 "คุณกำลังพยายามย้ายที่อยู่ติดต่อจากสมุดที่อยู่หนึ่งไปยังอีกที่หนึ่ง แต่ไม่สามารถลบออกจากต้นทางได้ "
 "คุณต้องการจะเปลี่ยนเป็นการบันทึกที่อยู่ติดต่อนี้แทนการย้ายหรือไม่?"
 
-#: ../addressbook/addressbook.error.xml.h:30
-#: ../calendar/calendar.error.xml.h:61
+#: ../addressbook/addressbook.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:59
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -469,34 +458,34 @@ msgstr ""
 "คุณกำลังเชื่อมต่อกับเซิร์ฟเวอร์ GroupWise รุ่นที่ไม่ได้สนับสนุน อาจจะทำให้เกิดปัญหาการใช้ "
 "Evolution ทางที่ดีที่สุดคือเซิร์ฟเวอร์ควรปรับปรุงให้ใช้กับรุ่นที่สนับสนุน"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:29
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "คุณได้เปลี่ยนแปลงแก้ไขที่อยู่ติดต่อนี้ไปแล้ว คุณต้องการบันทึกการเปลี่ยนแปลงหรือไม่?"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:30
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "ที่อยู่ติดต่อ {0} นี้จะยังไม่สามารถใช้ได้ จนกว่าจะเริ่มการทำงานของ Evolution ใหม่"
 
-#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:495
+#: ../addressbook/addressbook.error.xml.h:31 ../mail/em-vfolder-rule.c:494
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
 msgid "_Add"
 msgstr "เ_พิ่ม"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "_Discard"
 msgstr "_ละทิ้ง"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:33
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "{0}"
 msgstr "{0}"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "{1}"
 msgstr "{1}"
 
@@ -512,7 +501,7 @@ msgstr "ไม่สามารถโหลดสมุดที่อยู่
 #: ../addressbook/conduit/address-conduit.c:1252
 #: ../addressbook/conduit/address-conduit.c:1255
 msgid "Could not read pilot's Address application block"
-msgstr "ไม่สามารถอ่านบล็อคโปรแกรมสมุดที่อยู่ของ pilot ได้"
+msgstr ""
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Autocompletion"
@@ -532,7 +521,7 @@ msgstr "กำหนดค่าเติมเต็มคำอัตโนม
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1186
+#: ../addressbook/gui/component/addressbook-view.c:1133
 #: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:388
 msgid "Contacts"
 msgstr "ที่อยู่ติดต่อ"
@@ -573,12 +562,10 @@ msgstr "จัดการการตรวจสอบ S/MIME ของคุ�
 #. On This Computer is always first and Search Folders is always last
 #: ../addressbook/gui/component/addressbook-component.c:137
 #: ../addressbook/gui/component/addressbook-migrate.c:502
-#: ../calendar/gui/calendar-component.c:208
-#: ../calendar/gui/memos-component.c:192 ../calendar/gui/migration.c:462
-#: ../calendar/gui/migration.c:555 ../calendar/gui/migration.c:1057
-#: ../calendar/gui/tasks-component.c:188 ../mail/em-folder-tree-model.c:197
-#: ../mail/em-folder-tree-model.c:199 ../mail/mail-component.c:292
-#: ../mail/mail-vfolder.c:223
+#: ../calendar/gui/calendar-component.c:208 ../calendar/gui/migration.c:462
+#: ../calendar/gui/migration.c:555 ../calendar/gui/tasks-component.c:188
+#: ../mail/em-folder-tree-model.c:197 ../mail/em-folder-tree-model.c:199
+#: ../mail/mail-component.c:292 ../mail/mail-vfolder.c:223
 msgid "On This Computer"
 msgstr "ในคอมพิวเตอร์นี้"
 
@@ -590,12 +577,10 @@ msgstr "ในคอมพิวเตอร์นี้"
 #: ../addressbook/gui/component/addressbook-component.c:145
 #: ../addressbook/gui/component/addressbook-migrate.c:510
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../calendar/gui/calendar-component.c:216
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:470
-#: ../calendar/gui/migration.c:563 ../calendar/gui/migration.c:1065
-#: ../calendar/gui/tasks-component.c:196 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1043 ../mail/mail-config.c:78
-#: ../mail/mail-config.glade.h:104
+#: ../calendar/gui/calendar-component.c:216 ../calendar/gui/migration.c:470
+#: ../calendar/gui/migration.c:563 ../calendar/gui/tasks-component.c:196
+#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1043
+#: ../mail/mail-config.c:78 ../mail/mail-config.glade.h:104
 msgid "Personal"
 msgstr "ส่วนบุคคล"
 
@@ -622,7 +607,8 @@ msgid "Create a new contact list"
 msgstr "สร้างรายชื่อที่อยู่ติดต่อใหม่"
 
 #: ../addressbook/gui/component/addressbook-component.c:241
-#: ../addressbook/gui/component/addressbook-config.c:1202
+#: ../addressbook/gui/component/addressbook-config.c:1118
+#: ../addressbook/gui/component/addressbook-view.c:763
 msgid "New Address Book"
 msgstr "สมุดที่อยู่ใหม่"
 
@@ -638,60 +624,59 @@ msgstr "สร้างสมุดที่อยู่ใหม่"
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "การปรับปรุงการตั้งค่าสมุดที่อยู่หรือโฟลเดอร์ล้มเหลว"
 
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:313
 msgid "Base"
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-config.c:530
+#: ../addressbook/gui/component/addressbook-config.c:508
 #: ../calendar/gui/dialogs/calendar-setup.c:192
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "ประเ_ภท:"
 
-#: ../addressbook/gui/component/addressbook-config.c:634
+#: ../addressbook/gui/component/addressbook-config.c:607
 msgid "Copy book content locally for offline operation"
 msgstr "คัดลอกเนื้อหาสมุดที่อยู่ไว้ที่เครื่องเพื่อการทำงานแบบออฟไลน์"
 
-#: ../addressbook/gui/component/addressbook-config.c:981
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/addressbook-config.c:902
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:366
+#: ../calendar/gui/dialogs/calendar-setup.c:377
 #: ../mail/em-folder-properties.c:215 ../mail/mail-config.glade.h:85
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "ทั่วไป"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/component/addressbook-config.c:903
 #: ../mail/importers/pine-importer.c:393
 msgid "Addressbook"
 msgstr "สมุดที่อยู่"
 
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:907
 msgid "Server Information"
 msgstr "ข้อมูลเซิร์ฟเวอร์"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:909
 msgid "Authentication"
-msgstr "การยืนยันตัวบุคคล"
+msgstr "การยืนยันตัวตน"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/addressbook-config.c:912
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 #: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "รายละเอียด"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../addressbook/gui/component/addressbook-config.c:913
 msgid "Searching"
 msgstr "กำลังค้นหา"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:915
 msgid "Downloading"
 msgstr "กำลังดาวน์โหลด"
 
-#: ../addressbook/gui/component/addressbook-config.c:1200
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/addressbook-config.c:1116
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "คุณสมบัติสมุดที่อยู่"
 
@@ -721,9 +706,10 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"ตำแหน่งและโครงสร้างของโฟลเดอร์ที่อยู่ติดต่อของ Evolution มีการเปลี่ยนแปลงจากรุ่น 1.x\n"
+"ตำแหน่งและลำดับขั้นของโฟลเดอร์ที่อยู่ติดต่อของ Evolution มีการเปลี่ยนแปลงตั้งแต่ Evolution 1."
+"x.\n"
 "\n"
-"กรุณาอดใจรอ ขณะที่ Evolution ถ่ายโอนโฟลเดอร์ของคุณ..."
+"กรุณารอในขณะที่ Evolution ถ่ายโอนโฟลเดอร์ของคุณ..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1148
 msgid ""
@@ -741,9 +727,6 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"วิธีเก็บหมายเลขโทรศัพท์ของ Evolution ได้เปลี่ยนไปแล้ว\n"
-"\n"
-"กรุณาอดใจรอ ขณะที่ Evolution ถ่ายโอนโฟลเดอร์ของคุณ..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1167
 msgid ""
@@ -751,34 +734,23 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
-"บันทึกการเปลี่ยนแปลงของการ sync palm ของ Evolution ได้เปลี่ยนไปแล้ว\n"
-"\n"
-"กรุณาอดใจรอ ขณะที่ Evolution ถ่ายโอนข้อมูลการ sync pilot ของคุณ..."
 
-#: ../addressbook/gui/component/addressbook-view.c:769
-msgid "_New Address Book"
-msgstr "สมุดที่อยู่ใ_หม่"
-
-#. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:770
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/component/addressbook-view.c:764
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 #: ../calendar/gui/calendar-component.c:537
-#: ../calendar/gui/e-calendar-table.c:1194
-#: ../calendar/gui/e-calendar-view.c:1575 ../calendar/gui/e-memo-table.c:869
-#: ../calendar/gui/tasks-component.c:441 ../mail/em-folder-tree.c:2054
-#: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:34
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
-#: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
-msgid "_Delete"
-msgstr "_ลบ"
+#: ../calendar/gui/tasks-component.c:441 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:26 ../ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "ลบ"
 
-#: ../addressbook/gui/component/addressbook-view.c:772
+#: ../addressbook/gui/component/addressbook-view.c:766
 #: ../calendar/gui/calendar-component.c:538
 #: ../calendar/gui/tasks-component.c:442
-msgid "_Properties..."
-msgstr "คุณ_สมบัติ..."
+msgid "Properties..."
+msgstr "คุณสมบัติ..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1197
+#: ../addressbook/gui/component/addressbook-view.c:1144
 msgid "Contact Source Selector"
 msgstr ""
 
@@ -787,12 +759,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "กำลังเข้าถึงเซิร์ฟเวอร์ LDAP แบบเป็นบุคคลนิรนาม"
 
 #: ../addressbook/gui/component/addressbook.c:191
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:490
 msgid "Failed to authenticate.\n"
 msgstr "การตรวจสอบสิทธิ์ล้มเหลว\n"
 
 #: ../addressbook/gui/component/addressbook.c:198
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:469
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "ป้อนรหัสผ่านสำหรับ %s (ผู้ใช้ %s)"
@@ -824,7 +796,6 @@ msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr ""
-"จำนวนอักขระที่จะต้องป้อน ก่อนที่ Evolution จะพยายามเติมเต็มส่วนที่เหลือ"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
 msgid "URI for the folder last used in the select names dialog"
@@ -835,7 +806,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr ""
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 msgid "Vertical pane position"
 msgstr "ตำแหน่ง Vertical pane"
 
@@ -844,121 +815,127 @@ msgid "Whether to show the preview pane."
 msgstr "กำหนดว่าจะแสดง preview pane หรือไม่"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:1
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/event-page.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../mail/message-tags.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:1
+msgid "*"
+msgstr "*"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr "1"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:2
+#: ../addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:3
+#: ../addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:5
+#: ../addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:6
+#: ../addressbook/gui/component/ldap-config.glade.h:7
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
-msgstr "<b>การยืนยันตัวบุคคล</b>"
+msgstr "<b>การยืนยันตัวตน</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:7
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Display</b>"
 msgstr "<b>แสดง</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:8
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Downloading</b>"
 msgstr "<b>กำลังดาวน์โหลด</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Searching</b>"
 msgstr "<b>กำลังค้นหา</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Server Information</b>"
 msgstr "<b>ข้อมูลเซิร์ฟเวอร์</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:12
 msgid "<b>Type:</b>"
-msgstr "<b>ชนิด:</b>"
+msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add Address Book"
 msgstr "เพิ่มสมุดที่อยู่"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 #: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:759
 msgid "Always"
 msgstr "ใช้เสมอ"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 msgid "Basic"
 msgstr "พื้นฐาน"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid "Email address"
 msgstr "ที่อยู่อีเมล"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr "Evolution จะใช้ที่อยู่อีเมลนี้เพื่อตรวจสอบคุณกับเซิร์ฟเวอร์"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:22
 msgid "Find Possible Search Bases"
 msgstr "ค้นหาจุดเริ่มต้นค้นหาที่เป็นไปได้"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "Lo_gin:"
 msgstr "เ_ข้าระบบ:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 #: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:758
 msgid "Never"
 msgstr "ไม่ใช้"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "หนึ่ง"
 
-#: ../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 or TLS."
@@ -966,7 +943,7 @@ msgstr ""
 "การเลือกตัวเลือกนี้หมายความว่า Evolution จะเชื่อมต่อกับเซิร์ฟเวอร์ LDAP ของคุณเท่านั้น "
 "ถ้าเซิร์ฟเวอร์ LDAP ของคุณสนับสนุน SSL หรือ TLS"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a insecure environment. For example, if you and your LDAP server "
@@ -978,7 +955,7 @@ msgstr ""
 "ของคุณอยู่หลังไฟร์วอลล์ของที่ทำงาน Evolution ก็จะไม่ต้องใช้ SSL/TLS "
 "เพราะว่าการเชื่อมต่อของคุณอยู่ในสภาพแวดล้อมที่ปลอดภัยแล้ว"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 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 "
@@ -987,15 +964,15 @@ msgstr ""
 "การเลือกตัวเลือกนี้หมายความว่าเซิร์ฟเวอร์ของคุณจะไม่สนับสนุนทั้ง SSL หรือ TLS "
 "ซึ่งก็หมายความว่าการเชื่อมต่อของคุณจะไม่มีความปลอดภัย คุณจะเกิดจุดอ่อนที่คนอื่นเอาไปใช้ประโยชน์ได้"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Sub"
 msgstr "ย่อย"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid "Supported Search Bases"
 msgstr "สนับสนุนจุดเริ่มต้นค้นหา"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 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 "
@@ -1004,7 +981,7 @@ msgstr ""
 "จุดเริ่มต้นค้นหาจะเป็นชื่อแยกเฉพาะจากรายการที่คุณต้องการให้การค้นหาเริ่มต้นตรงนั้น "
 "ถ้าคุณปล่อยช่องนี้ว่าง การค้นหาของคุณจะเริ่มตั้งแต่รากของสายไดเรกทอรี่"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 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 "
@@ -1015,13 +992,13 @@ msgstr ""
 "ขอบเขตการค้นหา \"ย่อย\" จะรวมทุกรายการที่อยู่ใต้ฐานการค้นหาของคุณ ขอบเขตการค้นหา \"หนึ่ง"
 "\" จะรวมรายการที่อยู่ใต้จุดเริ่มต้นค้นหาของคุณหนึ่งระดับเท่านั้น"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 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:39
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1029,7 +1006,7 @@ msgstr ""
 "นี้คือจำนวนสูงสุดของรายการที่จะดาวน์โหลด "
 "การตั้งค่าจำนวนนี้สูงเกินไปจะทำให้สมุดที่อยู่ของคุณทำงานช้าลง"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1038,7 +1015,7 @@ msgstr ""
 "นี่คือวิธีที่ Evolution จะใช้ตรวจสอบตัวตนของคุณ สังเกตว่าการตั้งค่าเป็น \"ที่อยู่อีเมล\" "
 "ต้องการการเข้าถึงเซิร์ฟเวอร์ ldap ของคุณแบบไม่ระบุชื่อ"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1046,7 +1023,7 @@ msgstr ""
 "นี้คือชื่อสำหรับเซิร์ฟเวอร์นี้ ซึ่งจะปรากฏในโฟลเดอร์ Evolution ของคุณ "
 "จะใช้เพื่อวัตถุประสงค์การแสดงเท่านั้น"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 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 "
@@ -1055,36 +1032,36 @@ msgstr ""
 "นี้คือพอร์ตบนเซิร์ฟเวอร์ LDAP ที่ Evolution จะเชื่อมต่อไป ชื่อของพอร์ตมาตรฐานจะมีไว้ให้อยู่แล้ว "
 "จะต้องถามผู้ดูแลระบบของคุณว่าพอร์ตไหนที่คุณต้องระบุ"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid "Using email address"
 msgstr "การใช้ที่อยู่อีเมล"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 #: ../mail/em-account-editor.c:301
 msgid "Whenever Possible"
 msgstr "เมื่อเป็นไปได้"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid "_Add Address Book"
 msgstr "เ_พิ่มสมุดที่อยู่"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "_Download limit:"
 msgstr "_จำกัดการดาวน์โหลด:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid "_Find Possible Search Bases"
 msgstr "_ค้นหาฐานการค้นหาที่เป็นไปได้"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "_Login method:"
 msgstr "_วิธีการเข้าระบบ:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 #: ../calendar/gui/dialogs/calendar-setup.c:244
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:8
 #: ../mail/mail-config.glade.h:164
@@ -1092,35 +1069,33 @@ msgstr "_วิธีการเข้าระบบ:"
 msgid "_Name:"
 msgstr "_ชื่อ:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Port:"
 msgstr "_พอร์ต:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Search scope:"
 msgstr "_ขอบเขตการค้นหา:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 #: ../mail/mail-config.glade.h:171
 msgid "_Server:"
 msgstr "เ_ซิร์ฟเวอร์:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Timeout:"
 msgstr "เ_วลาที่จำกัด:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Use secure connection:"
 msgstr "ใ_ช้การเชื่อมต่อแบบปลอดภัย:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 msgid "cards"
 msgstr "นามบัตร"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
-#: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/alarm-notify/util.c:66
+#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
 #: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1951
@@ -1129,30 +1104,6 @@ msgstr "นามบัตร"
 msgid "minutes"
 msgstr "นาที"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../mail/message-tags.glade.h:1
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
-#: ../plugins/groupwise-features/properties.glade.h:1
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>อีเมล</b>"
@@ -1190,23 +1141,23 @@ msgid "<b>Work</b>"
 msgstr "<b>ที่ทำงาน</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
 #: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: ../addressbook/gui/widgets/e-minicard.c:182
 msgid "Contact"
 msgstr "ที่อยู่ติดต่อ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:526
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2373
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:525
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:540
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2353
 msgid "Contact Editor"
 msgstr "ตัวแก้ไขที่อยู่ติดต่อ"
 
@@ -1219,7 +1170,7 @@ msgid "Image"
 msgstr "รูป"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
@@ -1232,7 +1183,7 @@ msgid "Ni_ckname:"
 msgstr "ชื่อเ_ล่น:"
 
 #: ../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:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
@@ -1246,8 +1197,8 @@ msgstr "โทรศัพท์"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
 #: ../filter/filter-label.c:122 ../mail/em-migrate.c:1042
 #: ../mail/mail-config.c:77 ../mail/mail-config.glade.h:153
 msgid "Work"
@@ -1271,12 +1222,11 @@ msgid "_Birthday:"
 msgstr "วันเ_กิด:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../plugins/itip-formatter/itip-view.c:1661
+#: ../plugins/itip-formatter/itip-view.c:1662
 msgid "_Calendar:"
 msgstr "_ปฏิทิน:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: ../ui/evolution-event-editor.xml.h:26 ../ui/evolution-task-editor.xml.h:18
 msgid "_Categories"
 msgstr "_หมวด"
 
@@ -1364,17 +1314,17 @@ msgstr "แ_หล่ง:"
 msgid "_Zip/Postal Code:"
 msgstr "_รหัสไปรษณีย์:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:96
 #: ../addressbook/gui/widgets/eab-contact-display.c:367
 #: ../addressbook/gui/widgets/eab-contact-display.c:382
 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:142
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:103
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: ../addressbook/gui/widgets/e-addressbook-model.c:310
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
@@ -1388,975 +1338,975 @@ msgstr "ที่อยู่"
 msgid "Editable"
 msgstr "แก้ไขได้"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "United States"
 msgstr "สหรัฐอเมริกา "
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Afghanistan"
 msgstr "อัฟกานิสถาน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Albania"
 msgstr "แอลเบเนีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Algeria"
 msgstr "แอลจีเรีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "American Samoa"
 msgstr "อเมริกันซามัว"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Andorra"
 msgstr "อันดอร์รา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Angola"
 msgstr "แองโกลา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Anguilla"
 msgstr "แองกวิลลา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Antarctica"
 msgstr "แอนตาร์กติกา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Antigua And Barbuda"
 msgstr "แอนติกาและบาร์บูดา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Argentina"
 msgstr "อาร์เจนตินา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Armenia"
 msgstr "อาร์เมเนีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Aruba"
 msgstr "อารูบา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Australia"
 msgstr "ออสเตรเลีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Austria"
 msgstr "ออสเตรีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Azerbaijan"
 msgstr "อาร์เซอร์ไบจาน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Bahamas"
 msgstr "บาฮามาส"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bahrain"
 msgstr "บาห์เรน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bangladesh"
 msgstr "บังคลาเทศ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Barbados"
 msgstr "บาร์เบโดส"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Belarus"
 msgstr "เบลารุส"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Belgium"
 msgstr "เบลเยียม"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Belize"
 msgstr "เบลีซ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Benin"
 msgstr "เบนิน "
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bermuda"
 msgstr "เบอร์มิวดา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bhutan"
 msgstr "ภูฏาน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bolivia"
 msgstr "โบลิเวีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Bosnia And Herzegowina"
 msgstr "บอสเนียและเฮอร์เซโกวีนา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Botswana"
 msgstr "บอตสวานา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bouvet Island"
 msgstr "เกาะบูเวต์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Brazil"
 msgstr "บราซิล"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "British Indian Ocean Territory"
 msgstr "บริติชอินเดียนโอเชียนเทร์ริทอรี"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Brunei Darussalam"
 msgstr "บรูไนดารุสซาลาม"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Bulgaria"
 msgstr "บัลแกเรีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Burkina Faso"
 msgstr "เบอร์กินาฟาโซ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Burundi"
 msgstr "บุรุนดี"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cambodia"
 msgstr "กัมพูชา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Cameroon"
 msgstr "แคเมอรูน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Canada"
 msgstr "แคนาดา "
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Cape Verde"
 msgstr "เคปเวิร์ด"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cayman Islands"
 msgstr "หมู่เกาะเคย์แมน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Central African Republic"
 msgstr "สาธารณรัฐแอฟริกากลาง"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Chad"
 msgstr "ชาด"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Chile"
 msgstr "ชิลี"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "China"
 msgstr "จีน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Christmas Island"
 msgstr "เกาะคริสมาสต์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cocos (Keeling) Islands"
 msgstr "หมู่เกาะ (คีลิง) โคโคส"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Colombia"
 msgstr "โคลัมเบีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Comoros"
 msgstr "คอโมโรส"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Congo"
 msgstr "คองโก"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Congo, The Democratic Republic Of The"
 msgstr "สาธารณรัฐคองโก"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cook Islands"
 msgstr "หมู่เกาะคุก"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Costa Rica"
 msgstr "คอสตาริกา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Cote d'Ivoire"
 msgstr "โกตดิวัวร์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Croatia"
 msgstr "โครเอเชีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Cuba"
 msgstr "คิวบา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Cyprus"
 msgstr "ไซปรัส"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Czech Republic"
 msgstr "สาธารณรัฐเช็ก"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Denmark"
 msgstr "เดนมาร์ก"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Djibouti"
 msgstr "จิบูตี"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Dominica"
 msgstr "โดมินิกา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Dominican Republic"
 msgstr "สาธารณรัฐโดมินิกัน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Ecuador"
 msgstr "เอกวาดอร์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Egypt"
 msgstr "อียิปต์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "El Salvador"
 msgstr "เอลซัลวาดอร์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Equatorial Guinea"
 msgstr "อิเควทอเรียลกินี"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Eritrea"
 msgstr "เอริเทรีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Estonia"
 msgstr "เอสโตเนีย "
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Ethiopia"
 msgstr "เอธิโอเปีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Falkland Islands"
 msgstr "หมู่เกาะฟอร์คแลนด์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Faroe Islands"
 msgstr "หมู่เกาะฟาโร"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Fiji"
 msgstr "ฟิจิ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Finland"
 msgstr "ฟินแลนด์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "France"
 msgstr "ฝรั่งเศส"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "French Guiana"
 msgstr "เฟรนช์กียานา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Polynesia"
 msgstr "เฟรนช์โปลินีเซีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Southern Territories"
 msgstr "เฟรนช์เซาเทิร์นเทร์ริทอรีส์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gabon"
 msgstr "กาบอง"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gambia"
 msgstr "แกมเบีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Georgia"
 msgstr "จอร์เจีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Germany"
 msgstr "เยอรมนี"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Ghana"
 msgstr "กานา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Gibraltar"
 msgstr "ยิบรอลตาร์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Greece"
 msgstr "กรีซ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greenland"
 msgstr "กรีนแลนด์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Grenada"
 msgstr "เกรเนดา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guadeloupe"
 msgstr "เกาะกัวเดอลูป"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guam"
 msgstr "เกาะกวม"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guatemala"
 msgstr "กัวเตมาลา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guernsey"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea"
 msgstr "กินี"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guinea-bissau"
 msgstr "กินีบิสเซา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Guyana"
 msgstr "กายอานา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Haiti"
 msgstr "เฮติ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Heard And McDonald Islands"
 msgstr "เกาะเฮิร์ด และแมกดอนัลด์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Holy See"
 msgstr "นครรัฐวาติกัน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Honduras"
 msgstr "ฮอนดูรัส"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Hong Kong"
 msgstr "ฮ่องกง"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Hungary"
 msgstr "ฮังการี"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iceland"
 msgstr "ไอซ์แลนด์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "India"
 msgstr "อินเดีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Indonesia"
 msgstr "อินโดนีเซีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Iran"
 msgstr "อิหร่าน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Iraq"
 msgstr "อิรัก"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Ireland"
 msgstr "ไอร์แลนด์ "
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Isle of Man"
 msgstr "เกาะแมน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Israel"
 msgstr "อิสราเอล"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Italy"
 msgstr "อิตาลี "
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Jamaica"
 msgstr "จาเมกา "
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Japan"
 msgstr "ญี่ปุ่น"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Jersey"
 msgstr "เจอร์ซีย์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Jordan"
 msgstr "จอร์แดน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kazakhstan"
 msgstr "คาซัคสถาน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kenya"
 msgstr "เคนยา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kiribati"
 msgstr "คิริบาส"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 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:252
 msgid "Korea, Republic Of"
 msgstr "สาธารณรัฐเกาหลี"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Kuwait"
 msgstr "คูเวต"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Kyrgyzstan"
 msgstr "คีร์กีซสถาน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Laos"
 msgstr "ลาว"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Latvia"
 msgstr "ลัตเวีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lebanon"
 msgstr "เลบานอน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lesotho"
 msgstr "เลโซโท"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Liberia"
 msgstr "ไลบีเรีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Libya"
 msgstr "ลิเบีย "
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Liechtenstein"
 msgstr "ลิกเตนสไตน์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Lithuania"
 msgstr "ลิทัวเนีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Luxembourg"
 msgstr "ลักเซมเบิร์ก"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Macao"
 msgstr "มาเก๊า"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Macedonia"
 msgstr "มาซิโดเนีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Madagascar"
 msgstr "มาดากัสการ์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malawi"
 msgstr "มาลาวี"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Malaysia"
 msgstr "มาเลเซีย "
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Maldives"
 msgstr "มัลดีฟส์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mali"
 msgstr "มาลี"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Malta"
 msgstr "มอลตา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Marshall Islands"
 msgstr "หมู่เกาะมาร์แชล"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Martinique"
 msgstr "มาร์ตินีก"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Mauritania"
 msgstr "มอริเตเนีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Mauritius"
 msgstr "มอริเชียส"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mayotte"
 msgstr "มาย็อต"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mexico"
 msgstr "เม็กซิโก "
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Micronesia"
 msgstr "ไมโครนีเซีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Moldova, Republic Of"
 msgstr "สาธารณรัฐมอลโดวา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Monaco"
 msgstr "โมนาโก"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Mongolia"
 msgstr "มองโกเลีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Montserrat"
 msgstr "มอนต์เซร์แร็ต"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Morocco"
 msgstr "โมร็อกโก"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Mozambique"
 msgstr "โมซัมบิก"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Myanmar"
 msgstr "พม่า"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Namibia"
 msgstr "นามิเบีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Nauru"
 msgstr "นาอูรู"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nepal"
 msgstr "เนปาล"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Netherlands"
 msgstr "เนเธอร์แลนด์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Netherlands Antilles"
 msgstr "เนเธอร์แลนด์แอนทิลลิส"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "New Caledonia"
 msgstr "หมู่เกาะนิวแคลิโดเนีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "New Zealand"
 msgstr "นิวซีแลนด์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Nicaragua"
 msgstr "นิการากัว"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Niger"
 msgstr "ไนเจอร์ "
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Nigeria"
 msgstr "ไนจีเรีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Niue"
 msgstr "นีอูเอ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Norfolk Island"
 msgstr "เกาะนอร์ฟอล์ก"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Northern Mariana Islands"
 msgstr "หมู่เกาะนอร์ทเทิร์นมาเรียนา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Norway"
 msgstr "นอร์เวย์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Oman"
 msgstr "โอมาน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Pakistan"
 msgstr "ปากีสถาน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Palau"
 msgstr "ปาเลา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Palestinian Territory"
-msgstr "ดินแดนยึดครองปาเลสไตน์"
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Panama"
 msgstr "ปานามา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Papua New Guinea"
 msgstr "ปาปัวนิวกินี"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Paraguay"
 msgstr "ปารากวัย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Peru"
 msgstr "เปรู"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Philippines"
 msgstr "ฟิลิปปินส์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Pitcairn"
 msgstr "เกาะพิตแคร์น"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Poland"
 msgstr "โปแลนด์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Portugal"
 msgstr "โปรตุเกส"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Puerto Rico"
 msgstr "เปอร์โตริโก "
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Qatar"
 msgstr "กาตาร์ "
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Reunion"
 msgstr "เรอูนียง"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Romania"
 msgstr "โรมาเนีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Russian Federation"
 msgstr "สหพันธรัฐรัสเซีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Rwanda"
 msgstr "รวันดา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Saint Kitts And Nevis"
 msgstr "เซนต์คิตส์และเนวิส "
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saint Lucia"
 msgstr "เซนต์ลูเซีย "
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 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:321
 msgid "Samoa"
 msgstr "ซามัว "
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "San Marino"
 msgstr "ซานมาริโน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sao Tome And Principe"
 msgstr "เซาโตเม และ ปรินซิเป"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Saudi Arabia"
 msgstr "ซาอุดีอาระเบีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Senegal"
 msgstr "เซเนกัล"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Serbia And Montenegro"
 msgstr "เซอร์เบียและมอนเตเนโกร"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Seychelles"
 msgstr "เซเชลส์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Sierra Leone"
 msgstr "เซียร์ราลีโอ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Singapore"
 msgstr "สิงคโปร์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Slovakia"
 msgstr "สโลวะเกีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Slovenia"
 msgstr "สโลวีเนีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Solomon Islands"
 msgstr "หมู่เกาะโซโลมอน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Somalia"
 msgstr "โซมาเลีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "South Africa"
 msgstr "แอฟริกาใต้"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "เกาะเซาท์จอร์เจียและหมู่เกาะเซาท์แซนด์วิช"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Spain"
 msgstr "สเปน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Sri Lanka"
 msgstr "ศรีลังกา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "St. Helena"
 msgstr "เซนต์เฮเลนา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "St. Pierre And Miquelon"
 msgstr "แซงปีแยร์และมีเกอลง"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sudan"
 msgstr "ซูดาน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Suriname"
 msgstr "ซูรินาเม"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Svalbard And Jan Mayen Islands"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Swaziland"
 msgstr "สวาซิแลนด์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Sweden"
 msgstr "สวีเดน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Switzerland"
 msgstr "สวิตเซอร์แลนด์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Syria"
 msgstr "ซีเรีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Taiwan"
 msgstr "ไต้หวัน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tajikistan"
 msgstr "ทาจิกิสถาน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tanzania, United Republic Of"
 msgstr "สหสาธารณรัฐแทนซาเนีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Thailand"
 msgstr "ไทย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Timor-Leste"
 msgstr "ติมอร์เลสเต"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Togo"
 msgstr "โตโก"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Tokelau"
 msgstr "โตเกเลา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Tonga"
 msgstr "ตองกา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Trinidad And Tobago"
 msgstr "ตรินิแดดและโตเบโก"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tunisia"
 msgstr "ตูนิเซีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Turkey"
 msgstr "ตุรกี"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Turkmenistan"
 msgstr "เติร์กเมนิสถาน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Turks And Caicos Islands"
 msgstr "หมู่เกาะเติกส์และหมู่เกาะเคคอส"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Tuvalu"
 msgstr "ตูวาลู"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uganda"
 msgstr "ยูกันดา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Ukraine"
 msgstr "ยูเครน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "United Arab Emirates"
 msgstr "สหรัฐอาหรับเอมิเรตส์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "United Kingdom"
 msgstr "สหราชอาณาจักร"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "United States Minor Outlying Islands"
-msgstr "เกาะเล็กรอบนอกของสหรัฐอเมริกา"
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Uruguay"
 msgstr "อุรุกวัย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Uzbekistan"
 msgstr "อุซเบกิสถาน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Vanuatu"
 msgstr "วานูอาตู"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Venezuela"
 msgstr "เวเนซุเอลา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Viet Nam"
 msgstr "เวียดนาม"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Virgin Islands, British"
 msgstr "หมู่เกาะบริติชเวอร์จิน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Virgin Islands, U.S."
 msgstr "หมู่เกาะเวอร์จินของสหรัฐอเมริกา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Wallis And Futuna Islands"
 msgstr "หมู่เกาะวาลลิสและหมู่เกาะฟุตูนา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
 msgid "Western Sahara"
 msgstr "ซาฮาราตะวันตก"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
 msgid "Yemen"
 msgstr "เยเมน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
 msgid "Zambia"
 msgstr "แซมเบีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
 msgid "Zimbabwe"
 msgstr "ซิมบับเว"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
 #: ../plugins/exchange-operations/exchange-delegates.c:936
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:717
 #: ../plugins/plugin-manager/plugin-manager.c:44
@@ -2365,105 +2315,105 @@ msgstr "ซิมบับเว"
 msgid "Name"
 msgstr "ชื่อ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
 #: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr "Yahoo Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:119
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:118
 msgid "Service"
 msgstr "บริการ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:594
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:587
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "สถานที่"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:134
 msgid "Username"
 msgstr "ชื่อผู้ใช้"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:232
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "บ้าน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:240
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "อื่นๆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
 #: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "เป็นที่อยู่ติดต่อใหม่"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "เขตข้อมูลที่เขียนได้"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
 msgid "Required Fields"
 msgstr "เขตข้อมูลที่ต้องการ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:307
 msgid "Changed"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:536
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2368
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:535
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2348
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "ตัวแก้ไขที่อยู่ติดต่อ - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2681
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2661
 msgid "Please select an image for this contact"
 msgstr "กรุณาเลือกรูปสำหรับที่อยู่ติดต่อนี้"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2682
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2662
 msgid "No image"
 msgstr "ไม่มีรูป"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2961
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2941
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2471,7 +2421,7 @@ msgstr ""
 "ข้อมูลที่อยู่ติดต่อนี้ใช้ไม่ได้:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3013
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2993
 msgid "Invalid contact."
 msgstr "ที่อยู่ติดต่อที่ใช้ไม่ได้"
 
@@ -2624,8 +2574,8 @@ msgstr "_บริการ IM:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:234
-#: ../plugins/exchange-operations/exchange-contacts.c:214
+#: ../plugins/exchange-operations/exchange-calendar.c:215
+#: ../plugins/exchange-operations/exchange-contacts.c:193
 msgid "_Location:"
 msgstr "สถาน_ที่:"
 
@@ -2638,7 +2588,7 @@ msgid "Add an email to the List"
 msgstr "เพิ่มอีเมลไปที่รายชื่อ"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:834
 msgid "Contact List Editor"
 msgstr "ตัวแก้ไขรายชื่อที่อยู่ติดต่อ"
 
@@ -2670,24 +2620,24 @@ msgstr "เ_ลือก"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_พิมพ์ที่อยู่อีเมล หรือลากที่อยู่ติดต่อมาวางที่รายการด้านล่างนี้:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
 #: ../addressbook/gui/widgets/e-minicard-view.c:506
 msgid "Book"
 msgstr "หนังสือ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "เป็นรายชื่อใหม่"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:707
 msgid "_Members"
 msgstr "_สมาชิก"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:710
 msgid "Contact List Members"
 msgstr "สมาชิกรายชื่อผู้ติดต่อ"
 
@@ -2747,7 +2697,7 @@ msgstr[1] "ที่อยู่ติดต่อ %d รายการ"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:303
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
 #: ../addressbook/gui/widgets/e-minicard-view.c:513
 msgid "Query"
@@ -2771,137 +2721,127 @@ msgstr ""
 msgid "Error modifying card"
 msgstr "เกิดข้อผิดพลาดขณะเปลี่ยนแปลงนามบัตร"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:170
+#: ../addressbook/gui/widgets/e-addressbook-view.c:169
 msgid "Name begins with"
 msgstr "ชื่อขึ้นต้นด้วย"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Email begins with"
 msgstr "อีเมลขึ้นต้นด้วย"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
 #: ../calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "อยู่ในหมวด"
 
 #. We attach subitems below
-#: ../addressbook/gui/widgets/e-addressbook-view.c:173
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
 #: ../calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "ข้อมูลใดๆ มีคำว่า"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:174
-#: ../addressbook/gui/widgets/e-addressbook-view.c:179
+#: ../addressbook/gui/widgets/e-addressbook-view.c:173
+#: ../addressbook/gui/widgets/e-addressbook-view.c:178
 msgid "Advanced..."
 msgstr "ขั้นสูง..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:231
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:245
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:377
+#: ../calendar/gui/e-meeting-list-view.c:370
 #: ../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:550
+#: ../addressbook/gui/widgets/e-addressbook-view.c:544
 msgid "Address Book"
 msgstr "สมุดที่อยู่"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:821
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2037
-#: ../ui/evolution-addressbook.xml.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.c:807
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2011
+#: ../ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "บันทึกเป็น VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
-#: ../calendar/gui/dialogs/comp-editor.c:1055
-#: ../calendar/gui/e-calendar-table.c:1174
-#: ../calendar/gui/e-calendar-view.c:1555 ../calendar/gui/e-memo-table.c:852
-#: ../ui/evolution-addressbook.xml.h:38
+#: ../addressbook/gui/widgets/e-addressbook-view.c:930
+#: ../calendar/gui/e-calendar-table.c:1154
+#: ../calendar/gui/e-calendar-view.c:1528 ../ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "เ_ปิด"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
-msgid "_New Contact..."
-msgstr "ที่อยู่ติดต่อใ_หม่..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
-msgid "New Contact _List..."
-msgstr "_รายการที่อยู่ติดต่อใหม่..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:932
+msgid "New Contact..."
+msgstr "ที่อยู่ติดต่อใหม่..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
-#: ../ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard..."
-msgstr "_บันทึกเป็น VCard..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:933
+msgid "New Contact List..."
+msgstr "รายการที่อยู่ติดต่อใหม่..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
-msgid "_Forward Contact"
-msgstr "_ส่งต่อที่อยู่ติดต่อ"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "ส่งต่อที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
-msgid "_Forward Contacts"
-msgstr "_ส่งต่อที่อยู่ติดต่อ"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+msgid "Forward Contacts"
+msgstr "ส่งต่อที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
-msgid "Send _Message to Contact"
-msgstr "ส่ง_ข้อความไปยังที่อยู่ติดต่อ"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
+msgid "Send Message to Contact"
+msgstr "ส่งข้อความไปยังที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-msgid "Send _Message to List"
-msgstr "ส่ง_ข้อความไปยังลิสต์"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+msgid "Send Message to List"
+msgstr "ส่งข้อความไปยังลิสต์"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-msgid "Send _Message to Contacts"
-msgstr "ส่ง_ข้อความไปยังที่อยู่ติดต่อ"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+msgid "Send Message to Contacts"
+msgstr "ส่งข้อความไปยังที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-msgid "_Print"
-msgstr "_พิมพ์"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2501
+#: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "พิมพ์"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
-msgid "Cop_y to Address Book..."
-msgstr "_คัดลอกไปยังสมุดที่อยู่..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+msgid "Copy to Address Book..."
+msgstr "คัดลอกไปยังสมุดที่อยู่..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:960
-msgid "Mo_ve to Address Book..."
-msgstr "_ย้ายไปยังสมุดที่อยู่..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+msgid "Move to Address Book..."
+msgstr "ย้ายไปยังสมุดที่อยู่..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:8
-msgid "Cu_t"
-msgstr "_ตัด"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "ตัด"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 #: ../calendar/gui/calendar-component.c:536
-#: ../calendar/gui/dialogs/comp-editor.c:432
-#: ../calendar/gui/e-calendar-table.c:1182
-#: ../calendar/gui/e-calendar-view.c:1562 ../calendar/gui/e-memo-table.c:860
-#: ../calendar/gui/tasks-component.c:440 ../composer/e-msg-composer.c:3049
-#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1035
-#: ../mail/message-list.c:1718 ../ui/evolution-addressbook.xml.h:32
-#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:105
-#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
-msgid "_Copy"
-msgstr "_คัดลอก"
+#: ../calendar/gui/tasks-component.c:440 ../ui/evolution-addressbook.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:12 ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "คัดลอก"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
-msgid "P_aste"
-msgstr "_แปะ"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "แปะ"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1584
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1562
 #: ../calendar/gui/cal-search-bar.c:346
 msgid "Any Category"
 msgstr "หมวดใดก็ได้"
 
-#. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1786
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1761
 msgid "Print cards"
 msgstr "พิมพ์นามบัตร"
 
@@ -2934,10 +2874,9 @@ msgid "Car Phone"
 msgstr "โทรศัพท์รถ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/task-page.glade.h:6
 #: ../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 "หมวด"
 
@@ -2946,7 +2885,7 @@ msgid "Company Phone"
 msgstr "เบอร์โทรบริษัท"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:567
+#: ../addressbook/gui/widgets/eab-contact-display.c:564
 #: ../smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "อีเมล"
@@ -3042,7 +2981,7 @@ msgstr "วิทยุ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:388
+#: ../calendar/gui/e-meeting-list-view.c:378
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
 msgid "Role"
@@ -3132,7 +3071,7 @@ msgstr "ความยาวสูงสุดของชื่อเขตข
 
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
 msgid "Column Width"
-msgstr "ความกว้างคอลัมน์"
+msgstr "ความกว้างสดมภ์"
 
 #: ../addressbook/gui/widgets/e-minicard-view.c:172
 msgid ""
@@ -3239,7 +3178,7 @@ msgid "WWW"
 msgstr "WWW"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:378
-#: ../addressbook/gui/widgets/eab-contact-display.c:602
+#: ../addressbook/gui/widgets/eab-contact-display.c:599
 msgid "Blog"
 msgstr ""
 
@@ -3247,11 +3186,11 @@ msgstr ""
 msgid "personal"
 msgstr "ส่วนบุคคล"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:563
+#: ../addressbook/gui/widgets/eab-contact-display.c:560
 msgid "Job Title"
 msgstr "ตำแหน่งงาน"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:594
+#: ../addressbook/gui/widgets/eab-contact-display.c:591
 msgid "Home page"
 msgstr "โฮมเพจ"
 
@@ -3310,7 +3249,7 @@ msgstr "โพรโทคอลไม่สนับสนุน"
 #: ../calendar/gui/e-cal-component-preview.c:232
 #: ../calendar/gui/e-cal-model-tasks.c:348
 #: ../calendar/gui/e-cal-model-tasks.c:661
-#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2375
+#: ../calendar/gui/e-calendar-table.c:456 ../calendar/gui/print.c:2364
 msgid "Cancelled"
 msgstr "ยกเลิก"
 
@@ -3323,12 +3262,12 @@ msgstr "ไม่สามารถยกเลิก"
 #: ../addressbook/gui/widgets/eab-gui-util.c:63
 #: ../calendar/gui/comp-editor-factory.c:438
 msgid "Authentication Failed"
-msgstr "การยืนยันตัวบุคคลล้มเหลว"
+msgstr "การยืนยันตัวตนล้มเหลว"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
 #: ../addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Authentication Required"
-msgstr "ต้องการการยืนยันตัวบุคคล"
+msgstr "ต้องการการยืนยันตัวตน"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
@@ -3353,8 +3292,9 @@ msgstr "ข้อผิดพลาดอื่นๆ"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
 #: ../addressbook/gui/widgets/eab-gui-util.c:70
+#, fuzzy
 msgid "Invalid server version"
-msgstr "รุ่นเซิร์ฟเวอร์ใช้ไม่ได้"
+msgstr "รุ่นเซิร์ฟเวอร์"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:93
 msgid ""
@@ -3374,7 +3314,7 @@ msgid ""
 msgstr ""
 "เราไม่สามารถเปิดสมุดที่อยู่นี้ได้ กรุณาตรวจสอบว่ามีพาธ %s อยู่ หรือดูว่าคุณมีสิทธิ์ในการเข้าถึงหรือไม่"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:111
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3382,7 +3322,7 @@ msgstr ""
 "เราไม่สามารถเปิดสมุดที่อยู่นี้ได้ ซึ่งเป็นไปได้ว่าคุณอาจจะเข้าไปยัง URI ที่ไม่ถูกต้อง "
 "หรืออาจจะไม่สามารถเข้าไปยังเซิร์ฟเวอร์ LDAP ได้"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:116
+#: ../addressbook/gui/widgets/eab-gui-util.c:115
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3391,7 +3331,7 @@ msgstr ""
 "Evolution ไม่ได้มีการคอมไพล์เพื่อสนับสนุน LDAP ถ้าคุณต้องการใช้ LDAP ใน Evolution "
 "คุณจะต้องติดตั้งแพ็กเกจของ Evolution ที่เปิดใช้งาน LDAP"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:123
+#: ../addressbook/gui/widgets/eab-gui-util.c:122
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -3399,7 +3339,7 @@ msgstr ""
 "เราไม่สามารถเปิดสมุดที่อยู่นี้ได้ ซึ่งเป็นไปได้ว่าคุณอาจจะเข้าไปยัง URI ที่ไม่ถูกต้อง "
 "หรืออาจจะไม่สามารถเข้าไปยังเซิร์ฟเวอร์ได้"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:146
+#: ../addressbook/gui/widgets/eab-gui-util.c:145
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3407,7 +3347,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:151
 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"
@@ -3418,45 +3358,45 @@ msgstr ""
 "สำหรับสมุดที่อยู่นี้ กรุณาค้นหาดวยคำถามที่เฉพาะเจาะจงมากกว่านี้\n"
 "หรือเพิ่มค่าจำกัดเวลา ในหน้าต่างปรับแต่งเซิร์ฟเวอร์สารบบสำหรับสมุดที่อยู่นี้"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:157
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:161
+#: ../addressbook/gui/widgets/eab-gui-util.c:160
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
+#: ../addressbook/gui/widgets/eab-gui-util.c:163
 msgid "This query did not complete successfully."
 msgstr "คำถามนี้ไม่สำเร็จสมบูรณ์"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
+#: ../addressbook/gui/widgets/eab-gui-util.c:185
 msgid "Error adding list"
 msgstr "เกิดข้อผิดพลาดขณะเพิ่มรายการ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
-#: ../addressbook/gui/widgets/eab-gui-util.c:694
+#: ../addressbook/gui/widgets/eab-gui-util.c:185
+#: ../addressbook/gui/widgets/eab-gui-util.c:693
 msgid "Error adding contact"
 msgstr "เกิดข้อผิดพลาดขณะเพิ่มที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:197
+#: ../addressbook/gui/widgets/eab-gui-util.c:196
 msgid "Error modifying list"
 msgstr "เกิดข้อผิดพลาดขณะเปลี่ยนแปลงรายการ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:197
+#: ../addressbook/gui/widgets/eab-gui-util.c:196
 msgid "Error modifying contact"
 msgstr "เกิดข้อผิดพลาดขณะเปลี่ยนแปลงที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:209
+#: ../addressbook/gui/widgets/eab-gui-util.c:208
 msgid "Error removing list"
 msgstr "เกิดข้อผิดพลาดขณะลบรายการ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:649
+#: ../addressbook/gui/widgets/eab-gui-util.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:648
 msgid "Error removing contact"
 msgstr "เกิดข้อผิดพลาดขณะลบที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:291
+#: ../addressbook/gui/widgets/eab-gui-util.c:290
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3471,7 +3411,7 @@ msgstr[1] ""
 "ในการเปิดที่อยู่ติดต่อ %d รายการ จะเปิดในหน้าต่างใหม่ %d หน้าต่าง\n"
 "คุณต้องการให้แสดงที่อยู่ติดต่อทั้งหมดนี้จริงหรือไม่?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:320
+#: ../addressbook/gui/widgets/eab-gui-util.c:319
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3480,68 +3420,58 @@ msgstr ""
 "%s มีอยู่แล้ว\n"
 "คุณต้องการเขียนทับหรือไม่?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:324
+#: ../addressbook/gui/widgets/eab-gui-util.c:323
 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:369
-#: ../addressbook/gui/widgets/eab-gui-util.c:372
+#: ../addressbook/gui/widgets/eab-gui-util.c:368
+#: ../addressbook/gui/widgets/eab-gui-util.c:371
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "ที่อยู่ติดต่อ"
 msgstr[1] "ที่อยู่ติดต่อ"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:419
+#: ../addressbook/gui/widgets/eab-gui-util.c:418
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:595
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
 msgid "list"
 msgstr "รายชื่อ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:755
+#: ../addressbook/gui/widgets/eab-gui-util.c:754
 msgid "Move contact to"
 msgstr "ย้ายที่อยู่ติดต่อไปยัง"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:757
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Copy contact to"
 msgstr "คัดลอกที่อยู่ติดต่อไปยัง"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:760
+#: ../addressbook/gui/widgets/eab-gui-util.c:759
 msgid "Move contacts to"
 msgstr "ย้ายที่อยู่ติดต่อไปยัง"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:762
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
 msgid "Copy contacts to"
 msgstr "คัดลอกที่อยู่ติดต่อไปยัง"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:765
+#: ../addressbook/gui/widgets/eab-gui-util.c:764
 msgid "Select target addressbook."
 msgstr "เลือกสมุดที่อยู่เป้าหมาย"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:988
+#: ../addressbook/gui/widgets/eab-gui-util.c:987
 msgid "Multiple VCards"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:991
+#: ../addressbook/gui/widgets/eab-gui-util.c:990
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard สำหรับ %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1032
-#: ../addressbook/gui/widgets/eab-gui-util.c:1050
-msgid "Contact information"
-msgstr "ข้อมูลที่อยู่ติดต่อ"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:1052
-#, c-format
-msgid "Contact information for %s"
-msgstr "ข้อมูลที่อยู่ติดต่อของ %s"
-
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -3605,18 +3535,18 @@ msgstr "มุมมองนามบัตร"
 msgid "GTK Tree View"
 msgstr "มุมมองต้นไม้ GTK"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:583
+#: ../addressbook/importers/evolution-ldif-importer.c:486
 #: ../addressbook/importers/evolution-vcard-importer.c:249
 #: ../calendar/importers/icalendar-importer.c:311
 #: ../calendar/importers/icalendar-importer.c:643 ../shell/shell.error.xml.h:6
 msgid "Importing ..."
 msgstr "กำลังนำเข้า..."
 
-#: ../addressbook/importers/evolution-ldif-importer.c:754
+#: ../addressbook/importers/evolution-ldif-importer.c:652
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:755
+#: ../addressbook/importers/evolution-ldif-importer.c:653
 msgid "Evolution LDIF importer"
 msgstr "ตัวนำเข้า LDIF ของ Evolution"
 
@@ -3633,12 +3563,12 @@ msgstr "ตัวนำเข้า VCard ของ Evolution"
 msgid "Print envelope"
 msgstr "พิมพ์ซองจดหมาย"
 
-#: ../addressbook/printing/e-contact-print.c:1027
+#: ../addressbook/printing/e-contact-print.c:1001
 msgid "Print contacts"
 msgstr "พิมพ์ที่อยู่ติดต่อ"
 
-#: ../addressbook/printing/e-contact-print.c:1118
-#: ../addressbook/printing/e-contact-print.c:1146
+#: ../addressbook/printing/e-contact-print.c:1066
+#: ../addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "พิมพ์ที่อยู่ติดต่อ"
 
@@ -3791,9 +3721,9 @@ msgstr "การแรเงา"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:939
-#: ../plugins/exchange-operations/exchange-calendar.c:224
-#: ../plugins/exchange-operations/exchange-contacts.c:197
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
+#: ../plugins/exchange-operations/exchange-calendar.c:205
+#: ../plugins/exchange-operations/exchange-contacts.c:176
 msgid "Size:"
 msgstr "ขนาด:"
 
@@ -4041,13 +3971,13 @@ msgid "Delete calendar '{0}'?"
 msgstr "ลบปฏิทิน '{0}' หรือไม่?"
 
 #: ../calendar/calendar.error.xml.h:26
-msgid "Delete memo list '{0}'?"
-msgstr "ลบรายการบันทึกข้อความ '{0}' หรือไม่?"
-
-#: ../calendar/calendar.error.xml.h:27
 msgid "Delete task list '{0}'?"
 msgstr "ลบรายการงาน '{0}' หรือไม่?"
 
+#: ../calendar/calendar.error.xml.h:27
+msgid "Discard Changes"
+msgstr "ละเลยการเปลี่ยนแปลง"
+
 #: ../calendar/calendar.error.xml.h:28
 msgid "Don't Send"
 msgstr "ไม่ส่ง"
@@ -4080,31 +4010,31 @@ msgid "Error loading calendar"
 msgstr "เกิดข้อผิดพลาดขณะเรียกดูปฏิทิน"
 
 #: ../calendar/calendar.error.xml.h:35
-msgid "Error loading memo list"
-msgstr "เกิดข้อผิดพลาดขณะเรียกดูรายการบันทึกข้อความ"
-
-#: ../calendar/calendar.error.xml.h:36
 msgid "Error loading task list"
 msgstr "เกิดข้อผิดพลาดขณะเรียกดูรายการงาน"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:36
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the journal has been deleted."
 msgstr "ถ้าคุณไม่ส่งประกาศยกเลิก ผู้มีส่วนร่วมคนอื่นๆ อาจจะไม่รู้ว่าบันทึกได้ถูกลบไป"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:37
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the meeting is canceled."
 msgstr "ถ้าคุณไม่ส่งประกาศแจ้งการยกเลิก ผู้มีส่วนร่วมคนอื่นๆ จะไม่ทราบว่ามีการยกเลิกการประชุม"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the task has been deleted."
 msgstr "ถ้าคุณไม่ส่งประกาศแจ้งการยกเลิก ผู้มีส่วนร่วมคนอื่นๆ จะไม่ทราบว่าได้มีการลบงานแล้ว"
 
+#: ../calendar/calendar.error.xml.h:39
+msgid "Save Changes"
+msgstr "บันทึกการเปลี่ยนแปลง"
+
 #: ../calendar/calendar.error.xml.h:40
 #: ../ui/evolution-message-composer.xml.h:28
 msgid "Send"
@@ -4139,97 +4069,80 @@ msgid "The calendar is not marked for offline usage"
 msgstr "ไม่ได้ทำเครื่องหมายที่ปฏิทินเพื่อการใช้งานแบบออฟไลน์"
 
 #: ../calendar/calendar.error.xml.h:48
-msgid "The memo list is not marked for offline usage"
-msgstr "ไม่ได้ทำเครื่องหมายที่รายการบันทึกข้อความเพื่อการใช้งานแบบออฟไลน์"
-
-#: ../calendar/calendar.error.xml.h:49
 msgid "The task list is not marked for offline usage"
 msgstr "ไม่ได้ทำเครื่องหมายที่รายการงานเพื่อการใช้งานแบบออฟไลน์"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:49
 msgid "This calendar will be removed permanently."
-msgstr "ปฏิทินจะถูกลบออกอย่างถาวร"
+msgstr "ปฏิทินจะถูกลบออกถาวร"
 
-#: ../calendar/calendar.error.xml.h:51
-msgid "This memo list will be removed permanently."
-msgstr "บันทึกข้อความนี้จะถูกลบออกอย่างถาวร"
-
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:50
 msgid "This task list will be removed permanently."
-msgstr "งานจะถูกลบออกอย่างถาวร"
+msgstr "งานจะถูกลบออกถาวร"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:51
 msgid "Would you like to save your changes to this appointment?"
 msgstr "คุณต้องการบันทึกการเปลี่ยนแปลงการนัดหมายนี้หรือไม่?"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:52
 msgid "Would you like to save your changes to this task?"
 msgstr "คุณต้องการบันทึกการเปลี่ยนแปลงของคุณในงานนี้หรือไม่?"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:53
 msgid "Would you like to send a cancellation notice for this journal entry?"
 msgstr "คุณต้องการส่งประกาศการยกเลิกสำหรับรายการบันทึกนี้หรือไม่?"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:54
 msgid "Would you like to send all the participants a cancellation notice?"
 msgstr "คุณต้องการส่งประกาศแจ้งการยกเลิกไปยังผู้มีส่วนร่วมทุกคนหรือไม่?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:55
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "คุณต้องการส่งการเชิญประชุมไปยังผู้มีส่วนร่วมหรือไม่?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:56
 msgid "Would you like to send this task to participants?"
 msgstr "คุณต้องการส่งงานนี้ไปยังผู้มีส่วนร่วมหรือไม่?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "คุณต้องการส่งข้อมูลการประชุมที่ปรับปรุงไปยังผู้มีส่วนร่วมหรือไม่?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send updated task information to participants?"
 msgstr "คุณต้องการส่งข้อมูลที่ปรับปรุงของงานไปยังผู้มีส่วนร่วมหรือไม่?"
 
-#: ../calendar/calendar.error.xml.h:62
-msgid "You have changed this appointment, but not yet saved them."
+#: ../calendar/calendar.error.xml.h:60
+msgid "You have made changes to this appointment, but not yet saved them."
 msgstr "คุณได้เปลี่ยนแปลงการนัดหมายนี้ แต่ยังไม่ได้บันทึก"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:61
 msgid "You have made changes to this task, but not yet saved them."
 msgstr "คุณได้เปลี่ยนแปลงงานนี้ แต่ยังไม่ได้บันทึก"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:62
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "ปฏิทินของคุณจะใช้งานไม่ได้ จนกว่าจะเริ่มการทำงานของ Evolution ใหม่"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:63
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "ข้อมูลงานของคุณจะใช้งานไม่ได้ จนกว่าจะเริ่มการทำงานของ Evolution ใหม่"
 
-#: ../calendar/calendar.error.xml.h:66
-#: ../composer/mail-composer.error.xml.h:29
-msgid "_Discard Changes"
-msgstr "ไ_ม่สนใจการเปลี่ยนแปลง"
-
-#: ../calendar/calendar.error.xml.h:67 ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:64
 #: ../ui/evolution-message-composer.xml.h:51
 msgid "_Save"
 msgstr "_บันทึก"
 
-#: ../calendar/calendar.error.xml.h:68
-msgid "_Save Changes"
-msgstr "_บันทึกการเปลี่ยนแปลง"
-
-#: ../calendar/calendar.error.xml.h:69
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:129
+#: ../calendar/calendar.error.xml.h:65
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:123
 msgid "_Send"
 msgstr "_ส่ง"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:66
 msgid "{0}."
 msgstr "{0}"
 
-#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:323
+#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:301
 #: ../smime/gui/component.c:48
 msgid "Enter password"
 msgstr "ป้อนรหัสผ่าน"
@@ -4238,46 +4151,29 @@ msgstr "ป้อนรหัสผ่าน"
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1377
-#: ../calendar/conduits/calendar/calendar-conduit.c:1378
-#: ../calendar/conduits/memo/memo-conduit.c:854
-#: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:988
-#: ../calendar/conduits/todo/todo-conduit.c:989
+#: ../calendar/conduits/calendar/calendar-conduit.c:1365
+#: ../calendar/conduits/calendar/calendar-conduit.c:1366
+#: ../calendar/conduits/todo/todo-conduit.c:879
+#: ../calendar/conduits/todo/todo-conduit.c:880
+#, fuzzy
 msgid "Could not start evolution-data-server"
 msgstr "ไม่สามารถเริ่มเซิร์ฟเวอร์ข้อมูล evolution"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1486
-#: ../calendar/conduits/calendar/calendar-conduit.c:1489
+#: ../calendar/conduits/calendar/calendar-conduit.c:1474
+#: ../calendar/conduits/calendar/calendar-conduit.c:1477
 msgid "Could not read pilot's Calendar application block"
-msgstr "ไม่สามารถอ่านบล็อคโปรแกรมปฏิทินของ pilot ได้"
-
-#: ../calendar/conduits/memo/memo-conduit.c:937
-#: ../calendar/conduits/memo/memo-conduit.c:940
-msgid "Could not read pilot's Memo application block"
-msgstr "ไม่สามารถอ่านบล็อคโปรแกรมบันทึกข้อความของ pilot ได้"
-
-#: ../calendar/conduits/memo/memo-conduit.c:976
-#: ../calendar/conduits/memo/memo-conduit.c:979
-msgid "Could not write pilot's Memo application block"
-msgstr "ไม่สามารถเขียนบล็อคโปรแกรมบันทึกข้อความของ pilot ได้"
+msgstr ""
 
-#: ../calendar/conduits/todo/todo-conduit.c:237
+#: ../calendar/conduits/todo/todo-conduit.c:234
 msgid "Default Priority:"
 msgstr "ระดับความสำคัญโดยปริยาย:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1071
-#: ../calendar/conduits/todo/todo-conduit.c:1074
+#: ../calendar/conduits/todo/todo-conduit.c:959
+#: ../calendar/conduits/todo/todo-conduit.c:962
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: ../calendar/conduits/todo/todo-conduit.c:1110
-#: ../calendar/conduits/todo/todo-conduit.c:1113
-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:1968
 msgid "Calendar and Tasks"
 msgstr "ปฏิทินและงาน"
 
@@ -4311,40 +4207,26 @@ msgid "Evolution's Calendar component"
 msgstr "องค์ประกอบปฏิทินของ Evolution"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution's Memos component"
-msgstr "องค์ประกอบบันทึกข้อความของ Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Tasks component"
 msgstr "องค์ประกอบงานของ Evolution"
 
-#: ../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-memos.c:1092 ../calendar/gui/memos-component.c:528
-#: ../calendar/gui/memos-component.c:998 ../calendar/gui/memos-control.c:340
-msgid "Memos"
-msgstr "บันทึกข้อความ"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-tasks.c:1334 ../calendar/gui/print.c:1831
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#: ../calendar/gui/e-tasks.c:1257 ../calendar/gui/print.c:1822
 #: ../calendar/gui/tasks-component.c:519
-#: ../calendar/gui/tasks-component.c:1013 ../calendar/gui/tasks-control.c:472
+#: ../calendar/gui/tasks-component.c:1006 ../calendar/gui/tasks-control.c:457
 #: ../calendar/importers/icalendar-importer.c:79
 #: ../calendar/importers/icalendar-importer.c:707
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:589
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "งาน"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 msgid "_Calendars"
 msgstr "_ปฏิทิน"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
 #: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_งาน"
@@ -4353,19 +4235,17 @@ msgstr "_งาน"
 msgid "Evolution Calendar alarm notification service"
 msgstr "บริการการประกาศแจ้งเตือนปฏิทิน Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
-#: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/alarm-notify/util.c:66
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "นาที"
 msgstr[1] "นาที"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:248
 msgid "Start time"
 msgstr "เวลาเริ่ม"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:356
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:347
 #, c-format
 msgid ""
 "<big><b>%s</b></big>\n"
@@ -4381,10 +4261,8 @@ msgstr "การนัดหมาย"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1419
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1425
-#: ../calendar/gui/e-itip-control.c:1117
-#: ../plugins/itip-formatter/itip-view.c:883
+#: ../calendar/gui/e-itip-control.c:1120
+#: ../plugins/itip-formatter/itip-view.c:884
 msgid "Location:"
 msgstr "สถานที่:"
 
@@ -4397,13 +4275,13 @@ msgstr "ช่วงเ_วลาผัดผ่อน:"
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:6
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:13
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-editor.xml.h:17
-#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-addressbook.xml.h:34 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-composer-entries.xml.h:8
+#: ../ui/evolution-mail-messagedisplay.xml.h:5
 #: ../ui/evolution-message-composer.xml.h:44
 #: ../ui/evolution-signature-editor.xml.h:23
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution.xml.h:35
 msgid "_Edit"
 msgstr "แ_ก้ไข"
 
@@ -4412,51 +4290,53 @@ msgid "_Snooze"
 msgstr "_ผัดผ่อน"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+msgid "description of appointment"
+msgstr "คำอธิบายการนัดหมาย"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 msgid "location of appointment"
 msgstr "สถานที่นัดหมาย"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1097
-msgid "<b>Calendars</b>"
-msgstr "<b>ปฏิทิน</b>"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1163
-msgid "Preferences"
-msgstr "ปรับแต่ง"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1176
-msgid "_Configure Alarms"
-msgstr ""
+#: ../calendar/gui/alarm-notify/alarm-queue.c:954
+msgid "Dismiss"
+msgstr "ไม่สนใจ"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1178 ../ui/evolution.xml.h:44
-msgid "_Quit"
-msgstr "_ออก"
+#: ../calendar/gui/alarm-notify/alarm-queue.c:955
+msgid "Dismiss All"
+msgstr "ไม่สนใจทั้งหมด"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1284
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1401
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1037
 msgid "No summary available."
 msgstr "ไม่มีสรุป"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1293
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1295
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1046
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1048
 msgid "No description available."
 msgstr "ไม่มีคำอธิบายรายละเอียดอยู่"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1303
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1056
 msgid "No location information available."
 msgstr "ไม่มีข้อมูลสถานที่"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1339
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1072
 #, c-format
-msgid "You have %d alarms"
-msgstr "คุณมีการเตือน %d รายการ"
-
-#. FIXME
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1502
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1526
+msgid ""
+"Alarm on %s\n"
+"%s\n"
+"Starting at %s\n"
+"Ending at %s"
+msgstr ""
+"เตือนเมื่อ %s\n"
+"%s\n"
+"เริ่มต้นที่ %s\n"
+"สิ้นสุดที่ %s"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1175
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1199
 msgid "Warning"
 msgstr "การเตือน"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1506
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1179
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4466,7 +4346,7 @@ msgstr ""
 "Evolution ยังไม่สนับสนุนการเตือนความจำปฏิทินด้วยการแจ้งเตือนอีเมล\n"
 " แต่การเตือนความจำนี้ได้กำหนดค่าให้ส่งอีเมล Evolution จะแสดงกล่องข้อความเตือนความจำปกติแทน"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1532
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1205
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4483,15 +4363,15 @@ msgstr ""
 "\n"
 "คุณแน่ใจหรือไม่ ที่จะเรียกโปรแกรมนี้?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1546
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1219
 msgid "Do not ask me about this program again."
 msgstr "ไม่ต้องถามเกี่ยวกับโปรแกรมนี้อีกครั้ง"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:155
+#: ../calendar/gui/alarm-notify/notify-main.c:140
 msgid "Could not initialize Bonobo"
 msgstr "ไม่สามารถเริ่มใช้งาน Bonobo ได้"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:166
+#: ../calendar/gui/alarm-notify/notify-main.c:151
 msgid "Could not create the alarm notify service factory"
 msgstr "ไม่สามารถสร้างโรงงานบริการแจ้งเตือนได้"
 
@@ -4499,62 +4379,6 @@ msgstr "ไม่สามารถสร้างโรงงานบริก
 msgid "invalid time"
 msgstr "เวลาไม่ถูกต้อง"
 
-#. Can't be zero
-#: ../calendar/gui/alarm-notify/util.c:58
-#, c-format
-msgid "(%d seconds)"
-msgstr "(%d วินาที)"
-
-#: ../calendar/gui/alarm-notify/util.c:64
-#, c-format
-msgid "(%d %s %d %s)"
-msgstr "(%d %s %d %s)"
-
-#: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/dialogs/recurrence-page.c:991
-msgid "second"
-msgstr "วันที่สอง"
-
-#: ../calendar/gui/alarm-notify/util.c:64 ../filter/filter.glade.h:18
-#: ../mail/mail-config.glade.h:177
-msgid "seconds"
-msgstr "วินาที"
-
-#: ../calendar/gui/alarm-notify/util.c:66
-#, c-format
-msgid "(%d %s)"
-msgstr "(%d %s)"
-
-#: ../calendar/gui/alarm-notify/util.c:77
-#, c-format
-msgid " %u second"
-msgstr "%u วินาที"
-
-#: ../calendar/gui/alarm-notify/util.c:77
-#, c-format
-msgid " %u seconds"
-msgstr "%u วินาที"
-
-#: ../calendar/gui/alarm-notify/util.c:79
-#, c-format
-msgid " %u minute"
-msgstr "%u นาที"
-
-#: ../calendar/gui/alarm-notify/util.c:79
-#, c-format
-msgid " %u minutes"
-msgstr "%u นาที"
-
-#: ../calendar/gui/alarm-notify/util.c:81
-#, c-format
-msgid "%u hour"
-msgstr "%u ชั่วโมง"
-
-#: ../calendar/gui/alarm-notify/util.c:81
-#, c-format
-msgid "%u hours"
-msgstr "%u ชั่วโมง"
-
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 msgid "Alarm programs"
 msgstr "โปรแกรมการเตือน"
@@ -4727,191 +4551,133 @@ msgid "Programs that are allowed to be run by alarms."
 msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
-msgid "Show RSVP field in the event/task/meeting editor"
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
-msgid "Show Role field in the event/task/meeting editor"
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr "แสดงเวลาสิ้นสุดการนัดหมายในมุมมองสัปดาห์และเดือน"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
-msgid "Show categories field in the event/meeting/task editor"
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show display alarms in notification tray"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
-msgid "Show status field in the event/task/meeting editor"
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
-#: ../mail/evolution-mail.schemas.in.in.h:73
-msgid "Show the \"Preview\" pane"
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
-#: ../mail/evolution-mail.schemas.in.in.h:74
-msgid "Show the \"Preview\" pane."
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
-msgid "Show timezone field in the event/meeting editor"
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
-msgid "Show type field in the event/task/meeting editor"
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show week numbers in date navigator"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Tasks due today color"
 msgstr "สีของงานที่ถึงกำหนดวันนี้"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Tasks vertical pane position"
 msgstr "ตำแหน่ง vertical pane ของงาน"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 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.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
 #, 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.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Time divisions"
 msgstr "การจำแนกเวลา"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Time the last alarm ran, in time_t."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Timezone"
 msgstr "เขตเวลา"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Twenty four hour time format"
 msgstr "รูปแบบเวลา 24 ชั่วโมง"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "หน่วยสำหรับการเตือนความจำโดยปริยาย \"นาที\", \"ชั่วโมง\" หรือ \"วัน\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "หน่วยของการกำหนดเมื่อจะซ่อนงาน \"นาที\", \"ชั่วโมง\" หรือ \"วัน\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid "Week start"
 msgstr "เริ่มต้นสัปดาห์"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "วันในสัปดาห์เริ่มต้นสัปดาห์จากวันอาทิตย์ (0) ถึงวันเสาร์ (6)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "กำหนดว่าจะถามยืนยันก่อนลบการนัดหมายหรืองานหรือไม่"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 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.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "กำหนดว่าจะแสดงเวลาสิ้นสุดของเหตุการณ์ในมุมมองสัปดาห์และเดือนหรือไม่"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "กำหนดว่าจะวาด Marcus Bains Line (เส้นที่ตำแหน่งเวลาปัจจุบัน) ในปฏิทินหรือไม่"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "กำหนดว่าจะซ่อนงานที่เสร็จแล้วในมุมมองงานหรือไม่"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Whether to set a default reminder for appointments."
 msgstr "กำหนดว่าจะตั้งค่าเตือนความจำปริยายสำหรับการนัดหมายหรือไม่"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
-msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
-msgid "Whether to show categories field in the event/meeting editor"
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
-msgid "Whether to show role field in the event/task/meeting editor"
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
-msgid "Whether to show status field in the event/task/meeting editor"
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 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.in.h:79
-msgid "Whether to show timezone field in the event/meeting editor"
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
-msgid "Whether to show type field in the event/task/meeting editor"
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to show week numbers in the date navigator."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Work days"
 msgstr "วันทำงาน"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid "Workday end hour"
 msgstr "ชั่วโมงสิ้นสุดวันทำงาน"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Workday end minute"
 msgstr "นาทีสิ้นสุดวันทำงาน"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid "Workday start hour"
 msgstr "ชั่วโมงเริ่มต้นวันทำงาน"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Workday start minute"
 msgstr "นาทีเริ่มต้นวันทำงาน"
 
@@ -4935,26 +4701,17 @@ msgstr "สถานที่มีคำว่า"
 msgid "Unmatched"
 msgstr "ไม่ตรงกัน"
 
-#: ../calendar/gui/calendar-commands.c:120 ../calendar/gui/print.c:2512
-#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-memos.xml.h:11
-#: ../ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "พิมพ์"
-
-#: ../calendar/gui/calendar-commands.c:120
+#: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2117
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/gnome-cal.c:2094
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:590
-#: ../plugins/hula-account-setup/camel-hula-listener.c:374
-#: ../plugins/hula-account-setup/camel-hula-listener.c:403
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:588
 msgid "Calendar"
 msgstr "ปฏิทิน"
 
-#: ../calendar/gui/calendar-commands.c:355
+#: ../calendar/gui/calendar-commands.c:354
 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 "
@@ -4963,11 +4720,11 @@ msgstr ""
 "ปฏิบัติการนี้จะลบเหตุการณ์ทุกอย่างที่เก่ากว่าเวลาที่กำหนดไว้ หากคุณดำเนินการต่อไป "
 "จะไม่สามารถเรียกข้อมูลเหตุการณ์เหล่านี้ได้กลับคืนมาได้อีก"
 
-#: ../calendar/gui/calendar-commands.c:361
+#: ../calendar/gui/calendar-commands.c:360
 msgid "Purge events older than"
 msgstr "ลบเหตุการณ์ที่เก่ากว่า"
 
-#: ../calendar/gui/calendar-commands.c:366
+#: ../calendar/gui/calendar-commands.c:365
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:12
 #: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:265
@@ -4977,13 +4734,10 @@ 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:234
-#: ../calendar/gui/memos-component.c:219 ../calendar/gui/migration.c:489
-#: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1084
-#: ../calendar/gui/tasks-component.c:215
+#: ../calendar/gui/calendar-component.c:234 ../calendar/gui/migration.c:489
+#: ../calendar/gui/migration.c:582 ../calendar/gui/tasks-component.c:215
 msgid "On The Web"
 msgstr "ในเว็บ"
 
@@ -4998,14 +4752,15 @@ msgid "Weather"
 msgstr "รายงานอากาศ"
 
 #: ../calendar/gui/calendar-component.c:535
-msgid "_New Calendar"
-msgstr "ปฏิทินใ_หม่"
+#: ../calendar/gui/dialogs/calendar-setup.c:449
+msgid "New Calendar"
+msgstr "ปฏิทินใหม่"
 
 #: ../calendar/gui/calendar-component.c:858
 msgid "Failed upgrading calendars."
 msgstr "การปรับปรุงรุ่นปฏิทินล้มเหลว"
 
-#: ../calendar/gui/calendar-component.c:1157
+#: ../calendar/gui/calendar-component.c:1154
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "ไม่สามารถเปิดปฏิทิน '%s' เพื่อการสร้างเหตุการณ์และการประชุม"
@@ -5059,7 +4814,6 @@ msgid "New calendar"
 msgstr "ปฏิทินใหม่"
 
 #: ../calendar/gui/calendar-component.c:1500
-#: ../calendar/gui/dialogs/event-page.c:829
 msgid "Cale_ndar"
 msgstr "_ปฏิทิน"
 
@@ -5194,8 +4948,7 @@ msgstr "ชั่วโมง"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/calendar-http/calendar-http.c:264
+#: ../filter/filter.glade.h:15 ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:564
 msgid "hours"
 msgstr "ชั่วโมง"
@@ -5208,7 +4961,7 @@ msgstr "นาที"
 msgid "start of appointment"
 msgstr "เริ่มการนัดหมาย"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:200
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:199
 msgid "Action/Trigger"
 msgstr "ปฏิบัติการ/การเรียกโปรแกรม"
 
@@ -5217,8 +4970,6 @@ msgid "A_dd"
 msgstr "เ_พิ่ม"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "การเตือน"
 
@@ -5245,20 +4996,17 @@ msgstr "%.0fG"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:311
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
-#: ../calendar/gui/dialogs/comp-editor.c:2582
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:138
-#: ../mail/em-utils.c:483 ../mail/em-utils.c:520
-#: ../widgets/misc/e-attachment-bar.c:341
+#: ../calendar/gui/dialogs/comp-editor.c:2440
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:444
+#: ../mail/em-utils.c:481 ../widgets/misc/e-attachment-bar.c:341
 msgid "attachment"
 msgstr "เอกสารแนบ"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:473
-#: ../calendar/gui/dialogs/comp-editor.c:1056
-#: ../calendar/gui/dialogs/event-page.c:1734
-#: ../calendar/gui/dialogs/meeting-page.c:909
-#: ../calendar/gui/dialogs/task-page.c:1183
+#: ../calendar/gui/dialogs/comp-editor.c:1083
+#: ../calendar/gui/dialogs/meeting-page.c:887
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3545
+#: ../composer/e-msg-composer.c:3400
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
@@ -5266,23 +5014,23 @@ msgid "_Remove"
 msgstr "_ลบ"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:474
-#: ../calendar/gui/dialogs/comp-editor.c:1057
+#: ../calendar/gui/dialogs/comp-editor.c:1084
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3546 ../mail/em-folder-tree.c:2058
+#: ../composer/e-msg-composer.c:3401 ../mail/em-folder-tree.c:2047
 #: ../ui/evolution-mail-list.xml.h:29
 msgid "_Properties"
 msgstr "_คุณสมบัติ"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:476
-#: ../calendar/gui/dialogs/comp-editor.c:1059
+#: ../calendar/gui/dialogs/comp-editor.c:1086
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3548
+#: ../composer/e-msg-composer.c:3403
 msgid "_Add attachment..."
 msgstr "เ_พิ่มเอกสารแนบ..."
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:736
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:994
+#: ../widgets/misc/e-attachment-bar.c:963
 msgid "Attachment Bar"
 msgstr "แถบเอกสารแนบ"
 
@@ -5297,28 +5045,28 @@ msgid "Suggest automatic display of attachment"
 msgstr ""
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
-#: ../composer/e-msg-composer-select-file.c:239
+#: ../composer/e-msg-composer-select-file.c:241
 msgid "Attach file(s)"
 msgstr "แนบแฟ้ม"
 
-#: ../calendar/gui/dialogs/cal-attachment.c:211
-#: ../calendar/gui/dialogs/cal-attachment.c:227
-#: ../calendar/gui/dialogs/cal-attachment.c:320
-#: ../calendar/gui/dialogs/cal-attachment.c:336
-#: ../composer/e-msg-composer-attachment.c:188
-#: ../composer/e-msg-composer-attachment.c:204
-#: ../composer/e-msg-composer-attachment.c:298
-#: ../composer/e-msg-composer-attachment.c:314
+#: ../calendar/gui/dialogs/cal-attachment.c:210
+#: ../calendar/gui/dialogs/cal-attachment.c:226
+#: ../calendar/gui/dialogs/cal-attachment.c:319
+#: ../calendar/gui/dialogs/cal-attachment.c:335
+#: ../composer/e-msg-composer-attachment.c:187
+#: ../composer/e-msg-composer-attachment.c:203
+#: ../composer/e-msg-composer-attachment.c:297
+#: ../composer/e-msg-composer-attachment.c:313
 #: ../widgets/misc/e-attachment.c:221 ../widgets/misc/e-attachment.c:237
 #: ../widgets/misc/e-attachment.c:425 ../widgets/misc/e-attachment.c:441
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "ไม่สามารถแนบแฟ้ม %s: %s"
 
-#: ../calendar/gui/dialogs/cal-attachment.c:219
-#: ../calendar/gui/dialogs/cal-attachment.c:328
-#: ../composer/e-msg-composer-attachment.c:196
-#: ../composer/e-msg-composer-attachment.c:306
+#: ../calendar/gui/dialogs/cal-attachment.c:218
+#: ../calendar/gui/dialogs/cal-attachment.c:327
+#: ../composer/e-msg-composer-attachment.c:195
+#: ../composer/e-msg-composer-attachment.c:305
 #: ../widgets/misc/e-attachment.c:229 ../widgets/misc/e-attachment.c:433
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
@@ -5332,7 +5080,7 @@ msgstr "คุณสมบัติเอกสารแนบ"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:267
-#: ../calendar/gui/e-itip-control.c:1163
+#: ../calendar/gui/e-itip-control.c:1166
 #: ../calendar/gui/e-itip-control.glade.h:6
 #: ../composer/e-msg-composer-attachment.glade.h:3
 #: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
@@ -5352,35 +5100,35 @@ msgid "MIME type:"
 msgstr "ชนิด MIME:"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:583
-#: ../mail/em-account-prefs.c:504 ../mail/em-composer-prefs.c:930
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:576
+#: ../mail/em-account-prefs.c:504 ../mail/em-composer-prefs.c:891
 #: ../plugins/plugin-manager/plugin-manager.c:213
 msgid "Enabled"
 msgstr "เปิดใช้งาน"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:740
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:730
 msgid "Are you sure you want to remove this URL?"
 msgstr "คุณแน่ใจหรือไม่ว่า ต้องการลบ URL นี้?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:743
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:733
 msgid "Remove"
 msgstr "ลบ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:748
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:738
 msgid "Don't Remove"
 msgstr "ไม่ลบ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:797
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:830
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:863
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:853
 #: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
 #: ../mail/em-account-prefs.c:406
 msgid "Disable"
 msgstr "ปิดใช้งาน"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:797
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:830
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:865
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:855
 #: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
 #: ../mail/em-account-prefs.c:408
 msgid "Enable"
@@ -5470,14 +5218,12 @@ msgid "E_nable"
 msgstr "เ_ปิดใช้งาน"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: ../calendar/gui/dialogs/event-editor.c:555
-#: ../ui/evolution-event-editor.xml.h:6
 msgid "Free/Busy"
 msgstr "ว่าง/ไม่ว่าง"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Friday"
 msgstr "ศุกร์"
 
@@ -5490,8 +5236,8 @@ msgid "Minutes"
 msgstr "นาที"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
-#: ../calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Monday"
 msgstr "จันทร์"
 
@@ -5504,8 +5250,8 @@ msgid "S_un"
 msgstr "_อาทิตย์"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ../calendar/gui/dialogs/recurrence-page.c:1051
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/recurrence-page.c:1049
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Saturday"
 msgstr "เสาร์"
 
@@ -5518,8 +5264,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "แสดงสัป_ดาห์ที่ในปฏิทิน"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1052
-#: ../calendar/gui/e-itip-control.c:726
+#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Sunday"
 msgstr "อาทิตย์"
 
@@ -5536,13 +5282,12 @@ msgid "Template:"
 msgstr "รูปแบบข้อความ:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Thursday"
 msgstr "พฤหัสบดี"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "Time _zone:"
 msgstr "เ_ขตเวลา:"
 
@@ -5551,8 +5296,8 @@ msgid "Time format:"
 msgstr "รูปแบบเวลา:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Tuesday"
 msgstr "อังคาร"
 
@@ -5561,8 +5306,8 @@ msgid "W_eek starts:"
 msgstr "เริ่มต้น_สัปดาห์:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Wednesday"
 msgstr "พุธ"
 
@@ -5648,42 +5393,25 @@ msgstr "คัดลอกเนื้อหาปฏิทินไว้ที
 
 #: ../calendar/gui/dialogs/calendar-setup.c:290
 msgid "Copy task list contents locally for offline operation"
-msgstr "คัดลอกเนื้อหารายการงานไว้ที่เครื่องเพื่อการทำงานแบบออฟไลน์"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-msgid "Copy memo list contents locally for offline operation"
-msgstr "คัดลอกเนื้อหารายการบันทึกข้อความไว้ที่เครื่องเพื่อการทำงานแบบออฟไลน์"
+msgstr "คัดลอกเนื้อหารายการไว้ที่เครื่องเพื่อการทำงานแบบออฟไลน์"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:341
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "_สี:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:378
 msgid "Tasks List"
 msgstr "รายการงาน"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-msgid "Memos List"
-msgstr "รายการบันทึกข้อความ"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:460
+#: ../calendar/gui/dialogs/calendar-setup.c:447
 msgid "Calendar Properties"
 msgstr "คุณสมบัติปฏิทิน"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:462
-msgid "New Calendar"
-msgstr "ปฏิทินใหม่"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:528
+#: ../calendar/gui/dialogs/calendar-setup.c:515
 msgid "Task List Properties"
 msgstr "คุณสมบัติรายการงาน"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:594
-#: ../calendar/gui/memos-component.c:448
-msgid "New Memo List"
-msgstr "รายการบันทึกข้อความใหม่"
-
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
 msgstr "เพิ่มปฏิทิน"
@@ -5771,123 +5499,124 @@ msgstr "%s  คุณไม่ได้แก้ไขข้อมูลใด�
 msgid "Validation error: %s"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2270
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2261
 msgid " to "
 msgstr "ไปยัง"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2274
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2265
 msgid " (Completed "
 msgstr "(เสร็จแล้ว"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2276
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2267
 msgid "Completed "
 msgstr "เสร็จแล้ว"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2281
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2272
 msgid " (Due "
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2283
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2274
 msgid "Due "
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:194 ../composer/e-msg-composer.c:2800
+#: ../calendar/gui/dialogs/comp-editor.c:190 ../composer/e-msg-composer.c:2664
 #, c-format
 msgid "Attached message - %s"
 msgstr "ข้อความที่แนบมา - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:199
-#: ../calendar/gui/dialogs/comp-editor.c:369 ../composer/e-msg-composer.c:2805
-#: ../composer/e-msg-composer.c:2984
+#: ../calendar/gui/dialogs/comp-editor.c:195
+#: ../calendar/gui/dialogs/comp-editor.c:365 ../composer/e-msg-composer.c:2669
+#: ../composer/e-msg-composer.c:2846
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "ข้อความที่แนบมา"
 msgstr[1] "ข้อความที่แนบมา %d ข้อความ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:433 ../composer/e-msg-composer.c:3050
-#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1719
+#: ../calendar/gui/dialogs/comp-editor.c:428
+#: ../calendar/gui/e-calendar-table.c:1162
+#: ../calendar/gui/e-calendar-view.c:1535 ../composer/e-msg-composer.c:2911
+#: ../mail/em-folder-tree.c:974 ../mail/em-folder-view.c:1035
+#: ../mail/message-list.c:1708 ../ui/evolution-addressbook.xml.h:31
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-tasks.xml.h:21
+msgid "_Copy"
+msgstr "_คัดลอก"
+
+#: ../calendar/gui/dialogs/comp-editor.c:429 ../composer/e-msg-composer.c:2912
+#: ../mail/em-folder-tree.c:975 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1709
 msgid "_Move"
 msgstr "_ย้าย"
 
-#: ../calendar/gui/dialogs/comp-editor.c:435 ../composer/e-msg-composer.c:3052
-#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1721
+#: ../calendar/gui/dialogs/comp-editor.c:431 ../composer/e-msg-composer.c:2914
+#: ../mail/em-folder-tree.c:977 ../mail/message-list.c:1711
 msgid "Cancel _Drag"
 msgstr "ยกเลิกการ_ลาก"
 
-#: ../calendar/gui/dialogs/comp-editor.c:778
+#: ../calendar/gui/dialogs/comp-editor.c:774
 msgid "Could not update object"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:914 ../composer/e-msg-composer.c:2443
+#: ../calendar/gui/dialogs/comp-editor.c:977 ../composer/e-msg-composer.c:2318
 #, 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:944
-msgid "Hide Attachment _Bar"
-msgstr "ซ่อนแ_ถบเอกสารแนบ"
+#: ../calendar/gui/dialogs/comp-editor.c:1249
+msgid "_Attachment Bar (drop attachments here)"
+msgstr "แ_ถบเอกสารแนบ (วางเอกสารแนบที่นี่)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
-#: ../calendar/gui/dialogs/comp-editor.c:1364
-msgid "Show Attachment _Bar"
-msgstr "แสดงแ_ถบเอกสารแนบ"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1388
-msgid "Attachment Button: Press space key to toggle attachment bar"
-msgstr ""
-
-#: ../calendar/gui/dialogs/comp-editor.c:1991
-#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../calendar/gui/dialogs/comp-editor.c:1850
+#: ../calendar/gui/dialogs/comp-editor.c:1893
 msgid "Edit Appointment"
 msgstr "แก้ไขการนัดหมาย"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1997
-#: ../calendar/gui/dialogs/comp-editor.c:2040
+#: ../calendar/gui/dialogs/comp-editor.c:1856
+#: ../calendar/gui/dialogs/comp-editor.c:1899
 #, c-format
 msgid "Meeting - %s"
 msgstr "การประชุม - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1999
-#: ../calendar/gui/dialogs/comp-editor.c:2042
+#: ../calendar/gui/dialogs/comp-editor.c:1858
+#: ../calendar/gui/dialogs/comp-editor.c:1901
 #, c-format
 msgid "Appointment - %s"
 msgstr "การนัดหมาย - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2003
-#: ../calendar/gui/dialogs/comp-editor.c:2046
+#: ../calendar/gui/dialogs/comp-editor.c:1862
+#: ../calendar/gui/dialogs/comp-editor.c:1905
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "งานที่ได้รับมอบหมาย - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2005
-#: ../calendar/gui/dialogs/comp-editor.c:2048
+#: ../calendar/gui/dialogs/comp-editor.c:1864
+#: ../calendar/gui/dialogs/comp-editor.c:1907
 #, c-format
 msgid "Task - %s"
 msgstr "งาน - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2008
-#: ../calendar/gui/dialogs/comp-editor.c:2051
+#: ../calendar/gui/dialogs/comp-editor.c:1867
+#: ../calendar/gui/dialogs/comp-editor.c:1910
 #, c-format
 msgid "Journal entry - %s"
 msgstr "รายการบันทึก - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2019
-#: ../calendar/gui/dialogs/comp-editor.c:2061
+#: ../calendar/gui/dialogs/comp-editor.c:1878
+#: ../calendar/gui/dialogs/comp-editor.c:1920
 msgid "No summary"
 msgstr "ไม่มีสรุป"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2675
-#: ../calendar/gui/dialogs/comp-editor.c:2708
-#: ../calendar/gui/dialogs/comp-editor.c:2732
+#: ../calendar/gui/dialogs/comp-editor.c:2528
+#: ../calendar/gui/dialogs/comp-editor.c:2561
+#: ../calendar/gui/dialogs/comp-editor.c:2585
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:2756
+#: ../calendar/gui/dialogs/comp-editor.c:2609
 msgid "Unable to use current version!"
 msgstr "ไม่สามารถใช้รุ่นปัจจุบัน"
 
@@ -5964,178 +5693,203 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-editor.c:531
-msgid "Appoint_ment"
-msgstr "การ_นัดหมาย"
+#: ../calendar/gui/dialogs/event-editor.c:141 ../calendar/gui/print.c:2298
+msgid "Appointment"
+msgstr "การนัดหมาย"
 
-#: ../calendar/gui/dialogs/event-editor.c:535
-#: ../ui/evolution-event-editor.xml.h:12
+#: ../calendar/gui/dialogs/event-editor.c:150
 msgid "Recurrence"
 msgstr "การเวียนซ้ำ"
 
-#: ../calendar/gui/dialogs/event-page.c:835
-#: ../calendar/gui/dialogs/task-page.c:444
-msgid "Or_ganizer"
-msgstr "ผู้_ประสานงาน"
+#: ../calendar/gui/dialogs/event-editor.c:164
+#: ../calendar/gui/dialogs/event-editor.c:248
+#: ../calendar/gui/dialogs/event-editor.c:422
+msgid "Scheduling"
+msgstr "กำหนดการ"
+
+#: ../calendar/gui/dialogs/event-editor.c:174
+msgid "Delegatees"
+msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:873
-msgid "_Delegatees"
-msgstr "ผู้_รับฉันทะ"
+#: ../calendar/gui/dialogs/event-editor.c:178
+msgid "Attendees"
+msgstr "ผู้เข้าประชุม"
 
-#: ../calendar/gui/dialogs/event-page.c:875
-msgid "Atte_ndees"
-msgstr "ผู้เ_ข้าประชุม"
+#: ../calendar/gui/dialogs/event-editor.c:251
+#: ../calendar/gui/dialogs/event-editor.c:425
+msgid "Invitations"
+msgstr "การเชิญ"
 
-#: ../calendar/gui/dialogs/event-page.c:1034
+#: ../calendar/gui/dialogs/event-page.c:731
 msgid "Event with no start date"
 msgstr "เหตุการณ์ที่ไม่บอกวันเริ่มต้น"
 
-#: ../calendar/gui/dialogs/event-page.c:1037
+#: ../calendar/gui/dialogs/event-page.c:734
 msgid "Event with no end date"
 msgstr "เหตุการณ์ที่ไม่บอกวันสิ้นสุด"
 
-#: ../calendar/gui/dialogs/event-page.c:1202
-#: ../calendar/gui/dialogs/task-page.c:848
+#: ../calendar/gui/dialogs/event-page.c:900
+#: ../calendar/gui/dialogs/task-page.c:556
 msgid "Start date is wrong"
 msgstr "วันเริ่มต้นไม่ถูกต้อง"
 
-#: ../calendar/gui/dialogs/event-page.c:1212
+#: ../calendar/gui/dialogs/event-page.c:910
 msgid "End date is wrong"
 msgstr "วันสิ้นสุดไม่ถูกต้อง"
 
-#: ../calendar/gui/dialogs/event-page.c:1235
+#: ../calendar/gui/dialogs/event-page.c:933
 msgid "Start time is wrong"
 msgstr "เวลาเริ่มต้นไม่ถูกต้อง"
 
-#: ../calendar/gui/dialogs/event-page.c:1242
+#: ../calendar/gui/dialogs/event-page.c:940
 msgid "End time is wrong"
 msgstr "เวลาสิ้นสุดไม่ถูกต้อง"
 
-#: ../calendar/gui/dialogs/event-page.c:1397
-#: ../calendar/gui/dialogs/meeting-page.c:464
-#: ../calendar/gui/dialogs/task-page.c:905
-msgid "The organizer selected no longer has an account."
-msgstr ""
-
-#: ../calendar/gui/dialogs/event-page.c:1403
-#: ../calendar/gui/dialogs/meeting-page.c:470
-#: ../calendar/gui/dialogs/task-page.c:911
-msgid "An organizer is required."
-msgstr ""
-
-#: ../calendar/gui/dialogs/event-page.c:1418
-#: ../calendar/gui/dialogs/meeting-page.c:485
-#: ../calendar/gui/dialogs/task-page.c:926
-msgid "At least one attendee is required."
-msgstr "ต้องการผู้เข้าประชุมอย่างน้อยหนึ่งคน"
-
-#: ../calendar/gui/dialogs/event-page.c:1735
-#: ../calendar/gui/dialogs/meeting-page.c:910
-#: ../calendar/gui/dialogs/task-page.c:1184
-msgid "_Add "
-msgstr "เ_พิ่ม"
-
-#: ../calendar/gui/dialogs/event-page.c:2422
+#: ../calendar/gui/dialogs/event-page.c:1686
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "ไม่สามารถเปิดปฏิทิน '%s'"
 
-#: ../calendar/gui/dialogs/event-page.c:2662
+#: ../calendar/gui/dialogs/event-page.c:1892
 #, 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:2670
+#: ../calendar/gui/dialogs/event-page.c:1900
 #, 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:2678
+#: ../calendar/gui/dialogs/event-page.c:1908
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d นาทีก่อนการนัดหมาย"
 msgstr[1] "%d นาทีก่อนการนัดหมาย"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:1
+#: ../calendar/gui/dialogs/event-page.glade.h:2
+msgid "1 day before appointment"
+msgstr "1 วันก่อนการนัดหมาย"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:3
 msgid "1 hour before appointment"
 msgstr "1 ชั่วโมงก่อนการนัดหมาย"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "15 minutes before appointment"
 msgstr "15 นาทีก่อนการนัดหมาย"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:3
-msgid "1day before appointment"
-msgstr "1 วันก่อนการนัดหมาย"
-
 #: ../calendar/gui/dialogs/event-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "Atte_ndees..."
-msgstr "ผู้เ_ข้าประชุม..."
+msgid "<b>Basics</b>"
+msgstr "<b>พื้นฐาน</b>"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
-msgid "C_ustomize"
-msgstr "ปรับแ_ต่ง"
+#: ../calendar/gui/dialogs/task-page.glade.h:2
+msgid "<b>Date and Time</b>"
+msgstr "<b>วันและเวลา</b>"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
-msgid "Ca_tegories..."
-msgstr "ห_มวด..."
+#: ../calendar/gui/dialogs/task-page.glade.h:3
+msgid "<b>Send Options</b>"
+msgstr "<b>ส่งตัวเลือก</b>"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:8
-msgid "Cale_ndar:"
-msgstr "_ปฏิทิน:"
+msgid "A_ll day event"
+msgstr "เหตุการณ์ตลอด_วัน"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ad_vanced send options"
+msgstr ""
 
 #: ../calendar/gui/dialogs/event-page.glade.h:10
-msgid "Event Description"
-msgstr "คำบรรยายเหตุการณ์"
+msgid "C_ustomize..."
+msgstr "ปรับแ_ต่ง..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:11
-msgid "Locat_ion:"
-msgstr "_สถานที่:"
+#: ../calendar/gui/dialogs/task-page.glade.h:5
+msgid "Ca_tegories..."
+msgstr "ห_มวด..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:12
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "Or_ganizer:"
-msgstr "ผู้_ประสานงาน:"
+msgid "Cale_ndar:"
+msgstr "_ปฏิทิน:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:13
-#: ../calendar/gui/dialogs/task-page.glade.h:6
-msgid "Su_mmary:"
-msgstr "สรุ_ป:"
+#: ../calendar/gui/dialogs/task-page.glade.h:7
+msgid "Classi_fication:"
+msgstr "การจำแนก_กลุ่ม:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:360
+msgid "Confidential"
+msgstr "เป็นความลับ"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:15
-msgid "_Description:"
-msgstr "_คำอธิบาย:"
+msgid "Event Description"
+msgstr "คำบรรยายเหตุการณ์"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:16
-msgid "_Set alarm\t"
-msgstr "_ตั้งการแจ้งเตือน\t"
+msgid "Locat_ion:"
+msgstr "_สถานที่:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:17
-msgid "_Time:"
-msgstr "เ_วลา:"
+#: ../calendar/gui/dialogs/task-page.glade.h:10
+#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:323
+#: ../calendar/gui/e-calendar-table.c:359
+msgid "Private"
+msgstr "ส่วนตัว"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
-msgid "for"
-msgstr "เป็นจำนวน"
+#: ../calendar/gui/dialogs/task-page.glade.h:11
+#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:314
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:358
+msgid "Public"
+msgstr "เปิดเผย"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:19
+msgid "Show time as _busy"
+msgstr "แสดงเวลาเป็นไ_ม่ว่าง"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:20
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "until"
-msgstr "กระทั่ง"
+#: ../calendar/gui/dialogs/task-page.glade.h:13
+msgid "Su_mmary:"
+msgstr "สรุ_ป:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:21
+msgid "This appointment has customized alarms"
+msgstr "การนัดหมายนี้มีการแจ้งเตือนที่กำหนดขึ้นเอง"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:22
+msgid "_Alarm"
+msgstr "แ_จ้งเตือน"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:23
+msgid "_Description:"
+msgstr "_คำอธิบาย:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:24
+#: ../calendar/gui/e-meeting-time-sel.c:642
+msgid "_End time:"
+msgstr "เวลา_สิ้นสุด:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:25
+#: ../calendar/gui/e-meeting-time-sel.c:615
+msgid "_Start time:"
+msgstr "เวลาเ_ริ่มต้น:"
 
-#: ../calendar/gui/dialogs/meeting-page.c:306
+#: ../calendar/gui/dialogs/meeting-page.c:303
 msgid "<b>Dele_gatees</b>"
 msgstr ""
 
-#: ../calendar/gui/dialogs/meeting-page.c:310
+#: ../calendar/gui/dialogs/meeting-page.c:307
 msgid "<b>From:</b>"
 msgstr "<b>จาก:</b>"
 
@@ -6144,10 +5898,10 @@ msgstr "<b>จาก:</b>"
 #. When "None" is selected we want the field to be cleared.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../calendar/gui/dialogs/meeting-page.c:316
+#: ../calendar/gui/dialogs/meeting-page.c:313
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:653
-#: ../calendar/gui/e-itip-control.c:1103 ../composer/e-msg-composer.c:2246
+#: ../calendar/gui/e-itip-control.c:1106 ../composer/e-msg-composer.c:2122
 #: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
 #: ../mail/em-account-editor.c:1348 ../mail/em-account-prefs.c:464
 #: ../mail/em-folder-view.c:1064 ../mail/em-junk-hook.c:78
@@ -6156,12 +5910,29 @@ msgstr "<b>จาก:</b>"
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:7
 #: ../plugins/itip-formatter/itip-formatter.c:1627
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
-#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:474
-#: ../widgets/misc/e-dateedit.c:1513 ../widgets/misc/e-dateedit.c:1727
+#: ../widgets/misc/e-cell-date-edit.c:248 ../widgets/misc/e-dateedit.c:465
+#: ../widgets/misc/e-dateedit.c:1504 ../widgets/misc/e-dateedit.c:1673
 msgid "None"
 msgstr "ไม่"
 
+#: ../calendar/gui/dialogs/meeting-page.c:461
+msgid "The organizer selected no longer has an account."
+msgstr ""
+
+#: ../calendar/gui/dialogs/meeting-page.c:467
+msgid "An organizer is required."
+msgstr ""
+
+#: ../calendar/gui/dialogs/meeting-page.c:482
+msgid "At least one attendee is required."
+msgstr "ต้องการผู้เข้าประชุมอย่างน้อยหนึ่งคน"
+
+#: ../calendar/gui/dialogs/meeting-page.c:884
+msgid "_Delegate To..."
+msgstr ""
+
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
+#: ../calendar/gui/e-meeting-list-view.c:358
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "ผู้เข้าประชุม"
@@ -6197,14 +5968,15 @@ msgid "Member"
 msgstr "สมาชิก"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:399
+#: ../calendar/gui/e-meeting-list-view.c:386
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
+#: ../calendar/gui/dialogs/task-editor.c:147
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:410
+#: ../calendar/gui/e-meeting-list-view.c:394
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
 #: ../mail/message-list.etspec.h:12
 msgid "Status"
@@ -6219,9 +5991,14 @@ msgid "C_hange Organizer"
 msgstr ""
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Co_ntacts..."
+#: ../calendar/gui/e-meeting-time-sel.c:428
+msgid "Con_tacts..."
 msgstr "ที่อยู่_ติดต่อ..."
 
+#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+msgid "Or_ganizer:"
+msgstr "ผู้_ประสานงาน:"
+
 #: ../calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "Organizer"
 msgstr ""
@@ -6231,50 +6008,6 @@ msgstr ""
 msgid "Organizer:"
 msgstr ""
 
-#: ../calendar/gui/dialogs/memo-editor.c:130 ../calendar/gui/print.c:2311
-msgid "Memo"
-msgstr "บันทึกข้อความ"
-
-#: ../calendar/gui/dialogs/memo-page.c:490
-#, c-format
-msgid "Unable to open memos in '%s'."
-msgstr "ไม่สามารถเปิดบันทึกข้อความใน '%s'"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:2
-msgid "<span weight=\"bold\">Basics</span>"
-msgstr "<span weight=\"bold\">ทั่วไป</span>"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-msgid "Classi_fication:"
-msgstr "ประเ_ภท:"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
-#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:366
-msgid "Confidential"
-msgstr "เป็นความลับ"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:365
-msgid "Private"
-msgstr "ส่วนตัว"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:364
-msgid "Public"
-msgstr "เปิดเผย"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:8
-#: ../calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Group:"
-msgstr "_กลุ่ม:"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:9
-msgid "_Memo Content:"
-msgstr "เ_นื้อหาบันทึก:"
-
 #: ../calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>ตัวเลือกปฏิทิน</b>"
@@ -6344,51 +6077,55 @@ msgstr "กรณีนี้และต่อไป"
 msgid "All Instances"
 msgstr "ทุกกรณี"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:498
+#: ../calendar/gui/dialogs/recurrence-page.c:496
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:819
+#: ../calendar/gui/dialogs/recurrence-page.c:817
 msgid "Recurrence date is invalid"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:930
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "เมื่อ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:990
+#: ../calendar/gui/dialogs/recurrence-page.c:988
 msgid "first"
 msgstr "วันแรก"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#: ../calendar/gui/dialogs/recurrence-page.c:989
+msgid "second"
+msgstr "วันที่สอง"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:990
 msgid "third"
 msgstr "วันที่สาม"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:993
+#: ../calendar/gui/dialogs/recurrence-page.c:991
 msgid "fourth"
 msgstr "วันที่สี่"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:994
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "last"
 msgstr "วันสุดท้าย"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1017
+#: ../calendar/gui/dialogs/recurrence-page.c:1015
 msgid "Other Date"
 msgstr "วันอื่น"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
 msgid "day"
 msgstr "วัน"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1182
+#: ../calendar/gui/dialogs/recurrence-page.c:1180
 msgid "on the"
 msgstr "เมื่อ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1371
+#: ../calendar/gui/dialogs/recurrence-page.c:1369
 msgid "occurrences"
 msgstr "ครั้ง"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2326
+#: ../calendar/gui/dialogs/recurrence-page.c:2325
 msgid "Date/Time"
 msgstr "วัน/เวลา"
 
@@ -6413,6 +6150,10 @@ msgstr "ทุกๆ "
 msgid "This appointment rec_urs"
 msgstr "การนัดหมายนี้เ_วียนซ้ำเป็นรอบๆ"
 
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "for"
+msgstr "เป็นจำนวน"
+
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "ตลอดไป"
@@ -6421,6 +6162,10 @@ msgstr "ตลอดไป"
 msgid "month(s)"
 msgstr "เดือน"
 
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid "until"
+msgstr "กระทั่ง"
+
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "สัปดาห์"
@@ -6429,12 +6174,12 @@ msgstr "สัปดาห์"
 msgid "year(s)"
 msgstr "ปี"
 
-#: ../calendar/gui/dialogs/task-details-page.c:411
-#: ../calendar/gui/dialogs/task-details-page.c:431
+#: ../calendar/gui/dialogs/task-details-page.c:410
+#: ../calendar/gui/dialogs/task-details-page.c:430
 msgid "Completed date is wrong"
 msgstr ""
 
-#: ../calendar/gui/dialogs/task-details-page.c:523
+#: ../calendar/gui/dialogs/task-details-page.c:522
 msgid "Web Page"
 msgstr "เว็บเพจ"
 
@@ -6452,15 +6197,15 @@ msgstr "<span weight=\"bold\">สถานภาพ</span>"
 #: ../calendar/gui/e-cal-component-preview.c:229
 #: ../calendar/gui/e-cal-model-tasks.c:346
 #: ../calendar/gui/e-cal-model-tasks.c:659
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:895
+#: ../calendar/gui/e-calendar-table.c:455 ../calendar/gui/e-itip-control.c:898
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../calendar/gui/print.c:2372 ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/print.c:2361 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "เสร็จแล้ว"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1018
+#: ../calendar/gui/e-calendar-table.c:380 ../mail/message-list.c:1008
 msgid "High"
 msgstr "สูง"
 
@@ -6469,20 +6214,20 @@ msgstr "สูง"
 #: ../calendar/gui/e-cal-model-tasks.c:344
 #: ../calendar/gui/e-cal-model-tasks.c:657
 #: ../calendar/gui/e-cal-model-tasks.c:732
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2369
+#: ../calendar/gui/e-calendar-table.c:454 ../calendar/gui/print.c:2358
 msgid "In Progress"
 msgstr "กำลังดำเนินการ"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1016
+#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1006
 msgid "Low"
 msgstr "ต่ำ"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model.c:920 ../calendar/gui/e-calendar-table.c:387
-#: ../mail/message-list.c:1017
+#: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:381
+#: ../mail/message-list.c:1007
 msgid "Normal"
 msgstr "ปกติ"
 
@@ -6490,7 +6235,7 @@ msgstr "ปกติ"
 #: ../calendar/gui/e-cal-component-preview.c:236
 #: ../calendar/gui/e-cal-model-tasks.c:342
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/print.c:2366
+#: ../calendar/gui/e-calendar-table.c:453 ../calendar/gui/print.c:2355
 msgid "Not Started"
 msgstr "ยังไม่เริ่ม"
 
@@ -6499,76 +6244,69 @@ 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:389
+#: ../calendar/gui/e-calendar-table.c:383
 msgid "Undefined"
 msgstr "ไม่ได้กำหนด"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "_Date completed:"
 msgstr "_วันที่ทำเสร็จ:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:14
+#: ../calendar/gui/dialogs/task-details-page.glade.h:13
 #: ../widgets/misc/e-send-options.glade.h:31
 msgid "_Priority:"
 msgstr "_ระดับความสำคัญ:"
 
+#: ../calendar/gui/dialogs/task-details-page.glade.h:14
+msgid "_Status:"
+msgstr "_สถานภาพ:"
+
 #: ../calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Web Page:"
 msgstr "เ_ว็บเพจ:"
 
-#: ../calendar/gui/dialogs/task-editor.c:419
-#: ../calendar/gui/tasks-component.c:1172
-msgid "_Task"
-msgstr "_งาน"
-
-#: ../calendar/gui/dialogs/task-editor.c:423
-msgid "Task Details"
-msgstr "รายละเอียดงาน"
+#: ../calendar/gui/dialogs/task-editor.c:138 ../calendar/gui/print.c:2300
+msgid "Task"
+msgstr "งาน"
 
-#: ../calendar/gui/dialogs/task-page.c:437
-msgid "_Group"
-msgstr "_กลุ่ม"
+#: ../calendar/gui/dialogs/task-editor.c:162
+#: ../calendar/gui/dialogs/task-editor.c:224
+#: ../calendar/gui/dialogs/task-editor.c:378
+msgid "Assignment"
+msgstr "งานมอบหมาย"
 
-#: ../calendar/gui/dialogs/task-page.c:821
+#: ../calendar/gui/dialogs/task-page.c:529
 msgid "Due date is wrong"
 msgstr "วันกำหนดเสร็จงานไม่ถูกต้อง"
 
-#: ../calendar/gui/dialogs/task-page.c:1614
+#: ../calendar/gui/dialogs/task-page.c:873
 #, c-format
 msgid "Unable to open tasks in '%s'."
-msgstr "ไม่สามารถเปิดงานใน '%s'"
-
-#: ../calendar/gui/dialogs/task-page.glade.h:2
-msgid "Categor_ies..."
-msgstr "ห_มวด..."
+msgstr "ไม่สามารถเปิดงานใน '%s'."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:3
+#: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "D_escription:"
 msgstr "_คำอธิบาย:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:4
-msgid "Or_ganiser:"
-msgstr "ผู้_ประสานงาน:"
-
-#: ../calendar/gui/dialogs/task-page.glade.h:5
+#: ../calendar/gui/dialogs/task-page.glade.h:12
 msgid "Sta_rt date:"
 msgstr "วันเ_ริ่มต้น:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:7
-msgid "Time zone:"
-msgstr "เขตเวลา:"
+#: ../calendar/gui/dialogs/task-page.glade.h:14
+msgid "Task Description"
+msgstr "คำอธิบายงาน"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../calendar/gui/dialogs/task-page.glade.h:15
 msgid "_Due date:"
 msgstr "วัน_กำหนดเสร็จ:"
 
+#: ../calendar/gui/dialogs/task-page.glade.h:16
+msgid "_Group:"
+msgstr "_กลุ่ม:"
+
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Free/Busy C_alendars</b>"
-msgstr "<b>_ปฏิทิน ว่าง/ไม่ว่าง</b>"
+msgstr "<b>ปฏิทิน ว่าง/ไม่ว่าง</b>"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
 msgid "<b>Publishing Frequency</b>"
@@ -6691,27 +6429,17 @@ msgstr "%s ที่ %s"
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2704
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2703
 #, c-format
 msgid "Click to open %s"
 msgstr "คลิกเพื่อเปิด %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:199
-msgid "Memo:"
-msgstr ""
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:232
-#: ../calendar/gui/e-cal-component-preview.c:299
-msgid "Web Page:"
-msgstr "เว็บเพจ:"
-
 #: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:796
 msgid "Untitled"
 msgstr "ไม่มีชื่อเรื่อง"
 
 #: ../calendar/gui/e-cal-component-preview.c:186
-#: ../calendar/gui/e-itip-control.c:1107
+#: ../calendar/gui/e-itip-control.c:1110
 #: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "สรุป:"
@@ -6728,9 +6456,9 @@ msgstr "วันกำหนดเสร็จ:"
 #. write status
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:222
-#: ../calendar/gui/e-itip-control.c:1131
+#: ../calendar/gui/e-itip-control.c:1134
 #: ../plugins/exchange-operations/exchange-account-setup.c:265
-#: ../plugins/itip-formatter/itip-view.c:908
+#: ../plugins/itip-formatter/itip-view.c:909
 msgid "Status:"
 msgstr "สถานะ:"
 
@@ -6738,6 +6466,10 @@ msgstr "สถานะ:"
 msgid "Priority:"
 msgstr "ระดับความสำคัญ:"
 
+#: ../calendar/gui/e-cal-component-preview.c:299
+msgid "Web Page:"
+msgstr "เว็บเพจ:"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "วันสิ้นสุด"
@@ -6748,19 +6480,18 @@ 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:16
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../mail/mail-dialogs.glade.h:16 ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "สรุป"
 
 #: ../calendar/gui/e-cal-model-calendar.c:180
-#: ../calendar/gui/e-calendar-table.c:438
+#: ../calendar/gui/e-calendar-table.c:432
 msgid "Free"
 msgstr "ว่าง"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:439
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-calendar-table.c:433
+#: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Busy"
 msgstr "ไม่ว่าง"
 
@@ -6771,7 +6502,7 @@ msgid ""
 "45.436845,125.862501"
 msgstr ""
 
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:925
 #: ../calendar/gui/e-meeting-list-view.c:192
 #: ../calendar/gui/e-meeting-store.c:168 ../calendar/gui/e-meeting-store.c:178
 #: ../calendar/gui/e-meeting-store.c:808
@@ -6779,7 +6510,7 @@ msgstr ""
 msgid "Yes"
 msgstr "ตกลง"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:925
 #: ../calendar/gui/e-meeting-list-view.c:193
 #: ../calendar/gui/e-meeting-store.c:180
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
@@ -6788,179 +6519,153 @@ msgstr "ไม่ตกลง"
 
 #. This is the default filename used for temporary file creation
 #: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-model.c:330
-#: ../calendar/gui/e-cal-popup.c:106 ../calendar/gui/e-cal-popup.c:121
-#: ../calendar/gui/e-cal-popup.c:165 ../calendar/gui/e-itip-control.c:1148
-#: ../calendar/gui/e-itip-control.c:1289
+#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.c:1292
 #: ../calendar/gui/e-meeting-list-view.c:168
 #: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1283
+#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1244
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1652
 #: ../plugins/plugin-manager/plugin-manager.c:72
-#: ../widgets/misc/e-attachment-bar.c:690
+#: ../widgets/misc/e-attachment-bar.c:659
 #: ../widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "ไม่รู้จัก"
 
-#: ../calendar/gui/e-cal-model.c:922
+#: ../calendar/gui/e-cal-model.c:921
 msgid "Recurring"
 msgstr ""
 
-#: ../calendar/gui/e-cal-model.c:924
+#: ../calendar/gui/e-cal-model.c:923
 msgid "Assigned"
 msgstr ""
 
-#: ../calendar/gui/e-cal-popup.c:171 ../mail/em-popup.c:411
-msgid "Save As..."
-msgstr "บันทึกเป็น..."
-
-#: ../calendar/gui/e-cal-popup.c:187 ../mail/em-format-html-display.c:1812
-msgid "Select folder to save selected attachments..."
-msgstr "เลือกโฟลเดอร์ที่จะบันทึกเอกสารแนบที่เลือก..."
-
-#: ../calendar/gui/e-cal-popup.c:216 ../mail/em-popup.c:436
-#, c-format
-msgid "untitled_image.%s"
-msgstr ""
-
-#: ../calendar/gui/e-cal-popup.c:270 ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:1556 ../calendar/gui/e-memo-table.c:854
-#: ../mail/em-folder-view.c:1045 ../mail/em-popup.c:553 ../mail/em-popup.c:564
-msgid "_Save As..."
-msgstr "_บันทึกเป็น..."
-
-#: ../calendar/gui/e-cal-popup.c:271 ../mail/em-popup.c:554
-#: ../mail/em-popup.c:565
-msgid "Set as _Background"
-msgstr "ตั้งเป็น_พื้นหลัง"
-
-#: ../calendar/gui/e-cal-popup.c:272
-msgid "_Save Selected"
-msgstr "_บันทึกสิ่งที่เลือก"
-
-#: ../calendar/gui/e-cal-popup.c:394 ../mail/em-popup.c:774
-#, c-format
-msgid "Open in %s..."
-msgstr "เปิดใน %s..."
-
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:402
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:403
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:404
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:405
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:406
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:407
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:525
+#: ../calendar/gui/e-calendar-table.c:514
 msgid "Task Table"
 msgstr "โต๊ะงาน"
 
-#: ../calendar/gui/e-calendar-table.c:703
-#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:433
+#: ../calendar/gui/e-calendar-table.c:692
+#: ../calendar/gui/e-calendar-view.c:661
 msgid "Deleting selected objects"
 msgstr "กำลังลบวัตถุที่เลือก"
 
-#: ../calendar/gui/e-calendar-table.c:882
-#: ../calendar/gui/e-calendar-view.c:805 ../calendar/gui/e-memo-table.c:610
+#: ../calendar/gui/e-calendar-table.c:871
+#: ../calendar/gui/e-calendar-view.c:789
 msgid "Updating objects"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-table.c:1032
-#: ../calendar/gui/e-calendar-view.c:1132 ../calendar/gui/e-memo-table.c:742
-#: ../composer/e-msg-composer.c:1341
+#: ../calendar/gui/e-calendar-table.c:1012
+#: ../calendar/gui/e-calendar-view.c:1105 ../composer/e-msg-composer.c:1243
 msgid "Save as..."
 msgstr "บันทึกเป็น..."
 
-#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
+#: ../calendar/gui/e-calendar-table.c:1155
 msgid "Open _Web Page"
 msgstr "เปิด_เว็บเพจ"
 
-#: ../calendar/gui/e-calendar-table.c:1177
-#: ../calendar/gui/e-calendar-view.c:1536
-#: ../calendar/gui/e-calendar-view.c:1557 ../calendar/gui/e-memo-table.c:855
-#: ../mail/em-folder-view.c:1046
+#: ../calendar/gui/e-calendar-table.c:1156
+#: ../calendar/gui/e-calendar-view.c:1529 ../mail/em-folder-view.c:1045
+#: ../mail/em-popup.c:541 ../mail/em-popup.c:552
+msgid "_Save As..."
+msgstr "_บันทึกเป็น..."
+
+#: ../calendar/gui/e-calendar-table.c:1157
+#: ../calendar/gui/e-calendar-view.c:1509
+#: ../calendar/gui/e-calendar-view.c:1530 ../mail/em-folder-view.c:1046
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:120 ../ui/evolution-tasks.xml.h:27
 msgid "_Print..."
 msgstr "_พิมพ์..."
 
-#: ../calendar/gui/e-calendar-table.c:1181
-#: ../calendar/gui/e-calendar-view.c:1561 ../calendar/gui/e-memo-table.c:859
-#: ../ui/evolution-addressbook.xml.h:1 ../ui/evolution-calendar.xml.h:1
-#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-table.c:1161
+#: ../calendar/gui/e-calendar-view.c:1534 ../ui/evolution-addressbook.xml.h:1
+#: ../ui/evolution-calendar.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_ตัด"
 
-#: ../calendar/gui/e-calendar-table.c:1183
-#: ../calendar/gui/e-calendar-view.c:1539
-#: ../calendar/gui/e-calendar-view.c:1563 ../calendar/gui/e-memo-table.c:861
-#: ../ui/evolution-addressbook.xml.h:39 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-composer-entries.xml.h:9 ../ui/evolution-editor.xml.h:22
-#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:1512
+#: ../calendar/gui/e-calendar-view.c:1536 ../ui/evolution-addressbook.xml.h:38
+#: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
+#: ../ui/evolution-tasks.xml.h:26
 msgid "_Paste"
 msgstr "แ_ปะ"
 
-#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1167 ../ui/evolution-tasks.xml.h:20
 msgid "_Assign Task"
 msgstr "_มอบหมายงาน"
 
-#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
-#: ../ui/evolution-tasks.xml.h:26
+#: ../calendar/gui/e-calendar-table.c:1168 ../ui/evolution-tasks.xml.h:24
 msgid "_Forward as iCalendar"
 msgstr "ส่ง_ต่อเป็น iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1189
+#: ../calendar/gui/e-calendar-table.c:1169
 msgid "_Mark as Complete"
 msgstr "_ทำเครื่องหมายว่าเสร็จแล้ว"
 
-#: ../calendar/gui/e-calendar-table.c:1190
+#: ../calendar/gui/e-calendar-table.c:1170
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_ทำเครื่องหมายงานที่เลือกว่าเสร็จแล้ว"
 
-#: ../calendar/gui/e-calendar-table.c:1195
+#. FIXME: need to disable for undeletable folders
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1548 ../mail/em-folder-tree.c:2043
+#: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:33
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
+#: ../ui/evolution-tasks.xml.h:22
+msgid "_Delete"
+msgstr "_ลบ"
+
+#: ../calendar/gui/e-calendar-table.c:1175
 msgid "_Delete Selected Tasks"
 msgstr "ลบ_งานที่เลือก"
 
-#: ../calendar/gui/e-calendar-table.c:1428
+#: ../calendar/gui/e-calendar-table.c:1326
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "คลิกเพื่อเพิ่มงาน"
@@ -6995,78 +6700,73 @@ msgstr "วันเริ่มต้น"
 msgid "Task sort"
 msgstr "ลำดับงาน"
 
-#: ../calendar/gui/e-calendar-view.c:1258
+#: ../calendar/gui/e-calendar-view.c:1231
 msgid "Moving items"
 msgstr "กำลังลบรายการ"
 
-#: ../calendar/gui/e-calendar-view.c:1260
+#: ../calendar/gui/e-calendar-view.c:1233
 msgid "Copying items"
 msgstr "กำลังคัดลอกรายการ"
 
-#: ../calendar/gui/e-calendar-view.c:1530
+#: ../calendar/gui/e-calendar-view.c:1503
 msgid "New _Appointment..."
 msgstr "การนัดหมายใ_หม่"
 
-#: ../calendar/gui/e-calendar-view.c:1531
+#: ../calendar/gui/e-calendar-view.c:1504
 msgid "New All Day _Event"
 msgstr "เหตุการณ์ทั้งวันใหม่"
 
-#: ../calendar/gui/e-calendar-view.c:1532
-msgid "New _Meeting"
-msgstr "การประชุมใ_หม่"
-
-#: ../calendar/gui/e-calendar-view.c:1533
-msgid "New _Task"
-msgstr "งานใ_หม่"
+#: ../calendar/gui/e-calendar-view.c:1506
+msgid "New Task"
+msgstr "งานใหม่"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1543
-#: ../widgets/menus/gal-view-menus.c:291
-msgid "_Current View"
-msgstr "_มุมมองปัจจุบัน"
+#: ../calendar/gui/e-calendar-view.c:1516
+msgid "Current View"
+msgstr "มุมมองปัจจุบัน"
 
-#: ../calendar/gui/e-calendar-view.c:1545
-msgid "Select T_oday"
+#: ../calendar/gui/e-calendar-view.c:1518 ../ui/evolution-calendar.xml.h:26
+msgid "Select _Today"
 msgstr "เลือก_วันนี้"
 
-#: ../calendar/gui/e-calendar-view.c:1546
+#: ../calendar/gui/e-calendar-view.c:1519
 msgid "_Select Date..."
 msgstr "เ_ลือกวัน..."
 
 #. TODO: Why is this in a context menu when it applies globally?
-#: ../calendar/gui/e-calendar-view.c:1551 ../ui/evolution-calendar.xml.h:45
+#: ../calendar/gui/e-calendar-view.c:1524 ../ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_ประกาศข้อมูลการว่าง/ไม่ว่าง"
 
-#: ../calendar/gui/e-calendar-view.c:1567
+#: ../calendar/gui/e-calendar-view.c:1540
 msgid "Cop_y to Calendar..."
 msgstr "_คัดลอกไปยังปฏิทิน..."
 
-#: ../calendar/gui/e-calendar-view.c:1568
+#: ../calendar/gui/e-calendar-view.c:1541
 msgid "Mo_ve to Calendar..."
 msgstr "_ย้ายไปยังปฏิทิน..."
 
-#: ../calendar/gui/e-calendar-view.c:1569
+#: ../calendar/gui/e-calendar-view.c:1542
 msgid "_Delegate Meeting..."
 msgstr "มอบหมายประชุมแ_ทน..."
 
-#: ../calendar/gui/e-calendar-view.c:1570
+#: ../calendar/gui/e-calendar-view.c:1543
 msgid "_Schedule Meeting..."
 msgstr "_จัดเวลาประชุม..."
 
-#: ../calendar/gui/e-calendar-view.c:1571
+#: ../calendar/gui/e-calendar-view.c:1544
 msgid "_Forward as iCalendar..."
 msgstr "ส่ง_ต่อเป็น iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1576
+#: ../calendar/gui/e-calendar-view.c:1549
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:1577
+#: ../calendar/gui/e-calendar-view.c:1550
 msgid "Delete this _Occurrence"
 msgstr "_ลบเหตุการณ์นี้"
 
-#: ../calendar/gui/e-calendar-view.c:1578
+#: ../calendar/gui/e-calendar-view.c:1551
 msgid "Delete _All Occurrences"
 msgstr "ลบ_ทุกเหตุการณ์"
 
@@ -7113,7 +6813,7 @@ msgstr "ความละเอียด %02i นาที"
 #. order but don't change the specifiers or add
 #. anything.
 #: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1493
-#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1526
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1517
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -7129,393 +6829,393 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:760
+#: ../calendar/gui/e-itip-control.c:763
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:771
+#: ../calendar/gui/e-itip-control.c:774
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "ทุกวัน"
 msgstr[1] "ทุก %d วัน"
 
-#: ../calendar/gui/e-itip-control.c:776
+#: ../calendar/gui/e-itip-control.c:779
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "ทุกสัปดาห์"
 msgstr[1] "ทุก %d สัปดาห์"
 
-#: ../calendar/gui/e-itip-control.c:778
+#: ../calendar/gui/e-itip-control.c:781
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "ทุกสัปดาห์ในวัน"
 msgstr[1] "ทุก %d สัปดาห์ในวัน"
 
-#: ../calendar/gui/e-itip-control.c:786
+#: ../calendar/gui/e-itip-control.c:789
 msgid " and "
 msgstr "และ"
 
-#: ../calendar/gui/e-itip-control.c:793
+#: ../calendar/gui/e-itip-control.c:796
 #, c-format
 msgid "The %s day of "
 msgstr "วัน %s ของ"
 
-#: ../calendar/gui/e-itip-control.c:806
+#: ../calendar/gui/e-itip-control.c:809
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s ของ"
 
-#: ../calendar/gui/e-itip-control.c:813
+#: ../calendar/gui/e-itip-control.c:816
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "ทุกเดือน"
 msgstr[1] "ทุก %d เดือน"
 
-#: ../calendar/gui/e-itip-control.c:817
+#: ../calendar/gui/e-itip-control.c:820
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "ทุกปี"
 msgstr[1] "ทุก %d ปี"
 
-#: ../calendar/gui/e-itip-control.c:828
+#: ../calendar/gui/e-itip-control.c:831
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
-msgstr[0] "ทั้งหมด %d ครั้ง"
-msgstr[1] "ทั้งหมด %d ครั้ง"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../calendar/gui/e-itip-control.c:837
+#: ../calendar/gui/e-itip-control.c:840
 msgid ", ending on "
-msgstr "สิ้นสุด "
+msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:861
+#: ../calendar/gui/e-itip-control.c:864
 msgid "Starts"
 msgstr "เริ่ม"
 
-#: ../calendar/gui/e-itip-control.c:874
+#: ../calendar/gui/e-itip-control.c:877
 msgid "Ends"
 msgstr "สิ้นสุด"
 
-#: ../calendar/gui/e-itip-control.c:908
+#: ../calendar/gui/e-itip-control.c:911
 #: ../plugins/save-calendar/csv-format.c:395
 msgid "Due"
 msgstr "ถึงกำหนด"
 
-#: ../calendar/gui/e-itip-control.c:948 ../calendar/gui/e-itip-control.c:1005
+#: ../calendar/gui/e-itip-control.c:951 ../calendar/gui/e-itip-control.c:1008
 msgid "iCalendar Information"
 msgstr "ข้อมูล iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:965
+#: ../calendar/gui/e-itip-control.c:968
 msgid "iCalendar Error"
 msgstr "ข้อผิดพลาด iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1037 ../calendar/gui/e-itip-control.c:1053
-#: ../calendar/gui/e-itip-control.c:1064 ../calendar/gui/e-itip-control.c:1081
-#: ../plugins/itip-formatter/itip-view.c:337
+#: ../calendar/gui/e-itip-control.c:1040 ../calendar/gui/e-itip-control.c:1056
+#: ../calendar/gui/e-itip-control.c:1067 ../calendar/gui/e-itip-control.c:1084
 #: ../plugins/itip-formatter/itip-view.c:338
-#: ../plugins/itip-formatter/itip-view.c:405
+#: ../plugins/itip-formatter/itip-view.c:339
 #: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:407
 msgid "An unknown person"
 msgstr "บุคคลที่ไม่รู้จัก"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1088
+#: ../calendar/gui/e-itip-control.c:1091
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr "<br> กรุณาดูข้อมูลข้างล่างนี้ แล้วเลือกปฏิบัติการจากเมนูข้างล่าง "
 
-#: ../calendar/gui/e-itip-control.c:1136
+#: ../calendar/gui/e-itip-control.c:1139
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:546
+#: ../calendar/gui/itip-utils.c:548
 #: ../plugins/itip-formatter/itip-formatter.c:1640
 msgid "Accepted"
 msgstr "ตอบรับแล้ว"
 
-#: ../calendar/gui/e-itip-control.c:1140 ../calendar/gui/itip-utils.c:549
+#: ../calendar/gui/e-itip-control.c:1143 ../calendar/gui/itip-utils.c:551
 #: ../plugins/itip-formatter/itip-formatter.c:1643
 msgid "Tentatively Accepted"
 msgstr "อาจตอบรับ"
 
-#: ../calendar/gui/e-itip-control.c:1144
+#: ../calendar/gui/e-itip-control.c:1147
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/itip-utils.c:552 ../calendar/gui/itip-utils.c:581
+#: ../calendar/gui/itip-utils.c:554 ../calendar/gui/itip-utils.c:583
 #: ../plugins/itip-formatter/itip-formatter.c:1646
 msgid "Declined"
 msgstr "ปฏิเสธ"
 
-#: ../calendar/gui/e-itip-control.c:1228
+#: ../calendar/gui/e-itip-control.c:1231
 msgid ""
 "The meeting has been cancelled, however it could not be found in your "
 "calendars"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1230
+#: ../calendar/gui/e-itip-control.c:1233
 msgid ""
 "The task has been cancelled, however it could not be found in your task lists"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1309
+#: ../calendar/gui/e-itip-control.c:1312
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1310
+#: ../calendar/gui/e-itip-control.c:1313
 msgid "Meeting Information"
 msgstr "ข้อมูลการประชุม"
 
-#: ../calendar/gui/e-itip-control.c:1316
+#: ../calendar/gui/e-itip-control.c:1319
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1318
+#: ../calendar/gui/e-itip-control.c:1321
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1319
+#: ../calendar/gui/e-itip-control.c:1322
 msgid "Meeting Proposal"
 msgstr "เค้าโครงการประชุม"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1325
+#: ../calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1326
+#: ../calendar/gui/e-itip-control.c:1329
 msgid "Meeting Update"
 msgstr "ปรับปรุงข้อมูลการประชุม"
 
-#: ../calendar/gui/e-itip-control.c:1330
+#: ../calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ต้องการรับข้อมูลการประชุมล่าสุด"
 
-#: ../calendar/gui/e-itip-control.c:1331
+#: ../calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update Request"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-itip-control.c:1341
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1339
+#: ../calendar/gui/e-itip-control.c:1342
 msgid "Meeting Reply"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1346
+#: ../calendar/gui/e-itip-control.c:1349
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> ได้ยกเลิกการประชุม"
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1350
 msgid "Meeting Cancellation"
 msgstr "การยกเลิกการประชุม"
 
-#: ../calendar/gui/e-itip-control.c:1357 ../calendar/gui/e-itip-control.c:1434
-#: ../calendar/gui/e-itip-control.c:1474
+#: ../calendar/gui/e-itip-control.c:1360 ../calendar/gui/e-itip-control.c:1437
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1361
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1388
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1389
 msgid "Task Information"
 msgstr "ข้อมูลงาน"
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1396
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1398
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> ต้องการให้คุณทำงาน"
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1399
 msgid "Task Proposal"
 msgstr "ข้อเสนองาน"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1402
+#: ../calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> ต้องการเพิ่มงานที่มีอยู่"
 
-#: ../calendar/gui/e-itip-control.c:1403
+#: ../calendar/gui/e-itip-control.c:1406
 msgid "Task Update"
 msgstr "ปรับปรุงงาน"
 
-#: ../calendar/gui/e-itip-control.c:1407
+#: ../calendar/gui/e-itip-control.c:1410
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ต้องการรับข้อมูลงานล่าสุด"
 
-#: ../calendar/gui/e-itip-control.c:1408
+#: ../calendar/gui/e-itip-control.c:1411
 msgid "Task Update Request"
 msgstr "ต้องการข้อมูลปรับปรุงของงาน"
 
-#: ../calendar/gui/e-itip-control.c:1415
+#: ../calendar/gui/e-itip-control.c:1418
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> ได้ตอบกลับไปยังการมอบหมายงาน"
 
-#: ../calendar/gui/e-itip-control.c:1416
+#: ../calendar/gui/e-itip-control.c:1419
 msgid "Task Reply"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1426
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> ได้ยกเลิกงาน"
 
-#: ../calendar/gui/e-itip-control.c:1424
+#: ../calendar/gui/e-itip-control.c:1427
 msgid "Task Cancellation"
 msgstr "การยกเลิกงาน"
 
-#: ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1438
 msgid "Bad Task Message"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1459
+#: ../calendar/gui/e-itip-control.c:1462
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Free/Busy Information"
 msgstr "ข้อมูล ว่าง/ไม่ว่าง"
 
-#: ../calendar/gui/e-itip-control.c:1464
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> ต้องการข้อมูล ว่าง/ไม่ว่าง ของคุณ"
 
-#: ../calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Free/Busy Request"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1469
+#: ../calendar/gui/e-itip-control.c:1472
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1473
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1475
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1550
+#: ../calendar/gui/e-itip-control.c:1553
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1609
+#: ../calendar/gui/e-itip-control.c:1612
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1642
+#: ../calendar/gui/e-itip-control.c:1645
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1674
+#: ../calendar/gui/e-itip-control.c:1677
 msgid "The attachment has no viewable calendar items"
 msgstr "เอกสารแนบไม่มีรายการปฏิทินที่สามารถดูได้"
 
-#: ../calendar/gui/e-itip-control.c:1908
+#: ../calendar/gui/e-itip-control.c:1911
 msgid "Update complete\n"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1936
+#: ../calendar/gui/e-itip-control.c:1939
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1946
+#: ../calendar/gui/e-itip-control.c:1949
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1958
+#: ../calendar/gui/e-itip-control.c:1961
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1975
+#: ../calendar/gui/e-itip-control.c:1978
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1978
+#: ../calendar/gui/e-itip-control.c:1981
 #: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2008
+#: ../calendar/gui/e-itip-control.c:2011
 msgid "Removal Complete"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2031 ../calendar/gui/e-itip-control.c:2079
+#: ../calendar/gui/e-itip-control.c:2034 ../calendar/gui/e-itip-control.c:2082
 msgid "Item sent!\n"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2033 ../calendar/gui/e-itip-control.c:2083
+#: ../calendar/gui/e-itip-control.c:2036 ../calendar/gui/e-itip-control.c:2086
 msgid "The item could not be sent!\n"
 msgstr "ไม่สามารถส่งรายการ\n"
 
-#: ../calendar/gui/e-itip-control.c:2163
+#: ../calendar/gui/e-itip-control.c:2166
 msgid "Choose an action:"
 msgstr "เลือกปฏิบัติการ:"
 
-#: ../calendar/gui/e-itip-control.c:2234
+#: ../calendar/gui/e-itip-control.c:2237
 msgid "Update"
 msgstr "ปรับปรุง"
 
-#: ../calendar/gui/e-itip-control.c:2262
+#: ../calendar/gui/e-itip-control.c:2265
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "ยอมรับ"
 
-#: ../calendar/gui/e-itip-control.c:2263
+#: ../calendar/gui/e-itip-control.c:2266
 msgid "Tentatively accept"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2264
+#: ../calendar/gui/e-itip-control.c:2267
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "ปฏิเสธ"
 
-#: ../calendar/gui/e-itip-control.c:2293
+#: ../calendar/gui/e-itip-control.c:2296
 msgid "Send Free/Busy Information"
 msgstr "ส่งข้อมูล ว่าง/ไม่ว่าง"
 
-#: ../calendar/gui/e-itip-control.c:2321
+#: ../calendar/gui/e-itip-control.c:2324
 msgid "Update respondent status"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2349
+#: ../calendar/gui/e-itip-control.c:2352
 msgid "Send Latest Information"
 msgstr "ส่งข้อมูลล่าสุด"
 
-#: ../calendar/gui/e-itip-control.c:2377 ../calendar/gui/itip-utils.c:569
+#: ../calendar/gui/e-itip-control.c:2380 ../calendar/gui/itip-utils.c:571
 #: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
@@ -7627,22 +7327,17 @@ msgstr "ต้องดำเนินการ"
 
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Tentative"
 msgstr "ไม่แน่"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
 #: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/itip-utils.c:555
+#: ../calendar/gui/itip-utils.c:557
 #: ../plugins/itip-formatter/itip-formatter.c:1649
 msgid "Delegated"
 msgstr "ส่งผู้แทนเข้าประชุม"
 
-#. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:361
-msgid "Attendee                          "
-msgstr ""
-
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
 msgid "In Process"
 msgstr ""
@@ -7650,7 +7345,7 @@ 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:444
-#: ../calendar/gui/e-meeting-time-sel.c:2105
+#: ../calendar/gui/e-meeting-time-sel.c:2102
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Ey"
 
@@ -7661,7 +7356,7 @@ msgstr "%A %d %B %Ey"
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
 #: ../calendar/gui/e-meeting-time-sel-item.c:448
-#: ../calendar/gui/e-meeting-time-sel.c:2138 ../e-util/e-time-utils.c:203
+#: ../calendar/gui/e-meeting-time-sel.c:2135 ../e-util/e-time-utils.c:203
 #: ../e-util/e-time-utils.c:296 ../e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Ey"
@@ -7673,92 +7368,68 @@ msgstr "%a %d/%m/%Ey"
 #. This is a strftime() format for a short date. %m = month,
 #. %d = day of month, %Y = year (all digits).
 #: ../calendar/gui/e-meeting-time-sel-item.c:452 ../e-util/e-time-utils.c:238
-#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1736
+#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1682
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Ey"
 
-#: ../calendar/gui/e-meeting-time-sel.c:416 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "ไม่อยู่ที่ทำงาน"
 
-#: ../calendar/gui/e-meeting-time-sel.c:417
+#: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "No Information"
 msgstr "ไม่มีข้อมูล"
 
-#: ../calendar/gui/e-meeting-time-sel.c:431
-msgid "Con_tacts..."
-msgstr "ที่อยู่_ติดต่อ..."
-
-#: ../calendar/gui/e-meeting-time-sel.c:448
+#: ../calendar/gui/e-meeting-time-sel.c:445
 msgid "O_ptions"
 msgstr "_ตัวเลือก"
 
-#: ../calendar/gui/e-meeting-time-sel.c:465
+#: ../calendar/gui/e-meeting-time-sel.c:462
 msgid "Show _only working hours"
 msgstr "แสดง_ชั่วโมงทำการเท่านั้น"
 
-#: ../calendar/gui/e-meeting-time-sel.c:475
+#: ../calendar/gui/e-meeting-time-sel.c:472
 msgid "Show _zoomed out"
 msgstr "แสดงภาพขยาย_ออก"
 
-#: ../calendar/gui/e-meeting-time-sel.c:490
+#: ../calendar/gui/e-meeting-time-sel.c:487
 msgid "_Update free/busy"
 msgstr "_ปรับปรุงข้อมูล ว่าง/ไม่ว่าง "
 
-#: ../calendar/gui/e-meeting-time-sel.c:505
+#: ../calendar/gui/e-meeting-time-sel.c:502
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:523
+#: ../calendar/gui/e-meeting-time-sel.c:520
 msgid "_Autopick"
 msgstr "เลือก_อัตโนมัติ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:538
+#: ../calendar/gui/e-meeting-time-sel.c:535
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:555
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "_All people and resources"
 msgstr "_ทุกคน ทุกทรัพยากร"
 
-#: ../calendar/gui/e-meeting-time-sel.c:564
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "All _people and one resource"
 msgstr "ทุก_คน และทรัพยากรชิ้นใดชิ้นหนึ่ง"
 
-#: ../calendar/gui/e-meeting-time-sel.c:573
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "_Required people"
 msgstr "ผู้เข้าประชุมห_ลัก"
 
-#: ../calendar/gui/e-meeting-time-sel.c:582
+#: ../calendar/gui/e-meeting-time-sel.c:579
 msgid "Required people and _one resource"
 msgstr "ผู้เข้าประชุมหลัก และ_ทรัพยากรชิ้นใดชิ้นหนึ่ง"
 
-#: ../calendar/gui/e-meeting-time-sel.c:618
-msgid "_Start time:"
-msgstr "เวลาเ_ริ่มต้น:"
-
-#: ../calendar/gui/e-meeting-time-sel.c:645
-msgid "_End time:"
-msgstr "เวลา_สิ้นสุด:"
-
-#: ../calendar/gui/e-memo-table.c:274
-msgid "Memo Table"
-msgstr "ตารางบันทึกข้อความ"
-
-#: ../calendar/gui/e-memo-table.c:870
-msgid "_Delete Selected Memos"
-msgstr "ลบบันทึก_ข้อความที่เลือก"
-
-#: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
-msgid "Click to add a memo"
-msgstr "คลิกเพื่อเพิ่มบันทึกข้อความ"
-
-#: ../calendar/gui/e-memo-table.etspec.h:3
-msgid "Memo sort"
-msgstr "การเรียงบันทึกข้อความ"
+#: ../calendar/gui/e-pub-utils.c:300
+#, c-format
+msgid "Enter the password for %s"
+msgstr "ใส่รหัสผ่านสำหรับ %s"
 
-#: ../calendar/gui/e-memos.c:728 ../calendar/gui/e-tasks.c:823
-#: ../calendar/gui/gnome-cal.c:2565
+#: ../calendar/gui/e-tasks.c:798 ../calendar/gui/gnome-cal.c:2532
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7767,38 +7438,24 @@ msgstr ""
 "เกิดข้อผิดพลาดที่ %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:776
-msgid "Loading memos"
-msgstr "กำลังโหลดบันทึกข้อความ"
-
-#: ../calendar/gui/e-memos.c:861
-#, c-format
-msgid "Opening memos at %s"
-msgstr "กำลังเปิดบันทึกข้อความที่ %s"
-
-#: ../calendar/gui/e-memos.c:1034 ../calendar/gui/e-tasks.c:1226
-msgid "Deleting selected objects..."
-msgstr "กำลังลบสิ่งที่เลือก..."
-
-#: ../calendar/gui/e-pub-utils.c:322
-#, c-format
-msgid "Enter the password for %s"
-msgstr "ใส่รหัสผ่านสำหรับ %s"
-
-#: ../calendar/gui/e-tasks.c:871
+#: ../calendar/gui/e-tasks.c:846
 msgid "Loading tasks"
 msgstr "กำลังโหลดงาน"
 
-#: ../calendar/gui/e-tasks.c:958
+#: ../calendar/gui/e-tasks.c:930
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "กำลังเปิดงานที่ %s"
 
-#: ../calendar/gui/e-tasks.c:1203
+#: ../calendar/gui/e-tasks.c:1126
 msgid "Completing tasks..."
 msgstr ""
 
-#: ../calendar/gui/e-tasks.c:1253
+#: ../calendar/gui/e-tasks.c:1149
+msgid "Deleting selected objects..."
+msgstr "กำลังลบสิ่งที่เลือก..."
+
+#: ../calendar/gui/e-tasks.c:1176
 msgid "Expunging"
 msgstr "กำลังเก็บกวาด"
 
@@ -7809,42 +7466,45 @@ 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:329 ../calendar/gui/print.c:1510
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1501
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:792
+#: ../calendar/gui/gnome-cal.c:789
 msgid "Updating query"
 msgstr ""
 
-#: ../calendar/gui/gnome-cal.c:2240
-msgid "_Custom View"
-msgstr "มุมมอง_กำหนดเอง"
+#. bonobo displays this string so it must be in locale
+#: ../calendar/gui/gnome-cal.c:2209 ../widgets/menus/gal-view-instance.c:585
+#: ../widgets/menus/gal-view-menus.c:350
+msgid "Custom View"
+msgstr "มุมมองกำหนดเอง"
 
-#: ../calendar/gui/gnome-cal.c:2241
-msgid "_Save Custom View"
-msgstr "_บันทึกมุมมองที่กำหนดเอง"
+#: ../calendar/gui/gnome-cal.c:2210 ../widgets/menus/gal-view-instance.c:586
+msgid "Save Custom View"
+msgstr "บันทึกมุมมองที่กำหนดเอง"
 
-#: ../calendar/gui/gnome-cal.c:2246
-msgid "_Define Views..."
-msgstr "_กำหนดมุมมอง..."
+#: ../calendar/gui/gnome-cal.c:2215 ../widgets/menus/gal-view-instance.c:590
+#: ../widgets/menus/gal-view-menus.c:372
+msgid "Define Views..."
+msgstr "กำหนดมุมมอง..."
 
-#: ../calendar/gui/gnome-cal.c:2408
+#: ../calendar/gui/gnome-cal.c:2378
 #, c-format
 msgid "Loading appointments at %s"
 msgstr ""
 
-#: ../calendar/gui/gnome-cal.c:2427
+#: ../calendar/gui/gnome-cal.c:2397
 #, c-format
 msgid "Loading tasks at %s"
 msgstr ""
 
-#: ../calendar/gui/gnome-cal.c:2531
+#: ../calendar/gui/gnome-cal.c:2498
 #, c-format
 msgid "Opening %s"
 msgstr "กำลังเปิด %s"
 
-#: ../calendar/gui/gnome-cal.c:3449
+#: ../calendar/gui/gnome-cal.c:3388
 msgid "Purging"
 msgstr ""
 
@@ -7904,137 +7564,60 @@ msgstr "กันยายน"
 msgid "_Select Today"
 msgstr "เลือก_วันนี้"
 
-#: ../calendar/gui/itip-utils.c:351 ../calendar/gui/itip-utils.c:400
-#: ../calendar/gui/itip-utils.c:440
+#: ../calendar/gui/itip-utils.c:353 ../calendar/gui/itip-utils.c:402
+#: ../calendar/gui/itip-utils.c:442
 msgid "An organizer must be set."
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:387
+#: ../calendar/gui/itip-utils.c:389
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:508 ../calendar/gui/itip-utils.c:630
+#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:632
 msgid "Event information"
 msgstr "ข้อมูลเหตุการณ์"
 
-#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:632
+#: ../calendar/gui/itip-utils.c:512 ../calendar/gui/itip-utils.c:634
 msgid "Task information"
 msgstr "ข้อมูลงาน"
 
-#: ../calendar/gui/itip-utils.c:512 ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:514 ../calendar/gui/itip-utils.c:636
 msgid "Journal information"
 msgstr "ข้อมูลบันทึก"
 
-#: ../calendar/gui/itip-utils.c:514 ../calendar/gui/itip-utils.c:652
+#: ../calendar/gui/itip-utils.c:516 ../calendar/gui/itip-utils.c:654
 msgid "Free/Busy information"
 msgstr "ข้อมูล ว่าง/ไม่ว่าง"
 
-#: ../calendar/gui/itip-utils.c:516
+#: ../calendar/gui/itip-utils.c:518
 msgid "Calendar information"
 msgstr "ข้อมูลปฏิทิน"
 
-#: ../calendar/gui/itip-utils.c:565
+#: ../calendar/gui/itip-utils.c:567
 msgid "Updated"
 msgstr "ปรับปรุง"
 
-#: ../calendar/gui/itip-utils.c:573
+#: ../calendar/gui/itip-utils.c:575
 msgid "Refresh"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:577
+#: ../calendar/gui/itip-utils.c:579
 msgid "Counter-proposal"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:648
+#: ../calendar/gui/itip-utils.c:650
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "ข้อมูล ว่าง/ไม่ว่าง (%s ไปยัง %s)"
 
-#: ../calendar/gui/itip-utils.c:658
+#: ../calendar/gui/itip-utils.c:660
 msgid "iCalendar information"
 msgstr "ข้อมูล iCalendar"
 
-#: ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:815
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: ../calendar/gui/memos-component.c:449 ../ui/evolution-addressbook.xml.h:3
-#: ../ui/evolution-mail-message.xml.h:12 ../ui/evolution-memos.xml.h:2
-#: ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "คัดลอก"
-
-#: ../calendar/gui/memos-component.c:450 ../mail/em-filter-i18n.h:11
-#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:26 ../ui/evolution-memos.xml.h:6
-#: ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "ลบ"
-
-#: ../calendar/gui/memos-component.c:451
-msgid "Properties..."
-msgstr "คุณสมบัติ..."
-
-#: ../calendar/gui/memos-component.c:524
-#, c-format
-msgid "%d memo"
-msgid_plural "%d memos"
-msgstr[0] "บันทึกข้อความ %d รายการ"
-msgstr[1] "บันทึกข้อความ %d รายการ"
-
-#: ../calendar/gui/memos-component.c:526 ../calendar/gui/tasks-component.c:517
-#: ../mail/mail-component.c:548
-#, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] " เลือกอยู่ %d รายการ"
-msgstr[1] " เลือกอยู่ %d รายการ"
-
-#: ../calendar/gui/memos-component.c:573
-msgid "Failed upgrading memos."
-msgstr "การปรับปรุงรุ่นบันทึกข้อความล้มเหลว"
-
-#: ../calendar/gui/memos-component.c:869
-#, c-format
-msgid "Unable to open the memo list '%s' for creating events and meetings"
-msgstr "ไม่สามารถเปิดรายการบันทึกข้อความ '%s' สำหรับการสร้างเหตุการณ์และการประชุม"
-
-#: ../calendar/gui/memos-component.c:882
-msgid "There is no calendar available for creating memos"
-msgstr "ไม่มีปฏิทินที่ใช้ได้สำหรับการสร้างบันทึกข้อความ"
-
-#: ../calendar/gui/memos-component.c:973
-msgid "Memo Source Selector"
-msgstr ""
-
-#: ../calendar/gui/memos-component.c:1156
-msgid "New memo"
-msgstr "บันทึกข้อความใหม่"
-
-#: ../calendar/gui/memos-component.c:1157
-msgid "_Memo"
-msgstr "บันทึก_ข้อความ"
-
-#: ../calendar/gui/memos-component.c:1158
-msgid "Create a new memo"
-msgstr "สร้างบันทึกข้อความใหม่"
-
-#: ../calendar/gui/memos-component.c:1164
-msgid "New memo list"
-msgstr "รายการบันทึกข้อความใหม่"
-
-#: ../calendar/gui/memos-component.c:1165
-msgid "Memo l_ist"
-msgstr "_รายการบันทึกข้อความ"
-
-#: ../calendar/gui/memos-component.c:1166
-msgid "Create a new memo list"
-msgstr "สร้างรายการบันทึกข้อความใหม่"
-
-#: ../calendar/gui/memos-control.c:340
-msgid "Print Memos"
-msgstr "พิมพ์บันทึกข้อความ"
-
 #: ../calendar/gui/migration.c:151
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
@@ -8042,9 +7625,6 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"ตำแหน่งและโครงสร้างของโฟลเดอร์งานของ Evolution มีการเปลี่ยนแปลงจากรุ่น 1.x\n"
-"\n"
-"กรุณาอดใจรอ ขณะที่ Evolution ถ่ายโอนโฟลเดอร์ของคุณ..."
 
 #: ../calendar/gui/migration.c:155
 msgid ""
@@ -8053,9 +7633,6 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"ตำแหน่งและโครงสร้างของโฟลเดอร์ปฏิทินของ Evolution มีการเปลี่ยนแปลงจากรุ่น 1.x\n"
-"\n"
-"กรุณาอดใจรอ ขณะที่ Evolution ถ่ายโอนโฟลเดอร์ของคุณ..."
 
 #. FIXME: set proper domain/code
 #: ../calendar/gui/migration.c:748 ../calendar/gui/migration.c:915
@@ -8227,97 +7804,89 @@ msgid "Sa"
 msgstr "ส."
 
 #. Day
-#: ../calendar/gui/print.c:1926
+#: ../calendar/gui/print.c:1917
 msgid "Selected day (%a %b %d %Y)"
 msgstr "วันที่เลือก (%a %d %b %Ey)"
 
-#: ../calendar/gui/print.c:1951 ../calendar/gui/print.c:1955
+#: ../calendar/gui/print.c:1942 ../calendar/gui/print.c:1946
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: ../calendar/gui/print.c:1952
+#: ../calendar/gui/print.c:1943
 msgid "%a %d %Y"
 msgstr "%a %d %Ey"
 
-#: ../calendar/gui/print.c:1956 ../calendar/gui/print.c:1958
-#: ../calendar/gui/print.c:1959
+#: ../calendar/gui/print.c:1947 ../calendar/gui/print.c:1949
+#: ../calendar/gui/print.c:1950
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Ey"
 
-#: ../calendar/gui/print.c:1963
+#: ../calendar/gui/print.c:1954
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "อาทิตย์ที่เลือก (%s - %s)"
 
 #. Month
-#: ../calendar/gui/print.c:1971
+#: ../calendar/gui/print.c:1962
 msgid "Selected month (%b %Y)"
 msgstr "เดือนที่เลือก (%b %Ey)"
 
 #. Year
-#: ../calendar/gui/print.c:1978
+#: ../calendar/gui/print.c:1969
 msgid "Selected year (%Y)"
 msgstr "ปีที่เลือก (%Ey)"
 
-#: ../calendar/gui/print.c:2307
-msgid "Appointment"
-msgstr "การนัดหมาย"
-
-#: ../calendar/gui/print.c:2309
-msgid "Task"
-msgstr "งาน"
-
-#: ../calendar/gui/print.c:2331
+#: ../calendar/gui/print.c:2320
 #, c-format
 msgid "Summary: %s"
 msgstr "สรุป: %s"
 
-#: ../calendar/gui/print.c:2339
+#: ../calendar/gui/print.c:2328
 #, c-format
 msgid "Location: %s"
 msgstr ""
 
-#: ../calendar/gui/print.c:2382
+#: ../calendar/gui/print.c:2371
 #, c-format
 msgid "Status: %s"
 msgstr "สถานะ: %s"
 
-#: ../calendar/gui/print.c:2399
+#: ../calendar/gui/print.c:2388
 #, c-format
 msgid "Priority: %s"
 msgstr "ระดับความสำคัญ: %s"
 
-#: ../calendar/gui/print.c:2411
+#: ../calendar/gui/print.c:2400
 #, c-format
 msgid "Percent Complete: %i"
 msgstr ""
 
-#: ../calendar/gui/print.c:2423
+#: ../calendar/gui/print.c:2412
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2437
+#: ../calendar/gui/print.c:2426
 #, c-format
 msgid "Categories: %s"
 msgstr "หมวด: %s"
 
-#: ../calendar/gui/print.c:2448
+#: ../calendar/gui/print.c:2437
 msgid "Contacts: "
 msgstr "ที่อยู่ติดต่อ:"
 
-#: ../calendar/gui/print.c:2588 ../calendar/gui/print.c:2676
-#: ../calendar/gui/print.c:2802 ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2577 ../calendar/gui/print.c:2665
+#: ../calendar/gui/print.c:2791 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "ตัวอย่างก่อนพิมพ์"
 
-#: ../calendar/gui/print.c:2623
+#: ../calendar/gui/print.c:2612
 msgid "Print Item"
 msgstr "รายการพิมพ์"
 
 #: ../calendar/gui/tasks-component.c:439
-msgid "_New Task List"
-msgstr "รายการงานใ_หม่"
+msgid "New Task List"
+msgstr "รายการงานใหม่"
 
 #: ../calendar/gui/tasks-component.c:515
 #, c-format
@@ -8326,56 +7895,67 @@ msgid_plural "%d tasks"
 msgstr[0] "%d งาน"
 msgstr[1] "%d งาน"
 
+#: ../calendar/gui/tasks-component.c:517 ../mail/mail-component.c:548
+#, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "%d เลือกอยู่"
+msgstr[1] "%d เลือกอยู่"
+
 #: ../calendar/gui/tasks-component.c:564
 msgid "Failed upgrading tasks."
 msgstr ""
 
-#: ../calendar/gui/tasks-component.c:875
+#: ../calendar/gui/tasks-component.c:872
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "ไม่สามารถเปิดรายการงาน '%s' สำหรับการสร้างเหตุการณ์และการประชุม"
 
-#: ../calendar/gui/tasks-component.c:888
+#: ../calendar/gui/tasks-component.c:887
 msgid "There is no calendar available for creating tasks"
-msgstr "ไม่มีปฏิทินที่ใช้ได้สำหรับการสร้างงาน"
+msgstr "ไม่ใีปฏิทินที่ใช้ได้สำหรับการสร้างงาน"
 
-#: ../calendar/gui/tasks-component.c:988
+#: ../calendar/gui/tasks-component.c:981
 msgid "Task Source Selector"
 msgstr ""
 
-#: ../calendar/gui/tasks-component.c:1171
+#: ../calendar/gui/tasks-component.c:1164
 msgid "New task"
 msgstr "งานใหม่"
 
-#: ../calendar/gui/tasks-component.c:1173
+#: ../calendar/gui/tasks-component.c:1165
+msgid "_Task"
+msgstr "_งาน"
+
+#: ../calendar/gui/tasks-component.c:1166
 msgid "Create a new task"
 msgstr "สร้างงานใหม่"
 
-#: ../calendar/gui/tasks-component.c:1179
+#: ../calendar/gui/tasks-component.c:1172
 msgid "New assigned task"
 msgstr "งานที่ได้รับมอบหมายใหม่"
 
-#: ../calendar/gui/tasks-component.c:1180
+#: ../calendar/gui/tasks-component.c:1173
 msgid "Assigne_d Task"
 msgstr "งานที่ได้รับ_มอบหมาย"
 
-#: ../calendar/gui/tasks-component.c:1181
+#: ../calendar/gui/tasks-component.c:1174
 msgid "Create a new assigned task"
 msgstr "สร้างงานที่ได้รับมอบหมายใหม่"
 
-#: ../calendar/gui/tasks-component.c:1187
+#: ../calendar/gui/tasks-component.c:1180
 msgid "New task list"
 msgstr "รายการงานใหม่"
 
-#: ../calendar/gui/tasks-component.c:1188
+#: ../calendar/gui/tasks-component.c:1181
 msgid "Task l_ist"
 msgstr "รายการงาน"
 
-#: ../calendar/gui/tasks-component.c:1189
+#: ../calendar/gui/tasks-component.c:1182
 msgid "Create a new task list"
 msgstr "สร้างรายการงานใหม่"
 
-#: ../calendar/gui/tasks-control.c:435
+#: ../calendar/gui/tasks-control.c:419
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8387,11 +7967,11 @@ msgstr ""
 "\n"
 "คุณต้องการลบงานทั้งหมดนี้จริงๆ หรือไม่?"
 
-#: ../calendar/gui/tasks-control.c:438
+#: ../calendar/gui/tasks-control.c:422
 msgid "Do not ask me again."
 msgstr "ไม่ต้องถามอีกครั้ง"
 
-#: ../calendar/gui/tasks-control.c:472
+#: ../calendar/gui/tasks-control.c:457
 msgid "Print Tasks"
 msgstr "พิมพ์งาน"
 
@@ -10049,58 +9629,58 @@ msgstr "ประกาศที่:"
 msgid "A_ttach"
 msgstr "แ_นบ"
 
-#: ../composer/e-msg-composer.c:832
+#: ../composer/e-msg-composer.c:738
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:839
+#: ../composer/e-msg-composer.c:745
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:1322 ../composer/e-msg-composer.c:1356
+#: ../composer/e-msg-composer.c:1224 ../composer/e-msg-composer.c:1257
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "ไม่ทราบสาเหตุ"
 
-#: ../composer/e-msg-composer.c:1394
+#: ../composer/e-msg-composer.c:1294
 msgid "Could not open file"
 msgstr "ไม่สามารถเปิดแฟ้ม"
 
-#: ../composer/e-msg-composer.c:1402
+#: ../composer/e-msg-composer.c:1302
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:1677
+#: ../composer/e-msg-composer.c:1572
 msgid "Untitled Message"
 msgstr "จดหมายไม่มีชื่อเรื่อง"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1712
+#: ../composer/e-msg-composer.c:1606
 msgid "Open File"
 msgstr "เปิดแฟ้ม"
 
-#: ../composer/e-msg-composer.c:2126 ../mail/em-account-editor.c:588
+#: ../composer/e-msg-composer.c:2006 ../mail/em-account-editor.c:588
 #: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:700
 msgid "Autogenerated"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:2229
+#: ../composer/e-msg-composer.c:2105
 msgid "Si_gnature:"
 msgstr "ลายเ_ซ็น:"
 
-#: ../composer/e-msg-composer.c:2472 ../composer/e-msg-composer.c:3673
-#: ../composer/e-msg-composer.c:3676
+#: ../composer/e-msg-composer.c:2347 ../composer/e-msg-composer.c:3527
+#: ../composer/e-msg-composer.c:3528
 msgid "Compose a message"
 msgstr "เขียนจดหมาย"
 
-#: ../composer/e-msg-composer.c:3791
+#: ../composer/e-msg-composer.c:3643
 msgid "_Attachment Bar"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:4881
+#: ../composer/e-msg-composer.c:4718
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10127,7 +9707,7 @@ msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:17
 msgid "Because &quot;{1}&quot;."
 msgstr "เพราะว่า &quot;{1}&quot;."
 
@@ -10229,6 +9809,10 @@ msgstr "คุณไม่สามารถแนบแฟ้ม `{0}' ไป�
 msgid "You need to configure an account before you can compose mail."
 msgstr "คุณจะต้องกำหนดค่าบัญชีผู้ใช้ก่อนที่คุณจะสามารถเขียนเมลได้"
 
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Discard Changes"
+msgstr "ไ_ม่สนใจการเปลี่ยนแปลง"
+
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Save Message"
 msgstr "_บันทึกข้อความ"
@@ -10292,7 +9876,7 @@ msgstr "ไม่ต้องเปลี่ยนสถานะ"
 
 #: ../designs/OOA/ooa.glade.h:12
 msgid "Out of Office Assistant"
-msgstr "ผู้ช่วยจัดการสถานะไม่อยู่ที่ทำงาน"
+msgstr ""
 
 #: ../designs/OOA/ooa.glade.h:13
 msgid "Yes, Change Status"
@@ -10317,42 +9901,38 @@ msgid ""
 "sent is read, and to specify what Evolution should do when someone requests "
 "a receipt from you.</small>"
 msgstr ""
-"<small>หน้านี้เปิดโอกาสให้คุณเลือกว่าคุณต้องการจะรับการแจ้งผ่านการแจ้งรับ"
-"เมื่อข้อความที่คุณส่งถูกเปิดอ่านหรือไม่\n"
-"และเปิดให้คุณระบุสิ่งที่ Evolution ควรจะทำเมื่อมีผู้ร้องขอการแจ้งกลับจากคุณ</small>"
 
 #: ../designs/read_receipts/read.glade.h:6
 msgid "Always send back a read receipt"
-msgstr "ส่งการแจ้งรับข้อความเสมอ"
+msgstr ""
 
 #: ../designs/read_receipts/read.glade.h:7
 msgid "Ask me if I want to send back a read receipt"
-msgstr "ถามก่อนส่งการแจ้งรับข้อความ"
+msgstr ""
 
 #: ../designs/read_receipts/read.glade.h:8
 msgid "Never send back a read receipt"
-msgstr "ไม่ส่งการแจ้งรับข้อความ"
+msgstr ""
 
 #: ../designs/read_receipts/read.glade.h:9
 msgid "Read Receipts"
-msgstr "การแจ้งรับข้อความ"
+msgstr ""
 
 #: ../designs/read_receipts/read.glade.h:10
 msgid "Request a read receipt for all messages I send"
-msgstr "ร้องขอการแจ้งรับสำหรับทุกข้อความที่ส่ง"
+msgstr ""
 
 #: ../designs/read_receipts/read.glade.h:11
 msgid "Unless the message is sent to a mailing list, and not to me personally"
-msgstr "ถ้าข้อความไม่ได้ส่งไปที่เมลลิงลิสต์และไม่ได้ส่งตรงถึงฉัน"
+msgstr ""
 
 #: ../designs/read_receipts/read.glade.h:12
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
 msgstr ""
-"เมื่อคุณได้รับอีเมลที่ร้องขอการแจ้งรับ Evolution ควรทำอย่างไร?"
 
-#: ../e-util/e-dialog-utils.c:281
+#: ../e-util/e-dialog-utils.c:267
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10360,7 +9940,7 @@ msgstr ""
 "แฟ้มชื่อนั้นมีอยู่แล้ว\n"
 "ต้องการเขียนทับหรือไม่?"
 
-#: ../e-util/e-dialog-utils.c:283 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:269 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "เขียนทับหรือไม่?"
 
@@ -10403,7 +9983,7 @@ msgstr "คุณต้องการเขียนทับมันใช่
 msgid "File exists &quot;{0}&quot;."
 msgstr ""
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:128
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:122
 msgid "_Overwrite"
 msgstr "เ_ขียนทับ"
 
@@ -10487,7 +10067,7 @@ msgstr "%H:%M:%S"
 #. without seconds.
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: ../e-util/e-time-utils.c:348 ../e-util/e-time-utils.c:435
-#: ../widgets/misc/e-dateedit.c:1447 ../widgets/misc/e-dateedit.c:1774
+#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1720
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -10496,7 +10076,7 @@ msgstr "%I:%M %p"
 #. without seconds.
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: ../e-util/e-time-utils.c:352 ../e-util/e-time-utils.c:427
-#: ../widgets/misc/e-dateedit.c:1444 ../widgets/misc/e-dateedit.c:1771
+#: ../widgets/misc/e-dateedit.c:1435 ../widgets/misc/e-dateedit.c:1717
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -10507,7 +10087,7 @@ msgstr ""
 
 #: ../e-util/eggtrayicon.c:119
 msgid "The orientation of the tray."
-msgstr "แนววางของถาด"
+msgstr ""
 
 #: ../filter/filter-datespec.c:78
 #, c-format
@@ -10638,11 +10218,11 @@ msgid "Include threads"
 msgstr "รวมกระทู้"
 
 #: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:330
+#: ../mail/em-utils.c:291
 msgid "Incoming"
 msgstr "เข้า"
 
-#: ../filter/filter-rule.c:978 ../mail/em-utils.c:331
+#: ../filter/filter-rule.c:978 ../mail/em-utils.c:292
 msgid "Outgoing"
 msgstr "ออก"
 
@@ -10666,7 +10246,7 @@ msgstr "ไม่มีวันที่"
 msgid "Missing file name."
 msgstr "ไม่มีชื่อแฟ้ม"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:67
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:65
 msgid "Missing name."
 msgstr "ไม่มีชื่อ"
 
@@ -10684,7 +10264,7 @@ msgstr "คุณต้องเลือกวันที่"
 
 #: ../filter/filter.error.xml.h:10
 msgid "You must name this filter."
-msgstr "คุณต้องตั้งชื่อตัวกรองนี้"
+msgstr ""
 
 #: ../filter/filter.error.xml.h:11
 msgid "You must specify a file name."
@@ -10696,7 +10276,7 @@ msgstr "<b>_กฎการกรอง</b>"
 
 #: ../filter/filter.glade.h:2
 msgid "Compare against"
-msgstr "เปรียบเทียบกับ"
+msgstr ""
 
 #: ../filter/filter.glade.h:4
 msgid "Show filters for mail:"
@@ -10707,37 +10287,35 @@ msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
 msgstr ""
-"เวลาของข้อความจะถูกเปรียบเทียบกับเวลา\n"
-"0.00 น. ของวันที่ระบุ"
 
 #: ../filter/filter.glade.h:7
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
 msgstr ""
-"เวลาของข้อความจะถูกเปรียบเทียบกับเวลา\n"
-"ที่นับเทียบกับเวลาที่การกรองเกิดขึ้น"
 
 #: ../filter/filter.glade.h:9
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
 msgstr ""
-"เวลาของข้อความจะถูกเปรียบเทียบกับเวลา\n"
-"ปัจจุบันขณะที่การกรองเกิดขึ้น"
 
 #: ../filter/filter.glade.h:12
 msgid "a time relative to the current time"
-msgstr "เวลานับเทียบกับเวลาปัจจุบัน"
+msgstr ""
 
 #: ../filter/filter.glade.h:13
 msgid "ago"
-msgstr "ก่อน"
+msgstr ""
 
 #: ../filter/filter.glade.h:17
 msgid "months"
 msgstr "เดือน"
 
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:177
+msgid "seconds"
+msgstr "วินาที"
+
 #: ../filter/filter.glade.h:19
 msgid "the current time"
 msgstr "เวลาปัจจุบัน"
@@ -10844,7 +10422,7 @@ msgstr ""
 "และทำเครื่องหมายที่กล่องกาเครื่องหมายเพื่อแสดงการยอมรับ\n"
 
 #: ../mail/em-account-editor.c:464 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:495
+#: ../mail/em-vfolder-rule.c:494
 msgid "Select Folder"
 msgstr "เลือกโฟลเดอร์"
 
@@ -10868,30 +10446,30 @@ msgstr "_ตรวจเมลใหม่อัตโนมัติทุก �
 msgid "Sending Email"
 msgstr "กำลังส่งอีเมล"
 
-#: ../mail/em-account-editor.c:2165 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2162 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr ""
 
 #. Security settings
-#: ../mail/em-account-editor.c:2226 ../mail/mail-config.glade.h:122
+#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:122
 #: ../plugins/exchange-operations/exchange-account-setup.c:313
 msgid "Security"
 msgstr ""
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2263 ../mail/em-account-editor.c:2337
+#: ../mail/em-account-editor.c:2260 ../mail/em-account-editor.c:2334
 msgid "Receiving Options"
 msgstr "ตัวเลือกการรับเมล"
 
-#: ../mail/em-account-editor.c:2264 ../mail/em-account-editor.c:2338
+#: ../mail/em-account-editor.c:2261 ../mail/em-account-editor.c:2335
 msgid "Checking for New Mail"
 msgstr "การตรวจสอบเมลใหม่"
 
-#: ../mail/em-account-editor.c:2662 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2659 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr ""
 
-#: ../mail/em-account-editor.c:2662 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2659 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "ตัวช่วยตั้งค่าบัญชี Evolution"
 
@@ -10912,41 +10490,39 @@ msgstr "โพรโทคอล"
 msgid "Mail Accounts Table"
 msgstr ""
 
-#: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
+#: ../mail/em-composer-prefs.c:307 ../mail/em-composer-prefs.c:430
 #: ../mail/mail-config.c:958
 msgid "Unnamed"
 msgstr ""
 
-#: ../mail/em-composer-prefs.c:936
+#: ../mail/em-composer-prefs.c:897
 msgid "Language(s)"
 msgstr "ภาษา"
 
-#: ../mail/em-composer-prefs.c:979
+#: ../mail/em-composer-prefs.c:940
 msgid "Add signature script"
 msgstr "เพิ่มสคริปต์สำหรับลายเซ็น"
 
-#: ../mail/em-composer-prefs.c:999
+#: ../mail/em-composer-prefs.c:960
 msgid "Signature(s)"
-msgstr "ลายเซ็น"
+msgstr ""
 
-#: ../mail/em-composer-utils.c:862 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:853 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
-msgstr "-------- ข้อความส่งต่อ --------"
+msgstr ""
 
-#: ../mail/em-composer-utils.c:1657
+#: ../mail/em-composer-utils.c:1648
 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:1704
+#: ../mail/em-composer-utils.c:1695
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 msgstr ""
-"เมื่อ ${AbbrevWeekdayName} ${Year}-${Month}-${Day} เวลา ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} เขียนว่า:"
 
 #: ../mail/em-filter-editor.c:147
 msgid "_Filter Rules"
@@ -10965,7 +10541,7 @@ msgstr "แต้มสี"
 msgid "Assign Score"
 msgstr "ให้คะแนน"
 
-#: ../mail/em-filter-i18n.h:5 ../ui/evolution-editor.xml.h:1
+#: ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "เอกสารแนบ"
 
@@ -11078,7 +10654,7 @@ msgid "is not Flagged"
 msgstr "ไม่ได้ปักธงไว้"
 
 #: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
-#: ../ui/evolution-mail-message.xml.h:49
+#: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "ขยะ"
 
@@ -11274,84 +10850,79 @@ msgstr "จดหมายออก"
 msgid "Sent"
 msgstr "ส่งแล้ว"
 
-#: ../mail/em-folder-tree-model.c:499 ../mail/em-folder-tree-model.c:803
+#: ../mail/em-folder-tree-model.c:498 ../mail/em-folder-tree-model.c:802
 msgid "Loading..."
-msgstr "กำลังโหลด..."
+msgstr ""
 
-#: ../mail/em-folder-tree.c:694
+#: ../mail/em-folder-tree.c:689
 msgid "Mail Folder Tree"
-msgstr "ลำดับชั้นโฟลเดอร์เมล"
+msgstr ""
 
-#: ../mail/em-folder-tree.c:854
+#: ../mail/em-folder-tree.c:849
 #, c-format
 msgid "Moving folder %s"
-msgstr "กำลังย้ายโฟลเดอร์ %s"
+msgstr ""
 
-#: ../mail/em-folder-tree.c:856
+#: ../mail/em-folder-tree.c:851
 #, c-format
 msgid "Copying folder %s"
-msgstr "กำลังคัดลอกโฟลเดอร์ %s"
+msgstr ""
 
-#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1623
+#: ../mail/em-folder-tree.c:858 ../mail/message-list.c:1613
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "กำลังย้ายข้อความไปยังโฟลเดอร์ %s"
 
-#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1625
+#: ../mail/em-folder-tree.c:860 ../mail/message-list.c:1615
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "กำลังคัดลอกข้อความไปยังโฟลเดอร์ %s"
 
-#: ../mail/em-folder-tree.c:881
+#: ../mail/em-folder-tree.c:876
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-tree.c:972 ../ui/evolution-mail-message.xml.h:104
 msgid "_Copy to Folder"
 msgstr "_คัดลอกไปยังโฟลเดอร์"
 
-#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:117
+#: ../mail/em-folder-tree.c:973 ../ui/evolution-mail-message.xml.h:114
 msgid "_Move to Folder"
 msgstr "_ย้ายไปยังโฟลเดอร์"
 
-#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1057
+#: ../mail/em-folder-tree.c:1678 ../mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "กำลังตรวจโฟลเดอร์ต่างๆ ใน \"%s\""
 
-#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:44
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
+#: ../mail/em-folder-tree.c:2031 ../ui/evolution-addressbook.xml.h:44
+#: ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:48
 msgid "_View"
 msgstr "_มุมมอง"
 
-#: ../mail/em-folder-tree.c:2043
+#: ../mail/em-folder-tree.c:2032
 msgid "Open in _New Window"
 msgstr "เ_ปิดในหน้าต่างใหม่"
 
-#: ../mail/em-folder-tree.c:2047
+#: ../mail/em-folder-tree.c:2036
 msgid "_Copy..."
 msgstr "_คัดลอก..."
 
-#: ../mail/em-folder-tree.c:2048
+#: ../mail/em-folder-tree.c:2037
 msgid "_Move..."
 msgstr "_ย้าย..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2052
+#: ../mail/em-folder-tree.c:2041
 msgid "_New Folder..."
 msgstr "โ_ฟลเดอร์ใหม่..."
 
-#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:30
+#: ../mail/em-folder-tree.c:2044 ../ui/evolution-mail-list.xml.h:30
 msgid "_Rename..."
 msgstr "เปลี่ยน_ชื่อ..."
 
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:125
-msgid "_Empty Trash"
-msgstr "เ_ทขยะ"
-
 #: ../mail/em-folder-utils.c:104
 #, c-format
 msgid "Copying `%s' to `%s'"
@@ -11388,30 +10959,30 @@ msgstr "กำลังสร้างโฟลเดอร์ `%s'"
 
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:384
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "สร้างโฟลเดอร์"
 
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:384
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "ระบุที่ที่จะสร้างโฟลเดอร์"
 
-#: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:558 ../mail/em-popup.c:569
+#: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:546 ../mail/em-popup.c:557
 msgid "Reply to _All"
 msgstr "ตอบกลับ_ทั้งหมด"
 
-#: ../mail/em-folder-view.c:1040 ../ui/evolution-mail-message.xml.h:126
+#: ../mail/em-folder-view.c:1040 ../ui/evolution-mail-message.xml.h:122
 msgid "_Reply to Sender"
 msgstr "_ตอบกลับผู้ส่ง"
 
-#: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:560 ../mail/em-popup.c:571
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:548 ../mail/em-popup.c:559
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Forward"
 msgstr "ส่ง_ต่อ"
 
-#: ../mail/em-folder-view.c:1044 ../ui/evolution-mail-message.xml.h:108
+#: ../mail/em-folder-view.c:1044 ../ui/evolution-mail-message.xml.h:106
 msgid "_Edit as New Message..."
 msgstr "แ_ก้ไขเป็นข้อความใหม่..."
 
@@ -11419,11 +10990,11 @@ msgstr "แ_ก้ไขเป็นข้อความใหม่..."
 msgid "U_ndelete"
 msgstr "ไ_ม่ลบ"
 
-#: ../mail/em-folder-view.c:1051 ../ui/evolution-addressbook.xml.h:37
+#: ../mail/em-folder-view.c:1051 ../ui/evolution-addressbook.xml.h:36
 msgid "_Move to Folder..."
 msgstr "_ย้ายไปยังโฟลเดอร์..."
 
-#: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:33
+#: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_คัดลอกไปยังโฟลเดอร์..."
 
@@ -11500,200 +11071,194 @@ msgid "Filter on _Mailing List"
 msgstr "กรองที่เ_มลลิงลิสต์"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1922 ../mail/em-folder-view.c:1966
+#: ../mail/em-folder-view.c:1921 ../mail/em-folder-view.c:1965
 msgid "Default"
 msgstr "ปริยาย"
 
-#: ../mail/em-folder-view.c:2065
+#: ../mail/em-folder-view.c:2064
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "พิมพ์ข้อความ"
 
-#: ../mail/em-folder-view.c:2221
+#: ../mail/em-folder-view.c:2220
 msgid "Unable to retrieve message"
 msgstr "ดึงข้อความไม่สำเร็จ"
 
-#: ../mail/em-folder-view.c:2414
+#: ../mail/em-folder-view.c:2413
 msgid "_Copy Link Location"
 msgstr "คัด_ลอกที่อยู่ลิงก์"
 
-#: ../mail/em-folder-view.c:2416
+#: ../mail/em-folder-view.c:2415
 msgid "Create _Search Folder"
 msgstr "สร้างโฟลเดอร์_ค้นหา"
 
-#: ../mail/em-folder-view.c:2417
+#: ../mail/em-folder-view.c:2416
 msgid "_From this Address"
 msgstr "_จากที่อยู่นี้"
 
-#: ../mail/em-folder-view.c:2418
+#: ../mail/em-folder-view.c:2417
 msgid "_To this Address"
 msgstr "ไ_ปที่อยู่นี้"
 
-#: ../mail/em-folder-view.c:2699
+#: ../mail/em-folder-view.c:2698
 #, c-format
 msgid "Click to mail %s"
 msgstr "คลิกเพื่อส่งเมลไปยัง %s"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:461
+#: ../mail/em-format-html-display.c:445
 #, c-format
 msgid "Matches: %d"
 msgstr "หาพบ: %d"
 
-#: ../mail/em-format-html-display.c:712 ../mail/em-format-html.c:597
+#: ../mail/em-format-html-display.c:696 ../mail/em-format-html.c:597
 msgid "Unsigned"
-msgstr "ไม่มีลายเซ็นกำกับ"
+msgstr ""
 
-#: ../mail/em-format-html-display.c:712
+#: ../mail/em-format-html-display.c:696
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
-"ข้อความนี้ไม่มีลายเซ็นกำกับ ไม่มีอะไรประกันได้เลยว่าข้อความนี้เป็นมาจากผู้ส่งจริง"
 
-#: ../mail/em-format-html-display.c:713 ../mail/em-format-html.c:598
+#: ../mail/em-format-html-display.c:697 ../mail/em-format-html.c:598
 msgid "Valid signature"
-msgstr "ลายเซ็นถูกต้อง"
+msgstr ""
 
-#: ../mail/em-format-html-display.c:713
+#: ../mail/em-format-html-display.c:697
 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:714 ../mail/em-format-html.c:599
+#: ../mail/em-format-html-display.c:698 ../mail/em-format-html.c:599
 msgid "Invalid signature"
-msgstr "ลายเซ็นไม่ถูกต้อง"
+msgstr ""
 
-#: ../mail/em-format-html-display.c:714
+#: ../mail/em-format-html-display.c:698
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
-"ลายเซ็นกำกับข้อความนี้ตรวจสอบแล้วไม่ผ่าน เป็นไปได้ว่าข้อความอาจถูกแก้ไขระหว่างทาง"
 
-#: ../mail/em-format-html-display.c:715
+#: ../mail/em-format-html-display.c:699
 msgid "Valid signature, cannot verify sender"
-msgstr "ลายเซ็นถูกต้อง แต่ไม่สามารถตรวจสอบผู้ส่ง"
+msgstr ""
 
-#: ../mail/em-format-html-display.c:715
+#: ../mail/em-format-html-display.c:699
 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:721 ../mail/em-format-html.c:606
+#: ../mail/em-format-html-display.c:705 ../mail/em-format-html.c:606
 msgid "Unencrypted"
-msgstr "ไม่ได้เข้ารหัส"
+msgstr ""
 
-#: ../mail/em-format-html-display.c:721
+#: ../mail/em-format-html-display.c:705
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
-"ข้อความนี้ไม่ได้เข้ารหัส เนื้อหาอาจถูกดักอ่านระหว่างทางในอินเทอร์เน็ตได้"
 
-#: ../mail/em-format-html-display.c:722 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:706 ../mail/em-format-html.c:607
 msgid "Encrypted, weak"
-msgstr "เข้ารหัสแบบอ่อน"
+msgstr ""
 
-#: ../mail/em-format-html-display.c:722
+#: ../mail/em-format-html-display.c:706
 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:723 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:707 ../mail/em-format-html.c:608
 msgid "Encrypted"
-msgstr "เข้ารหัส"
+msgstr ""
 
-#: ../mail/em-format-html-display.c:723
+#: ../mail/em-format-html-display.c:707
 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:724 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:708 ../mail/em-format-html.c:609
 msgid "Encrypted, strong"
-msgstr "เข้ารหัสแบบแน่นหนา"
+msgstr ""
 
-#: ../mail/em-format-html-display.c:724
+#: ../mail/em-format-html-display.c:708
 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:825 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:809 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
-msgstr "_ดูใบรับรอง"
+msgstr ""
 
-#: ../mail/em-format-html-display.c:840
+#: ../mail/em-format-html-display.c:824
 msgid "This certificate is not viewable"
-msgstr "ใบรับรองนี้เปิดดูไม่ได้"
+msgstr ""
 
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1106
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "เสร็จเมื่อ %d %B %Ey, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1130
+#: ../mail/em-format-html-display.c:1114
 msgid "Overdue:"
 msgstr "เลยกำหนด:"
 
-#: ../mail/em-format-html-display.c:1133
+#: ../mail/em-format-html-display.c:1117
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "เมื่อ %d %B %Ey, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1193
+#: ../mail/em-format-html-display.c:1177
 msgid "_View Inline"
 msgstr "แ_สดงในบรรทัด"
 
-#: ../mail/em-format-html-display.c:1194
+#: ../mail/em-format-html-display.c:1178
 msgid "_Hide"
 msgstr "_ซ่อน"
 
-#: ../mail/em-format-html-display.c:1195
+#: ../mail/em-format-html-display.c:1179
 msgid "_Fit to Width"
-msgstr "_พอดีความกว้าง"
+msgstr ""
 
-#: ../mail/em-format-html-display.c:1196
+#: ../mail/em-format-html-display.c:1180
 msgid "Show _Original Size"
-msgstr "แสดงขนาด_จริง"
+msgstr ""
 
-#: ../mail/em-format-html-display.c:1566
+#: ../mail/em-format-html-display.c:1550
 msgid "Attachment Button"
-msgstr "ปุ่มเอกสารแนบ"
+msgstr ""
 
-#: ../mail/em-format-html-display.c:1773
+#: ../mail/em-format-html-display.c:1757
 msgid "Select folder to save all attachments..."
 msgstr "เลือกโฟลเดอร์ที่จะบันทึกเอกสารแนบทั้งหมด..."
 
-#: ../mail/em-format-html-display.c:1820
+#: ../mail/em-format-html-display.c:1796
+msgid "Select folder to save selected attachments..."
+msgstr "เลือกโฟลเดอร์ที่จะบันทึกเอกสารแนบที่เลือก..."
+
+#: ../mail/em-format-html-display.c:1804
 msgid "Save Selected..."
 msgstr "บันทึกรายการที่เลือก..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1887
+#: ../mail/em-format-html-display.c:1871
 #, c-format
 msgid "%d attachment"
 msgid_plural "%d attachments"
 msgstr[0] "เอกสารแนบ %d ฉบับ"
 msgstr[1] "เอกสารแนบ %d ฉบับ"
 
-#: ../mail/em-format-html-display.c:1951
+#: ../mail/em-format-html-display.c:1935
 msgid "No Attachment"
 msgstr "ไม่มีเอกสารแนบ"
 
-#: ../mail/em-format-html-display.c:1954
+#: ../mail/em-format-html-display.c:1938
 msgid "Save All"
 msgstr "บันทึกทั้งหมด"
 
@@ -11709,7 +11274,7 @@ msgstr "กำลังดึง `%s'"
 
 #: ../mail/em-format-html.c:600
 msgid "Valid signature but cannot verify sender"
-msgstr "ลายเซ็นถูกต้องแต่ไม่สามารถตรวจสอบผู้ส่ง"
+msgstr ""
 
 #: ../mail/em-format-html.c:870
 msgid "Malformed external-body part."
@@ -11773,7 +11338,7 @@ msgstr "สำเนาลับถึง"
 
 #. pseudo-header
 #: ../mail/em-format-html.c:1576 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:992
+#: ../mail/em-mailer-prefs.c:987
 msgid "Mailer"
 msgstr "โปรแกรมส่งเมล"
 
@@ -11801,31 +11366,31 @@ msgstr "กลุ่มข่าว"
 #: ../mail/em-format.c:1102
 #, c-format
 msgid "%s attachment"
-msgstr "เอกสารแนบ %s"
+msgstr ""
 
 #: ../mail/em-format.c:1141 ../mail/em-format.c:1288 ../mail/em-format.c:1575
 msgid "Could not parse S/MIME message: Unknown error"
-msgstr "ไม่สามารถแจงข้อความ S/MIME: ข้อผิดพลาดไม่ทราบสาเหตุ"
+msgstr ""
 
 #: ../mail/em-format.c:1270 ../mail/em-format.c:1426
 msgid "Could not parse MIME message. Displaying as source."
-msgstr "ไม่สามารถแจงข้อความ MIME จะแสดงข้อความต้นฉบับ"
+msgstr ""
 
 #: ../mail/em-format.c:1278
 msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "ชนิดการเข้ารหัสที่ไม่สนับสนุนสำหรับ multipart/encrypted"
+msgstr ""
 
 #: ../mail/em-format.c:1445
 msgid "Unsupported signature format"
-msgstr "รูปแบบลายเซ็นที่ไม่สนับสนุน"
+msgstr ""
 
 #: ../mail/em-format.c:1453 ../mail/em-format.c:1517
 msgid "Error verifying signature"
-msgstr "เกิดข้อผิดพลาดขณะตรวจสอบลายเซ็น"
+msgstr ""
 
 #: ../mail/em-format.c:1453 ../mail/em-format.c:1517
 msgid "Unknown error verifying signature"
-msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุขณะตรวจสอบลายเซ็น"
+msgstr ""
 
 #: ../mail/em-mailer-prefs.c:101
 msgid "Every time"
@@ -11850,9 +11415,6 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"ตำแหน่งและโครงสร้างของโฟลเดอร์กล่องเมลของ Evolution มีการเปลี่ยนแปลงจากรุ่น 1.x\n"
-"\n"
-"กรุณาอดใจรอ ขณะที่ Evolution ถ่ายโอนโฟลเดอร์ของคุณ..."
 
 #: ../mail/em-migrate.c:1632
 #, c-format
@@ -11867,62 +11429,78 @@ msgstr "ไม่สามารถคัดลอกโฟลเดอร์ `%
 #: ../mail/em-migrate.c:1843
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "ไม่สามารถตรวจหากล่องเมลที่มีอยู่ที่ `%s': %s"
+msgstr ""
 
 #: ../mail/em-migrate.c:2047
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "ไม่สามารถเปิดข้อมูล POP เก่า `%s' ชนิดเก็บไว้ที่เซิร์ฟเวอร์: %s"
+msgstr ""
 
 #: ../mail/em-migrate.c:2061
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "ไม่สามารถสร้างไดเรกทอรีข้อมูล POP3 `%s' ชนิดเก็บไว้ที่เซิร์ฟเวอร์: %s"
+msgstr ""
 
 #: ../mail/em-migrate.c:2090
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "ไม่สามารถคัดลอกข้อมูล POP3 `%s' ชนิดเก็บไว้ที่เซิร์ฟเวอร์: %s"
+msgstr ""
 
 #: ../mail/em-migrate.c:2561 ../mail/em-migrate.c:2573
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
-msgstr "ไม่สามารถสร้างที่เก็บเมลท้องถิ่น `%s': %s"
+msgstr ""
 
 #: ../mail/em-migrate.c:2693
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
-msgstr "ไม่สามารถสร้างโฟลเดอร์เมลท้องถิ่น `%s': %s"
+msgstr ""
 
 #: ../mail/em-migrate.c:2711
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
-"ไม่สามารถอ่านค่าตั้งจากการติดตั้งครั้งก่อนของ Evolution "
-"ไม่มีแฟ้ม `evolution/config.xmldb' หรือแฟ้มเสียหาย"
 
-#: ../mail/em-popup.c:556 ../mail/em-popup.c:567
+#: ../mail/em-popup.c:399
+msgid "Save As..."
+msgstr "บันทึกเป็น..."
+
+#: ../mail/em-popup.c:424
+#, c-format
+msgid "untitled_image.%s"
+msgstr ""
+
+#: ../mail/em-popup.c:542 ../mail/em-popup.c:553
+msgid "Set as _Background"
+msgstr "ตั้งเป็น_พื้นหลัง"
+
+#: ../mail/em-popup.c:544 ../mail/em-popup.c:555
 msgid "_Reply to sender"
 msgstr "_ตอบไปยังผู้ส่ง"
 
-#: ../mail/em-popup.c:557 ../mail/em-popup.c:568
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../mail/em-popup.c:545 ../mail/em-popup.c:556
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Reply to _List"
 msgstr "ตอบกลับเข้า_ลิสต์"
 
-#: ../mail/em-popup.c:619
+#: ../mail/em-popup.c:607
 msgid "_Open Link in Browser"
 msgstr "เปิดลิงก์ในเ_บราว์เซอร์"
 
-#: ../mail/em-popup.c:620
+#: ../mail/em-popup.c:608
 msgid "_Send New Message To..."
 msgstr "ส่งข้อความใ_หม่ไปถึง..."
 
-#: ../mail/em-popup.c:621
+#: ../mail/em-popup.c:609
 msgid "_Add to Addressbook"
 msgstr "เ_พิ่มในสมุดที่อยู่"
 
+#: ../mail/em-popup.c:762
+#, c-format
+msgid "Open in %s..."
+msgstr "เปิดใน %s..."
+
 #: ../mail/em-subscribe-editor.c:614
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
@@ -11938,34 +11516,34 @@ msgstr "โฟลเดอร์"
 #. FIXME: This is just to get the shadow, is there a better way?
 #: ../mail/em-subscribe-editor.c:862
 msgid "Please select a server."
-msgstr "กรุณาเลือกเซิร์ฟเวอร์"
+msgstr "โปรดเลือกเซิร์ฟเวอร์"
 
 #: ../mail/em-subscribe-editor.c:883
 msgid "No server has been selected"
 msgstr "ไม่ได้เลือกเซิร์ฟเวอร์"
 
-#: ../mail/em-utils.c:106
+#: ../mail/em-utils.c:105
 msgid "Don't show this message again."
 msgstr "ไม่ต้องแสดงข้อความนี้อีกครั้ง"
 
-#: ../mail/em-utils.c:338
+#: ../mail/em-utils.c:299
 msgid "Filters"
 msgstr "ตัวกรองข้อความ"
 
-#: ../mail/em-utils.c:481 ../mail/em-utils.c:518
+#: ../mail/em-utils.c:442 ../mail/em-utils.c:479
 msgid "message"
 msgstr "ข้อความ"
 
-#: ../mail/em-utils.c:653
+#: ../mail/em-utils.c:614
 msgid "Save Message..."
 msgstr "บันทึกข้อความ..."
 
-#: ../mail/em-utils.c:702
+#: ../mail/em-utils.c:663
 msgid "Add address"
 msgstr "เพิ่มที่อยู่"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1181
+#: ../mail/em-utils.c:1142
 #, c-format
 msgid "Messages from %s"
 msgstr "ข้อความจาก %s"
@@ -11974,7 +11552,7 @@ msgstr "ข้อความจาก %s"
 msgid "Search _Folders"
 msgstr "โ_ฟลเดอร์ค้นหา"
 
-#: ../mail/em-vfolder-rule.c:575
+#: ../mail/em-vfolder-rule.c:574
 msgid "Search Folder source"
 msgstr "แหล่งสำหรับโฟลเดอร์ค้นหา"
 
@@ -12281,6 +11859,14 @@ msgstr ""
 msgid "Show deleted messages in the message-list"
 msgstr ""
 
+#: ../mail/evolution-mail.schemas.in.in.h:73
+msgid "Show the \"Preview\" pane"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:74
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
 #: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "แฟ้มเสียงที่จะเล่นเมื่อมีเมลเข้ามาใหม่"
@@ -12708,11 +12294,11 @@ msgstr "<span weight=\"bold\">การแจ้งเหตุ</span>"
 
 #: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication Type</span>"
-msgstr "<span weight=\"bold\">ชนิดของการยืนยันตัวบุคคล</span>"
+msgstr "<span weight=\"bold\">ชนิดของการยืนยันตัวตน</span>"
 
 #: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
-msgstr "<span weight=\"bold\">การยืนยันตัวบุคคล</span>"
+msgstr "<span weight=\"bold\">การยืนยันตัวตน</span>"
 
 #: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
@@ -13131,7 +12717,7 @@ msgstr "โ_ฟลเดอร์ข้อความออก:"
 
 #: ../mail/mail-config.glade.h:131
 msgid "Ser_ver requires authentication"
-msgstr "เซิร์ฟเวอร์ต้องการการ_ยืนยันตัวบุคคล"
+msgstr "เซิร์ฟเวอร์ต้องการการ_ยืนยันตัวตน"
 
 #: ../mail/mail-config.glade.h:132
 msgid "Server _Type: "
@@ -13613,7 +13199,6 @@ msgid "Checking for new mail"
 msgstr "กำลังตรวจสอบเมลใหม่"
 
 #: ../mail/mail-session.c:207
-#: ../plugins/exchange-operations/exchange-config-listener.c:601
 #, c-format
 msgid "Enter Password for %s"
 msgstr "ป้อนรหัสผ่านสำหรับ %s"
@@ -13626,20 +13211,20 @@ msgstr "ป้อนรหัสผ่าน"
 msgid "User canceled operation."
 msgstr "ผู้ใช้ยกเลิกปฏิบัติการ"
 
-#: ../mail/mail-signature-editor.c:381
+#: ../mail/mail-signature-editor.c:372
 msgid "Edit signature"
 msgstr "แก้ไขลายเซ็น"
 
-#: ../mail/mail-signature-editor.c:423
+#: ../mail/mail-signature-editor.c:412
 msgid "Enter a name for this signature."
-msgstr "กรุณาป้อนชื่อสำหรับลายเซ็นนี้"
+msgstr "ใส่ชื่อสำหรับลายเซ็นนี้"
 
-#: ../mail/mail-signature-editor.c:426
+#: ../mail/mail-signature-editor.c:415
 #: ../plugins/groupwise-features/properties.glade.h:5
 msgid "Name:"
 msgstr "ชื่อ:"
 
-#: ../mail/mail-tools.c:115
+#: ../mail/mail-tools.c:116
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr ""
@@ -13649,16 +13234,16 @@ msgstr ""
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr ""
 
-#: ../mail/mail-tools.c:249
+#: ../mail/mail-tools.c:242
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: ../mail/mail-tools.c:251
+#: ../mail/mail-tools.c:244
 msgid "Forwarded message"
 msgstr ""
 
-#: ../mail/mail-tools.c:291
+#: ../mail/mail-tools.c:284
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr ""
@@ -13706,148 +13291,138 @@ msgstr ""
 msgid ""
 "A read receipt notification has been requested for &quot;{1}&quot;.  Send "
 "the reciept notification to {0}?"
-msgstr "&quot;{1}&quot; ร้องขอการแจ้งรับข้อความ จะแจ้งกลับไปยัง {0} หรือไม่?"
+msgstr "&quot;{1}&quot; ร้องขอการแจ้งกลับเมื่อได้รับข้อความ จะแจ้งกลับไปยัง {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; อยู่แล้ว กรุณาใช้ชื่ออื่น"
-
-#: ../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
+#: ../mail/mail.error.xml.h:8
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "คุณแน่ใจหรือไม่ว่าต้องการลบชื่อบัญชีนี้ พร้อมทั้งพร็อกซีทั้งหมด?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account?"
 msgstr "คุณแน่ใจหรือไม่ว่าต้องการลบชื่อบัญชีนี้?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:10
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:11
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr "คุณแน่ใจหรือไม่ว่าจะกวาดข้อความที่สั่งลบไว้ในทุกโฟลเดอร์ทิ้งอย่างถาวร?"
 
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:12
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
 msgstr "คุณแน่ใจหรือไม่ว่าจะกวาดข้อความที่สั่งลบไว้ในโฟลเดอร์ &quot;{0}&quot; ทิ้งอย่างถาวร?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:13
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "คุณแน่ใจหรือไม่ว่าต้องการส่งข้อความในรูปแบบ HTML?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:14
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "คุณแน่ใจหรือไม่ ว่าต้องการส่งข้อความที่มีแต่ผู้รับสำเนาลับล้วนๆ?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "คุณแน่ใจหรือไม่ว่าต้องการส่งข้อความโดยไม่มีชื่อเรื่อง?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:16
 msgid "Because &quot;{0}&quot;."
 msgstr "เพราะ &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{2}&quot;."
 msgstr "เพราะ &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:20
-msgid "Blank Signature"
-msgstr "ลายเซ็นเปล่า"
-
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:19
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "ไม่สามารถเพิ่มโฟลเดอร์ค้นหา &quot;{0}&quot;"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:20
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "ไม่สามารถคัดลอกโฟลเดอร์ &quot;{0}&quot; ไปยัง &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:21
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "ไม่สามารถสร้างโฟลเดอร์ &quot;{0}&quot;"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot create temporary save directory."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "ไม่สามารถลบโฟลเดอร์ &quot;{0}&quot;"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr "ไม่สามารถแก้ไขโฟลเดอร์ค้นหา &quot;{0}&quot; เพราะไม่มีโฟลเดอร์ที่ว่า"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "ไม่สามารถย้ายโฟลเดอร์ &quot;{0}&quot; ไปยัง &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:31
 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."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "ไม่สามารถเปลี่ยนชื่อ &quot;{0}&quot; เป็น &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr "ไม่สามารถเปลี่ยนชื่อหรือย้ายโฟลเดอร์ระบบ &quot;{0}&quot; ได้"
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot save changes to account."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:38
 msgid ""
 "Check to make sure your password is spelled correctly.  Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -13855,69 +13430,69 @@ msgstr ""
 "ตรวจดูให้แน่ใจว่ารหัสผ่านของคุณสะกดถูกต้อง จะต้องจำไว้ว่าการใช้ตัวพิมพ์เล็กพิมพ์ใหญ่ก็เป็นเรื่องสำคัญ "
 "บางทีปุ่มล็อคแป้นพิมพ์ของคุณอาจจะถูกกดค้างไว้อยู่"
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:39
 msgid "Could not save signature file."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:40
 msgid "Delete &quot;{0}&quot;?"
 msgstr "ลบ &quot;{0}&quot; หรือไม่?"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:41
 msgid "Delete account?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
 msgid "Discard changed?"
 msgstr "ละเลยการเปลี่ยนแปลงใช่หรือไม่?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid "Do you wish to save your changes?"
 msgstr "คุณต้องการบันทึกการเปลี่ยนแปลงของคุณหรือไม่?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:45
 msgid "Don't delete"
 msgstr "ไม่ลบ"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:46
 msgid "Enter password."
 msgstr "ป้อนรหัสผ่าน"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:47
 msgid "Error loading filter definitions."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid "Error while performing operation."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Error while {0}."
 msgstr "เกิดข้อผิดพลาดขณะ{0}"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:50
 msgid "File exists but cannot overwrite it."
 msgstr "แฟ้มมีอยู่แต่ไม่สามารถเขียนทับได้"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "File exists but is not a regular file."
 msgstr "แฟ้มมีอยู่แต่ไม่ใช่แฟ้มปกติ"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "ถ้าดำเนินการต่อไป คุณจะไม่สามารถเรียกข้อความเหล่านี้คืนมาได้อีก"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:53
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
 msgstr "ถ้าคุณลบโฟลเดอร์ เนื้อหาทั้งหมดในโฟลเดอร์และโฟลเดอร์ย่อยจะถูกลบไปแบบถาวร"
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:54
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13925,29 +13500,29 @@ msgstr ""
 "ถ้าคุณดำเนินการต่อไป ข้อมูลบัญชีผู้ใช้และพร็อกซีทั้งหมด\n"
 "จะถูกลบทิ้งอย่างถาวร"
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:56
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "ถ้าคุณดำเนินการต่อไป ข้อมูลบัญชีผู้ใช้จะถูกลบไปแบบถาวร"
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:57
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr "ถ้าคุณหยุด ข้อความเหล่านี้จะไม่ถูกส่งไป จนกว่า Evolutio จะเริ่มใหม่อีก"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:58
 msgid "Ignore"
 msgstr "ไม่สนใจ"
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:59
 msgid "Invalid authentication"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:60
 msgid "Mail filters automatically updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:61
 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 "
@@ -13958,35 +13533,31 @@ msgstr ""
 "ซึ่งข้อมูลนี้จะแสดงผู้รับทั้งหมดของข้อความอยู่ดี คุณสามารถเลี่ยงการแสดงข้อมูลดังกล่าวได้ "
 "โดยเพิ่มผู้รับในช่อง ถึง: หรือ สำเนา: อย่างน้อยหนึ่งคน"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:62
 msgid "Mark all messages as read"
 msgstr "ทำเครื่องหมายว่าทุกข้อความอ่านแล้ว"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:63
 msgid "Mark all messages as read in the selected folder"
 msgstr "ทำเครื่องหมายว่าทุกข้อความอ่านแล้วในโฟลเดอร์ที่เลือก"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:64
 msgid "Missing folder."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:66
 msgid "No sources selected."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:67
 msgid "Opening too many messages at once may take a long time."
 msgstr "การเปิดข้อความมากเกินไปในแต่ละครั้งอาจจะต้องกินเวลานาน"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:68
 msgid "Please check your account settings and try again."
 msgstr "กรุณาตรวจสอบการตั้งค่าบัญชีของคุณและลองใหม่อีกครั้ง"
 
-#: ../mail/mail.error.xml.h:71
-msgid "Please enable the account or send using another account."
-msgstr "กรุณาเปิดใช้บัญชี หรือไม่ก็ส่งด้วยบัญชีอื่น"
-
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:69
 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."
@@ -13994,7 +13565,7 @@ msgstr ""
 "กรุณาป้อนที่อยู่อีเมลที่จะส่งในช่อง \"ถึง:\" คุณสามารถค้นที่อยู่อีเมลได้โดยกดปุ่ม \"ถึง:\" "
 "ที่อยู่ถัดจากช่องเติมข้อความ"
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:70
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14005,47 +13576,39 @@ msgstr ""
 "{0}\n"
 "ยืนยันส่งแน่นอน?"
 
-#: ../mail/mail.error.xml.h:76
-msgid "Please provide an unique name to identify this signature."
-msgstr "กรุณาตั้งชื่อที่ไม่ซ้ำกับชื่ออื่นสำหรับลายเซ็นนี้"
-
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:73
 msgid "Please wait."
 msgstr "กรุณารอสักครู่"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:74
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
-msgstr "เกิดปัญหาขณะถ่ายโอนโฟลเดอร์เมล &quot;{0}&quot;"
+msgstr ""
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:75
 msgid "Querying server"
-msgstr "กำลังสอบถามเซิร์ฟเวอร์"
+msgstr ""
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:76
 msgid "Querying server for a list of supported authentication mechanisms."
-msgstr "กำลังสอบถามรายการกลไกการยืนยันตัวบุคคลที่เซิร์ฟเวอร์สนับสนุน"
+msgstr ""
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:77
 msgid "Read receipt requested."
-msgstr "ร้องขอการแจ้งรับข้อความแล้ว"
+msgstr ""
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:78
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "ลบโฟลเดอร์ &quot;{0}&quot; และโฟลเดอร์ย่อยทั้งหมดหรือไม่?"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:79
 msgid "Search Folders automatically updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:80
 msgid "Send Receipt"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:85
-msgid "Signature Already Exists"
-msgstr "ลายเซ็นมีอยู่แล้ว"
-
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -14053,7 +13616,7 @@ msgstr ""
 "Evolution จำเป็นต้องใช้โฟลเดอร์ระบบ จึงจะทำงานได้อย่างถูกต้อง จึงไม่สามารถเปลี่ยนชื่อ ย้าย "
 "หรือลบได้"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:82
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14068,7 +13631,7 @@ msgstr ""
 "ซึ่งข้อมูลนี้จะแสดงผู้รับทั้งหมดของข้อความอยู่ดี คุณสามารถเลี่ยงการแสดงข้อมูลดังกล่าวได้ "
 "โดยเพิ่มผู้รับในช่อง ถึง: หรือ สำเนา: อย่างน้อยหนึ่งคน"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:85
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14077,7 +13640,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14086,7 +13649,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "The message was sent via the &quot;sendmail&quot; external application.  "
 "Sendmail reports the following error: status 67: mail not sent.\n"
@@ -14094,179 +13657,177 @@ msgid ""
 "and resend."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:97
 msgid "The script file must exist and be executable."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:98
 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:105
-msgid ""
-"This message cannot be sent because the account you chose to send with is "
-"not enabled"
-msgstr "ไม่สามารถส่งข้อความนี้ได้ เพราะบัญชีที่คุณเลือกยังไม่เปิดใช้"
-
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:100
 msgid ""
 "This message cannot be sent because you have not specified any Recipients"
 msgstr "ไม่สามารถส่งข้อความนี้ได้ เพราะคุณไม่ได้ระบุชื่อผู้รับ"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:101
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:102
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:103
 msgid "Unable to connect to the GroupWise server."
 msgstr "ไม่สามารถเชื่อมต่อไปยังเซิร์ฟเวอร์ GroupWise"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "Unable to open the drafts folder for this account.  Use the system drafts "
 "folder instead?"
 msgstr ""
 "ไม่สามารถเปิดโฟลเดอร์จดหมายร่างสำหรับบัญชีนี้ได้ จะใช้โฟลเดอร์จดหมายร่างของระบบแทนหรือไม่?"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:105
 msgid "Unable to read license file."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:106
 msgid "Use _Default"
 msgstr "ใช้โฟลเดอร์_ปริยาย"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:107
 msgid "Use default drafts folder?"
 msgstr "ใช้โฟลเดอร์จดหมายร่างปริยายหรือไม่?"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:108
 msgid "You have not filled in all of the required information."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:109
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "คุณมีข้อความที่ยังไม่ได้ส่ง คุณต้องการออกจากโปรแกรมหรือไม่?"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:110
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:111
 msgid "You must name this Search Folder."
 msgstr "คุณต้องตั้งชื่อโฟลเดอร์ค้นหานี้ด้วย"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:112
 msgid "You must specify a folder."
 msgstr "คุณต้องระบุโฟลเดอร์"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:113
 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:121
+#: ../mail/mail.error.xml.h:115
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:116
 msgid "Your message with the subject &quot;{0}&quot; was not delivered."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:117
 msgid "_Append"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:118
 msgid "_Discard changes"
 msgstr "ไ_ม่สนใจการเปลี่ยนแปลง"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:119
+msgid "_Empty Trash"
+msgstr "เ_ทขยะ"
+
+#: ../mail/mail.error.xml.h:120
 msgid "_Expunge"
 msgstr "เ_ก็บกวาด"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:121
 msgid "_Open Messages"
 msgstr "เ_ปิดข้อความ"
 
-#: ../mail/message-list.c:1006
+#: ../mail/message-list.c:996
 msgid "Unseen"
 msgstr ""
 
-#: ../mail/message-list.c:1007
+#: ../mail/message-list.c:997
 msgid "Seen"
 msgstr ""
 
-#: ../mail/message-list.c:1008
+#: ../mail/message-list.c:998
 msgid "Answered"
 msgstr ""
 
-#: ../mail/message-list.c:1009
+#: ../mail/message-list.c:999
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: ../mail/message-list.c:1010
+#: ../mail/message-list.c:1000
 msgid "Multiple Messages"
 msgstr ""
 
-#: ../mail/message-list.c:1014
+#: ../mail/message-list.c:1004
 msgid "Lowest"
 msgstr ""
 
-#: ../mail/message-list.c:1015
+#: ../mail/message-list.c:1005
 msgid "Lower"
 msgstr ""
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1009
 msgid "Higher"
 msgstr ""
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1010
 msgid "Highest"
 msgstr ""
 
-#: ../mail/message-list.c:1348 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1338 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1355 ../plugins/itip-formatter/itip-view.c:197
+#: ../mail/message-list.c:1345 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "วันนี้ %l:%M %p"
 
-#: ../mail/message-list.c:1364 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1354 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "เมื่อวาน %l:%M %p"
 
-#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1366 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1384 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1374 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../mail/message-list.c:1386 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%d %b %Ey"
 
-#: ../mail/message-list.c:2052
+#: ../mail/message-list.c:2042
 msgid "Message List"
 msgstr ""
 
-#: ../mail/message-list.c:3397
+#: ../mail/message-list.c:3387
 msgid "Generating message list"
 msgstr ""
 
@@ -14314,7 +13875,7 @@ msgstr "แปะประกาศตอบ"
 msgid "For Your Information"
 msgstr "สำหรับข้อมูลของคุณ"
 
-#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:43
+#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "ส่งต่อ"
 
@@ -14322,11 +13883,11 @@ msgstr "ส่งต่อ"
 msgid "No Response Necessary"
 msgstr "ไม่จำเป็นต้องตอบ"
 
-#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:83
+#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:82
 msgid "Reply"
 msgstr "ตอบกลับ"
 
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:84
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to All"
 msgstr "ตอบกลับทั้งหมด"
 
@@ -14423,33 +13984,33 @@ msgstr ""
 msgid "Restore Settings..."
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:410
+#: ../plugins/bbdb/bbdb.c:404
 msgid "Automatic Contacts"
 msgstr "ติดต่ออัตโนมัติ"
 
-#: ../plugins/bbdb/bbdb.c:419
+#: ../plugins/bbdb/bbdb.c:413
 msgid "<span weight=\"bold\">Automatic Contacts</span>"
 msgstr "<span weight=\"bold\">ติดต่ออัตโนมัติ</span>"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:432
+#: ../plugins/bbdb/bbdb.c:426
 msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
 msgstr "เพิ่มรายการในสมุดที่อยู่โดย_อัตโนมัติเมื่อตอบเมล"
 
-#: ../plugins/bbdb/bbdb.c:450
+#: ../plugins/bbdb/bbdb.c:444
 msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
 msgstr "<span weight=\"bold\">ที่อยู่ติดต่อสำหรับการส่งข้อความทันใจ</span>"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:463
+#: ../plugins/bbdb/bbdb.c:457
 msgid ""
 "Periodically synchronize contact information and images from my _instant "
 "messenger"
 msgstr "_ปรับข้อมูลที่อยู่ติดต่อและรูปภาพกับโปรแกรมส่งข้อความทันใจของฉันเป็นระยะ"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:470
+#: ../plugins/bbdb/bbdb.c:464
 msgid "Synchronize with _buddy list now"
 msgstr "ปรับข้อมูลกับรายชื่อ_คู่สนทนาเดี๋ยวนี้"
 
@@ -14669,36 +14230,30 @@ msgid "View the size of all Exchange folders"
 msgstr ""
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:357
+#, fuzzy
 msgid "Folders Size"
-msgstr "ขนาดของโฟลเดอร์"
+msgstr "โฟลเดอร์"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:364
 msgid "Exchange Settings"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:611
+#: ../plugins/exchange-operations/exchange-account-setup.c:607
 msgid "_OWA Url:"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:636
+#: ../plugins/exchange-operations/exchange-account-setup.c:632
 msgid "A_uthenticate"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:823
+#: ../plugins/exchange-operations/exchange-account-setup.c:820
 msgid "Authentication Type"
-msgstr "ชนิดของการยืนยันตัวบุคคล"
+msgstr "ชนิดของการยืนยันตัวตน"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:837
+#: ../plugins/exchange-operations/exchange-account-setup.c:834
 msgid "Ch_eck for Supported Types"
 msgstr "_ตรวจสอบชนิดที่สนับสนุน"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:192
-#: ../plugins/exchange-operations/exchange-contacts.c:162
-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.
 #.
@@ -14730,8 +14285,9 @@ msgstr ""
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:144
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:576
+#, fuzzy
 msgid "Custom"
-msgstr "กำหนดเอง"
+msgstr "ตัด"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:191
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
@@ -14740,8 +14296,9 @@ msgid "Permissions for %s"
 msgstr "การกำหนดสิทธิ์สำหรับ %s"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:421
+#, fuzzy
 msgid "Delegate To"
-msgstr "มอบฉันทะให้กับ"
+msgstr "ลบ"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:562
 #, c-format
@@ -14762,22 +14319,24 @@ msgid "Could not find delegate %s in Active Directory"
 msgstr ""
 
 #: ../plugins/exchange-operations/exchange-delegates.c:719
-#, c-format
+#, fuzzy, c-format
 msgid "Could not remove delegate %s"
-msgstr "ไม่สามารถลบตัวแทน %s"
+msgstr "ไม่สามารถลบ delegate %s"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:779
+#, fuzzy
 msgid "Could not update list of delegates."
-msgstr "ไม่สามารถอัพเดตรายการตัวแทน"
+msgstr "ไม่สามารถดูรายการของสมุดที่อยู่"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:797
-#, c-format
+#, fuzzy, c-format
 msgid "Could not add delegate %s"
-msgstr "ไม่สามารถเพิ่มตัวแทน %s"
+msgstr "ไม่สามารถเพิ่ม delegate %s"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:965
+#, fuzzy
 msgid "Error reading delegates list."
-msgstr "เกิดข้อผิดพลาดขณะเรียกดูรายการตัวแทน"
+msgstr "เกิดข้อผิดพลาดขณะเรียกดูรายการงาน"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
@@ -14796,8 +14355,9 @@ msgid "Delegate Permissions"
 msgstr ""
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+#, fuzzy
 msgid "Delegates"
-msgstr ""
+msgstr "ลบ"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Editor (read, create, edit)"
@@ -14839,31 +14399,29 @@ msgid "Folder Name"
 msgstr "ชื่อโฟลเดอร์"
 
 #: ../plugins/exchange-operations/exchange-folder-size-display.c:140
+#, fuzzy
 msgid "Folder Size"
-msgstr "ขนาดของโฟลเดอร์"
-
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:180
-msgid "Subscribe to Other User's"
-msgstr ""
+msgstr "โฟลเดอร์"
 
 #: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
 msgid "Exchange Folder Tree"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:227
-#: ../plugins/exchange-operations/exchange-folder.c:237
+#: ../plugins/exchange-operations/exchange-folder.c:62
+#: ../plugins/exchange-operations/exchange-folder.c:223
+#: ../plugins/exchange-operations/exchange-folder.c:233
+#, fuzzy
 msgid "Unsubscribe Folder..."
-msgstr ""
+msgstr "โ_ฟลเดอร์ใหม่..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:464
-#: ../plugins/exchange-operations/exchange-folder.c:524
+#: ../plugins/exchange-operations/exchange-folder.c:460
+#: ../plugins/exchange-operations/exchange-folder.c:520
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-folder.c:476
-#: ../plugins/exchange-operations/exchange-folder.c:536
+#: ../plugins/exchange-operations/exchange-folder.c:472
+#: ../plugins/exchange-operations/exchange-folder.c:532
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr ""
@@ -14885,60 +14443,68 @@ msgid "<b>Permissions</b>"
 msgstr "<b>การกำหนดสิทธิ์</b>"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
+#, fuzzy
 msgid "Cannot Delete"
-msgstr "ห้ามลบ"
+msgstr "ไม่สามารถเปิดแฟ้ม"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
+#, fuzzy
 msgid "Cannot Edit"
-msgstr "ห้ามแก้ไข"
+msgstr "ตัวแก้ไขที่อยู่ติดต่อ"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
+#, fuzzy
 msgid "Create items"
-msgstr "สร้างรายการ"
+msgstr "สร้าง_กฎ"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
+#, fuzzy
 msgid "Create subfolders"
-msgstr "สร้างโฟลเดอร์ย่อย"
+msgstr "สร้างโฟลเดอร์"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
 msgid "Delete Any Items"
-msgstr "ลบรายการใดๆ"
+msgstr ""
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
 msgid "Delete Own Items"
-msgstr "ลบรายการของตนเอง"
+msgstr ""
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
+#, fuzzy
 msgid "Edit Any Items"
-msgstr "แก้ไขรายการใดๆ"
+msgstr "แก้ไขการนัดหมาย"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
 msgid "Edit Own Items"
-msgstr "แก้ไขรายการของตนเอง"
+msgstr ""
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
+#, fuzzy
 msgid "Folder contact"
-msgstr "ที่อยู่ติดต่อในโฟลเดอร์"
+msgstr "%d ที่อยู่ติดต่อ"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
 msgid "Folder owner"
 msgstr "เจ้าของโฟลเดอร์"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
+#, fuzzy
 msgid "Folder visible"
-msgstr "มองเห็นโฟลเดอร์"
+msgstr "โฟลเดอร์"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
 msgid "Read items"
-msgstr "อ่านรายการ"
+msgstr ""
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
 msgid "Role: "
 msgstr "บทบาท:"
 
 #: ../plugins/exchange-operations/exchange-user-dialog.c:144
+#, fuzzy
 msgid "Select User"
-msgstr "เลือกผู้ใช้"
+msgstr "เลือกโฟลเดอร์"
 
 #: ../plugins/exchange-operations/exchange-user-dialog.c:182
 msgid "Addressbook..."
@@ -14946,15 +14512,15 @@ msgstr "สมุดที่อยู่..."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
 msgid "Subscribe to Other User's Contacts"
-msgstr "บอกรับข้อมูลที่อยู่ติดต่อของผู้ใช้อื่น"
+msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1
 msgid "Subscribe to Other User's Calendar"
-msgstr "บอกรับข้อมูลปฏิทินของผู้ใช้อื่น"
+msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
 msgid "Cannot change password due to configuration problems."
-msgstr "ไม่สามารถเปลี่ยนรหัสผ่านเนื่องจากปัญหาเกี่ยวกับการตั้งค่า"
+msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
 msgid "Cannot display folders."
@@ -14965,12 +14531,11 @@ msgid ""
 "Changes to Exchange account configuration will take place after you quit and "
 "restart Evolution."
 msgstr ""
-"การเปลี่ยนแปลงค่าตั้งในบัญชี Exchange จะมีผลหลังจากที่คุณออกจาก Evolution "
-"และเข้าใหม่"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
+#, fuzzy
 msgid "Could not authenticate to server."
-msgstr "ไม่สามารถยืนยันตัวบุคคลกับเซิร์ฟเวอร์"
+msgstr "ตรวจสอบสิทธิ์ด้วยเซิร์ฟเวอร์ LDAP ล้มเหลว"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid "Could not change password."
@@ -14982,25 +14547,25 @@ msgid ""
 "an unknown error occurred. Check the URL, \n"
 "username, and password, and try again."
 msgstr ""
-"ไม่สามารถตั้งค่าบัญชี Exchange เพราะเกิดข้อผิดพลาด\n"
-"ไม่ทราบสาเหตุ กรุณาตรวจสอบ URL, ชื่อผู้ใช้ \n"
-"และรหัสผ่าน แล้วลองใหม่"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
+#, fuzzy
 msgid "Could not connect to server {0}."
-msgstr "ไม่สามารถเชื่อมต่อไปยังเซิร์ฟเวอร์ {0}"
+msgstr "ไม่สามารถสร้างหน้าต่างเขียนจดหมาย"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#, fuzzy
 msgid "Could not determine folder permissions for delegates."
-msgstr "ไม่สามารถพิจารณาสิทธิ์ในโฟลเดอร์ของตัวแทน"
+msgstr "ไม่สามารถดูข้อมูล schema สำหรับเซิร์ฟเวอร์ LDAP"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not find Exchange Web Storage System."
 msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#, fuzzy
 msgid "Could not locate server {0}."
-msgstr "หาตำแหน่งเซิร์ฟเวอร์ {0} ไม่พบ"
+msgstr "ไม่สามารถสร้างจดหมาย"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not make {0} a delegate"
@@ -15015,20 +14580,22 @@ msgid "Could not read folder permissions."
 msgstr "ไม่สามารถอ่านค่าการกำหนดสิทธิ์ของโฟลเดอร์"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#, fuzzy
 msgid "Could not read out-of-office state"
-msgstr "ไม่สามารถอ่านสถานะการไม่อยู่ที่ทำงาน"
+msgstr "ไม่สามารถสร้างจดหมาย"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#, fuzzy
 msgid "Could not update folder permissions."
-msgstr "ไม่สามารถอัพเดตการกำหนดสิทธิ์ของโฟลเดอร์"
+msgstr "ไม่สามารถเปิดที่ปลายทาง"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not update out-of-office state"
-msgstr "ไม่สามารถอัพเดตสถานะการไม่อยู่ที่ทำงาน"
+msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Exchange Account is offline."
-msgstr "บัญชี Exchange ทำงานออฟไลน์อยู่"
+msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Exchange Connector access error."
@@ -15052,16 +14619,19 @@ msgid ""
 msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
+#, fuzzy
 msgid "Failed to update delegates:"
-msgstr ""
+msgstr "การตรวจสอบสิทธิ์ล้มเหลว\n"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#, fuzzy
 msgid "Folder already exists"
-msgstr "โฟลเดอร์มีอยู่แล้ว"
+msgstr "รหัสที่อยู่ติดต่อมีอยู่แล้ว"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#, fuzzy
 msgid "Folder does not exist"
-msgstr "ไม่มีโฟลเดอร์ที่อ้าง"
+msgstr "ไม่มีสมุดที่อยู่"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder offline"
@@ -15070,7 +14640,7 @@ msgstr ""
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 #: ../shell/e-shell.c:1265
 msgid "Generic error"
-msgstr "ข้อผิดพลาดทั่วไป"
+msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid ""
@@ -15080,7 +14650,7 @@ msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Mailbox for {0} is not on this server."
-msgstr "กล่องเมลสำหรับ {0} ไม่อยู่ในเซิร์ฟเวอร์นี้"
+msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Make sure the URL is correct and try again."
@@ -15100,35 +14670,36 @@ msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "No mailbox for user {0} on {1}."
-msgstr "ไม่มีกล่องเมลสำหรับผู้ใช้ {0} ที่ {1}"
+msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "No such user {0}"
-msgstr "ไม่มีผู้ใช้ {0} ที่อ้าง"
+msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Password successfully changed."
-msgstr "เปลี่ยนรหัสผ่านสำเร็จแล้ว"
+msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "Please restart Evolution"
-msgstr "กรุณาเริ่ม Evolution ใหม่"
+msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#, fuzzy
 msgid "Please select a user."
-msgstr "กรุณาเลือกผู้ใช้"
+msgstr "โปรดเลือกเซิร์ฟเวอร์"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Server rejected password because it is too weak."
-msgstr "เซิร์ฟเวอร์ปฏิเสธรหัสผ่านเพราะเดาง่ายเกินไป"
+msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "The Exchange account will be disabled when you quit Evolution"
-msgstr "บัญชี Exchange จะถูกปิดเมื่อคุณออกจาก Evolution"
+msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "The Exchange account will be removed when you quit Evolution"
-msgstr "บัญชี Exchange จะถูกลบเมื่อคุณออกจาก Evolution"
+msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "The Exchange server is not compatible with Exchange Connector."
@@ -15151,27 +14722,31 @@ msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid "Try again with a different password."
-msgstr "กรุณาลองตั้งรหัสผ่านใหม่"
+msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid "Unable to add user to access control list:"
 msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
+#, fuzzy
 msgid "Unable to edit delegates."
-msgstr ""
+msgstr "ไม่สามารถเปิดปฏิทิน '%s'"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#, fuzzy
 msgid "Unknown error looking up {0}"
-msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุขณะเปิดหา {0}"
+msgstr "ข้อผิดพลาดที่ไม่ทราบ"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#, fuzzy
 msgid "Unknown error."
-msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุ"
+msgstr "ข้อผิดพลาดที่ไม่ทราบ"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#, fuzzy
 msgid "Unknown type"
-msgstr "ชนิดไม่รู้จัก"
+msgstr "ไม่รู้จัก"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unsupported operation"
@@ -15302,7 +14877,6 @@ 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:13 ../ui/evolution-task-editor.xml.h:8
 #: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "ตัวเลือกของการส่ง"
@@ -15393,7 +14967,7 @@ msgid "Subscribe to my _notifications"
 msgstr ""
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Read"
 msgstr "_อ่านแล้ว"
 
@@ -15421,22 +14995,18 @@ msgid "Proxy Login"
 msgstr "ล็อกเข้าพร็อกซี"
 
 #: ../plugins/groupwise-features/proxy-login.c:219
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:501
+#: ../plugins/groupwise-features/proxy-login.c:261
+#: ../plugins/groupwise-features/proxy.c:490
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sป้อนรหัสผ่านสำหรับ %s (ผู้ใช้ %s)"
 
-#: ../plugins/groupwise-features/proxy-login.c:497
+#: ../plugins/groupwise-features/proxy-login.c:484
 msgid "_Proxy Login..."
 msgstr "ล็อกเข้า_พร็อกซี..."
 
-#: ../plugins/groupwise-features/proxy.c:690
-msgid "The Proxy tab will be available only when the account is online."
-msgstr ""
-
-#: ../plugins/groupwise-features/proxy.c:695
+#: ../plugins/groupwise-features/proxy.c:672
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 
@@ -15446,13 +15016,13 @@ msgstr "ผู้ใช้"
 
 #: ../plugins/groupwise-features/share-folder-common.c:319
 msgid "Enter the users and set permissions"
-msgstr "กรุณาป้อนชื่อผู้ใช้และตั้งค่าการอนุญาตใช้สิทธิ์"
+msgstr "ใส่ชื่อผู้ใช้และตั้งค่าการอนุญาตใช้สิทธิ์"
 
 #: ../plugins/groupwise-features/share-folder-common.c:338
 msgid "New _Shared Folder..."
 msgstr ""
 
-#: ../plugins/groupwise-features/share-folder-common.c:446
+#: ../plugins/groupwise-features/share-folder-common.c:453
 msgid "Sharing"
 msgstr ""
 
@@ -15460,61 +15030,6 @@ msgstr ""
 msgid "Track Message Status..."
 msgstr "ติดตามสถานะข้อความ..."
 
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "Hula Account Setup"
-msgstr "ตั้งค่าบัญชี Hula"
-
-#: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:137
-msgid "iCalendar format (.ics)"
-msgstr ""
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
-msgstr ""
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
-msgid "Synchronize to iPod"
-msgstr "Synchronize กับ iPod"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
-msgid "iPod Synchronization"
-msgstr "การ Synchronize กับ iPod"
-
-#: ../plugins/ipod-sync/sync.c:158
-msgid "No output directory!"
-msgstr ""
-
-#: ../plugins/ipod-sync/sync.c:159
-msgid ""
-"The output directory was not found on iPod! Please ensure that iPod has been "
-"correctly set up and try again."
-msgstr ""
-
-#: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
-msgid "Could not export data!"
-msgstr "ไม่สามารถส่งออกข้อมูล!"
-
-#: ../plugins/ipod-sync/sync.c:203
-msgid "Exporting data failed."
-msgstr "การส่งออกข้อมูลล้มเหลว"
-
-#: ../plugins/ipod-sync/sync.c:231
-msgid "Could not open addressbook!"
-msgstr "ไม่สามารถเปิดสมุดที่อยู่!"
-
-#: ../plugins/ipod-sync/sync.c:232
-msgid "Could not open the Evolution addressbook to export data."
-msgstr "ไม่สามารถเปิดสมุดที่อยู่ Evolution เพื่อส่งออกข้อมูล"
-
-#: ../plugins/ipod-sync/sync.c:291
-msgid "Could not open calendar/todo!"
-msgstr ""
-
-#: ../plugins/ipod-sync/sync.c:292
-msgid "Could not open the Evolution calendar/todo list to export data."
-msgstr ""
-
 #: ../plugins/itip-formatter/itip-formatter.c:724
 msgid "Unable to parse item"
 msgstr ""
@@ -15550,12 +15065,14 @@ msgid "Organizer has removed the delegate %s "
 msgstr ""
 
 #: ../plugins/itip-formatter/itip-formatter.c:905
+#, fuzzy
 msgid "Sent a cancellation notice to the delegate"
-msgstr "ส่งประกาศการยกเลิกไปยังตัวแทนแล้ว"
+msgstr "คุณต้องการส่งประกาศการยกเลิกสำหรับรายการบันทึกนี้หรือไม่?"
 
 #: ../plugins/itip-formatter/itip-formatter.c:907
+#, fuzzy
 msgid "Could not send the cancellation notice to the delegate"
-msgstr "ไม่สามารถส่งประกาศการยกเลิกไปยังตัวแทน"
+msgstr "คุณต้องการส่งประกาศการยกเลิกสำหรับรายการบันทึกนี้หรือไม่?"
 
 #: ../plugins/itip-formatter/itip-formatter.c:991
 msgid "Attendee status could not be updated because the status is invalid"
@@ -15604,6 +15121,10 @@ msgid ""
 "imported"
 msgstr ""
 
+#: ../plugins/itip-formatter/itip-formatter.c:1968
+msgid "Meetings and Tasks"
+msgstr "ประชุมและงาน"
+
 #. Delete message after acting
 #. FIXME Need a schema for this
 #: ../plugins/itip-formatter/itip-formatter.c:1991
@@ -15624,314 +15145,315 @@ msgid "Conflict Search Table"
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:183 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:466
+#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:240 ../widgets/misc/e-dateedit.c:457
 msgid "Today"
 msgstr "วันนี้"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:188
+#: ../plugins/itip-formatter/itip-view.c:189
 msgid "Today %H:%M"
 msgstr "วันนี้ %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:192
+#: ../plugins/itip-formatter/itip-view.c:193
 msgid "Today %H:%M:%S"
 msgstr "วันนี้ %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:202
 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:211
+#: ../plugins/itip-formatter/itip-view.c:212
 msgid "Tomorrow"
 msgstr "พรุ่งนี้"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:216
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow %H:%M"
 msgstr "พรุ่งนี้ %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:221
 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:225
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %l:%M %p"
 msgstr "พรุ่งนี้ %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:230
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "พรุ่งนี้ %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:248
+#: ../plugins/itip-formatter/itip-view.c:249
 #, 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:253
+#: ../plugins/itip-formatter/itip-view.c:254
 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:257
+#: ../plugins/itip-formatter/itip-view.c:258
 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:262
+#: ../plugins/itip-formatter/itip-view.c:263
 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:266
+#: ../plugins/itip-formatter/itip-view.c:267
 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:275
+#: ../plugins/itip-formatter/itip-view.c:276
 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:281
+#: ../plugins/itip-formatter/itip-view.c:282
 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:285
+#: ../plugins/itip-formatter/itip-view.c:286
 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:290
+#: ../plugins/itip-formatter/itip-view.c:291
 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:294
+#: ../plugins/itip-formatter/itip-view.c:295
 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:300
+#: ../plugins/itip-formatter/itip-view.c:301
 msgid "%A, %B %e, %Y"
 msgstr "%A %e %B %Ey"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:305
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A %e %B %Ey %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:310
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A %e %B %Ey %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:314
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A %e %B %Ey %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:319
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A %e %B %Ey %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:343
+#: ../plugins/itip-formatter/itip-view.c:344
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:345
+#: ../plugins/itip-formatter/itip-view.c:346
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:350
-#, c-format
+#: ../plugins/itip-formatter/itip-view.c:351
+#, fuzzy, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
-msgstr ""
+msgstr "<b>%s</b> ได้ยกเลิกการประชุม"
 
-#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:354
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:355
+#: ../plugins/itip-formatter/itip-view.c:356
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:362
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:373
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> through %s has cancelled the following meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:375
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> has cancelled the following meeting."
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:379
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:384
+#: ../plugins/itip-formatter/itip-view.c:385
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:411
+#: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:413
+#: ../plugins/itip-formatter/itip-view.c:414
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:418
+#: ../plugins/itip-formatter/itip-view.c:419
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:421
+#: ../plugins/itip-formatter/itip-view.c:422
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:423
+#: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:429
+#: ../plugins/itip-formatter/itip-view.c:430
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:431
+#: ../plugins/itip-formatter/itip-view.c:432
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:435
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:438
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:442
 #, c-format
 msgid "<b>%s</b> through %s has cancelled the following assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:443
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> has cancelled the following assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:451
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr ""
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:891
+#: ../plugins/itip-formatter/itip-view.c:892
 msgid "Start time:"
 msgstr "เวลาเริ่ม:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:900
+#: ../plugins/itip-formatter/itip-view.c:901
 msgid "End time:"
 msgstr "เวลาสิ้นสุด:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:916
-#: ../plugins/itip-formatter/itip-view.c:966
+#: ../plugins/itip-formatter/itip-view.c:917
+#: ../plugins/itip-formatter/itip-view.c:967
 msgid "Comment:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:980
+#: ../plugins/itip-formatter/itip-view.c:981
 msgid "Send u_pdates to attendees"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:989
+#: ../plugins/itip-formatter/itip-view.c:990
+#, fuzzy
 msgid "A_pply to all instances"
-msgstr ""
+msgstr "ทุกกรณี"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
 msgid "Displays text/calendar parts in messages."
@@ -15948,8 +15470,9 @@ msgid ""
 msgstr ""
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+#, fuzzy
 msgid "This meeting has been delegated"
-msgstr ""
+msgstr "เหตุการณ์นี้ถูกลบไปแล้ว"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
 msgid ""
@@ -15983,8 +15506,9 @@ msgid "Account cannot send e-mail"
 msgstr ""
 
 #: ../plugins/mail-remote/evolution-mail-store.c:605
+#, fuzzy
 msgid "No store available"
-msgstr ""
+msgstr "ไม่มีข้อสรุปอยู่"
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
 msgid ""
@@ -15992,8 +15516,9 @@ msgid ""
 msgstr ""
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
+#, fuzzy
 msgid "Mail Remote"
-msgstr ""
+msgstr "โ_ฟลเดอร์เมล"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
 msgid ""
@@ -16177,8 +15702,9 @@ msgid "A plugin which implements mono plugins."
 msgstr ""
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
+#, fuzzy
 msgid "Mono Loader"
-msgstr ""
+msgstr "_ย้ายไปยังโฟลเดอร์"
 
 #: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:1
 msgid "Generates a D-BUS message when new mail arrives."
@@ -16281,17 +15807,17 @@ msgid "Gives an option to print mail from composer"
 msgstr "เพิ่มตัวเลือกสั่งพิมพ์เมลจากหน้าต่างเขียนเมล"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:18 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:79 ../ui/evolution-memos.xml.h:12
-#: ../ui/evolution-tasks.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "ตัวอ_ย่างก่อนพิมพ์"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:2
+#, fuzzy
 msgid "Prints the message"
-msgstr "พิมพ์ข้อความ"
+msgstr "พิมพ์ข้อความนี้"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:99
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:98
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (ฝังในตัว)"
 
@@ -16329,7 +15855,7 @@ msgid "MIME Type"
 msgstr ""
 
 #: ../plugins/save-attachments/save-attachments.c:359
-#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:18
+#: ../ui/evolution-message-composer.xml.h:18
 msgid "Save"
 msgstr "บันทึก"
 
@@ -16413,6 +15939,10 @@ msgstr ""
 msgid "Comma separated value format (.csv)"
 msgstr ""
 
+#: ../plugins/save-calendar/ical-format.c:137
+msgid "iCalendar format (.ics)"
+msgstr ""
+
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
 msgstr "บันทึกสิ่งที่เลือก"
@@ -16438,11 +15968,18 @@ msgstr "%FT%T"
 msgid "RDF format (.rdf)"
 msgstr "รูปแบบ RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:170
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:171
+#: ../plugins/save-calendar/save-calendar.c:181
 msgid "Select destination file"
 msgstr "เลือกแฟ้มปลายทาง"
 
+#: ../plugins/save-calendar/save-calendar.c:216
+#, c-format
+msgid ""
+"The suggested filename extension of this filetype (%s) is unused in the "
+"chosen filename. Do you want to continue?"
+msgstr ""
+
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
 msgid "Select one source"
 msgstr ""
@@ -16729,27 +16266,27 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: ../shell/e-shell-window-commands.c:71
+#: ../shell/e-shell-window-commands.c:70
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: ../shell/e-shell-window-commands.c:79
+#: ../shell/e-shell-window-commands.c:78
 #, c-format
 msgid "Error executing %s."
 msgstr ""
 
-#: ../shell/e-shell-window-commands.c:128
+#: ../shell/e-shell-window-commands.c:127
 msgid "Bug buddy is not installed."
 msgstr ""
 
-#: ../shell/e-shell-window-commands.c:136
+#: ../shell/e-shell-window-commands.c:135
 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 box
-#: ../shell/e-shell-window-commands.c:533
+#: ../shell/e-shell-window-commands.c:532
 msgid "translator-credits"
 msgstr ""
 "สุปราณี ธีระวัฒนสุข <supranee@opentle.org>\n"
@@ -16758,19 +16295,19 @@ msgstr ""
 "ถ้ามีเวลาโปรดมาช่วยกันแปล :-)\n"
 "http://gnome-th.sf.net"
 
-#: ../shell/e-shell-window-commands.c:547
+#: ../shell/e-shell-window-commands.c:546
 msgid "Groupware Suite"
 msgstr "ชุดกรุ๊ปแวร์"
 
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:774
 msgid "_Work Online"
 msgstr "ทำงานออ_นไลน์"
 
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:52
+#: ../shell/e-shell-window-commands.c:787 ../ui/evolution.xml.h:50
 msgid "_Work Offline"
 msgstr "ทำงานออ_ฟไลน์"
 
-#: ../shell/e-shell-window-commands.c:801
+#: ../shell/e-shell-window-commands.c:800
 msgid "Work Offline"
 msgstr "ทำงานออฟไลน์"
 
@@ -16786,7 +16323,7 @@ msgstr "Evolution กำลังเปลี่ยนการทำงาน�
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr "Evolution กำลังออฟไลน์อยู่ คุณกดปุ่มนี้ได้เพื่อให้ออนไลน์"
 
-#: ../shell/e-shell-window.c:735
+#: ../shell/e-shell-window.c:724
 #, c-format
 msgid "Switch to %s"
 msgstr "เปลี่ยนไปที่%s"
@@ -16800,7 +16337,7 @@ msgstr ""
 msgid "%ld KB"
 msgstr ""
 
-#: ../shell/e-shell.c:1257 ../widgets/misc/e-cell-date-edit.c:257
+#: ../shell/e-shell.c:1257 ../widgets/misc/e-cell-date-edit.c:256
 msgid "OK"
 msgstr ""
 
@@ -16883,7 +16420,7 @@ msgid ""
 "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"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
 "This product comes with no warranty and is not intended for\n"
 "individuals prone to violent fits of anger.\n"
 "\n"
@@ -16898,7 +16435,7 @@ msgstr ""
 "หากคุณต้องการใช้ Evolution รุ่นเสถียร เราขอแนะนำให้ถอดถอนรุ่นนี้\n"
 "ออกก่อน แล้วจึงติดตั้งรุ่น %s แทน\n"
 "\n"
-"หากคุณพบข้อผิดพลาด กรุณารายงานให้เราทราบที่ bugzilla.gnome.org\n"
+"หากคุณพบข้อผิดพลาด กรุณารายงานให้เราทราบที่ bugzilla.ximian.com\n"
 "ผลิตภัณฑ์นี้ไม่มีการรับประกันใดๆ และไม่มีความมุ่งหมายสำหรับผู้ใช้ที่\n"
 "โมโหง่าย หรือนิยมความรุนแรง\n"
 "\n"
@@ -17579,113 +17116,103 @@ msgstr ""
 msgid "Shutting down %s (%s)\n"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:2
-msgid "Contact _Preview"
-msgstr "ดู_ตัวอย่างที่อยู่ติดต่อ"
-
-#: ../ui/evolution-addressbook.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:3
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "คัดลอกที่อยู่ติดต่อที่เลือกไปยังโฟลเดอร์อื่น..."
 
-#: ../ui/evolution-addressbook.xml.h:5 ../ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:4 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "คัดลอกส่วนที่เลือก"
 
-#: ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-addressbook.xml.h:5
 msgid "Copy to Folder..."
 msgstr "คัดลอกไปยังโฟลเดอร์..."
 
-#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-memos.xml.h:4
-#: ../ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "ตัด"
-
-#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "ตัดส่วนที่เลือก"
 
-#: ../ui/evolution-addressbook.xml.h:10
+#: ../ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "ลบที่อยู่ติดต่อที่เลือก"
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Forward Contact"
-msgstr "ส่งต่อที่อยู่ติดต่อ"
-
-#: ../ui/evolution-addressbook.xml.h:12
 msgid "Move Selected Contacts to Another Folder..."
 msgstr "ย้ายที่อยู่ติดต่อที่เลือกไปยังโฟลเดอร์อื่น..."
 
-#: ../ui/evolution-addressbook.xml.h:13
+#: ../ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr "ย้ายไปยังโฟลเดอร์..."
 
-#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-memos.xml.h:8
-#: ../ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "แปะ"
-
-#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
 msgstr "แปะจากคลิปบอร์ด"
 
-#: ../ui/evolution-addressbook.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "แสดงตัวอย่างที่อยู่ติดต่อก่อนพิมพ์"
 
-#: ../ui/evolution-addressbook.xml.h:19
+#: ../ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "พิมพ์ที่อยู่ติดต่อที่เลือก"
 
-#: ../ui/evolution-addressbook.xml.h:21
+#: ../ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "บันทึกที่อยู่ติดต่อที่เลือกในรูป VCard"
 
-#: ../ui/evolution-addressbook.xml.h:22 ../widgets/text/e-text.c:2684
+#: ../ui/evolution-addressbook.xml.h:21 ../widgets/text/e-text.c:2684
 msgid "Select All"
 msgstr "เลือกทั้งหมด"
 
-#: ../ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "เลือกที่อยู่ติดต่อทั้งหมด"
 
-#: ../ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-addressbook.xml.h:23
 msgid "Send a message to the selected contacts."
 msgstr "ส่งข้อความไปยังที่อยู่ติดต่อที่เลือกอยู่"
 
-#: ../ui/evolution-addressbook.xml.h:25
+#: ../ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "ส่งที่อยู่ติดต่อที่เลือกไปให้ผู้อื่น"
 
-#: ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-addressbook.xml.h:26
 msgid "Show contact preview window"
-msgstr "แสดงช่องหน้าต่างแสดงตัวอย่างที่อยู่ติดต่อ"
+msgstr "แสดงช่องหน้าต่างตัวอย่างที่อยู่ติดต่อ"
 
-#: ../ui/evolution-addressbook.xml.h:28
+#: ../ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "หยุด"
 
-#: ../ui/evolution-addressbook.xml.h:29
+#: ../ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "หยุดโหลด"
 
-#: ../ui/evolution-addressbook.xml.h:30
+#: ../ui/evolution-addressbook.xml.h:29
 msgid "View the current contact"
 msgstr "ดูข้อมูลที่อยู่ติดต่อปัจจุบัน"
 
-#: ../ui/evolution-addressbook.xml.h:31 ../ui/evolution-calendar.xml.h:38
-#: ../ui/evolution-tasks.xml.h:21
+#: ../ui/evolution-addressbook.xml.h:30 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-tasks.xml.h:19
 msgid "_Actions"
 msgstr "_ปฏิบัติการ"
 
-#: ../ui/evolution-addressbook.xml.h:36
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "_Forward Contact..."
 msgstr "ส่ง_ต่อที่อยู่ติดต่อ..."
 
+#: ../ui/evolution-addressbook.xml.h:39
+msgid "_Preview Pane"
+msgstr "ช่องแสดง_ตัวอย่าง"
+
+#: ../ui/evolution-addressbook.xml.h:41
+msgid "_Save as VCard..."
+msgstr "_บันทึกเป็น VCard..."
+
 #: ../ui/evolution-addressbook.xml.h:42
 msgid "_Select All"
 msgstr "เลือกทั้ง_หมด"
@@ -17734,7 +17261,7 @@ msgstr "รายการ"
 msgid "Month"
 msgstr "เดือน"
 
-#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:61
+#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:60
 msgid "Next"
 msgstr "ถัดไป"
 
@@ -17742,7 +17269,7 @@ msgstr "ถัดไป"
 msgid "Previews the calendar to be printed"
 msgstr "แสดงตัวอย่างปฏิทินก่อนพิมพ์"
 
-#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:76
 msgid "Previous"
 msgstr "ก่อนหน้า"
 
@@ -17766,10 +17293,6 @@ msgstr "ลบนัดหมายและการประชุมเก่
 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 "ระบุวันที่"
@@ -17814,191 +17337,30 @@ msgstr "สัปดาห์ทำงาน"
 msgid "_Open Appointment"
 msgstr "เ_ปิดนัดหมาย"
 
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-editor.xml.h:7
+#: ../ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
 msgstr ""
 
-#: ../ui/evolution-composer-entries.xml.h:3 ../ui/evolution-editor.xml.h:9
+#: ../ui/evolution-composer-entries.xml.h:2
+msgid "Cu_t"
+msgstr "_ตัด"
+
+#: ../ui/evolution-composer-entries.xml.h:3
 msgid "Cut selected text to the clipboard"
 msgstr ""
 
-#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:10
+#: ../ui/evolution-composer-entries.xml.h:4
 msgid "Paste text from the clipboard"
 msgstr ""
 
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-editor.xml.h:12
-#: ../ui/evolution-subscribe.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "เลือกทั้ง_หมด"
 
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:6
 msgid "Select all text"
 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 availabe"
-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:4
-#: ../ui/evolution-signature-editor.xml.h:7
-msgid "Close"
-msgstr "ปิด"
-
-#: ../ui/evolution-editor.xml.h:14
-msgid "_Attachments"
-msgstr "เอกสารแ_นบ"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:42 ../ui/evolution-subscribe.xml.h:9
-msgid "_Close"
-msgstr "ปิ_ด"
-
-#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:45
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:37
-msgid "_File"
-msgstr "แ_ฟ้ม"
-
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:38
-msgid "_Help"
-msgstr "_วิธีใช้"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-message-composer.xml.h:47
-#: ../ui/evolution-signature-editor.xml.h:25
-msgid "_Insert"
-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 ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "กำหนดเป็นประเภทความลับ"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "กำหนดเป็นประเภทส่วนตัว"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "กำหนดเป็นประเภทเปิดเผย"
-
-#: ../ui/evolution-event-editor.xml.h:7 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "แทรกตัวเลือกขั้นสูงของการส่ง"
-
-#: ../ui/evolution-event-editor.xml.h:8
-msgid "Make this a recurring event"
-msgstr "ทำให้เป็นเหตุการณ์เวียนซ้ำ"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "เ_ปิดเผย"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Query free / busy information for the attendees"
-msgstr "สอบถามข้อมูลการว่าง/ไม่ว่างของผู้เข้าประชุม"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:14 ../ui/evolution-task-editor.xml.h:9
-msgid "Show Time _Zone"
-msgstr "แสดงเ_ขตเวลา"
-
-#: ../ui/evolution-event-editor.xml.h:15
-msgid "Show time as b_usy"
-msgstr "แสดงเวลาเป็นไ_ม่ว่าง"
-
-#: ../ui/evolution-event-editor.xml.h:16 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:22
-msgid "Toggles whether to have All day Event"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:23
-msgid "Toggles whether to show time as busy"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:24
-msgid "_Alarms"
-msgstr "การเ_ตือน"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "_All day Event"
-msgstr "เหตุการณ์ตลอด_วัน"
-
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "ประเ_ภท"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "เป็นความ_ลับ"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "ส่วน_ตัว"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Field"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:25
-msgid "_Type Field"
-msgstr ""
-
 #: ../ui/evolution-executive-summary.xml.h:1
 msgid "Customize My Evolution"
 msgstr ""
@@ -18055,7 +17417,7 @@ msgstr "โ_ฟลเดอร์ค้นหา"
 
 #: ../ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
-msgstr "แสดงหน้าต่างแสดงตัวอย่างข้อความ"
+msgstr "แสดงหน้าต่างตัวอย่างข้อความ"
 
 #: ../ui/evolution-mail-global.xml.h:16
 msgid "Subscribe or unsubscribe to folders on remote servers"
@@ -18123,10 +17485,10 @@ msgid ""
 msgstr "ซ่อนข้อความที่ลบ แทนการแสดงด้วยการขีดฆ่า"
 
 #: ../ui/evolution-mail-list.xml.h:13
-msgid "Mar_k Messages as Read"
+msgid "Mark Me_ssages as Read"
 msgstr "ทำเ_ครื่องหมายข้อความว่าอ่านแล้ว"
 
-#: ../ui/evolution-mail-list.xml.h:14 ../ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-mail-list.xml.h:14 ../ui/evolution-mail-message.xml.h:69
 msgid "Paste message(s) from the clipboard"
 msgstr ""
 
@@ -18178,7 +17540,7 @@ msgstr "ซ่อนข้อความที่เลือกชั่วค
 msgid "Threaded Message list"
 msgstr "เรียงข้อความเป็นกระทู้"
 
-#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:113
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_ข้อความ"
@@ -18297,317 +17659,312 @@ msgid "Display the previous unread message"
 msgstr "แสดงข้อความที่ยังไม่อ่านก่อนหน้า"
 
 #: ../ui/evolution-mail-message.xml.h:34
-msgid "F_orward As..."
-msgstr "ส่ง_ต่อเป็น..."
-
-#: ../ui/evolution-mail-message.xml.h:35
 msgid "Filter on Mailing _List..."
 msgstr "กรองที่เ_มลลิงลิสต์..."
 
-#: ../ui/evolution-mail-message.xml.h:36
+#: ../ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
 msgstr "กรองที่ผู้_ส่ง..."
 
-#: ../ui/evolution-mail-message.xml.h:37
+#: ../ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
 msgstr "กรองที่ชื่อผู้_รับ..."
 
-#: ../ui/evolution-mail-message.xml.h:38
+#: ../ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
 msgstr "กรองที่ชื่อเ_รื่อง..."
 
-#: ../ui/evolution-mail-message.xml.h:39
+#: ../ui/evolution-mail-message.xml.h:38
 msgid "Filter the selected messages for junk status"
 msgstr "กรองข้อความที่เลือกสำหรับสถานะเมลขยะ"
 
-#: ../ui/evolution-mail-message.xml.h:40
+#: ../ui/evolution-mail-message.xml.h:39
 msgid "Flag selected message(s) for follow-up"
 msgstr "ปักธงที่ข้อความเพื่อตามกระทู้"
 
-#: ../ui/evolution-mail-message.xml.h:41
+#: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
 msgstr "ติด_ตามกระทู้..."
 
-#: ../ui/evolution-mail-message.xml.h:42
+#: ../ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
 msgstr "บังคับให้โหลดรูปภาพในเมล HTML ทั้งหมด"
 
-#: ../ui/evolution-mail-message.xml.h:44
+#: ../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:45
+#: ../ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:46
+#: ../ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr "ส่งต่อข้อความที่เลือกไปยังผู้อื่น"
 
-#: ../ui/evolution-mail-message.xml.h:47
+#: ../ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:48
+#: ../ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr "เพิ่มขนาดอักษรข้อความ"
 
-#: ../ui/evolution-mail-message.xml.h:50
+#: ../ui/evolution-mail-message.xml.h:49
 msgid "Mar_k as"
 msgstr "ทำเ_ครื่องหมายเป็น"
 
-#: ../ui/evolution-mail-message.xml.h:51
+#: ../ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as having been read"
 msgstr "ทำเครื่องหมายข้อความที่เลือกเพื่อแสดงว่าได้อ่านแล้ว"
 
-#: ../ui/evolution-mail-message.xml.h:52
+#: ../ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected message(s) as important"
 msgstr "ทำเครื่องหมายข้อความที่เลือกว่าเป็นข้อความสำคัญ"
 
-#: ../ui/evolution-mail-message.xml.h:53
+#: ../ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected message(s) as junk"
 msgstr "ทำเครื่องหมายข้อความที่เลือกว่าเป็นเมลขยะ"
 
-#: ../ui/evolution-mail-message.xml.h:54
+#: ../ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected message(s) as not being junk"
 msgstr "ทำเครื่องหมายข้อความที่เลือกว่าไม่ใช่เมลขยะ"
 
-#: ../ui/evolution-mail-message.xml.h:55
+#: ../ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as not having been read"
 msgstr "ทำเครื่องหมายข้อความที่เลือกว่ายังไม่ได้อ่าน"
 
-#: ../ui/evolution-mail-message.xml.h:56
+#: ../ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as unimportant"
 msgstr "ทำเครื่องหมายข้อความที่เลือกว่าเป็นข้อความไม่สำคัญ"
 
-#: ../ui/evolution-mail-message.xml.h:57
+#: ../ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected messages for deletion"
 msgstr "ทำเครื่องหมายเพื่อลบข้อความที่เลือก"
 
-#: ../ui/evolution-mail-message.xml.h:58
+#: ../ui/evolution-mail-message.xml.h:57
 msgid "Message Source"
 msgstr "ข้อมูลดิบของข้อความ"
 
-#: ../ui/evolution-mail-message.xml.h:59
+#: ../ui/evolution-mail-message.xml.h:58
 msgid "Move"
 msgstr "ย้าย"
 
-#: ../ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-mail-message.xml.h:59
 msgid "Move selected message(s) to another folder"
 msgstr "ย้ายข้อความที่เลือกไปยังโฟลเดอร์อื่น"
 
-#: ../ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Important Message"
 msgstr "ข้อความ_สำคัญถัดไป"
 
-#: ../ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:62
 msgid "Next _Thread"
 msgstr "_กระทู้ถัดไป"
 
-#: ../ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:63
 msgid "Next _Unread Message"
 msgstr "ข้อความที่ยังไม่ได้อ่าน_ถัดไป"
 
-#: ../ui/evolution-mail-message.xml.h:65
+#: ../ui/evolution-mail-message.xml.h:64
 msgid "Not Junk"
 msgstr "ไม่ใช่ขยะ"
 
-#: ../ui/evolution-mail-message.xml.h:66
+#: ../ui/evolution-mail-message.xml.h:65
 msgid "Open a window for composing a mail message"
 msgstr "เปิดหน้าต่างสำหรับการเขียนข้อความเมล"
 
-#: ../ui/evolution-mail-message.xml.h:67
+#: ../ui/evolution-mail-message.xml.h:66
 msgid "Open the selected message in a new window"
 msgstr "เปิดข้อความที่เลือกในหน้าต่างใหม่"
 
-#: ../ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-message.xml.h:67
 msgid "Open the selected message in the composer for editing"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-message.xml.h:68
 msgid "P_revious Unread Message"
 msgstr "ข้อความที่ยังไม่ได้อ่าน_ก่อนหน้า"
 
-#: ../ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:70
 msgid "Pos_t New Message to Folder"
 msgstr "แปะ_ประกาศไปยังโฟลเดอร์"
 
-#: ../ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-mail-message.xml.h:71
 msgid "Post a Repl_y"
 msgstr "แปะประกาศตอ_บ"
 
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:72
 msgid "Post a message to a Public folder"
 msgstr "แปะประกาศไปยังโฟลเดอร์สาธารณะ"
 
-#: ../ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Post a reply to a message in a Public folder"
 msgstr "แปะประกาศตอบข้อความในโฟลเดอร์สาธารณะ"
 
-#: ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-mail-message.xml.h:74
 msgid "Pr_evious Important Message"
 msgstr "ข้อความสำคัญ_ก่อนหน้า"
 
-#: ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-mail-message.xml.h:75
 msgid "Preview the message to be printed"
 msgstr "ดูตัวอย่างข้อความก่อนพิมพ์"
 
-#: ../ui/evolution-mail-message.xml.h:80
+#: ../ui/evolution-mail-message.xml.h:79
 msgid "Print this message"
 msgstr "พิมพ์ข้อความนี้"
 
-#: ../ui/evolution-mail-message.xml.h:81
+#: ../ui/evolution-mail-message.xml.h:80
 msgid "Re_direct"
 msgstr "เปลี่ยนเ_ส้นทาง"
 
-#: ../ui/evolution-mail-message.xml.h:82
+#: ../ui/evolution-mail-message.xml.h:81
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "เปลี่ยนเส้นทาง (bounce) ข้อความที่เลือกไปยังผู้อื่น"
 
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:85
 msgid "Reset the text to its original size"
 msgstr "ตั้งขนาดอักษรข้อความกลับไปค่าเดิม"
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Save the message as a text file"
 msgstr "บันทึกข้อความลงเป็นแฟ้มข้อความ"
 
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Search Folder from Mailing _List..."
 msgstr "สร้างโฟลเดอร์ค้นหาจากเ_มลลิงลิสต์..."
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Search Folder from Recipients..."
 msgstr "สร้างโฟลเดอร์ค้นหาจากชื่อผู้_รับ..."
 
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:89
 msgid "Search Folder from S_ubject..."
 msgstr "สร้างโฟลเดอร์ค้นหาจากชื่อเ_รื่อง..."
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Search Folder from Sen_der..."
 msgstr "สร้างโฟลเดอร์ค้นหาจากชื่อผู้_ส่ง..."
 
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "ค้นหาข้อความในตัวข้อความที่แสดงอยู่"
 
-#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Select _All Text"
 msgstr "เลือกเนื้อความทั้ง_หมด"
 
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Select all the text in a message"
 msgstr "เลือกเนื้อความทั้งหมดในข้อความ"
 
-#: ../ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Set up the page settings for your current printer"
 msgstr "กำหนดการตั้งค่าสำหรับเครื่องพิมพ์ปัจจุบันของคุณ"
 
-#: ../ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "แสดงเคอร์เซอร์กะพริบในเนื้อความของข้อความที่แสดง"
+msgstr "แสดงเคอร์เซอร์กระพริบในเนื้อความของข้อความที่แสดง"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "แสดงข้อความในรูปแบบปกติ"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "แสดงข้อความพร้อมด้วยส่วนหัวของอีเมลทั้งหมด"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "แสดงข้อมูลดิบของอีเมลของข้อความ"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Un-delete the selected messages"
 msgstr "ไม่ลบข้อความที่เลือก"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "Uni_mportant"
 msgstr "ไ_ม่สำคัญ"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "Zoom _Out"
 msgstr "ขยาย_ออก"
 
-#: ../ui/evolution-mail-message.xml.h:103
-msgid "_Attached"
-msgstr "แ_นบ"
-
-#: ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Caret Mode"
 msgstr "ใช้เ_คอร์เซอร์"
 
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "_ลบข้อความ"
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
 msgstr "_ค้นหาในข้อความ..."
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Go To"
 msgstr "ไป_ยัง"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Important"
 msgstr "_สำคัญ"
 
-#: ../ui/evolution-mail-message.xml.h:113
-msgid "_Inline"
-msgstr "ใ_นข้อความ"
-
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Junk"
 msgstr "เมล_ขยะ"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Load Images"
 msgstr "โ_หลดภาพ"
 
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Next Message"
 msgstr "ข้อความ_ถัดไป"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Normal Size"
 msgstr "ขนาด_ปกติ"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Not Junk"
 msgstr "ไม่ใช่เมล_ขยะ"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Open in New Window"
 msgstr "เปิดใน_หน้าต่างใหม่"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Previous Message"
 msgstr "ข้อความ_ก่อนหน้า"
 
-#: ../ui/evolution-mail-message.xml.h:124
-msgid "_Quoted"
-msgstr "อ้าง_คำพูด"
-
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:123
 msgid "_Save Message..."
 msgstr "_บันทึกข้อความ..."
 
-#: ../ui/evolution-mail-message.xml.h:128
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Undelete Message"
 msgstr "เรียก_คืนข้อความที่ลบ"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:125
 msgid "_Unread"
 msgstr "_ยังไม่ได้อ่าน"
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Zoom In"
 msgstr "_ขยายเข้า"
 
+#.
+#. <cmd name="FileSave" _label="Save"
+#. _tip="Save the current file" pixtype="stock" pixname="Save"
+#. accel="*Ctrl*s"/>
+#.
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+#: ../ui/evolution-message-composer.xml.h:4
+#: ../ui/evolution-signature-editor.xml.h:7
+msgid "Close"
+msgstr "ปิด"
+
 #: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "ปิดหน้าต่างนี้"
@@ -18616,37 +17973,17 @@ msgstr "ปิดหน้าต่างนี้"
 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-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:42 ../ui/evolution-subscribe.xml.h:9
+msgid "_Close"
+msgstr "ปิ_ด"
 
-#: ../ui/evolution-memos.xml.h:18
-msgid "_Open Memo"
-msgstr "เ_ปิดบันทึกข้อความ"
+#: ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:45
+#: ../ui/evolution-signature-editor.xml.h:24
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:36
+msgid "_File"
+msgstr "แ_ฟ้ม"
 
 #: ../ui/evolution-message-composer.xml.h:1
 msgid "Attach"
@@ -18658,7 +17995,7 @@ msgstr "แนบแฟ้ม"
 
 #: ../ui/evolution-message-composer.xml.h:3
 msgid "Check to get delivery notification when your message is read"
-msgstr "กาเลือกเพื่อรับการแจ้งเมื่อข้อความของคุณถูกเปิดอ่าน"
+msgstr ""
 
 #.
 #. <cmd name="FileSave" _label="Save"
@@ -18672,7 +18009,7 @@ msgstr "ปิดแฟ้มปัจจุบัน"
 
 #: ../ui/evolution-message-composer.xml.h:6
 msgid "Delete all but signature"
-msgstr "ลบทั้งหมดยกเว้นลายเซ็น"
+msgstr ""
 
 #: ../ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with PGP"
@@ -18705,7 +18042,7 @@ msgstr ""
 
 #: ../ui/evolution-message-composer.xml.h:15
 msgid "Request read receipt"
-msgstr "ร้องขอการแจ้งรับข้อความ"
+msgstr ""
 
 #: ../ui/evolution-message-composer.xml.h:16
 msgid "S/MIME Encrypt"
@@ -18720,8 +18057,9 @@ msgid "Save As"
 msgstr "บันทึกเป็น"
 
 #: ../ui/evolution-message-composer.xml.h:20
+#, fuzzy
 msgid "Save Draft"
-msgstr "บันทึกฉบับร่าง"
+msgstr "บันทึกฉบับ_ร่าง"
 
 #: ../ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
@@ -18732,8 +18070,9 @@ msgid "Save _Draft"
 msgstr "บันทึกฉบับ_ร่าง"
 
 #: ../ui/evolution-message-composer.xml.h:23
+#, fuzzy
 msgid "Save as draft"
-msgstr "บันทึกเป็นฉบับร่าง"
+msgstr "บันทึกฉบับ_ร่าง"
 
 #: ../ui/evolution-message-composer.xml.h:24
 msgid "Save in folder..."
@@ -18762,7 +18101,7 @@ msgstr "ส่งข้อความนี้"
 
 #: ../ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your PGP key"
-msgstr "เซ็นกำกับข้อความนี้ด้วยคีย์ PGP ของคุณ"
+msgstr ""
 
 #: ../ui/evolution-message-composer.xml.h:32
 msgid "Sign this message with your S/MIME Signature Certificate"
@@ -18770,27 +18109,27 @@ msgstr ""
 
 #: ../ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the BCC field is displayed"
-msgstr "ซ่อน/แสดงช่อง สำเนาลับถึง (BCC)"
+msgstr ""
 
 #: ../ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the CC field is displayed"
-msgstr "ซ่อน/แสดงช่อง สำเนาถึง (CC)"
+msgstr ""
 
 #: ../ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the From chooser is displayed"
-msgstr "ซ่อน/แสดงตัวเลือกผู้ส่ง"
+msgstr ""
 
 #: ../ui/evolution-message-composer.xml.h:36
 msgid "Toggles whether the Post-To field is displayed"
-msgstr "ซ่อน/แสดงช่อง ประกาศที่ (Post-To)"
+msgstr ""
 
 #: ../ui/evolution-message-composer.xml.h:37
 msgid "Toggles whether the Reply-To field is displayed"
-msgstr "ซ่อน/แสดงช่อง ที่อยู่ตอบกลับ (Reply-To)"
+msgstr ""
 
 #: ../ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the To field is displayed"
-msgstr "ซ่อน/แสดงช่อง ถึง (To)"
+msgstr ""
 
 #: ../ui/evolution-message-composer.xml.h:39
 msgid "_Attachment..."
@@ -18810,7 +18149,12 @@ msgstr "_ลบทั้งหมด"
 
 #: ../ui/evolution-message-composer.xml.h:46
 msgid "_From Field"
-msgstr "ช่อง_จาก"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-signature-editor.xml.h:25
+msgid "_Insert"
+msgstr "แ_ทรก"
 
 #: ../ui/evolution-message-composer.xml.h:48
 msgid "_Open..."
@@ -18818,11 +18162,11 @@ msgstr "เปิ_ด..."
 
 #: ../ui/evolution-message-composer.xml.h:49
 msgid "_Post-To Field"
-msgstr "ช่อง_ประกาศที่"
+msgstr ""
 
 #: ../ui/evolution-message-composer.xml.h:50
 msgid "_Reply-To Field"
-msgstr "ช่อง_ที่อยู่ตอบกลับ"
+msgstr ""
 
 #: ../ui/evolution-message-composer.xml.h:52
 msgid "_Security"
@@ -18830,7 +18174,7 @@ msgstr ""
 
 #: ../ui/evolution-message-composer.xml.h:53
 msgid "_To Field"
-msgstr "ช่อง_ถึง"
+msgstr ""
 
 #: ../ui/evolution-signature-editor.xml.h:1
 msgid "C_lose"
@@ -18883,22 +18227,6 @@ msgstr ""
 msgid "_Invert Selection"
 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:10
-msgid "Status Details"
-msgstr "รายละเอียดสถานะ"
-
-#: ../ui/evolution-task-editor.xml.h:11
-msgid "Time Zone"
-msgstr "เขตเวลา"
-
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Status Details"
-msgstr "รายละเอียด_สถานะ"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "คัดลอกงานที่เลือก"
@@ -18936,18 +18264,10 @@ 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
+#: ../ui/evolution-tasks.xml.h:25
 msgid "_Open Task"
 msgstr "เ_ปิดงาน"
 
@@ -19060,58 +18380,58 @@ msgid "Tool_bar style"
 msgstr "_รูปแบบแถบเครื่องมือ"
 
 #: ../ui/evolution.xml.h:33
-msgid "View/Hide the Status Bar"
-msgstr ""
-
-#: ../ui/evolution.xml.h:34
 msgid "_About Evolution..."
 msgstr "เ_กี่ยวกับ Evolution..."
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:34
 msgid "_Close Window"
 msgstr "_ปิดหน้าต่าง"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:37
+msgid "_Help"
+msgstr "_วิธีใช้"
+
+#: ../ui/evolution.xml.h:38
 msgid "_Hide buttons"
 msgstr "_ซ่อนปุ่ม"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:39
 msgid "_Icons only"
 msgstr "ไ_อคอนเท่านั้น"
 
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:40
 msgid "_Import..."
 msgstr "_นำเข้า..."
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:41
 msgid "_New"
 msgstr "สร้างใ_หม่"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:42
 msgid "_Quick Reference"
 msgstr "เอกสาร_อ้างอิงด่วน"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:43
+msgid "_Quit"
+msgstr "_ออก"
+
+#: ../ui/evolution.xml.h:44
 msgid "_Send / Receive"
 msgstr "_รับ / ส่ง"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:45
 msgid "_Switcher Appearance"
 msgstr "รูปแบบของ_ปุ่มเลือก"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:46
 msgid "_Synchronization Options..."
 msgstr "_ตัวเลือกการ sync..."
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:47
 msgid "_Text only"
 msgstr "_ข้อความเท่านั้น"
 
-#: ../ui/evolution.xml.h:50
-msgid "_View Status Bar"
-msgstr "_ดูแถบสถานะ"
-
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:49
 msgid "_Window"
 msgstr "_หน้าต่าง"
 
@@ -19171,10 +18491,6 @@ msgstr "ตามธงการ_ติดตามกระทู้"
 msgid "_Messages"
 msgstr "_ข้อความ"
 
-#: ../views/memos/galview.xml.h:1
-msgid "_Memos"
-msgstr "_บันทึกข้อความ"
-
 #: ../views/tasks/galview.xml.h:1
 msgid "With _Due Date"
 msgstr "แสดง_กำหนดเสร็จ"
@@ -19215,8 +18531,9 @@ msgstr ""
 
 #: ../widgets/menus/gal-define-views-dialog.c:76
 #: ../widgets/menus/gal-define-views-model.c:188
+#, fuzzy
 msgid "Collection"
-msgstr ""
+msgstr "สถานที่"
 
 #: ../widgets/menus/gal-define-views-dialog.c:325
 #: ../widgets/menus/gal-define-views.glade.h:4
@@ -19226,13 +18543,14 @@ msgstr "กำหนดมุมมองสำหรับ %s"
 
 #: ../widgets/menus/gal-define-views-dialog.c:333
 #: ../widgets/menus/gal-define-views-dialog.c:335
+#, fuzzy
 msgid "Define Views"
-msgstr "กำหนดมุมมอง"
+msgstr "กำหนดมุมมอง..."
 
 #: ../widgets/menus/gal-define-views.glade.h:2
-#, no-c-format
+#, fuzzy, no-c-format
 msgid "Define Views for \"%s\""
-msgstr "กำหนดมุมมองสำหรับ \"%s\""
+msgstr "กำหนดมุมมอง..."
 
 #: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit..."
@@ -19246,8 +18564,9 @@ msgid "Table"
 msgstr "ตาราง"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:182
+#, fuzzy
 msgid "Instance"
-msgstr ""
+msgstr "ทุกกรณี"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:232
 msgid "Save Current View"
@@ -19261,20 +18580,9 @@ msgstr "_สร้างมุมมองใหม่"
 msgid "_Replace existing view"
 msgstr "ใช้แ_ทนมุมมองที่มีอยู่"
 
-#. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:585
-#: ../widgets/menus/gal-view-menus.c:350
-msgid "Custom View"
-msgstr "มุมมองกำหนดเอง"
-
-#: ../widgets/menus/gal-view-instance.c:586
-msgid "Save Custom View"
-msgstr "บันทึกมุมมองที่กำหนดเอง"
-
-#: ../widgets/menus/gal-view-instance.c:590
-#: ../widgets/menus/gal-view-menus.c:372
-msgid "Define Views..."
-msgstr "กำหนดมุมมอง..."
+#: ../widgets/menus/gal-view-menus.c:291
+msgid "_Current View"
+msgstr "_มุมมองปัจจุบัน"
 
 #: ../widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View..."
@@ -19293,8 +18601,9 @@ msgid "Name of new view:"
 msgstr "ชื่อของมุมมองใหม่:"
 
 #: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#, fuzzy
 msgid "Type of View"
-msgstr ""
+msgstr "มุมมองวัน"
 
 #: ../widgets/menus/gal-view-new-dialog.glade.h:4
 msgid "Type of view:"
@@ -19323,8 +18632,9 @@ msgstr "ปฏิทินเดือน"
 #: ../widgets/misc/e-canvas-background.c:457 ../widgets/text/e-entry.c:1284
 #: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3540
 #: ../widgets/text/e-text.c:3541
+#, fuzzy
 msgid "Fill color"
-msgstr "สีเติม"
+msgstr "สี"
 
 #: ../widgets/misc/e-canvas-background.c:463
 #: ../widgets/misc/e-canvas-background.c:464
@@ -19335,7 +18645,7 @@ msgstr "สีเติม"
 #: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3555
 #: ../widgets/text/e-text.c:3556
 msgid "GDK fill color"
-msgstr "สีเติมของ GDK"
+msgstr ""
 
 #: ../widgets/misc/e-canvas-background.c:477
 #: ../widgets/misc/e-canvas-background.c:478 ../widgets/text/e-entry.c:1305
@@ -19369,25 +18679,26 @@ msgstr "Y2"
 #: ../widgets/table/e-table-group-leaf.c:636
 #: ../widgets/table/e-table-item.c:3005
 msgid "Minimum width"
-msgstr "ความกว้างต่ำสุด"
+msgstr ""
 
 #: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1431
 #: ../widgets/table/e-table-group-container.c:979
 #: ../widgets/table/e-table-group-leaf.c:637
 #: ../widgets/table/e-table-item.c:3006
+#, fuzzy
 msgid "Minimum Width"
-msgstr "ความกว้างต่ำสุด"
+msgstr "ความกว้างสดมภ์"
 
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
 #: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr ""
 
-#: ../widgets/misc/e-cell-date-edit.c:233 ../widgets/misc/e-dateedit.c:460
+#: ../widgets/misc/e-cell-date-edit.c:232 ../widgets/misc/e-dateedit.c:451
 msgid "Now"
 msgstr "ขณะนี้"
 
-#: ../widgets/misc/e-cell-date-edit.c:802
+#: ../widgets/misc/e-cell-date-edit.c:801
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "เวลาต้องอยู่ในรูปแบบ: %s"
@@ -19484,31 +18795,31 @@ msgstr "อื่นๆ ..."
 msgid "..."
 msgstr "..."
 
-#: ../widgets/misc/e-dateedit.c:320
+#: ../widgets/misc/e-dateedit.c:316
 msgid "Date and Time Entry"
 msgstr "รายการเวลาและวันที่"
 
-#: ../widgets/misc/e-dateedit.c:339
+#: ../widgets/misc/e-dateedit.c:335
 msgid "Text entry to input date"
 msgstr "รายการข้อความเพื่อป้อนข้อมูลวันที่"
 
-#: ../widgets/misc/e-dateedit.c:340
+#: ../widgets/misc/e-dateedit.c:336
 msgid "Text Date Entry"
 msgstr "รายการวันที่ข้อความ"
 
-#: ../widgets/misc/e-dateedit.c:361
+#: ../widgets/misc/e-dateedit.c:353
 msgid "Click this button to show a calendar"
 msgstr "คลิกที่ปุ่มนี้เพื่อแสดงปฏิทิน"
 
-#: ../widgets/misc/e-dateedit.c:362
+#: ../widgets/misc/e-dateedit.c:354
 msgid "Date Button"
 msgstr "ปุ่มวันที่"
 
-#: ../widgets/misc/e-dateedit.c:383
+#: ../widgets/misc/e-dateedit.c:374
 msgid "Combo box to select time"
 msgstr "กล่องคอมโบเพื่อเลือกเวลา"
 
-#: ../widgets/misc/e-dateedit.c:384
+#: ../widgets/misc/e-dateedit.c:375
 msgid "Time Combo Box"
 msgstr "กล่องคอมโบเวลา"
 
@@ -19614,8 +18925,9 @@ msgid "Sync Categories:"
 msgstr ""
 
 #: ../widgets/misc/e-reflow.c:1452 ../widgets/misc/e-reflow.c:1453
+#, fuzzy
 msgid "Empty message"
-msgstr "ข้อความว่างเปล่า"
+msgstr "แ_ก้ไขข้อความ"
 
 #: ../widgets/misc/e-reflow.c:1459 ../widgets/misc/e-reflow.c:1460
 msgid "Reflow model"
@@ -19627,41 +18939,41 @@ msgstr "ความกว้างคอลัมน์"
 
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:346
+#: ../widgets/misc/e-search-bar.c:345
 msgid "Search Text Entry"
 msgstr "ค้นหารายการข้อความ"
 
-#: ../widgets/misc/e-search-bar.c:550
+#: ../widgets/misc/e-search-bar.c:549
 msgid "_Search"
 msgstr "_ค้นหา"
 
-#: ../widgets/misc/e-search-bar.c:556
+#: ../widgets/misc/e-search-bar.c:555
 msgid "_Find Now"
 msgstr "_ค้นหาเดี๋ยวนี้"
 
-#: ../widgets/misc/e-search-bar.c:557 ../widgets/misc/e-search-bar.c:944
+#: ../widgets/misc/e-search-bar.c:556 ../widgets/misc/e-search-bar.c:943
 msgid "_Clear"
 msgstr "_ล้าง"
 
-#: ../widgets/misc/e-search-bar.c:648
+#: ../widgets/misc/e-search-bar.c:647
 msgid "Search Type"
 msgstr "ชนิดการค้นหา"
 
-#: ../widgets/misc/e-search-bar.c:852
+#: ../widgets/misc/e-search-bar.c:851
 msgid "Item ID"
 msgstr ""
 
-#: ../widgets/misc/e-search-bar.c:859
+#: ../widgets/misc/e-search-bar.c:858
 msgid "Subitem ID"
 msgstr ""
 
-#: ../widgets/misc/e-search-bar.c:866 ../widgets/text/e-entry.c:1249
+#: ../widgets/misc/e-search-bar.c:865 ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3462
 #: ../widgets/text/e-text.c:3463
 msgid "Text"
 msgstr "ข้อความ"
 
-#: ../widgets/misc/e-search-bar.c:946
+#: ../widgets/misc/e-search-bar.c:945
 msgid "Find _Now"
 msgstr "ค้นหา เ_ดี๋ยวนี้"
 
@@ -19680,12 +18992,13 @@ msgid "Sorter"
 msgstr ""
 
 #: ../widgets/misc/e-selection-model.c:221
+#, fuzzy
 msgid "Selection Mode"
-msgstr "โหมดการเลือก"
+msgstr "เลือกโฟลเดอร์"
 
 #: ../widgets/misc/e-selection-model.c:229
 msgid "Cursor Mode"
-msgstr "โหมดของเคอร์เซอร์"
+msgstr ""
 
 #: ../widgets/misc/e-send-options.c:521
 msgid "When de_leted:"
@@ -19790,8 +19103,9 @@ msgid "_All information"
 msgstr "_ข้อมูลทั้งหมด"
 
 #: ../widgets/misc/e-send-options.glade.h:29
+#, fuzzy
 msgid "_Delay message delivery"
-msgstr "_หน่วงการส่งข้อความ"
+msgstr "การส่งข้อความ_ล่าช้า"
 
 #: ../widgets/misc/e-send-options.glade.h:30
 msgid "_Delivered"
@@ -19852,8 +19166,9 @@ msgid "%l:%M %p"
 msgstr "%l:%M %p"
 
 #: ../widgets/table/e-cell-pixbuf.c:397
+#, fuzzy
 msgid "Selected Column"
-msgstr "คอลัมน์ที่เลือก"
+msgstr "เลือกโฟลเดอร์"
 
 #: ../widgets/table/e-cell-pixbuf.c:404
 msgid "Focused Column"
@@ -19868,8 +19183,9 @@ msgid "Strikeout Column"
 msgstr ""
 
 #: ../widgets/table/e-cell-text.c:1747
+#, fuzzy
 msgid "Underline Column"
-msgstr ""
+msgstr "ใช้ขีดเส้นใต้"
 
 #: ../widgets/table/e-cell-text.c:1754
 msgid "Bold Column"
@@ -19967,8 +19283,9 @@ msgid "_Sort..."
 msgstr "เ_รียง..."
 
 #: ../widgets/table/e-table-config.c:150
+#, fuzzy
 msgid "State"
-msgstr ""
+msgstr "เริ่ม"
 
 #: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
 msgid "(Ascending)"
@@ -19987,8 +19304,9 @@ msgid "No grouping"
 msgstr "ไม่จัดกลุ่ม"
 
 #: ../widgets/table/e-table-config.c:584
+#, fuzzy
 msgid "Available Fields"
-msgstr ""
+msgstr "เขตข้อมูลที่เขียนได้"
 
 #: ../widgets/table/e-table-config.glade.h:17
 msgid "_Group By..."
@@ -20002,23 +19320,26 @@ msgstr "แ_สดงเขตข้อมูลต่อไปนี้ตา�
 #: ../widgets/table/e-table-field-chooser-item.c:646
 #: ../widgets/table/e-table-field-chooser.c:79
 #: ../widgets/table/e-table-header-item.c:1810
+#, fuzzy
 msgid "DnD code"
-msgstr ""
+msgstr "ยูนิโค้ด "
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
 #: ../widgets/table/e-table-field-chooser-item.c:653
 #: ../widgets/table/e-table-field-chooser.c:86
 #: ../widgets/table/e-table-header-item.c:1824
+#, fuzzy
 msgid "Full Header"
-msgstr ""
+msgstr "หัวกระดาษ"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:126
 msgid "Add a column..."
 msgstr "เพิ่มคอลัมน์..."
 
 #: ../widgets/table/e-table-field-chooser.glade.h:1
+#, fuzzy
 msgid "Field Chooser"
-msgstr ""
+msgstr "ชื่อเขตข้อมูล "
 
 #: ../widgets/table/e-table-field-chooser.glade.h:2
 msgid ""
@@ -20039,14 +19360,14 @@ msgid "%s : %s (%d items)"
 msgstr ""
 
 #: ../widgets/table/e-table-group-container.c:356
-#, c-format
+#, fuzzy, c-format
 msgid "%s (%d item)"
-msgstr "%s (%d รายการ)"
+msgstr "%s (%d%% เสร็จสมบูรณ์)"
 
 #: ../widgets/table/e-table-group-container.c:357
-#, c-format
+#, fuzzy, c-format
 msgid "%s (%d items)"
-msgstr "%s (%d รายการ)"
+msgstr "%s (%d%% เสร็จสมบูรณ์)"
 
 #: ../widgets/table/e-table-group-container.c:901
 #: ../widgets/table/e-table-group-container.c:902
@@ -20062,8 +19383,9 @@ msgstr ""
 #: ../widgets/table/e-table-group-leaf.c:581
 #: ../widgets/table/e-table-item.c:2970 ../widgets/table/e-table-item.c:2971
 #: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
+#, fuzzy
 msgid "Horizontal Draw Grid"
-msgstr ""
+msgstr "ตำแหน่งของ Horizontal pane"
 
 #: ../widgets/table/e-table-group-container.c:915
 #: ../widgets/table/e-table-group-container.c:916
@@ -20071,8 +19393,9 @@ msgstr ""
 #: ../widgets/table/e-table-group-leaf.c:588
 #: ../widgets/table/e-table-item.c:2977 ../widgets/table/e-table-item.c:2978
 #: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
+#, fuzzy
 msgid "Vertical Draw Grid"
-msgstr ""
+msgstr "ตำแหน่ง Vertical pane"
 
 #: ../widgets/table/e-table-group-container.c:922
 #: ../widgets/table/e-table-group-container.c:923
@@ -20096,8 +19419,9 @@ msgstr ""
 #: ../widgets/table/e-table-group-leaf.c:615
 #: ../widgets/table/e-table-group-leaf.c:616
 #: ../widgets/table/e-table-item.c:2956 ../widgets/table/e-table-item.c:2957
+#, fuzzy
 msgid "Selection model"
-msgstr ""
+msgstr "เลือกโฟลเดอร์"
 
 #: ../widgets/table/e-table-group-container.c:943
 #: ../widgets/table/e-table-group-container.c:944
@@ -20123,8 +19447,9 @@ msgstr ""
 #: ../widgets/table/e-table-group-container.c:958
 #: ../widgets/table/e-table-group-leaf.c:643
 #: ../widgets/table/e-table-group-leaf.c:644
+#, fuzzy
 msgid "Frozen"
-msgstr ""
+msgstr "จาก"
 
 #: ../widgets/table/e-table-header-item.c:1472
 msgid "Customize Current View"
@@ -20147,8 +19472,9 @@ msgid "Group By This Field"
 msgstr "จัดกลุ่มตามเขตข้อมูลนี้"
 
 #: ../widgets/table/e-table-header-item.c:1497
+#, fuzzy
 msgid "Group By Box"
-msgstr "จัดกลุ่มตามกล่อง"
+msgstr "จัดกลุ่มตามเ_ธรด"
 
 #: ../widgets/table/e-table-header-item.c:1499
 msgid "Remove This Column"
@@ -20159,8 +19485,9 @@ msgid "Add a Column..."
 msgstr "เพิ่มคอลัมน์..."
 
 #: ../widgets/table/e-table-header-item.c:1502
+#, fuzzy
 msgid "Alignment"
-msgstr "การจัดชิดขอบ"
+msgstr "งานมอบหมาย"
 
 #: ../widgets/table/e-table-header-item.c:1503
 msgid "Best Fit"
@@ -20176,8 +19503,9 @@ msgstr "ปรับแต่งมุมมองปัจจุบัน..."
 
 #: ../widgets/table/e-table-header-item.c:1817 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
+#, fuzzy
 msgid "Fontset"
-msgstr ""
+msgstr "ตัวอักษร"
 
 #: ../widgets/table/e-table-header-item.c:1838
 #: ../widgets/table/e-table-sorter.c:175
@@ -20187,8 +19515,9 @@ msgstr ""
 #: ../widgets/table/e-table-header-item.c:1852
 #: ../widgets/table/e-tree-scrolled.c:223
 #: ../widgets/table/e-tree-scrolled.c:224
+#, fuzzy
 msgid "Tree"
-msgstr ""
+msgstr "ว่าง"
 
 #: ../widgets/table/e-table-item.c:2942 ../widgets/table/e-table-item.c:2943
 msgid "Table header"
@@ -20203,12 +19532,14 @@ msgid "Cursor row"
 msgstr ""
 
 #: ../widgets/table/e-table.c:3330
+#, fuzzy
 msgid "Always Search"
-msgstr ""
+msgstr "การค้นหาขั้นสูง"
 
 #: ../widgets/table/e-table.c:3337
+#, fuzzy
 msgid "Use click to add"
-msgstr "คลิกเพื่อเพิ่ม"
+msgstr "คลิกเพื่อเพิ่มงาน"
 
 #: ../widgets/table/e-tree.c:3290 ../widgets/table/e-tree.c:3291
 msgid "ETree table adapter"
@@ -20231,8 +19562,9 @@ msgid "Minicard Test"
 msgstr ""
 
 #: ../widgets/text/e-entry-test.c:50
+#, fuzzy
 msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "Copyright (C) 2000, Helix Code, Inc."
+msgstr "Copyright (C) 2000, Ximian, Inc."
 
 #: ../widgets/text/e-entry-test.c:52
 msgid "This should test the minicard canvas item"
@@ -20240,16 +19572,19 @@ msgstr ""
 
 #: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
 #: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
+#, fuzzy
 msgid "Event Processor"
-msgstr ""
+msgstr "ใส่รหัสผ่าน"
 
 #: ../widgets/text/e-entry.c:1256 ../widgets/text/e-entry.c:1257
+#, fuzzy
 msgid "Font"
-msgstr "แบบอักษร"
+msgstr "ตัวอักษร"
 
 #: ../widgets/text/e-entry.c:1270 ../widgets/text/e-entry.c:1271
+#, fuzzy
 msgid "GDKFont"
-msgstr "แบบอักษร GDK"
+msgstr "ตัวอักษร"
 
 #: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
 #: ../widgets/text/e-text.c:3491 ../widgets/text/e-text.c:3492
@@ -20268,71 +19603,81 @@ msgstr ""
 
 #: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
 #: ../widgets/text/e-text.c:3605 ../widgets/text/e-text.c:3606
+#, fuzzy
 msgid "Line wrap"
-msgstr "ตัดบรรทัด"
+msgstr "ไลบีเรีย"
 
 #: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
 #: ../widgets/text/e-text.c:3612 ../widgets/text/e-text.c:3613
 msgid "Break characters"
-msgstr "ตัดที่อักขระ"
+msgstr ""
 
 #: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
 #: ../widgets/text/e-text.c:3619 ../widgets/text/e-text.c:3620
+#, fuzzy
 msgid "Max lines"
-msgstr "จำนวนบรรทัดสูงสุด"
+msgstr "มัลดีฟส์"
 
 #: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
 #: ../widgets/text/e-text.c:3648 ../widgets/text/e-text.c:3649
 msgid "Allow newlines"
-msgstr "แทรกอักขระขึ้นบรรทัดใหม่ได้"
+msgstr ""
 
 #: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
 #: ../widgets/text/e-text.c:3641 ../widgets/text/e-text.c:3642
 msgid "Draw borders"
-msgstr "วาดขอบ"
+msgstr ""
 
 #: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
 #: ../widgets/text/e-text.c:3655 ../widgets/text/e-text.c:3656
+#, fuzzy
 msgid "Draw background"
-msgstr "วาดพื้นหลัง"
+msgstr "ตั้งเป็น_พื้นหลัง"
 
 #: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
 #: ../widgets/text/e-text.c:3662 ../widgets/text/e-text.c:3663
+#, fuzzy
 msgid "Draw button"
-msgstr "วาดปุ่ม"
+msgstr "ปุ่มวันที่"
 
 #: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
 #: ../widgets/text/e-text.c:3669 ../widgets/text/e-text.c:3670
+#, fuzzy
 msgid "Cursor position"
-msgstr "ตำแหน่งเคอร์เซอร์"
+msgstr "ตำแหน่ง"
 
 #: ../widgets/text/e-entry.c:1389 ../widgets/text/e-entry.c:1390
 msgid "Emulate label resize"
-msgstr "จำลองการปรับขนาดฉลาก"
+msgstr ""
 
 #: ../widgets/text/e-text.c:2696
+#, fuzzy
 msgid "Input Methods"
-msgstr "วิธีป้อนข้อความ"
+msgstr "แฟ้มนำเข้า"
 
 #: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
+#, fuzzy
 msgid "Bold"
-msgstr "หนา"
+msgstr "โฟลเดอร์"
 
 #: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
 msgid "Strikeout"
-msgstr "ขีดฆ่า"
+msgstr ""
 
 #: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
+#, fuzzy
 msgid "Anchor"
-msgstr ""
+msgstr "อันดอร์รา"
 
 #: ../widgets/text/e-text.c:3498 ../widgets/text/e-text.c:3499
+#, fuzzy
 msgid "Clip Width"
-msgstr ""
+msgstr "ความกว้างสดมภ์"
 
 #: ../widgets/text/e-text.c:3505 ../widgets/text/e-text.c:3506
+#, fuzzy
 msgid "Clip Height"
-msgstr ""
+msgstr "สูง"
 
 #: ../widgets/text/e-text.c:3512 ../widgets/text/e-text.c:3513
 msgid "Clip"
@@ -20352,78 +19697,17 @@ msgstr ""
 
 #: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
 msgid "Text width"
-msgstr "ความกว้างข้อความ"
+msgstr ""
 
 #: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
 msgid "Text height"
-msgstr "ความสูงข้อความ"
+msgstr ""
 
 #: ../widgets/text/e-text.c:3676 ../widgets/text/e-text.c:3677
+#, fuzzy
 msgid "IM Context"
-msgstr ""
+msgstr "มอนต์เซร์แร็ต"
 
 #: ../widgets/text/e-text.c:3683 ../widgets/text/e-text.c:3684
 msgid "Handle Popup"
 msgstr ""
-
-#~ msgid "Discard Changes"
-#~ msgstr "ละเลยการเปลี่ยนแปลง"
-
-#~ msgid "description of appointment"
-#~ msgstr "คำอธิบายการนัดหมาย"
-
-#~ msgid "Dismiss"
-#~ msgstr "ไม่สนใจ"
-
-#~ msgid "Dismiss All"
-#~ msgstr "ไม่สนใจทั้งหมด"
-
-#~ msgid ""
-#~ "Alarm on %s\n"
-#~ "%s\n"
-#~ "Starting at %s\n"
-#~ "Ending at %s"
-#~ msgstr ""
-#~ "เตือนเมื่อ %s\n"
-#~ "%s\n"
-#~ "เริ่มต้นที่ %s\n"
-#~ "สิ้นสุดที่ %s"
-
-#~ msgid "_Attachment Bar (drop attachments here)"
-#~ msgstr "แ_ถบเอกสารแนบ (วางเอกสารแนบที่นี่)"
-
-#~ msgid "Scheduling"
-#~ msgstr "กำหนดการ"
-
-#~ msgid "Invitations"
-#~ msgstr "การเชิญ"
-
-#~ msgid "<b>Basics</b>"
-#~ msgstr "<b>พื้นฐาน</b>"
-
-#~ msgid "<b>Date and Time</b>"
-#~ msgstr "<b>วันและเวลา</b>"
-
-#~ msgid "<b>Send Options</b>"
-#~ msgstr "<b>ส่งตัวเลือก</b>"
-
-#~ msgid "This appointment has customized alarms"
-#~ msgstr "การนัดหมายนี้มีการแจ้งเตือนที่กำหนดขึ้นเอง"
-
-#~ msgid "_Alarm"
-#~ msgstr "แ_จ้งเตือน"
-
-#~ msgid "Assignment"
-#~ msgstr "งานมอบหมาย"
-
-#~ msgid "Task Description"
-#~ msgstr "คำอธิบายงาน"
-
-#~ msgid "Current View"
-#~ msgstr "มุมมองปัจจุบัน"
-
-#~ msgid "Meetings and Tasks"
-#~ msgstr "ประชุมและงาน"
-
-#~ msgid "_Preview Pane"
-#~ msgstr "ช่องแสดง_ตัวอย่าง"
diff --git a/po/tr.po b/po/tr.po
index cc25d0aa0a..d4c1ccaf81 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-11 17:30+0200\n"
+"POT-Creation-Date: 2005-09-05 18:14+0300\n"
 "PO-Revision-Date: 2005-09-02 23:54+0300\n"
 "Last-Translator: Baris Cicek <baris@teamforce.name.tr>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
@@ -755,7 +755,7 @@ msgstr ""
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/tasks-component.c:441 ../mail/em-filter-i18n.h:11
 #: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:26 ../ui/evolution-tasks.xml.h:6
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Sil"
 
@@ -2831,7 +2831,7 @@ msgstr "Bağlantılara İleti Gönder"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:942
 #: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2501
 #: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-tasks.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Yazdır"
 
@@ -2851,7 +2851,7 @@ msgstr "Kes"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:950
 #: ../calendar/gui/calendar-component.c:536
 #: ../calendar/gui/tasks-component.c:440 ../ui/evolution-addressbook.xml.h:2
-#: ../ui/evolution-mail-message.xml.h:12 ../ui/evolution-tasks.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:11 ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopyala"
 
@@ -4203,6 +4203,7 @@ msgstr "Evolution yeniden başlatılmadan görevleriniz ulaşılabilir olmayacak
 
 #: ../calendar/calendar.error.xml.h:64
 #: ../ui/evolution-message-composer.xml.h:51
+#: ../ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Kaydet"
 
@@ -4350,9 +4351,9 @@ msgstr "Dinlenme _zamanı:"
 #: ../ui/evolution-composer-entries.xml.h:8
 #: ../ui/evolution-mail-messagedisplay.xml.h:5
 #: ../ui/evolution-message-composer.xml.h:44
-#: ../ui/evolution-signature-editor.xml.h:23
+#: ../ui/evolution-signature-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:23
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:32
 msgid "_Edit"
 msgstr "Dü_zenle"
 
@@ -5643,7 +5644,7 @@ msgstr[0] "Eklenmiş iletiler"
 #: ../mail/em-folder-tree.c:974 ../mail/em-folder-view.c:1035
 #: ../mail/message-list.c:1708 ../ui/evolution-addressbook.xml.h:31
 #: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
-#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-tasks.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:102 ../ui/evolution-tasks.xml.h:21
 msgid "_Copy"
 msgstr "_Kopyala"
 
@@ -6724,7 +6725,7 @@ msgstr "_Farklı Kaydet..."
 #: ../calendar/gui/e-calendar-view.c:1530 ../mail/em-folder-view.c:1046
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:120 ../ui/evolution-tasks.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-tasks.xml.h:27
 msgid "_Print..."
 msgstr "_Yazdır..."
 
@@ -10811,7 +10812,7 @@ msgid "is not Flagged"
 msgstr "İşaretli değilse"
 
 #: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
-#: ../ui/evolution-mail-message.xml.h:48
+#: ../ui/evolution-mail-message.xml.h:47
 msgid "Junk"
 msgstr "Gereksiz"
 
@@ -11037,11 +11038,11 @@ msgstr "İletiler %s klasörüne kopyalanıyor"
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "İleti(ler) üst seviye konuma taşınamıyor"
 
-#: ../mail/em-folder-tree.c:972 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:972 ../ui/evolution-mail-message.xml.h:103
 msgid "_Copy to Folder"
 msgstr "Klasöre _Kopyala"
 
-#: ../mail/em-folder-tree.c:973 ../ui/evolution-mail-message.xml.h:114
+#: ../mail/em-folder-tree.c:973 ../ui/evolution-mail-message.xml.h:113
 msgid "_Move to Folder"
 msgstr "Klasöre _Taşı"
 
@@ -11051,9 +11052,9 @@ msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" içinde klasörler taranıyor"
 
 #: ../mail/em-folder-tree.c:2031 ../ui/evolution-addressbook.xml.h:44
-#: ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution-mail-global.xml.h:22
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:45
 msgid "_View"
 msgstr "_Göster"
 
@@ -11128,16 +11129,16 @@ msgstr "Klasörün nerede yaratılacağını belirtin:"
 msgid "Reply to _All"
 msgstr "_Herkese Cevapla"
 
-#: ../mail/em-folder-view.c:1040 ../ui/evolution-mail-message.xml.h:122
+#: ../mail/em-folder-view.c:1040 ../ui/evolution-mail-message.xml.h:121
 msgid "_Reply to Sender"
 msgstr "_Gönderene Cevapla"
 
 #: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:548 ../mail/em-popup.c:559
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Forward"
 msgstr "_Yönlendir"
 
-#: ../mail/em-folder-view.c:1044 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1044 ../ui/evolution-mail-message.xml.h:105
 msgid "_Edit as New Message..."
 msgstr "Yeni İleti Olarak _Düzenle..."
 
@@ -11657,7 +11658,7 @@ msgid "_Reply to sender"
 msgstr "_Gönderene cevapla"
 
 #: ../mail/em-popup.c:545 ../mail/em-popup.c:556
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "_Listeye Cevapla"
 
@@ -14133,7 +14134,7 @@ msgstr "Takip"
 msgid "For Your Information"
 msgstr "Bilginiz İçin"
 
-#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:41
 msgid "Forward"
 msgstr "Yönlendir"
 
@@ -14141,11 +14142,11 @@ msgstr "Yönlendir"
 msgid "No Response Necessary"
 msgstr "Cevaba Gerek Yok"
 
-#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:82
+#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply"
 msgstr "Cevapla"
 
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:83
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to All"
 msgstr "Herkese cevapla"
 
@@ -14226,8 +14227,7 @@ msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr ""
 "Evolution verilerini ve ayarlarını yedekleme ve geri alma için bir eklenti."
 
-#. the path to the shared library
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
 msgid "Backup and restore plugin"
 msgstr "Yedekleme ve geri alma eklentisi"
 
@@ -15249,7 +15249,7 @@ msgid "Subscribe to my _notifications"
 msgstr "_Uyarılarıma kayıt ol"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Read"
 msgstr "_Oku"
 
@@ -16115,7 +16115,7 @@ msgstr "Düzenleyiciden mektup çıktısı almanız için bir seçenek verir"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
 #: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-tasks.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Yazdırma Ö_nizlemesi"
 
@@ -16141,8 +16141,7 @@ msgstr ""
 "Bir iletinin tüm eklerini ya da parçalarını bir kerede kaydetmeniz için bir "
 "eklenti."
 
-#. the path to the shared library
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
+#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:2
 msgid "Save attachments"
 msgstr "Ekleri kaydet"
 
@@ -16164,6 +16163,7 @@ msgstr "MIME Türü"
 
 #: ../plugins/save-attachments/save-attachments.c:359
 #: ../ui/evolution-message-composer.xml.h:18
+#: ../ui/evolution-signature-editor.xml.h:6
 msgid "Save"
 msgstr "Kaydet"
 
@@ -16624,7 +16624,7 @@ msgstr "Groupwise Takımı"
 msgid "_Work Online"
 msgstr "Ç_evrimiçi Çalış"
 
-#: ../shell/e-shell-window-commands.c:787 ../ui/evolution.xml.h:50
+#: ../shell/e-shell-window-commands.c:787 ../ui/evolution.xml.h:47
 msgid "_Work Offline"
 msgstr "Çe_vrimdışı Çalış"
 
@@ -17576,7 +17576,7 @@ msgid "View the current contact"
 msgstr "Güncel bağlantıyı göster"
 
 #: ../ui/evolution-addressbook.xml.h:30 ../ui/evolution-calendar.xml.h:38
-#: ../ui/evolution-tasks.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:26 ../ui/evolution-tasks.xml.h:19
 msgid "_Actions"
 msgstr "_Eylemler"
 
@@ -17640,7 +17640,7 @@ msgstr "Liste"
 msgid "Month"
 msgstr "Ay"
 
-#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:59
 msgid "Next"
 msgstr "İleri"
 
@@ -17648,7 +17648,7 @@ msgstr "İleri"
 msgid "Previews the calendar to be printed"
 msgstr "Yazdırılacak olan takvimi önizler"
 
-#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:75
 msgid "Previous"
 msgstr "Geri"
 
@@ -17768,7 +17768,7 @@ msgstr "Yeni mektupları filtrelemek için kurallar oluştur veya düzenle"
 msgid "Empty _Trash"
 msgstr "Çöpü _Boşalt"
 
-#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:7
+#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:6
 #: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Klasör"
@@ -17778,14 +17778,17 @@ msgid "Message F_ilters"
 msgstr "İleti _Filtreleri"
 
 #: ../ui/evolution-mail-global.xml.h:10
+msgid "Message _List As"
+msgstr "İleti _Listesi Olarak"
+
+#: ../ui/evolution-mail-global.xml.h:11
 msgid "Message _Preview"
 msgstr "İleti _Önizlemesi"
 
-#: ../ui/evolution-mail-global.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:12
 msgid "Move the selected folder into another folder"
 msgstr "Seçili klasörü başka bir klasör içine taşı"
 
-#. Alphabetical by name, yo
 #: ../ui/evolution-mail-global.xml.h:13
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Tüm dizindeki tüm silinmiş iletileri kalıcı olarak sil"
@@ -17811,13 +17814,14 @@ msgid "_Move Folder To..."
 msgstr "_Klasöre Taşı..."
 
 #: ../ui/evolution-mail-global.xml.h:19
+msgid "_New Search _Folder (FIXME)"
+msgstr "_Yeni Arama _Klasörü (BENİ DÜZELT)"
+
+#: ../ui/evolution-mail-global.xml.h:20
 msgid "_New..."
 msgstr "_Yeni..."
 
-#.
-#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
-#.
-#: ../ui/evolution-mail-global.xml.h:23
+#: ../ui/evolution-mail-global.xml.h:21
 msgid "_Subscriptions"
 msgstr "Ü_yelikler"
 
@@ -17829,97 +17833,96 @@ msgstr "Bu klasörün ismini değiştir"
 msgid "Change the properties of this folder"
 msgstr "Bu klasörün özelliklerini değiştir"
 
-#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:12
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Seçili iletileri panoya kopyala"
 
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-list.xml.h:5 ../ui/evolution-mail-message.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:4 ../ui/evolution-mail-message.xml.h:23
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Seçilen iletileri panoya kes"
 
-#: ../ui/evolution-mail-list.xml.h:6
+#: ../ui/evolution-mail-list.xml.h:5
 msgid "E_xpunge"
 msgstr "_Temizle"
 
-#: ../ui/evolution-mail-list.xml.h:8
+#: ../ui/evolution-mail-list.xml.h:7
 msgid "Group By _Threads"
 msgstr "_Dallara Göre Grupla"
 
-#: ../ui/evolution-mail-list.xml.h:9
+#: ../ui/evolution-mail-list.xml.h:8
 msgid "Hide S_elected Messages"
 msgstr "_Seçilen İletileri Gizle"
 
-#: ../ui/evolution-mail-list.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:9
 msgid "Hide _Deleted Messages"
 msgstr "_Silenen İletileri Gizle"
 
-#: ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-list.xml.h:10
 msgid "Hide _Read Messages"
 msgstr "_Okunan İletileri Gizle"
 
-#: ../ui/evolution-mail-list.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:11
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr "Silinen iletileri üzerine çizgi çekmek yerine gizle"
 
-#: ../ui/evolution-mail-list.xml.h:13
+#: ../ui/evolution-mail-list.xml.h:12
 msgid "Mark Me_ssages as Read"
 msgstr "İletileri _Okunmuş Olarak İşaretle"
 
-#: ../ui/evolution-mail-list.xml.h:14 ../ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-list.xml.h:13 ../ui/evolution-mail-message.xml.h:68
 msgid "Paste message(s) from the clipboard"
 msgstr "İletiyi panodan yapıştır"
 
-#: ../ui/evolution-mail-list.xml.h:15
+#: ../ui/evolution-mail-list.xml.h:14
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Bu klasörden silinmiş tüm iletileri kalıcı olarak sil"
 
-#: ../ui/evolution-mail-list.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:15
 msgid "Permanently remove this folder"
 msgstr "Bu klasörü kalıcı olarak sil"
 
-#: ../ui/evolution-mail-list.xml.h:17
+#: ../ui/evolution-mail-list.xml.h:16
 msgid "Select Message _Thread"
 msgstr "İleti _Dalı Seç"
 
-#: ../ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:17
 msgid "Select _All Messages"
 msgstr "Tüm İletileri _Seç"
 
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:18
 msgid "Select all and only the messages that are not currently selected"
 msgstr "Hepsini ve sadece şu anda seçilmemiş iletileri seç"
 
-#: ../ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:19
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Seçilen ileti ile aynı konumdaki tüm iletileri seç"
 
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:20
 msgid "Select all visible messages"
 msgstr "Tüm görünen iletileri seç"
 
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:21
 msgid "Sh_ow Hidden Messages"
 msgstr "Gizli İletileri _Göster"
 
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:22
 msgid "Show messages that have been temporarily hidden"
 msgstr "Geçici olarak gizlenmiş iletileri göster"
 
-#: ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:23
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Geçici olarak tüm okunmuş iletileri gizle"
 
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:24
 msgid "Temporarily hide the selected messages"
 msgstr "Geçici olarak seçili iletileri gizle"
 
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "Threaded Message list"
 msgstr "Konumlandırılan İleti listesi"
 
-#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:112
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "İ_leti"
@@ -17932,415 +17935,409 @@ msgstr "Gö_ndereni Adres Defterine Ekle"
 msgid "A_pply Filters"
 msgstr "_Filtreleri Uygula"
 
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-message.xml.h:4
+#: ../ui/evolution-mail-message.xml.h:3
 msgid "Add Sender to Address Book"
 msgstr "Göndereni Adres Defterine Ekle"
 
-#: ../ui/evolution-mail-message.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:4
 msgid "All Message _Headers"
 msgstr "Tüm İleti _Başlıkları"
 
-#: ../ui/evolution-mail-message.xml.h:6
+#: ../ui/evolution-mail-message.xml.h:5
 msgid "Apply filter rules to the selected messages"
 msgstr "Seçilen iletilere filtre kurallarını uygula"
 
-#: ../ui/evolution-mail-message.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:6
 msgid "Check for _Junk"
 msgstr "_Gereksiz için Kontrol Et"
 
-#: ../ui/evolution-mail-message.xml.h:8
+#: ../ui/evolution-mail-message.xml.h:7
 msgid "Compose _New Message"
 msgstr "_Yeni İleti Düzenle"
 
-#: ../ui/evolution-mail-message.xml.h:9
+#: ../ui/evolution-mail-message.xml.h:8
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Seçili iletideki tüm alıcılara bir cevap düzenle"
 
-#: ../ui/evolution-mail-message.xml.h:10
+#: ../ui/evolution-mail-message.xml.h:9
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Seçili iletideki posta listesine bir cevap düzenle"
 
-#: ../ui/evolution-mail-message.xml.h:11
+#: ../ui/evolution-mail-message.xml.h:10
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Seçilen iletinin göndericisine bir cevap düzenle"
 
-#: ../ui/evolution-mail-message.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:13
 msgid "Copy selected messages to another folder"
 msgstr "Seçili iletileri başka klasöre kopyala"
 
-#: ../ui/evolution-mail-message.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:14
 msgid "Create R_ule"
 msgstr "_Kural Oluştur"
 
-#: ../ui/evolution-mail-message.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:15
 msgid "Create a Search Folder for these recipients"
 msgstr "Bu alıcılar için bir Arama Klasörü oluştur"
 
-#: ../ui/evolution-mail-message.xml.h:17
+#: ../ui/evolution-mail-message.xml.h:16
 msgid "Create a Search Folder for this mailing list"
 msgstr "Bu posta listesi için bir Arama Klasörü oluştur"
 
-#: ../ui/evolution-mail-message.xml.h:18
+#: ../ui/evolution-mail-message.xml.h:17
 msgid "Create a Search Folder for this sender"
 msgstr "Bu gönderen için bir Arama Klasörü oluştur"
 
-#: ../ui/evolution-mail-message.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:18
 msgid "Create a Search Folder for this subject"
 msgstr "Bu konu için bir Arama Klasörü oluştur"
 
-#: ../ui/evolution-mail-message.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a rule to filter messages from this sender"
 msgstr "Bu gönderene göre iletileri filtrelemek için kural oluştur"
 
-#: ../ui/evolution-mail-message.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Bu alıcılara göre iletileri filtrelemek için kural oluştur"
 
-#: ../ui/evolution-mail-message.xml.h:22
+#: ../ui/evolution-mail-message.xml.h:21
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Bu posta listesine göre iletileri filtrelemek için kural oluştur"
 
-#: ../ui/evolution-mail-message.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:22
 msgid "Create a rule to filter messages with this subject"
 msgstr "Bu konuyla iletileri filtrelemek için kural oluştur"
 
-#: ../ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-mail-message.xml.h:24
 msgid "Decrease the text size"
 msgstr "Metin boyunu küçült"
 
-#: ../ui/evolution-mail-message.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:26
 msgid "Display the next important message"
 msgstr "Sonraki önemli iletiyi göster"
 
-#: ../ui/evolution-mail-message.xml.h:28
+#: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next message"
 msgstr "Sonraki iletiyi göster"
 
-#: ../ui/evolution-mail-message.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:28
 msgid "Display the next unread message"
 msgstr "Sonraki okunmamış iletiyi göster"
 
-#: ../ui/evolution-mail-message.xml.h:30
+#: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the next unread thread"
 msgstr "Sonraki okunmamış konumu göster"
 
-#: ../ui/evolution-mail-message.xml.h:31
+#: ../ui/evolution-mail-message.xml.h:30
 msgid "Display the previous important message"
 msgstr "Önceki önemli iletiyi göster"
 
-#: ../ui/evolution-mail-message.xml.h:32
+#: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous message"
 msgstr "Önceki iletiyi göster"
 
-#: ../ui/evolution-mail-message.xml.h:33
+#: ../ui/evolution-mail-message.xml.h:32
 msgid "Display the previous unread message"
 msgstr "Önceki okunmamış iletiyi göster"
 
-#: ../ui/evolution-mail-message.xml.h:34
+#: ../ui/evolution-mail-message.xml.h:33
 msgid "Filter on Mailing _List..."
 msgstr "_Posta Listelerine Göre Filtrele..."
 
-#: ../ui/evolution-mail-message.xml.h:35
+#: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Se_nder..."
 msgstr "_Gönderene Göre Filtrele..."
 
-#: ../ui/evolution-mail-message.xml.h:36
+#: ../ui/evolution-mail-message.xml.h:35
 msgid "Filter on _Recipients..."
 msgstr "_Alıcılara Göre Filtrele..."
 
-#: ../ui/evolution-mail-message.xml.h:37
+#: ../ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Subject..."
 msgstr "_Konuya Göre Filtrele..."
 
-#: ../ui/evolution-mail-message.xml.h:38
+#: ../ui/evolution-mail-message.xml.h:37
 msgid "Filter the selected messages for junk status"
 msgstr "Seçili iletileri gereksiz olarak filtrele"
 
-#: ../ui/evolution-mail-message.xml.h:39
+#: ../ui/evolution-mail-message.xml.h:38
 msgid "Flag selected message(s) for follow-up"
 msgstr "Seçili iletileri takip için işaretle"
 
-#: ../ui/evolution-mail-message.xml.h:40
+#: ../ui/evolution-mail-message.xml.h:39
 msgid "Follow _Up..."
 msgstr "_Takip..."
 
-#: ../ui/evolution-mail-message.xml.h:41
+#: ../ui/evolution-mail-message.xml.h:40
 msgid "Force images in HTML mail to be loaded"
 msgstr "HTML iletinin içindeki resimlerin yüklenmesine izin ver"
 
-#: ../ui/evolution-mail-message.xml.h:43
+#: ../ui/evolution-mail-message.xml.h:42
 msgid "Forward the selected message in the body of a new message"
 msgstr "Seçilen iletiyi bir başka iletinin içeriğinde yönlendir"
 
-#: ../ui/evolution-mail-message.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message quoted like a reply"
 msgstr "Seçilen iletiyi cevaptaki alıntıymış gibi yönlendir"
 
-#: ../ui/evolution-mail-message.xml.h:45
+#: ../ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message to someone"
 msgstr "Seçilen iletiyi birisine yönlendir"
 
-#: ../ui/evolution-mail-message.xml.h:46
+#: ../ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Seçilen iletiyi birisine ek olarak yönlendir"
 
-#: ../ui/evolution-mail-message.xml.h:47
+#: ../ui/evolution-mail-message.xml.h:46
 msgid "Increase the text size"
 msgstr "Metin boyunu büyült"
 
-#: ../ui/evolution-mail-message.xml.h:49
+#: ../ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as"
 msgstr "İş_aretle"
 
-#: ../ui/evolution-mail-message.xml.h:50
+#: ../ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected message(s) as having been read"
 msgstr "Seçili iletileri okunmuş olarak işaretle"
 
-#: ../ui/evolution-mail-message.xml.h:51
+#: ../ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as important"
 msgstr "Seçili iletileri önemli olarak işaretle"
 
-#: ../ui/evolution-mail-message.xml.h:52
+#: ../ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected message(s) as junk"
 msgstr "Seçili iletileri gereksiz olarak işaretle"
 
-#: ../ui/evolution-mail-message.xml.h:53
+#: ../ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected message(s) as not being junk"
 msgstr "Seçili iletileri gereksiz değil olarak işaretle"
 
-#: ../ui/evolution-mail-message.xml.h:54
+#: ../ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Seçili iletileri okunmamış olarak işaretle"
 
-#: ../ui/evolution-mail-message.xml.h:55
+#: ../ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Seçili iletileri önemsiz olarak işaretle"
 
-#: ../ui/evolution-mail-message.xml.h:56
+#: ../ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected messages for deletion"
 msgstr "Seçili iletileri silmek için işaretle"
 
-#: ../ui/evolution-mail-message.xml.h:57
+#: ../ui/evolution-mail-message.xml.h:56
 msgid "Message Source"
 msgstr "İleti Kaynağı"
 
-#: ../ui/evolution-mail-message.xml.h:58
+#: ../ui/evolution-mail-message.xml.h:57
 msgid "Move"
 msgstr "Taşı"
 
-#: ../ui/evolution-mail-message.xml.h:59
+#: ../ui/evolution-mail-message.xml.h:58
 msgid "Move selected message(s) to another folder"
 msgstr "Seçili iletileri başka bir klasöre taşı"
 
-#: ../ui/evolution-mail-message.xml.h:61
+#: ../ui/evolution-mail-message.xml.h:60
 msgid "Next _Important Message"
 msgstr "_Sonraki Önemli İleti"
 
-#: ../ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Thread"
 msgstr "S_onraki Konum"
 
-#: ../ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:62
 msgid "Next _Unread Message"
 msgstr "Sonraki O_kunmamış İleti"
 
-#: ../ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:63
 msgid "Not Junk"
 msgstr "Gereksiz Değil"
 
-#: ../ui/evolution-mail-message.xml.h:65
+#: ../ui/evolution-mail-message.xml.h:64
 msgid "Open a window for composing a mail message"
 msgstr "Yeni bir ileti düzenlemek için pencere aç"
 
-#: ../ui/evolution-mail-message.xml.h:66
+#: ../ui/evolution-mail-message.xml.h:65
 msgid "Open the selected message in a new window"
 msgstr "Seçilen iletiyi yeni bir pencerede aç"
 
-#: ../ui/evolution-mail-message.xml.h:67
+#: ../ui/evolution-mail-message.xml.h:66
 msgid "Open the selected message in the composer for editing"
 msgstr "Seçilen iletiyi düzenleyicide düzenlemek için aç"
 
-#: ../ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-message.xml.h:67
 msgid "P_revious Unread Message"
 msgstr "Ö_nceki Okunmamış İleti"
 
-#: ../ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Pos_t New Message to Folder"
 msgstr "Klasöre _Yeni Bir İleti Gönder"
 
-#: ../ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:70
 msgid "Post a Repl_y"
 msgstr "_Yanıt Gönder"
 
-#: ../ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-mail-message.xml.h:71
 msgid "Post a message to a Public folder"
 msgstr "Genel bir klasöre ileti gönder"
 
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:72
 msgid "Post a reply to a message in a Public folder"
 msgstr "Genel klasörde iletiye yanıt gönder"
 
-#: ../ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Pr_evious Important Message"
 msgstr "Ö_nceki Önemli İleti"
 
-#: ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-mail-message.xml.h:74
 msgid "Preview the message to be printed"
 msgstr "Yazdırılacak olan iletiyi önizle"
 
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:78
 msgid "Print this message"
 msgstr "Bu iletiyi yazdır"
 
-#: ../ui/evolution-mail-message.xml.h:80
+#: ../ui/evolution-mail-message.xml.h:79
 msgid "Re_direct"
 msgstr "_Yeniden Yönlendir"
 
-#: ../ui/evolution-mail-message.xml.h:81
+#: ../ui/evolution-mail-message.xml.h:80
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Seçilen iletiyi birisine yeniden yönlendir"
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Reset the text to its original size"
 msgstr "Metni asıl boyuna sıfırla"
 
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:85
 msgid "Save the message as a text file"
 msgstr "İletiyi bir metin dosyası olarak kaydet"
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Search Folder from Mailing _List..."
 msgstr "_Posta Listesine Göre Arama Klasörü..."
 
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Search Folder from Recipients..."
 msgstr "Alıcılara Göre Arama Klasörü..."
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Search Folder from S_ubject..."
 msgstr "_Konuya Göre Arama Klasörü..."
 
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:89
 msgid "Search Folder from Sen_der..."
 msgstr "_Gönderene Göre Arama Klasörü..."
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Search for text in the body of the displayed message"
 msgstr "Görüntülenen ileti içinde bir metin ara"
 
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Select _All Text"
 msgstr "Tüm Metni _Seç"
 
-#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Select all the text in a message"
 msgstr "Bir iletideki tüm metni seç"
 
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Set up the page settings for your current printer"
 msgstr "Güncel yazıcı için sayfa ayarlarını yap"
 
-#: ../ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Görüntülenen iletiler içinde içinde yanıp sönen imleci göster"
 
-#: ../ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Show message in the normal style"
 msgstr "İletiyi normal biçemde göster"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show message with all email headers"
 msgstr "İletiyi kapsamlı başlıklarıyla göster"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Show the raw email source of the message"
 msgstr "İletinin ham e-posta kaynağını göster"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Un-delete the selected messages"
 msgstr "Seçilen iletileri geri sil"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Uni_mportant"
 msgstr "Ö_nemsiz"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "Zoom _Out"
 msgstr "_Uzaklaştır"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
 msgstr "İşaretçi _Kipi"
 
-#: ../ui/evolution-mail-message.xml.h:105
+#: ../ui/evolution-mail-message.xml.h:104
 msgid "_Delete Message"
 msgstr "İletiyi _Sil"
 
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Find in Message..."
 msgstr "İletide İçinde _Bul..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Go To"
 msgstr "_Git"
 
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Important"
 msgstr "Ön_emli"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Junk"
 msgstr "_Gereksiz"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Load Images"
 msgstr "Resimleri _Yükle"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Next Message"
 msgstr "_Sonraki İleti"
 
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Normal Size"
 msgstr "_Normal Boyut"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Not Junk"
 msgstr "Gereksiz _Değil"
 
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Open in New Window"
 msgstr "_Yeni Pencerede Aç"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Previous Message"
 msgstr "Ö_nceki İleti"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Save Message..."
 msgstr "İ_letiyi Kaydet..."
 
-#: ../ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:123
 msgid "_Undelete Message"
 msgstr "İletiyi _Silme"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Unread"
 msgstr "_Okunmadı"
 
-#: ../ui/evolution-mail-message.xml.h:126
+#: ../ui/evolution-mail-message.xml.h:125
 msgid "_Zoom In"
 msgstr "_Yakınlaştır"
 
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
 #: ../ui/evolution-mail-messagedisplay.xml.h:1
 #: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:7
+#: ../ui/evolution-signature-editor.xml.h:2
 msgid "Close"
 msgstr "Kapat"
 
@@ -18348,7 +18345,7 @@ msgstr "Kapat"
 msgid "Close this window"
 msgstr "Bu pencereyi kapat"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "Ana araç çubuğu"
 
@@ -18359,8 +18356,8 @@ msgstr "_Kapat"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:45
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:36
+#: ../ui/evolution-signature-editor.xml.h:13
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:33
 msgid "_File"
 msgstr "_Dosya"
 
@@ -18376,13 +18373,8 @@ msgstr "Bir dosya ekle"
 msgid "Check to get delivery notification when your message is read"
 msgstr "İletiniz okunduğunda dağıtıldı bildirimi almak için işaretleyin"
 
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
 #: ../ui/evolution-message-composer.xml.h:5
-#: ../ui/evolution-signature-editor.xml.h:13
+#: ../ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
 msgstr "Güncel dosyayı kapat"
 
@@ -18399,7 +18391,7 @@ msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Bu iletiyi S/MIME Şifreleme Sertifikanız'la şifrele"
 
 #: ../ui/evolution-message-composer.xml.h:9
-#: ../ui/evolution-signature-editor.xml.h:14
+#: ../ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
 msgstr "Biçi_m"
 
@@ -18456,6 +18448,7 @@ msgid "Save in folder..."
 msgstr "Klasör içine kaydet..."
 
 #: ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-signature-editor.xml.h:9
 msgid "Save the current file"
 msgstr "Mevcut dosyayı kaydet"
 
@@ -18468,7 +18461,7 @@ msgid "Save the message in a specified folder"
 msgstr "İletiyi belirtilen klasöre kaydet"
 
 #: ../ui/evolution-message-composer.xml.h:29
-#: ../ui/evolution-signature-editor.xml.h:22
+#: ../ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
 msgstr "İletiyi HTML biçiminde gönder"
 
@@ -18529,7 +18522,7 @@ msgid "_From Field"
 msgstr "_Gönderen Alanı"
 
 #: ../ui/evolution-message-composer.xml.h:47
-#: ../ui/evolution-signature-editor.xml.h:25
+#: ../ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Ekle"
 
@@ -18557,22 +18550,19 @@ msgstr "_Alıcı Alanı"
 msgid "C_lose"
 msgstr "_Kapat"
 
-#: ../ui/evolution-signature-editor.xml.h:15
+#: ../ui/evolution-signature-editor.xml.h:5
 msgid "H_TML"
 msgstr "H_TML"
 
-#: ../ui/evolution-signature-editor.xml.h:16
+#: ../ui/evolution-signature-editor.xml.h:7
 msgid "Save and Close"
 msgstr "Kaydet ve Kapat"
 
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:20
+#: ../ui/evolution-signature-editor.xml.h:8
 msgid "Save and _Close"
 msgstr "_Kaydet ve Kapat"
 
-#: ../ui/evolution-signature-editor.xml.h:21
+#: ../ui/evolution-signature-editor.xml.h:10
 msgid "Save the current file and close the window"
 msgstr "Mevcut dosyayı kaydet ve pencereyi kapat"
 
@@ -18681,134 +18671,134 @@ msgid "Display window buttons with text only"
 msgstr "Pencere düğmelerini sadece metin olarak göster"
 
 #: ../ui/evolution.xml.h:10
+msgid "Evolution _FAQ"
+msgstr "Evolution _SSS"
+
+#: ../ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Programdan çık"
 
-#: ../ui/evolution.xml.h:11
+#: ../ui/evolution.xml.h:12
 msgid "Forget _Passwords"
 msgstr "Parolaları _Unut"
 
-#: ../ui/evolution.xml.h:12
+#: ../ui/evolution.xml.h:13
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Bilinen parolaları unut böylece bu parolalar size tekrar sorulacaktır"
 
-#: ../ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:14
 msgid "Hide window buttons"
 msgstr "Pencere düğmelerini gizle"
 
-#: ../ui/evolution.xml.h:14
+#: ../ui/evolution.xml.h:15
 msgid "Icons _and text"
 msgstr "Simgeler _ve metin"
 
-#: ../ui/evolution.xml.h:15
+#: ../ui/evolution.xml.h:16
 msgid "Import data from other programs"
 msgstr "Diğer programlardan veri aktar"
 
-#: ../ui/evolution.xml.h:17
+#: ../ui/evolution.xml.h:18
 msgid "New _Window"
 msgstr "Yeni _Pencere"
 
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:19
 msgid "Prefere_nces"
 msgstr "_Tercihler"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:20
 msgid "Send / Receive"
 msgstr "Gönder / Al"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "Kuyruktaki öğeleri gönder ve yeni öğeler al"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "Pilot yapılandırmasını düzenle"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:23
 msgid "Show information about Evolution"
 msgstr "Evolution hakkında bilgi göster"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "Hata Raporu Gönder"
 
-#. <menuitem name="HelpFAQ" verb=""
-#. _label="Evolution _FAQ"/>
-#.
-#. <separator/>
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "_Hata Raporu Gönder"
 
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Buddy kullanarak bir hata raporu gönder"
 
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:27
 msgid "Toggle whether we are working offline."
 msgstr "Çevirim dışı çalışılıp çalışılmadığını seçer."
 
-#: ../ui/evolution.xml.h:31
+#: ../ui/evolution.xml.h:28
 msgid "Tool_bar"
 msgstr "_Araç Çubuğu"
 
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:29
 msgid "Tool_bar style"
 msgstr "_Araç çubuğu biçemi"
 
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:30
 msgid "_About Evolution..."
 msgstr "_Evolution Hakkında..."
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:31
 msgid "_Close Window"
 msgstr "_Pencereyi Kapat"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:34
 msgid "_Help"
 msgstr "_Yardım"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:35
 msgid "_Hide buttons"
 msgstr "_Düğmeleri gizle"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:36
 msgid "_Icons only"
 msgstr "S_adece simge"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:37
 msgid "_Import..."
 msgstr "_Aktar..."
 
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:38
 msgid "_New"
 msgstr "_Yeni"
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:39
 msgid "_Quick Reference"
 msgstr "_Hızlı Referans"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:40
 msgid "_Quit"
 msgstr "Çı_k"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:41
 msgid "_Send / Receive"
 msgstr "_Gönder / Al"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:42
 msgid "_Switcher Appearance"
 msgstr "_Değiştirici Görünümü"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:43
 msgid "_Synchronization Options..."
 msgstr "_Eşzamanlandırma Seçenekleri..."
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:44
 msgid "_Text only"
 msgstr "_Sadece metin"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:46
 msgid "_Window"
 msgstr "_Pencere"
 
@@ -20053,3 +20043,6 @@ msgstr "IM bağlamı"
 #: ../widgets/text/e-text.c:3683 ../widgets/text/e-text.c:3684
 msgid "Handle Popup"
 msgstr "Açılırı İdare Et"
+
+#~ msgid "The Proxy tab will be available only when the account is online."
+#~ msgstr "Vekil sekmesi sadece hesap çevrim içi olduğunda kullanılabilir."
diff --git a/po/vi.po b/po/vi.po
index c17a4811df..dff353bbab 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 1.4 Gnome HEAD\n"
+"Project-Id-Version: evolution 1.4 Gnome 2.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-11 17:30+0200\n"
-"PO-Revision-Date: 2005-08-27 17:35+0930\n"
+"POT-Creation-Date: 2005-08-25 05:57+0000\n"
+"PO-Revision-Date: 2005-09-20 18:44+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Gnome-Vi <gnomevi-list@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -37,7 +37,7 @@ msgstr "Danh sách liên lạc mới"
 #, c-format
 msgid "current addressbook folder has %d card"
 msgid_plural "current addressbook folder has %d cards"
-msgstr[0] "danh mục sổ địa chỉ hiện thời có %d thẻ"
+msgstr[0] "Thư mục sổ địa chỉ hiện thời có %d thẻ"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../calendar/gui/alarm-notify/alarm-queue.c:953
@@ -320,12 +320,12 @@ msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
 msgstr ""
-"Có một liên lạc với địa chỉ này rồi. Bạn có muốn thêm một thẻ mới với cùng "
-"địa chỉ bằng mọi giá không?"
+"Một liên lạc với địa chỉ này đã có. Bạn vẫn muốn thêm một thẻ mới với cùng "
+"địa chỉ chứ?"
 
 #: ../addressbook/addressbook.error.xml.h:2
 msgid "Address '{0}' already exists."
-msgstr "Có địa chỉ «{0}» rồi."
+msgstr "Địa chỉ «{0}» đã có."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid "Cannot move contact."
@@ -343,7 +343,7 @@ msgid ""
 msgstr ""
 "Hãy kiểm tra để bảo đảm mật khẩu của bạn được gõ chính xác và bạn sử dụng "
 "phương thức đăng nhập được hỗ trợ. Lưu ý rằng nhiều mật khẩu phân biệt chữ "
-"hoa, chữ thường; và hãy chắc là phím Caps Lock của bạn tắt rồi."
+"hoa, chữ thường; và hãy chắc là phím Caps Lock của bạn đã tắt."
 
 #: ../addressbook/addressbook.error.xml.h:6
 msgid "Could not get schema information for LDAP server."
@@ -558,7 +558,7 @@ msgstr "Điều khiển Quản lý Chứng nhận S/MIME Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
-msgstr "Điều khiển cấu hình thiết lập danh mục Evolution"
+msgstr "Điều khiển cấu hình thiết lập thư mục Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 msgid "Manage your S/MIME certificates here"
@@ -628,7 +628,7 @@ msgstr "Tạo sổ địa chỉ mới"
 
 #: ../addressbook/gui/component/addressbook-component.c:385
 msgid "Failed upgrading Addressbook settings or folders."
-msgstr "Lỗi nâng cấp thiết lập Sổ địa chỉ hoặc danh mục."
+msgstr "Lỗi nâng cấp thiết lập Sổ địa chỉ hoặc thư mục."
 
 #: ../addressbook/gui/component/addressbook-config.c:313
 msgid "Base"
@@ -712,10 +712,10 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Địa chỉ và cây danh mục liên lạc Evolution đã thay đổi so với Evolution 1."
+"Địa chỉ và cây thư mục liên lạc Evolution đã thay đổi so với Evolution 1."
 "x.\n"
 "\n"
-"Hãy kiên nhẫn trong khi Evolution chuyển đổi các danh mục..."
+"Hãy kiên nhẫn trong khi Evolution chuyển đổi các thư mục..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1148
 msgid ""
@@ -725,7 +725,7 @@ msgid ""
 msgstr ""
 "Định dạng của liên lạc hộp thư chung đã thay đổi.\n"
 "\n"
-"Hãy kiên nhẫn trong khi Evolution chuyển đổi các danh mục của bạn..."
+"Hãy kiên nhẫn trong khi Evolution chuyển đổi các thư mục của bạn..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1157
 msgid ""
@@ -733,9 +733,9 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Cách Evolution lưu một phần số điện thoại đã thay đổi rồi.\n"
+"Cách Evolution lưu một phần số điện thoại đã thay đổi.\n"
 "\n"
-"Hãy kiên nhẫn trong khi Evolution chuyển đổi các danh mục của bạn..."
+"Hãy kiên nhẫn trong khi Evolution chuyển đổi các thư mục của bạn..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1167
 msgid ""
@@ -753,7 +753,7 @@ msgstr ""
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/tasks-component.c:441 ../mail/em-filter-i18n.h:11
 #: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:26 ../ui/evolution-tasks.xml.h:6
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Xoá bỏ"
 
@@ -789,13 +789,13 @@ msgstr "Độ dài tự động hoàn tất"
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
 msgid "EFolderList XML for the list of completion URIs"
 msgstr ""
-"XML EFolderList (danh sách danh mục điện) cho danh sách các địa chỉ Mạng sẽ "
+"XML EFolderList (danh sách thư mục điện) cho danh sách các địa chỉ Mạng sẽ "
 "hoàn tất."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
 msgid "EFolderList XML for the list of completion URIs."
 msgstr ""
-"XML EFolderList (danh sách danh mục điện) cho danh sách các địa chỉ Mạng sẽ "
+"XML EFolderList (danh sách thư mục điện) cho danh sách các địa chỉ Mạng sẽ "
 "hoàn tất."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
@@ -818,11 +818,11 @@ msgstr "Số ký tự cần gõ trước khi trình Evolution sẽ cố tự đ�
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
 msgid "URI for the folder last used in the select names dialog"
-msgstr "Địa chỉ Mạng cho danh mục đã dùng cuối cùng trong hộp thoại chọn tên."
+msgstr "Địa chỉ Mạng cho thư mục đã dùng cuối cùng trong hộp thoại chọn tên."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
 msgid "URI for the folder last used in the select names dialog."
-msgstr "Địa chỉ Mạng cho danh mục đã dùng cuối cùng trong hộp thoại chọn tên."
+msgstr "Địa chỉ Mạng cho thư mục đã dùng cuối cùng trong hộp thoại chọn tên."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
@@ -972,7 +972,7 @@ msgstr ""
 "Chọn tùy chọn này nghĩa là Evolution sẽ chỉ thử dùng SSL/TLS nếu bạn trong "
 "môi trường bất an. Ví dụ, nếu bạn và máy phục vụ LDAP của bạn nằm sau tường "
 "lửa tại chỗ làm, thì Evolution sẽ không cần dùng SSL/TLS vì kết nối đã đủ an "
-"toàn rồi."
+"toàn."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
@@ -998,7 +998,7 @@ msgid ""
 "root of the directory tree."
 msgstr ""
 "Cơ sở tìm là tên phân biệt (TP) của mục, chỗ bắt đầu tìm kiếm. Nếu bạn bỏ "
-"trống chỗ này, tìm kiếm sẽ được bắt đầu từ gốc cây danh mục."
+"trống chỗ này, tìm kiếm sẽ được bắt đầu từ gốc cây thư mục."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
@@ -1007,7 +1007,7 @@ msgid ""
 "your search base. A search scope of \"one\" will only include the entries "
 "one level beneath your base."
 msgstr ""
-"Phạm vi tìm cho biết độ sâu tìm kiếm đi xuống trong cây danh mục. Phạm vi "
+"Phạm vi tìm cho biết độ sâu tìm kiếm đi xuống trong cây thư mục. Phạm vi "
 "tìm kiếm «con» sẽ bao gồm mọi mục dưới cơ sở tìm. Phạm vi tìm kiếm «một» sẽ "
 "chỉ tìm những mục nằm một mức độ dưới trong cơ sở tìm thôi."
 
@@ -1039,7 +1039,7 @@ msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
 msgstr ""
-"Đây là tên máy phục vụ xuất hiện trong danh sách danh mục Evolution. Chỉ "
+"Đây là tên máy phục vụ xuất hiện trong danh sách thư mục Evolution. Chỉ "
 "được dùng với mục đích hiển thị thôi."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:39
@@ -2681,7 +2681,7 @@ msgid ""
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 "Tên hoặc địa chỉ thư điện tử đã thay đổi của liên lạc này\n"
-"đã có trong danh mục này rồi. Bạn có muốn thêm nữa không?"
+"đã có trong thư mục này. Bạn vẫn muốn thêm nữa chứ?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
@@ -2697,7 +2697,7 @@ msgid ""
 "in this folder.  Would you like to add it anyway?"
 msgstr ""
 "Tên hoặc địa chỉ thư điện từ của liên lạc này đã có\n"
-"trong danh mục này rồi. Bạn có muốn thêm nữa nữa?"
+"trong thư mục này. Bạn vẫn muốn thêm nữa chứ?"
 
 #. FIXME: get the toplevel window...
 #: ../addressbook/gui/search/e-addressbook-search-dialog.c:160
@@ -2826,7 +2826,7 @@ msgstr "Gửi thư cho liên lạc"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:942
 #: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2501
 #: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-tasks.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "In"
 
@@ -2846,7 +2846,7 @@ msgstr "Cắt"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:950
 #: ../calendar/gui/calendar-component.c:536
 #: ../calendar/gui/tasks-component.c:440 ../ui/evolution-addressbook.xml.h:2
-#: ../ui/evolution-mail-message.xml.h:12 ../ui/evolution-tasks.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:11 ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Chép"
 
@@ -3035,7 +3035,7 @@ msgstr "Đơn vị"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Web Site"
-msgstr "Nơi Mạng"
+msgstr "Chỗ Mạng"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:138
@@ -3048,7 +3048,7 @@ msgstr "Nơi Mạng"
 #: ../widgets/table/e-table-group-container.c:972
 #: ../widgets/table/e-table-group-leaf.c:629
 #: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3012 ../widgets/table/e-table-item.c:3013
+#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
 #: ../widgets/text/e-text.c:3626 ../widgets/text/e-text.c:3627
 msgid "Width"
 msgstr "Rộng"
@@ -3063,7 +3063,7 @@ msgstr "Rộng"
 #: ../widgets/table/e-table-group-container.c:965
 #: ../widgets/table/e-table-group-leaf.c:622
 #: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
+#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
 #: ../widgets/text/e-text.c:3634 ../widgets/text/e-text.c:3635
 msgid "Height"
 msgstr "Cao"
@@ -3257,7 +3257,7 @@ msgstr "Không tìm thấy liên lạc"
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
 #: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Contact ID already exists"
-msgstr "Có ID Liên lạc ấy rồi"
+msgstr "ID liên lạc ấy đã có "
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
 #: ../addressbook/gui/widgets/eab-gui-util.c:60
@@ -3370,7 +3370,7 @@ msgstr ""
 "Quá nhiều thẻ khớp với truy vấn này, nhiều hơn cấu hình\n"
 "của máy phục vụ có thể trả gửi, hoặc cấu hình của Evolution\n"
 "có thể hiển thị. Bạn hãy tìm kiếm chính xác hơn hoặc tăng giới hạn\n"
-"kết quả trong Sở thích máy phục vụ thư mục cho sổ địa chỉ này."
+"kết quả trong Tùy thích máy phục vụ thư mục cho sổ địa chỉ này."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:151
 msgid ""
@@ -3382,7 +3382,7 @@ msgstr ""
 "Thời gian thực hiện truy vấn này vượt quá giới hạn máy phục vụ\n"
 "hoặc giới hạn do bạn cấu hình cho sổ địa chỉ này.\n"
 "Vui lòng tìm kiếm chính xác hơn hoặc tăng giới hạn thời gian trong\n"
-"Sở thích máy phục vụ thư mục cho sổ địa chỉ này."
+"Tùy thích máy phục vụ thư mục cho sổ địa chỉ này."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:157
 msgid "The backend for this addressbook was unable to parse this query."
@@ -3440,7 +3440,7 @@ msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
-"Có « %s » rồi.\n"
+"« %s » đã có.\n"
 "Bạn có muốn ghi đè lên nó không?"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:323
@@ -3820,7 +3820,7 @@ msgstr "TẬP_TIN_XUẤT"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:58
 msgid "List local addressbook folders"
-msgstr "Liệt kê các danh mục sổ địa chỉ địa phương"
+msgstr "Liệt kê các thư mục sổ địa chỉ địa phương"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Show cards as vcard or csv file"
@@ -4188,6 +4188,7 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:64
 #: ../ui/evolution-message-composer.xml.h:51
+#: ../ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Lưu"
 
@@ -4236,7 +4237,7 @@ msgid "Calendar and Tasks"
 msgstr "Công việc và Lịch"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1309
+#: ../calendar/gui/calendar-component.c:1307
 msgid "Calendars"
 msgstr "Lịch"
 
@@ -4336,9 +4337,9 @@ msgstr "Thời gian _ngủ:"
 #: ../ui/evolution-composer-entries.xml.h:8
 #: ../ui/evolution-mail-messagedisplay.xml.h:5
 #: ../ui/evolution-message-composer.xml.h:44
-#: ../ui/evolution-signature-editor.xml.h:23
+#: ../ui/evolution-signature-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:23
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:32
 msgid "_Edit"
 msgstr "_Hiệu chỉnh"
 
@@ -4426,11 +4427,11 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Đừng hỏi tôi về chương trình này lần nữa."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:140
+#: ../calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Không thể khởi động Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:151
+#: ../calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Không tạo được bộ tạo dịch vụ báo động"
 
@@ -4852,55 +4853,55 @@ msgstr "Không mở được lịch « %s » để tạo sự kiện và cuộc
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Không có lịch nào sẵn sàng để tạo sự kiện và cuộc họp."
 
-#: ../calendar/gui/calendar-component.c:1284
+#: ../calendar/gui/calendar-component.c:1282
 msgid "Calendar Source Selector"
 msgstr "Bộ chọn nguồn lịch"
 
-#: ../calendar/gui/calendar-component.c:1475
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New appointment"
 msgstr "Cuộc hẹn mới"
 
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1474
 msgid "_Appointment"
 msgstr "_Cuộc hẹn"
 
-#: ../calendar/gui/calendar-component.c:1477
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new appointment"
 msgstr "Tạo cuộc hẹn mới"
 
-#: ../calendar/gui/calendar-component.c:1483
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New meeting"
 msgstr "Cuộc họp mới"
 
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1482
 msgid "M_eeting"
 msgstr "_Cuộc họp"
 
-#: ../calendar/gui/calendar-component.c:1485
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new meeting request"
 msgstr "Tạo yêu cầu cuộc họp mới"
 
-#: ../calendar/gui/calendar-component.c:1491
+#: ../calendar/gui/calendar-component.c:1489
 msgid "New all day appointment"
 msgstr "Cuộc hẹn nguyên ngày mới"
 
-#: ../calendar/gui/calendar-component.c:1492
+#: ../calendar/gui/calendar-component.c:1490
 msgid "All Day A_ppointment"
 msgstr "Cuộc hẹn _nguyên ngày"
 
-#: ../calendar/gui/calendar-component.c:1493
+#: ../calendar/gui/calendar-component.c:1491
 msgid "Create a new all-day appointment"
 msgstr "Tạo cuộc hẹn nguyên ngày mới"
 
-#: ../calendar/gui/calendar-component.c:1499
+#: ../calendar/gui/calendar-component.c:1497
 msgid "New calendar"
 msgstr "Lịch mới"
 
-#: ../calendar/gui/calendar-component.c:1500
+#: ../calendar/gui/calendar-component.c:1498
 msgid "Cale_ndar"
 msgstr "_Lịch"
 
-#: ../calendar/gui/calendar-component.c:1501
+#: ../calendar/gui/calendar-component.c:1499
 msgid "Create a new calendar"
 msgstr "Tạo lịch mới"
 
@@ -5188,7 +5189,7 @@ msgstr "Kiểu MIME:"
 #: ../mail/em-account-prefs.c:504 ../mail/em-composer-prefs.c:891
 #: ../plugins/plugin-manager/plugin-manager.c:213
 msgid "Enabled"
-msgstr "Bật rồi"
+msgstr "Bật"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:730
 msgid "Are you sure you want to remove this URL?"
@@ -5564,15 +5565,15 @@ msgstr "« %s »  Bạn chưa thay đổi gì, đóng bộ biên soạn?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
-msgstr "Sự kiện này đã thay đổi rồi."
+msgstr "Sự kiện này đã thay đổi."
 
 #: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
-msgstr "Công việc này đã thay đổi rồi."
+msgstr "Công việc này đã thay đổi."
 
 #: ../calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
-msgstr "Mục nhật ký này đã thay đổi rồi."
+msgstr "Mục nhật ký này đã thay đổi."
 
 #: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
@@ -5631,7 +5632,7 @@ msgstr[0] "%d thư đính kèm"
 #: ../mail/em-folder-tree.c:974 ../mail/em-folder-view.c:1035
 #: ../mail/message-list.c:1708 ../ui/evolution-addressbook.xml.h:31
 #: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
-#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-tasks.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:102 ../ui/evolution-tasks.xml.h:21
 msgid "_Copy"
 msgstr "_Chép"
 
@@ -6288,7 +6289,7 @@ msgstr "<span weight=\"bold\">Trạng thái</span>"
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
 #: ../calendar/gui/print.c:2361 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
-msgstr "Xong rồi."
+msgstr "Hoàn thành."
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:248
@@ -6703,7 +6704,7 @@ msgstr "Lư_u mới..."
 #: ../calendar/gui/e-calendar-view.c:1530 ../mail/em-folder-view.c:1046
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:120 ../ui/evolution-tasks.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-tasks.xml.h:27
 msgid "_Print..."
 msgstr "_In..."
 
@@ -6762,7 +6763,7 @@ msgstr "% hoàn tất"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:617
 msgid "Complete"
-msgstr "Xong rồi"
+msgstr "Hoàn tất"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
@@ -7229,7 +7230,7 @@ msgstr "Đính kèm không chứa mục lịch nào có thể xem được."
 
 #: ../calendar/gui/e-itip-control.c:1911
 msgid "Update complete\n"
-msgstr "Cập nhật rồi.\n"
+msgstr "Cập nhật hoàn thành.\n"
 
 #: ../calendar/gui/e-itip-control.c:1939
 msgid "Object is invalid and cannot be updated\n"
@@ -7248,7 +7249,7 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1978
 msgid "Attendee status updated\n"
-msgstr "Đã cập nhật trạng thái người tham dự rồi.\n"
+msgstr "Trạng thái người tham dự đã được cập nhật.\n"
 
 #: ../calendar/gui/e-itip-control.c:1981
 #: ../plugins/itip-formatter/itip-formatter.c:1025
@@ -7258,11 +7259,11 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:2011
 msgid "Removal Complete"
-msgstr "Loại bỏ rồi."
+msgstr "Việc gỡ bỏ hoàn thành."
 
 #: ../calendar/gui/e-itip-control.c:2034 ../calendar/gui/e-itip-control.c:2082
 msgid "Item sent!\n"
-msgstr "Gửi mục rồi.\n"
+msgstr "Mục đã được gởi.\n"
 
 #: ../calendar/gui/e-itip-control.c:2036 ../calendar/gui/e-itip-control.c:2086
 msgid "The item could not be sent!\n"
@@ -7713,10 +7714,10 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Địa chỉ và cây danh mục công việc Evolution đã thay đổi so với Evolution "
+"Địa chỉ và cây thư mục công việc Evolution đã thay đổi so với Evolution "
 "phiên bản 1.x.\n"
 "\n"
-"Hãy kiên nhẫn trong khi Evolution chuyển đổi các danh mục..."
+"Hãy kiên nhẫn trong khi Evolution chuyển đổi các thư mục..."
 
 #: ../calendar/gui/migration.c:155
 msgid ""
@@ -7725,10 +7726,10 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Địa chỉ và cây danh mục lịch Evolution đã thay đổi so với Evolution phiên "
+"Địa chỉ và cây thư mục lịch Evolution đã thay đổi so với Evolution phiên "
 "bản 1.x.\n"
 "\n"
-"Hãy kiên nhẫn trong khi Evolution chuyển đổi các danh mục..."
+"Hãy kiên nhẫn trong khi Evolution chuyển đổi các thư mục..."
 
 #. FIXME: set proper domain/code
 #: ../calendar/gui/migration.c:748 ../calendar/gui/migration.c:915
@@ -9648,7 +9649,7 @@ msgstr "Đích gửi đến"
 
 #: ../composer/e-msg-composer-hdrs.c:559
 msgid "Choose folders to post the message to."
-msgstr "Hãy chọn các danh mục để gửi thư ấy vào."
+msgstr "Hãy chọn các thư mục để gửi thư ấy vào."
 
 #: ../composer/e-msg-composer-hdrs.c:593
 msgid "Click here for the address book"
@@ -9799,7 +9800,7 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:2
 msgid "All accounts have been removed."
-msgstr "Loại bỏ mọi tài khoản rồi."
+msgstr "Mọi tài khoản đã được gỡ bỏ."
 
 #: ../composer/mail-composer.error.xml.h:3
 msgid ""
@@ -9823,7 +9824,7 @@ msgid ""
 "continue the message at a later date."
 msgstr ""
 "Đóng cửa sổ soạn này thì sẽ xóa bỏ thư ấy vĩnh viễn, trừ bạn chọn lưu thư ấy "
-"vào danh mục Nháp. Làm như thế sẽ cho phép bạn tiếp tục thư ấy lần sau."
+"vào thư mục Nháp. Làm như thế sẽ cho phép bạn tiếp tục thư ấy lần sau."
 
 #: ../composer/mail-composer.error.xml.h:7
 msgid "Could not create composer window."
@@ -9913,7 +9914,7 @@ msgstr "Tìm thấy thư chưa hoàn tất"
 
 #: ../composer/mail-composer.error.xml.h:26
 msgid "Warning: Modified Message"
-msgstr "Cảnh báo: thư đã sửa đổi rồi."
+msgstr "Cảnh báo: thư đã được sửa đổi."
 
 #: ../composer/mail-composer.error.xml.h:27
 msgid "You cannot attach the file `{0}' to this message."
@@ -10058,7 +10059,7 @@ msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
-"Có tập tin tên này rồi.\n"
+"Tập tin tên này đã có.\n"
 "Ghi đè lên nó không?"
 
 #: ../e-util/e-dialog-utils.c:269 ../e-util/e-system.error.xml.h:6
@@ -10102,7 +10103,7 @@ msgstr "Bạn có muốn ghi đè lên nó không?"
 
 #: ../e-util/e-system.error.xml.h:5
 msgid "File exists &quot;{0}&quot;."
-msgstr "Có tập tin «{0}» rồi."
+msgstr "Tập tin «{0}» đã có."
 
 #: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:122
 msgid "_Overwrite"
@@ -10546,7 +10547,7 @@ msgstr ""
 #: ../mail/em-account-editor.c:464 ../mail/em-filter-folder-element.c:237
 #: ../mail/em-vfolder-rule.c:494
 msgid "Select Folder"
-msgstr "Chọn danh mục"
+msgstr "Chọn thư mục"
 
 #: ../mail/em-account-editor.c:760
 msgid "Ask for each message"
@@ -10679,7 +10680,7 @@ msgstr "chứa"
 
 #: ../mail/em-filter-i18n.h:8
 msgid "Copy to Folder"
-msgstr "Chép vào danh mục"
+msgstr "Chép vào thư mục"
 
 #: ../mail/em-filter-i18n.h:9
 msgid "Date received"
@@ -10778,7 +10779,7 @@ msgid "is not Flagged"
 msgstr "không được đặt cờ"
 
 #: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
-#: ../ui/evolution-mail-message.xml.h:48
+#: ../ui/evolution-mail-message.xml.h:47
 msgid "Junk"
 msgstr "Rác"
 
@@ -10817,7 +10818,7 @@ msgstr "Thư không phải Rác"
 
 #: ../mail/em-filter-i18n.h:44
 msgid "Move to Folder"
-msgstr "Chuyển vào danh mục"
+msgstr "Chuyển vào thư mục"
 
 #: ../mail/em-filter-i18n.h:45
 msgid "Pipe to Program"
@@ -10895,7 +10896,7 @@ msgstr "bắt đầu bằng"
 msgid "Stop Processing"
 msgstr "Dừng xử lý"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1572
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1557
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
 #: ../mail/em-mailer-prefs.c:88 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:330
@@ -10915,7 +10916,7 @@ msgstr "<b>Thì</b>"
 
 #: ../mail/em-folder-browser.c:134
 msgid "C_reate Search Folder From Search..."
-msgstr "Tạo danh mục tìm kiếm từ kết quả tìm kiếm..."
+msgstr "Tạo thư mục tìm kiếm từ kết quả tìm kiếm..."
 
 #. TODO: can this be done in a loop?
 #: ../mail/em-folder-properties.c:144
@@ -10931,11 +10932,11 @@ msgstr[0] "Thư chưa đọc:"
 #: ../mail/em-folder-properties.c:278
 #: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Folder Properties"
-msgstr "Thuộc tính danh mục"
+msgstr "Thuộc tính thư mục"
 
 #: ../mail/em-folder-selection-button.c:123
 msgid "<click here to select a folder>"
-msgstr "<nhấn đây để chọn danh mục>"
+msgstr "<nhấn đây để chọn thư mục>"
 
 #: ../mail/em-folder-selector.c:261
 msgid "Create"
@@ -10943,12 +10944,12 @@ msgstr "Tạo"
 
 #: ../mail/em-folder-selector.c:265
 msgid "Folder _name:"
-msgstr "_Tên danh mục:"
+msgstr "_Tên thư mục:"
 
 #: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
 #: ../mail/mail-vfolder.c:937 ../mail/mail-vfolder.c:1007
 msgid "Search Folders"
-msgstr "Danh mục tìm kiếm"
+msgstr "Thư mục tìm kiếm"
 
 #. UNMATCHED is always last
 #: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
@@ -10962,11 +10963,11 @@ msgstr "Nháp"
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:472 ../mail/mail-component.c:143
 msgid "Inbox"
-msgstr "Hộp Đến"
+msgstr "Thư Đến"
 
 #: ../mail/em-folder-tree-model.c:475 ../mail/mail-component.c:145
 msgid "Outbox"
-msgstr "Hộp gửi"
+msgstr "Thư Đi"
 
 #: ../mail/em-folder-tree-model.c:477 ../mail/mail-component.c:146
 msgid "Sent"
@@ -10978,7 +10979,7 @@ msgstr "Đang tải..."
 
 #: ../mail/em-folder-tree.c:689
 msgid "Mail Folder Tree"
-msgstr "Cây danh mục thư"
+msgstr "Cây thư mục thư"
 
 #: ../mail/em-folder-tree.c:849
 #, c-format
@@ -10988,39 +10989,39 @@ msgstr "Đang chuyển thư mục « %s »"
 #: ../mail/em-folder-tree.c:851
 #, c-format
 msgid "Copying folder %s"
-msgstr "Đang sao chép danh mục « %s »"
+msgstr "Đang sao chép thư mục « %s »"
 
 #: ../mail/em-folder-tree.c:858 ../mail/message-list.c:1613
 #, c-format
 msgid "Moving messages into folder %s"
-msgstr "Đang chuyển thư vào danh mục « %s »"
+msgstr "Đang chuyển thư vào thư mục « %s »"
 
 #: ../mail/em-folder-tree.c:860 ../mail/message-list.c:1615
 #, c-format
 msgid "Copying messages into folder %s"
-msgstr "Đang sao chép thư vào danh mục « %s »"
+msgstr "Đang sao chép thư vào thư mục « %s »"
 
 #: ../mail/em-folder-tree.c:876
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Không thả được thư vào kho mức độ đỉnh"
 
-#: ../mail/em-folder-tree.c:972 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:972 ../ui/evolution-mail-message.xml.h:103
 msgid "_Copy to Folder"
-msgstr "_Chép vào danh mục"
+msgstr "_Chép vào thư mục"
 
-#: ../mail/em-folder-tree.c:973 ../ui/evolution-mail-message.xml.h:114
+#: ../mail/em-folder-tree.c:973 ../ui/evolution-mail-message.xml.h:113
 msgid "_Move to Folder"
-msgstr "_Chuyển vào danh mục"
+msgstr "_Chuyển vào thư mục"
 
 #: ../mail/em-folder-tree.c:1678 ../mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
-msgstr "Đang quét các danh mục trong « %s »"
+msgstr "Đang quét các thư mục trong « %s »"
 
 #: ../mail/em-folder-tree.c:2031 ../ui/evolution-addressbook.xml.h:44
-#: ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution-mail-global.xml.h:22
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:45
 msgid "_View"
 msgstr "_Xem"
 
@@ -11039,7 +11040,7 @@ msgstr "_Di chuyển..."
 #. FIXME: need to disable for nochildren folders
 #: ../mail/em-folder-tree.c:2041
 msgid "_New Folder..."
-msgstr "Danh mục _mới..."
+msgstr "Thư mục _mới..."
 
 #: ../mail/em-folder-tree.c:2044 ../ui/evolution-mail-list.xml.h:30
 msgid "_Rename..."
@@ -11054,7 +11055,7 @@ msgstr "Đang sao chép « %s » vào « %s »"
 #: ../mail/em-folder-view.c:946 ../mail/importers/evolution-mbox-importer.c:85
 #: ../mail/importers/evolution-outlook-importer.c:134
 msgid "Select folder"
-msgstr "Chọn danh mục"
+msgstr "Chọn thư mục"
 
 #: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:946
 msgid "C_opy"
@@ -11063,7 +11064,7 @@ msgstr "_Chép"
 #: ../mail/em-folder-utils.c:503
 #, c-format
 msgid "Rename the \"%s\" folder to:"
-msgstr "Đổi tên danh mục « %s » thành:"
+msgstr "Đổi tên thư mục « %s » thành:"
 
 #: ../mail/em-folder-utils.c:505
 msgid "Rename Folder"
@@ -11071,13 +11072,13 @@ msgstr "Đổi tên thư mục"
 
 #: ../mail/em-folder-utils.c:511
 msgid "Folder names cannot contain '/'"
-msgstr "Tên danh mục không thể chứa ký tự sổ chéo."
+msgstr "Tên thư mục không thể chứa ký tự sổ chéo."
 
 #: ../mail/em-folder-utils.c:581
 #: ../plugins/groupwise-features/share-folder-common.c:141
 #, c-format
 msgid "Creating folder `%s'"
-msgstr "Đang tạo danh mục « %s »"
+msgstr "Đang tạo thư mục « %s »"
 
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
@@ -11089,22 +11090,22 @@ msgstr "Tạo thư mục"
 #: ../plugins/groupwise-features/install-shared.c:164
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
-msgstr "Xác định nơi tạo danh mục ấy:"
+msgstr "Xác định nơi tạo thư mục ấy:"
 
 #: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:546 ../mail/em-popup.c:557
 msgid "Reply to _All"
 msgstr "Trả lời _mọi người"
 
-#: ../mail/em-folder-view.c:1040 ../ui/evolution-mail-message.xml.h:122
+#: ../mail/em-folder-view.c:1040 ../ui/evolution-mail-message.xml.h:121
 msgid "_Reply to Sender"
 msgstr "T_rả lời người gửi"
 
 #: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:548 ../mail/em-popup.c:559
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Forward"
 msgstr "_Chuyển tiếp"
 
-#: ../mail/em-folder-view.c:1044 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1044 ../ui/evolution-mail-message.xml.h:105
 msgid "_Edit as New Message..."
 msgstr "_Hiệu chỉnh như thư mới..."
 
@@ -11114,11 +11115,11 @@ msgstr "_Hủy xóa bỏ"
 
 #: ../mail/em-folder-view.c:1051 ../ui/evolution-addressbook.xml.h:36
 msgid "_Move to Folder..."
-msgstr "_Chuyển sang danh mục..."
+msgstr "_Chuyển sang thư mục..."
 
 #: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
-msgstr "C_hép vào danh mục..."
+msgstr "C_hép vào thư mục..."
 
 #: ../mail/em-folder-view.c:1055
 msgid "Mar_k as Read"
@@ -11162,19 +11163,19 @@ msgstr "Tạo _quy tắc từ thư"
 
 #: ../mail/em-folder-view.c:1074
 msgid "Search Folder from _Subject"
-msgstr "Danh mục tìm kiếm trên _Chủ đề"
+msgstr "Thư mục tìm kiếm trên _Chủ đề"
 
 #: ../mail/em-folder-view.c:1075
 msgid "Search Folder from Se_nder"
-msgstr "Danh mục tìm kiếm trên _Người gửi"
+msgstr "Thư mục tìm kiếm trên _Người gửi"
 
 #: ../mail/em-folder-view.c:1076
 msgid "Search Folder from _Recipients"
-msgstr "Danh mục tìm kiếm trên N_gười nhận"
+msgstr "Thư mục tìm kiếm trên N_gười nhận"
 
 #: ../mail/em-folder-view.c:1077
 msgid "Search Folder from Mailing _List"
-msgstr "Danh mục tìm kiếm trên _Hộp thư chung"
+msgstr "Thư mục tìm kiếm trên _Hộp thư chung"
 
 #: ../mail/em-folder-view.c:1081
 msgid "Filter on Sub_ject"
@@ -11213,7 +11214,7 @@ msgstr "Sao chép địa chỉ _liên kết"
 
 #: ../mail/em-folder-view.c:2415
 msgid "Create _Search Folder"
-msgstr "Tạo Danh mục tìm _kiếm"
+msgstr "Tạo thư mục tìm _kiếm"
 
 #: ../mail/em-folder-view.c:2416
 msgid "_From this Address"
@@ -11234,52 +11235,52 @@ msgstr "Nhấn để gửi thư cho « %s »"
 msgid "Matches: %d"
 msgstr "Khớp: %d"
 
-#: ../mail/em-format-html-display.c:696 ../mail/em-format-html.c:597
+#: ../mail/em-format-html-display.c:697 ../mail/em-format-html.c:595
 msgid "Unsigned"
 msgstr "Chưa ký"
 
-#: ../mail/em-format-html-display.c:696
+#: ../mail/em-format-html-display.c:697
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "Thư này không có chữ ký nên không thể đảm bảo thư này do người ấy gửi."
 
-#: ../mail/em-format-html-display.c:697 ../mail/em-format-html.c:598
+#: ../mail/em-format-html-display.c:698 ../mail/em-format-html.c:596
 msgid "Valid signature"
 msgstr "Chữ ký hợp lệ"
 
-#: ../mail/em-format-html-display.c:697
+#: ../mail/em-format-html-display.c:698
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "Thư này có chữ ký và hợp lệ nên rất có thể là thư ấy do người ấy gửi."
 
-#: ../mail/em-format-html-display.c:698 ../mail/em-format-html.c:599
+#: ../mail/em-format-html-display.c:699 ../mail/em-format-html.c:597
 msgid "Invalid signature"
 msgstr "Chữ ký không hợp lệ"
 
-#: ../mail/em-format-html-display.c:698
+#: ../mail/em-format-html-display.c:699
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 "Không thể xác minh chữ ký của thư này: có lẽ nó bị giả trong khi truyền."
 
-#: ../mail/em-format-html-display.c:699
+#: ../mail/em-format-html-display.c:700
 msgid "Valid signature, cannot verify sender"
 msgstr "Chữ ký hợp lệ nhưng mà không thể xác minh người gửi."
 
-#: ../mail/em-format-html-display.c:699
+#: ../mail/em-format-html-display.c:700
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr "Thư này có chữ ký hợp lệ, nhưng mà không thể xác minh người gửi thư."
 
-#: ../mail/em-format-html-display.c:705 ../mail/em-format-html.c:606
+#: ../mail/em-format-html-display.c:706 ../mail/em-format-html.c:604
 msgid "Unencrypted"
 msgstr "Không mật mã"
 
-#: ../mail/em-format-html-display.c:705
+#: ../mail/em-format-html-display.c:706
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -11287,11 +11288,11 @@ msgstr ""
 "Thư này không mật mã nên bất cứ người nào có xem được nội dung nó trong khi "
 "truyền qua Mạng."
 
-#: ../mail/em-format-html-display.c:706 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:707 ../mail/em-format-html.c:605
 msgid "Encrypted, weak"
 msgstr "Mật mã yếu"
 
-#: ../mail/em-format-html-display.c:706
+#: ../mail/em-format-html-display.c:707
 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 "
@@ -11300,21 +11301,21 @@ msgstr ""
 "Thư này mật mã, nhưng mà dùng thuật toán mật mã yếu. Người khác sẽ gặp khó "
 "khăn đọc thư này được một thời gian hữu ích, nhưng mà có thể làm như thế."
 
-#: ../mail/em-format-html-display.c:707 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:708 ../mail/em-format-html.c:606
 msgid "Encrypted"
 msgstr "Mật mã"
 
-#: ../mail/em-format-html-display.c:707
+#: ../mail/em-format-html-display.c:708
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr "Thư này mật mã. Người khác sẽ gặp khó khăn nhiều đọc nội dung thư."
 
-#: ../mail/em-format-html-display.c:708 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:709 ../mail/em-format-html.c:607
 msgid "Encrypted, strong"
 msgstr "Mật mã mạnh"
 
-#: ../mail/em-format-html-display.c:708
+#: ../mail/em-format-html-display.c:709
 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 "
@@ -11323,70 +11324,70 @@ msgstr ""
 "Thư này mật mã dùng thuật toán mật mã mạnh. Người khác sẽ gặp khó khăn rất "
 "nhiều đọc nội dung thư được thời gian hữu ích. "
 
-#: ../mail/em-format-html-display.c:809 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:810 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Xem Chứng nhận"
 
-#: ../mail/em-format-html-display.c:824
+#: ../mail/em-format-html-display.c:825
 msgid "This certificate is not viewable"
 msgstr "Chứng nhận này không thể xem"
 
-#: ../mail/em-format-html-display.c:1106
+#: ../mail/em-format-html-display.c:1107
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Hoàn thành lúc %d %B, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1114
+#: ../mail/em-format-html-display.c:1115
 msgid "Overdue:"
 msgstr "Quá hạn:"
 
-#: ../mail/em-format-html-display.c:1117
+#: ../mail/em-format-html-display.c:1118
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "trước %d %B, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1177
+#: ../mail/em-format-html-display.c:1178
 msgid "_View Inline"
 msgstr "_Xem trực tiếp"
 
-#: ../mail/em-format-html-display.c:1178
+#: ../mail/em-format-html-display.c:1179
 msgid "_Hide"
 msgstr "Ẩ_n"
 
-#: ../mail/em-format-html-display.c:1179
+#: ../mail/em-format-html-display.c:1180
 msgid "_Fit to Width"
 msgstr "_Vừa khít độ rộng"
 
-#: ../mail/em-format-html-display.c:1180
+#: ../mail/em-format-html-display.c:1181
 msgid "Show _Original Size"
 msgstr "Hiển thị kích thước _gốc"
 
-#: ../mail/em-format-html-display.c:1550
+#: ../mail/em-format-html-display.c:1551
 msgid "Attachment Button"
 msgstr "Nút đính kèm"
 
-#: ../mail/em-format-html-display.c:1757
+#: ../mail/em-format-html-display.c:1758
 msgid "Select folder to save all attachments..."
-msgstr "Chọn danh mục nơi cần lưu mọi đính kèm..."
+msgstr "Chọn thư mục nơi cần lưu mọi đính kèm..."
 
-#: ../mail/em-format-html-display.c:1796
+#: ../mail/em-format-html-display.c:1797
 msgid "Select folder to save selected attachments..."
-msgstr "Chọn danh mục nơi cần lưu những đính kèm đã chọn..."
+msgstr "Chọn thư mục nơi cần lưu những đính kèm đã chọn..."
 
-#: ../mail/em-format-html-display.c:1804
+#: ../mail/em-format-html-display.c:1805
 msgid "Save Selected..."
 msgstr "Lưu các điều chọn..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1871
+#: ../mail/em-format-html-display.c:1872
 #, c-format
 msgid "%d attachment"
 msgid_plural "%d attachments"
 msgstr[0] "%d đính kèm"
 
-#: ../mail/em-format-html-display.c:1935
+#: ../mail/em-format-html-display.c:1936
 msgid "No Attachment"
 msgstr "Không có đính kèm"
 
-#: ../mail/em-format-html-display.c:1938
+#: ../mail/em-format-html-display.c:1939
 msgid "Save All"
 msgstr "Lưu tất cả"
 
@@ -11400,93 +11401,93 @@ msgstr "Trang %d trên %d"
 msgid "Retrieving `%s'"
 msgstr "Đang nhận « %s »"
 
-#: ../mail/em-format-html.c:600
+#: ../mail/em-format-html.c:598
 msgid "Valid signature but cannot verify sender"
 msgstr "Chữ ký hợp lệ nhưng mà không thể xác minh người gửi."
 
-#: ../mail/em-format-html.c:870
+#: ../mail/em-format-html.c:855
 msgid "Malformed external-body part."
 msgstr "Phần thân ở ngoại dạng sai."
 
-#: ../mail/em-format-html.c:900
+#: ../mail/em-format-html.c:885
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Trỏ tới địa chỉ FTP (%s)"
 
-#: ../mail/em-format-html.c:911
+#: ../mail/em-format-html.c:896
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Trỏ tới tập tin cục bộ (%s) hợp lệ tại nơi Mạng « %s »"
+msgstr "Trỏ tới tập tin cục bộ (%s) hợp lệ tại chỗ Mạng « %s »"
 
-#: ../mail/em-format-html.c:913
+#: ../mail/em-format-html.c:898
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Trỏ tới tập tin cục bộ (%s)"
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:919
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Trỏ tới dữ liệu ở xa (%s)"
 
-#: ../mail/em-format-html.c:945
+#: ../mail/em-format-html.c:930
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Trỏ tới dữ liệu lạ bên ngoài (kiểu « %s »)"
 
-#: ../mail/em-format-html.c:1171
+#: ../mail/em-format-html.c:1156
 msgid "Formatting message"
 msgstr "Đang định dạng thư"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1449 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:83
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:326
 msgid "From"
 msgstr "Từ"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1449 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:84
 msgid "Reply-To"
 msgstr "Trả lời cho"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1449 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:85
 #: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Cho"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1449 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:86
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1449 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:87
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1576 ../mail/em-format-quote.c:322
+#: ../mail/em-format-html.c:1561 ../mail/em-format-quote.c:322
 #: ../mail/em-mailer-prefs.c:987
 msgid "Mailer"
 msgstr "Trình thư"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1603
+#: ../mail/em-format-html.c:1588
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1606
+#: ../mail/em-format-html.c:1591
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1616 ../mail/em-format-quote.c:329
+#: ../mail/em-format-html.c:1601 ../mail/em-format-quote.c:329
 #: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:89
 #: ../mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Ngày"
 
-#: ../mail/em-format-html.c:1639 ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1624 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:90
 msgid "Newsgroups"
 msgstr "Nhóm tin"
@@ -11543,20 +11544,20 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Vị trí và cây của các danh mục hộp thư Evolution đã thay đổi so sánh với "
+"Vị trí và cây của các thư mục hộp thư Evolution đã thay đổi so sánh với "
 "trình Evolution phiên bản 1.x.\n"
 "\n"
-"Hãy kiên nhẫn trong khi Evolution chuyển đổi các danh mục của bạn..."
+"Hãy kiên nhẫn trong khi Evolution chuyển đổi các thư mục của bạn..."
 
 #: ../mail/em-migrate.c:1632
 #, c-format
 msgid "Unable to create new folder `%s': %s"
-msgstr "Không tạo được danh mục mới « %s »: %s"
+msgstr "Không tạo được thư mục mới « %s »: %s"
 
 #: ../mail/em-migrate.c:1658
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "Không sao chép được danh mục « %s » thành « %s »: %s"
+msgstr "Không sao chép được thư mục « %s » thành « %s »: %s"
 
 #: ../mail/em-migrate.c:1843
 #, c-format
@@ -11586,7 +11587,7 @@ msgstr "Không tạo kho thư địa phương được « %s »: %s"
 #: ../mail/em-migrate.c:2693
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
-msgstr "Không tạo được những danh mục thư địa phương tại « %s »: %s"
+msgstr "Không tạo được những thư mục thư địa phương tại « %s »: %s"
 
 #: ../mail/em-migrate.c:2711
 msgid ""
@@ -11615,7 +11616,7 @@ msgid "_Reply to sender"
 msgstr "T_rả lời người gửi"
 
 #: ../mail/em-popup.c:545 ../mail/em-popup.c:556
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Trả lời _Hộp thư chung"
 
@@ -11646,7 +11647,7 @@ msgstr "Đã đăng ký"
 
 #: ../mail/em-subscribe-editor.c:647
 msgid "Folder"
-msgstr "Danh mục"
+msgstr "Thư mục"
 
 #. FIXME: This is just to get the shadow, is there a better way?
 #: ../mail/em-subscribe-editor.c:862
@@ -11685,11 +11686,11 @@ msgstr "Thừ từ « %s »"
 
 #: ../mail/em-vfolder-editor.c:104
 msgid "Search _Folders"
-msgstr "_Danh mục tìm kiếm"
+msgstr "_thư mục tìm kiếm"
 
 #: ../mail/em-vfolder-rule.c:574
 msgid "Search Folder source"
-msgstr "Nguồn danh mục tìm kiếm"
+msgstr "Nguồn thư mục tìm kiếm"
 
 #: ../mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
@@ -11773,15 +11774,15 @@ msgstr "Vẽ chỉ báo lỗi chính tả trên từ khi gõ."
 
 #: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
-msgstr "Đổ các danh mục Sọt rác khi thoát"
+msgstr "Đổ các thư mục Sọt rác khi thoát"
 
 #: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
-msgstr "Đổ các danh mục Sọt rác khi thoát trình Evolution."
+msgstr "Đổ các thư mục Sọt rác khi thoát trình Evolution."
 
 #: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr "Hiệu lực chế độ con nháy, để bạn xem con chạy khi đọc thư."
+msgstr "Hiệu lực chế độ con nháy, để bạn xem con trỏ khi đọc thư."
 
 #: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
@@ -11939,7 +11940,7 @@ msgstr "Nhắc khi chủ đề rỗng"
 
 #: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
-msgstr "Nhắc người dùng khi họ cố xóa hẳn danh mục."
+msgstr "Nhắc người dùng khi họ cố xóa hẳn thư mục."
 
 #: ../mail/evolution-mail.schemas.in.in.h:57
 msgid ""
@@ -12182,12 +12183,12 @@ msgstr "Đang nhập thư từ Elm"
 #: ../mail/importers/evolution-mbox-importer.c:82
 #: ../mail/importers/evolution-outlook-importer.c:131
 msgid "Destination folder:"
-msgstr "Danh mục đích:"
+msgstr "Thư mục đích:"
 
 #: ../mail/importers/evolution-mbox-importer.c:85
 #: ../mail/importers/evolution-outlook-importer.c:134
 msgid "Select folder to import into"
-msgstr "Chọn danh mục để nhập vào"
+msgstr "Chọn thư mục để nhập vào"
 
 #: ../mail/importers/evolution-mbox-importer.c:216
 msgid "Berkeley Mailbox (mbox)"
@@ -12195,7 +12196,7 @@ msgstr "Berkeley Mailbox (mbox)"
 
 #: ../mail/importers/evolution-mbox-importer.c:217
 msgid "Importer Berkeley Mailbox format folders"
-msgstr "Bộ nhập danh mục dạng Berkeley Mailbox"
+msgstr "Bộ nhập thư mục dạng Berkeley Mailbox"
 
 #: ../mail/importers/evolution-outlook-importer.c:257
 #: ../mail/importers/mail-importer.c:230 ../shell/e-shell-importer.c:516
@@ -12408,7 +12409,7 @@ msgstr "Tạo hộp thư mới"
 
 #: ../mail/mail-component.c:919
 msgid "Failed upgrading Mail settings or folders."
-msgstr "Không cập nhật thiết lập hay danh mục Thư được."
+msgstr "Không cập nhật thiết lập hay thư mục Thư được."
 
 #: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
@@ -12639,7 +12640,7 @@ msgstr "Màu sắc"
 
 #: ../mail/mail-config.glade.h:59
 msgid "Confirm _when expunging a folder"
-msgstr "_Xác nhận khi xóa hẳn danh mục"
+msgstr "_Xác nhận khi xóa hẳn thư mục"
 
 #: ../mail/mail-config.glade.h:60
 msgid ""
@@ -12674,11 +12675,11 @@ msgstr "Không trích dẫn thư gốc"
 
 #: ../mail/mail-config.glade.h:72
 msgid "Done"
-msgstr "Xong rồi"
+msgstr "Hoàn thành"
 
 #: ../mail/mail-config.glade.h:73
 msgid "Drafts _Folder:"
-msgstr "Danh mục _Nháp:"
+msgstr "Thư mục _Nháp:"
 
 #: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
@@ -12690,7 +12691,7 @@ msgstr "Đị_a chỉ thư:"
 
 #: ../mail/mail-config.glade.h:77
 msgid "Empty trash folders on e_xit"
-msgstr "_Xoá rỗng Sọt Rác khi thoát"
+msgstr "_Xoá rỗng mọi thư mục Sọt Rác khi thoát"
 
 #: ../mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
@@ -12866,7 +12867,7 @@ msgstr "Đang gửi thư"
 
 #: ../mail/mail-config.glade.h:130
 msgid "Sent _Messages Folder:"
-msgstr "Danh mục thư Đã _gửi:"
+msgstr "Thư mục thư Đã _gửi:"
 
 #: ../mail/mail-config.glade.h:131
 msgid "Ser_ver requires authentication"
@@ -13034,7 +13035,7 @@ msgstr "mô tả"
 
 #: ../mail/mail-dialogs.glade.h:2
 msgid "<b>Search Folder Sources</b>"
-msgstr "<b>Nguồn danh mục tìm kiếm</b>"
+msgstr "<b>Nguồn thư mục tìm kiếm</b>"
 
 #: ../mail/mail-dialogs.glade.h:3
 msgid "<span weight=\"bold\">Digital Signature</span>"
@@ -13050,7 +13051,7 @@ msgstr "_Phân biệt hoa/thường"
 
 #: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
-msgstr "_Xong rồi."
+msgstr "Hoàn thành."
 
 #: ../mail/mail-dialogs.glade.h:8
 msgid "F_ind:"
@@ -13067,7 +13068,7 @@ msgstr "Đặt cờ để theo dõi tiếp"
 
 #: ../mail/mail-dialogs.glade.h:11
 msgid "Folder Subscriptions"
-msgstr "Đăng ký danh mục"
+msgstr "Đăng ký thư mục"
 
 #: ../mail/mail-dialogs.glade.h:12
 msgid "License Agreement"
@@ -13120,7 +13121,7 @@ msgstr "_Bỏ đăng ký"
 
 #: ../mail/mail-dialogs.glade.h:25
 msgid "specific folders only"
-msgstr "chỉ những danh mục dứt khoát thôi"
+msgstr "chỉ những thư mục dứt khoát thôi"
 
 #: ../mail/mail-dialogs.glade.h:26
 msgid "with all active remote folders"
@@ -13128,7 +13129,7 @@ msgstr "với mọi thư mục hoạt động từ xa"
 
 #: ../mail/mail-dialogs.glade.h:27
 msgid "with all local and active remote folders"
-msgstr "với mọi danh mục hoạt động từ xa và cục bộ đều"
+msgstr "với mọi thư mục hoạt động từ xa và cục bộ đều"
 
 #: ../mail/mail-dialogs.glade.h:28
 msgid "with all local folders"
@@ -13160,12 +13161,12 @@ msgid ""
 "Appending to local `Sent' folder instead."
 msgstr ""
 "Không phụ thêm vào « %s » được: %s\n"
-"Thì phụ thêm vào danh mục «Đã gửi» thay vào đó."
+"Thì phụ thêm vào thư mục «Đã gửi» thay vào đó."
 
 #: ../mail/mail-ops.c:621
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
-msgstr "Không thêm vào danh mục «Đã gửi» địa phương được: %s"
+msgstr "Không thêm vào thư mục «Đã gửi» địa phương được: %s"
 
 #: ../mail/mail-ops.c:733
 #, c-format
@@ -13183,11 +13184,11 @@ msgstr "Bị hủy bỏ."
 
 #: ../mail/mail-ops.c:762
 msgid "Complete."
-msgstr "Xong rồi."
+msgstr "Hoàn thành."
 
 #: ../mail/mail-ops.c:859
 msgid "Saving message to folder"
-msgstr "Đang lưu thư vào danh mục"
+msgstr "Đang lưu thư vào thư mục"
 
 #: ../mail/mail-ops.c:944
 #, c-format
@@ -13206,7 +13207,7 @@ msgstr "Thư đã chuyển tiếp"
 #: ../mail/mail-ops.c:1210
 #, c-format
 msgid "Opening folder %s"
-msgstr "Đang mở danh mục « %s »"
+msgstr "Đang mở thư mục « %s »"
 
 #: ../mail/mail-ops.c:1282
 #, c-format
@@ -13216,12 +13217,12 @@ msgstr "Đang mở kho « %s »"
 #: ../mail/mail-ops.c:1360
 #, c-format
 msgid "Removing folder %s"
-msgstr "Đang gở bỏ danh mục « %s »"
+msgstr "Đang gở bỏ thư mục « %s »"
 
 #: ../mail/mail-ops.c:1454
 #, c-format
 msgid "Storing folder '%s'"
-msgstr "Đang cất giữ danh mục « %s »"
+msgstr "Đang cất giữ thư mục « %s »"
 
 #: ../mail/mail-ops.c:1519
 #, c-format
@@ -13239,7 +13240,7 @@ msgstr "Đang cập nhật thư mục"
 
 #: ../mail/mail-ops.c:1611 ../mail/mail-ops.c:1662
 msgid "Expunging folder"
-msgstr "Đang xóa hẳn danh mục"
+msgstr "Đang xóa hẳn thư mục"
 
 #: ../mail/mail-ops.c:1659
 #, c-format
@@ -13248,7 +13249,7 @@ msgstr "Đang đổ sọt rác trong « %s »"
 
 #: ../mail/mail-ops.c:1660
 msgid "Local Folders"
-msgstr "Danh mục cục bộ"
+msgstr "Thư mục cục bộ"
 
 #: ../mail/mail-ops.c:1743
 #, c-format
@@ -13389,7 +13390,7 @@ msgstr "Tên:"
 #: ../mail/mail-tools.c:116
 #, c-format
 msgid "Could not create spool directory `%s': %s"
-msgstr "Không tạo được danh mục ống chỉ « %s »: %s"
+msgstr "Không tạo được thư mục ống chỉ « %s »: %s"
 
 #: ../mail/mail-tools.c:143
 #, c-format
@@ -13408,35 +13409,35 @@ msgstr "Thư đã chuyển tiếp"
 #: ../mail/mail-tools.c:284
 #, c-format
 msgid "Invalid folder: `%s'"
-msgstr "Danh mục không hợp lệ: « %s »"
+msgstr "Thư mục không hợp lệ: « %s »"
 
 #: ../mail/mail-vfolder.c:91
 #, c-format
 msgid "Setting up Search Folder: %s"
-msgstr "Đang thiết lập danh mục tìm kiếm: %s"
+msgstr "Đang thiết lập thư mục tìm kiếm: %s"
 
 #: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
-msgstr "Đang cập nhật các danh mục tìm kiếm cho «%s:%s»"
+msgstr "Đang cập nhật các thư mục tìm kiếm cho «%s:%s»"
 
 #: ../mail/mail-vfolder.c:247
 #, c-format
 msgid "Updating Search Folders for '%s'"
-msgstr "Đang cập nhật các danh mục tìm kiếm cho « %s »"
+msgstr "Đang cập nhật các thư mục tìm kiếm cho « %s »"
 
 #: ../mail/mail-vfolder.c:1046
 msgid "Edit Search Folder"
-msgstr "Hiệu chỉnh danh mục tìm kiếm"
+msgstr "Hiệu chỉnh thư mục tìm kiếm"
 
 #: ../mail/mail-vfolder.c:1130
 msgid "New Search Folder"
-msgstr "Danh mục tìm kiếm mới"
+msgstr "Thư mục tìm kiếm mới"
 
 #: ../mail/mail.error.xml.h:1
 msgid ""
 "A folder named &quot;{1}&quot; already exists. Please use a different name."
-msgstr "Có danh mục tên «{1}» rồi. Hãy sử dụng tên khác."
+msgstr "Thư mục tên «{1}» đã có. Hãy sử dụng tên khác."
 
 #: ../mail/mail.error.xml.h:2
 msgid ""
@@ -13445,9 +13446,9 @@ msgid ""
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit.\n"
 msgstr ""
-"Có một danh mục không rỗng tại «{1}» rồi.\n"
+"Một thư mục không rỗng đã có tại «{1}».\n"
 "\n"
-"Bạn có thể chọn bỏ qua danh mục này, ghi đè lên nó, phụ thêm nội dung nó, "
+"Bạn có thể chọn bỏ qua thư mục này, ghi đè lên nó, phụ thêm nội dung nó, "
 "hoặc thoát.\n"
 
 #: ../mail/mail.error.xml.h:6
@@ -13482,7 +13483,7 @@ msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr ""
-"Bạn có chắc muốn loại bỏ vĩnh viễn mọi thư đã xóa bỏ trong mọi danh mục "
+"Bạn có chắc muốn loại bỏ vĩnh viễn mọi thư đã xóa bỏ trong mọi thư mục "
 "không?"
 
 #: ../mail/mail.error.xml.h:12
@@ -13490,7 +13491,7 @@ msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
 msgstr ""
-"Bạn có chắc muốn xoá bỏ vĩnh viễn mọi thư đã xóa bỏ trong danh mục «{0}» "
+"Bạn có chắc muốn xoá bỏ vĩnh viễn mọi thư đã xóa bỏ trong thư mục «{0}» "
 "không?"
 
 #: ../mail/mail.error.xml.h:13
@@ -13516,15 +13517,15 @@ msgstr "Vì «{2}»."
 
 #: ../mail/mail.error.xml.h:19
 msgid "Cannot add Search Folder &quot;{0}&quot;."
-msgstr "Không thêm được danh mục tìm kiếm «{0}»."
+msgstr "Không thêm được thư mục tìm kiếm «{0}»."
 
 #: ../mail/mail.error.xml.h:20
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Không sao chép được danh mục «{0}» vào «{1}»."
+msgstr "Không sao chép được thư mục «{0}» vào «{1}»."
 
 #: ../mail/mail.error.xml.h:21
 msgid "Cannot create folder &quot;{0}&quot;."
-msgstr "Không tạo được danh mục «{0}»."
+msgstr "Không tạo được thư mục «{0}»."
 
 #: ../mail/mail.error.xml.h:22
 msgid "Cannot create temporary save directory."
@@ -13536,19 +13537,19 @@ msgstr "Không tạo được thư mục lưu, vì «{1}»."
 
 #: ../mail/mail.error.xml.h:24
 msgid "Cannot delete folder &quot;{0}&quot;."
-msgstr "Không xóa bỏ được danh mục «{0}»."
+msgstr "Không xóa bỏ được thư mục «{0}»."
 
 #: ../mail/mail.error.xml.h:25
 msgid "Cannot delete system folder &quot;{0}&quot;."
-msgstr "Không xóa bỏ được danh mục hệ thống «{0}»."
+msgstr "Không xóa bỏ được thư mục hệ thống «{0}»."
 
 #: ../mail/mail.error.xml.h:26
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
-msgstr "Không thể hiệu chỉnh danh mục tìm kiếm «{0}» vì nó không tồn tại."
+msgstr "Không thể hiệu chỉnh thư mục tìm kiếm «{0}» vì nó không tồn tại."
 
 #: ../mail/mail.error.xml.h:27
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Không thể di chuyển danh mục «{0}» đến «{1}»."
+msgstr "Không thể di chuyển thư mục «{0}» đến «{1}»."
 
 #: ../mail/mail.error.xml.h:28
 msgid "Cannot open source &quot;{1}&quot;"
@@ -13573,11 +13574,11 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:32
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Không thay đổi được tên danh mục «{0}» sang «{1}»."
+msgstr "Không thay đổi được tên thư mục «{0}» sang «{1}»."
 
 #: ../mail/mail.error.xml.h:33
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
-msgstr "Không thể thay đổi tên hoặc di chuyển danh mục hệ thống «{0}»."
+msgstr "Không thể thay đổi tên hoặc di chuyển thư mục hệ thống «{0}»."
 
 #: ../mail/mail.error.xml.h:34
 msgid "Cannot save changes to account."
@@ -13621,7 +13622,7 @@ msgstr "Hủy các thay đổi không?"
 
 #: ../mail/mail.error.xml.h:43
 msgid "Do you want the operation to be performed in the subfolders?"
-msgstr "Bạn có muốn thực hiện thao tác ấy xuống những danh mục con không?"
+msgstr "Bạn có muốn thực hiện thao tác ấy xuống những thư mục con không?"
 
 #: ../mail/mail.error.xml.h:44
 msgid "Do you wish to save your changes?"
@@ -13664,7 +13665,7 @@ msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
 msgstr ""
-"Nếu bạn xóa bỏ danh mục ấy thì sẽ xóa bỏ vĩnh viễn mọi nội dung và danh mục "
+"Nếu bạn xóa bỏ thư mục ấy thì sẽ xóa bỏ vĩnh viễn mọi nội dung và thư mục "
 "con của nó."
 
 #: ../mail/mail.error.xml.h:54
@@ -13697,7 +13698,7 @@ msgstr "Xác thực không hợp lệ"
 
 #: ../mail/mail.error.xml.h:60
 msgid "Mail filters automatically updated."
-msgstr "Đã tự động cập nhật các bộ lọc thư rồi."
+msgstr "Các bộ lọc thư đã được cập nhật tự động."
 
 #: ../mail/mail.error.xml.h:61
 msgid ""
@@ -13718,7 +13719,7 @@ msgstr "Đánh dấu mọi thư Đã đọc"
 
 #: ../mail/mail.error.xml.h:63
 msgid "Mark all messages as read in the selected folder"
-msgstr "Đánh dấu mọi thư Đã đọc trong danh mục đã chọn"
+msgstr "Đánh dấu mọi thư Đã đọc trong thư mục đã chọn"
 
 #: ../mail/mail.error.xml.h:64
 msgid "Missing folder."
@@ -13754,7 +13755,7 @@ msgstr ""
 "Hãy đảm bảo rằng những người nhận sau có thể và cũng muốn nhận thư dạng "
 "HTML:\n"
 "{0}\n"
-"Gửi bất chấp không?"
+"Vẫn gửi chứ?"
 
 #: ../mail/mail.error.xml.h:73
 msgid "Please wait."
@@ -13762,7 +13763,7 @@ msgstr "Vui lòng chờ"
 
 #: ../mail/mail.error.xml.h:74
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
-msgstr "Gặp lỗi khi chuyển đổi danh mục thư cũ «{0}»."
+msgstr "Gặp lỗi khi chuyển đổi thư mục thư cũ «{0}»."
 
 #: ../mail/mail.error.xml.h:75
 msgid "Querying server"
@@ -13780,11 +13781,11 @@ msgstr "Đã yêu cầu thông báo đã đọc."
 #: ../mail/mail.error.xml.h:78
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr ""
-"Bạn thật sự muốn xóa bỏ danh mục «{0}» và mọi danh mục con của nó không?"
+"Bạn thật sự muốn xóa bỏ thư mục «{0}» và mọi thư mục con của nó không?"
 
 #: ../mail/mail.error.xml.h:79
 msgid "Search Folders automatically updated."
-msgstr "Đã tự động cập nhật các danh mục tìm kiếm rồi."
+msgstr "Các thư mục tìm kiếm đã được cập nhật tự động."
 
 #: ../mail/mail.error.xml.h:80
 msgid "Send Receipt"
@@ -13795,7 +13796,7 @@ msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
 msgstr ""
-"Các danh mục hệ thống có cần thiết để trình Ximian Evolution hoạt động cho "
+"Các thư mục hệ thống có cần thiết để trình Ximian Evolution hoạt động cho "
 "đúng nên không thể thay đổi tên, di chuyển hay xóa bỏ chúng."
 
 #: ../mail/mail.error.xml.h:82
@@ -13824,11 +13825,11 @@ msgid ""
 "    &quot;{1}&quot;\n"
 "And have been updated."
 msgstr ""
-"Những danh mục tìm kiếm theo đây:\n"
+"Những thư mục tìm kiếm theo đây:\n"
 "{0}\n"
-"đã dùng danh mục mới bị loại bỏ:\n"
+"đã dùng thư mục mới bị loại bỏ:\n"
 "    «{1}»\n"
-"và đã được cập nhật rồi."
+"và đã được cập nhật."
 
 #: ../mail/mail.error.xml.h:90
 msgid ""
@@ -13840,9 +13841,9 @@ msgid ""
 msgstr ""
 "Những quy tắc lọc theo đây:\n"
 "{0}\n"
-"đã dùng danh mục mới bị loại bỏ:\n"
+"đã dùng thư mục mới bị loại bỏ:\n"
 "    «{1}»\n"
-"và đã được cập nhật rồi."
+"và đã được cập nhật."
 
 #: ../mail/mail.error.xml.h:95
 msgid ""
@@ -13854,7 +13855,7 @@ msgstr ""
 "Đã cố gửi thư ấy thông qua ứng dụng ở ngoại sendmail. Trình sendmail thông "
 "báo lỗi này:\n"
 "status 67: mail not sent (trạng thái 67, chưa gửi thư)\n"
-"Đã cất giữ thư ấy vào danh mục Hộp Đi (Outbox). Hãy kiểm tra xem lỗi trong "
+"Đã cất giữ thư ấy vào thư mục Thư Đi (Outbox). Hãy kiểm tra xem lỗi trong "
 "thư ấy và gửi lại."
 
 #: ../mail/mail.error.xml.h:97
@@ -13866,7 +13867,7 @@ msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
-"Có lẽ đã thêm danh mục này một cách ngầm; hãy dùng bộ hiệu chỉnh danh mục "
+"Có lẽ đã thêm thư mục này một cách ngầm; hãy dùng bộ hiệu chỉnh thư mục "
 "tìm kiếm để thêm nó một cách dứt khoát, nếu cần thiết."
 
 #: ../mail/mail.error.xml.h:100
@@ -13895,7 +13896,7 @@ msgid ""
 "Unable to open the drafts folder for this account.  Use the system drafts "
 "folder instead?"
 msgstr ""
-"Không mở được danh mục Nháp cho tài khoản này. Dùng danh mục Nháp của hệ "
+"Không mở được thư mục Nháp cho tài khoản này. Dùng thư mục Nháp của hệ "
 "thống chứ?"
 
 #: ../mail/mail.error.xml.h:105
@@ -13908,7 +13909,7 @@ msgstr "Dùng _mặc định"
 
 #: ../mail/mail.error.xml.h:107
 msgid "Use default drafts folder?"
-msgstr "Dùng danh mục nháp mặc định chứ?"
+msgstr "Dùng thư mục nháp mặc định chứ?"
 
 #: ../mail/mail.error.xml.h:108
 msgid "You have not filled in all of the required information."
@@ -13916,7 +13917,7 @@ msgstr "Bạn chưa điền đủ các thông tin yêu cầu."
 
 #: ../mail/mail.error.xml.h:109
 msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Bạn có vài thư chưa gửi, bạn vẫn muốn thoát sao?"
+msgstr "Bạn có vài thư chưa gửi, bạn vẫn muốn thoát chứ?"
 
 #: ../mail/mail.error.xml.h:110
 msgid "You may not create two accounts with the same name."
@@ -13924,7 +13925,7 @@ msgstr "Không cho phép bạn tạo hai tài khoản trùng tên."
 
 #: ../mail/mail.error.xml.h:111
 msgid "You must name this Search Folder."
-msgstr "Bạn phải đặt tên cho danh mục tìm kiếm này."
+msgstr "Bạn phải đặt tên cho thư mục tìm kiếm này."
 
 #: ../mail/mail.error.xml.h:112
 msgid "You must specify a folder."
@@ -13936,10 +13937,10 @@ msgid ""
 "Either by selecting the folders individually, and/or by selecting all local "
 "folders, all remote folders, or both."
 msgstr ""
-"Bạn phải ghi rõ ít nhất một danh mục là nguồn,\n"
-"hoặc bằng cách chọn mỗi danh mục từng một cái,\n"
-"hoặc/và bằng cách chọn mọi danh mục địa phương,\n"
-"mọi danh mục ở xa, hoặc cả hai."
+"Bạn phải ghi rõ ít nhất một thư mục là nguồn,\n"
+"hoặc bằng cách chọn mỗi thư mục từng một cái,\n"
+"hoặc/và bằng cách chọn mọi thư mục địa phương,\n"
+"mọi thư mục ở xa, hoặc cả hai."
 
 #: ../mail/mail.error.xml.h:115
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
@@ -14084,7 +14085,7 @@ msgstr "Theo dõi tiếp"
 msgid "For Your Information"
 msgstr "Cho bạn biết tin tức này"
 
-#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:41
 msgid "Forward"
 msgstr "Chuyển tiếp"
 
@@ -14092,11 +14093,11 @@ msgstr "Chuyển tiếp"
 msgid "No Response Necessary"
 msgstr "Không cần thiết trả lời"
 
-#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:82
+#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply"
 msgstr "Trả lời"
 
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:83
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to All"
 msgstr "Trả lời tất cả"
 
@@ -14178,8 +14179,7 @@ msgstr ""
 "Một trình cầm phít để lưu trữ và phục hồi dữ liệu và thiết lập của trình "
 "Evolution."
 
-#. the path to the shared library
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
 msgid "Backup and restore plugin"
 msgstr "Bộ cầm phít lưu trữ và phục hồi"
 
@@ -14355,11 +14355,11 @@ msgstr ""
 #: ../plugins/default-source/default-source.c:82
 #: ../plugins/default-source/default-source.c:109
 msgid "Mark as default folder"
-msgstr "Đánh dấu là danh mục mặc định"
+msgstr "Đánh dấu là thư mục mặc định"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
-msgstr "Mở danh mục của người dùng khác"
+msgstr "Mở thư mục của người dùng khác"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
 msgid "_Account:"
@@ -14367,7 +14367,7 @@ msgstr "Tài _khoản:"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3
 msgid "_Folder Name:"
-msgstr "_Tên danh mục:"
+msgstr "_Tên thư mục:"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4
 msgid "_User:"
@@ -14448,11 +14448,11 @@ msgstr "Linh tinh"
 #. Folder Size
 #: ../plugins/exchange-operations/exchange-account-setup.c:349
 msgid "View the size of all Exchange folders"
-msgstr "Xem kích thước của mọi danh mục Exchange"
+msgstr "Xem kích thước của mọi thư mục Exchange"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:351
 msgid "Folders Size"
-msgstr "Cỡ danh mục"
+msgstr "Cỡ thư mục"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:358
 msgid "Exchange Settings"
@@ -14529,7 +14529,7 @@ msgstr "Loại bỏ người được ủy nhiệm « %s » không?"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:679
 msgid "Could not access Active Directory"
-msgstr "Không truy cập được danh mục hoạt động."
+msgstr "Không truy cập được thư mục hoạt động."
 
 #: ../plugins/exchange-operations/exchange-delegates.c:694
 msgid "Could not find self in Active Directory"
@@ -14596,7 +14596,7 @@ msgid ""
 "and access your folders with the permissions you give them."
 msgstr ""
 "Những người dùng này sẽ có thể gởi thư điện tử\n"
-"thay mặt cho bạn, cũng có thể truy cập các danh mục bạn,\n"
+"thay mặt cho bạn, cũng có thể truy cập các thư mục bạn,\n"
 "dùng quyền hạn mà bạn đã cho họ."
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:12
@@ -14605,7 +14605,7 @@ msgstr "Người ủ_y nhiêm có thể thấy những mục tư nhân"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:14
 msgid "_Inbox:"
-msgstr "Hộp _nhận"
+msgstr "Thư Đ_ến:"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 msgid "_Tasks:"
@@ -14618,33 +14618,33 @@ msgstr "Quyền hạn..."
 
 #: ../plugins/exchange-operations/exchange-folder-size-display.c:136
 msgid "Folder Name"
-msgstr "Tên danh mục:"
+msgstr "Tên thư mục:"
 
 #: ../plugins/exchange-operations/exchange-folder-size-display.c:140
 msgid "Folder Size"
-msgstr "Cỡ danh mục"
+msgstr "Cỡ thư mục"
 
 #: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
 msgid "Exchange Folder Tree"
-msgstr "Cây danh mục Exchange"
+msgstr "Cây thư mục Exchange"
 
-#: ../plugins/exchange-operations/exchange-folder.c:62
-#: ../plugins/exchange-operations/exchange-folder.c:223
-#: ../plugins/exchange-operations/exchange-folder.c:233
+#: ../plugins/exchange-operations/exchange-folder.c:57
+#: ../plugins/exchange-operations/exchange-folder.c:100
+#: ../plugins/exchange-operations/exchange-folder.c:110
 msgid "Unsubscribe Folder..."
-msgstr "Bỏ đăng ký danh mục..."
+msgstr "Bỏ đăng ký thư mục..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:460
-#: ../plugins/exchange-operations/exchange-folder.c:520
+#: ../plugins/exchange-operations/exchange-folder.c:337
+#: ../plugins/exchange-operations/exchange-folder.c:397
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
-msgstr "Thật sự bỏ đăng ký trên danh mục « %s » không?"
+msgstr "Thật sự bỏ đăng ký trên thư mục « %s » không?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:472
-#: ../plugins/exchange-operations/exchange-folder.c:532
+#: ../plugins/exchange-operations/exchange-folder.c:349
+#: ../plugins/exchange-operations/exchange-folder.c:409
 #, c-format
 msgid "Unsubscribe from \"%s\""
-msgstr "Bỏ đăng ký trên danh mục « %s »"
+msgstr "Bỏ đăng ký trên thư mục « %s »"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:301
 msgid "(Permission denied.)"
@@ -14676,7 +14676,7 @@ msgstr "Tạo mục"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
 msgid "Create subfolders"
-msgstr "Tạo danh mục con"
+msgstr "Tạo thư mục con"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
 msgid "Delete Any Items"
@@ -14696,15 +14696,15 @@ msgstr "Hiệu chỉnh mục mình"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
 msgid "Folder contact"
-msgstr "Liên lạc danh mục"
+msgstr "Liên lạc thư mục"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
 msgid "Folder owner"
-msgstr "Người sở hữu danh mục"
+msgstr "Người sở hữu thư mục"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
 msgid "Folder visible"
-msgstr "Hiển thị danh mục"
+msgstr "Hiển thị thư mục"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
 msgid "Read items"
@@ -14736,7 +14736,7 @@ msgstr "Không thể thay đổi mật khẩu vì vấn đề cấu hình."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
 msgid "Cannot display folders."
-msgstr "Không thể hiển thị danh mục."
+msgstr "Không thể hiển thị thư mục."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
 msgid ""
@@ -14771,7 +14771,7 @@ msgstr "Không thể kết nối đến máy phục vụ {0}."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
 msgid "Could not determine folder permissions for delegates."
-msgstr "Không thể xác định quyền truy cập danh mục cho người được ủy nhiệm."
+msgstr "Không thể xác định quyền truy cập thư mục cho người được ủy nhiệm."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not find Exchange Web Storage System."
@@ -14787,11 +14787,11 @@ msgstr "Không thể ủy nhiệm cho « {0} »."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not read folder permissions"
-msgstr "Không đọc được quyền truy cập danh mục."
+msgstr "Không đọc được quyền truy cập thư mục."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not read folder permissions."
-msgstr "Không đọc được quyền truy cập danh mục."
+msgstr "Không đọc được quyền truy cập thư mục."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not read out-of-office state"
@@ -14799,7 +14799,7 @@ msgstr "Không đọc được tính trạng ngoài-văn-phòng."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not update folder permissions."
-msgstr "Không thể cập nhật quyền truy cập danh mục."
+msgstr "Không thể cập nhật quyền truy cập thư mục."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not update out-of-office state"
@@ -14850,15 +14850,15 @@ msgstr "Không thể cập nhật người được ủy nhiệm:"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
 msgid "Folder already exists"
-msgstr "Có danh mục này rồi."
+msgstr "Thư mục này đã có."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Folder does not exist"
-msgstr "Không có danh mục này."
+msgstr "Không có thư mục này."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder offline"
-msgstr "Danh mục này ngoại tuyến."
+msgstr "Thư mục này ngoại tuyến."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 #: ../shell/e-shell.c:1265
@@ -14904,7 +14904,7 @@ msgstr "Không có người dùng như vậy « {0} »."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Password successfully changed."
-msgstr "Mật khẩu đã thay đổi rồi."
+msgstr "Mật khẩu đã thay đổi thành công."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "Please restart Evolution"
@@ -15029,7 +15029,7 @@ msgstr "Không thêm được « {0} » vào danh sách điều khiển truy c�
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "{0} is already a delegate"
-msgstr "« {0} » là một người được ủy nhiệm rồi."
+msgstr "« {0} » lại là một người được ủy nhiệm."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0} is already in the list"
@@ -15041,25 +15041,25 @@ msgstr "Đăng ký với các công việc của người dùng khác"
 
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
 msgid "Check folder permissions"
-msgstr "Hãy kiểm tra quyền truy cập danh mục là đúng."
+msgstr "Hãy kiểm tra quyền truy cập thư mục là đúng."
 
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
-msgstr "Đăng ký với danh mục của người dùng khác"
+msgstr "Đăng ký với thư mục của người dùng khác"
 
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
-msgstr "Đang bỏ đăng ký trên danh mục « %s »"
+msgstr "Đang bỏ đăng ký trên thư mục « %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 ""
-"Cho phép bỏ đăng ký danh mục thư trong trình đơn ngữ cảnh cây danh mục."
+"Cho phép bỏ đăng ký thư mục thư trong trình đơn ngữ cảnh cây thư mục."
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
-msgstr "Bỏ đăng ký danh mục"
+msgstr "Bỏ đăng ký thư mục"
 
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
 msgid "Checklist"
@@ -15138,7 +15138,7 @@ msgstr "Thông điệp"
 
 #: ../plugins/groupwise-features/properties.glade.h:6
 msgid "Shared Folder Notification"
-msgstr "Thông báo danh mục chung"
+msgstr "Thông báo thư mục chung"
 
 #: ../plugins/groupwise-features/properties.glade.h:8
 msgid "The participants will receive the following notification.\n"
@@ -15182,7 +15182,7 @@ msgstr "_Liên lạc"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
 msgid "Modify _folders/options/rules/"
-msgstr "Sửa đổi _danh mục/tùy chọn/quy tắc/"
+msgstr "Sửa đổi _thư mục/tùy chọn/quy tắc/"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
 msgid "Read items marked _private"
@@ -15201,7 +15201,7 @@ msgid "Subscribe to my _notifications"
 msgstr "Đăng ký với _thông báo tôi"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Read"
 msgstr "Đọ_c"
 
@@ -15254,7 +15254,7 @@ msgstr "Nhập những người dùng và lập quyền hạn"
 
 #: ../plugins/groupwise-features/share-folder-common.c:338
 msgid "New _Shared Folder..."
-msgstr "Danh mục _chung mới..."
+msgstr "Thư mục _chung mới..."
 
 #: ../plugins/groupwise-features/share-folder-common.c:453
 msgid "Sharing"
@@ -15318,7 +15318,7 @@ msgstr "Không cập nhật được người tham dự. %s"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1021
 msgid "Attendee status updated"
-msgstr "Đã cập nhật trạng thái người tham dự rồi."
+msgstr "Trạng thái người tham dự đã được cập nhật."
 
 #: ../plugins/itip-formatter/itip-formatter.c:1148
 msgid "The calendar attached is not valid"
@@ -15706,7 +15706,7 @@ msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
 "&quot;{1}&quot; ?"
 msgstr ""
-"«{0}» đã ủy nhiệm cuộc họp này rồi. Bạn có muốn thêm người ủy nhiệm «{1}» "
+"«{0}» đã ủy nhiệm cuộc họp này. Bạn có muốn thêm người ủy nhiệm «{1}» "
 "không?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
@@ -16064,7 +16064,7 @@ msgstr "Cung cấp tùy chọn để in thư từ bộ soạn"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
 #: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-tasks.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "_Xem thử bản in"
 
@@ -16088,8 +16088,7 @@ msgstr "học biết phát hiện thư rác, dùng trình nền spamd"
 msgid "A plugin for saving all attachments or parts of a message at once."
 msgstr "Một trình cầm phít lưu mọi đính kèm hay phần thư đều cùng lúc."
 
-#. the path to the shared library
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
+#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:2
 msgid "Save attachments"
 msgstr "Lưu đính kèm"
 
@@ -16111,6 +16110,7 @@ msgstr "Kiểu MIME:"
 
 #: ../plugins/save-attachments/save-attachments.c:359
 #: ../ui/evolution-message-composer.xml.h:18
+#: ../ui/evolution-signature-editor.xml.h:6
 msgid "Save"
 msgstr "Lưu"
 
@@ -16359,7 +16359,7 @@ msgstr "Phiên bản cấu hình Evolution đã cập nhật cuối cùng"
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
-"Danh sách các đường dẫn danh mục sẽ được đồng bộ hóa vào đĩa để sử dụng "
+"Danh sách các đường dẫn thư mục sẽ được đồng bộ hóa vào đĩa để sử dụng "
 "ngoại tuyến."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:9
@@ -16523,24 +16523,24 @@ msgstr "Thiết lập Evolution"
 
 #: ../shell/e-shell-utils.c:118
 msgid "No folder name specified."
-msgstr "Chưa ghi rõ tên danh mục."
+msgstr "Chưa ghi rõ tên thư mục."
 
 #: ../shell/e-shell-utils.c:125
 msgid "Folder name cannot contain the Return character."
-msgstr "Tên danh mục không thể chứa ký tự Return."
+msgstr "Tên thư mục không thể chứa ký tự Return."
 
 #: ../shell/e-shell-utils.c:131
 msgid "Folder name cannot contain the character \"/\"."
-msgstr "Tên danh mục không thể chứa ký tự sổ chéo «/»"
+msgstr "Tên thư mục không thể chứa ký tự sổ chéo «/»"
 
 #: ../shell/e-shell-utils.c:137
 msgid "Folder name cannot contain the character \"#\"."
-msgstr "Tên danh mục không thể chứa ký tự dấu thăng «#»."
+msgstr "Tên thư mục không thể chứa ký tự dấu thăng «#»."
 
 #: ../shell/e-shell-utils.c:143
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
-"Dấu chấm «.» và hai dấu chấm tiếp tực «..» là hai tên danh mục đặc biệt, "
+"Dấu chấm «.» và hai dấu chấm tiếp tực «..» là hai tên thư mục đặc biệt, "
 "được dành riêng."
 
 #: ../shell/e-shell-window-commands.c:70
@@ -16563,23 +16563,23 @@ msgstr "Không chạy được trình Bug buddy."
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
 #. * about box
-#: ../shell/e-shell-window-commands.c:532
+#: ../shell/e-shell-window-commands.c:508
 msgid "translator-credits"
 msgstr "Gnome-Vi <gnomevi-list@lists.sourceforge.net>"
 
-#: ../shell/e-shell-window-commands.c:546
+#: ../shell/e-shell-window-commands.c:522
 msgid "Groupware Suite"
 msgstr "Bộ phần mềm nhóm (Groupware)"
 
-#: ../shell/e-shell-window-commands.c:774
+#: ../shell/e-shell-window-commands.c:750
 msgid "_Work Online"
 msgstr "_Trực tuyến"
 
-#: ../shell/e-shell-window-commands.c:787 ../ui/evolution.xml.h:50
+#: ../shell/e-shell-window-commands.c:763 ../ui/evolution.xml.h:47
 msgid "_Work Offline"
 msgstr "_Ngoại tuyến"
 
-#: ../shell/e-shell-window-commands.c:800
+#: ../shell/e-shell-window-commands.c:776
 msgid "Work Offline"
 msgstr "Ngoại tuyến"
 
@@ -16807,7 +16807,7 @@ msgid ""
 "Once deleted, you cannot downgrade to the previous version of Evolution "
 "without manual intervention.\n"
 msgstr ""
-"Sắp loại bỏ vĩnh viễn toàn nội dung của danh mục «evolution».\n"
+"Sắp loại bỏ vĩnh viễn toàn nội dung của thư mục «evolution».\n"
 "\n"
 "Có đề nghị là bạn tự kiểm chứng có tất cả dữ liệu thư, liên lạc và lịch "
 "trong phiên bản mới, mà hoặt động cho đúng, trước khi xóa bỏ dữ liệu cũ "
@@ -17158,7 +17158,7 @@ msgstr ""
 
 #: ../smime/gui/smime-ui.glade.h:41
 msgid "Trust this CA to identify web sites."
-msgstr "Tin cây nhà cầm quyền chứng nhận này để nhận diện nơi Mạng."
+msgstr "Tin cây nhà cầm quyền chứng nhận này để nhận diện chỗ Mạng."
 
 #: ../smime/gui/smime-ui.glade.h:42
 msgid "View"
@@ -17188,7 +17188,7 @@ msgstr "_Sửa đổi tính tin cây CA"
 #. XXX we shouldn't be popping up dialogs in this code.
 #: ../smime/lib/e-cert-db.c:651
 msgid "Certificate already exists"
-msgstr "Có chứng nhận ấy rồi"
+msgstr "Chứng nhận ấy đã có"
 
 #: ../smime/lib/e-cert.c:238 ../smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
@@ -17445,7 +17445,7 @@ msgstr "Đang tắt « %s » (%s)\n"
 
 #: ../ui/evolution-addressbook.xml.h:3
 msgid "Copy Selected Contacts to Another Folder..."
-msgstr "Chép các liên lạc được chọn sang danh mục khác..."
+msgstr "Chép các liên lạc được chọn sang thư mục khác..."
 
 #: ../ui/evolution-addressbook.xml.h:4 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
@@ -17465,11 +17465,11 @@ msgstr "Xoá bỏ các liên lạc được chọn"
 
 #: ../ui/evolution-addressbook.xml.h:11
 msgid "Move Selected Contacts to Another Folder..."
-msgstr "Chuyển các liên lạc được chọn sang danh mục khác..."
+msgstr "Chuyển các liên lạc được chọn sang thư mục khác..."
 
 #: ../ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
-msgstr "Chuyển sang danh mục..."
+msgstr "Chuyển sang thư mục..."
 
 #: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
@@ -17524,7 +17524,7 @@ msgid "View the current contact"
 msgstr "Xem liên lạc hiện thời"
 
 #: ../ui/evolution-addressbook.xml.h:30 ../ui/evolution-calendar.xml.h:38
-#: ../ui/evolution-tasks.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:26 ../ui/evolution-tasks.xml.h:19
 msgid "_Actions"
 msgstr "_Hành động"
 
@@ -17588,7 +17588,7 @@ msgstr "Danh sách"
 msgid "Month"
 msgstr "Tháng"
 
-#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:59
 msgid "Next"
 msgstr "Kế"
 
@@ -17596,7 +17596,7 @@ msgstr "Kế"
 msgid "Previews the calendar to be printed"
 msgstr "Xem trước lịch cần in"
 
-#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:75
 msgid "Previous"
 msgstr "Lùi"
 
@@ -17698,15 +17698,15 @@ msgstr "Hủy tác vụ thư tín hiện thời"
 
 #: ../ui/evolution-mail-global.xml.h:3
 msgid "Copy the selected folder into another folder"
-msgstr "Sao chép danh mục được chọn sang danh mục khác"
+msgstr "Sao chép thư mục được chọn sang thư mục khác"
 
 #: ../ui/evolution-mail-global.xml.h:4
 msgid "Create a new folder for storing mail"
-msgstr "Tạo danh mục mới để lưu thư"
+msgstr "Tạo thư mục mới để lưu thư"
 
 #: ../ui/evolution-mail-global.xml.h:5
 msgid "Create or edit Search Folder definitions"
-msgstr "Tạo hoặc sửa lời định nghĩa danh mục tìm kiếm"
+msgstr "Tạo hoặc sửa lời định nghĩa thư mục tìm kiếm"
 
 #: ../ui/evolution-mail-global.xml.h:6
 msgid "Create or edit rules for filtering new mail"
@@ -17716,7 +17716,7 @@ msgstr "Tạo hoặc sửa đổi quy tắc lọc thư mới"
 msgid "Empty _Trash"
 msgstr "Đổ _Sọt rác"
 
-#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:7
+#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:6
 #: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "Danh _mục"
@@ -17726,21 +17726,24 @@ msgid "Message F_ilters"
 msgstr "Bộ _lọc thư"
 
 #: ../ui/evolution-mail-global.xml.h:10
+msgid "Message _List As"
+msgstr "Danh sách thư _là"
+
+#: ../ui/evolution-mail-global.xml.h:11
 msgid "Message _Preview"
 msgstr "Xem thư _trước"
 
-#: ../ui/evolution-mail-global.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:12
 msgid "Move the selected folder into another folder"
-msgstr "Chuyển danh mục được chọn tới danh mục khác"
+msgstr "Chuyển thư mục được chọn tới thư mục khác"
 
-#. Alphabetical by name, yo
 #: ../ui/evolution-mail-global.xml.h:13
 msgid "Permanently remove all deleted messages from all folders"
-msgstr "Loại bỏ vĩnh viễn mọi thư đã xóa bỏ của mọi danh mục"
+msgstr "Loại bỏ vĩnh viễn mọi thư đã xóa bỏ của mọi thư mục"
 
 #: ../ui/evolution-mail-global.xml.h:14
 msgid "Search F_olders"
-msgstr "Tìm kiếm trong _danh mục"
+msgstr "Tìm kiếm trong _thư mục"
 
 #: ../ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
@@ -17752,20 +17755,21 @@ msgstr "Đăng ký hoặc hủy đăng ký thư mục trên máy chủ từ xa"
 
 #: ../ui/evolution-mail-global.xml.h:17
 msgid "_Copy Folder To..."
-msgstr "_Chép danh mục vào..."
+msgstr "_Chép thư mục vào..."
 
 #: ../ui/evolution-mail-global.xml.h:18
 msgid "_Move Folder To..."
-msgstr "_Chuyển danh mục sang..."
+msgstr "_Chuyển thư mục sang..."
 
 #: ../ui/evolution-mail-global.xml.h:19
+msgid "_New Search _Folder (FIXME)"
+msgstr "Thư mục tìm kiếm _mới"
+
+#: ../ui/evolution-mail-global.xml.h:20
 msgid "_New..."
 msgstr "_Mới..."
 
-#.
-#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
-#.
-#: ../ui/evolution-mail-global.xml.h:23
+#: ../ui/evolution-mail-global.xml.h:21
 msgid "_Subscriptions"
 msgstr "_Mục đăng ký"
 
@@ -17775,99 +17779,98 @@ msgstr "Thay đổi tên thư mục này"
 
 #: ../ui/evolution-mail-list.xml.h:2
 msgid "Change the properties of this folder"
-msgstr "Thay đổi thuộc tính danh mục này"
+msgstr "Thay đổi thuộc tính thư mục này"
 
-#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:12
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Sao chép các thư được chọn sang khay"
 
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-list.xml.h:5 ../ui/evolution-mail-message.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:4 ../ui/evolution-mail-message.xml.h:23
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Cắt các thư được chọn vào khay"
 
-#: ../ui/evolution-mail-list.xml.h:6
+#: ../ui/evolution-mail-list.xml.h:5
 msgid "E_xpunge"
 msgstr "_Xóa hẳn"
 
-#: ../ui/evolution-mail-list.xml.h:8
+#: ../ui/evolution-mail-list.xml.h:7
 msgid "Group By _Threads"
 msgstr "Nhóm lại theo _mạch"
 
-#: ../ui/evolution-mail-list.xml.h:9
+#: ../ui/evolution-mail-list.xml.h:8
 msgid "Hide S_elected Messages"
 msgstr "Ẩn các thư đã _chọn"
 
-#: ../ui/evolution-mail-list.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:9
 msgid "Hide _Deleted Messages"
 msgstr "Ẩn các thư đã _xoá bỏ"
 
-#: ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-list.xml.h:10
 msgid "Hide _Read Messages"
 msgstr "Ẩn các thư đã đọ_c"
 
-#: ../ui/evolution-mail-list.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:11
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr "Ẩn các thư đã xoá bỏ thay vì hiển thị chúng dạng gạch đè"
 
-#: ../ui/evolution-mail-list.xml.h:13
+#: ../ui/evolution-mail-list.xml.h:12
 msgid "Mark Me_ssages as Read"
 msgstr "Đánh dấu thư Đã đọ_c"
 
-#: ../ui/evolution-mail-list.xml.h:14 ../ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-list.xml.h:13 ../ui/evolution-mail-message.xml.h:68
 msgid "Paste message(s) from the clipboard"
 msgstr "Dán các thư từ khay"
 
-#: ../ui/evolution-mail-list.xml.h:15
+#: ../ui/evolution-mail-list.xml.h:14
 msgid "Permanently remove all deleted messages from this folder"
-msgstr "Loại bỏ vĩnh viễn mọi thư đã xoá bỏ trong danh mục này"
+msgstr "Loại bỏ vĩnh viễn mọi thư đã xoá bỏ trong thư mục này"
 
-#: ../ui/evolution-mail-list.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:15
 msgid "Permanently remove this folder"
-msgstr "Loại bỏ vĩnh viễn danh mục này"
+msgstr "Loại bỏ vĩnh viễn thư mục này"
 
-#: ../ui/evolution-mail-list.xml.h:17
+#: ../ui/evolution-mail-list.xml.h:16
 msgid "Select Message _Thread"
 msgstr "Chọn _nhánh thư"
 
-#: ../ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:17
 msgid "Select _All Messages"
 msgstr "Chọn _mọi thư"
 
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:18
 msgid "Select all and only the messages that are not currently selected"
 msgstr "Chọn tất cả và chỉ những thư hiện thời không được chọn"
 
-#: ../ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:19
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Chọn tất cả nhưng thư trong cùng mạch với thư đã chọn"
 
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:20
 msgid "Select all visible messages"
 msgstr "Chọn mọi thư có thể thấy"
 
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:21
 msgid "Sh_ow Hidden Messages"
 msgstr "_Hiển thị thư bị ẩn"
 
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:22
 msgid "Show messages that have been temporarily hidden"
 msgstr "Hiển thị các thư đang bị giấu tạm thời"
 
-#: ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:23
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Ẩn tạm thời mọi thư đã đọc"
 
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:24
 msgid "Temporarily hide the selected messages"
 msgstr "Ẩn tạm thời những thư được chọn"
 
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "Threaded Message list"
 msgstr "Danh sách thư theo mạch"
 
-#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:112
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Thư"
@@ -17880,415 +17883,409 @@ msgstr "Thêm người _gửi vào Sổ địa chỉ"
 msgid "A_pply Filters"
 msgstr "Á_p dụng bộ lọc"
 
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-message.xml.h:4
+#: ../ui/evolution-mail-message.xml.h:3
 msgid "Add Sender to Address Book"
 msgstr "Thêm người gửi vào Sổ địa chỉ"
 
-#: ../ui/evolution-mail-message.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:4
 msgid "All Message _Headers"
 msgstr "Các dòng đầu thư"
 
-#: ../ui/evolution-mail-message.xml.h:6
+#: ../ui/evolution-mail-message.xml.h:5
 msgid "Apply filter rules to the selected messages"
 msgstr "Áp dụng bộ lọc vào các thư đã chọn"
 
-#: ../ui/evolution-mail-message.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:6
 msgid "Check for _Junk"
 msgstr "Kiểm tra tìm thư rác"
 
-#: ../ui/evolution-mail-message.xml.h:8
+#: ../ui/evolution-mail-message.xml.h:7
 msgid "Compose _New Message"
 msgstr "Soạn thư _mới"
 
-#: ../ui/evolution-mail-message.xml.h:9
+#: ../ui/evolution-mail-message.xml.h:8
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Soạn thư trả lời cho mọi người nhận thư được chọn"
 
-#: ../ui/evolution-mail-message.xml.h:10
+#: ../ui/evolution-mail-message.xml.h:9
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Soạn thư trả lời cho hộp thư chung của thư được chọn"
 
-#: ../ui/evolution-mail-message.xml.h:11
+#: ../ui/evolution-mail-message.xml.h:10
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Soạn thư trả lời cho người gửi thư được chọn"
 
-#: ../ui/evolution-mail-message.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:13
 msgid "Copy selected messages to another folder"
-msgstr "Sao chép các thư được chọn sang danh mục khác"
+msgstr "Sao chép các thư được chọn sang thư mục khác"
 
-#: ../ui/evolution-mail-message.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:14
 msgid "Create R_ule"
 msgstr "Tạo _quy tắc"
 
-#: ../ui/evolution-mail-message.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:15
 msgid "Create a Search Folder for these recipients"
-msgstr "Tạo danh mục tìm kiếm cho những người nhận này"
+msgstr "Tạo thư mục tìm kiếm cho những người nhận này"
 
-#: ../ui/evolution-mail-message.xml.h:17
+#: ../ui/evolution-mail-message.xml.h:16
 msgid "Create a Search Folder for this mailing list"
-msgstr "Tạo danh mục tìm kiếm cho hộp thư chung này"
+msgstr "Tạo thư mục tìm kiếm cho hộp thư chung này"
 
-#: ../ui/evolution-mail-message.xml.h:18
+#: ../ui/evolution-mail-message.xml.h:17
 msgid "Create a Search Folder for this sender"
-msgstr "Tạo danh mục tìm kiếm cho người gửi này"
+msgstr "Tạo thư mục tìm kiếm cho người gửi này"
 
-#: ../ui/evolution-mail-message.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:18
 msgid "Create a Search Folder for this subject"
-msgstr "Tạo danh mục tìm kiếm cho chủ đề này"
+msgstr "Tạo thư mục tìm kiếm cho chủ đề này"
 
-#: ../ui/evolution-mail-message.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a rule to filter messages from this sender"
 msgstr "Tạo quy tắc để lọc mọi thư từ người gửi này"
 
-#: ../ui/evolution-mail-message.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Tạo quy tắc để lọc mọi thư được gửi cho những người nhận này"
 
-#: ../ui/evolution-mail-message.xml.h:22
+#: ../ui/evolution-mail-message.xml.h:21
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Tạo quy tắc để lọc mọi thư được gửi cho hộp thư chung này"
 
-#: ../ui/evolution-mail-message.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:22
 msgid "Create a rule to filter messages with this subject"
 msgstr "Tạo quy tắc để lọc mọi thư có chủ đề này"
 
-#: ../ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-mail-message.xml.h:24
 msgid "Decrease the text size"
 msgstr "Giảm cỡ chữ"
 
-#: ../ui/evolution-mail-message.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:26
 msgid "Display the next important message"
 msgstr "Hiển thị thư quan trọng kế tiếp"
 
-#: ../ui/evolution-mail-message.xml.h:28
+#: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next message"
 msgstr "Hiển thị thư kế tiếp"
 
-#: ../ui/evolution-mail-message.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:28
 msgid "Display the next unread message"
 msgstr "Hiển thị thư chưa đọc kế tiếp"
 
-#: ../ui/evolution-mail-message.xml.h:30
+#: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the next unread thread"
 msgstr "Hiển thị mạch chưa đọc kế tiếp"
 
-#: ../ui/evolution-mail-message.xml.h:31
+#: ../ui/evolution-mail-message.xml.h:30
 msgid "Display the previous important message"
 msgstr "Hiển thị thư quan trọng trước đó"
 
-#: ../ui/evolution-mail-message.xml.h:32
+#: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous message"
 msgstr "Hiển thị thư trước đó"
 
-#: ../ui/evolution-mail-message.xml.h:33
+#: ../ui/evolution-mail-message.xml.h:32
 msgid "Display the previous unread message"
 msgstr "Hiển thị thư chưa đọc trước đó"
 
-#: ../ui/evolution-mail-message.xml.h:34
+#: ../ui/evolution-mail-message.xml.h:33
 msgid "Filter on Mailing _List..."
 msgstr "Lọc theo _hộp thư chung..."
 
-#: ../ui/evolution-mail-message.xml.h:35
+#: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Se_nder..."
 msgstr "Lọc theo Người _gửi..."
 
-#: ../ui/evolution-mail-message.xml.h:36
+#: ../ui/evolution-mail-message.xml.h:35
 msgid "Filter on _Recipients..."
 msgstr "Lọc theo _Người nhận..."
 
-#: ../ui/evolution-mail-message.xml.h:37
+#: ../ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Subject..."
 msgstr "Lọc theo _Chủ đề..."
 
-#: ../ui/evolution-mail-message.xml.h:38
+#: ../ui/evolution-mail-message.xml.h:37
 msgid "Filter the selected messages for junk status"
 msgstr "Lọc các thư được chọn để quyết định trạng thái rác"
 
-#: ../ui/evolution-mail-message.xml.h:39
+#: ../ui/evolution-mail-message.xml.h:38
 msgid "Flag selected message(s) for follow-up"
 msgstr "Đặt cờ trên các thư được chọn để theo dõi tiếp"
 
-#: ../ui/evolution-mail-message.xml.h:40
+#: ../ui/evolution-mail-message.xml.h:39
 msgid "Follow _Up..."
 msgstr "Th_eo dõi tiếp..."
 
-#: ../ui/evolution-mail-message.xml.h:41
+#: ../ui/evolution-mail-message.xml.h:40
 msgid "Force images in HTML mail to be loaded"
 msgstr "Ép tải ảnh trong thư HTML"
 
-#: ../ui/evolution-mail-message.xml.h:43
+#: ../ui/evolution-mail-message.xml.h:42
 msgid "Forward the selected message in the body of a new message"
 msgstr "Chuyển tiếp thư được chọn trong thân thư mới"
 
-#: ../ui/evolution-mail-message.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message quoted like a reply"
 msgstr "Chuyển tiếp thư được chọn được trích dẫn là trả lời"
 
-#: ../ui/evolution-mail-message.xml.h:45
+#: ../ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message to someone"
 msgstr "Chuyển tiếp thông điệp được chọn tới người khác"
 
-#: ../ui/evolution-mail-message.xml.h:46
+#: ../ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Chuyển tiếp thông điệp được chọn tới người khác như là đính kèm"
 
-#: ../ui/evolution-mail-message.xml.h:47
+#: ../ui/evolution-mail-message.xml.h:46
 msgid "Increase the text size"
 msgstr "Tăng cỡ chữ"
 
-#: ../ui/evolution-mail-message.xml.h:49
+#: ../ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as"
 msgstr "_Nhãn là"
 
-#: ../ui/evolution-mail-message.xml.h:50
+#: ../ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected message(s) as having been read"
 msgstr "Đánh dấu các thư được chọn có đã đọc"
 
-#: ../ui/evolution-mail-message.xml.h:51
+#: ../ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as important"
 msgstr "Đánh dấu cho các thư được chọn là quan trọng"
 
-#: ../ui/evolution-mail-message.xml.h:52
+#: ../ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected message(s) as junk"
 msgstr "Đánh dấu các thư được chọn là rác"
 
-#: ../ui/evolution-mail-message.xml.h:53
+#: ../ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected message(s) as not being junk"
 msgstr "Đánh dấu các thư được chọn không phải là rác"
 
-#: ../ui/evolution-mail-message.xml.h:54
+#: ../ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Đánh dấu các thư được chọn có chưa đọc"
 
-#: ../ui/evolution-mail-message.xml.h:55
+#: ../ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Đánh dấu các thư được chọn không phải là quan trọng"
 
-#: ../ui/evolution-mail-message.xml.h:56
+#: ../ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected messages for deletion"
 msgstr "Đánh dấu các thư được chọn cần xóa bỏ"
 
-#: ../ui/evolution-mail-message.xml.h:57
+#: ../ui/evolution-mail-message.xml.h:56
 msgid "Message Source"
 msgstr "Mã nguồn thư"
 
-#: ../ui/evolution-mail-message.xml.h:58
+#: ../ui/evolution-mail-message.xml.h:57
 msgid "Move"
 msgstr "Chuyển"
 
-#: ../ui/evolution-mail-message.xml.h:59
+#: ../ui/evolution-mail-message.xml.h:58
 msgid "Move selected message(s) to another folder"
-msgstr "Di chuyển các thư được chọn sang danh mục khác"
+msgstr "Di chuyển các thư được chọn sang thư mục khác"
 
-#: ../ui/evolution-mail-message.xml.h:61
+#: ../ui/evolution-mail-message.xml.h:60
 msgid "Next _Important Message"
 msgstr "Thư _quan trọng kế"
 
-#: ../ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Thread"
 msgstr "_Mạch kế"
 
-#: ../ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:62
 msgid "Next _Unread Message"
 msgstr "Thư _chưa đọc kế"
 
-#: ../ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:63
 msgid "Not Junk"
 msgstr "Không phải rác"
 
-#: ../ui/evolution-mail-message.xml.h:65
+#: ../ui/evolution-mail-message.xml.h:64
 msgid "Open a window for composing a mail message"
 msgstr "Mở cửa sổ soạn thư"
 
-#: ../ui/evolution-mail-message.xml.h:66
+#: ../ui/evolution-mail-message.xml.h:65
 msgid "Open the selected message in a new window"
 msgstr "Mở thông điệp được chọn trong cửa sổ mới"
 
-#: ../ui/evolution-mail-message.xml.h:67
+#: ../ui/evolution-mail-message.xml.h:66
 msgid "Open the selected message in the composer for editing"
 msgstr "Mở thông điệp được chọn trong bộ soạn thảo để hiệu chỉnh"
 
-#: ../ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-message.xml.h:67
 msgid "P_revious Unread Message"
 msgstr "Thư chưa đọc t_rước"
 
-#: ../ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Pos_t New Message to Folder"
-msgstr "Gửi thư mới _tới danh mục"
+msgstr "Gửi thư mới _tới thư mục"
 
-#: ../ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:70
 msgid "Post a Repl_y"
 msgstr "Gửi t_rả lời"
 
-#: ../ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-mail-message.xml.h:71
 msgid "Post a message to a Public folder"
-msgstr "Gửi thư tới danh mục Công cộng"
+msgstr "Gửi thư tới thư mục Công cộng"
 
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:72
 msgid "Post a reply to a message in a Public folder"
 msgstr "Gửi trả lời thông điệp trong thư mục Công cộng"
 
-#: ../ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Pr_evious Important Message"
 msgstr "Thư quan trọng t_rước"
 
-#: ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-mail-message.xml.h:74
 msgid "Preview the message to be printed"
 msgstr "Xem trước thông điệp cần in"
 
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:78
 msgid "Print this message"
 msgstr "In thư này"
 
-#: ../ui/evolution-mail-message.xml.h:80
+#: ../ui/evolution-mail-message.xml.h:79
 msgid "Re_direct"
 msgstr "Chuyển _hướng"
 
-#: ../ui/evolution-mail-message.xml.h:81
+#: ../ui/evolution-mail-message.xml.h:80
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Chuyển hướng (bounce: nảy lên) thư được chọn tới người khác"
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Reset the text to its original size"
 msgstr "Phục hồi kích thước chữ gốc"
 
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:85
 msgid "Save the message as a text file"
 msgstr "Lưu thư là tập tin văn bản"
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Search Folder from Mailing _List..."
-msgstr "Danh mục tìm kiếm trên _Hộp thư chung..."
+msgstr "Thư mục tìm kiếm trên _Hộp thư chung..."
 
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Search Folder from Recipients..."
-msgstr "Danh mục tìm kiếm trên _Người nhận..."
+msgstr "Thư mục tìm kiếm trên _Người nhận..."
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Search Folder from S_ubject..."
-msgstr "Danh mục tìm kiếm trên _Chủ đề..."
+msgstr "Thư mục tìm kiếm trên _Chủ đề..."
 
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:89
 msgid "Search Folder from Sen_der..."
-msgstr "Danh mục tìm kiếm trên Người _gửi..."
+msgstr "Thư mục tìm kiếm trên Người _gửi..."
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Search for text in the body of the displayed message"
 msgstr "Tìm đoạn trong thân thư đã hiển thị"
 
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Select _All Text"
 msgstr "Chọn toàn bộ _văn bản"
 
-#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Select all the text in a message"
 msgstr "Chọn mọi văn bản trong thư"
 
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Set up the page settings for your current printer"
 msgstr "Thiết lập trang cho máy in hiện thời"
 
-#: ../ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "Hiển thị con chạy nháy trong phần thân các thư đã hiển thị"
+msgstr "Hiển thị con trỏ nháy trong phần thân các thư đã hiển thị"
 
-#: ../ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Show message in the normal style"
 msgstr "Hiện thông điệp theo cách bình thường"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show message with all email headers"
 msgstr "Hiện thư với mọi dòng đầu thư"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Show the raw email source of the message"
 msgstr "Hiện thư thô, mã nguồn"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Un-delete the selected messages"
 msgstr "Hủy xóa bỏ những thư được chọn"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Uni_mportant"
 msgstr "_Không quan trọng"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "Zoom _Out"
 msgstr "Thu _nhỏ"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
 msgstr "Chế độn con _nháy"
 
-#: ../ui/evolution-mail-message.xml.h:105
+#: ../ui/evolution-mail-message.xml.h:104
 msgid "_Delete Message"
 msgstr "_Xoá bỏ thư"
 
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Find in Message..."
 msgstr "_Tìm trong thư"
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Go To"
 msgstr "Đ_i tới"
 
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Important"
 msgstr "_Quan trọng"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Junk"
 msgstr "_Rác"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Load Images"
 msgstr "Tải ả_nh"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Next Message"
 msgstr "Thư _kế"
 
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Normal Size"
 msgstr "Cỡ _bình thường"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Not Junk"
 msgstr "Không _phải rác"
 
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Open in New Window"
 msgstr "Mở trong cửa sổ _mới"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Previous Message"
 msgstr "Thư t_rước"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Save Message..."
 msgstr "_Lưu thư..."
 
-#: ../ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:123
 msgid "_Undelete Message"
 msgstr "_Hủy xóa bỏ thư"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Unread"
 msgstr "C_hưa đọc"
 
-#: ../ui/evolution-mail-message.xml.h:126
+#: ../ui/evolution-mail-message.xml.h:125
 msgid "_Zoom In"
 msgstr "_Phóng to"
 
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
 #: ../ui/evolution-mail-messagedisplay.xml.h:1
 #: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:7
+#: ../ui/evolution-signature-editor.xml.h:2
 msgid "Close"
 msgstr "Đóng"
 
@@ -18296,19 +18293,19 @@ msgstr "Đóng"
 msgid "Close this window"
 msgstr "Đóng cửa sổ này"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "Thanh công cụ chính"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:42 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
-msgstr "Đón_g"
+msgstr "_Đóng"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:45
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:36
+#: ../ui/evolution-signature-editor.xml.h:13
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:33
 msgid "_File"
 msgstr "_Tập tin"
 
@@ -18324,13 +18321,8 @@ msgstr "Đính kèm tập tin"
 msgid "Check to get delivery notification when your message is read"
 msgstr "Chọn để nhận thông báo khi người nhận đã đọc thư bạn"
 
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
 #: ../ui/evolution-message-composer.xml.h:5
-#: ../ui/evolution-signature-editor.xml.h:13
+#: ../ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
 msgstr "Đóng tập tin hiện thời"
 
@@ -18347,7 +18339,7 @@ msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Mật mã hoá thư này, dùng Chứng nhận Mật mã hóa S/MIME của bạn"
 
 #: ../ui/evolution-message-composer.xml.h:9
-#: ../ui/evolution-signature-editor.xml.h:14
+#: ../ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
 msgstr "_Dạng thức"
 
@@ -18401,9 +18393,10 @@ msgstr "Lưu là nháp"
 
 #: ../ui/evolution-message-composer.xml.h:24
 msgid "Save in folder..."
-msgstr "Lưu vào danh mục..."
+msgstr "Lưu vào thư mục..."
 
 #: ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-signature-editor.xml.h:9
 msgid "Save the current file"
 msgstr "Lưu tập tin hiện thời"
 
@@ -18413,10 +18406,10 @@ msgstr "Lưu tập tin hiện thời với tên khác"
 
 #: ../ui/evolution-message-composer.xml.h:27
 msgid "Save the message in a specified folder"
-msgstr "Lưu thông điệp vào danh mục xác định"
+msgstr "Lưu thông điệp vào thư mục xác định"
 
 #: ../ui/evolution-message-composer.xml.h:29
-#: ../ui/evolution-signature-editor.xml.h:22
+#: ../ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
 msgstr "Gửi thông điệp với dạng thức HTML"
 
@@ -18477,7 +18470,7 @@ msgid "_From Field"
 msgstr "Trường _From (Từ)"
 
 #: ../ui/evolution-message-composer.xml.h:47
-#: ../ui/evolution-signature-editor.xml.h:25
+#: ../ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Chèn"
 
@@ -18503,24 +18496,21 @@ msgstr "Trường To (Cho)"
 
 #: ../ui/evolution-signature-editor.xml.h:1
 msgid "C_lose"
-msgstr "Đón_g"
+msgstr "_Đóng"
 
-#: ../ui/evolution-signature-editor.xml.h:15
+#: ../ui/evolution-signature-editor.xml.h:5
 msgid "H_TML"
 msgstr "H_TML"
 
-#: ../ui/evolution-signature-editor.xml.h:16
+#: ../ui/evolution-signature-editor.xml.h:7
 msgid "Save and Close"
 msgstr "Lưu và Đóng"
 
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:20
+#: ../ui/evolution-signature-editor.xml.h:8
 msgid "Save and _Close"
-msgstr "Lưu và Đón_g"
+msgstr "Lưu và _Đóng"
 
-#: ../ui/evolution-signature-editor.xml.h:21
+#: ../ui/evolution-signature-editor.xml.h:10
 msgid "Save the current file and close the window"
 msgstr "Lưu tập tin hiện thời và đóng cửa sổ"
 
@@ -18534,7 +18524,7 @@ msgstr "Cập nhật danh sách"
 
 #: ../ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
-msgstr "Cập nhật danh sách các danh mục"
+msgstr "Cập nhật danh sách các thư mục"
 
 #: ../ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
@@ -18630,135 +18620,135 @@ msgid "Display window buttons with text only"
 msgstr "Hiển thị mọi cái nút cửa sổ dùng chỉ chữ thôi"
 
 #: ../ui/evolution.xml.h:10
+msgid "Evolution _FAQ"
+msgstr "Hỏi đáp Evolution"
+
+#: ../ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Thoát chương trình"
 
-#: ../ui/evolution.xml.h:11
+#: ../ui/evolution.xml.h:12
 msgid "Forget _Passwords"
 msgstr "Quên các _mật khẩu"
 
-#: ../ui/evolution.xml.h:12
+#: ../ui/evolution.xml.h:13
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 "Quên đi các mật khẩu đã nhớ, như vậy bạn sẽ lại được nhắc nhập mật khẩu"
 
-#: ../ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:14
 msgid "Hide window buttons"
 msgstr "Ẩn mọi nút cửa sổ"
 
-#: ../ui/evolution.xml.h:14
+#: ../ui/evolution.xml.h:15
 msgid "Icons _and text"
 msgstr "Ảnh _và chữ"
 
-#: ../ui/evolution.xml.h:15
+#: ../ui/evolution.xml.h:16
 msgid "Import data from other programs"
 msgstr "Nhập dữ liệu từ chương trình khác"
 
-#: ../ui/evolution.xml.h:17
+#: ../ui/evolution.xml.h:18
 msgid "New _Window"
 msgstr "Cửa sổ mớ_i"
 
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:19
 msgid "Prefere_nces"
-msgstr "_Sở thích..."
+msgstr "_Tùy thích..."
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:20
 msgid "Send / Receive"
 msgstr "Gửi / Nhận"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "Gửi các mục đang đợi gửi và nhận các mục mới"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "Thiết lập cấu hình Pilot"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:23
 msgid "Show information about Evolution"
 msgstr "Hiện thông tin về Evolution"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "Gửi báo cáo lỗi"
 
-#. <menuitem name="HelpFAQ" verb=""
-#. _label="Evolution _FAQ"/>
-#.
-#. <separator/>
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "_Gửi báo cáo lỗi"
 
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Báo cáo lỗi, dùng Bug Buddy"
 
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:27
 msgid "Toggle whether we are working offline."
 msgstr "Bật tắt hoạt động ngoại tuyến"
 
-#: ../ui/evolution.xml.h:31
+#: ../ui/evolution.xml.h:28
 msgid "Tool_bar"
 msgstr "_Thanh công cụ"
 
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:29
 msgid "Tool_bar style"
 msgstr "_Kiểu dạng thanh công cụ"
 
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:30
 msgid "_About Evolution..."
 msgstr "_Giới thiệu Evolution..."
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:31
 msgid "_Close Window"
 msgstr "Đón_g cửa sổ"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:34
 msgid "_Help"
 msgstr "Trợ _giúp"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:35
 msgid "_Hide buttons"
 msgstr "Ẩ_n nút"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:36
 msgid "_Icons only"
 msgstr "_Chỉ ảnh thôi"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:37
 msgid "_Import..."
 msgstr "_Nhập..."
 
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:38
 msgid "_New"
 msgstr "Mớ_i"
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:39
 msgid "_Quick Reference"
 msgstr "_Tham khảo nhanh"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:40
 msgid "_Quit"
 msgstr "_Thoát"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:41
 msgid "_Send / Receive"
 msgstr "_Gửi / Nhận"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:42
 msgid "_Switcher Appearance"
 msgstr "Hình thức bộ _chuyển đổi"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:43
 msgid "_Synchronization Options..."
 msgstr "Tùy chọn đồng _bộ..."
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:44
 msgid "_Text only"
 msgstr "Chỉ _chữ thôi"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:46
 msgid "_Window"
 msgstr "_Cửa sổ"
 
@@ -18796,7 +18786,7 @@ msgstr "Khung _tuần làm việc"
 
 #: ../views/mail/galview.xml.h:1
 msgid "As _Sent Folder"
-msgstr "Theo _danh mục gửi"
+msgstr "Theo _thư mục gửi"
 
 #: ../views/mail/galview.xml.h:2
 msgid "By S_tatus"
@@ -18999,14 +18989,14 @@ msgstr "Y2"
 #: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1430
 #: ../widgets/table/e-table-group-container.c:978
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3005
+#: ../widgets/table/e-table-item.c:3001
 msgid "Minimum width"
 msgstr "Độ rộng tối thiểu"
 
 #: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1431
 #: ../widgets/table/e-table-group-container.c:979
 #: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-item.c:3006
+#: ../widgets/table/e-table-item.c:3002
 msgid "Minimum Width"
 msgstr "Độ rộng tối thiểu"
 
@@ -19355,7 +19345,7 @@ msgstr "Tạ_o mục đã gửi để theo dõi thông tin"
 
 #: ../widgets/misc/e-send-options.glade.h:8
 msgid "Deli_vered and opened"
-msgstr "_Gửi và mở rồi"
+msgstr "Đã _gửi và đã mở"
 
 #: ../widgets/misc/e-send-options.glade.h:9
 msgid "Gene_ral Options"
@@ -19687,7 +19677,7 @@ msgstr "%s (mục %d)"
 #: ../widgets/table/e-table-group-container.c:902
 #: ../widgets/table/e-table-group-leaf.c:573
 #: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2963 ../widgets/table/e-table-item.c:2964
+#: ../widgets/table/e-table-item.c:2959 ../widgets/table/e-table-item.c:2960
 msgid "Alternating Row Colors"
 msgstr "Các màu của hàng thay thế"
 
@@ -19695,7 +19685,7 @@ msgstr "Các màu của hàng thay thế"
 #: ../widgets/table/e-table-group-container.c:909
 #: ../widgets/table/e-table-group-leaf.c:580
 #: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2970 ../widgets/table/e-table-item.c:2971
+#: ../widgets/table/e-table-item.c:2966 ../widgets/table/e-table-item.c:2967
 #: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
 msgid "Horizontal Draw Grid"
 msgstr "Lưới vẽ ngang"
@@ -19704,7 +19694,7 @@ msgstr "Lưới vẽ ngang"
 #: ../widgets/table/e-table-group-container.c:916
 #: ../widgets/table/e-table-group-leaf.c:587
 #: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2977 ../widgets/table/e-table-item.c:2978
+#: ../widgets/table/e-table-item.c:2973 ../widgets/table/e-table-item.c:2974
 #: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
 msgid "Vertical Draw Grid"
 msgstr "Lưới vẽ dọc"
@@ -19713,7 +19703,7 @@ msgstr "Lưới vẽ dọc"
 #: ../widgets/table/e-table-group-container.c:923
 #: ../widgets/table/e-table-group-leaf.c:594
 #: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2984 ../widgets/table/e-table-item.c:2985
+#: ../widgets/table/e-table-item.c:2980 ../widgets/table/e-table-item.c:2981
 #: ../widgets/table/e-tree.c:3283 ../widgets/table/e-tree.c:3284
 msgid "Draw focus"
 msgstr "Tập trung vẽ"
@@ -19722,7 +19712,7 @@ msgstr "Tập trung vẽ"
 #: ../widgets/table/e-table-group-container.c:930
 #: ../widgets/table/e-table-group-leaf.c:601
 #: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:2991 ../widgets/table/e-table-item.c:2992
+#: ../widgets/table/e-table-item.c:2987 ../widgets/table/e-table-item.c:2988
 msgid "Cursor mode"
 msgstr "Chế độ con trỏ"
 
@@ -19730,7 +19720,7 @@ msgstr "Chế độ con trỏ"
 #: ../widgets/table/e-table-group-container.c:937
 #: ../widgets/table/e-table-group-leaf.c:615
 #: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2956 ../widgets/table/e-table-item.c:2957
+#: ../widgets/table/e-table-item.c:2952 ../widgets/table/e-table-item.c:2953
 msgid "Selection model"
 msgstr "Mô hình lựa chọn"
 
@@ -19738,7 +19728,7 @@ msgstr "Mô hình lựa chọn"
 #: ../widgets/table/e-table-group-container.c:944
 #: ../widgets/table/e-table-group-leaf.c:608
 #: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:2998 ../widgets/table/e-table-item.c:2999
+#: ../widgets/table/e-table-item.c:2994 ../widgets/table/e-table-item.c:2995
 #: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3265
 #: ../widgets/table/e-tree.c:3266
 msgid "Length Threshold"
@@ -19748,7 +19738,7 @@ msgstr "Ngường độ dài"
 #: ../widgets/table/e-table-group-container.c:951
 #: ../widgets/table/e-table-group-leaf.c:650
 #: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
 #: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3297
 #: ../widgets/table/e-tree.c:3298
 msgid "Uniform row height"
@@ -19825,15 +19815,15 @@ msgstr "Sắp xếp thông tin"
 msgid "Tree"
 msgstr "Cây"
 
-#: ../widgets/table/e-table-item.c:2942 ../widgets/table/e-table-item.c:2943
+#: ../widgets/table/e-table-item.c:2938 ../widgets/table/e-table-item.c:2939
 msgid "Table header"
 msgstr "Dòng đầu bảng"
 
-#: ../widgets/table/e-table-item.c:2949 ../widgets/table/e-table-item.c:2950
+#: ../widgets/table/e-table-item.c:2945 ../widgets/table/e-table-item.c:2946
 msgid "Table model"
 msgstr "Mẫu bảng"
 
-#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
+#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
 msgid "Cursor row"
 msgstr "Hàng con trỏ"
 
diff --git a/views/ChangeLog b/views/ChangeLog
index bb9b541de3..1eef740b40 100644
--- a/views/ChangeLog
+++ b/views/ChangeLog
@@ -1,11 +1,3 @@
-2005-10-19 Harish Krishnaswamy <kharish@novell.com>
-	
-	Committing for Nathan Owens <pianocomp81@yahoo.com>
-	
-	* Makefile.am: added memos directory
-	* views/memos/*: added galview.xml, Makefile.am, Memos.galview for
-	initial Memos component
-
 2005-09-28  Devashish Sharma <sdevashish@novell.com>
 
 	* addressbook/Phone_List.galview: Match new column values, change
diff --git a/widgets/ChangeLog b/widgets/ChangeLog
index 5243bf6314..ef3ba387db 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -1,44 +1,17 @@
-2005-11-29 Simon Zheng <simon.zheng@sun.coma
+2005-11-29 Simon Zheng <simon.zheng@sun.com>
 
 	* menus/gal-view-collection.c: (gal_view_generate_string):
 	Fix #322311. Using g_utf8_next_char() to traverses UTF-8
 	string and replace characters that are neither a alpha nor
 	a numeral.
 
-2005-09-29  Tor Lillqvist  <tml@novell.com>
-
-	* menus/gal-view-collection.c (load_single_dir)
-	* menus/gal-view-instance.c (load_current_view): Use
-	g_win32_locale_filename_from_utf8() from GLib 2.8 instead of
-	gnome_win32_locale_filename_from_utf8() which was temporarily in
-	libgnome.
-
-2005-09-29  Li Yuan  <li.yuan@sun.com>
+2005-09-30  Li Yuan  <li.yuan@sun.com>
 
 	* menus/gal-define-views-dialog.c:
 	(etable_selection_change_forall_cb):
 	Fix #240762. If the galview implement the edit function,
 	enable the edit button. If not, disable it.
 
-2005-09-28  Tor Lillqvist  <tml@novell.com>
-
-	* e-timezone-dialog/Makefile.am
-	* menus/Makefile.am
-	* text/Makefile.am: Install in privsolib instead of privlib (no
-	difference on Unix). Use NO_UNDEFINED. Link with all needed
-	libraries to satisfy the -no-undefined used on Windows.
-
-	* e-timezone-dialog/Makefile.am
-	* text/Makefile.am: On Win32, use bootstrap import library for
-	libemiscwidgets, which hasn't been built yet when we come
-	here.
-
-	* menus/Makefile.am: Drop several overlapping CFLAGS, use
-	E_UTIL_CFLAGS instead.
-
-	* text/Makefile.am: Drop several overlapping
-	CFLAGS. EXTRA_GNOME_CFLAGS should be enough.
-	
 2005-08-03  Li Yuan  <li.yuan@sun.com>
 
 	* menus/gal-view-new-dialog.glade:
diff --git a/widgets/menus/gal-view-collection.c b/widgets/menus/gal-view-collection.c
index 1ee4859ced..32fe790b61 100644
--- a/widgets/menus/gal-view-collection.c
+++ b/widgets/menus/gal-view-collection.c
@@ -400,7 +400,7 @@ load_single_dir (GalViewCollection *collection,
 	
 	if (g_file_test (filename, G_FILE_TEST_IS_REGULAR)) {
 #ifdef G_OS_WIN32
-		gchar *locale_filename = g_win32_locale_filename_from_utf8 (filename);
+		gchar *locale_filename = gnome_win32_locale_filename_from_utf8 (filename);
 		if (locale_filename != NULL)
 			doc = xmlParseFile (locale_filename);
 		g_free (locale_filename);
diff --git a/widgets/table/e-table-example-1.c b/widgets/table/e-table-example-1.c
deleted file mode 100644
index 37ac85770f..0000000000
--- a/widgets/table/e-table-example-1.c
+++ /dev/null
@@ -1,308 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-table-example-1.c
- * Copyright 2000, 2001, Ximian, Inc.
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-/* This code is GPL. */
-#include <stdio.h>
-#include <string.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-#include "gal/e-util/e-cursors.h"
-#include "e-table-simple.h"
-#include "e-table-header.h"
-#include "e-table-header-item.h"
-#include "e-table-item.h"
-#include "e-cell-text.h"
-#include "e-cell-checkbox.h"
-#include "e-table.h"
-
-#include "table-test.h"
-
-/*
- * One way in which we make it simpler to build an ETableModel is through
- * the ETableSimple class.  Instead of creating your own ETableModel
- * class, you simply create a new object of the ETableSimple class.  You
- * give it a bunch of functions that act as callbacks.
- * 
- * You also get to pass a void * to ETableSimple and it gets passed to
- * your callbacks.  This would be for having multiple models of the same
- * type.  This is just an example though, so we statically define all the
- * data and ignore the void *data parameter.
- * 
- * In our example we will be creating a table model with 6 columns and 10
- * rows.  This corresponds to having 6 different types of information and
- * 10 different sets of data in our database.
- * 
- * The headers will be hard coded, as will be the example data.
- *
- */
-
-/*
- * There are two different meanings to the word "column".  The first is
- * the model column.  A model column corresponds to a specific type of
- * data.  This is very much like the usage in a database table where a
- * column is a field in the database.
- *
- * The second type of column is a view column.  A view column
- * corresponds to a visually displayed column.  Each view column
- * corresponds to a specific model column, though a model column may
- * have any number of view columns associated with it, from zero to
- * greater than one.
- *
- * Also, a view column doesn't necessarily depend on only one model
- * column.  In some cases, the view column renderer can be given a
- * reference to another column to get extra information about its
- * display.
-*/
-
-#define ROWS 10
-#define COLS 4
-
-#define IMPORTANCE_COLUMN 4
-#define COLOR_COLUMN 5
-
-/*
- * Here we define the initial layout of the table.  This is an xml
- * format that allows you to change the initial ordering of the
- * columns or to do sorting or grouping initially.  This specification
- * shows all 5 columns, but moves the importance column nearer to the
- * front.  It also sorts by the "Full Name" column (ascending.)
- * Sorting and grouping take the model column as their arguments
- * (sorting is specified by the "column" argument to the leaf elemnt.
- */
-
-#define INITIAL_SPEC "<ETableSpecification>                    	       \
-	<columns-shown>                  			       \
-		<column> 0 </column>     			       \
-		<column> 4 </column>     			       \
-		<column> 1 </column>     			       \
-		<column> 2 </column>     			       \
-		<column> 3 </column>     			       \
-	</columns-shown>                 			       \
-	<grouping> <leaf column=\"1\" ascending=\"true\"/> </grouping>    \
-</ETableSpecification>"
-
-char *headers [COLS] = {
-  "Email",
-  "Full Name",
-  "Address",
-  "Phone"
-};
-
-/*
- * Virtual Column list:
- * 0   Email
- * 1   Full Name
- * 2   Address
- * 3   Phone
- */
-
-char *table_data [ROWS] [COLS];
-
-/*
- * ETableSimple callbacks
- * These are the callbacks that define the behavior of our custom model.
- */
-
-/*
- * Since our model is a constant size, we can just return its size in
- * the column and row count fields.
- */
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-my_col_count (ETableModel *etc, void *data)
-{
-	return COLS;
-}
-
-/* This function returns the number of rows in our ETableModel. */
-static int
-my_row_count (ETableModel *etc, void *data)
-{
-	return ROWS;
-}
-
-/* This function returns the value at a particular point in our ETableModel. */
-static void *
-my_value_at (ETableModel *etc, int col, int row, void *data)
-{
-	return (void *) table_data [row] [col];
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-my_set_value_at (ETableModel *etc, int col, int row, const void *val, void *data)
-{
-	g_free (table_data [row] [col]);
-	table_data [row] [col] = g_strdup (val);
-}
-
-/* This function returns whether a particular cell is editable. */
-static gboolean
-my_is_cell_editable (ETableModel *etc, int col, int row, void *data)
-{
-	return TRUE;
-}
-
-/* This function duplicates the value passed to it. */
-static void *
-my_duplicate_value (ETableModel *etc, int col, const void *value, void *data)
-{
-	return g_strdup (value);
-}
-
-/* This function frees the value passed to it. */
-static void
-my_free_value (ETableModel *etc, int col, void *value, void *data)
-{
-	g_free (value);
-}
-
-/* This function creates an empty value. */
-static void *
-my_initialize_value (ETableModel *etc, int col, void *data)
-{
-	return g_strdup ("");
-}
-
-/* This function reports if a value is empty. */
-static gboolean
-my_value_is_empty (ETableModel *etc, int col, const void *value, void *data)
-{
-	return !(value && *(char *)value);
-}
-
-/* This function reports if a value is empty. */
-static char *
-my_value_to_string (ETableModel *etc, int col, const void *value, void *data)
-{
-	return g_strdup(value);
-}
-
-/* We create a window containing our new table. */
-static void
-create_table (void)
-{
-	GtkWidget *e_table, *window, *frame;
-	ECell *cell_left_just;
-	ETableHeader *e_table_header;
-	int i, j;
-	ETableModel *e_table_model = NULL;
-
-	/* First we fill in the simple data. */
-	for (i = 0; i < ROWS; i++){
-		for (j = 0; j < COLS; j++)
-			table_data [i] [j] = g_strdup ("");
-	}
-	/* Next we create our model.  This uses the functions we defined
-	   earlier. */
-	e_table_model = e_table_simple_new (
-					    my_col_count, my_row_count, my_value_at,
-					    my_set_value_at, my_is_cell_editable,
-					    my_duplicate_value, my_free_value, 
-					    my_initialize_value, my_value_is_empty,
-					    my_value_to_string,
-					    NULL);
-	/*
-	 * Next we create a header.  The ETableHeader is used in two
-	 * different way.  The first is the full_header.  This is the
-	 * list of possible columns in the view.  The second use is
-	 * completely internal.  Many of the ETableHeader functions are
-	 * for that purpose.  The only functions we really need are
-	 * e_table_header_new and e_table_header_add_col.
-	 *
-	 * First we create the header.
-	 */
-	e_table_header = e_table_header_new ();
-	
-	/*
-	 * Next we have to build renderers for all of the columns.
-	 * Since all our columns are text columns, we can simply use
-	 * the same renderer over and over again.  If we had different
-	 * types of columns, we could use a different renderer for
-	 * each column.
-	 */
-	cell_left_just = e_cell_text_new (e_table_model, NULL, GTK_JUSTIFY_LEFT);
-		
-	/*
-	 * Next we create a column object for each view column and add
-	 * them to the header.  We don't create a column object for
-	 * the importance column since it will not be shown.
-	 */
-	for (i = 0; i < COLS; i++) {
-		/* Create the column. */
-		ETableCol *ecol = e_table_col_new (
-						   i, headers [i],
-						   1.0, 20, cell_left_just,
-						   g_str_compare, TRUE);
-		/* Add it to the header. */
-		e_table_header_add_column (e_table_header, ecol, i);
-	}
-
-	/*
-	 * Here we create a window for our new table.  This window
-	 * will get shown and the person will be able to test their
-	 * item.
-	 */
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-	/* This frame is simply to get a bevel around our table. */
-	frame = gtk_frame_new (NULL);
-
-	/*
-	 * Here we create the table.  We give it the three pieces of
-	 * the table we've created, the header, the model, and the
-	 * initial layout.  It does the rest.
-	 */
-	e_table = e_table_new (e_table_header, e_table_model, INITIAL_SPEC);
-
-	/* Build the gtk widget hierarchy. */
-	gtk_container_add (GTK_CONTAINER (frame), e_table);
-	gtk_container_add (GTK_CONTAINER (window), frame);
-
-	/* Size the initial window. */
-	gtk_widget_set_usize (window, 200, 200);
-
-	/* Show it all. */
-	gtk_widget_show_all (window);
-}
-
-/* This is the main function which just initializes gnome and call our create_table function */
-
-int
-main (int argc, char *argv [])
-{
-	gnome_init ("TableExample", "TableExample", argc, argv);
-	e_cursors_init ();
-
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-
-	create_table ();
-	
-	gtk_main ();
-
-	e_cursors_shutdown ();
-	return 0;
-}
-