Merge branch 'master' into kill-bonobo

Conflicts:
	addressbook/gui/component/addressbook-view.c
	addressbook/gui/component/component-factory.c
	addressbook/gui/component/eab-composer-util.h
	addressbook/gui/widgets/Makefile.am
	addressbook/gui/widgets/e-addressbook-model.c
	addressbook/gui/widgets/e-addressbook-view.c
	addressbook/gui/widgets/e-addressbook-view.h
	addressbook/gui/widgets/eab-gui-util.c
	addressbook/gui/widgets/eab-gui-util.h
	addressbook/gui/widgets/eab-menu.h
	addressbook/gui/widgets/eab-popup.h
	calendar/gui/calendar-component.c
	calendar/gui/e-cal-event.h
	calendar/gui/e-calendar-table.c
	calendar/gui/e-calendar-view.c
	calendar/gui/e-calendar-view.h
	calendar/gui/e-memo-table.c
	calendar/gui/memos-component.c
	calendar/gui/tasks-component.c
	composer/e-composer-header-table.c
	composer/e-composer-private.h
	composer/e-msg-composer.c
	composer/e-msg-composer.h
	composer/evolution-composer.ui
	configure.ac
	data/icons/Makefile.am
	em-format/em-format.c
	em-format/em-format.h
	mail/Makefile.am
	mail/e-mail-shell-migrate.c
	mail/e-searching-tokenizer.c
	mail/e-searching-tokenizer.h
	mail/em-composer-utils.c
	mail/em-composer-utils.h
	mail/em-folder-browser.c
	mail/em-folder-tree-model.c
	mail/em-folder-view.c
	mail/em-format-html-display.c
	mail/em-format-html-display.h
	mail/em-mailer-prefs.c
	mail/em-message-browser.c
	plugins/vcard-inline/Makefile.am
	plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml
	plugins/vcard-inline/vcard-inline.c
	shell/e-component-registry.h
	shell/e-shell-window.c
	shell/es-menu.h
	widgets/misc/e-filter-bar.c
	widgets/misc/e-filter-bar.h
	widgets/misc/e-search-bar.c
	widgets/misc/e-search-bar.h

3 files changed, 210 insertions, 290 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index fe3f6aa629..721636a83f 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -99,12 +99,10 @@
 
 	* or.po: Updated Oriya Translation.
 
-<<<<<<< .mine
 2009-03-16  Manoj Kumar Giri  <mgiri@redhat.com>
 
 	* or.po: Updated Oriya Translation.
 
-=======
 2009-03-16  Dwayne Bailey  <dwayne@translate.org.za>
 
 	* af.po: Fix msgfmt errors
@@ -115,7 +113,6 @@
 	Fixes bug #575466.
 	* LINGUAS: Added af.
 
->>>>>>> .r37444
 2009-03-15  Daniel Nylander <po@danielnylander.se>
 
 	* sv.po: Updated Swedish translation.
@@ -696,11 +693,7 @@
 
 	* sk.po: Updated Slovak translation.
 
-<<<<<<< HEAD:po/ChangeLog
-2008-10-17  Jorge Gonzalez  <jorgegonz@svn.gnome.org>   
-=======
 2008-10-17  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
->>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:po/ChangeLog
 
 	* es.po: Updated Spanish translation
 
@@ -748,11 +741,7 @@
 
 2008-10-01  Robert-André Mauchin  <zebob.m@pengzone.org>
 
-<<<<<<< HEAD:po/ChangeLog
-	* fr.po: French translation update. Fixed #554548 
-=======
 	* fr.po: French translation update. Fixed #554548
->>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:po/ChangeLog
 	thanks to Hanka Zalska from Sun.
 
 2008-10-01  Priit Laes  <plaes at svn dot gnome dot org>
@@ -805,27 +794,12 @@
 
 	* pl.po: Updated Polish translation
 
-<<<<<<< HEAD:po/ChangeLog
-2008-09-21  Djihed Afifi <djihed@gmail.com> 
-=======
 2008-09-21  Djihed Afifi <djihed@gmail.com>
->>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:po/ChangeLog
 
 	* ar.po: Updated Arabic Translation by OsamaKhalid.
 
 2008-09-21  Rajesh Ranjan <rajeshkajha@yahoo.com>
 
-<<<<<<< HEAD:po/ChangeLog
-        * hi.po: Updated Hindi Translation.
-        
-2008-09-21  Rajesh Ranjan <rajeshkajha@yahoo.com>
-
-        * hi.po: Updated Hindi Translation.
-        
-2008-09-21  Rajesh Ranjan <rajeshkajha@yahoo.com>
-
-        * hi.po: Updated Hindi Translation.
-=======
 	* hi.po: Updated Hindi Translation.
 
 2008-09-21  Rajesh Ranjan <rajeshkajha@yahoo.com>
@@ -835,7 +809,6 @@
 2008-09-21  Rajesh Ranjan <rajeshkajha@yahoo.com>
 
 	* hi.po: Updated Hindi Translation.
->>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:po/ChangeLog
 
 2008-09-21  Gabor Kelemen  <kelemeng@gnome.hu>
 
@@ -896,30 +869,18 @@
 
 2008-09-18  Shankar Prasad  <svenkate@redhat.com>
 
-<<<<<<< HEAD:po/ChangeLog
-        * kn.po: Updated Kannada translation
-=======
 	* kn.po: Updated Kannada translation
->>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:po/ChangeLog
 
 2008-09-18  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
 
 	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
 	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
 
-<<<<<<< HEAD:po/ChangeLog
-2008-09-18  Djihed Afifi <djihed@gmail.com> 
-
-	* ar.po: Updated Arabic Translation by Usama Akkad.
-
-2008-09-17  Djihed Afifi <djihed@gmail.com> 
-=======
 2008-09-18  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Usama Akkad.
 
 2008-09-17  Djihed Afifi <djihed@gmail.com>
