[evolution/wip/gsettings] Updated Spanish translation

From: Rodrigo Moya <rodrigo src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution/wip/gsettings] Updated Spanish translation
Date: Wed, 14 Sep 2011 12:22:43 +0000 (UTC)
commit 06d617b5bdb5ff83984e125f72f749f9a96d2319
Author: Daniel Mustieles <daniel mustieles gmail com>
Date:   Sun Aug 7 18:33:59 2011 +0200

    Updated Spanish translation

 po/es.po | 1157 ++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 607 insertions(+), 550 deletions(-)
---
diff --git a/po/es.po b/po/es.po
index 5312bc3..944fcda 100644
--- a/po/es.po
+++ b/po/es.po
@@ -18,8 +18,8 @@ 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-07-28 11:09+0000\n"
-"PO-Revision-Date: 2011-07-29 10:19+0200\n"
+"POT-Creation-Date: 2011-08-06 06:53+0000\n"
+"PO-Revision-Date: 2011-08-07 18:33+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"
@@ -306,7 +306,7 @@ msgid "Blog:"
 msgstr "Blog:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tegorÃasâ"
@@ -446,7 +446,7 @@ msgstr "_Blog:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 #: ../calendar/gui/dialogs/event-page.c:708
-#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 #: ../plugins/itip-formatter/itip-view.c:1923
 msgid "_Calendar:"
 msgstr "_Calendario:"
@@ -943,7 +943,7 @@ msgid "Car Phone"
 msgstr "TelÃfono del coche"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -1581,8 +1581,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:4
@@ -2006,7 +2006,7 @@ msgstr[1] "horas"
 #. (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:129
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/recurrence-page.c:1125
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dÃa"
@@ -2091,9 +2091,11 @@ msgid "No location information available."
 msgstr "No hay informaciÃn del lugar disponible."
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1589
-#, c-format
-msgid "You have %d alarm"
-msgid_plural "You have %d alarms"
+#, fuzzy, c-format
+#| msgid "You have %d alarm"
+#| msgid_plural "You have %d alarms"
+msgid "You have %d reminder"
+msgid_plural "You have %d reminders"
 msgstr[0] "Tiene una alerta"
 msgstr[1] "Tiene %d alertas"
 
@@ -2210,7 +2212,7 @@ msgid "Classification"
 msgstr "ClasificaciÃn"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:769 ../calendar/gui/e-task-table.c:492
+#: ../calendar/gui/e-cal-model.c:774 ../calendar/gui/e-task-table.c:492
 #: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "Confidencial"
@@ -2252,13 +2254,13 @@ msgid "Organizer"
 msgstr "Organizador"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:239
-#: ../calendar/gui/e-cal-model.c:767 ../calendar/gui/e-task-table.c:491
+#: ../calendar/gui/e-cal-model.c:772 ../calendar/gui/e-task-table.c:491
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privado"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:238
-#: ../calendar/gui/e-cal-model.c:758 ../calendar/gui/e-cal-model.c:765
+#: ../calendar/gui/e-cal-model.c:763 ../calendar/gui/e-cal-model.c:770
 #: ../calendar/gui/e-task-table.c:490 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "PÃblico"
@@ -2305,8 +2307,10 @@ msgid "is not"
 msgstr "no es"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:626
-msgid "Edit Alarm"
-msgstr "Editar alerta"
+#, fuzzy
+#| msgid "Reminder!"
+msgid "Edit Reminder"
+msgstr "ÂRecuerde!"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:817
 #: ../calendar/gui/e-alarm-list.c:438
@@ -2329,30 +2333,36 @@ msgid "Send an email"
 msgstr "Enviar un correo-e"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "Add Alarm"
-msgstr "AÃadir alerta"
+#, fuzzy
+#| msgid "Reminder!"
+msgid "Add Reminder"
+msgstr "ÂRecuerde!"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:360
-msgid "Alarm"
-msgstr "Alerta"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
 msgstr "_Mensaje personalizado"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-msgid "Custom alarm sound"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
+#, fuzzy
+#| msgid "Custom alarm sound"
+msgid "Custom reminder sound"
 msgstr "Sonido de alerta personalizado"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 msgid "Mes_sage:"
 msgstr "_Mensaje:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:75
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:75
 msgid "Options"
 msgstr "Opciones"
 
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../calendar/gui/dialogs/event-editor.c:360
+#, fuzzy
+#| msgid "Reminder!"
+msgid "Reminder"
+msgstr "ÂRecuerde!"
+
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
 msgid "Repeat"
 msgstr "Repetir"
@@ -2374,8 +2384,9 @@ msgid "_Program:"
 msgstr "_Programa:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-msgid "_Repeat the alarm"
-msgstr "_Repetir la alerta"
+#| msgid "_Repeat the alarm"
+msgid "_Repeat the reminder"
+msgstr "_Repetir el recordatorio"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
 msgid "_Sound:"
@@ -2397,7 +2408,7 @@ msgstr "dÃa(s)"
 msgid "end of appointment"
 msgstr "fin de la cita"
 
-#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "veces adicionales cada"
@@ -2423,10 +2434,11 @@ msgid "A_dd"
 msgstr "AÃa_dir"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-page.ui.h:1
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
-msgid "Alarms"
-msgstr "Alertas"
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../modules/calendar/e-calendar-preferences.ui.h:24
+#| msgid "Reminder!"
+msgid "Reminders"
+msgstr "Recordatorios"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:164
 msgid "Type:"
@@ -2471,14 +2483,14 @@ msgstr "Colo_r:"
 #: ../mail/em-folder-properties.c:233 ../mail/mail-config.ui.h:52
 #: ../modules/addressbook/addressbook-config.c:1052
 #: ../modules/calendar/e-calendar-preferences.ui.h:19
-#: ../plugins/itip-formatter/itip-formatter.c:2960
+#: ../plugins/itip-formatter/itip-formatter.c:2974
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "General"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:407
-#: ../modules/calendar/e-calendar-preferences.ui.h:40
+#: ../modules/calendar/e-calendar-preferences.ui.h:41
 msgid "Task List"
 msgstr "Lista de tareas"
 
@@ -2607,49 +2619,46 @@ msgid "Keep original item?"
 msgstr "ÂMantener el elemento original?"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1071
-#| msgid "Close the current file"
 msgid "Close the current window"
 msgstr "Cerrar la ventana actual"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1078 ../mail/e-mail-browser.c:141
-#: ../shell/e-shell-window-actions.c:1474
+#: ../shell/e-shell-window-actions.c:1455
 #: ../widgets/misc/e-focus-tracker.c:117 ../widgets/misc/e-focus-tracker.c:555
 #: ../widgets/misc/e-web-view.c:457 ../widgets/misc/e-web-view.c:1280
 msgid "Copy the selection"
 msgstr "Copiar la selecciÃn"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1085 ../mail/e-mail-browser.c:148
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1462
 #: ../widgets/misc/e-focus-tracker.c:110 ../widgets/misc/e-focus-tracker.c:550
 #: ../widgets/misc/e-web-view.c:1274
 msgid "Cut the selection"
 msgstr "Cortar la selecciÃn"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1092
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:1469
 #: ../widgets/misc/e-focus-tracker.c:131 ../widgets/misc/e-focus-tracker.c:565
 msgid "Delete the selection"
 msgstr "Eliminar la selecciÃn"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1099
-#| msgid "View"
 msgid "View help"
 msgstr "Ver la ayuda"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1106 ../mail/e-mail-browser.c:155
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1497
 #: ../widgets/misc/e-focus-tracker.c:124 ../widgets/misc/e-focus-tracker.c:560
 #: ../widgets/misc/e-web-view.c:1286
 msgid "Paste the clipboard"
 msgstr "Pega el contenido del porta papeles"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1127
-#| msgid "Save Current View"
 msgid "Save current changes"
 msgstr "Guardar los cambios actuales"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1134 ../mail/e-mail-browser.c:162
-#: ../shell/e-shell-window-actions.c:1600
+#: ../shell/e-shell-window-actions.c:1574
 #: ../widgets/misc/e-focus-tracker.c:138 ../widgets/misc/e-focus-tracker.c:570
 msgid "Select all text"
 msgstr "Selecciona todo el texto"
@@ -2662,19 +2671,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:1628
+#: ../shell/e-shell-window-actions.c:1602
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Editar"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1155 ../mail/e-mail-browser.c:169
-#: ../shell/e-shell-window-actions.c:1635
+#: ../shell/e-shell-window-actions.c:1609
 #: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
 msgstr "_Archivo"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1162
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Help"
 msgstr "Ay_uda"
 
@@ -2688,7 +2697,7 @@ msgid "_Options"
 msgstr "_Opciones"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1183 ../mail/e-mail-browser.c:183
-#: ../shell/e-shell-window-actions.c:1677 ../smime/gui/smime-ui.ui.h:46
+#: ../shell/e-shell-window-actions.c:1651 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "_Ver"
 
@@ -2903,13 +2912,14 @@ msgid "Enter Delegate"
 msgstr "Introducir un delegado"
 
 #: ../calendar/gui/dialogs/event-editor.c:212
-msgid "_Alarms"
-msgstr "_Alertas"
+#| msgid "Reminder!"
+msgid "_Reminders"
+msgstr "_Recordatorios"
 
 #: ../calendar/gui/dialogs/event-editor.c:214
-#| msgid "Click here to set or unset alarms for this event"
-msgid "Set or unset alarms for this event"
-msgstr "Poner o quitar alertas para este acontecimiento"
+#| msgid "Set or unset alarms for this event"
+msgid "Set or unset reminders for this event"
+msgstr "Poner o quitar recordatorios para este acontecimiento"
 
 #: ../calendar/gui/dialogs/event-editor.c:222
 msgid "Show Time as _Busy"
@@ -2953,12 +2963,12 @@ msgstr "_Disponibilidad"
 msgid "Query free / busy information for the attendees"
 msgstr "Consultar informaciÃn de disponibilidad para los participantes"
 
-#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3185
+#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3184
 msgid "Appointment"
 msgstr "Cita"
 
 #: ../calendar/gui/dialogs/event-editor.c:384
-#: ../calendar/gui/dialogs/event-page.ui.h:3
+#: ../calendar/gui/dialogs/event-page.ui.h:2
 #: ../calendar/gui/e-meeting-list-view.c:160
 msgid "Attendees"
 msgstr "Participantes"
@@ -2983,11 +2993,12 @@ msgstr ""
 
 #: ../calendar/gui/dialogs/event-page.c:649
 #: ../calendar/gui/dialogs/event-page.c:3021
-msgid "This event has alarms"
-msgstr "Este acontecimiento tiene alertas."
+#| msgid "This event has alarms"
+msgid "This event has reminders"
+msgstr "Este acontecimiento tiene recordatorios."
 
 #: ../calendar/gui/dialogs/event-page.c:716
-#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganizador:"
@@ -3080,47 +3091,50 @@ msgstr[1] "%d minutos antes de la cita"
 msgid "Customize"
 msgstr "Personalizar"
 
-#. Translators: "None" for "No alarm set"
+#. Translators: "None" for "No reminder set"
 #: ../calendar/gui/dialogs/event-page.c:3287
