Merge branch 'master' into wip/gsettings

7 files changed, 273 insertions, 283 deletions

diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index c2fa19ba68..187757cece 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -39,6 +39,8 @@
 
 #include <composer/e-msg-composer.h>
 
+#define d(x)
+
 static const gchar *itip_methods[] = {
 	"PUBLISH",
 	"REQUEST",
@@ -574,8 +576,15 @@ comp_to_list (ECalComponentItipMethod method,
 		for (l = attendees; l != NULL; l = l->next) {
 			ECalComponentAttendee *att = l->data;
 
+			/* Bugfix: 688711 - Varadhan
+			   Resource is also considered as a "attendee". If the respective backend
+			   is able to successfully book resources automagically, it will appear
+			   in the users list and thereby won't get added to the list of destinations
+			   to send the meeting invite, otherwise, as a safety measure, a meeting
+			   invite will be sent to the resources as well. */
 			if (att->cutype != ICAL_CUTYPE_INDIVIDUAL &&
-			    att->cutype != ICAL_CUTYPE_GROUP)
+			    att->cutype != ICAL_CUTYPE_GROUP &&
+			    att->cutype != ICAL_CUTYPE_RESOURCE)
 				continue;
 			else if (users_has_attendee (users, att->value))
 				continue;
@@ -606,6 +615,9 @@ comp_to_list (ECalComponentItipMethod method,
 			e_destination_set_email (
 				destination, itip_strip_mailto (att->value));
 			g_ptr_array_add (array, destination);
+			d(printf ("itip-utils.c: comp_to_list: name: %s, email: %s\n",
+				  e_destination_get_name (destination),
+				  e_destination_get_email (destination)));
 		}
 		g_free (sender);
 		e_cal_component_free_attendee_list (attendees);
@@ -961,8 +973,10 @@ comp_server_send (ECalComponentItipMethod method,
 	GError *error = NULL;
 
 	top_level = comp_toplevel_with_zones (method, comp, cal_client, zones);
+	d(printf ("itip-utils.c: comp_server_send: calling e_cal_send_objects... \n"));
 	if (!e_cal_client_send_objects_sync (cal_client, top_level, users, &returned_icalcomp, NULL, &error)) {
 		/* FIXME Really need a book problem status code */
+		d(printf ("itip-utils.c: return value from e_cal_send_objects is: %d", error->code));
 		if (error) {
 			if (g_error_matches (error, E_CAL_CLIENT_ERROR, E_CAL_CLIENT_ERROR_OBJECT_ID_ALREADY_EXISTS)) {
 				e_notice (
@@ -979,6 +993,8 @@ comp_server_send (ECalComponentItipMethod method,
 
 			retval = FALSE;
 		}
+	} else {
+	  d(printf ("itip-utils.c: e_cal_send_objects returned without errors\n"));
 	}
 
 	g_clear_error (&error);
@@ -1505,6 +1521,7 @@ itip_send_comp (ECalComponentItipMethod method,
 
 	/* Give the server a chance to manipulate the comp */
 	if (method != E_CAL_COMPONENT_METHOD_PUBLISH) {
+		d(printf ("itip-utils.c: itip_send_comp: calling comp_server_send... \n"));
 		if (!comp_server_send (method, send_comp, cal_client, zones, &users))
 			goto cleanup;
 	}
diff --git a/help/C/import-supported-file-formats.page b/help/C/import-supported-file-formats.page
index 8f50d125d7..a36ea54579 100644
--- a/help/C/import-supported-file-formats.page
+++ b/help/C/import-supported-file-formats.page
@@ -6,7 +6,7 @@
     
     <link type="guide" xref="import-data" />
 
-    <revision pkgversion="3.0.2" version="0.2" date="2011-07-31" status="final"/>
+    <revision pkgversion="3.0.2" version="0.3" date="2011-10-13" status="final"/>
     <credit type="author">
       <name>Andre Klapper</name>
       <email>ak-47@gmx.net</email>
@@ -78,8 +78,8 @@ Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):</p>
 <p>CSV (Comma-separated values) or Tabulator files saved by using Evolution, Microsoft Outlook and Mozilla.
 </p></item>
 <item><p>
-Personal Storage Table (.pst):</p>
-<p>A file format used to store local copies of messages, calendar events, and other items within Microsoft software such as Microsoft Exchange Client, Windows Messaging, and Microsoft Outlook.
+Outlook Personal Folders (.pst):</p>
+<p>A file format used to store local copies of messages, calendar events, and other items within Microsoft software such as Microsoft Exchange Client, Windows Messaging, and Microsoft Outlook. It is also called "Personal Storage Table".
 </p></item>
 </list>
 </section>
diff --git a/help/C/mail-encryption-s-mime-manage.page b/help/C/mail-encryption-s-mime-manage.page
index f146fb78fd..2ebad5f483 100644
--- a/help/C/mail-encryption-s-mime-manage.page
+++ b/help/C/mail-encryption-s-mime-manage.page
@@ -6,7 +6,7 @@
 
     <link type="guide" xref="mail-encryption#s-mime"/>
 
-    <revision pkgversion="2.32.1" version="0.1" date="2011-01-05" status="draft"/>
+    <revision pkgversion="3.2.0" version="0.2" date="2011-10-13" status="draft"/>
     <credit type="author">
       <name>Andre Klapper</name>
       <email>ak-47@gmx.net</email>
@@ -24,6 +24,9 @@
 
 <p>Certificates allow you to communicate with others securely over an encrypted connection, or sign a message confirming your identity to the contact. These settings only apply to S/MIME encryption.</p>
 <p>You can import, view, edit (except for your own certificates), and delete your certificates under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Certificates</gui></guiseq>.</p>
+
+<note style="tip"><p>If you get the error "Peer's certificate issuer has been marked as not trusted by the user. (-8172) - Cannot add SMIMEEncKeyPrefs attribute" after adding your mail certificate, go to <gui>Authorities</gui> and enable <gui>Trust this CA to identify email users</gui> for the certificate.</p></note>
+
 <p><gui>Your Certificates</gui> displays a list of certificates that you own. To add a signing certificate, click <gui style="button">Import</gui>, select the file to import, then click <gui style="button">Open</gui> and enter a password.</p>
 <p><gui>Contact Certificates</gui> displays a list of certificates that you have for contacts. These certificates allow you to decrypt messages as well verify signed messages.</p>
 <p><gui>Authorities</gui> displays a list of trusted certificate authorities who verify that your own certificate is valid.</p>
diff --git a/help/es/es.po b/help/es/es.po
index 0cb8b76f19..4b329752b7 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -2,23 +2,23 @@
 # translation of evolution manual to spanish

 # 

 # 

-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011.
Jorge González <jorgegonz@svn.gnome.org>, 2007, 2009, 2010, 2011.
 # Jorge González <jorgegonz@svn.gnome.org>, 2011.
, 2011.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011.
Jorge González <jorgegonz@svn.gnome.org>, 2007, 2009, 2010, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-help.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-07 15:03+0000\n"
-"PO-Revision-Date: 2011-10-08 15:42+0200\n"
-"Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
-"Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n"
+"POT-Creation-Date: 2011-10-13 16:47+0000\n"
+"PO-Revision-Date: 2011-10-14 12:19+0200\n"
+"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
+"Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: \n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: C/using-categories.page:5(desc)
 msgid ""
@@ -1570,14 +1570,6 @@ msgstr ""
 "errores su distribución con GNOME</link> en su lugar."
 
 #: C/problems-reporting-bugs.page:25(p)
-#| msgid ""
-#| "When reporting bugs exact information is welcome as it makes it easier "
-#| "for others to reproduce and fix the issue. If possible please include "
-#| "information such as the Evolution version (under <guiseq><gui>Help</"
-#| "gui><gui>Contents</gui></guiseq>), your distribution, and exact steps to "
-#| "reproduce the problem, click by click. See the <link href=\"https://"
-#| "bugzilla.gnome.org/page.cgi?id=bug-writing.html\">Bug Writing Guidelines</"
-#| "link> for more information."
 msgid ""
 "When reporting bugs exact information is welcome as it makes it easier for "
 "others to reproduce and fix the issue. If possible please include "
@@ -1716,12 +1708,6 @@ msgstr ""
 "usar esta característica de GNOME par acualquier notificación de correo."
 
 #: C/minimize-to-system-tray.page:29(p)
-#| msgid ""
-#| "In GNOME version 2 you may modify the notification area and set it up to "
-#| "become a system tray by using external software such as <link href="
-#| "\"http://alltray.trausch.us/\"> Alltray</link> that might be available "
-#| "for installation in the software management tool of your distribution. "
-#| "This is no longer possible in GNOME 3."
 msgid ""
 "In GNOME version 2 you may modify the notification area and set it up to "
 "become a system tray by using external software such as <link href=\"http://"
@@ -3014,12 +3000,6 @@ msgid "Manually send and receive messages"
 msgstr "Enviar y recibir mensajes manualmente"
 
 #: C/mail-send-and-receive-manual.page:21(p)
-#| msgid ""
-#| "To receive new messages from the mail server and to send messages you "
-#| "have written that are in the local Outbox, click the <gui style=\"button"
-#| "\">Send / Receive</gui> button in the toolbar, or press <key>F9</key>, or "
-#| "choose <guiseq><gui>File</gui><gui>Send / Receive </gui></guiseq> from "
-#| "the main menu."
 msgid ""
 "To receive new messages from the mail server and to send messages you have "
 "written that are in the local Outbox, click the <gui style=\"button\">Send / "
@@ -3553,10 +3533,10 @@ msgstr ""
 "es.wikipedia.org/wiki/Expresi%C3%B3n_regular\">expresiones regulares</link>, "
 "saque provecho aquí de su poderío, esta opción le permite hacer búsquedas de "
 "patrones complejos de letras de manera que, por ejemplo, podría encontrar "
-"todas las palabras que empiezan o acaban con «m» y tienen entre seis y "
-"quince letras de longitud, o distinguir todos los mensajes que tengan "
-"duplicada una determinada cabecera. Para saber cómo usar las expresiones "
-"regulares examine la página del manual del comando «grep»."
+"todas las palabras que empiezan o acaban con «m» y tienen entre seis y quince "
+"letras de longitud, o distinguir todos los mensajes que tengan duplicada una "
+"determinada cabecera. Para saber cómo usar las expresiones regulares examine "
+"la página del manual del comando «grep»."
 
 #: C/mail-search-folders-conditions.page:87(p)
 msgid "Message Location:"
@@ -4214,12 +4194,10 @@ msgstr ""
 "nuevos en todas las carpetas."
 
 #: C/mail-receiving-options-exchange-ews.page:5(desc)
-#| msgid "Receiving options for Exchange MAPI accounts."
 msgid "Receiving options for Exchange Web Services accounts."
 msgstr "Opciones de recepción para cuentas Exchange Web Services."
 
 #: C/mail-receiving-options-exchange-ews.page:20(title)
-#| msgid "Exchange MAPI receiving options"
 msgid "Exchange Web Services receiving options"
 msgstr "Opciones de recepción Exchange Web Services"
 
@@ -4356,12 +4334,6 @@ msgid "Switcher layout when a new message has arrived"
 msgstr "Distribución del selector cuando llega un correo nuevo"
 
 #: C/mail-received-notification.page:28(p)
-#| msgid ""
-#| "In order to get also notified of new messages in the GNOME Notification "
-#| "area at the bottom of the screen, make sure that <guiseq><gui>Edit</"
-#| "gui><gui>Plugins</gui><gui>Mail Notification</gui></guiseq> is enabled "
-#| "and that you have set your preferred options in the <gui>Configuration</"
-#| "gui> tab."
 msgid ""
 "In order to also be notified of new messages in the GNOME Notification area "
 "at the bottom of the screen, make sure that <guiseq><gui>Edit</"
@@ -5652,7 +5624,20 @@ msgstr ""
 "sus certificados bajo <guiseq><gui>Editar</gui><gui>Preferencias</"
 "gui><gui>Certificados</gui></guiseq>."
 
-#: C/mail-encryption-s-mime-manage.page:27(p)
+#: C/mail-encryption-s-mime-manage.page:28(p)
+msgid ""
+"If you get the error \"Peer's certificate issuer has been marked as not "
+"trusted by the user. (-8172) - Cannot add SMIMEEncKeyPrefs attribute\" after "
+"adding your mail certificate, go to <gui>Authorities</gui> and enable "
+"<gui>Trust this CA to identify email users</gui> for the certificate."
+msgstr ""
+"Si obtiene el error «El emisor del certificado se ha marcado como no "
+"confiable por el usuario. (-8172): no se puede añadir el atributo "
+"SMIMEEncKeyPrefs» después de añadir su certificado de correo-e, vaya a "
+"<gui>Autoridades</gui> y active <gui>Confiar en esta AC para identificar a "
+"usuarios de correo-e</gui>."
+
+#: C/mail-encryption-s-mime-manage.page:30(p)
 msgid ""
 "<gui>Your Certificates</gui> displays a list of certificates that you own. "
 "To add a signing certificate, click <gui style=\"button\">Import</gui>, "
@@ -5664,7 +5649,7 @@ msgstr ""
 "seleccione el archivo que importar, después pulse <gui style=\"button"
 "\">Abrir</gui> e introduzca una contraseña."
 
-#: C/mail-encryption-s-mime-manage.page:28(p)
+#: C/mail-encryption-s-mime-manage.page:31(p)
 msgid ""
 "<gui>Contact Certificates</gui> displays a list of certificates that you "
 "have for contacts. These certificates allow you to decrypt messages as well "
@@ -5674,7 +5659,7 @@ msgstr ""
 "lista de los certificados que posee de sus contactos. Estos certificados le "
 "permiten descifrar mensajes así como verificar los mensajes firmados."
 
-#: C/mail-encryption-s-mime-manage.page:29(p)
+#: C/mail-encryption-s-mime-manage.page:32(p)
 msgid ""
 "<gui>Authorities</gui> displays a list of trusted certificate authorities "
 "who verify that your own certificate is valid."
@@ -6151,9 +6136,9 @@ msgid ""
 "Evolution's code repository to test."
 msgstr ""
 "Sólo para desarrolladores: en versiones futuras, Evolution usará WebKit en "
-"lugar de gtkhtml para mostrar HTML. Hay una rama llamada «<link href="
-"\"http://git.gnome.org/browse/evolution?h=webkit\">webkit</link>» en el "
-"repositorio de código de Evolution para pruebas."
+"lugar de gtkhtml para mostrar HTML. Hay una rama llamada «<link href=\"http://"
+"git.gnome.org/browse/evolution?h=webkit\">webkit</link>» en el repositorio "
+"de código de Evolution para pruebas."
 
 #: C/mail-displaying-no-css.page:27(p)
 msgid ""
@@ -6356,11 +6341,6 @@ msgstr ""
 "ver el correo."
 
 #: C/mail-displaying-character-encodings.page:25(p)
-#| msgid ""
-#| "To constantly change this setting, go to <guiseq><gui>Edit</"
-#| "gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>General</"
-#| "gui><gui>Message Display</gui><gui>Default character encoding</gui></"
-#| "guiseq>."
 msgid ""
 "To make this the default setting, go to <guiseq><gui>Edit</"
 "gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>General</"
@@ -8584,7 +8564,6 @@ msgid "Access a Gmail POP Account via Evolution"
 msgstr "Acceder a una cuenta POP de GMail a través de Evolution"
 
 #: C/mail-access-gmail-pop-account.page:26(p)
-#| msgid "Follow these steps to set up your GMail POP Account in Evolution:"
 msgid "Follow these steps to set up your Gmail POP Account in Evolution:"
 msgstr ""
 "Siga estos pasos para configurar su cuenta de correo POP de Gmail en "
@@ -8667,14 +8646,10 @@ msgstr ""
 "de correo IMAP</link>."
 
 #: C/mail-access-gmail-imap-account.page:28(p)
-#| msgid ""
-#| "To access GMail via IMAP you must turn on IMAP in your Google account. "
-#| "See the <link href=\"https://mail.google.com/support/bin/answer.py?"
-#| "answer=77695\">GMail Help</link> for more information."
 msgid ""
 "To access Gmail via IMAP you must turn on IMAP in your Google account. See "
-"the <link href=\"https://mail.google.com/support/bin/answer.py?"
-"answer=77695\">Gmail Help</link> for more information."
+"the <link href=\"https://mail.google.com/support/bin/answer.py?answer=77695"
+"\">Gmail Help</link> for more information."
 msgstr ""
 "Para acceder a Gmail mediante IMAP debe activar IMAP en su cuenta de Google. "
 "Consulte la <link href=\"https://mail.google.com/support/bin/answer.py?"
@@ -9131,10 +9106,6 @@ msgid "Restore from backup"
 msgstr "Restaurar desde un respaldo"
 
 #: C/intro-first-run.page:32(p)
-#| msgid ""
-#| "You will get asked whether to restore from a backup of a previous "
-#| "version. If you have such a backup, continue <link xref=\"backup-"
-#| "restore#restore\">here</link>. Otherwise, go to the next page."
 msgid ""
 "You will be asked whether to restore from a backup of a previous version. If "
 "you have such a backup, continue <link xref=\"backup-restore#restore\">here</"
@@ -9686,18 +9657,25 @@ msgstr ""
 "Evolution, Microsoft Outlook y Mozilla."
 
 #: C/import-supported-file-formats.page:80(p)
-msgid "Personal Storage Table (.pst):"
-msgstr "Tabla de almacenamiento personal (.pst):"
+#| msgid "Outlook Express 5/6 Personal Folders (.dbx):"
+msgid "Outlook Personal Folders (.pst):"
+msgstr "Carpetas personales de Outlook (.pst):"
 
 #: C/import-supported-file-formats.page:82(p)
+#| msgid ""
+#| "A file format used to store local copies of messages, calendar events, "
+#| "and other items within Microsoft software such as Microsoft Exchange "
+#| "Client, Windows Messaging, and Microsoft Outlook."
 msgid ""
 "A file format used to store local copies of messages, calendar events, and "
 "other items within Microsoft software such as Microsoft Exchange Client, "
-"Windows Messaging, and Microsoft Outlook."
+"Windows Messaging, and Microsoft Outlook. It is also called \"Personal "
+"Storage Table\"."
 msgstr ""
 "Un formato de archivo usado para almacenar copias locales de mensajes, "
-"acontecimientos de calendario y otros elementos del software Microsoft "
-"Exchange Client, Windows Messaging y Microsoft Outlook."
+"eventos de calendario y otros elementos de software de Microsoft como "
+"Microsoft Exchange Client, Windows Messaging y Microsoft Outlook. También se "
+"llama «Tabla de almacenamiento personal»."
 
 #: C/import-single-files.page:5(desc)
 msgid "Importing single files."
@@ -10297,10 +10275,6 @@ msgstr ""
 "share/applications/mimeapps.list</file>."
 
 #: C/default-browser.page:29(p)
-#| msgid ""
-#| "This requires having the evolution-mapi package installed. <link action="
-#| "\"install:evolution-mapi\" href=\"http://ftp.gnome.org/pub/gnome/sources/"
-#| "evolution-mapi/\">Install evolution-mapi now.</link>"
 msgid ""
 "If the error message \"Could not open the link: Operation not supported\" is "
 "shown, you need to install <link action=\"install:gvfs\" href=\"http://ftp."
@@ -10319,8 +10293,6 @@ msgid "Data storage locations"
 msgstr "Ubicaciones de almacenamiento de datos"
 
 #: C/data-storage.page:23(p)
-#| msgid ""
-#| "This is only interesting for advanced users that want to debug problems."
 msgid "This is only interesting for advanced users who want to debug problems."
 msgstr ""
 "Esto sólo es interesante para usuarios avanzados que quieren depurar "
@@ -10656,11 +10628,6 @@ msgid "Adding a Contact"
 msgstr "Añadir un contacto"
 
 #: C/contacts-usage-add-contact.page:23(p)
-#| msgid ""
-#| "Click <guiseq><gui>File</gui><gui>New</gui><gui>Contact</gui></guiseq>, "
-#| "or right-click in a blank space in the list of contacts and click \"New "
-#| "Contact...\", or press <keyseq><key>Shift</key><key>Ctrl</key><key>C</"
-#| "key></keyseq>."
 msgid ""
 "Click <guiseq><gui>File</gui><gui>New</gui><gui>Contact</gui></guiseq>, or "
 "right-click in a blank space in the list of contacts and click <gui>New "
@@ -10763,8 +10730,6 @@ msgid "Adding another local address book"
 msgstr "Añadir otra libreta de direcciones local"
 
 #: C/contacts-local.page:22(p)
-#| msgid ""
-#| "To add another local calendar to Evolution, perform the following steps:"
 msgid ""
 "To add another local address book to Evolution, perform the following steps:"
 msgstr ""
@@ -10805,9 +10770,6 @@ msgstr ""
 "LibreOffice."
 
 #: C/contacts-libreoffice.page:25(p)
-#| msgid ""
-#| "Click <guiseq><gui>Insert</gui><gui>Table...</gui></guiseq> in the "
-#| "menubar."
 msgid ""
 "Click <guiseq><gui>Edit</gui><gui>Exchange Database...</gui></guiseq> in the "
 "menu bar. This will bring up the <gui>Exchange databases</gui> dialog box."
@@ -10827,7 +10789,6 @@ msgstr ""
 "triángulo para obtener la lista de sus libretas de direcciones de Evolution."
 
 #: C/contacts-libreoffice.page:27(p)
-#| msgid "Choose the file, and click <gui style=\"button\">Open</gui>."
 msgid "Choose an addressbook and click <gui style=\"button\">Define</gui>."
 msgstr ""
 "Seleccione una libreta de direcciones y pulse <gui style=\"button\">Definir</"
@@ -11155,16 +11116,6 @@ msgid "Adding people automatically to my contacts"
 msgstr "Añadir personas automáticamente a mis contactos"
 
 #: C/contacts-add-automatically.page:27(p)
-#| msgid ""
-#| "You can add people automatically to your contacts when you reply to "
-#| "received email. Enable the plugin <gui>Automatic Contacts</gui> by going "
-#| "to <guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>; click on "
-#| "\"Automatic Contacts\" so that it shows a check mark. Then go to "
-#| "<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Contacts</"
-#| "gui><gui>Automatic Contacts</gui></guiseq> and enable the <gui>Create "
-#| "address book entries when sending emails</gui> option and select an "
-#| "address book in the drop-down field below that will receive the new "
-#| "contacts."
 msgid ""
 "You can add people automatically to your contacts when you reply to received "
 "email. Enable the plugin <gui>Automatic Contacts</gui> by going to "
@@ -11256,7 +11207,6 @@ msgid "Navigate to <code>/org/gnome/desktop/interface</code>."
 msgstr "Vaya a <code>/org/gnome/desktop/interface</code>."
 
 #: C/change-keyboard-shortcuts.page:23(p)
-#| msgid "Enable <gui>Attachment Reminder</gui>."
 msgid "Enable <gui>can-change-accels</gui>."
 msgstr "Actíve <gui>can-change-accels</gui>."
 
@@ -12577,6 +12527,9 @@ msgstr ""
 "Jorge González <jorgegonz@svn.gnome.org>, 2007-2011\n"
 "Francisco Javier F. Serrador <serrador@openshine.com>, 2005, 2006"
 
+#~ msgid "Personal Storage Table (.pst):"
+#~ msgstr "Tabla de almacenamiento personal (.pst):"
+
 #~ msgid "What to do when this error is shown."
 #~ msgstr "Qué hacer cuando se muestra este error."
 
diff --git a/po/es.po b/po/es.po
index 0064f2c731..40a6ac2045 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,8 +9,8 @@
 # Héctor García Álvarez <hector@scouts-es.org>, 2002.
 # Pablo Gonzalo del Campo <pablodc@bigfoot.com>,2003 (revisión).
 # Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2003, 2004, 2005, 2006.
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011.
 # Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011.
 #
 #: ../shell/main.c:566
 msgid ""
@@ -18,14 +18,14 @@ msgstr ""
 "Project-Id-Version: evolution.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=evolution&keywords=I18N+L10N\n"
-"POT-Creation-Date: 2011-10-12 13:44+0000\n"
-"PO-Revision-Date: 2011-10-12 17:24+0200\n"
-"Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
-"Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n"
+"POT-Creation-Date: 2011-10-13 16:11+0000\n"
+"PO-Revision-Date: 2011-10-14 11:18+0200\n"
+"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
+"Language-Team: Español <gnome-es-list@gnome.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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #. For Translators: {0} is the name of the address book source
@@ -1236,7 +1236,7 @@ msgstr "Charla por vídeo"
 #: ../modules/calendar/e-cal-shell-view-actions.c:232
 #: ../modules/calendar/e-cal-shell-view-actions.c:261
 #: ../modules/calendar/e-cal-shell-view.c:523
-#: ../modules/online-accounts/e-online-accounts-google.c:294
+#: ../modules/online-accounts/e-online-accounts-google.c:296
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
 #: ../widgets/misc/e-send-options.c:528
 msgid "Calendar"
@@ -1500,7 +1500,7 @@ msgstr "No se pudo obtener la lista de libretas de direcciones: %s"
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
 #: ../calendar/gui/dialogs/memo-page.c:938 ../em-format/em-format.c:2324
-#: ../mail/em-folder-tree.c:678 ../mail/mail-ops.c:662
+#: ../mail/em-folder-tree.c:679 ../mail/mail-ops.c:662
 #: ../plugins/caldav/caldav-browse-server.c:220
 #: ../plugins/caldav/caldav-browse-server.c:1469 ../plugins/face/face.c:174
 #: ../smime/gui/certificate-manager.c:313
@@ -1585,8 +1585,8 @@ msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar from the side bar in the Calendar view."
 msgstr ""
-"«{0}» es un calendario de sólo lectura y no se puede modificar. Seleccione "
-"un calendario diferente de la barra lateral en la vista del calendario."
+"«{0}» es un calendario de sólo lectura y no se puede modificar. Seleccione un "
+"calendario diferente de la barra lateral en la vista del calendario."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:6
@@ -2640,21 +2640,21 @@ msgid "Close the current window"
 msgstr "Cerrar la ventana actual"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1127 ../mail/e-mail-browser.c:141
-#: ../shell/e-shell-window-actions.c:1455
+#: ../shell/e-shell-window-actions.c:1464
 #: ../widgets/misc/e-focus-tracker.c:117 ../widgets/misc/e-focus-tracker.c:555
 #: ../widgets/misc/e-web-view.c:459 ../widgets/misc/e-web-view.c:1306
 msgid "Copy the selection"
 msgstr "Copiar la selección"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1134 ../mail/e-mail-browser.c:148
-#: ../shell/e-shell-window-actions.c:1462
+#: ../shell/e-shell-window-actions.c:1471
 #: ../widgets/misc/e-focus-tracker.c:110 ../widgets/misc/e-focus-tracker.c:550
 #: ../widgets/misc/e-web-view.c:1300
 msgid "Cut the selection"
 msgstr "Cortar la selección"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1141
-#: ../shell/e-shell-window-actions.c:1469
+#: ../shell/e-shell-window-actions.c:1478
 #: ../widgets/misc/e-focus-tracker.c:131 ../widgets/misc/e-focus-tracker.c:565
 msgid "Delete the selection"
 msgstr "Eliminar la selección"
@@ -2664,7 +2664,7 @@ msgid "View help"
 msgstr "Ver la ayuda"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1155 ../mail/e-mail-browser.c:155
-#: ../shell/e-shell-window-actions.c:1497
+#: ../shell/e-shell-window-actions.c:1506
 #: ../widgets/misc/e-focus-tracker.c:124 ../widgets/misc/e-focus-tracker.c:560
 #: ../widgets/misc/e-web-view.c:1312
 msgid "Paste the clipboard"
@@ -2675,7 +2675,7 @@ msgid "Save current changes"
 msgstr "Guardar los cambios actuales"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1183 ../mail/e-mail-browser.c:162
-#: ../shell/e-shell-window-actions.c:1574
+#: ../shell/e-shell-window-actions.c:1583
 #: ../widgets/misc/e-focus-tracker.c:138 ../widgets/misc/e-focus-tracker.c:570
 msgid "Select all text"
 msgstr "Selecciona todo el texto"
@@ -2688,19 +2688,19 @@ msgstr "_Clasificación"
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
 #: ../mail/e-mail-browser.c:176
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1602
+#: ../shell/e-shell-window-actions.c:1611
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Editar"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1204 ../mail/e-mail-browser.c:169
-#: ../shell/e-shell-window-actions.c:1609
+#: ../shell/e-shell-window-actions.c:1618
 #: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
 msgstr "_Archivo"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1211
-#: ../shell/e-shell-window-actions.c:1616
+#: ../shell/e-shell-window-actions.c:1625
 msgid "_Help"
 msgstr "Ay_uda"
 
@@ -2714,7 +2714,7 @@ msgid "_Options"
 msgstr "_Opciones"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1232 ../mail/e-mail-browser.c:183
-#: ../shell/e-shell-window-actions.c:1651 ../smime/gui/smime-ui.ui.h:46
+#: ../shell/e-shell-window-actions.c:1660 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "_Ver"
 
@@ -4284,7 +4284,7 @@ msgstr "Razón del fallo: %s"
 
 #: ../calendar/gui/e-meeting-store.c:1891
 #: ../plugins/caldav/caldav-browse-server.c:957
-#: ../plugins/google-account-setup/google-source.c:460
+#: ../plugins/google-account-setup/google-source.c:458
 #: ../plugins/publish-calendar/publish-calendar.c:337
 #: ../smime/gui/component.c:54
 msgid "Enter password"
@@ -6769,7 +6769,7 @@ msgstr "_Mensaje nuevo"
 msgid "Open New Message window"
 msgstr "Abrir la ventana de mensaje nuevo"
 
-#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1511
+#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1520
 msgid "Configure Evolution"
 msgstr "Configurar Evolution"
 
@@ -7192,8 +7192,8 @@ msgstr "CalDAV"
 
 #: ../capplet/settings/mail-account-view.c:361
 #: ../capplet/settings/mail-account-view.c:413
-#: ../modules/online-accounts/e-online-accounts-google.c:287
-#: ../modules/online-accounts/e-online-accounts-google.c:359
+#: ../modules/online-accounts/e-online-accounts-google.c:289
+#: ../modules/online-accounts/e-online-accounts-google.c:362
 #: ../plugins/google-account-setup/google-contacts-source.c:55
 #: ../plugins/google-account-setup/google-source.c:87
 msgid "Google"
@@ -8315,9 +8315,9 @@ msgstr "Vista de icono"
 msgid "List View"
 msgstr "Vista de lista"
 
-#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1427
-#: ../shell/e-shell-window-actions.c:1434
-#: ../shell/e-shell-window-actions.c:1441
+#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1436
+#: ../shell/e-shell-window-actions.c:1443
+#: ../shell/e-shell-window-actions.c:1450
 msgid "Close this window"
 msgstr "Cierra esta ventana"
 
@@ -9104,8 +9104,8 @@ msgstr "Obteniendo mensaje «%s»"
 #. * other user means other calendars subscribed
 #: ../mail/e-mail-reader.c:3255 ../mail/mail-config.ui.h:32
 #: ../plugins/google-account-setup/google-source.c:316
-#: ../plugins/google-account-setup/google-source.c:565
-#: ../plugins/google-account-setup/google-source.c:704
+#: ../plugins/google-account-setup/google-source.c:558
+#: ../plugins/google-account-setup/google-source.c:695
 #: ../widgets/misc/e-account-tree-view.c:414
 msgid "Default"
 msgstr "Predeterminado"
@@ -9614,41 +9614,41 @@ msgstr "C_rear"
 msgid "Folder _name:"
 msgstr "_Nombre de la carpeta:"
 
-#: ../mail/em-folder-tree.c:647
+#: ../mail/em-folder-tree.c:648
 msgid "Folder names cannot contain '/'"
 msgstr "Los nombres de carpetas no pueden contener el carácter «/»"
 
-#: ../mail/em-folder-tree.c:768
+#: ../mail/em-folder-tree.c:773
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1590
+#: ../mail/em-folder-tree.c:1595
 msgid "Mail Folder Tree"
 msgstr "Árbol de carpetas de correo"
 
-#: ../mail/em-folder-tree.c:2067 ../mail/em-folder-utils.c:115
+#: ../mail/em-folder-tree.c:2091 ../mail/em-folder-utils.c:115
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moviendo la carpeta %s"
 
-#: ../mail/em-folder-tree.c:2070 ../mail/em-folder-utils.c:117
+#: ../mail/em-folder-tree.c:2094 ../mail/em-folder-utils.c:117
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando la carpeta %s"
 
-#: ../mail/em-folder-tree.c:2077 ../mail/message-list.c:2303
+#: ../mail/em-folder-tree.c:2101 ../mail/message-list.c:2303
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moviendo los mensajes a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:2081 ../mail/message-list.c:2305
+#: ../mail/em-folder-tree.c:2105 ../mail/message-list.c:2305
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando los mensajes a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:2100
+#: ../mail/em-folder-tree.c:2124
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "No se puede dejar el(los) mensaje(s) en el almacén de nivel superior"
@@ -10212,8 +10212,7 @@ msgid ""
 "expanded by default. \"0\" = expanded \"1\" = collapsed"
 msgstr ""
 "Describe si las cabeceras del mensajes en la vista con paneles se deben "
-"contraer o expandir de manera predeterminada. «0» = expandidas «1» = "
-"contraídas"
+"contraer o expandir de manera predeterminada. «0» = expandidas «1» = contraídas"
 
 #: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
@@ -10261,8 +10260,8 @@ msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 msgstr ""
-"Determina si se debe usar la misma tipografía para las líneas «De» y "
-"«Asunto» en la columna «Mensajes» de la vista vertical."
+"Determina si se debe usar la misma tipografía para las líneas «De» y «Asunto» "
+"en la columna «Mensajes» de la vista vertical."
 
 #: ../mail/evolution-mail.schemas.in.h:50
 msgid "Directory for saving mail component files."
@@ -10448,8 +10447,8 @@ msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
 msgstr ""
-"Altura inicial de la ventana «Editor de filtros». El valor se actualiza "
-"según el usuario redimensiona verticalmente la ventana."
+"Altura inicial de la ventana «Editor de filtros». El valor se actualiza según "
+"el usuario redimensiona verticalmente la ventana."
 
 #: ../mail/evolution-mail.schemas.in.h:85
 msgid ""
@@ -10472,8 +10471,8 @@ msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
-"Altura inicial de la ventana «Enviar y recibir correo». El valor se "
-"actualiza según el usuario redimensiona verticalmente la ventana."
+"Altura inicial de la ventana «Enviar y recibir correo». El valor se actualiza "
+"según el usuario redimensiona verticalmente la ventana."
 
 #: ../mail/evolution-mail.schemas.in.h:88
 msgid ""
@@ -10494,11 +10493,11 @@ msgid ""
 "particular value is not used by Evolution since the \"Folder Subscriptions\" "
 "window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
-"Estado inicial maximizado de la ventana «Suscripciones de carpetas». El "
-"valor se actualiza cuando el usuario maximiza o reduce la ventana. Nota: "
-"Evolution no usa este valor en particular ya que la ventana «Suscripciones "
-"de carpetas» no se puede maximizar. Esta clave existe sólo como un detalle "
-"de implementación."
+"Estado inicial maximizado de la ventana «Suscripciones de carpetas». El valor "
+"se actualiza cuando el usuario maximiza o reduce la ventana. Nota: Evolution "
+"no usa este valor en particular ya que la ventana «Suscripciones de carpetas» "
+"no se puede maximizar. Esta clave existe sólo como un detalle de "
+"implementación."
 
 #: ../mail/evolution-mail.schemas.in.h:90
 msgid ""
@@ -10784,9 +10783,9 @@ msgid ""
 "Possible values are: never - to never close browser window always - to "
 "always close browser window ask - (or any other value) will ask user"
 msgstr ""
-"Los valores posibles son: «never» (nunca) para no cerrar nunca la ventana "
-"del examinador; «always» (siempre) para cerrar siempre la ventana del "
-"examinador; «ask» (preguntar) o cualquier otro valor, preguntarán al usuario"
+"Los valores posibles son: «never» (nunca) para no cerrar nunca la ventana del "
+"examinador; «always» (siempre) para cerrar siempre la ventana del examinador; "
+"«ask» (preguntar) o cualquier otro valor, preguntarán al usuario"
 
 #: ../mail/evolution-mail.schemas.in.h:138
 msgid "Prompt before sending to recipients not entered as mail addresses"
@@ -10968,8 +10967,8 @@ msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
-"Mostrar el campo «Cco» al enviar un mensaje de correo. Esto se controla "
-"desde el menú Ver cuando se elige una cuenta de correo."
+"Mostrar el campo «Cco» al enviar un mensaje de correo. Esto se controla desde "
+"el menú Ver cuando se elige una cuenta de correo."
 
 #: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
@@ -11036,8 +11035,8 @@ msgid ""
 "it will do that. It works by comparing the Reply-To: header with a List-"
 "Post: header, if there is one."
 msgstr ""
-"Algunas listas de correo establecen una cabecera «Responder a:» para forzar "
-"a los usuarios a responder a la lista, incluso cuando los usuarios piden que "
+"Algunas listas de correo establecen una cabecera «Responder a:» para forzar a "
+"los usuarios a responder a la lista, incluso cuando los usuarios piden que "
 "Evolution envíe una respuesta privada. Establecer esta opción a cierta "
 "intentará ignorar tales cabeceras «Responder a:», de tal forma que Evolution "
 "haga lo que se le pide. Si usa la acción de respuesta privada, responderá de "
@@ -11148,8 +11147,8 @@ msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr ""
-"Esto puede tener tres valores posibles. «0» para errores. «1» para avisos. "
-"«2» para mensajes de depuración."
+"Esto puede tener tres valores posibles. «0» para errores. «1» para avisos. «2» "
+"para mensajes de depuración."
 
 #: ../mail/evolution-mail.schemas.in.h:205
 msgid ""
@@ -11177,9 +11176,9 @@ msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
 msgstr ""
-"Esta clave es de una sola lectura y después de leerla se establece a "
-"«false». Esto deselecciona el correo en la lista y elimina la vista previa "
-"para esa carpeta."
+"Esta clave es de una sola lectura y después de leerla se establece a «false». "
+"Esto deselecciona el correo en la lista y elimina la vista previa para esa "
+"carpeta."
 
 #: ../mail/evolution-mail.schemas.in.h:208
 msgid ""
@@ -11312,9 +11311,9 @@ msgid ""
 "started. This option is used only together with 'send_recv_on_start' option."
 msgstr ""
 "Indica si se debe comprobar si hay mensajes nuevos en todas las cuentas "
-"activas independientemente del conteo en la opción «Comprobar si hay "
-"mensajes nuevos cada X minutos» al iniciar Evolution. Esta opción sólo se "
-"usa junto con la opción «send_recv_on_start»."
+"activas independientemente del conteo en la opción «Comprobar si hay mensajes "
+"nuevos cada X minutos» al iniciar Evolution. Esta opción sólo se usa junto "
+"con la opción «send_recv_on_start»."
 
 #: ../mail/evolution-mail.schemas.in.h:227
 msgid ""
@@ -12457,8 +12456,8 @@ msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "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}». ¿Quiere enviar una "
+"notificación de recepción a {0}?"
 
 #: ../mail/mail.error.xml.h:10
 msgid ""
@@ -13626,7 +13625,7 @@ msgstr "Crea una libreta de direcciones nueva"
 #: ../modules/addressbook/e-book-shell-view.c:405
 #: ../modules/calendar/e-cal-shell-backend.c:115
 #: ../modules/calendar/e-cal-shell-migrate.c:63
-#: ../modules/online-accounts/e-online-accounts-google.c:366
+#: ../modules/online-accounts/e-online-accounts-google.c:369
 msgid "Contacts"
 msgstr "Contactos"
 
@@ -14573,8 +14572,7 @@ msgstr ""
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
 msgid "Show Role field in the event/task/meeting editor"
-msgstr ""
-"Mostrar el campo «Rol» en el editor de acontecimientos/tareas/reuniones"
+msgstr "Mostrar el campo «Rol» en el editor de acontecimientos/tareas/reuniones"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:68
 msgid "Show appointment end times in week and month views"
@@ -14664,8 +14662,8 @@ msgid ""
 "The UID of the selected (or \"primary\") memo list in the sidebar of the "
 "\"Memos\" view."
 msgstr ""
-"El UID de la nota seleccionada (o «primaria») en la barra lateral de la "
-"vista de «Notas»."
+"El UID de la nota seleccionada (o «primaria») en la barra lateral de la vista "
+"de «Notas»."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
 msgid ""
@@ -14702,8 +14700,8 @@ msgid ""
 msgstr ""
 "El estilo de la distribución determina dónde ubicar el panel de vista previa "
 "en relación con la lista de notas. «0» (vista clásica) ubica el panel de "
-"vista previa debajo de la lista de notas. «1» (vista vertical) ubica el "
-"panel de vista previa junto a la lista de notas."
+"vista previa debajo de la lista de notas. «1» (vista vertical) ubica el panel "
+"de vista previa junto a la lista de notas."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:90
 msgid ""
@@ -14725,8 +14723,8 @@ msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
 msgstr ""
-"Esto puede tener tres valores posibles. «0» para errores. «1» para avisos. "
-"«2» para mensajes de depuración."
+"Esto puede tener tres valores posibles. «0» para errores. «1» para avisos. «2» "
+"para mensajes de depuración."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
 msgid "Time divisions"
@@ -14749,8 +14747,8 @@ msgid ""
 "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
 "\"days\"."
 msgstr ""
-"Unidades para el recordatorio de cumpleaños o aniversarios, «minutes», "
-"«hours» o «days»."
+"Unidades para el recordatorio de cumpleaños o aniversarios, «minutes», «hours» "
+"o «days»."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
@@ -14879,8 +14877,8 @@ msgstr ""
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:121
 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"
+"Indica si debe mostrar el campo «Tipo» en el editor de acontecimientos/tareas/"
+"reuniones"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
 msgid "Whether to show week numbers in various places in the Calendar."
@@ -16611,8 +16609,10 @@ msgid "Are you sure you want to close Evolution?"
 msgstr "¿Seguro que quiere cerrar Evolution?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
+#| msgid ""
+#| "Are you sure you want to restore Evolution from the selected back up file?"
 msgid ""
-"Are you sure you want to restore Evolution from the selected back up file?"
+"Are you sure you want to restore Evolution from the selected backup file?"
 msgstr ""
 "¿Está seguro de que quiere restaurar Evolution desde el archivo de respaldo "
 "seleccionado?"
@@ -16630,12 +16630,14 @@ msgid "Insufficient Permissions"
 msgstr "Permisos insuficientes"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
-msgid "Invalid Evolution back up file"
+#| msgid "Invalid Evolution back up file"
+msgid "Invalid Evolution backup file"
 msgstr "Archivo de respaldo de Evolution no válido"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-msgid "Please select a valid back up file to restore."
-msgstr "Seleccione un archivo de respaldo válido para restaurar."
+#| msgid "Please select a valid back up file to restore."
+msgid "Please select a valid backup file to restore."
+msgstr "Seleccione un archivo de respaldo válido que restaurar."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid "The selected folder is not writable."
@@ -16650,16 +16652,21 @@ msgstr ""
 "de que guarda todo dato sin guardar antes de proceder."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
+#| msgid ""
+#| "To restore your data and settings, you must first close Evolution. Please "
+#| "make sure that you save any unsaved data before proceeding. This will "
+#| "delete all your current Evolution data and settings and restore them from "
+#| "your back up."
 msgid ""
 "To restore your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding. This will delete "
-"all your current Evolution data and settings and restore them from your back "
-"up."
+"all your current Evolution data and settings and restore them from your "
+"backup."
 msgstr ""
-"Para restaurar sus datos y ajustes, primero debe cerrar Evolution. Asegúrese "
-"de que guarda todos sus datos sin guardar antes de proceder. Esto eliminará "
-"todos sus datos y configuración actual de Evolution y los restaurará de su "
-"respaldo."
+"Para restaurar sus datos y su configuración, primero debe cerrar Evolution. "
+"Asegúrese de que guarda todos los datos que no haya guardado antes de "
+"proceder. Esto eliminará todos sus datos y configuración actual de Evolution "
+"y los restaurará desde su respaldo."
 
 #: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
@@ -16832,7 +16839,7 @@ msgstr "Usar _conexión segura"
 
 #: ../plugins/caldav/caldav-source.c:249
 #: ../plugins/google-account-setup/google-contacts-source.c:337
-#: ../plugins/google-account-setup/google-source.c:669
+#: ../plugins/google-account-setup/google-source.c:660
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:269
 msgid "User_name:"
 msgstr "_Usuario:"
@@ -16846,7 +16853,7 @@ msgstr "_Examinar el servidor para un calendario"
 #: ../plugins/calendar-http/calendar-http.c:129
 #: ../plugins/calendar-weather/calendar-weather.c:421
 #: ../plugins/google-account-setup/google-contacts-source.c:377
-#: ../plugins/google-account-setup/google-source.c:675
+#: ../plugins/google-account-setup/google-source.c:666
 msgid "Re_fresh:"
 msgstr "A_ctualizar:"
 
@@ -17256,14 +17263,14 @@ msgstr ""
 msgid "Server"
 msgstr "Servidor"
 
-#: ../plugins/google-account-setup/google-source.c:459
+#: ../plugins/google-account-setup/google-source.c:457
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr ""
 "Introduzca la contraseña para que el usuario %s acceda a la lista de "
 "calendarios suscritos."
 
-#: ../plugins/google-account-setup/google-source.c:576
+#: ../plugins/google-account-setup/google-source.c:569
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17272,17 +17279,17 @@ msgstr ""
 "No se pueden leer los datos del servidor de Google.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:576
+#: ../plugins/google-account-setup/google-source.c:569
 #: ../plugins/mail-to-task/mail-to-task.c:820
 #: ../plugins/mail-to-task/mail-to-task.c:1084
 msgid "Unknown error."
 msgstr "Error desconocido."
 
-#: ../plugins/google-account-setup/google-source.c:679
+#: ../plugins/google-account-setup/google-source.c:670
 msgid "Cal_endar:"
 msgstr "Cal_endario:"
 
-#: ../plugins/google-account-setup/google-source.c:714
+#: ../plugins/google-account-setup/google-source.c:705
 msgid "Retrieve _List"
 msgstr "Obtener _lista"
 
@@ -17769,8 +17776,8 @@ msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "meeting:"
 msgstr ""
-"%s desea recibir la última información de la siguiente reunión a través de "
-"%s:"
+"%s desea recibir la última información de la siguiente reunión a través de %"
+"s:"
 
 #: ../plugins/itip-formatter/itip-view.c:402
 #, c-format
@@ -18230,8 +18237,8 @@ msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
 "old event?"
 msgstr ""
-"El calendario seleccionado ya contiene el acontecimiento «%s». ¿Quiere "
-"editar el acontecimiento antiguo?"
+"El calendario seleccionado ya contiene el acontecimiento «%s». ¿Quiere editar "
+"el acontecimiento antiguo?"
 
 #: ../plugins/mail-to-task/mail-to-task.c:613
 #, c-format
@@ -19391,275 +19398,274 @@ msgstr ""
 msgid "Evolution Website"
 msgstr "Página web de Evolution"
 
-#: ../shell/e-shell-window-actions.c:902
+#: ../shell/e-shell-window-actions.c:911
 msgid "Categories Editor"
 msgstr "Editor de categorías"
 
-#: ../shell/e-shell-window-actions.c:1237
+#: ../shell/e-shell-window-actions.c:1246
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy no está instalado."
 
-#: ../shell/e-shell-window-actions.c:1239
+#: ../shell/e-shell-window-actions.c:1248
 msgid "Bug Buddy could not be run."
 msgstr "No se pudo ejecutar Bug Buddy."
 
-#: ../shell/e-shell-window-actions.c:1420
+#: ../shell/e-shell-window-actions.c:1429
 msgid "Show information about Evolution"
 msgstr "Mostrar información acerca de Evolution"
 
-#: ../shell/e-shell-window-actions.c:1425
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1434
+#: ../shell/e-shell-window-actions.c:1448
 msgid "_Close Window"
 msgstr "_Cerrar ventana"
 
-#: ../shell/e-shell-window-actions.c:1446
+#: ../shell/e-shell-window-actions.c:1455
 msgid "_Contents"
 msgstr "Índ_ice"
 
-#: ../shell/e-shell-window-actions.c:1448
+#: ../shell/e-shell-window-actions.c:1457
 msgid "Open the Evolution User Guide"
 msgstr "Abrir la Guía de usuario de Evolution"
 
-#: ../shell/e-shell-window-actions.c:1474
+#: ../shell/e-shell-window-actions.c:1483
 msgid "_Forget Passwords"
 msgstr "_Olvidar contraseñas"
 
-#: ../shell/e-shell-window-actions.c:1476
+#: ../shell/e-shell-window-actions.c:1485
 msgid "Forget all remembered passwords"
 msgstr "Olvidar todas las contraseñas recordadas"
 
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1490
 msgid "I_mport..."
 msgstr "I_mportar…"
 
-#: ../shell/e-shell-window-actions.c:1483
+#: ../shell/e-shell-window-actions.c:1492
 msgid "Import data from other programs"
 msgstr "Importa datos de otros programas"
 
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:1497
 msgid "New _Window"
 msgstr "_Ventana nueva"
 
-#: ../shell/e-shell-window-actions.c:1490
+#: ../shell/e-shell-window-actions.c:1499
 msgid "Create a new window displaying this view"
 msgstr "Crear una ventana nueva mostrando esta vista"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1511
 msgid "Available Cate_gories"
 msgstr "Categorías _disponibles:"
 
-#: ../shell/e-shell-window-actions.c:1504
+#: ../shell/e-shell-window-actions.c:1513
 msgid "Manage available categories"
 msgstr "Gestionar las categorías disponibles"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1525
 msgid "_Quick Reference"
 msgstr "_Referencia rápida"
 
-#: ../shell/e-shell-window-actions.c:1518
+#: ../shell/e-shell-window-actions.c:1527
 msgid "Show Evolution's shortcut keys"
 msgstr "Mostrar los atajos de teclas de Evolution"
 
-#: ../shell/e-shell-window-actions.c:1525
+#: ../shell/e-shell-window-actions.c:1534
 msgid "Exit the program"
 msgstr "Sale del programa"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1539
 msgid "_Advanced Search..."
 msgstr "Búsqueda _avanzada…"
 
-#: ../shell/e-shell-window-actions.c:1532
+#: ../shell/e-shell-window-actions.c:1541
 msgid "Construct a more advanced search"
 msgstr "Construir una búsqueda más avanzada"
 
-#: ../shell/e-shell-window-actions.c:1539
+#: ../shell/e-shell-window-actions.c:1548
 msgid "Clear the current search parameters"
 msgstr "Limpiar los parámetros de búsqueda actuales"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1553
 msgid "_Edit Saved Searches..."
 msgstr "_Editar búsquedas guardadas…"
 
-#: ../shell/e-shell-window-actions.c:1546
+#: ../shell/e-shell-window-actions.c:1555
 msgid "Manage your saved searches"
 msgstr "Gestionar sus búsquedas guardadas"
 
-#: ../shell/e-shell-window-actions.c:1553
+#: ../shell/e-shell-window-actions.c:1562
 msgid "Click here to change the search type"
 msgstr "Pulse aquí para cambiar el tipo de búsqueda"
 
 # En conflicto con _Buscar del menu principal
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1567
 msgid "_Find Now"
 msgstr "B_uscar ahora"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1560
+#: ../shell/e-shell-window-actions.c:1569
 msgid "Execute the current search parameters"
 msgstr "Ejecutar los parámetros de búsqueda actuales"
 
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1574
 msgid "_Save Search..."
 msgstr "_Guardar búsqueda…"
 
-#: ../shell/e-shell-window-actions.c:1567
+#: ../shell/e-shell-window-actions.c:1576
 msgid "Save the current search parameters"
 msgstr "Guardar los parámetros de búsqueda actuales"
 
-#: ../shell/e-shell-window-actions.c:1579
+#: ../shell/e-shell-window-actions.c:1588
 msgid "Submit _Bug Report..."
 msgstr "Enviar informe de _fallo…"
 
-#: ../shell/e-shell-window-actions.c:1581
+#: ../shell/e-shell-window-actions.c:1590
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Envía un informe de fallos usando Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1595
 msgid "_Work Offline"
 msgstr "_Trabajar desconectado"
 
-#: ../shell/e-shell-window-actions.c:1588
+#: ../shell/e-shell-window-actions.c:1597
 msgid "Put Evolution into offline mode"
 msgstr "Poner Evolution en modo desconectado"
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1602
 msgid "_Work Online"
 msgstr "_Trabajar conectado"
 
-#: ../shell/e-shell-window-actions.c:1595
+#: ../shell/e-shell-window-actions.c:1604
 msgid "Put Evolution into online mode"
 msgstr "Poner Evolution en modo conectado"
 
-#: ../shell/e-shell-window-actions.c:1623
+#: ../shell/e-shell-window-actions.c:1632
 msgid "Lay_out"
 msgstr "_Distribución"
 
-#: ../shell/e-shell-window-actions.c:1630
+#: ../shell/e-shell-window-actions.c:1639
 msgid "_New"
 msgstr "_Nuevo"
 
-#: ../shell/e-shell-window-actions.c:1637
+#: ../shell/e-shell-window-actions.c:1646
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../shell/e-shell-window-actions.c:1644
+#: ../shell/e-shell-window-actions.c:1653
 msgid "_Switcher Appearance"
 msgstr "Apariencia del _selector"
 
-#: ../shell/e-shell-window-actions.c:1658
+#: ../shell/e-shell-window-actions.c:1667
 msgid "_Window"
 msgstr "_Ventana"
 
-#: ../shell/e-shell-window-actions.c:1687
+#: ../shell/e-shell-window-actions.c:1696
 msgid "Show Side _Bar"
 msgstr "Mostrar barra _lateral"
 
-#: ../shell/e-shell-window-actions.c:1689
+#: ../shell/e-shell-window-actions.c:1698
 msgid "Show the side bar"
 msgstr "Mostrar la barra lateral"
 
-#: ../shell/e-shell-window-actions.c:1695
+#: ../shell/e-shell-window-actions.c:1704
 msgid "Show _Buttons"
 msgstr "Mostrar _botones"
 
-#: ../shell/e-shell-window-actions.c:1697
+#: ../shell/e-shell-window-actions.c:1706
 msgid "Show the switcher buttons"
 msgstr "Mostrar los botones del selector"
 
-#: ../shell/e-shell-window-actions.c:1703
+#: ../shell/e-shell-window-actions.c:1712
 msgid "Show _Status Bar"
 msgstr "Mostrar barra de _estado"
 
-#: ../shell/e-shell-window-actions.c:1705
+#: ../shell/e-shell-window-actions.c:1714
 msgid "Show the status bar"
 msgstr "Mostrar la barra de estado"
 
-#: ../shell/e-shell-window-actions.c:1711
+#: ../shell/e-shell-window-actions.c:1720
 msgid "Show _Tool Bar"
 msgstr "Mostrar barra de _herramientas"
 
-#: ../shell/e-shell-window-actions.c:1713
+#: ../shell/e-shell-window-actions.c:1722
 msgid "Show the tool bar"
 msgstr "Mostrar la barra de herramientas"
 
-#: ../shell/e-shell-window-actions.c:1735
+#: ../shell/e-shell-window-actions.c:1744
 msgid "_Icons Only"
 msgstr "Sólo _iconos"
 
-#: ../shell/e-shell-window-actions.c:1737
+#: ../shell/e-shell-window-actions.c:1746
 msgid "Display window buttons with icons only"
 msgstr "Mostrar los botones de la ventana sólo con iconos"
 
-#: ../shell/e-shell-window-actions.c:1742
+#: ../shell/e-shell-window-actions.c:1751
 msgid "_Text Only"
 msgstr "Sólo _texto"
 
-#: ../shell/e-shell-window-actions.c:1744
+#: ../shell/e-shell-window-actions.c:1753
 msgid "Display window buttons with text only"
 msgstr "Mostrar los botones de la ventana sólo con texto"
 
-#: ../shell/e-shell-window-actions.c:1749
+#: ../shell/e-shell-window-actions.c:1758
 msgid "Icons _and Text"
 msgstr "Iconos _y texto"
 
-#: ../shell/e-shell-window-actions.c:1751
+#: ../shell/e-shell-window-actions.c:1760
 msgid "Display window buttons with icons and text"
 msgstr "Mostrar los botones de la ventana con iconos y texto"
 
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1765
 msgid "Tool_bar Style"
 msgstr "Estilo de la _barra de herramientas"
 
-#: ../shell/e-shell-window-actions.c:1758
+#: ../shell/e-shell-window-actions.c:1767
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 "Mostrar los botones de la ventana usando la configuración de la barra de "
 "herramientas del escritorio"
 
-#: ../shell/e-shell-window-actions.c:1766
+#: ../shell/e-shell-window-actions.c:1775
 msgid "Define Views..."
 msgstr "Definir vistas…"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1777
 msgid "Create or edit views"
 msgstr "Crear o editar vistas"
 
-#: ../shell/e-shell-window-actions.c:1773
+#: ../shell/e-shell-window-actions.c:1782
 msgid "Save Custom View..."
 msgstr "Guardar vista personalizada…"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1784
 msgid "Save current custom view"
 msgstr "Guardar la vista actual personalizada"
 
-#: ../shell/e-shell-window-actions.c:1782
+#: ../shell/e-shell-window-actions.c:1791
 msgid "C_urrent View"
 msgstr "Vista act_ual"
 
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1801
 msgid "Custom View"
 msgstr "Vista personalizada"
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1803
 msgid "Current view is a customized view"
 msgstr "La vista actual es una vista personalizada"
 
-#: ../shell/e-shell-window-actions.c:1804
+#: ../shell/e-shell-window-actions.c:1813
 msgid "Change the page settings for your current printer"
 msgstr "Cambiar la configuración de página para la impresora actual"
 
-#: ../shell/e-shell-window-actions.c:2194
+#: ../shell/e-shell-window-actions.c:2203
 #, c-format
 msgid "Switch to %s"
 msgstr "Cambiar a %s"
 
-#: ../shell/e-shell-window-actions.c:2314
+#: ../shell/e-shell-window-actions.c:2323
 #, c-format
-#| msgid "Select A File"
 msgid "Select view: %s"
 msgstr "Seleccionar vista: %s"
 
-#: ../shell/e-shell-window-actions.c:2414
+#: ../shell/e-shell-window-actions.c:2423
 msgid "Execute these search parameters"
 msgstr "Ejecutar estos parámetros de búsqueda"
 
@@ -20220,16 +20226,19 @@ msgid "Trust the authenticity of this certificate"
 msgstr "Confiar en la autenticidad de este certificado"
 
 #: ../smime/gui/smime-ui.ui.h:35
-msgid "Trust this CA to identify email users."
-msgstr "Confiar en esta AC para identificar a usuarios de correo-e."
+#| msgid "Trust this CA to identify email users."
+msgid "Trust this CA to identify _email users."
+msgstr "Confiar en esta AC para identificar a usuarios de _correo-e."
 
 #: ../smime/gui/smime-ui.ui.h:36
-msgid "Trust this CA to identify software developers."
-msgstr "Confiar en esta AC para identificar a desarrolladores de software."
+#| msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify _software developers."
+msgstr "Confiar en esta AC para identificar a desarrolladores de _software."
 
 #: ../smime/gui/smime-ui.ui.h:37
-msgid "Trust this CA to identify websites."
-msgstr "Confiar en esta AC para identificar sitios web."
+#| msgid "Trust this CA to identify websites."
+msgid "Trust this CA to identify _websites."
+msgstr "Confiar en esta AC para identificar sitios _web."
 
 #: ../smime/gui/smime-ui.ui.h:38
 msgid "Validity"
@@ -22255,8 +22264,8 @@ msgstr "Métodos de entrada"
 #~ "Folder '%s' contains %d duplicate messages. Are you sure you want to "
 #~ "delete them?"
 #~ msgstr ""
-#~ "La carpeta «%s» contiene %d correos duplicados. ¿Está seguro de que "
-#~ "quiere eliminarlos?"
+#~ "La carpeta «%s» contiene %d correos duplicados. ¿Está seguro de que quiere "
+#~ "eliminarlos?"
 
 #~ msgid ""
 #~ "Error on %s: %s\n"
@@ -22283,8 +22292,8 @@ msgstr "Métodos de entrada"
 
 #~ msgid "Count of default recurrence for a new event. -1 means forever."
 #~ msgstr ""
-#~ "Conteo de las repeticiones predeterminadas para un acontecimiento nuevo. "
-#~ "-1 significa para siempre."
+#~ "Conteo de las repeticiones predeterminadas para un acontecimiento nuevo. -"
+#~ "1 significa para siempre."
 
 #~ msgid "Default recurrence count"
 #~ msgstr "Conteo de repeticiones predeterminado"
@@ -23632,8 +23641,7 @@ msgstr "Métodos de entrada"
 
 #~ msgid "The content widget appears in a shell window's right pane"
 #~ msgstr ""
-#~ "El widget de contenido aparece en un panel derecho de la ventana de "
-#~ "«shell»"
+#~ "El widget de contenido aparece en un panel derecho de la ventana de «shell»"
 
 #~ msgid "Shell Sidebar Widget"
 #~ msgstr "Widget de barra lateral de «shell»"
@@ -24620,8 +24628,8 @@ msgstr "Métodos de entrada"
 #~ "This is the full name of your LDAP server. For example, \"ldap.mycompany."
 #~ "com\"."
 #~ msgstr ""
-#~ "Este es el nombre completo del servidor LDAP. Por ejemplo, «ldap."
-#~ "miempresa.com»."
+#~ "Este es el nombre completo del servidor LDAP. Por ejemplo, «ldap.miempresa."
+#~ "com»."
 
 #~ msgid ""
 #~ "This is the maximum number of entries to download. Setting this number to "
diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c
index de4ce86569..2dd8228548 100644
--- a/shell/e-shell-window-actions.c
+++ b/shell/e-shell-window-actions.c
@@ -701,7 +701,16 @@ static void
 action_contents_cb (GtkAction *action,
                     EShellWindow *shell_window)
 {
+#ifdef G_OS_WIN32
+	/* On Windows, link to online help instead. See https://bugzilla.gnome.org/show_bug.cgi?id=576478 */
+	gchar *online_help_url;
+	online_help_url = g_strconcat (
+		"http://library.gnome.org/users/evolution/", BASE_VERSION, NULL);
+	e_show_uri (GTK_WINDOW (shell_window), online_help_url);
+	g_free (online_help_url);
+#else
 	e_display_help (GTK_WINDOW (shell_window), NULL);
+#endif
 }
 
 static void
diff --git a/smime/gui/smime-ui.ui b/smime/gui/smime-ui.ui
index 4b4fbaef8b..0ad3f47d81 100644
--- a/smime/gui/smime-ui.ui
+++ b/smime/gui/smime-ui.ui
@@ -1188,7 +1188,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="ssl_trust_checkbutton">
-                <property name="label" translatable="yes">Trust this CA to identify websites.</property>
+                <property name="label" translatable="yes">Trust this CA to identify _websites.</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -1203,7 +1203,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="email_trust_checkbutton">
-                <property name="label" translatable="yes">Trust this CA to identify email users.</property>
+                <property name="label" translatable="yes">Trust this CA to identify _email users.</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -1218,7 +1218,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="objsign_trust_checkbutton">
-                <property name="label" translatable="yes">Trust this CA to identify software developers.</property>
+                <property name="label" translatable="yes">Trust this CA to identify _software developers.</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>