->>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:po/ChangeLog
 
 	* ar.po: Updated Arabic Translation by Usama Akkad.
 
@@ -933,11 +894,7 @@
 
 2008-09-17  Shankar Prasad  <svenkate@redhat.com>
 
-<<<<<<< HEAD:po/ChangeLog
-        * kn.po: Updated Kannada translation
-=======
 	* kn.po: Updated Kannada translation
->>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:po/ChangeLog
 
 2008-09-16  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8ebac02e3a..39a35ece46 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -477,6 +477,7 @@ widgets/menus/gal-view-new-dialog.glade
 widgets/misc/e-attachment.c
 widgets/misc/e-attachment-dialog.c
 widgets/misc/e-attachment-handler-image.c
+widgets/misc/e-attachment-handler-sendto.c
 widgets/misc/e-attachment-icon-view.c
 widgets/misc/e-attachment-paned.c
 widgets/misc/e-attachment-store.c
diff --git a/po/es.po b/po/es.po
index d2c8accd34..5a6ad30fbd 100644
--- a/po/es.po
+++ b/po/es.po
@@ -16,8 +16,8 @@ msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=evolution\n"
-"POT-Creation-Date: 2009-05-06 15:05+0000\n"
-"PO-Revision-Date: 2009-05-08 21:01+0200\n"
+"POT-Creation-Date: 2009-05-17 03:19+0000\n"
+"PO-Revision-Date: 2009-05-18 23:02+0200\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -388,10 +388,6 @@ msgid "Could not remove address book."
 msgstr "No se pudo eliminar la libreta de direcciones."
 
 #: ../addressbook/addressbook.error.xml.h:11
-#| msgid ""
-#| "Currently you can access only GroupWise System Address Book from "
-#| "Evolution. Please use some other GroupWise mail client once, to get your "
-#| "GroupWise Frequent Contacts and GroupWise Personal Contacts folders."
 msgid ""
 "Currently you can only access the GroupWise System Address Book from "
 "Evolution. Please use some other GroupWise mail client once to get your "
@@ -803,7 +799,7 @@ msgstr ""
 
 #: ../addressbook/gui/component/addressbook-config.c:1022
 #: ../addressbook/gui/component/ldap-config.glade.h:17
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: ../calendar/gui/dialogs/calendar-setup.c:367
 #: ../calendar/gui/dialogs/calendar-setup.c:378
 #: ../calendar/gui/dialogs/calendar-setup.c:389
@@ -1147,7 +1143,6 @@ msgid "Search _filter:"
 msgstr "_Filtro de búsqueda:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:27
-#, fuzzy
 #| 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 "
@@ -1156,9 +1151,9 @@ msgid ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on 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»."
+"El filtro de búsqueda es el tipo de los objetos que buscar. Si no se "
+"modifica, la búsqueda predeterminada se realizará sobre la clase de objetos "
+"de tipo «person»."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Supported Search Bases"
@@ -2264,16 +2259,16 @@ msgstr "Seleccionado"
 msgid "Has Cursor"
 msgstr "Tiene el cursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:549
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:545
 msgid "_Open Link in Browser"
 msgstr "_Abrir enlace en el navegador"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:170
-#: ../mail/em-folder-view.c:2756
+#: ../mail/em-folder-view.c:2755
 msgid "_Copy Link Location"
 msgstr "_Copiar dirección del enlace"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:550
+#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:546
 msgid "_Send New Message To..."
 msgstr "_Enviar un mensaje nuevo a…"
 
@@ -2331,7 +2326,7 @@ msgid "Calendar"
 msgstr "Calendario"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:629
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "Disponibilidad"
@@ -2669,22 +2664,22 @@ msgstr "Mover contactos a"
 msgid "Copy contacts to"
 msgstr "Copiar contactos a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:901
+#: ../addressbook/gui/widgets/eab-gui-util.c:903
 msgid "Multiple vCards"
 msgstr "vCards múltiples"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:908
+#: ../addressbook/gui/widgets/eab-gui-util.c:910
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard para %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:920
-#: ../addressbook/gui/widgets/eab-gui-util.c:946
+#: ../addressbook/gui/widgets/eab-gui-util.c:922
+#: ../addressbook/gui/widgets/eab-gui-util.c:948
 #, c-format
 msgid "Contact information"
 msgstr "Información de contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:948
+#: ../addressbook/gui/widgets/eab-gui-util.c:950
 #, c-format
 msgid "Contact information for %s"
 msgstr "Información de contacto de %s"
@@ -3442,7 +3437,7 @@ msgid "_Dismiss"
 msgstr "_Descartar"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1021
+#: ../calendar/gui/dialogs/comp-editor.c:1019
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:8
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:168
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
@@ -4566,14 +4561,14 @@ msgid "A_dd"
 msgstr "Aña_dir"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "Alarms"
 msgstr "Alertas"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
 #: ../widgets/misc/e-attachment-dialog.c:371
-#: ../widgets/misc/e-attachment-store.c:545
+#: ../widgets/misc/e-attachment-store.c:553
 msgid "_Suggest automatic display of attachment"
 msgstr "_Sugerir mostrar automáticamente el adjunto"
 
@@ -4584,7 +4579,7 @@ msgstr "Adjuntar archivo(s)"
 #. an empty string is the same as 'None'
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:137
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:186
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 #: ../calendar/gui/dialogs/event-page.c:2968
 #: ../calendar/gui/e-cal-model-tasks.c:673
 #: ../calendar/gui/e-day-view-time-item.c:788