-msgctxt "cal-alarms"
+#| msgid "None"
+msgctxt "cal-reminders"
 msgid "None"
-msgstr "Ninguna"
+msgstr "Ninguno"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:2
+#: ../calendar/gui/dialogs/event-page.ui.h:1
 #: ../calendar/gui/dialogs/task-page.ui.h:1
 #: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Atte_ndees..."
 msgstr "_Participantesâ"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-msgid "Custom Alarm:"
-msgstr "Alerta personalizada:"
+#: ../calendar/gui/dialogs/event-page.ui.h:5
+#| msgid "Custom Header"
+msgid "Custom Reminder:"
+msgstr "Recordatorio personalizado:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 msgid "Event Description"
 msgstr "DescripciÃn del acontecimiento"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:9
-#: ../modules/calendar/e-calendar-preferences.ui.h:44
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Time _zone:"
 msgstr "_Zona horaria:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:10
-msgid "_Alarm"
-msgstr "_Alerta"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:347
 msgid "_Description:"
 msgstr "_DescripciÃn:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../plugins/calendar-weather/calendar-weather.c:366
 msgid "_Location:"
 msgstr "_Lugar:"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:13
+#| msgid "Reminder!"
+msgid "_Reminder"
+msgstr "_Recordatorio"
+
 #: ../calendar/gui/dialogs/event-page.ui.h:14
 msgid "_Summary:"
 msgstr "_Resumen:"
@@ -3129,19 +3143,19 @@ msgstr "_Resumen:"
 msgid "_Time:"
 msgstr "_Hora:"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:17
 msgctxt "eventpage"
 msgid "1 day before appointment"
 msgstr "1 dÃa antes de la cita"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:19
 msgctxt "eventpage"
 msgid "1 hour before appointment"
 msgstr "1 hora antes de la cita"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:21
 msgctxt "eventpage"
 msgid "15 minutes before appointment"
@@ -3216,7 +3230,7 @@ msgstr "Seleccionar _hoy"
 msgid "September"
 msgstr "Septiembre"
 
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3189
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3188
 msgid "Memo"
 msgstr "Nota"
 
@@ -3242,8 +3256,8 @@ msgid "Unable to open memos in '%s': %s"
 msgstr "No es posible abrir las notas en Â%sÂ: %s"
 
 #: ../calendar/gui/dialogs/memo-page.c:1099 ../em-format/em-format-quote.c:319
-#: ../em-format/em-format.c:1056 ../mail/em-format-html.c:2563
-#: ../mail/em-format-html.c:2628 ../mail/em-format-html.c:2652
+#: ../em-format/em-format.c:1056 ../mail/em-format-html.c:2573
+#: ../mail/em-format-html.c:2638 ../mail/em-format-html.c:2662
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
 msgstr "Para"
@@ -3265,8 +3279,9 @@ msgstr "_Para:"
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
 #: ../calendar/gui/dialogs/task-page.c:331
 #: ../calendar/gui/dialogs/task-page.ui.h:9
-msgid "_Group:"
-msgstr "_Grupo:"
+#| msgid "_Last:"
+msgid "_List:"
+msgstr "_Lista:"
 
 #: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
@@ -3305,15 +3320,15 @@ msgstr "Esta instancia y las futuras"
 msgid "All Instances"
 msgstr "Todas las instancias"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:563
+#: ../calendar/gui/dialogs/recurrence-page.c:573
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Esta cita tiene repeticiones que Evolution no puede editar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:894
+#: ../calendar/gui/dialogs/recurrence-page.c:904
 msgid "Recurrence date is invalid"
 msgstr "La fecha de repeticiÃn es invÃlida"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:934
+#: ../calendar/gui/dialogs/recurrence-page.c:944
 msgid "End time of the recurrence was before event's start"
 msgstr ""
 "La fecha de finalizaciÃn de la repeticiÃn es anterior al inicio del "
@@ -3321,7 +3336,7 @@ msgstr ""
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:964
+#: ../calendar/gui/dialogs/recurrence-page.c:974
 msgid "on"
 msgstr "en"
 
@@ -3329,7 +3344,7 @@ msgstr "en"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1022
+#: ../calendar/gui/dialogs/recurrence-page.c:1032
 msgid "first"
 msgstr "primer"
 
@@ -3338,7 +3353,7 @@ msgstr "primer"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1028
+#: ../calendar/gui/dialogs/recurrence-page.c:1038
 msgid "second"
 msgstr "segundo"
 
@@ -3346,7 +3361,7 @@ msgstr "segundo"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1033
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
 msgid "third"
 msgstr "tercer"
 
@@ -3354,7 +3369,7 @@ msgstr "tercer"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1038
+#: ../calendar/gui/dialogs/recurrence-page.c:1048
 msgid "fourth"
 msgstr "cuarto"
 
@@ -3362,7 +3377,7 @@ msgstr "cuarto"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "fifth"
 msgstr "quinto"
 
@@ -3370,13 +3385,13 @@ msgstr "quinto"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/dialogs/recurrence-page.c:1058
 msgid "last"
 msgstr "Ãltimo"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1072
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "Other Date"
 msgstr "Otra fecha"
 
@@ -3384,7 +3399,7 @@ msgstr "Otra fecha"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1078
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
 msgid "1st to 10th"
 msgstr "del 1 al 10"
 
@@ -3392,7 +3407,7 @@ msgstr "del 1 al 10"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1094
 msgid "11th to 20th"
 msgstr "del 11 al 20"
 
@@ -3400,73 +3415,73 @@ msgstr "del 11 al 20"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
+#: ../calendar/gui/dialogs/recurrence-page.c:1100
 msgid "21st to 31st"
 msgstr "del 21 al 31"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/recurrence-page.c:1126
 #: ../modules/calendar/e-calendar-preferences.ui.h:22
 msgid "Monday"
 msgstr "lunes"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
+#: ../calendar/gui/dialogs/recurrence-page.c:1127
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
 msgid "Tuesday"
 msgstr "martes"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../modules/calendar/e-calendar-preferences.ui.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1128
+#: ../modules/calendar/e-calendar-preferences.ui.h:49
 msgid "Wednesday"
 msgstr "miÃrcoles"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
-#: ../modules/calendar/e-calendar-preferences.ui.h:42
+#: ../calendar/gui/dialogs/recurrence-page.c:1129
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Thursday"
 msgstr "jueves"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/dialogs/recurrence-page.c:1130
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgid "Friday"
 msgstr "viernes"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
-#: ../modules/calendar/e-calendar-preferences.ui.h:26
+#: ../calendar/gui/dialogs/recurrence-page.c:1131
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
 msgid "Saturday"
 msgstr "sÃbado"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
-#: ../modules/calendar/e-calendar-preferences.ui.h:36
+#: ../calendar/gui/dialogs/recurrence-page.c:1132
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
 msgid "Sunday"
 msgstr "domingo"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1244
+#: ../calendar/gui/dialogs/recurrence-page.c:1254
 msgid "on the"
 msgstr "en el"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1418
+#: ../calendar/gui/dialogs/recurrence-page.c:1428
 msgid "occurrences"
 msgstr "repeticiones"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2128
+#: ../calendar/gui/dialogs/recurrence-page.c:2138
 msgid "Add exception"
 msgstr "AÃadir excepciÃn"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2169
+#: ../calendar/gui/dialogs/recurrence-page.c:2179
 msgid "Could not get a selection to modify."
 msgstr "No es posible obtener una selecciÃn que modificar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2175
+#: ../calendar/gui/dialogs/recurrence-page.c:2185
 msgid "Modify exception"
 msgstr "Modificar excepciÃn"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2219
+#: ../calendar/gui/dialogs/recurrence-page.c:2229
 msgid "Could not get a selection to delete."
 msgstr "No es posible obtener una selecciÃn que eliminar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2353
+#: ../calendar/gui/dialogs/recurrence-page.c:2363
 msgid "Date/Time"
 msgstr "Fecha/Hora"
 
@@ -3529,8 +3544,9 @@ msgid "year(s)"
 msgstr "aÃo(s)"
 
 #: ../calendar/gui/dialogs/send-comp.c:192
-msgid "Send my alarms with this event"
-msgstr "Enviar mis alarmas con este evento"
+#| msgid "Send my alarms with this event"
+msgid "Send my reminders with this event"
+msgstr "Enviar mis recordatorios con este evento"
 
 #: ../calendar/gui/dialogs/send-comp.c:194
 msgid "Notify new attendees _only"
@@ -3551,7 +3567,7 @@ msgstr "PÃgina web"
 #: ../calendar/gui/e-cal-model-tasks.c:439
 #: ../calendar/gui/e-cal-model-tasks.c:713 ../calendar/gui/e-task-table.c:210
 #: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:594
-#: ../calendar/gui/print.c:3275 ../mail/em-sync-stream.c:152
+#: ../calendar/gui/print.c:3274 ../mail/em-sync-stream.c:152
 #: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
@@ -3564,7 +3580,7 @@ msgstr "Cancelado"
 #: ../calendar/gui/e-cal-model-tasks.c:711
 #: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
 #: ../calendar/gui/e-task-table.c:208 ../calendar/gui/e-task-table.c:223
-#: ../calendar/gui/e-task-table.c:593 ../calendar/gui/print.c:3272
+#: ../calendar/gui/e-task-table.c:593 ../calendar/gui/print.c:3271
 #: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:374
 msgid "Completed"
 msgstr "Terminado"
@@ -3584,7 +3600,7 @@ msgstr "Alta"
 #: ../calendar/gui/e-cal-model-tasks.c:709
 #: ../calendar/gui/e-cal-model-tasks.c:786 ../calendar/gui/e-task-table.c:206
 #: ../calendar/gui/e-task-table.c:221 ../calendar/gui/e-task-table.c:592
-#: ../calendar/gui/print.c:3269
+#: ../calendar/gui/print.c:3268
 msgid "In Progress"
 msgstr "En proceso"
 
@@ -3599,7 +3615,7 @@ msgstr "Baja"
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:319
-#: ../calendar/gui/e-cal-model.c:1528 ../calendar/gui/e-task-table.c:515
+#: ../calendar/gui/e-cal-model.c:1533 ../calendar/gui/e-task-table.c:515
 #: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1223
 #: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
@@ -3611,7 +3627,7 @@ msgstr "Normal"
 #: ../calendar/gui/e-cal-model-tasks.c:433
 #: ../calendar/gui/e-cal-model-tasks.c:707 ../calendar/gui/e-task-table.c:204
 #: ../calendar/gui/e-task-table.c:219 ../calendar/gui/e-task-table.c:591
-#: ../calendar/gui/print.c:3266 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/print.c:3265 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Sin comenzar"
 
@@ -3667,7 +3683,7 @@ msgstr "Pulse para cambiar o ver los detalles del estado de la tarea"
 msgid "_Send Options"
 msgstr "Opciones de _envÃo"
 
-#: ../calendar/gui/dialogs/task-editor.c:319 ../calendar/gui/print.c:3187
+#: ../calendar/gui/dialogs/task-editor.c:319 ../calendar/gui/print.c:3186
 #: ../widgets/misc/e-send-options.c:526
 msgid "Task"
 msgstr "Tarea"