@@ -4659,25 +4654,21 @@ msgstr "<span weight=\"bold\">Tiempo</span>"
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">Semana laboral</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Adjust for daylight sa_ving time"
-msgstr "Ajustar a la hora de _verano"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Day _ends:"
 msgstr "La jornada _acaba a las:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Display"
 msgstr "Mostrar"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: ../calendar/gui/dialogs/recurrence-page.c:1107
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Friday"
 msgstr "viernes"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -4687,13 +4678,13 @@ msgstr ""
 "horas\n"
 "días"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: ../calendar/gui/dialogs/recurrence-page.c:1103
 #: ../calendar/gui/e-itip-control.c:727
 msgid "Monday"
 msgstr "lunes"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -4711,182 +4702,182 @@ msgstr ""
 "sábado\n"
 "domingo"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #: ../mail/mail-config.glade.h:117
 msgid "Pick a color"
 msgstr "Elija un color"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "S_un"
 msgstr "_Dom"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: ../calendar/gui/dialogs/recurrence-page.c:1108
 #: ../calendar/gui/e-itip-control.c:732
 msgid "Saturday"
 msgstr "sábado"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Sc_roll Month View by a week"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Se_cond zone:"
 msgstr "Zona se_cundaria:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Select the calendars for alarm notification"
 msgstr "Seleccione los calendarios para las alertas de notificación"
 
 #. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Sh_ow a reminder"
 msgstr "M_ostrar un recordatorio"
 
 #. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Show a _reminder"
 msgstr "Mostrar un _recordatorio"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Show week _numbers in date navigator"
 msgstr "Mostrar los _números de las semanas en el navegador de fechas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "Show week n_umber in Day and Work Week View"
 msgstr ""
 "Mostrar los n_úmeros de las semanas en la Vista diaria y en la Vista de la "
 "semana laboral"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #: ../calendar/gui/dialogs/recurrence-page.c:1109
 #: ../calendar/gui/e-itip-control.c:726
 msgid "Sunday"
 msgstr "domingo"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "T_asks due today:"
 msgstr "Ta_reas que vencen hoy:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "T_hu"
 msgstr "_Jue"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "Template:"
 msgstr "Plantilla:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 #: ../calendar/gui/dialogs/recurrence-page.c:1106
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Thursday"
 msgstr "jueves"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 #: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "_Zona horaria:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Time format:"
 msgstr "Formato de la hora:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 #: ../calendar/gui/dialogs/recurrence-page.c:1104
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Tuesday"
 msgstr "martes"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "Use s_ystem time zone"
 msgstr "Usar la zona horaria del s_istema"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 #: ../calendar/gui/dialogs/recurrence-page.c:1105
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Wednesday"
 msgstr "miércoles"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "Wee_k starts on:"
 msgstr "La _semana empieza en:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "Work days:"
 msgstr "Días laborables:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_12 hour (AM/PM)"
 msgstr "_12 horas (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_24 hour"
 msgstr "_24 horas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Ask for confirmation when deleting items"
 msgstr "Pedir confirm_ación al borrar elementos"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_Compress weekends in month view"
 msgstr "_Comprimir fines de semana en la vista mensual"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Day begins:"
 msgstr "La jornada laboral _comienza a las:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Fri"
 msgstr "_Vie"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Hide completed tasks after"
 msgstr "_Ocultar tareas terminadas tras"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Mon"
 msgstr "_Lun"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Overdue tasks:"
 msgstr "Tareas fuera de pla_zo:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
 msgid "_Sat"
 msgstr "_Sáb"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:74
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Show appointment end times in week and month view"
 msgstr ""
 "_Mostrar la hora del final de las citas en las vistas semanales y mensuales"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:74
 msgid "_Time divisions:"
 msgstr "Divisiones de _hora:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
 msgid "_Tue"
 msgstr "_Mar"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:78
 msgid "_Wed"
 msgstr "M_ié"
 
 #. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:81
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:80
 msgid "before every anniversary/birthday"
 msgstr "antes de cada aniversario/cumpleaños"
 
 #. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:83
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:82
 msgid "before every appointment"
 msgstr "antes de cada cita"
 
@@ -5019,211 +5010,211 @@ msgid "Due "
 msgstr "Vence "
 
 #: ../calendar/gui/dialogs/comp-editor.c:245
-#: ../calendar/gui/dialogs/comp-editor.c:2677 ../mail/em-utils.c:373
+#: ../calendar/gui/dialogs/comp-editor.c:2675 ../mail/em-utils.c:373
 #: ../plugins/prefer-plain/prefer-plain.c:91
 msgid "attachment"
 msgstr "adjunto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:476
+#: ../calendar/gui/dialogs/comp-editor.c:474
 msgid "Could not update object"
 msgstr "No es posible actualizar el objeto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:565
+#: ../calendar/gui/dialogs/comp-editor.c:563
 msgid "Edit Appointment"
 msgstr "Editar cita"
 
-#: ../calendar/gui/dialogs/comp-editor.c:572
+#: ../calendar/gui/dialogs/comp-editor.c:570
 #, c-format
 msgid "Meeting - %s"
 msgstr "Reunión: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:574
+#: ../calendar/gui/dialogs/comp-editor.c:572
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:580
+#: ../calendar/gui/dialogs/comp-editor.c:578
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tarea asignada: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:582
+#: ../calendar/gui/dialogs/comp-editor.c:580
 #, c-format
 msgid "Task - %s"
 msgstr "Tarea: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:587
+#: ../calendar/gui/dialogs/comp-editor.c:585
 #, c-format
 msgid "Memo - %s"
 msgstr "Nota - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:603
+#: ../calendar/gui/dialogs/comp-editor.c:601
 msgid "No Summary"
 msgstr "Sin resumen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:745
+#: ../calendar/gui/dialogs/comp-editor.c:743
 msgid "Keep original item?"
 msgstr "¿Mantener el elemento original?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:951