@@ -3885,39 +3901,39 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ninguna"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1534
+#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1539
 #: ../calendar/gui/e-meeting-list-view.c:201
 #: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:188
 #: ../calendar/gui/e-meeting-store.c:1028
 msgid "Yes"
 msgstr "SÃ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1534
+#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1539
 #: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:190
 msgid "No"
 msgstr "No"
 
-#: ../calendar/gui/e-cal-model.c:771 ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-cal-model.c:776 ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-list-view.c:191
 #: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:171
 #: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1098
 #: ../calendar/gui/print.c:1115 ../e-util/e-charset.c:52
 #: ../modules/plugin-manager/evolution-plugin-manager.c:101
 #: ../plugins/itip-formatter/itip-formatter.c:462
-#: ../plugins/itip-formatter/itip-formatter.c:2617
+#: ../plugins/itip-formatter/itip-formatter.c:2631
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../calendar/gui/e-cal-model.c:1530
+#: ../calendar/gui/e-cal-model.c:1535
 msgid "Recurring"
 msgstr "RepeticiÃn"
 
-#: ../calendar/gui/e-cal-model.c:1532
+#: ../calendar/gui/e-cal-model.c:1537
 msgid "Assigned"
 msgstr "Asignado"
 
-#: ../calendar/gui/e-cal-model.c:2714
+#: ../calendar/gui/e-cal-model.c:2794
 #, c-format
 msgid "Opening %s"
 msgstr "Abriendo %s"
@@ -3990,14 +4006,14 @@ msgstr "Actualizando objetos"
 #: ../calendar/gui/e-calendar-view.c:1778
 #: ../calendar/gui/e-meeting-list-view.c:213
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../plugins/itip-formatter/itip-formatter.c:2605
+#: ../plugins/itip-formatter/itip-formatter.c:2619
 msgid "Accepted"
 msgstr "Aceptado"
 
 #: ../calendar/gui/e-calendar-view.c:1779
 #: ../calendar/gui/e-meeting-list-view.c:214
 #: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../plugins/itip-formatter/itip-formatter.c:2611
+#: ../plugins/itip-formatter/itip-formatter.c:2625
 msgid "Declined"
 msgstr "Rehusado"
 
@@ -4011,7 +4027,7 @@ msgstr "Provisional"
 #: ../calendar/gui/e-calendar-view.c:1781
 #: ../calendar/gui/e-meeting-list-view.c:216
 #: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../plugins/itip-formatter/itip-formatter.c:2614
+#: ../plugins/itip-formatter/itip-formatter.c:2628
 msgid "Delegated"
 msgstr "Delegado"
 
@@ -4038,7 +4054,7 @@ msgid "Organizer: %s"
 msgstr "Organizador: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1946 ../calendar/gui/print.c:3221
+#: ../calendar/gui/e-calendar-view.c:1946 ../calendar/gui/print.c:3220
 #, c-format
 msgid "Location: %s"
 msgstr "Lugar: %s"
@@ -4083,7 +4099,7 @@ msgstr "Muestra la segunda zona horaria"
 
 #. Translators: "None" indicates no second time zone set for a day view
 #: ../calendar/gui/e-day-view-time-item.c:844
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
 #: ../modules/calendar/e-calendar-preferences.c:179
 #: ../modules/calendar/e-calendar-preferences.c:228
 msgctxt "cal-second-zone"
@@ -4464,8 +4480,9 @@ msgid "%d %B"
 msgstr "%e de %B"
 
 #: ../calendar/gui/ea-cal-view-event.c:290
-msgid "It has alarms."
-msgstr "Tiene alertas."
+#| msgid "It has recurrences."
+msgid "It has reminders."
+msgstr "Tiene recordatorios."
 
 #: ../calendar/gui/ea-cal-view-event.c:293
 msgid "It has recurrences."
@@ -4611,7 +4628,7 @@ msgstr "vista de calendario para un mes"
 msgid "calendar view for one or more weeks"
 msgstr "vista de calendario para una o mÃs semanas"
 
-#: ../calendar/gui/gnome-cal.c:2209
+#: ../calendar/gui/gnome-cal.c:2219
 msgid "Purging"
 msgstr "Compactando"
 
@@ -4893,71 +4910,71 @@ msgstr "Sa"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3014
+#: ../calendar/gui/print.c:3013
 msgid " to "
 msgstr " a "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3024
+#: ../calendar/gui/print.c:3023
 msgid " (Completed "
 msgstr " (Completado "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3030
+#: ../calendar/gui/print.c:3029
 msgid "Completed "
 msgstr "Completado "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3040
+#: ../calendar/gui/print.c:3039
 msgid " (Due "
 msgstr " (Vence "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3047
+#: ../calendar/gui/print.c:3046
 msgid "Due "
 msgstr "Vence "
 
-#: ../calendar/gui/print.c:3212
+#: ../calendar/gui/print.c:3211
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumen: %s"
 
-#: ../calendar/gui/print.c:3239
+#: ../calendar/gui/print.c:3238
 msgid "Attendees: "
 msgstr "Participantes: "
 
-#: ../calendar/gui/print.c:3282
+#: ../calendar/gui/print.c:3281
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:3297
+#: ../calendar/gui/print.c:3296
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridad: %s"
 
-#: ../calendar/gui/print.c:3315
+#: ../calendar/gui/print.c:3314
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaje completado: %i"
 
-#: ../calendar/gui/print.c:3326
+#: ../calendar/gui/print.c:3325
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3339
+#: ../calendar/gui/print.c:3338
 #, c-format
 msgid "Categories: %s"
 msgstr "CategorÃas: %s"
 
-#: ../calendar/gui/print.c:3350
+#: ../calendar/gui/print.c:3349
 msgid "Contacts: "
 msgstr "Contactos: "
 
@@ -4988,7 +5005,7 @@ msgstr "Reuniones y citas"
 
 #: ../calendar/importers/icalendar-importer.c:411
 #: ../calendar/importers/icalendar-importer.c:821
-#: ../plugins/itip-formatter/itip-formatter.c:2094
+#: ../plugins/itip-formatter/itip-formatter.c:2108
 msgid "Opening calendar"
 msgstr "Apertura del calendario"
 
@@ -5055,9 +5072,10 @@ msgid "is an instance"
 msgstr "es una instancia"
 
 #: ../calendar/importers/icalendar-importer.c:1098
+#| msgid "Sh_ow a reminder"
 msgctxt "iCalImp"
-msgid "has alarms"
-msgstr "tiene alertas"
+msgid "has reminders"
+msgstr "tiene recordatorios"
 
 #: ../calendar/importers/icalendar-importer.c:1103
 msgctxt "iCalImp"
@@ -6735,7 +6753,7 @@ msgstr "_Mensaje nuevo"
 msgid "Open New Message window"
 msgstr "Abrir la ventana de mensaje nuevo"
 
-#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1537
+#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1511
 msgid "Configure Evolution"
 msgstr "Configurar Evolution"
 
@@ -7308,7 +7326,7 @@ msgid "Back - Receiving options"
 msgstr "AtrÃs - Opciones de recepciÃn"
 
 #: ../capplet/settings/mail-account-view.c:638
-#: ../mail/em-account-editor.c:3202
+#: ../mail/em-account-editor.c:3290
 msgid "Defaults"
 msgstr "Predeterminados"
 
@@ -7436,7 +7454,7 @@ msgstr "Evolution"
 msgid "Evolution Mail and Calendar"
 msgstr "Correo y calendario de Evolution"
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:657
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
 msgid "Groupware Suite"
 msgstr "Suite de trabajo en grupo"
 
@@ -7742,14 +7760,14 @@ msgid "Reply-To"
 msgstr "Responder a"
 
 #: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1057
-#: ../mail/em-format-html.c:2564 ../mail/em-format-html.c:2632
-#: ../mail/em-format-html.c:2655 ../modules/mail/em-mailer-prefs.c:75
+#: ../mail/em-format-html.c:2574 ../mail/em-format-html.c:2642
+#: ../mail/em-format-html.c:2665 ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
 msgstr "Cc"
 
 #: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1058
-#: ../mail/em-format-html.c:2565 ../mail/em-format-html.c:2636
-#: ../mail/em-format-html.c:2658 ../modules/mail/em-mailer-prefs.c:76
+#: ../mail/em-format-html.c:2575 ../mail/em-format-html.c:2646
+#: ../mail/em-format-html.c:2668 ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
 msgstr "Cco"
 
@@ -7761,7 +7779,7 @@ msgid "Subject"
 msgstr "Asunto"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:474 ../mail/em-format-html.c:2757
+#: ../em-format/em-format-quote.c:474 ../mail/em-format-html.c:2767
 #: ../modules/mail/em-mailer-prefs.c:1008
 msgid "Mailer"
 msgstr "Transporte"
@@ -7993,8 +8011,9 @@ msgid "No reply or parent"
 msgstr "Sin respuesta o antecesor"
 
 #: ../filter/e-filter-rule.c:759
-msgid "I_nclude threads"
-msgstr "I_ncluir conversaciones"
+#| msgid "I_nclude threads"
+msgid "I_nclude threads:"
+msgstr "I_ncluir conversaciones:"
 
 #: ../filter/e-filter-rule.c:784
 msgid "A_dd Condition"
@@ -8209,7 +8228,7 @@ msgstr "RecepciÃn de correo"
 msgid "Please configure the following account settings."
 msgstr "Configure las siguientes opciones de la cuenta."
 
-#: ../mail/em-account-editor.c:2188 ../mail/em-account-editor.c:2898
+#: ../mail/em-account-editor.c:2188 ../mail/em-account-editor.c:2986
 msgid "Sending Email"
 msgstr "EnvÃo de correo"
 
@@ -8252,34 +8271,34 @@ msgstr ""
 "\n"
 "Pulse ÂAplicarÂ para guardar su configuraciÃn."
 
-#: ../mail/em-account-editor.c:2696
+#: ../mail/em-account-editor.c:2715
 msgid "Check for _new messages every"
 msgstr "Comprobar si hay mensajes _nuevos cada"
 
-#: ../mail/em-account-editor.c:2704
+#: ../mail/em-account-editor.c:2723
 msgid "minu_tes"
 msgstr "minuto_s"
 
-#: ../mail/em-account-editor.c:3015
+#: ../mail/em-account-editor.c:3103
 msgid "Please select a folder from the current account."
 msgstr "Seleccionar una carpeta de la cuenta actual."
 
-#: ../mail/em-account-editor.c:3341 ../mail/mail-config.ui.h:101
+#: ../mail/em-account-editor.c:3429 ../mail/mail-config.ui.h:101
 msgid "Security"
 msgstr "Seguridad"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:3395 ../mail/em-account-editor.c:3478
+#: ../mail/em-account-editor.c:3483 ../mail/em-account-editor.c:3566
 msgid "Receiving Options"
 msgstr "Opciones de recepciÃn"
 
-#: ../mail/em-account-editor.c:3396 ../mail/em-account-editor.c:3479
+#: ../mail/em-account-editor.c:3484 ../mail/em-account-editor.c:3567
 msgid "Checking for New Messages"
 msgstr "Comprobando si hay mensajes nuevos"
 
 #: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