+#: ../calendar/gui/dialogs/comp-editor.c:949
 msgid "Click here to close the current window"
 msgstr "Pulse aquí para cerrar la ventana actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:958
+#: ../calendar/gui/dialogs/comp-editor.c:956
 msgid "Copy selected text to the clipboard"
 msgstr "Copia el texto seleccionado al portapapeles"
 
-#: ../calendar/gui/dialogs/comp-editor.c:965
+#: ../calendar/gui/dialogs/comp-editor.c:963
 msgid "Cut selected text to the clipboard"
 msgstr "Corta el texto seleccionado al portapapeles"
 
-#: ../calendar/gui/dialogs/comp-editor.c:972
+#: ../calendar/gui/dialogs/comp-editor.c:970
 msgid "Click here to view help available"
 msgstr "Pulse aquí para ver la ayuda disponible"
 
-#: ../calendar/gui/dialogs/comp-editor.c:979
+#: ../calendar/gui/dialogs/comp-editor.c:977
 msgid "Paste text from the clipboard"
 msgstr "Pega texto desde el portapapeles"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1000
+#: ../calendar/gui/dialogs/comp-editor.c:998
 msgid "Click here to save the current window"
 msgstr "Pulse aquí para guardar la vista actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1007
+#: ../calendar/gui/dialogs/comp-editor.c:1005
 msgid "Select all text"
 msgstr "Selecciona todo el texto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1014
+#: ../calendar/gui/dialogs/comp-editor.c:1012
 msgid "_Classification"
 msgstr "_Clasificación"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1028
+#: ../calendar/gui/dialogs/comp-editor.c:1026
 #: ../mail/mail-signature-editor.c:208
 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "_Archivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1035
+#: ../calendar/gui/dialogs/comp-editor.c:1033
 #: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "Ay_uda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1042
+#: ../calendar/gui/dialogs/comp-editor.c:1040
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1049
+#: ../calendar/gui/dialogs/comp-editor.c:1047
 msgid "_Options"
 msgstr "_Opciones"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1056 ../mail/em-folder-tree.c:2115
+#: ../calendar/gui/dialogs/comp-editor.c:1054 ../mail/em-folder-tree.c:2115
 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "_Ver"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1066
+#: ../calendar/gui/dialogs/comp-editor.c:1064
 #: ../composer/e-composer-actions.c:413
 msgid "_Attachment..."
 msgstr "_Adjunto…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1068
+#: ../calendar/gui/dialogs/comp-editor.c:1066
 msgid "Click here to attach a file"
 msgstr "Pulse aquí para adjuntar un archivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1076
+#: ../calendar/gui/dialogs/comp-editor.c:1074
 msgid "_Categories"
 msgstr "_Categorías"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1078
+#: ../calendar/gui/dialogs/comp-editor.c:1076
 msgid "Toggles whether to display categories"
 msgstr "Conmuta cuando se muestran las categorías"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1084
+#: ../calendar/gui/dialogs/comp-editor.c:1082
 msgid "Time _Zone"
 msgstr "_Zona horaria"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1086
+#: ../calendar/gui/dialogs/comp-editor.c:1084
 msgid "Toggles whether the time zone is displayed"
 msgstr "Conmuta cuando se muestra la «Zona horaria»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1095
+#: ../calendar/gui/dialogs/comp-editor.c:1093
 msgid "Pu_blic"
 msgstr "Pú_blico"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1097
+#: ../calendar/gui/dialogs/comp-editor.c:1095
 msgid "Classify as public"
 msgstr "Clasificar como público"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1100
 msgid "_Private"
 msgstr "_Privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1104
+#: ../calendar/gui/dialogs/comp-editor.c:1102
 msgid "Classify as private"
 msgstr "Clasificar como privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1109
+#: ../calendar/gui/dialogs/comp-editor.c:1107
 msgid "_Confidential"
 msgstr "_Confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1111
+#: ../calendar/gui/dialogs/comp-editor.c:1109
 msgid "Classify as confidential"
 msgstr "Clasificar como confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1119
+#: ../calendar/gui/dialogs/comp-editor.c:1117
 msgid "R_ole Field"
 msgstr "Campo «_Rol»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1121
+#: ../calendar/gui/dialogs/comp-editor.c:1119
 msgid "Toggles whether the Role field is displayed"
 msgstr "Conmuta cuando se muestra el campo «Rol»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1127
+#: ../calendar/gui/dialogs/comp-editor.c:1125
 msgid "_RSVP"
 msgstr "_Confirmar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
+#: ../calendar/gui/dialogs/comp-editor.c:1127
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Conmuta cuando se muestra el campo «Confirmar»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1135
+#: ../calendar/gui/dialogs/comp-editor.c:1133
 msgid "_Status Field"
 msgstr "Campo de _estado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1137
+#: ../calendar/gui/dialogs/comp-editor.c:1135
 msgid "Toggles whether the Status field is displayed"
 msgstr "Conmuta cuando se muestra el campo «Estado»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1143
+#: ../calendar/gui/dialogs/comp-editor.c:1141
 msgid "_Type Field"
 msgstr "Campo de _tipo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1145
+#: ../calendar/gui/dialogs/comp-editor.c:1143
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Conmuta indicando si se muestra el campo «Tipo de participante»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1169
+#: ../calendar/gui/dialogs/comp-editor.c:1167
 #: ../composer/e-composer-private.c:66
 msgid "Recent _Documents"
 msgstr "_Documentos recientes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1595
+#: ../calendar/gui/dialogs/comp-editor.c:1593
 #: ../composer/e-composer-actions.c:640
 msgid "Attach"
 msgstr "Adjuntar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1858
-#: ../calendar/gui/dialogs/comp-editor.c:1906
-#: ../calendar/gui/dialogs/comp-editor.c:2708
+#: ../calendar/gui/dialogs/comp-editor.c:1856
+#: ../calendar/gui/dialogs/comp-editor.c:1904
+#: ../calendar/gui/dialogs/comp-editor.c:2706
 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:2737
+#: ../calendar/gui/dialogs/comp-editor.c:2735
 msgid "Unable to use current version!"
 msgstr "Imposible usar la versión actual."
 
@@ -6000,7 +5991,7 @@ msgid "I_mport to Tasks"
 msgstr "I_mportar a las tareas"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:69
-#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3272
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3271
 #, c-format
 msgid "Click to open %s"
 msgstr "Pulse para abrir %s"
@@ -6114,7 +6105,6 @@ msgstr "Fecha de terminación"
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
 #: ../calendar/gui/e-calendar-table.etspec.h:9
 #: ../calendar/gui/e-memo-table.etspec.h:4
-#| msgid "Modified"
 msgid "Last modified"
 msgstr ""
 
@@ -6130,7 +6120,7 @@ msgstr "Libre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
 #: ../calendar/gui/e-calendar-table.c:641
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-meeting-time-sel.c:397
 msgid "Busy"
 msgstr "Ocupada"
 
@@ -6284,7 +6274,7 @@ msgstr "Abrir página _web"
 
 #: ../calendar/gui/e-calendar-table.c:1600
 #: ../calendar/gui/e-calendar-view.c:1814 ../calendar/gui/e-memo-table.c:939
-#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:498
+#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:494
 msgid "_Save As..."
 msgstr "Guardar _como…"
 
@@ -6443,7 +6433,7 @@ msgstr "_Responder"
 
 #: ../calendar/gui/e-calendar-view.c:1831
 #: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1331
-#: ../mail/em-popup.c:503 ../ui/evolution-mail-message.xml.h:82
+#: ../mail/em-popup.c:499 ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
@@ -6478,7 +6468,7 @@ msgstr "Rehusado"
 #: ../calendar/gui/e-calendar-view.c:2294
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/e-meeting-time-sel.c:397
+#: ../calendar/gui/e-meeting-time-sel.c:396
 msgid "Tentative"
 msgstr "Provisional"
 
@@ -7073,7 +7063,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:467
-#: ../calendar/gui/e-meeting-time-sel.c:2126
+#: ../calendar/gui/e-meeting-time-sel.c:2125
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B, %Y"
 
@@ -7082,7 +7072,7 @@ msgstr "%A, %d de %B, %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:471
-#: ../calendar/gui/e-meeting-time-sel.c:2157
+#: ../calendar/gui/e-meeting-time-sel.c:2156
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -7092,67 +7082,67 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%e/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Out of Office"
 msgstr "Fuera de la oficina"
 
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "No Information"
 msgstr "Sin información"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "A_ttendees..."
 msgstr "_Participantes…"
 
-#: ../calendar/gui/e-meeting-time-sel.c:436
+#: ../calendar/gui/e-meeting-time-sel.c:435
 msgid "O_ptions"
 msgstr "O_pciones"
 
-#: ../calendar/gui/e-meeting-time-sel.c:453
+#: ../calendar/gui/e-meeting-time-sel.c:452
 msgid "Show _only working hours"
 msgstr "Mostrar _sólo las horas de trabajo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:463
+#: ../calendar/gui/e-meeting-time-sel.c:462
 msgid "Show _zoomed out"
 msgstr "Mostrar quitando _ampliación"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:477
 msgid "_Update free/busy"
 msgstr "_Actualizar disponibilidad"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:492
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:511
+#: ../calendar/gui/e-meeting-time-sel.c:510
 msgid "_Autopick"
 msgstr "_Auto-seleccionar"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:525
 msgid ">_>"
 msgstr "_>>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:543
+#: ../calendar/gui/e-meeting-time-sel.c:542
 msgid "_All people and resources"
 msgstr "_Todas las personas y los recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "All _people and one resource"
 msgstr "Todas las _personas y un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "_Required people"
 msgstr "Personas _requeridas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "Required people and _one resource"
 msgstr "Personas requeridas y _un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:606
+#: ../calendar/gui/e-meeting-time-sel.c:605
 msgid "_Start time:"
 msgstr "Hora de _inicio:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:633
+#: ../calendar/gui/e-meeting-time-sel.c:632
 msgid "_End time:"
 msgstr "Hora de _fin:"
 
@@ -9644,15 +9634,15 @@ msgstr "Conmutador que indica si se muestra el campo «Para»"
 msgid "Save Draft"
 msgstr "Guardar borrador"
 
-#: ../composer/e-composer-header-table.c:64
+#: ../composer/e-composer-header-table.c:65
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
 
-#: ../composer/e-composer-header-table.c:66
+#: ../composer/e-composer-header-table.c:67
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Escriba las direcciones que recibirán una copia del mensaje"
 
-#: ../composer/e-composer-header-table.c:69
+#: ../composer/e-composer-header-table.c:70
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -9660,35 +9650,35 @@ msgstr ""
 "Escriba las direcciones que recibirán una copia del mensaje sin aparecer en "
 "la lista de destinatarios del mensaje"
 
-#: ../composer/e-composer-header-table.c:643
+#: ../composer/e-composer-header-table.c:742
 msgid "Fr_om:"
 msgstr "_De:"
 
-#: ../composer/e-composer-header-table.c:652
+#: ../composer/e-composer-header-table.c:751
 msgid "_Reply-To:"
 msgstr "_Responder a:"
 
-#: ../composer/e-composer-header-table.c:656
+#: ../composer/e-composer-header-table.c:755
 msgid "_To:"
 msgstr "_Para:"
 
-#: ../composer/e-composer-header-table.c:661
+#: ../composer/e-composer-header-table.c:760
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:666
+#: ../composer/e-composer-header-table.c:765
 msgid "_Bcc:"
 msgstr "Cc_o:"
 