-#: ../mail/em-format-html-display.c:1217 ../mail/mail-config.ui.h:14
+#: ../mail/em-format-html-display.c:1219 ../mail/mail-config.ui.h:14
 #: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:128
 #: ../widgets/misc/e-attachment-paned.c:133
 msgid "Attachment"
@@ -8297,9 +8316,9 @@ msgstr "Vista de icono"
 msgid "List View"
 msgstr "Vista de lista"
 
-#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1446
-#: ../shell/e-shell-window-actions.c:1453
-#: ../shell/e-shell-window-actions.c:1460
+#: ../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
 msgid "Close this window"
 msgstr "Cierra esta ventana"
 
@@ -8446,28 +8465,28 @@ msgstr "Nombre"
 
 #: ../mail/e-mail-local.c:41 ../mail/em-folder-properties.c:310
 #: ../mail/em-folder-tree-model.c:722
-#: ../modules/mail/e-mail-shell-view-private.c:1065
-#: ../modules/mail/e-mail-shell-view-private.c:1076
+#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../modules/mail/e-mail-shell-view-private.c:1077
 msgid "Inbox"
 msgstr "Bandeja de entrada"
 
 #: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:715
-#: ../modules/mail/e-mail-shell-view-private.c:1063
+#: ../modules/mail/e-mail-shell-view-private.c:1064
 msgid "Drafts"
 msgstr "Borradores"
 
 #: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:726
-#: ../modules/mail/e-mail-shell-view-private.c:1067
+#: ../modules/mail/e-mail-shell-view-private.c:1068
 msgid "Outbox"
 msgstr "Bandeja de salida"
 
 #: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:730
-#: ../modules/mail/e-mail-shell-view-private.c:1069
+#: ../modules/mail/e-mail-shell-view-private.c:1070
 msgid "Sent"
 msgstr "Correo enviado"
 
 #: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:718
-#: ../modules/mail/e-mail-shell-view-private.c:1071
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 #: ../plugins/templates/templates.c:1006 ../plugins/templates/templates.c:1283
 #: ../plugins/templates/templates.c:1293
@@ -9668,101 +9687,101 @@ msgstr "Crear carpeta"
 msgid "Specify where to create the folder:"
 msgstr "Especifique donde crear la carpeta:"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:166
 msgid "Formatting message"
 msgstr "Formateando el mensaje"
 
-#: ../mail/em-format-html.c:368
+#: ../mail/em-format-html.c:378
 msgid "Formatting Message..."
 msgstr "Formateando el mensajeâ"
 
-#: ../mail/em-format-html.c:1541 ../mail/em-format-html.c:1551
+#: ../mail/em-format-html.c:1551 ../mail/em-format-html.c:1561
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "Obteniendo Â%sÂ"
 
-#: ../mail/em-format-html.c:1697 ../mail/em-format-html-display.c:85
+#: ../mail/em-format-html.c:1707 ../mail/em-format-html-display.c:85
 msgid "Unsigned"
 msgstr "No firmado"
 
-#: ../mail/em-format-html.c:1698 ../mail/em-format-html-display.c:86
+#: ../mail/em-format-html.c:1708 ../mail/em-format-html-display.c:86
 msgid "Valid signature"
 msgstr "Firma vÃlida"
 
-#: ../mail/em-format-html.c:1699 ../mail/em-format-html-display.c:87
+#: ../mail/em-format-html.c:1709 ../mail/em-format-html-display.c:87
 msgid "Invalid signature"
 msgstr "Firma no vÃlida"
 
-#: ../mail/em-format-html.c:1700 ../mail/em-format-html-display.c:88
+#: ../mail/em-format-html.c:1710 ../mail/em-format-html-display.c:88
 msgid "Valid signature, but cannot verify sender"
 msgstr "Firma vÃlida, pero no se puede verificar el remitente"
 
-#: ../mail/em-format-html.c:1701 ../mail/em-format-html-display.c:89
+#: ../mail/em-format-html.c:1711 ../mail/em-format-html-display.c:89
 msgid "Signature exists, but need public key"
 msgstr "La firma existe pero se necesita la clave pÃblica"
 
-#: ../mail/em-format-html.c:1707 ../mail/em-format-html-display.c:96
+#: ../mail/em-format-html.c:1717 ../mail/em-format-html-display.c:96
 msgid "Unencrypted"
 msgstr "Descifrado"
 
-#: ../mail/em-format-html.c:1708 ../mail/em-format-html-display.c:97
+#: ../mail/em-format-html.c:1718 ../mail/em-format-html-display.c:97
 msgid "Encrypted, weak"
 msgstr "Cifrado, dÃbil"
 
-#: ../mail/em-format-html.c:1709 ../mail/em-format-html-display.c:98
+#: ../mail/em-format-html.c:1719 ../mail/em-format-html-display.c:98
 msgid "Encrypted"
 msgstr "Cifrado"
 
-#: ../mail/em-format-html.c:1710 ../mail/em-format-html-display.c:99
+#: ../mail/em-format-html.c:1720 ../mail/em-format-html-display.c:99
 msgid "Encrypted, strong"
 msgstr "Cifrado, fuerte"
 
-#: ../mail/em-format-html.c:2110
+#: ../mail/em-format-html.c:2120
 msgid "Unknown external-body part."
 msgstr "Parte externa al cuerpo del mensaje desconocida."
 
-#: ../mail/em-format-html.c:2120
+#: ../mail/em-format-html.c:2130
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
-#: ../mail/em-format-html.c:2151
+#: ../mail/em-format-html.c:2161
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: ../mail/em-format-html.c:2162
+#: ../mail/em-format-html.c:2172
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Puntero a archivo local (%s) vÃlido en el sitio Â%sÂ"
 
-#: ../mail/em-format-html.c:2164
+#: ../mail/em-format-html.c:2174
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: ../mail/em-format-html.c:2185
+#: ../mail/em-format-html.c:2195
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntero a datos remotos (%s)"
 
-#: ../mail/em-format-html.c:2200
+#: ../mail/em-format-html.c:2210
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntero a datos externos desconocidos (tipo Â%sÂ)"
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../mail/em-format-html.c:2905
+#: ../mail/em-format-html.c:2915
 #: ../plugins/mail-notification/mail-notification.c:405
 #, c-format
 msgid "From: %s"
 msgstr "De: %s"
 
-#: ../mail/em-format-html.c:2927
+#: ../mail/em-format-html.c:2937
 msgid "(no subject)"
 msgstr "(sin asunto)"
 
-#: ../mail/em-format-html.c:3003
+#: ../mail/em-format-html.c:3013
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "%s enviÃ este mensaje en nombre de %s"
@@ -9871,15 +9890,15 @@ msgstr "Atrasado:"
 msgid "by"
 msgstr "por"
 
-#: ../mail/em-format-html-display.c:1142 ../mail/em-format-html-display.c:1189
+#: ../mail/em-format-html-display.c:1144 ../mail/em-format-html-display.c:1191
 msgid "View _Unformatted"
 msgstr "Ver _sin formato"
 
-#: ../mail/em-format-html-display.c:1144
+#: ../mail/em-format-html-display.c:1146
 msgid "Hide _Unformatted"
 msgstr "Ocultar _sin formato"
 
-#: ../mail/em-format-html-display.c:1209
+#: ../mail/em-format-html-display.c:1211
 msgid "O_pen With"
 msgstr "Abrir c_on"
 
@@ -10038,7 +10057,7 @@ msgid "Always request read receipt"
 msgstr "Siempre solicitar confirmaciÃn de lectura"
 
 #: ../mail/evolution-mail.schemas.in.h:14
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr ""
 "Tiempo en segundos que deberÃ mostrarse el error en la barra de estado."
@@ -10093,7 +10112,7 @@ msgstr "Anchura predeterminada de la ventana de redacciÃn de mensajes"
 
 #: ../mail/evolution-mail.schemas.in.h:26
 msgid "Composer load/attach directory"
-msgstr "Directorio de carga/adjuntos del editor"
+msgstr "Carpeta de carga/adjuntos del editor"
 
 #: ../mail/evolution-mail.schemas.in.h:27
 msgid "Compress display of addresses in TO/CC/BCC"
@@ -10178,15 +10197,13 @@ msgid "Default width of the mail browser window."
 msgstr "Anchura predeterminada de la ventana del examinador de correo."
 
 #: ../mail/evolution-mail.schemas.in.h:44
-#| msgid ""
-#| "Describes wheter message headers in paned view should be collapsed or "
-#| "expanded by default. \"0\" = expanded \"1\" = collapsed"
 msgid ""
 "Describes whether message headers in paned view should be collapsed or "
 "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:45
 msgid ""
@@ -10234,16 +10251,16 @@ 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:51
 msgid "Directory for loading/attaching files to composer."
-msgstr "Directorio para cargar/adjuntar archivos en el editor."
+msgstr "Carpeta para cargar/adjuntar archivos en el editor."
 
 #: ../mail/evolution-mail.schemas.in.h:52
 msgid "Directory for saving mail component files."
-msgstr "Directorio para guardar archivos enviados por correo."
+msgstr "Carpeta para guardar archivos enviados por correo."
 
 #: ../mail/evolution-mail.schemas.in.h:53
 msgid "Disable or enable ellipsizing of folder names in side bar"
@@ -10421,8 +10438,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:86
 msgid ""
@@ -10445,8 +10462,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:89
 msgid ""
@@ -10467,11 +10484,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:91
 msgid ""
@@ -10604,7 +10621,7 @@ msgid "Layout style"
 msgstr "Estilo de la distribuciÃn"
 
 #: ../mail/evolution-mail.schemas.in.h:106
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
 msgid "Level beyond which the message should be logged."
 msgstr "Nivel mÃs allÃ del cuÃl el mensaje se debe registrar."
 
@@ -10630,7 +10647,7 @@ msgid ""
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 "Lista de cuentas conocidas para el componente de correo de Evolution. La "
-"lista contiene cadenas nombrando subdirectorios relativos a /apps/evolution/"
+"lista contiene cadenas nombrando subcarpetas relativas a /apps/evolution/"
 "mail/accounts."
 
 #: ../mail/evolution-mail.schemas.in.h:112
@@ -10757,9 +10774,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:139
 msgid "Prompt before sending to recipients not entered as mail addresses"
@@ -10850,7 +10867,7 @@ msgstr "Ejecutar la prueba de SPAM en el correo entrante."
 
 #: ../mail/evolution-mail.schemas.in.h:159
 msgid "Save directory"
-msgstr "Directorio donde guardar"
+msgstr "Carpeta donde guardar"
 
 #: ../mail/evolution-mail.schemas.in.h:160
 msgid "Search for the sender photo in local address books"
@@ -10941,8 +10958,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:181
 msgid ""
@@ -11009,8 +11026,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 "
@@ -11105,8 +11122,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:204
 msgid ""
@@ -11134,9 +11151,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:207
 msgid ""
@@ -11269,9 +11286,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:226
 msgid ""
@@ -11345,13 +11362,13 @@ msgstr "Carpeta de _destino:"
 
 #: ../mail/importers/evolution-mbox-importer.c:142
 #: ../plugins/dbx-import/dbx-importer.c:259
-#: ../plugins/pst-import/pst-importer.c:318
+#: ../plugins/pst-import/pst-importer.c:362
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
 #: ../mail/importers/evolution-mbox-importer.c:143
 #: ../plugins/dbx-import/dbx-importer.c:260
-#: ../plugins/pst-import/pst-importer.c:319
+#: ../plugins/pst-import/pst-importer.c:363
 msgid "Select folder to import into"
 msgstr "Seleccione la carpeta en la que importar"
 
@@ -11381,8 +11398,8 @@ msgstr "Importando buzÃn de correo"
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:153
 #: ../plugins/dbx-import/dbx-importer.c:603
-#: ../plugins/pst-import/pst-importer.c:500
-#: ../plugins/pst-import/pst-importer.c:609
+#: ../plugins/pst-import/pst-importer.c:544
+#: ../plugins/pst-import/pst-importer.c:680
 #, c-format
 msgid "Importing '%s'"
 msgstr "Importando Â%sÂ"
@@ -12307,7 +12324,7 @@ msgstr "Comprobando correo nuevo"
 #: ../mail/mail-tools.c:72
 #, c-format
 msgid "Could not create spool directory '%s': %s"
-msgstr "No se pudo crear el directorio spool Â%sÂ: %s"
+msgstr "No se pudo crear la carpeta spool Â%sÂ: %s"
 
 #: ../mail/mail-tools.c:106
 #, c-format
@@ -12401,8 +12418,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 ""
@@ -12487,11 +12504,11 @@ msgstr "No se puede crear la carpeta: Â{0}Â."
 
 #: ../mail/mail.error.xml.h:26
 msgid "Cannot create temporary save directory."
-msgstr "No se puede crear el directorio de guardado temporal."
+msgstr "No se puede crear la carpeta de guardado temporal."
 
 #: ../mail/mail.error.xml.h:27
 msgid "Cannot create the save directory, because \"{1}\""
-msgstr "No se puede crear el directorio de guardado, debido a Â{1}Â"
+msgstr "No se puede crear la carpeta de guardado, debido a Â{1}Â"
 
 #: ../mail/mail.error.xml.h:28
 msgid "Cannot delete folder \"{0}\"."
@@ -12544,7 +12561,7 @@ msgstr "No se pueden guardar los cambios en la cuenta."
 
 #: ../mail/mail.error.xml.h:39
 msgid "Cannot save to directory \"{0}\"."
-msgstr "No se puede guardar al directorio Â{0}Â."
+msgstr "No se puede guardar en la carpeta Â{0}Â."
 
 #: ../mail/mail.error.xml.h:40
 msgid "Cannot save to file \"{0}\"."
@@ -13338,9 +13355,9 @@ msgid ""
 "one level beneath your base."
 msgstr ""
 "El Ãmbito de bÃsqueda define hasta quÃ profundidad desea que la bÃsqueda se "
-"extienda a lo largo de un Ãrbol de directorios. Un Ãmbito de bÃsqueda de "
-"ÂsubÂ incluirÃ todas las entradas por debajo de su base de bÃsqueda. Un "
-"Ãmbito de ÂunoÂ sÃlo incluirÃ las entradas un nivel bajo su base."
+"extienda a lo largo de un Ãrbol de carpetas. Un Ãmbito de bÃsqueda de ÂsubÂ "
+"incluirÃ todas las entradas por debajo de su base de bÃsqueda. Un Ãmbito de "
+"ÂunoÂ sÃlo incluirÃ las entradas un nivel bajo su base."
 
 #: ../modules/addressbook/addressbook-config.c:1058
 msgid "Server Information"
@@ -13985,6 +14002,10 @@ msgstr "30 minutos"
 msgid "60 minutes"
 msgstr "60 minutos"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
+msgid "Alarms"
+msgstr "Alertas"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:10
 msgid "Alerts"
 msgstr "Alertas"
@@ -14006,8 +14027,9 @@ msgid "Display"
 msgstr "Mostrar"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:16
-msgid "Display alarms in _notification area only"
-msgstr "Mostrar alarmas sÃlo en el Ãrea de _notificaciÃn"
+#| msgid "Display alarms in _notification area only"
+msgid "Display reminders in _notification area only"
+msgstr "Mostrar recordatorios sÃlo en el Ãrea de _notificaciÃn"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:20
 msgid "Hours"
@@ -14018,307 +14040,307 @@ msgid "Minutes"
 msgstr "Minutos"
 
 #. Sunday
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
+#: ../modules/calendar/e-calendar-preferences.ui.h:26
 msgid "S_un"
 msgstr "_Dom"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:27
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
 msgid "Sc_roll Month View by a week"
 msgstr "Desplazar la vista mens_ual una semana"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
+#: ../modules/calendar/e-calendar-preferences.ui.h:29
 msgid "Se_cond zone:"
 msgstr "Zona se_cundaria:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:29
-msgid "Select the calendars for alarm notification"
-msgstr "Seleccione los calendarios para las alertas de notificaciÃn"
+#: ../modules/calendar/e-calendar-preferences.ui.h:30
+#| msgid "Select the calendars for alarm notification"
+msgid "Select the calendars for reminder notification"
+msgstr "Seleccione los calendarios para los recordatorios de notificaciÃn"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
+#: ../modules/calendar/e-calendar-preferences.ui.h:32
 msgid "Sh_ow a reminder"
 msgstr "Mos_\ttrar un recordatorio"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:33
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
 msgid "Show a _reminder"
 msgstr "Mostrar un _recordatorio"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:34
+#: ../modules/calendar/e-calendar-preferences.ui.h:35
 msgid "Show r_ecurring events in italic in bottom left calendar"
 msgstr ""
 "Mostrar acontecimientos repeti_dos en cursiva en el calendario inferior "
 "izquierdo"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:35
+#: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "Show week _numbers"
 msgstr "Mostrar _nÃmeros de semanas"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
+#: ../modules/calendar/e-calendar-preferences.ui.h:38
 msgid "T_asks due today:"
 msgstr "_Tareas que vencen hoy:"
 
 #. Thursday
-#: ../modules/calendar/e-calendar-preferences.ui.h:39
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "T_hu"
 msgstr "_Jue"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:41
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "Template:"
 msgstr "Plantilla:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
 #: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "Hora"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Time format:"
 msgstr "Formato de la hora:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "Use s_ystem time zone"
 msgstr "Usar la zona horaria del s_istema"
 
 #. A weekday like "Monday" follows
-#: ../modules/calendar/e-calendar-preferences.ui.h:50
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
 msgid "Wee_k starts on:"
 msgstr "La sema_na empieza en:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:51
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
 #: ../modules/calendar/e-cal-shell-view-actions.c:1646
 msgid "Work Week"
 msgstr "Semana laboral"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
 msgid "Work days:"
 msgstr "DÃas laborables:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:53
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "_12 hour (AM/PM)"
 msgstr "_12 horas (AM/PM)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
 msgid "_24 hour"
 msgstr "_24 horas"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:55
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "Pedir con_firmaciÃn al eliminar elementos"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "_Compress weekends in month view"
 msgstr "_Comprimir fines de semana en la vista mensual"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "_Day begins:"
 msgstr "La jornada laboral c_omienza a las:"
 
 #. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "_Fri"
 msgstr "Vi_e"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "_Ocultar tareas terminadas tras"
 
 #. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
 msgid "_Mon"
 msgstr "_Lun"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
 msgid "_Overdue tasks:"
 msgstr "Tareas fuera de pla_zo:"
 
 #. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
 msgid "_Sat"
 msgstr "_SÃb"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:66
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
 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"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
 msgid "_Time divisions:"
 msgstr "Divisiones de _hora:"
 
 #. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:69
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
 msgid "_Tue"
 msgstr "_Mar"
 
 #. Wednesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:71
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
 msgid "_Wed"
 msgstr "M_iÃ"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "antes de cada aniversario/cumpleaÃos"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:75
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
 msgid "before every appointment"
 msgstr "antes de cada cita"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
-msgid "Alarm programs"
-msgstr "Programas de alerta"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
 msgid "Ask for confirmation when deleting items"
 msgstr "Pedir confirmaciÃn al eliminar elementos"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "Color de fondo para las tareas que vencen hoy, en formato Â#rrggbbÂ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr ""
 "Color de fondo para las tareas que estÃn retrasadas, en formato Â#rrggbbÂ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
 msgid "Birthday and anniversary reminder"
 msgstr "Recordatorio de cumpleaÃos y aniversarios"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
 msgid "Birthday and anniversary reminder units"
 msgstr "Unidades del recordatorio de cumpleaÃos y aniversarios"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
 msgid "Birthday and anniversary reminder value"
 msgstr "Valor del recordatorio de cumpleaÃos y aniversarios"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
-msgid "Calendars to run alarms for"
-msgstr "Los calendarios ejecutarÃn alertas durante"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+#| msgid "Calendars to run alarms for"
+msgid "Calendars to run reminders for"
+msgstr "Calendarios para los que ejecutar recordatorios"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 "Color para dibujar la lÃnea de Marcus Bains en la barra de Tiempo (vacÃa por "
 "omisiÃn)."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Color para dibujar la lÃnea de Marcus Bains en la vista diaria."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
 msgid "Compress weekends in month view"
 msgstr "Comprimir fines de semana en la vista mensual"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
 msgid "Confirm expunge"
 msgstr "Confirmar compactaciÃn"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr ""
 "DÃas en los cuales debe indicarse el inicio y fin de las horas de trabajo."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
 msgstr "Recordatorio predeterminado de citas"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "Unidades predeterminadas del recordatorio"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "Valor predeterminado del recordatorio"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
-msgid "Directory for saving alarm audio files"
-msgstr "Directorio para guardar los archivos de sonidos de alertas"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+#| msgid "Directory for saving alarm audio files"
+msgid "Directory for saving reminder audio files"
+msgstr "Carpeta para guardar los archivos de sonidos de recordatorios"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy server URLs"
 msgstr "URL del servidor de disponibilidad"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
 msgid "Free/busy template URL"
 msgstr "URL de la plantilla de disponibilidad"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
 msgid "Hide completed tasks"
 msgstr "Ocultar tareas terminadas"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide task units"
 msgstr "Ocultar Lista de tareas nueva"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task value"
 msgstr "Ocultar el valor de la tarea"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
 msgid "Horizontal pane position"
 msgstr "PosiciÃn horizontal del panel"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr ""
 "Hora en la que acaba la jornada laboral, en formato de veinticuatro horas, "
 "de 0 a 23."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr ""
 "Hora a la que empieza la jornada laboral, en formato de veinticuatro horas, "
 "de 0 a 23."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
 msgid "If \"true\", show the memo preview pane in the main window."
 msgstr ""
 "Si es cierto mostrarÃ el panel de vista previa de notas en la ventana "
 "principal."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr ""
 "Si es cierto mostrarÃ el panel de vista previa de tareas en la ventana "
 "principal."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr ""
 "Los intervalos de tiempo mostrados en las vistas diarias y semanales, en "
 "minutos."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