-#: ../composer/e-composer-header-table.c:671
+#: ../composer/e-composer-header-table.c:770
 msgid "_Post To:"
 msgstr "_Publicar en:"
 
-#: ../composer/e-composer-header-table.c:675
+#: ../composer/e-composer-header-table.c:774
 msgid "S_ubject:"
 msgstr "_Asunto:"
 
-#: ../composer/e-composer-header-table.c:684
+#: ../composer/e-composer-header-table.c:783
 msgid "Si_gnature:"
 msgstr "_Firma:"
 
@@ -9723,11 +9713,11 @@ msgstr ""
 "No es posible cifrar el mensaje saliente: no hay establecido un certificado "
 "de cifrado para esta cuenta"
 
-#: ../composer/e-msg-composer.c:1357 ../composer/e-msg-composer.c:2311
+#: ../composer/e-msg-composer.c:1357 ../composer/e-msg-composer.c:2218
 msgid "Compose Message"
 msgstr "Redactar un mensaje"
 
-#: ../composer/e-msg-composer.c:3533
+#: ../composer/e-msg-composer.c:3440
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10502,7 +10492,7 @@ msgid "_Mail"
 msgstr "Co_rreo"
 
 #: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1332
-#: ../mail/em-popup.c:505 ../ui/evolution-mail-message.xml.h:109
+#: ../mail/em-popup.c:501 ../ui/evolution-mail-message.xml.h:109
 msgid "_Forward"
 msgstr "Reen_viar"
 
@@ -10687,14 +10677,14 @@ msgid "No account found to use, forward of the message has been cancelled."
 msgstr ""
 "No se encontró ninguna cuenta que usar, se canceló el reenvío del mensaje."
 
-#: ../mail/em-composer-utils.c:2065
+#: ../mail/em-composer-utils.c:2068
 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:2112
+#: ../mail/em-composer-utils.c:2115
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10702,7 +10692,7 @@ msgstr ""
 "El ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} a las ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escribió:"
 
-#: ../mail/em-composer-utils.c:2255
+#: ../mail/em-composer-utils.c:2258
 msgid "-----Original Message-----"
 msgstr "-----Mensaje original-----"
 
@@ -11382,33 +11372,29 @@ msgstr "No se pudo obtener el mensaje"
 msgid "Retrieving Message..."
 msgstr "Obteniendo mensaje…"
 
-#: ../mail/em-folder-view.c:2755
-msgid "C_all To..."
-msgstr "Ll_amar a…"
-
-#: ../mail/em-folder-view.c:2758
+#: ../mail/em-folder-view.c:2757
 msgid "Create _Search Folder"
 msgstr "Crear carpeta de _búsqueda"
 
-#: ../mail/em-folder-view.c:2759
+#: ../mail/em-folder-view.c:2758
 msgid "_From this Address"
 msgstr "_Desde esta dirección"
 
-#: ../mail/em-folder-view.c:2760
+#: ../mail/em-folder-view.c:2759
 msgid "_To this Address"
 msgstr "_A esta dirección"
 
-#: ../mail/em-folder-view.c:3253
+#: ../mail/em-folder-view.c:3252
 #, c-format
 msgid "Click to mail %s"
 msgstr "Pulse para enviar correo a %s"
 
-#: ../mail/em-folder-view.c:3265
+#: ../mail/em-folder-view.c:3264
 #, c-format
 msgid "Click to call %s"
 msgstr "Pulse para llamar a %s"
 
-#: ../mail/em-folder-view.c:3270
+#: ../mail/em-folder-view.c:3269
 msgid "Click to hide/unhide addresses"
 msgstr "Pulse para ocultar/mostrar las direcciones"
 
@@ -11670,7 +11656,7 @@ msgstr "Cco"
 
 #. pseudo-header
 #: ../mail/em-format-html.c:1749 ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1451
+#: ../mail/em-mailer-prefs.c:1439
 msgid "Mailer"
 msgstr "Transporte"
 
@@ -11809,20 +11795,20 @@ msgid "Tag"
 msgstr "Etiqueta"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133
+#: ../mail/em-mailer-prefs.c:1067 ../mail/em-mailer-prefs.c:1121
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "El complemento %s está disponible y el binario está instalado."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142
+#: ../mail/em-mailer-prefs.c:1075 ../mail/em-mailer-prefs.c:1130
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 "El complemento %s no está disponible. Compruebe si el paquete está instalado."
 
-#: ../mail/em-mailer-prefs.c:1108
+#: ../mail/em-mailer-prefs.c:1096
 msgid "No Junk plugin available"
 msgstr "No hay complemento para SPAM disponible"
 
@@ -11916,55 +11902,55 @@ msgstr ""
 "No es posible leer la configuración de la instalación anterior de Evolution, "
 "«evolution/config.xmldb» no existe o está corrompido."
 
-#: ../mail/em-popup.c:368
+#: ../mail/em-popup.c:364
 msgid "Save As..."
 msgstr "Guardar como…"
 
-#: ../mail/em-popup.c:393
+#: ../mail/em-popup.c:389
 #, c-format
 msgid "untitled_image.%s"
 msgstr "imagen-_sin-título.%s"
 
-#: ../mail/em-popup.c:499 ../widgets/misc/e-attachment-handler-image.c:147
+#: ../mail/em-popup.c:495 ../widgets/misc/e-attachment-handler-image.c:147
 msgid "Set as _Background"
 msgstr "Establecer como _fondo"
 
-#: ../mail/em-popup.c:501
+#: ../mail/em-popup.c:497
 msgid "_Reply to sender"
 msgstr "_Responder al remitente"
 
-#: ../mail/em-popup.c:502 ../ui/evolution-mail-message.xml.h:83
+#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Responder a la _lista"
 
 #. make it first item