-msgid "Last alarm time"
-msgstr "Hora de la Ãltima alerta"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+#| msgid "Last alarm time"
+msgid "Last reminder time"
+msgstr "Hora del Ãltimo recordatorio"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
 msgid "List of recently used second time zones in a Day View."
 msgstr ""
 "Lista de zonas horarias secundarias recientemente usadas en una Vista diaria."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
 msgid "List of server URLs for free/busy publishing."
 msgstr "Lista de URL del servidor para publicaciÃn de disponibilidad."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
 msgid "Marcus Bains Line"
 msgstr "LÃnea de Marcus Bains"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Color de la lÃnea de Marcus Bains de la vista de dÃa"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Color de la lÃnea de Marcus Bains de la barra de tiempo"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
@@ -14326,57 +14348,57 @@ msgstr ""
 "MÃximo nÃmero de zonas horarias usadas recientemente para recordar en la "
 "lista Âday_second_zonesÂ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
 msgid "Maximum number of recently used timezones to remember."
 msgstr "MÃximo nÃmero de zonas horarias usadas recientemente para recordar."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
 msgid "Memo layout style"
 msgstr "Estilo de la distribuciÃn de notas"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
 msgid "Memo preview pane position (horizontal)"
 msgstr "Vista previa del panel de posiciÃn de las notas (horizontal)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
 msgid "Memo preview pane position (vertical)"
 msgstr "Vista previa del panel de posiciÃn de las notas (vertical)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minuto en el que acaba la jornada laboral, de 0 a 59."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minuto en el que empieza la jornada laboral, de 0 a 59."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
 msgid "Month view horizontal pane position"
 msgstr "PosiciÃn del panel horizontal de la vista mensual"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
 msgid "Month view vertical pane position"
 msgstr "PosiciÃn del panel vertical en la vista mensual"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
 msgid "Number of units for determining a birthday or anniversary reminder."
 msgstr ""
 "NÃmero de unidades para determinar un el recordatorio de un cumpleaÃos o "
 "aniversario."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
 msgid "Number of units for determining a default reminder."
 msgstr "NÃmero de unidades para determinar un recordatorio predeterminado."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
 msgid "Number of units for determining when to hide tasks."
 msgstr "NÃmero de unidades para determinar cuÃndo ocultar tareas."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
 msgid "Overdue tasks color"
 msgstr "Color para las tareas fuera de plazo"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -14384,7 +14406,7 @@ msgstr ""
 "PosiciÃn del panel horizontal, entre la vista y la fecha del navegador del "
 "calendario y lista de tareas cuando no estÃ en la vista mensual, en pÃxeles."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -14392,25 +14414,25 @@ msgstr ""
 "PosiciÃn del panel horizontal, entre la vista y el navegador de fechas del "
 "calendario y la lista de tareas en la vista de mes, en pÃxeles."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
 msgid "Position of the memo preview pane when oriented vertically."
 msgstr ""
 "PosiciÃn del panel de vista previa de notas cuando estÃ orientado "
 "verticalmente."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr ""
 "PosiciÃn del panel de vista previa de tareas cuando estÃ orientado "
 "horizontalmente."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the task preview pane when oriented vertically."
 msgstr ""
 "PosiciÃn del panel de vista previa de tareas cuando estÃ orientado "
 "verticalmente."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -14418,7 +14440,7 @@ msgstr ""
 "PosiciÃn del panel vertical, entre las listas del calendario el calendario "
 "del navegador de fechas."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -14426,7 +14448,7 @@ msgstr ""
 "PosiciÃn de la hoja vertical, entre la vista y el navegador del calendario y "
 "la lista de tareas en la vista mensual, en pÃxeles."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -14435,33 +14457,40 @@ msgstr ""
 "calendario y la lista de tareas cuando no estÃ en la vista mensual, en "
 "pÃxeles."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
 msgid "Primary calendar"
 msgstr "Calendario primario"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
 msgid "Primary memo list"
 msgstr "Lista de notas primaria"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary task list"
 msgstr "Lista de tareas primaria"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
-msgid "Programs that are allowed to be run by alarms."
-msgstr "Programas que se permite que sean ejecutados por las alertas."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+#| msgid "Programs that are allowed to be run by alarms."
+msgid "Programs that are allowed to be run by reminders."
+msgstr "Programas que se permite que ejecuten por los recordatorios."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
 msgid "Recently used second time zones in a Day View"
 msgstr "Zonas horarias secundarias recientemente usadas en una Vista diaria"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
 msgid "Recurrent Events in Italic"
 msgstr "Los acontecimientos que se repiten en cursiva"
 
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+#| msgid "Reminder Notes"
+msgid "Reminder programs"
+msgstr "Notas de recordatorios"
+
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
-msgid "Save directory for alarm audio"
-msgstr "Directorio donde guardar los sonidos de las alertas"
+#| msgid "Save directory for alarm audio"
+msgid "Save directory for reminder audio"
+msgstr "Carpeta donde guardar los sonidos de los recordatorios"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
 msgid "Scroll Month View by a week"
@@ -14474,7 +14503,8 @@ 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"
@@ -14495,8 +14525,9 @@ msgstr ""
 "cursiva en la parte inferior izquierda del calendario."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
-msgid "Show display alarms in notification tray"
-msgstr "Mostrar el visor de la alerta en una bandeja de notificaciÃn"
+#| msgid "Show display alarms in notification tray"
+msgid "Show display reminders in notification tray"
+msgstr "Mostrar el visor del recordatorio en la bandeja de notificaciÃn"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
 msgid "Show status field in the event/task/meeting editor"
@@ -14564,8 +14595,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 ""
@@ -14602,8 +14633,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 ""
@@ -14625,16 +14656,17 @@ 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"
 msgstr "Divisiones de hora"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
-msgid "Time the last alarm ran, in time_t."
-msgstr "La hora en que la Ãltima alerta sonÃ, en time_t."
+#| msgid "Time the last alarm ran, in time_t."
+msgid "Time the last reminder ran, in time_t."
+msgstr "La hora en que el Ãltimo recordatorio sonÃ, en time_t."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
 msgid "Timezone"
@@ -14649,8 +14681,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\"."
@@ -14687,9 +14719,11 @@ msgstr ""
 "El dÃa en que empieza la semana, desde el domingo (0) hasta el sÃbado (6)."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
-msgid "Whether or not to use the notification tray for display alarms."
+#| msgid "Whether or not to use the notification tray for display alarms."
+msgid "Whether or not to use the notification tray for display reminders."
 msgstr ""
-"Indica si se debe usar o no la bandeja de notificaciÃn para mostrar alertas."
+"Indica si se debe usar o no la bandeja de notificaciÃn para mostrar "
+"recordatorios."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to ask for confirmation when deleting an appointment or task."
@@ -14778,8 +14812,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."
@@ -14829,8 +14863,9 @@ msgid "I_mport to Tasks"
 msgstr "I_mportar a las tareas"
 
 #: ../modules/calendar/e-calendar-preferences.c:441
-msgid "Selected Calendars for Alarms"
-msgstr "Calendarios seleccionados para alertas"
+#| msgid "Selected Calendars for Alarms"
+msgid "Selected Calendars for Reminders"
+msgstr "Calendarios seleccionados para recordatorios"
 
 #: ../modules/calendar/e-calendar-preferences.c:840
 msgid "Ti_me and date:"
@@ -14899,7 +14934,7 @@ msgid "Create a new calendar"
 msgstr "Crea un calendario nuevo"
 
 #: ../modules/calendar/e-cal-shell-backend.c:755
-#: ../plugins/itip-formatter/itip-formatter.c:2951
+#: ../plugins/itip-formatter/itip-formatter.c:2965
 msgid "Calendar and Tasks"
 msgstr "Calendario y tareas"
 
@@ -15957,68 +15992,68 @@ msgstr "BÃsqueda en la cuenta"
 msgid "Proxy _Logout"
 msgstr "_Cerrar sesiÃn proxy"
 
-#: ../modules/mail/e-mail-shell-view-private.c:996
+#: ../modules/mail/e-mail-shell-view-private.c:997
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d seleccionado, "
 msgstr[1] "%d seleccionados, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1007
+#: ../modules/mail/e-mail-shell-view-private.c:1008
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d borrado"
 msgstr[1] "%d borrados"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1013
-#: ../modules/mail/e-mail-shell-view-private.c:1020
+#: ../modules/mail/e-mail-shell-view-private.c:1014
+#: ../modules/mail/e-mail-shell-view-private.c:1021
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d SPAM"
 msgstr[1] "%d SPAM"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1026
+#: ../modules/mail/e-mail-shell-view-private.c:1027
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d borrador"
 msgstr[1] "%d borradores"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1032
+#: ../modules/mail/e-mail-shell-view-private.c:1033
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d sin enviar"
 msgstr[1] "%d sin enviar"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1038
+#: ../modules/mail/e-mail-shell-view-private.c:1039
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d enviado"
 msgstr[1] "%d enviados"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1050
+#: ../modules/mail/e-mail-shell-view-private.c:1051
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d no leÃdo, "
 msgstr[1] "%d no leÃdos, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1053
+#: ../modules/mail/e-mail-shell-view-private.c:1054
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d en total"
 msgstr[1] "%d en total"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1073
+#: ../modules/mail/e-mail-shell-view-private.c:1074
 msgid "Trash"
 msgstr "Papelera"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1541
+#: ../modules/mail/e-mail-shell-view-private.c:1542
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
@@ -16394,11 +16429,11 @@ msgstr "Respaldar y restaurar los datos y la configuraciÃn desde un archivador"
 
 #: ../plugins/backup-restore/backup.c:77
 msgid "Back up Evolution directory"
-msgstr "Respaldar el directorio de Evolution"
+msgstr "Respaldar la carpeta de Evolution"
 
 #: ../plugins/backup-restore/backup.c:79
 msgid "Restore Evolution directory"
-msgstr "Restaurar el directorio de Evolution"
+msgstr "Restaurar la carpeta de Evolution"
 
 #: ../plugins/backup-restore/backup.c:81
 msgid "Check Evolution Back up"
@@ -16702,7 +16737,6 @@ msgstr "Soporta"
 
 #: ../plugins/caldav/caldav-browse-server.c:1334
 #: ../plugins/caldav/caldav-source.c:256
-#| msgid "User e-_mail:"
 msgid "User e_mail:"
 msgstr "Correo-_e del usuario:"
 
@@ -16728,7 +16762,6 @@ msgstr "_URL:"
 #: ../plugins/caldav/caldav-source.c:244
 #: ../plugins/calendar-http/calendar-http.c:138
 #: ../plugins/google-account-setup/google-contacts-source.c:351
-#| msgid "_Use secure connection:"
 msgid "Use _secure connection"
 msgstr "Usar _conexiÃn segura"
 
@@ -17057,7 +17090,7 @@ msgstr "Usar un editor externo para editar mensajes de correo en texto plano."
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
 msgid "Cannot create Temporary File"
-msgstr "No se puede crear el directorio de guardado temporal"
+msgstr "No se puede crear la carpeta de guardado temporal"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
 msgid "Editor not launchable"
@@ -17237,9 +17270,6 @@ msgstr ""
 "Cuantas mÃs cabeceras tenga mÃs tiempo se tardarÃ en descargar."
 
 #: ../plugins/imap-features/imap-headers.ui.h:8
-#| msgid ""
-#| "_Basic Headers - (Fastest) \n"
-#| "Use this if you do not have filters based on mailing lists"
 msgid ""
 "_Basic Headers (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
@@ -17292,117 +17322,117 @@ msgstr "No se puede encontrar esta tarea en ninguna lista de tareas"
 msgid "Unable to find this memo in any memo list"
 msgstr "No se puede encontrar esta nota en ninguna lista de notas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1026
+#: ../plugins/itip-formatter/itip-formatter.c:1040
 msgid "Opening the calendar. Please wait..."
 msgstr "Abriendo el calendario. Espereâ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1029
+#: ../plugins/itip-formatter/itip-formatter.c:1043
 msgid "Searching for an existing version of this appointment"
 msgstr "Buscando una versiÃn existente de esta cita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1302
+#: ../plugins/itip-formatter/itip-formatter.c:1316
 msgid "Unable to parse item"
 msgstr "No es posible interpretar el elemento"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1391
+#: ../plugins/itip-formatter/itip-formatter.c:1405
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "No es posible enviar el elemento al calendario Â%sÂ: %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1403
+#: ../plugins/itip-formatter/itip-formatter.c:1417
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Enviado al calendario Â%sÂ como aceptado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1421
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviado al calendario Â%sÂ como tentativa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1412
+#: ../plugins/itip-formatter/itip-formatter.c:1426
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviado al calendario Â%sÂ como rehusado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1431
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Enviado al calendario Â%sÂ como cancelado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1511
+#: ../plugins/itip-formatter/itip-formatter.c:1525
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "El organizador ha quitado al delegado %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1518
+#: ../plugins/itip-formatter/itip-formatter.c:1532
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Enviar una notificaciÃn de cancelaciÃn al delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1520
+#: ../plugins/itip-formatter/itip-formatter.c:1534
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "No es posible enviar una notificaciÃn de cancelaciÃn al delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1631
+#: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "El estado de asistencia no pudo actualizarse debido a que el estado es "
 "invÃlido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1660
+#: ../plugins/itip-formatter/itip-formatter.c:1674
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "No es posible actualizar la asistencia. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1664
+#: ../plugins/itip-formatter/itip-formatter.c:1678
 msgid "Attendee status updated"
 msgstr "Estado de asistencia actualizado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1668
+#: ../plugins/itip-formatter/itip-formatter.c:1682
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "El estado del participante no pudo actualizarse porque ya no existe el "
 "elemento"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1690
+#: ../plugins/itip-formatter/itip-formatter.c:1704
 msgid "Meeting information sent"
 msgstr "InformaciÃn de reuniÃn enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1693
+#: ../plugins/itip-formatter/itip-formatter.c:1707
 msgid "Task information sent"
 msgstr "InformaciÃn de la tarea enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1696
+#: ../plugins/itip-formatter/itip-formatter.c:1710
 msgid "Memo information sent"
 msgstr "InformaciÃn de la nota enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1705
+#: ../plugins/itip-formatter/itip-formatter.c:1719
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "No se puede enviar la informaciÃn de la reuniÃn, la reuniÃn no existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1708
+#: ../plugins/itip-formatter/itip-formatter.c:1722
 msgid "Unable to send task information, the task does not exist"
 msgstr "No se puede enviar la informaciÃn de la tarea, la tarea no existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1711
+#: ../plugins/itip-formatter/itip-formatter.c:1725
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "No se puede enviar la informaciÃn de la nota, la nota no existe"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1776
+#: ../plugins/itip-formatter/itip-formatter.c:1790
 msgid "calendar.ics"
 msgstr "calendario.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1781
+#: ../plugins/itip-formatter/itip-formatter.c:1795
 msgid "Save Calendar"
 msgstr "Guardar calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1839
-#: ../plugins/itip-formatter/itip-formatter.c:1850
+#: ../plugins/itip-formatter/itip-formatter.c:1853
+#: ../plugins/itip-formatter/itip-formatter.c:1864
 msgid "The calendar attached is not valid"
 msgstr "El calendario adjunto no es vÃlido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1840
-#: ../plugins/itip-formatter/itip-formatter.c:1851
+#: ../plugins/itip-formatter/itip-formatter.c:1854
+#: ../plugins/itip-formatter/itip-formatter.c:1865
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17410,15 +17440,15 @@ msgstr ""
 "El mensaje dice contener un calendario, pero el calendario no es un "
 "iCalendar vÃlido."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1891
-#: ../plugins/itip-formatter/itip-formatter.c:1919
-#: ../plugins/itip-formatter/itip-formatter.c:2028
+#: ../plugins/itip-formatter/itip-formatter.c:1905
+#: ../plugins/itip-formatter/itip-formatter.c:1933
+#: ../plugins/itip-formatter/itip-formatter.c:2042
 msgid "The item in the calendar is not valid"
 msgstr "El elemento en el calendario no es vÃlido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1892
-#: ../plugins/itip-formatter/itip-formatter.c:1920
-#: ../plugins/itip-formatter/itip-formatter.c:2029
+#: ../plugins/itip-formatter/itip-formatter.c:1906
+#: ../plugins/itip-formatter/itip-formatter.c:1934
+#: ../plugins/itip-formatter/itip-formatter.c:2043
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17426,11 +17456,11 @@ msgstr ""
 "El mensaje contiene un calendario, pero el calendario no contiene ningÃn "
 "acontecimiento, tarea o informaciÃn de disponibilidad"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1933
+#: ../plugins/itip-formatter/itip-formatter.c:1947
 msgid "The calendar attached contains multiple items"
 msgstr "El calendario adjunto contiene elementos mÃltiples"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1934
+#: ../plugins/itip-formatter/itip-formatter.c:1948
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17438,40 +17468,40 @@ msgstr ""
 "Para procesar todos estos elementos, el archivo deberÃa guardarse y el "
 "calendario importarse"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2592
+#: ../plugins/itip-formatter/itip-formatter.c:2606
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ninguno"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2608
+#: ../plugins/itip-formatter/itip-formatter.c:2622
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2726
+#: ../plugins/itip-formatter/itip-formatter.c:2740
 msgid "This meeting recurs"
 msgstr "Esta reuniÃn se repite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2729
+#: ../plugins/itip-formatter/itip-formatter.c:2743
 msgid "This task recurs"
 msgstr "Esta tarea se repite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2732
+#: ../plugins/itip-formatter/itip-formatter.c:2746
 msgid "This memo recurs"
 msgstr "Esta nota se repite"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2976
+#: ../plugins/itip-formatter/itip-formatter.c:2990
 msgid "_Delete message after acting"
 msgstr "_Eliminar el mensaje despuÃs de actuar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2986
-#: ../plugins/itip-formatter/itip-formatter.c:3019
+#: ../plugins/itip-formatter/itip-formatter.c:3000
+#: ../plugins/itip-formatter/itip-formatter.c:3033
 msgid "Conflict Search"
 msgstr "BÃsqueda de conflictos"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:3001
+#: ../plugins/itip-formatter/itip-formatter.c:3015
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccione los calendario en los que buscar conflictos entre reuniones"
 
@@ -17670,8 +17700,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:400
 #, c-format
@@ -18131,8 +18161,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:589
 #, c-format
@@ -18513,35 +18543,35 @@ msgstr "Importador PST de Outlook"
 msgid "Outlook personal folders (.pst)"
 msgstr "Carpetas personales de Outlook (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:308
+#: ../plugins/pst-import/pst-importer.c:352
 msgid "_Mail"
 msgstr "Co_rreo"
 
-#: ../plugins/pst-import/pst-importer.c:326
+#: ../plugins/pst-import/pst-importer.c:370
 msgid "Destination folder:"
 msgstr "Carpeta de destino:"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:332
+#: ../plugins/pst-import/pst-importer.c:376
 msgid "_Address Book"
 msgstr "Libreta de _direcciones"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:339
+#: ../plugins/pst-import/pst-importer.c:383
 msgid "A_ppointments"
 msgstr "Ci_tas"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:345 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:389 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tareas"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:395
 msgid "_Journal entries"
 msgstr "Entradas del dia_rio"
 
-#: ../plugins/pst-import/pst-importer.c:366
+#: ../plugins/pst-import/pst-importer.c:410
 msgid "Importing Outlook data"
 msgstr "_Importando datos de Outlook"
 
@@ -18785,7 +18815,6 @@ msgid "_Encapsulate values with:"
 msgstr "_Encapsular valores con:"
 
 #: ../plugins/save-calendar/csv-format.c:625
-#| msgid "Comma separated value format (.csv)"
 msgid "Comma separated values (.csv)"
 msgstr "Valores separados por comas (.csv)"
 
@@ -18811,7 +18840,6 @@ msgid "%FT%T"
 msgstr "%FT%T"
 
 #: ../plugins/save-calendar/rdf-format.c:375
-#| msgid "RDF format (.rdf)"
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
@@ -19204,7 +19232,6 @@ msgid "Use HTTP proxy"
 msgstr "Usar proxy HTTP"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:55
-#| msgid "User name to pass as authentication when doing HTTP proxying."
 msgid "Username to pass as authentication when doing HTTP proxying."
 msgstr "Nombre de usuario que pasar como autenticaciÃn al usar el proxy HTTP."
 
@@ -19293,7 +19320,7 @@ msgstr "Guardando el estado de la interfaz de usuario"
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:648
+#: ../shell/e-shell-window-actions.c:645
 msgid "translator-credits"
 msgstr ""
 "Jorge GonzÃlez <jorgegonz svn gnome org>, 2007-2010\n"
@@ -19304,281 +19331,273 @@ msgstr ""
 "Eneko Lacunza <enlar iname com>, 2001-2002\n"
 "Carlos PerellÃ MarÃn <carlos gnome-db org>, 2000-2001"
 
-#: ../shell/e-shell-window-actions.c:659
+#: ../shell/e-shell-window-actions.c:656
 msgid "Evolution Website"
 msgstr "PÃgina web de Evolution"
 
-#: ../shell/e-shell-window-actions.c:921
+#: ../shell/e-shell-window-actions.c:902
 msgid "Categories Editor"
 msgstr "Editor de categorÃas"
 
-#: ../shell/e-shell-window-actions.c:1256
+#: ../shell/e-shell-window-actions.c:1237
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy no estÃ instalado."
 
-#: ../shell/e-shell-window-actions.c:1258
+#: ../shell/e-shell-window-actions.c:1239
 msgid "Bug Buddy could not be run."
 msgstr "No se pudo ejecutar Bug Buddy."
 
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1420
 msgid "Show information about Evolution"
 msgstr "Mostrar informaciÃn acerca de Evolution"
 
-#: ../shell/e-shell-window-actions.c:1444
-#: ../shell/e-shell-window-actions.c:1458
+#: ../shell/e-shell-window-actions.c:1425
+#: ../shell/e-shell-window-actions.c:1439
 msgid "_Close Window"
 msgstr "_Cerrar ventana"
 
-#: ../shell/e-shell-window-actions.c:1465
+#: ../shell/e-shell-window-actions.c:1446
 msgid "_Contents"
 msgstr "Ãnd_ice"
 