-#: ../mail/em-popup.c:551 ../mail/em-popup.c:751
+#: ../mail/em-popup.c:547 ../mail/em-popup.c:747
 msgid "_Add to Address Book"
 msgstr "_Añadir a la libreta de direcciones"
 
-#: ../mail/em-popup.c:730
+#: ../mail/em-popup.c:726
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s…"
 
-#: ../mail/em-subscribe-editor.c:604
+#: ../mail/em-subscribe-editor.c:605
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Este almacén no soporta suscripciones, o no están activadas."
 
-#: ../mail/em-subscribe-editor.c:637
+#: ../mail/em-subscribe-editor.c:638
 msgid "Subscribed"
 msgstr "Suscrito"
 
-#: ../mail/em-subscribe-editor.c:641
+#: ../mail/em-subscribe-editor.c:642
 msgid "Folder"
 msgstr "Carpeta"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:857
+#: ../mail/em-subscribe-editor.c:858
 msgid "Please select a server."
 msgstr "Seleccione un servidor."
 
-#: ../mail/em-subscribe-editor.c:893
+#: ../mail/em-subscribe-editor.c:894
 msgid "No server has been selected"
 msgstr "No se ha seleccionado ningún servidor"
 
@@ -12234,7 +12220,6 @@ msgid "Enable or disable magic space bar"
 msgstr "Activa o desactiva la barra espaciadora mágica"
 
 #: ../mail/evolution-mail.schemas.in.h:49
-#| msgid "It disables/enables the prompt while marking multiple messages."
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Activar o desactivar la pregunta cuando se marcan varios mensajes."
 
@@ -12279,10 +12264,6 @@ msgid "Encode file names in an Outlook/GMail way"
 msgstr "Codificar nombres de archivo de la forma Outlook/GMail"
 
 #: ../mail/evolution-mail.schemas.in.h:58
-#| msgid ""
-#| "Encode file names in the mail headers same as Outlook or GMail does, to "
-#| "let them understand localized file names sent by Evolution, because they "
-#| "do not follow the RFC 2231, but uses incorrect RFC 2047 standard."
 msgid ""
 "Encode file names in the mail headers same as Outlook or GMail do, to let "
 "them display correctly file names with UTF-8 letters sent by Evolution, "
@@ -15293,7 +15274,6 @@ msgstr "Contactos automáticos"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:645
-#| msgid "_Auto-create address book entries when replying to messages"
 msgid "Create _address book entries when sending mails"
 msgstr ""
 "Crear entradas _automáticamente en la libreta de direcciones al enviar "
@@ -16642,7 +16622,6 @@ msgstr ""
 "puede enviar correos en texto plano."
 
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
-#| msgid "Default External Editor"
 msgid "External Editor"
 msgstr "Editor externo"
 
@@ -16696,7 +16675,6 @@ msgstr ""
 
 #: ../plugins/external-editor/external-editor.c:308
 #: ../plugins/external-editor/external-editor.c:310
-#| msgid "Compose in _External Editor"
 msgid "Compose in External Editor"
 msgstr "Redactar en un editor externo"
 
@@ -17961,7 +17939,6 @@ msgid "_Inherit reminder"
 msgstr "_Heredar recordatorio"
 
 #: ../plugins/itip-formatter/itip-view.c:1914
-#| msgid "_Memos"
 msgid "_Memos:"
 msgstr "_Notas:"
 
@@ -18175,9 +18152,6 @@ msgid "Cannot open calendar. %s"
 msgstr "No se puede abrir el calendario. %s"
 
 #: ../plugins/mail-to-task/mail-to-task.c:350
-#| msgid ""
-#| "Selected source is read only, thus cannot create task there. Select other "
-#| "source, please."
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18194,9 +18168,6 @@ msgstr ""
 "tarea en él. Seleccione otro origen."
 
 #: ../plugins/mail-to-task/mail-to-task.c:356
-#| msgid ""
-#| "Selected source is read only, thus cannot create task there. Select other "
-#| "source, please."
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18211,7 +18182,6 @@ msgstr "No se pudo crear el objeto. %s"
 
 #: ../plugins/mail-to-task/mail-to-task.c:555
 #, c-format
-#| msgid "Cannot open source \"{2}\"."
 msgid "Cannot get source list. %s"
 msgstr "No se pudo obtener la lista de origen. %s"
 
@@ -18254,17 +18224,14 @@ msgid "Mail to task"
 msgstr "Correo a tarea"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
-#| msgid "Convert the selected message to a new task"
 msgid "Convert the selected message to a new event"
 msgstr "Convertir el mensaje seleccionado en un acontecimiento nuevo"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
-#| msgid "Convert the selected message to a new task"
 msgid "Convert the selected message to a new meeting"
 msgstr "Convertir el mensaje seleccionado en una reunión nueva"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:3
-#| msgid "Convert the selected message to a new task"
 msgid "Convert the selected message to a new memo"
 msgstr "Convertir el mensaje seleccionado en una nota nueva"
 
@@ -18709,7 +18676,6 @@ msgid "Service _type:"
 msgstr "_Tipo de servicio:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
-#| msgid "Time _zone:"
 msgid "Time _duration:"
 msgstr "_Duración:"
 
@@ -18734,11 +18700,6 @@ msgid "_Username:"
 msgstr "_Usuario:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:29
-#| msgid ""
-#| "day(s)\n"
-#| "week(s)\n"
-#| "month(s)\n"
-#| "year(s)"
 msgid ""
 "days\n"
 "weeks\n"
@@ -18795,51 +18756,47 @@ msgstr "Un complemento que carga otros complementos escritos en Python."
 msgid "Python Loader"
 msgstr "Cargador de Python"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:111