-#: ../shell/e-shell-window-actions.c:1467
+#: ../shell/e-shell-window-actions.c:1448
 msgid "Open the Evolution User Guide"
 msgstr "Abrir la GuÃa de usuario de Evolution"
 
-#: ../shell/e-shell-window-actions.c:1493
-msgid "Evolution _FAQ"
-msgstr "P+_F de Evolution"
-
-#: ../shell/e-shell-window-actions.c:1495
-msgid "Open the Frequently Asked Questions webpage"
-msgstr "Abrir la pÃgina web de preguntas mÃs frecuentes"
-
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1474
 msgid "_Forget Passwords"
 msgstr "_Olvidar contraseÃas"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1476
 msgid "Forget all remembered passwords"
 msgstr "Olvidar todas las contraseÃas recordadas"
 
-#: ../shell/e-shell-window-actions.c:1507
+#: ../shell/e-shell-window-actions.c:1481
 msgid "I_mport..."
 msgstr "I_mportarâ"
 
-#: ../shell/e-shell-window-actions.c:1509
+#: ../shell/e-shell-window-actions.c:1483
 msgid "Import data from other programs"
 msgstr "Importa datos de otros programas"
 
-#: ../shell/e-shell-window-actions.c:1514
+#: ../shell/e-shell-window-actions.c:1488
 msgid "New _Window"
 msgstr "_Ventana nueva"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1490
 msgid "Create a new window displaying this view"
 msgstr "Crear una ventana nueva mostrando esta vista"
 
-#: ../shell/e-shell-window-actions.c:1528
+#: ../shell/e-shell-window-actions.c:1502
 msgid "Available Cate_gories"
 msgstr "CategorÃas _disponibles:"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1504
 msgid "Manage available categories"
 msgstr "Gestionar las categorÃas disponibles"
 
-#: ../shell/e-shell-window-actions.c:1542
+#: ../shell/e-shell-window-actions.c:1516
 msgid "_Quick Reference"
 msgstr "_Referencia rÃpida"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1518
 msgid "Show Evolution's shortcut keys"
 msgstr "Mostrar los atajos de teclas de Evolution"
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1525
 msgid "Exit the program"
 msgstr "Sale del programa"
 
-#: ../shell/e-shell-window-actions.c:1556
+#: ../shell/e-shell-window-actions.c:1530
 msgid "_Advanced Search..."
 msgstr "BÃsqueda _avanzadaâ"
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1532
 msgid "Construct a more advanced search"
 msgstr "Construir una bÃsqueda mÃs avanzada"
 
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1539
 msgid "Clear the current search parameters"
 msgstr "Limpiar los parÃmetros de bÃsqueda actuales"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1544
 msgid "_Edit Saved Searches..."
 msgstr "_Editar bÃsquedas guardadasâ"
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1546
 msgid "Manage your saved searches"
 msgstr "Gestionar sus bÃsquedas guardadas"
 
-#: ../shell/e-shell-window-actions.c:1579
+#: ../shell/e-shell-window-actions.c:1553
 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:1584
+#: ../shell/e-shell-window-actions.c:1558
 msgid "_Find Now"
 msgstr "B_uscar ahora"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1560
 msgid "Execute the current search parameters"
 msgstr "Ejecutar los parÃmetros de bÃsqueda actuales"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1565
 msgid "_Save Search..."
 msgstr "_Guardar bÃsquedaâ"
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1567
 msgid "Save the current search parameters"
 msgstr "Guardar los parÃmetros de bÃsqueda actuales"
 
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1579
 msgid "Submit _Bug Report..."
 msgstr "Enviar informe de _falloâ"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1581
 msgid "Submit a bug report using Bug Buddy"
 msgstr "EnvÃa un informe de fallos usando Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1586
 msgid "_Work Offline"
 msgstr "_Trabajar desconectado"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1588
 msgid "Put Evolution into offline mode"
 msgstr "Poner Evolution en modo desconectado"
 
-#: ../shell/e-shell-window-actions.c:1619
+#: ../shell/e-shell-window-actions.c:1593
 msgid "_Work Online"
 msgstr "_Trabajar conectado"
 
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1595
 msgid "Put Evolution into online mode"
 msgstr "Poner Evolution en modo conectado"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1623
 msgid "Lay_out"
 msgstr "_DistribuciÃn"
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1630
 msgid "_New"
 msgstr "_Nuevo"
 
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1637
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../shell/e-shell-window-actions.c:1670
+#: ../shell/e-shell-window-actions.c:1644
 msgid "_Switcher Appearance"
 msgstr "Apariencia del _selector"
 
-#: ../shell/e-shell-window-actions.c:1684
+#: ../shell/e-shell-window-actions.c:1658
 msgid "_Window"
 msgstr "_Ventana"
 
-#: ../shell/e-shell-window-actions.c:1713
+#: ../shell/e-shell-window-actions.c:1687
 msgid "Show Side _Bar"
 msgstr "Mostrar barra _lateral"
 
-#: ../shell/e-shell-window-actions.c:1715
+#: ../shell/e-shell-window-actions.c:1689
 msgid "Show the side bar"
 msgstr "Mostrar la barra lateral"
 
-#: ../shell/e-shell-window-actions.c:1721
+#: ../shell/e-shell-window-actions.c:1695
 msgid "Show _Buttons"
 msgstr "Mostrar _botones"
 
-#: ../shell/e-shell-window-actions.c:1723
+#: ../shell/e-shell-window-actions.c:1697
 msgid "Show the switcher buttons"
 msgstr "Mostrar los botones del selector"
 
-#: ../shell/e-shell-window-actions.c:1729
+#: ../shell/e-shell-window-actions.c:1703
 msgid "Show _Status Bar"
 msgstr "Mostrar barra de _estado"
 
-#: ../shell/e-shell-window-actions.c:1731
+#: ../shell/e-shell-window-actions.c:1705
 msgid "Show the status bar"
 msgstr "Mostrar la barra de estado"
 
-#: ../shell/e-shell-window-actions.c:1737
+#: ../shell/e-shell-window-actions.c:1711
 msgid "Show _Tool Bar"
 msgstr "Mostrar barra de _herramientas"
 
-#: ../shell/e-shell-window-actions.c:1739
+#: ../shell/e-shell-window-actions.c:1713
 msgid "Show the tool bar"
 msgstr "Mostrar la barra de herramientas"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1735
 msgid "_Icons Only"
 msgstr "SÃlo _iconos"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1737
 msgid "Display window buttons with icons only"
 msgstr "Mostrar los botones de la ventana sÃlo con iconos"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1742
 msgid "_Text Only"
 msgstr "SÃlo _texto"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1744
 msgid "Display window buttons with text only"
 msgstr "Mostrar los botones de la ventana sÃlo con texto"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1749
 msgid "Icons _and Text"
 msgstr "Iconos _y texto"
 
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1751
 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:1782
+#: ../shell/e-shell-window-actions.c:1756
 msgid "Tool_bar Style"
 msgstr "Estilo de la _barra de herramientas"
 
-#: ../shell/e-shell-window-actions.c:1784
+#: ../shell/e-shell-window-actions.c:1758
 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:1792
+#: ../shell/e-shell-window-actions.c:1766
 msgid "Define Views..."
 msgstr "Definir vistasâ"
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1768
 msgid "Create or edit views"
 msgstr "Crear o editar vistas"
 
-#: ../shell/e-shell-window-actions.c:1799
+#: ../shell/e-shell-window-actions.c:1773
 msgid "Save Custom View..."
 msgstr "Guardar vista personalizadaâ"
 
-#: ../shell/e-shell-window-actions.c:1801
+#: ../shell/e-shell-window-actions.c:1775
 msgid "Save current custom view"
 msgstr "Guardar la vista actual personalizada"
 
-#: ../shell/e-shell-window-actions.c:1808
+#: ../shell/e-shell-window-actions.c:1782
 msgid "C_urrent View"
 msgstr "Vista act_ual"
 
-#: ../shell/e-shell-window-actions.c:1818
+#: ../shell/e-shell-window-actions.c:1792
 msgid "Custom View"
 msgstr "Vista personalizada"
 
-#: ../shell/e-shell-window-actions.c:1820
+#: ../shell/e-shell-window-actions.c:1794
 msgid "Current view is a customized view"
 msgstr "La vista actual es una vista personalizada"
 
-#: ../shell/e-shell-window-actions.c:1830
+#: ../shell/e-shell-window-actions.c:1804
 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:2215
+#: ../shell/e-shell-window-actions.c:2189
 #, c-format
 msgid "Switch to %s"
 msgstr "Cambiar a %s"
 
-#: ../shell/e-shell-window-actions.c:2430
+#: ../shell/e-shell-window-actions.c:2404
 msgid "Execute these search parameters"
 msgstr "Ejecutar estos parÃmetros de bÃsqueda"
 
@@ -19957,7 +19976,6 @@ msgstr "Huella MD5"
 
 #: ../smime/gui/certificate-manager.c:93
 #: ../smime/gui/certificate-manager.c:113
-#| msgid "Email _Address:"
 msgid "Email Address"
 msgstr "DirecciÃn de correo-e"
 
@@ -21500,6 +21518,47 @@ msgstr "Seleccionar todo"
 msgid "Input Methods"
 msgstr "MÃtodos de entrada"
 
+#~ msgid "Edit Alarm"
+#~ msgstr "Editar alerta"
+
+#~ msgid "Add Alarm"
+#~ msgstr "AÃadir alerta"
+
+#~ msgid "Alarm"
+#~ msgstr "Alerta"
+
+#~ msgid "_Alarms"
+#~ msgstr "_Alertas"
+
+#~ msgctxt "cal-alarms"
+#~ msgid "None"
+#~ msgstr "Ninguna"
+
+#~ msgid "Custom Alarm:"
+#~ msgstr "Alerta personalizada:"
+
+#~ msgid "_Alarm"
+#~ msgstr "_Alerta"
+
+#~ msgid "_Group:"
+#~ msgstr "_Grupo:"
+
+#~ msgid "It has alarms."
+#~ msgstr "Tiene alertas."
+
+#~ msgctxt "iCalImp"
+#~ msgid "has alarms"
+#~ msgstr "tiene alertas"
+
+#~ msgid "Alarm programs"
+#~ msgstr "Programas de alerta"
+
+#~ msgid "Evolution _FAQ"
+#~ msgstr "P+_F de Evolution"
+
+#~ msgid "Open the Frequently Asked Questions webpage"
+#~ msgstr "Abrir la pÃgina web de preguntas mÃs frecuentes"
+
 #~ msgid "Click here to close the current window"
 #~ msgstr "Pulse aquÃ para cerrar la ventana actual"
 
@@ -21953,9 +22012,6 @@ msgstr "MÃtodos de entrada"
 #~ msgid "Read items marked _private"
 #~ msgstr "Leer elementos marcados como _privados"
 
-#~ msgid "Reminder Notes"
-#~ msgstr "Notas de recuerdo"
-
 #~ msgid "Subscribe to my _alarms"
 #~ msgstr "Suscribirse a _mis alertas"
 
@@ -22107,8 +22163,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"
@@ -22135,8 +22191,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"
@@ -23484,7 +23540,8 @@ 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Â"
@@ -24471,8 +24528,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 "
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]