-msgid "SpamAssassin (built-in)"
-msgstr "SpamAssassin (integrado)"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:137
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "No se encontró SpamAssasin, código: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:145
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:153
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:144
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Falló al crear la tubería: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:192
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:183
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Error después de bifurcar: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "El proceso hijo de SpamAssasin no está respondiendo, matándolo…"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:249
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:240
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "Espere a que el proceso hijo de SpamAssasin se interrumpa, terminando…"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:258
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:249
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "Falló la tubería hacia SpamAssasin, código de error: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:521
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:512
 #, c-format
 msgid "SpamAssassin is not available."
 msgstr "SpamAssasin no está disponible."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:913
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:904
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Esto hará que SpamAssasin sea más exacto, pero más lento"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:919
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:910
 msgid "I_nclude remote tests"
 msgstr "I_ncluir tests remotos"
 
@@ -19198,7 +19155,7 @@ msgstr "Vista inicial de adjunto"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "Initial file chooser folder"
-msgstr ""
+msgstr "Carpeta inicial del selector de archivos"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Initial folder for GtkFileChooser dialogs."
@@ -19506,7 +19463,6 @@ msgstr ""
 
 #: ../shell/e-shell-window-commands.c:78
 #, c-format
-#| msgid "Error executing %s."
 msgid "Error executing %s. (%s)"
 msgstr "Error al ejecutar %s. (%s)"
 
@@ -21907,56 +21863,54 @@ msgstr "Tipo de vista"
 msgid "Type of view:"
 msgstr "Tipo de vista:"
 
-#: ../widgets/misc/e-attachment.c:936
-#| msgid "Attached message"
-#| msgid_plural "%d attached messages"
+#: ../widgets/misc/e-attachment.c:940
 msgid "Attached message"
 msgstr "Mensaje adjunto"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1709 ../widgets/misc/e-attachment.c:2258
-#: ../widgets/misc/e-attachment-store.c:627
+#: ../widgets/misc/e-attachment.c:1719 ../widgets/misc/e-attachment.c:2270
+#: ../widgets/misc/e-attachment-store.c:635
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment.c:1756 ../widgets/misc/e-attachment.c:2560
+#: ../widgets/misc/e-attachment.c:1766 ../widgets/misc/e-attachment.c:2572
 msgid "A load operation is already in progress"
 msgstr "Existe una operación de carga en progreso"
 
-#: ../widgets/misc/e-attachment.c:1764 ../widgets/misc/e-attachment.c:2568
+#: ../widgets/misc/e-attachment.c:1774 ../widgets/misc/e-attachment.c:2580
 msgid "A save operation is already in progress"
 msgstr "Existe una operación de guardado en progreso"
 
-#: ../widgets/misc/e-attachment.c:1857
+#: ../widgets/misc/e-attachment.c:1867
 #, c-format
 msgid "Could not load '%s'"
 msgstr "No se pudo cargar «%s»"
 
-#: ../widgets/misc/e-attachment.c:1860
+#: ../widgets/misc/e-attachment.c:1870
 #, c-format
 msgid "Could not load the attachment"
 msgstr "No se pudo cargar el adjunto"
 
-#: ../widgets/misc/e-attachment.c:2135
+#: ../widgets/misc/e-attachment.c:2147
 #, c-format
 msgid "Could not open '%s'"
 msgstr "No se pudo abrir «%s»"
 
-#: ../widgets/misc/e-attachment.c:2138
+#: ../widgets/misc/e-attachment.c:2150
 #, c-format
 msgid "Could not open the attachment"
 msgstr "No se pudo abrir el adjunto"
 
-#: ../widgets/misc/e-attachment.c:2576
+#: ../widgets/misc/e-attachment.c:2588
 msgid "Attachment contents not loaded"
 msgstr "No se cargó el contenido del adjunto"
 
-#: ../widgets/misc/e-attachment.c:2653
+#: ../widgets/misc/e-attachment.c:2665
 #, c-format
 msgid "Could not save '%s'"
 msgstr "No se pudo guardar «%s»"
 
-#: ../widgets/misc/e-attachment.c:2656
+#: ../widgets/misc/e-attachment.c:2668
 #, c-format
 msgid "Could not save the attachment"
 msgstr "No se pudo guardar el adjunto"
@@ -21996,15 +21950,15 @@ msgstr "Ocultar _barra de adjuntos"
 msgid "Show _Attachment Bar"
 msgstr "Mostrar _barra de adjuntos"
 
-#: ../widgets/misc/e-attachment-store.c:533
+#: ../widgets/misc/e-attachment-store.c:541
 msgid "Add Attachment"
 msgstr "Añadir adjunto"
 
-#: ../widgets/misc/e-attachment-store.c:536
+#: ../widgets/misc/e-attachment-store.c:544
 msgid "A_ttach"
 msgstr "_Adjuntar"
 
-#: ../widgets/misc/e-attachment-store.c:598
+#: ../widgets/misc/e-attachment-store.c:606
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Guarda el adjunto"
@@ -22020,7 +21974,6 @@ msgstr "_Añadir adjunto…"
 
 #: ../widgets/misc/e-attachment-view.c:646
 #, c-format
-#| msgid "Opening %s"
 msgid "Open with \"%s\""
 msgstr "Abrir con «%s»"
 
@@ -23024,6 +22977,15 @@ msgstr "Contexto IM"
 msgid "Handle Popup"
 msgstr "Tirador emergente"
 
+#~ msgid "Adjust for daylight sa_ving time"
+#~ msgstr "Ajustar a la hora de _verano"
+
+#~ msgid "C_all To..."
+#~ msgstr "Ll_amar a…"
+
+#~ msgid "SpamAssassin (built-in)"
+#~ msgstr "SpamAssassin (integrado)"
+
 #~ msgid ""
 #~ "Enable side bar search feature so that you can start interactive "
 #~ "searching by typing in the text. Use is that you can easily find a folder "