[evolution] Updated Galician translations



commit 88db20f3e9ff38296c031671de963ae665fd8143
Author: Fran DiÃguez <fran dieguez mabishu com>
Date:   Sun Jun 24 22:41:13 2012 +0200

    Updated Galician translations

 po/gl.po | 3876 ++++++++++++++++++++++++++++----------------------------------
 1 files changed, 1732 insertions(+), 2144 deletions(-)
---
diff --git a/po/gl.po b/po/gl.po
index b550d8c..f10a572 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -18,13 +18,13 @@
 # Fran DiÃguez <frandieguez gnome org>, 2009, 2010, 2011.
 # Fran Dieguez <frandieguez gnome org>, 2010, 2011, 2012.
 #
-#: ../shell/main.c:573
+#: ../shell/main.c:568
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-master-po-gl-53747.merged\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-08 19:56+0200\n"
-"PO-Revision-Date: 2012-06-08 20:01+0200\n"
+"POT-Creation-Date: 2012-06-24 22:35+0200\n"
+"PO-Revision-Date: 2012-06-24 22:41+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez gnome org>\n"
 "Language-Team: Galician <gnome-l10n-gl gnome org>\n"
 "Language: gl\n"
@@ -32,7 +32,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: Gtranslator 2.91.4\n"
+"X-Generator: Gtranslator 2.91.5\n"
 
 #: ../addressbook/addressbook.error.xml.h:1
 msgid "This address book could not be opened."
@@ -193,7 +193,7 @@ msgstr ""
 "unha tarxeta nova co mesmo enderezo?"
 
 #: ../addressbook/addressbook.error.xml.h:33
-#: ../mail/em-vfolder-editor-rule.c:339 ../widgets/table/e-table-config.ui.h:6
+#: ../mail/em-vfolder-editor-rule.c:340 ../widgets/table/e-table-config.ui.h:6
 msgid "_Add"
 msgstr "Eng_adir"
 
@@ -443,7 +443,7 @@ msgstr "_Aniversario:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:712
-#: ../calendar/gui/e-calendar-view.c:2147
+#: ../calendar/gui/e-calendar-view.c:2150
 msgid "Anniversary"
 msgstr "Aniversario"
 
@@ -454,8 +454,8 @@ msgstr "Aniversario"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:711
-#: ../calendar/gui/e-calendar-view.c:2146 ../capplet/anjal-settings-main.c:83
-#: ../shell/main.c:133
+#: ../calendar/gui/e-calendar-view.c:2149 ../capplet/anjal-settings-main.c:83
+#: ../shell/main.c:131
 msgid "Birthday"
 msgstr "Aniversario"
 
@@ -513,7 +513,7 @@ msgstr "Traballo"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:195
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:73
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:391
-#: ../calendar/gui/e-cal-model.c:3536
+#: ../calendar/gui/e-cal-model.c:3566
 msgid "Other"
 msgstr "Outros"
 
@@ -866,7 +866,7 @@ msgid "Send a mail message to this address"
 msgstr "Enviar unha mensaxe a este enderezo"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:307
-#: ../widgets/misc/e-web-view.c:1089 ../widgets/misc/e-web-view-gtkhtml.c:974
+#: ../widgets/misc/e-web-view.c:1086 ../widgets/misc/e-web-view-gtkhtml.c:974
 #, c-format
 msgid "Click to mail %s"
 msgstr "Prema para enviar un correo a %s"
@@ -918,7 +918,7 @@ msgstr "Videoconferencia"
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:679
 #: ../modules/calendar/e-cal-shell-view-actions.c:216
 #: ../modules/calendar/e-cal-shell-view-actions.c:245
-#: ../modules/calendar/e-cal-shell-view.c:621
+#: ../modules/calendar/e-cal-shell-view.c:626
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
 #: ../widgets/misc/e-send-options.c:546
 msgid "Calendar"
@@ -1362,19 +1362,6 @@ msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "o cartafol das axendas de enderezos actual %s ten %d tarxeta"
 msgstr[1] "o cartafol das axendas de enderezos actual %s ten %d tarxetas"
 
-#: ../addressbook/gui/widgets/e-book-source-config.c:98
-msgid "Mark as default address book"
-msgstr "Marcar como axenda de enderezos predefinida"
-
-#: ../addressbook/gui/widgets/e-book-source-config.c:103
-msgid "Autocomplete with this address book"
-msgstr "Completar automaticamente con esta axenda de enderezos"
-
-#: ../addressbook/gui/widgets/e-book-source-config.c:244
-msgid "Copy book content locally for offline operation"
-msgstr ""
-"Copiar o contido da axenda de enderezos localmente para operar sen conexiÃn"
-
 #: ../addressbook/gui/widgets/e-minicard.c:97
 msgid "Work Email"
 msgstr "Correo electrÃnico do traballo"
@@ -1384,7 +1371,7 @@ msgid "Home Email"
 msgstr "Correo electrÃnico particular"
 
 #: ../addressbook/gui/widgets/e-minicard.c:99
-#: ../addressbook/gui/widgets/e-minicard.c:794
+#: ../addressbook/gui/widgets/e-minicard.c:793
 msgid "Other Email"
 msgstr "Outro correo electrÃnico"
 
@@ -1640,6 +1627,7 @@ msgstr "horas"
 #: ../calendar/alarm-notify/alarm-notify.ui.h:7
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
 #: ../calendar/gui/dialogs/event-page.ui.h:19 ../filter/filter.ui.h:6
+#: ../mail/e-mail-config-provider-page.c:541
 #: ../modules/addressbook/ldap-config.ui.h:29
 #: ../widgets/misc/e-interval-chooser.c:139
 msgid "minutes"
@@ -2289,7 +2277,7 @@ msgstr "Participante"
 
 #: ../calendar/gui/caltypes.xml.h:14
 #: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
-#: ../plugins/publish-calendar/publish-calendar.c:855
+#: ../plugins/publish-calendar/publish-calendar.c:872
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
 #: ../plugins/save-calendar/csv-format.c:386
 msgid "Location"
@@ -2301,9 +2289,9 @@ msgid "Category"
 msgstr "CategorÃa"
 
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:53
 #: ../em-format/e-mail-formatter-print-headers.c:198
-#: ../em-format/e-mail-formatter-print.c:53 ../mail/em-filter-i18n.h:5
+#: ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "Anexos"
 
@@ -2571,19 +2559,19 @@ msgstr "Desexa gardar o elemento orixinal?"
 msgid "Close the current window"
 msgstr "Pechar a xanela actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1160 ../mail/e-mail-browser.c:138
+#: ../calendar/gui/dialogs/comp-editor.c:1160 ../mail/e-mail-browser.c:136
 #: ../shell/e-shell-window-actions.c:1446
 #: ../widgets/misc/e-focus-tracker.c:121 ../widgets/misc/e-focus-tracker.c:558
-#: ../widgets/misc/e-web-view.c:328 ../widgets/misc/e-web-view.c:1407
+#: ../widgets/misc/e-web-view.c:328 ../widgets/misc/e-web-view.c:1412
 #: ../widgets/misc/e-web-view-gtkhtml.c:457
 #: ../widgets/misc/e-web-view-gtkhtml.c:1300
 msgid "Copy the selection"
 msgstr "Copiar a selecciÃn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1167 ../mail/e-mail-browser.c:145
+#: ../calendar/gui/dialogs/comp-editor.c:1167 ../mail/e-mail-browser.c:143
 #: ../shell/e-shell-window-actions.c:1453
 #: ../widgets/misc/e-focus-tracker.c:114 ../widgets/misc/e-focus-tracker.c:553
-#: ../widgets/misc/e-web-view.c:1401 ../widgets/misc/e-web-view-gtkhtml.c:1294
+#: ../widgets/misc/e-web-view.c:1406 ../widgets/misc/e-web-view-gtkhtml.c:1294
 msgid "Cut the selection"
 msgstr "Cortar a selecciÃn"
 
@@ -2597,10 +2585,10 @@ msgstr "Eliminar a selecciÃn"
 msgid "View help"
 msgstr "Ver a axuda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1188 ../mail/e-mail-browser.c:152
+#: ../calendar/gui/dialogs/comp-editor.c:1188 ../mail/e-mail-browser.c:150
 #: ../shell/e-shell-window-actions.c:1481
 #: ../widgets/misc/e-focus-tracker.c:128 ../widgets/misc/e-focus-tracker.c:563
-#: ../widgets/misc/e-web-view.c:1413 ../widgets/misc/e-web-view-gtkhtml.c:1306
+#: ../widgets/misc/e-web-view.c:1418 ../widgets/misc/e-web-view-gtkhtml.c:1306
 msgid "Paste the clipboard"
 msgstr "Pegar o contido do portapapeis"
 
@@ -2616,7 +2604,7 @@ msgstr "Gardar e pechar"
 msgid "Save current changes and close editor"
 msgstr "Gardar os cambios actuais e pechar o editor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1223 ../mail/e-mail-browser.c:159
+#: ../calendar/gui/dialogs/comp-editor.c:1223 ../mail/e-mail-browser.c:157
 #: ../shell/e-shell-window-actions.c:1558
 #: ../widgets/misc/e-focus-tracker.c:142 ../widgets/misc/e-focus-tracker.c:573
 msgid "Select all text"
@@ -2628,14 +2616,14 @@ msgstr "_ClasificaciÃn"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1237
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../filter/filter.ui.h:16
-#: ../mail/e-mail-browser.c:173
+#: ../mail/e-mail-browser.c:171
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
 #: ../shell/e-shell-window-actions.c:1586
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1244 ../mail/e-mail-browser.c:166
+#: ../calendar/gui/dialogs/comp-editor.c:1244 ../mail/e-mail-browser.c:164
 #: ../shell/e-shell-window-actions.c:1593
 #: ../widgets/misc/e-mail-signature-editor.c:299
 msgid "_File"
@@ -2655,7 +2643,7 @@ msgstr "_Inserir"
 msgid "_Options"
 msgstr "_OpciÃns"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1272 ../mail/e-mail-browser.c:180
+#: ../calendar/gui/dialogs/comp-editor.c:1272 ../mail/e-mail-browser.c:178
 #: ../shell/e-shell-window-actions.c:1635 ../smime/gui/smime-ui.ui.h:28
 msgid "_View"
 msgstr "_Vista"
@@ -2748,24 +2736,24 @@ msgstr "Alterna a vista do campo de tipo de participante"
 msgid "Attach"
 msgstr "Anexar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2456
-#: ../calendar/gui/dialogs/comp-editor.c:2619
-#: ../calendar/gui/dialogs/comp-editor.c:3617
+#: ../calendar/gui/dialogs/comp-editor.c:2459
+#: ../calendar/gui/dialogs/comp-editor.c:2643
+#: ../calendar/gui/dialogs/comp-editor.c:3647
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "As modificaciÃns realizadas neste elemento pÃdense rexeitar se chega unha "
 "actualizaciÃn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3581
+#: ../calendar/gui/dialogs/comp-editor.c:3611
 #: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:115
 msgid "attachment"
 msgstr "anexo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3649
+#: ../calendar/gui/dialogs/comp-editor.c:3679
 msgid "Unable to use current version!"
 msgstr "Non à posÃbel usar a versiÃn actual!"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:438
+#: ../calendar/gui/dialogs/comp-editor-page.c:441
 #, c-format
 msgid "Validation error: %s"
 msgstr "Erro de validaciÃn: %s"
@@ -3215,9 +3203,9 @@ msgid "Unknown error"
 msgstr "Erro descoÃecido"
 
 #: ../calendar/gui/dialogs/memo-page.c:1173
+#: ../em-format/e-mail-formatter.c:1364
 #: ../em-format/e-mail-formatter-utils.c:180
-#: ../em-format/e-mail-formatter-utils.c:203
-#: ../em-format/e-mail-formatter.c:1342 ../mail/em-filter-i18n.h:77
+#: ../em-format/e-mail-formatter-utils.c:203 ../mail/em-filter-i18n.h:77
 #: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:69
 msgid "To"
 msgstr "Para"
@@ -3603,7 +3591,7 @@ msgstr "Cancelada"
 #. * Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:17
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:3590
+#: ../calendar/gui/e-cal-model.c:3620
 #: ../calendar/gui/e-meeting-list-view.c:684
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:74
@@ -3810,7 +3798,7 @@ msgstr "%A, %d de %b de %Y"
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:202 ../calendar/gui/e-day-view.c:1854
+#: ../calendar/gui/ea-gnome-calendar.c:202 ../calendar/gui/e-day-view.c:1852
 #: ../calendar/gui/e-day-view-top-item.c:835
 #: ../calendar/gui/e-week-view-main-item.c:231
 #: ../modules/calendar/e-cal-shell-view-private.c:1090
@@ -3842,7 +3830,7 @@ msgstr "%d de %b de %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:232 ../calendar/gui/e-day-view.c:1870
+#: ../calendar/gui/ea-gnome-calendar.c:232 ../calendar/gui/e-day-view.c:1868
 #: ../calendar/gui/e-day-view-top-item.c:839
 #: ../calendar/gui/e-week-view-main-item.c:245
 #: ../modules/calendar/e-cal-shell-view-private.c:1126
@@ -3987,7 +3975,7 @@ msgid "Priority:"
 msgstr "Prioridade:"
 
 #: ../calendar/gui/e-cal-component-preview.c:336
-#: ../mail/e-mail-config-service-page.c:713
+#: ../mail/e-mail-config-service-page.c:720
 msgid "Description:"
 msgstr "DescriciÃn:"
 
@@ -4077,7 +4065,7 @@ msgstr "Actualizando os obxectos"
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1989 ../calendar/gui/e-memo-table.c:553
+#: ../calendar/gui/e-calendar-view.c:1992 ../calendar/gui/e-memo-table.c:553
 #: ../calendar/gui/e-task-table.c:825
 #, c-format
 msgid "Organizer: %s <%s>"
@@ -4086,20 +4074,20 @@ msgstr "Organizador: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:1993 ../calendar/gui/e-memo-table.c:558
+#: ../calendar/gui/e-calendar-view.c:1996 ../calendar/gui/e-memo-table.c:558
 #: ../calendar/gui/e-task-table.c:829
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizador: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2009 ../calendar/gui/print.c:3360
+#: ../calendar/gui/e-calendar-view.c:2012 ../calendar/gui/print.c:3360
 #, c-format
 msgid "Location: %s"
 msgstr "LocalizaciÃn: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2040
+#: ../calendar/gui/e-calendar-view.c:2043
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
@@ -4135,7 +4123,7 @@ msgstr "Asignada"
 #: ../calendar/gui/e-cal-model.c:1663 ../calendar/gui/e-cal-model-tasks.c:1145
 #: ../calendar/gui/e-meeting-list-view.c:210
 #: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:191
-#: ../calendar/gui/e-meeting-store.c:1057
+#: ../calendar/gui/e-meeting-store.c:1075
 msgid "Yes"
 msgstr "Si"
 
@@ -4145,40 +4133,40 @@ msgstr "Si"
 msgid "No"
 msgstr "Non"
 
-#: ../calendar/gui/e-cal-model.c:3086
+#: ../calendar/gui/e-cal-model.c:3116
 #, c-format
 msgid "Opening %s"
 msgstr "Abrindo %s"
 
-#: ../calendar/gui/e-cal-model.c:3531
+#: ../calendar/gui/e-cal-model.c:3561
 #: ../calendar/gui/e-meeting-list-view.c:222
 #: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
 #: ../modules/itip-formatter/itip-view.c:5925
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: ../calendar/gui/e-cal-model.c:3532
+#: ../calendar/gui/e-cal-model.c:3562
 #: ../calendar/gui/e-meeting-list-view.c:223
 #: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
 #: ../modules/itip-formatter/itip-view.c:5931
 msgid "Declined"
 msgstr "Rexeitado"
 
-#: ../calendar/gui/e-cal-model.c:3533
+#: ../calendar/gui/e-cal-model.c:3563
 #: ../calendar/gui/e-meeting-list-view.c:224
 #: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
 #: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "Tentative"
 msgstr "Provisional"
 
-#: ../calendar/gui/e-cal-model.c:3534
+#: ../calendar/gui/e-cal-model.c:3564
 #: ../calendar/gui/e-meeting-list-view.c:225
 #: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
 #: ../modules/itip-formatter/itip-view.c:5934
 msgid "Delegated"
 msgstr "Delegado"
 
-#: ../calendar/gui/e-cal-model.c:3535
+#: ../calendar/gui/e-cal-model.c:3565
 msgid "Needs action"
 msgstr "Necesita unha acciÃn"
 
@@ -4208,39 +4196,6 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "NingÃn"
 
-#: ../calendar/gui/e-cal-source-config.c:170
-msgid "Mark as default calendar"
-msgstr "Marcar como calendario predefinido"
-
-#: ../calendar/gui/e-cal-source-config.c:173
-msgid "Mark as default task list"
-msgstr "Marcar como lista de tarefas predefinida"
-
-#: ../calendar/gui/e-cal-source-config.c:176
-msgid "Mark as default memo list"
-msgstr "Marcar como a lista de notas predefinida"
-
-#: ../calendar/gui/e-cal-source-config.c:201
-msgid "Color:"
-msgstr "Cor:"
-
-#: ../calendar/gui/e-cal-source-config.c:373
-msgid "Copy calendar contents locally for offline operation"
-msgstr ""
-"Copiar localmente os contidos do calendario para unha operaciÃn sen conexiÃn"
-
-#: ../calendar/gui/e-cal-source-config.c:377
-msgid "Copy task list contents locally for offline operation"
-msgstr ""
-"Copiar localmente os contidos da lista de tarefas para unha operaciÃn sen "
-"conexiÃn"
-
-#: ../calendar/gui/e-cal-source-config.c:381
-msgid "Copy memo list contents locally for offline operation"
-msgstr ""
-"Copiar localmente os contidos da lista de notas para unha operaciÃn sen "
-"conexiÃn"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: ../calendar/gui/e-cell-date-edit-text.c:162
 msgid "%a %m/%d/%Y %H:%M:%S"
@@ -4280,13 +4235,13 @@ msgstr "pm"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../calendar/gui/e-day-view.c:1837 ../calendar/gui/e-day-view-top-item.c:831
+#: ../calendar/gui/e-day-view.c:1835 ../calendar/gui/e-day-view-top-item.c:831
 #: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1979
 msgid "%A %d %B"
 msgstr "%A %d de %B"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2672
+#: ../calendar/gui/e-day-view.c:2670
 #, c-format
 msgid "Week %d"
 msgstr "Semana %d"
@@ -4339,7 +4294,7 @@ msgstr "Recursos"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
-#: ../calendar/gui/e-meeting-store.c:1051 ../calendar/gui/print.c:1155
+#: ../calendar/gui/e-meeting-store.c:1069 ../calendar/gui/print.c:1155
 msgid "Individual"
 msgstr "Individual"
 
@@ -4369,7 +4324,7 @@ msgstr "Presidente"
 
 #: ../calendar/gui/e-meeting-list-view.c:197
 #: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
-#: ../calendar/gui/e-meeting-store.c:1054 ../calendar/gui/print.c:1173
+#: ../calendar/gui/e-meeting-store.c:1072 ../calendar/gui/print.c:1173
 msgid "Required Participant"
 msgstr "Participante necesario"
 
@@ -4387,7 +4342,7 @@ msgstr "Non-participante"
 
 #: ../calendar/gui/e-meeting-list-view.c:221
 #: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
-#: ../calendar/gui/e-meeting-store.c:1064
+#: ../calendar/gui/e-meeting-store.c:1082
 msgid "Needs Action"
 msgstr "Necesita unha acciÃn"
 
@@ -4406,20 +4361,20 @@ msgstr "RSVP"
 msgid "In Process"
 msgstr "En progreso"
 
-#: ../calendar/gui/e-meeting-store.c:1888
+#: ../calendar/gui/e-meeting-store.c:1906
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr ""
 "Introducir o contrasinal para acceder à informaciÃn de dispoÃibilidade no "
 "servidor %s como usuario %s"
 
-#: ../calendar/gui/e-meeting-store.c:1898
+#: ../calendar/gui/e-meeting-store.c:1916
 #, c-format
 msgid "Failure reason: %s"
 msgstr "RazÃn do fallo: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1903
-#: ../plugins/publish-calendar/publish-calendar.c:333
+#: ../calendar/gui/e-meeting-store.c:1921
+#: ../plugins/publish-calendar/publish-calendar.c:335
 #: ../smime/gui/component.c:54
 msgid "Enter password"
 msgstr "Introduza o contrasinal"
@@ -4512,7 +4467,7 @@ msgstr "Idioma"
 #: ../modules/calendar/e-cal-shell-content.c:476
 #: ../modules/calendar/e-memo-shell-view-actions.c:232
 #: ../modules/calendar/e-memo-shell-view-actions.c:247
-#: ../modules/calendar/e-memo-shell-view.c:296
+#: ../modules/calendar/e-memo-shell-view.c:301
 msgid "Memos"
 msgstr "Notas"
 
@@ -4571,7 +4526,7 @@ msgstr "%d%%"
 #: ../modules/calendar/e-cal-shell-content.c:437
 #: ../modules/calendar/e-task-shell-view-actions.c:255
 #: ../modules/calendar/e-task-shell-view-actions.c:270
-#: ../modules/calendar/e-task-shell-view.c:451
+#: ../modules/calendar/e-task-shell-view.c:456
 msgid "Tasks"
 msgstr "Tarefas"
 
@@ -4608,7 +4563,7 @@ msgstr "Seleccionar un fuso horario"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2303
+#: ../calendar/gui/gnome-cal.c:2315
 msgid "Purging"
 msgstr "Purgando"
 
@@ -6769,7 +6724,7 @@ msgid "Personal details:"
 msgstr "InformaciÃn persoal:"
 
 #: ../capplet/settings/mail-account-view.c:476
-#: ../widgets/misc/e-source-config.c:478
+#: ../widgets/misc/e-source-config.c:681 ../widgets/misc/e-source-config.c:685
 msgid "Name:"
 msgstr "Nome:"
 
@@ -6782,7 +6737,7 @@ msgid "Details:"
 msgstr "InformaciÃn:"
 
 #: ../capplet/settings/mail-account-view.c:503
-#: ../mail/e-mail-config-summary-page.c:444
+#: ../mail/e-mail-config-summary-page.c:409
 msgid "Receiving"
 msgstr "Recibindo"
 
@@ -6795,7 +6750,7 @@ msgid "Server address:"
 msgstr "Endrezo do servidor:"
 
 #: ../capplet/settings/mail-account-view.c:528
-#: ../mail/e-mail-config-summary-page.c:510
+#: ../mail/e-mail-config-summary-page.c:475
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
 msgid "Username:"
 msgstr "Nome do usuario:"
@@ -6805,7 +6760,7 @@ msgid "Use encryption:"
 msgstr "Usar cifrado:"
 
 #: ../capplet/settings/mail-account-view.c:570
-#: ../mail/e-mail-config-summary-page.c:456
+#: ../mail/e-mail-config-summary-page.c:421
 msgid "Sending"
 msgstr "Enviando"
 
@@ -7245,13 +7200,13 @@ msgstr ""
 msgid "Compose Message"
 msgstr "Escribir unha mensaxe"
 
-#: ../composer/e-msg-composer.c:4167
+#: ../composer/e-msg-composer.c:4182
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "O editor contÃn un corpo de mensaxe sen texto, polo que non à posÃbel a "
 "ediciÃn."
 
-#: ../composer/e-msg-composer.c:4839
+#: ../composer/e-msg-composer.c:4854
 msgid "Untitled Message"
 msgstr "Mensaxe sen tÃtulo"
 
@@ -7421,7 +7376,7 @@ msgstr "Notificador de alarmas do Evolution"
 msgid "Calendar event notifications"
 msgstr "NotificaciÃns de actividades do calendario"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:940
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:938
 #: ../modules/mailto-handler/evolution-mailto-handler.c:215
 #: ../shell/e-shell-window-private.c:243
 msgid "Evolution"
@@ -7448,7 +7403,6 @@ msgid "Configure email accounts"
 msgstr "Configurar as contas de correo"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:21
 msgid "Enable address formatting"
 msgstr "Activar formatado de enderezos"
 
@@ -7461,12 +7415,10 @@ msgstr ""
 "destino"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:3
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
 msgid "Autocomplete length"
 msgstr "Lonxitude do completado automÃtico"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:4
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
@@ -7475,12 +7427,10 @@ msgstr ""
 "completar automaticamente."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:5
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
 msgid "Show autocompleted name with an address"
 msgstr "Mostrar o nome completado automaticamente co enderezo"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:6
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
 msgid ""
 "Whether force showing the mail address with the name of the autocompleted "
 "contact in the entry."
@@ -7489,24 +7439,20 @@ msgstr ""
 "completado automaticamente na entrada."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:7
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 "O URI para o cartafol usado por Ãltima vez no diÃlogo de selecciÃn de nomes"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:8
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog."
 msgstr ""
 "O URI para o cartafol usado por Ãltima vez no diÃlogo de selecciÃn de nomes."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:9
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
 msgid "Contact layout style"
 msgstr "Estilo da disposiciÃn dos contactos"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:10
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the contact list. \"0\" (Classic View) places the preview pane below the "
@@ -7519,31 +7465,26 @@ msgstr ""
 "vista previa ao lado da lista de contactos."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:11
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
 msgid "Contact preview pane position (horizontal)"
 msgstr "PosiciÃn do panel de vista previa de contactos (horizontal)"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:12
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
 msgid "Position of the contact preview pane when oriented horizontally."
 msgstr ""
 "PosiciÃn do panel de vista previa de contactos cando se dispoÃa "
 "horizontalmente."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:13
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
 msgid "Contact preview pane position (vertical)"
 msgstr "PosiciÃn do panel de vista previa de contactos (vertical)"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:14
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid "Position of the contact preview pane when oriented vertically."
 msgstr ""
 "PosiciÃn do panel de vista previa de contactos cando se dispoÃa "
 "verticalmente."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:15
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
 msgid "Show maps"
 msgstr "Mostrar mapas"
 
@@ -7552,7 +7493,6 @@ msgid "Whether to show maps in preview pane"
 msgstr "Indica se se mostran os mapas no panel de vista previa"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:17
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
 msgid "Primary address book"
 msgstr "Axenda de enderezos primaria"
 
@@ -7565,22 +7505,18 @@ msgstr ""
 "da vista de ÂContactosÂ"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:19
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
 msgid "Show preview pane"
 msgstr "Mostrar o panel de vista previa"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:20
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
 msgid "Whether to show the preview pane."
 msgstr "Indica se mostrar o panel de vista previa."
 
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
-#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:1
 msgid "Convert mail messages to Unicode"
 msgstr "Converter as mensaxes de correo a Unicode"
 
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:2
-#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:2
 msgid ""
 "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
 "different character sets."
@@ -7589,17 +7525,14 @@ msgstr ""
 "ham que veÃen de diferentes conxuntos de caracteres."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
 msgid "Save directory for reminder audio"
 msgstr "Cartafol onde gardar o son dos recordatorios"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:2
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:124
 msgid "Directory for saving reminder audio files"
 msgstr "Cartafol onde gardar ficheiros de son para os recordatorios"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:3
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:103
 msgid "Birthday and anniversary reminder value"
 msgstr "Valor de aviso de aniversarios"
 
@@ -7610,7 +7543,6 @@ msgstr ""
 "aniversario"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:5
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
 msgid "Birthday and anniversary reminder units"
 msgstr "Unidades de aviso de aniversarios"
 
@@ -7621,7 +7553,6 @@ msgid ""
 msgstr "Unidades para os avisos de aniversario, ÂminutosÂ, Âhoras ou ÂdÃasÂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:7
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
 msgid "Compress weekends in month view"
 msgstr "Comprimir as fins de semana na vista mensual"
 
@@ -7634,7 +7565,6 @@ msgstr ""
 "e o domingo no mesmo espazo que un dÃa laborÃbel"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:9
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
 msgid "Ask for confirmation when deleting items"
 msgstr "Pedir confirmaciÃn antes de eliminar elementos"
 
@@ -7643,7 +7573,6 @@ msgid "Whether to ask for confirmation when deleting an appointment or task"
 msgstr "Indica se se solicita confirmaciÃn ao eliminar unha cita ou tarefa"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:11
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
 msgid "Confirm expunge"
 msgstr "Confirmar a expurgaciÃn"
 
@@ -7653,7 +7582,6 @@ msgstr ""
 "Indica se se solicita a confirmaciÃn antes de expurgar as citas ou as tarefas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:13
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
 msgid "Month view vertical pane position"
 msgstr "PosiciÃn do panel vertical na vista mensual"
 
@@ -7666,7 +7594,6 @@ msgstr ""
 "datas do calendario"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:15
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
 msgid "Workday end hour"
 msgstr "Hora de finalizaciÃn da xornada laboral"
 
@@ -7676,39 +7603,32 @@ msgstr ""
 "Hora do fin da xornada laboral, en formato de vinte e catro horas, de 0 a 23"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:17
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
 msgid "Workday end minute"
 msgstr "Minuto de finalizaciÃn da xornada laboral"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:18
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minuto de finalizaciÃn da xornada laboral, de 0 a 59."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:19
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
 msgid "Workday start hour"
 msgstr "Hora de inicio da xornada laboral"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:20
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr ""
 "Hora do inicio da xornada laboral, en formato de vinte e catro horas, de 0 a "
 "23."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:21
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
 msgid "Workday start minute"
 msgstr "Minuto de inicio da xornada laboral"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:22
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minuto de inicio da xornada laboral, de 0 a 59."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:23
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
 msgid "The second timezone for a Day View"
 msgstr "O fuso horario secundario para unha vista diaria"
 
@@ -7721,7 +7641,6 @@ msgstr ""
 "estabelecido. O valor à semellante ao usado na chave ÂtimezoneÂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
 msgid "Recently used second time zones in a Day View"
 msgstr "Fusos horarios secundarios usados recentemente nunha vista diaria"
 
@@ -7744,7 +7663,6 @@ msgstr ""
 "lista 'day-second-zones'"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
 msgid "Default reminder value"
 msgstr "Valor predeterminado para o aviso"
 
@@ -7753,7 +7671,6 @@ msgid "Number of units for determining a default reminder"
 msgstr "NÃmero de unidades para determinar un aviso predeterminado"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
 msgid "Default reminder units"
 msgstr "Unidades predeterminadas para o aviso"
 
@@ -7763,75 +7680,62 @@ msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
 msgstr "Unidades para un aviso predeterminado:  ÂminutosÂ, Âhoras ou ÂdÃasÂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Mostrar o campo categorÃas no editor de actividades/reuniÃns/tarefas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr ""
 "Indica se se mostra o campo de categorÃas no editor de actividades/reuniÃns"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Mostrar o campo ÂFunciÃn no editor de actividades/tarefas/reuniÃns"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr ""
 "Indica se se mostra o campo de funciÃn no editor de actividades/tarefas/"
 "reuniÃns"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Mostrar o campo RSVP no editor de actividades/tarefas/reuniÃns"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Indica se se mostra o campo RSVP no editor de actividades/tarefas/reuniÃns"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Mostrar o campo de estado no editor de actividades/tarefas/reuniÃns"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr ""
 "Indica se se mostra o campo de estado no editor de actividades/tarefas/"
 "reuniÃns"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Mostrar o campo do fuso horario no editor de actividades/reuniÃns"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr ""
 "Indica se se mostra o campo de fuso horario no editor de actividades/reuniÃns"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Mostrar o campo de tipo no editor de actividades/tarefas/reuniÃns"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr ""
 "Indica se se mostra o campo de tipo no editor de actividades/tarefas/reuniÃns"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:81
 msgid "Hide completed tasks"
 msgstr "Ocultar as tarefas terminadas"
 
@@ -7840,7 +7744,6 @@ msgid "Whether to hide completed tasks in the tasks view"
 msgstr "Indica se se ocultan as tarefas terminadas na vista de tarefas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:47
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:83
 msgid "Hide task units"
 msgstr "Ocultar as unidades da tarefa"
 
@@ -7853,7 +7756,6 @@ msgstr ""
 "ÂdÃasÂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
 msgid "Hide task value"
 msgstr "Ocultar o valor da tarefa"
 
@@ -7862,7 +7764,6 @@ msgid "Number of units for determining when to hide tasks"
 msgstr "NÃmero de unidades para determinar cando ocultar as tarefas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
 msgid "Horizontal pane position"
 msgstr "PosiciÃn do panel horizontal"
 
@@ -7875,7 +7776,6 @@ msgstr ""
 "lista de tarefas cando non està na vista mensual, en pÃxeles"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
 msgid "Last reminder time"
 msgstr "Hora do Ãltimo recordatorio"
 
@@ -7884,7 +7784,6 @@ msgid "Time the last reminder ran, in time_t"
 msgstr "A hora na que se executou o Ãltimo recordatorio, en time_t"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Cor da liÃa de Marcus Bains - Vista de dÃa"
 
@@ -7893,7 +7792,6 @@ msgid "Color to draw the Marcus Bains line in the Day View"
 msgstr "Cor para debuxar a liÃa de Marcus Bains na vista diaria"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:73
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Cor da liÃa de Marcus Bains - Barra de tempo"
 
@@ -7904,7 +7802,6 @@ msgstr ""
 "predeterminada)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:69
 msgid "Marcus Bains Line"
 msgstr "LiÃa de Marcus Bains"
 
@@ -7915,7 +7812,6 @@ msgstr ""
 "Indica se se debuxa a liÃa Marcus Bains (liÃa na hora actual) no calendario"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
 msgid "Memo preview pane position (horizontal)"
 msgstr "PosiciÃn do panel de vista previa de notas (horizontal)"
 
@@ -7926,7 +7822,6 @@ msgstr ""
 "horizontalmente"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
 msgid "Memo layout style"
 msgstr "Estilo da disposiciÃn das notas"
 
@@ -7942,7 +7837,6 @@ msgstr ""
 "vista previa ao lado da lista de notas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
 msgid "Memo preview pane position (vertical)"
 msgstr "PosiciÃn do panel de vista previa de notas (vertical)"
 
@@ -7952,7 +7846,6 @@ msgstr ""
 "PosiciÃn do panel de vista previa de notas cando està orientado verticalmente"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
 msgid "Month view horizontal pane position"
 msgstr "PosiciÃn do panel horizontal da vista mensual"
 
@@ -7973,7 +7866,6 @@ msgid "Whether to scroll a Month View by a week, not by a month"
 msgstr "Indica se se despraza a vista mensual por semana e non por mes"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
 msgid "Reminder programs"
 msgstr "Programas de recordatorio"
 
@@ -7982,7 +7874,6 @@ msgid "Programs that are allowed to be run by reminders"
 msgstr "Programas que se poden executar desde os recordatorios"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
 msgid "Show display reminders in notification tray"
 msgstr "Mostrar o visualizador de recordatorios na bandexa de notificaciÃn"
 
@@ -8001,7 +7892,6 @@ msgid "Name of the preferred New toolbar button item"
 msgstr "Nome do botÃn ÂNovo da barra de ferramentas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
 msgid "Primary calendar"
 msgstr "Calendario principal"
 
@@ -8014,7 +7904,6 @@ msgstr ""
 "ÂCalendariosÂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
 msgid "Primary memo list"
 msgstr "Lista de notas principal"
 
@@ -8027,7 +7916,6 @@ msgstr ""
 "ÂNotasÂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
 msgid "Primary task list"
 msgstr "Lista de tarefas principal"
 
@@ -8040,7 +7928,6 @@ msgstr ""
 "de ÂTarefasÂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
 msgid "Free/busy template URL"
 msgstr "URL do modelo de dispoÃibilidade"
 
@@ -8055,7 +7942,6 @@ msgstr ""
 "polo dominio"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:75
 msgid "Recurrent Events in Italic"
 msgstr "Actividades con repeticiÃn en cursiva"
 
@@ -8080,7 +7966,6 @@ msgstr ""
 "predeterminado son 10 anos"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
 msgid "Show appointment end times in week and month views"
 msgstr "Mostrar as horas finais das citas nas vista semanal e mensual"
 
@@ -8091,7 +7976,6 @@ msgstr ""
 "semanais e mensuais"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
 msgid "Show the memo preview pane"
 msgstr "Mostrar o panel de vista previa de notas"
 
@@ -8102,7 +7986,6 @@ msgstr ""
 "principal"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
 msgid "Show the task preview pane"
 msgstr "Mostrar o panel de vista previa de tarefas"
 
@@ -8113,7 +7996,6 @@ msgstr ""
 "principal"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr ""
 "Mostrar os nÃmeros das semanas na vista diaria, de semana laboral e no "
@@ -8140,7 +8022,6 @@ msgstr ""
 "overdue-color)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
 msgid "Tasks due today color"
 msgstr "Cor para as tarefas que vencen hoxe"
 
@@ -8153,12 +8034,10 @@ msgstr ""
 "xunto ao resaltado de tarefas que vencen hoxe."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
 msgid "Task preview pane position (horizontal)"
 msgstr "PosiciÃn do panel de vista previa de tarefas (horizontal)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
 msgid "Task layout style"
 msgstr "Estilo da disposiciÃn de tarefas"
 
@@ -8174,7 +8053,6 @@ msgstr ""
 "vista previa ao lado da lista de tarefas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
 msgid "Task preview pane position (vertical)"
 msgstr "PosiciÃn do panel de vista previa de tarefas (vertical)"
 
@@ -8196,7 +8074,6 @@ msgstr ""
 "color)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
 msgid "Overdue tasks color"
 msgstr "Cor para as tarefas atrasadas"
 
@@ -8209,7 +8086,6 @@ msgstr ""
 "xunto ao realzado de tarefas fÃra de prazo."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
 msgid "Time divisions"
 msgstr "DivisiÃns horarias"
 
@@ -8220,7 +8096,6 @@ msgstr ""
 "minutos"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
 msgid "Timezone"
 msgstr "Fuso horario"
 
@@ -8234,7 +8109,6 @@ msgstr ""
 "ex:ÂAmerica/New YorkÂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
 msgid "Twenty four hour time format"
 msgstr "Formato de hora de vinte e catro horas"
 
@@ -8245,7 +8119,6 @@ msgstr ""
 "usar am/pm"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
 msgid "Birthday and anniversary reminder"
 msgstr "Avisos de aniversarios"
 
@@ -8254,7 +8127,6 @@ msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr "Indica se se estabelece un aviso para os aniversarios"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
 msgid "Default appointment reminder"
 msgstr "Aviso de cita predeterminado"
 
@@ -8263,7 +8135,6 @@ msgid "Whether to set a default reminder for appointments"
 msgstr "Indica se se estabelece un aviso predeterminado para as citas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
 msgid "Use system timezone"
 msgstr "Usar o fuso horario do sistema"
 
@@ -8274,7 +8145,6 @@ msgstr ""
 "Evolution"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
 msgid "Week start"
 msgstr "inicio da semana"
 
@@ -8283,7 +8153,6 @@ msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)"
 msgstr "O dÃa no que comeza a semana, desde o domingo (0) ata o sÃbado (6)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
 msgid "Work days"
 msgstr "DÃas laborÃbeis"
 
@@ -8292,12 +8161,10 @@ msgid "Days on which the start and end of work hours should be indicated"
 msgstr "DÃas nos que debe indicarse o inicio e fin das horas de traballo"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:1
-#: ../shell/apps_evolution_shell.schemas.in.h:1
 msgid "Configuration version"
 msgstr "VersiÃn de configuraciÃn"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:2
-#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -8306,12 +8173,10 @@ msgstr ""
 "menor (por exemplo Â2.6.0Â)."
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:3
-#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Last upgraded configuration version"
 msgstr "Ãltima versiÃn da configuraciÃn anovada"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:4
-#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -8364,12 +8229,10 @@ msgid "Whether tasks from Gnome Calendar have been imported or not"
 msgstr "Indica se a tarefa desde GNOME Calendar foi importada ou non"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:1
-#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
 msgstr "Comprobar se o Evolution à o aplicativo de correo predeterminado"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:2
-#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
 msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
@@ -8377,17 +8240,14 @@ msgstr ""
 "predeterminado."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:3
-#: ../mail/evolution-mail.schemas.in.h:1
 msgid "Default charset in which to compose messages"
 msgstr "Conxunto de caracteres predeterminado para escribir mensaxes"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:4
-#: ../mail/evolution-mail.schemas.in.h:2
 msgid "Default charset in which to compose messages."
 msgstr "Conxunto de caracteres predeterminado para escribir mensaxes."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
-#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Path where picture gallery should search for its content"
 msgstr "Ruta onde a galerÃa de imaxes deberÃa buscar o seu contido"
 
@@ -8402,32 +8262,26 @@ msgstr ""
 "usarase tamÃn cando a ruta estabelecida non apunta a un cartafol existente."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
-#: ../mail/evolution-mail.schemas.in.h:3
 msgid "Spell check inline"
 msgstr "ComprobaciÃn ortogrÃfica en liÃa"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
-#: ../mail/evolution-mail.schemas.in.h:4
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Mostrar os erros de ortografÃa mentres se escribe."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:9
-#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Automatic link recognition"
 msgstr "RecoÃecemento automÃtico de ligazÃns"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:10
-#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Recognize links in text and replace them."
 msgstr "RecoÃecer as ligazÃns no texto e substituÃlas."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:11
-#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "RecoÃecemento automÃtico de emoticonas"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
-#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "RecoÃecer as emoticonas no texto e substituÃlas con imaxes."
 
@@ -8468,12 +8322,10 @@ msgstr ""
 "vai a mensaxe orixinal"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
-#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Group Reply replies to list"
 msgstr "A resposta ao grupo responde à lista"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
-#: ../mail/evolution-mail.schemas.in.h:10
 msgid ""
 "Instead of the normal \"Reply to All\" behaviour, this option will make the "
 "'Group Reply' toolbar button try to reply only to the mailing list through "
@@ -8486,12 +8338,10 @@ msgstr ""
 "respondendo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
-#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Put the cursor at the bottom of replies"
 msgstr "PoÃer o cursor ao fondo da resposta"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
-#: ../mail/evolution-mail.schemas.in.h:14
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
@@ -8502,58 +8352,48 @@ msgstr ""
 "mensaxe ou no final."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
-#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Always request read receipt"
 msgstr "Requirir sempre a confirmaciÃn de lectura"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
-#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
 "Indica se hai que engadir unha solicitude de confirmaciÃn de lectura de "
 "forma predeterminada."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
-#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Send HTML mail by default"
 msgstr "Enviar o correo en HTML de forma predeterminada"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
-#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Send HTML mail by default."
 msgstr "Enviar o correo en HTML de forma predeterminada."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
-#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Spell checking color"
 msgstr "Cor da comprobaciÃn ortogrÃfica"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
-#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
 "Cor de subliÃado para as palabras escritas incorrectamente cando se usa a "
 "comprobaciÃn ortogrÃfica en liÃa."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
-#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Spell checking languages"
 msgstr "Idiomas para a comprobaciÃn ortogrÃfica"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
-#: ../mail/evolution-mail.schemas.in.h:22
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 "Lista dos cÃdigos de idioma dos dicionarios usados para a comprobaciÃn "
 "ortogrÃfica."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
-#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Mostrar o campo ÂCco ao enviar unha mensaxe de correo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
-#: ../mail/evolution-mail.schemas.in.h:24
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -8562,12 +8402,10 @@ msgstr ""
 "configurar no menà ÂVista cando se selecciona unha conta de correo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
-#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Mostrar o campo ÂCc ao enviar unha mensaxe de correo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
-#: ../mail/evolution-mail.schemas.in.h:26
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -8576,12 +8414,10 @@ msgstr ""
 "configurar no menà ÂVista cando se selecciona unha conta de correo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
-#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Mostrar o campo ÂRespostar a ao enviar unha mensaxe de correo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
-#: ../mail/evolution-mail.schemas.in.h:28
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -8590,12 +8426,10 @@ msgstr ""
 "configurar no menà ÂVista cando se selecciona unha conta de correo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
-#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Mostrar o campo ÂDe ao enviar unha mensaxe a un grupo de discusiÃn"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
-#: ../mail/evolution-mail.schemas.in.h:30
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -8604,13 +8438,11 @@ msgstr ""
 "pÃdese configurar no menà ÂVista cando se selecciona unha conta de novas."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
-#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr ""
 "Mostrar o campo ÂRespostar a ao enviar unha mensaxe a un grupo de discusiÃn"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
-#: ../mail/evolution-mail.schemas.in.h:32
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -8624,7 +8456,6 @@ msgid "Digitally sign replies when the original message is signed"
 msgstr "Firmar dixitalmente respostas cando a mensaxe orixinal estea firmada"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
-#: ../mail/evolution-mail.schemas.in.h:12
 msgid ""
 "Automatically enable PGP or S/MIME signatures when replying to a message "
 "which is also PGP or S/MIME signed."
@@ -8633,12 +8464,10 @@ msgstr ""
 "firmada con PGP ou S/MIME."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
-#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Encode filenames in an Outlook/GMail way"
 msgstr "Codificar nomes de ficheiro da forma Outlook/GMail"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
-#: ../mail/evolution-mail.schemas.in.h:34
 msgid ""
 "Encode filenames in the mail headers same as Outlook or GMail do, to let "
 "them display correctly filenames with UTF-8 letters sent by Evolution, "
@@ -8651,12 +8480,10 @@ msgstr ""
 "usan un estÃndar RFC 2047 incorrecto."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
-#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Put personalized signatures at the top of replies"
 msgstr "PoÃer sinaturas personalizadas no inicio das respostas"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
-#: ../mail/evolution-mail.schemas.in.h:36
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
@@ -8667,12 +8494,10 @@ msgstr ""
 "mensaxe ou no final."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
-#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Do not add signature delimiter"
 msgstr "Non engadir un delimitador de sinatura"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
-#: ../mail/evolution-mail.schemas.in.h:38
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -8681,13 +8506,11 @@ msgstr ""
 "de sinatura antes da sinatura cando escriba un correo electrÃnico."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
-#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Ignore list Reply-To:"
 msgstr "Ignorar ÂResponder a:Â para as listas:"
 
 #
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
-#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Some mailing lists set a Reply-To: header to trick users into sending "
 "replies to the list, even when they ask Evolution to make a private reply. "
@@ -8721,12 +8544,31 @@ msgstr ""
 "estÃndar ÂReÂ. Un exemplo à ÂSV, AVÂ."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:53
+msgid "Save file format for drag-and-drop operation"
+msgstr "Gardar o formato de ficheiro para a operaciÃn de arrastrar e soltar"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+msgid "Can be either 'mbox' or 'pdf'."
+msgstr "Pode ser Âmbox ou ÂpdfÂ."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+msgid "Save name format for drag-and-drop operation"
+msgstr "Gardar o nome do formato para a operaciÃn de arrastrar e soltar"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+msgid ""
+"Can be either 2 to use current date and time or any other value for sent "
+"date of the message. This has a meaning only when dropping just one message."
+msgstr ""
+"Pode ser de 2 para usar a data e hora actuais, ou calquera outro valor para "
+"a data de envÃo da mensaxe. Isto sà ten significado cando se elimina unha "
+"Ãnica mensaxe."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
 msgid "Show image animations"
 msgstr "Mostrar as imaxes animadas"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -8734,13 +8576,11 @@ msgstr ""
 "Activar as imaxes animadas no correo HTML. Moitos usuarios atopan as imaxes "
 "animadas molestas e prefiren ver unha mensaxe estÃtica."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid "Enable or disable type ahead search feature"
 msgstr "Activar ou desactivar a caracterÃstica de busca ao teclear"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -8748,26 +8588,22 @@ msgstr ""
 "Activar a barra de busca lateral para permitir a busca interactiva de nomes "
 "de cartafoles."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr ""
 "Desactivar ou activar a abreviaciÃn dos nomes de cartafol na barra lateral"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr ""
 "Indica se hai que desactivar a funcionalidade de abreviaciÃn dos nomes dos "
 "cartafoles na barra lateral."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 msgid "Enable or disable magic space bar"
 msgstr "Activar ou desactivar a barra de espazo mÃxica"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -8775,67 +8611,55 @@ msgstr ""
 "Activar esta opciÃn para usar a barra espazadora para desprazarse pola "
 "mensaxe, na lista de mensaxes e nos cartafoles."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 "Activar o uso dos axustes de vista da lista de mensaxes similares en todos "
 "os cartafoles"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 "Activar o uso dos axustes de vista da lista de mensaxes similares en todos "
 "os cartafoles."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marcar citas textuais na ÂVista previa da mensaxe"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcar citas textuais na ÂVista previa da mensaxe"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Citation highlight color"
 msgstr "Cor de realce das citas"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Citation highlight color."
 msgstr "Cor de realce das citas."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Enable/disable caret mode"
 msgstr "Activar/desactivar o modo de cursor"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Activar o modo de cursor para poder ver un cursor ao ler un correo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Default charset in which to display messages"
 msgstr "Conxunto de caracteres predeterminado para mostrar mensaxes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "Default charset in which to display messages."
 msgstr "Conxunto de caracteres predeterminado para mostrar mensaxes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Load images for HTML messages over HTTP"
 msgstr "Cargar as imaxes das mensaxes HTML sobre HTTP"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
@@ -8845,33 +8669,27 @@ msgstr ""
 "Â0Â - Non cargar nunca as imaxes de fÃra da rede. Â1Â - Cargar as imaxes nas "
 "mensaxes dos contactos. Â2Â - Cargar sempre as imaxes de fÃra da rede."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid "Show Animations"
 msgstr "Mostrar as animaciÃns"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Show animated images as animations."
 msgstr "Mostrar as imaxes animadas como animaciÃns."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Show all message headers"
 msgstr "Mostrar todas as cabeceiras das mensaxes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Show all the headers when viewing a messages."
 msgstr "Mostrar todas as cabeceiras ao visualizar as mensaxes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista de cabeceiras personalizadas e o seu estado de activaciÃn."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -8883,35 +8701,29 @@ msgstr ""
 "estrutura XML Ã &lt;header enabled&gt; - defÃnao como activado para mostrar "
 "a cabeceira na vista do correo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Show photo of the sender"
 msgstr "Mostrar a fotografÃa do remitente"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Mostrar a fotografÃa do remitente no panel de lectura da mensaxe."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid "Search for the sender photo in local address books"
 msgstr "Buscar a fotografÃa do remitente nas axendas locais de enderezos"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid "This option would help in improving the speed of fetching."
 msgstr "Esta opciÃn poderÃa axudar a mellorar a velocidade de recepciÃn."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr ""
 "Lista dos tipos MIME para os que comprobar os visualizadores de compoÃentes "
 "do Bonobo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -8922,40 +8734,34 @@ msgstr ""
 "mapee a un visualizador de compoÃentes Bonobo na base de datos de tipos MIME "
 "do GNOME."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Mark as Seen after specified timeout"
 msgstr "Marcar como visto despois do tempo de espera indicado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcar como visto despois do tempo de espera indicado."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Timeout for marking messages as seen"
 msgstr "Tempo de espera para marcar unha mensaxe como vista"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "Tempo de espera para marcar unha mensaxe como vista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid "Sender email-address column in the message list"
 msgstr "Columna cos enderezos dos remitentes na lista de mensaxes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr ""
 "Mostrar o enderezo do remitente nunha columna separada na lista de mensaxes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view"
@@ -8963,8 +8769,7 @@ msgstr ""
 "Determina se se debe usar o mesmo tipo de letra para as liÃas ÂDe e "
 "ÂAsunto da columna ÂMensaxes na vista vertical"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -8972,21 +8777,19 @@ msgstr ""
 "Determina se se debe usar o mesmo tipo de letra para as liÃas ÂDe e "
 "ÂAsunto da columna ÂMensaxes na vista vertical."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid "Show deleted messages in the message-list"
 msgstr "Mostrar as mensaxes eliminadas na lista de mensaxes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Mostrar as mensaxes eliminadas (riscadas) na lista de mensaxes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Enable Unmatched search folder"
 msgstr "Activar o cartafol de busca non coincidente"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
@@ -8994,13 +8797,11 @@ msgstr ""
 "Activar o cartafol de busca non coincidente nos cartafoles de busca. Non fai "
 "nada se os Cartafoles de busca estÃn desactivados."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Oculta a vista previa por cartafol e elimina a selecciÃn"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 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."
@@ -9008,22 +8809,19 @@ msgstr ""
 "Esta chave sà se le unha vez e restabelÃcese como Âfalso despois de a ler. "
 "Isto deselecciona o correo da lista e elimina a vista previa de ese cartafol."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "Height of the message-list pane"
 msgstr "Altura do panel da lista de mensaxes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Height of the message-list pane."
 msgstr "Altura do panel da lista de mensaxes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "State of message headers in paned view"
 msgstr "Estado das cabeceiras da mensaxe na vista con paneis"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid ""
 "Describes whether message headers in paned view should be collapsed or "
 "expanded by default. \"0\" = expanded and \"1\" = collapsed"
@@ -9031,23 +8829,19 @@ msgstr ""
 "Describe se as cabeceiras dos mensaxes na vista con paneis se deben contraer "
 "ou expandir de maneira predeterminada. Â0Â = expandidas Â1Â = contraÃdas"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Width of the message-list pane"
 msgstr "Largura do panel da lista de mensaxes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Width of the message-list pane."
 msgstr "Largura do panel da lista de mensaxes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Layout style"
 msgstr "Estilo da disposiciÃn"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -9059,56 +8853,46 @@ msgstr ""
 "previa embaixo da lista de mensaxes. Â1Â (vista vertical) mostra o panel de "
 "vista previa ao lado da lista de mensaxes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Variable width font"
 msgstr "Tipo de letra de largura variÃbel"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "The variable width font for mail display."
 msgstr "O tipo de letra de largura variÃbel para mostrar o correo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Terminal font"
 msgstr "Tipo de letra do terminal"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "The terminal font for mail display."
 msgstr "O tipo de letra do terminal para mostrar o correo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Use custom fonts"
 msgstr "Usar tipos de letra personalizados"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Use custom fonts for displaying mail."
 msgstr "Usar tipos de letra personalizados para mostrar o correo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Abreviar a vista de enderezos en A/CC/CCO"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr ""
 "Abrevia a vista de enderezos en A/CC/CCO co nÃmero indicado en address_count."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "NÃmero de enderezos para mostrar en A/CC/CCO"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -9116,13 +8900,11 @@ msgstr ""
 "Isto define o nÃmero de enderezos que se mostra na vista da lista de "
 "mensaxes predeterminada, para os restantes mostrarase ÂâÂ."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Thread the message-list based on Subject"
 msgstr "Lista de mensaxes por conversas baseadas no asunto"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -9130,12 +8912,11 @@ msgstr ""
 "Indica se debe retroceder no agrupamento de conversas polo asunto cando as "
 "mensaxes non conteÃen cabeceiras ÂEn resposta a ou ÂReferenciasÂ."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Default value for thread expand state"
 msgstr "Valor predeterminado para o estado despregado da conversa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -9143,13 +8924,11 @@ msgstr ""
 "Esta opciÃn indica se os fÃos deben estar despregadas ou pregadas por "
 "omisiÃn. Ã necesario reiniciar o Evolution."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Indica se ordenar as conversa pola Ãltima mensaxe que aparece"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -9159,12 +8938,11 @@ msgstr ""
 "mensaxe de cada conversa en vez de pola data das mensaxes. Ã necesario "
 "reiniciar o Evolution."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Ordenar contas alfabeticamente nun Ãrbore de cartafoles"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid ""
 "Tells how to sort accounts in a folder tree used in a Mail view. When set to "
 "true accounts are sorted alphabetically, with an exception of On This "
@@ -9176,33 +8954,27 @@ msgstr ""
 "coa excepciÃn de Neste equipo y Cartafoles de busca, pola contra os "
 "cartafoles ordÃnanse pola orde dada polo usuario"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Log filter actions"
 msgstr "Rexistrar as acciÃns de filtrado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid "Log filter actions to the specified log file."
 msgstr "Rexistrar as acciÃns de filtrado no ficheiro indicado."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Logfile to log filter actions"
 msgstr "Ficheiro de rexistro para as acciÃns de filtrado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "Logfile to log filter actions."
 msgstr "Ficheiro de rexistro para as acciÃns de filtrado."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Flush Outbox after filtering"
 msgstr "Limpar a caixa de saÃda despois do filtrado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any 'Forward to' filter action and approximately "
@@ -9213,54 +8985,42 @@ msgstr ""
 "filtrado ÂReencamiÃar a e aproximadamente un minuto despois da invocaciÃn "
 "da Ãltima acciÃn."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Default forward style"
 msgstr "Estilo de reencamiÃamento predeterminado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
-#: ../mail/evolution-mail.schemas.in.h:150
-msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr "Estilo de vista da mensaxe (ÂnormalÂ, Âcabeceiras completasÂ, ÂfonteÂ)"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid "Prompt on empty subject"
 msgstr "Avisar cando o ÂAsunto estea baleiro"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Avisar ao usuario cando tente enviar unha mensaxe sen asunto."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid "Prompt when emptying the trash"
 msgstr "Avisar ao baleirar o lixo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "Avisar ao usuario cando tente baleirar o lixo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid "Prompt when user expunges"
 msgstr "Avisar cando o usuario expurgue"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Avisar ao usuario cando tente expurgar un cartafol."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr ""
 "Preguntar antes de enviar a destinatarios non inseridos como enderezos de "
 "correo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -9268,38 +9028,32 @@ msgstr ""
 "Activa/desactiva as preguntas que avisan de que està tentando enviar unha "
 "mensaxe a destinatarios non insertados como enderezos de correo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid "Prompt when user only fills Bcc"
 msgstr "Avisar cando o usuario encha sà o campo Cco"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Avisar cando o usuario tente enviar unha mensaxe sen cubrir os campos ÂPara "
 "ou ÂCCÂ."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Avisar cando o usuario tente enviar un HTML non desexado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
 "Avisar ao enviar mensaxes en HTML a destinatarios que non desexen recibilas."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Avisar cando o usuario tente abrir dez ou mÃis mensaxes ao mesmo tempo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -9307,23 +9061,19 @@ msgstr ""
 "Se un usuario tenta abrir 10 ou mÃis mensaxes ao mesmo tempo, pedir a "
 "confirmaciÃn."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid "Prompt while marking multiple messages"
 msgstr "Avisar cando se marquen varias mensaxes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Activar ou desactivar a confirmaciÃn cando se marcan varias mensaxes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 msgid "Prompt when deleting messages in search folder"
 msgstr "Avisar ao eliminar mensaxes no cartafol de busca"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -9333,13 +9083,13 @@ msgstr ""
 "cartafol de busca bÃrranse as mensaxes permanentemente, non sà dos "
 "resultados da busca."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr ""
 "Pregunta se se deben copiar cartafoles arrastrando e soltando no Ãrbore de "
 "cartafoles"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid ""
 "Possible values are: 'never' - do not allow copy with drag &amp; drop of "
 "folders in folder tree, 'always' - allow copy with drag &amp; drop of "
@@ -9351,13 +9101,13 @@ msgstr ""
 "permitir mover cartafoles arrastrando e soltando no Ãrbore de cartafoles ou  "
 "Âask (preguntar) ou calquera outro valor, par preguntarlle ao usuario."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr ""
 "Pregunta se se deben mover cartafoles arrastrando e soltando no Ãrbore de "
 "cartafoles"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid ""
 "Possible values are: 'never' - do not allow move with drag &amp; drop of "
 "folders in folder tree, 'always' - allow move with drag &amp; drop of "
@@ -9369,13 +9119,11 @@ msgstr ""
 "permitir mover cartafoles arrastrando e soltando no Ãrbore de cartafoles ou "
 "Âask (preguntar) ou calquera outro valor, para preguntar ao usuario."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid "Prompt when replying privately to list messages"
 msgstr "Avisar cando se responda de forma privada a correos dunha lista"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
@@ -9383,13 +9131,11 @@ msgstr ""
 "Activa/desactiva as preguntas que avisan de que està enviando unha resposta "
 "privada a un correo que chegou a travÃs dunha lista de correo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Avisar cando a lista de correo secuestre as respostas privadas"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
@@ -9400,13 +9146,11 @@ msgstr ""
 "a lista estabelece unha cabeceira ÂResponder a:Â que redirecciona a sÃa "
 "resposta de novo à lista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid "Prompt when replying to many recipients"
 msgstr "Avisar ao responder a moitos destinatarios"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
@@ -9414,8 +9158,7 @@ msgstr ""
 "Activa/desactiva as mensaxes que avisan de que està enviando unha resposta a "
 "moitas persoas."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid ""
 "Asks whether to close the message window when the user forwards or replies "
 "to the message shown in the window"
@@ -9423,7 +9166,7 @@ msgstr ""
 "Pregunta se se pecha a xanela da mensaxe cando o usuario reencamiÃa ou "
 "responde à mensaxe mostrada"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid ""
 "Possible values are: 'never' - to never close browser window, 'always' - to "
 "always close browser window or 'ask' - (or any other value) will ask user."
@@ -9432,54 +9175,43 @@ msgstr ""
 "Âsempre - pechar sempre a xanela do buscador ou Âpreguntar (ou calquera "
 "valor) preguntar ao usuario."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid "Empty Trash folders on exit"
 msgstr "Baleirar os cartafoles de lixo ao saÃr"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Baleirar todos os cartafoles de lixo ao saÃr do Evolution."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid "Minimum days between emptying the trash on exit"
 msgstr "NÃmero mÃnimo de dÃas antes de baleirar o lixo ao saÃr"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Tempo mÃnimo antes de baleirar o lixo ao saÃr, en dÃas."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Last time Empty Trash was run"
 msgstr "A Ãltima vez que se baleirou o lixo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "A Ãltima vez que se baleirou o lixo, en dÃas desde o 1 de xaneiro de 1970 "
 "(Epoch)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
-#: ../mail/evolution-mail.schemas.in.h:181
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr ""
 "Tempo (en segundos) durante o que se mostrarà o erro na barra de estado."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
-#: ../mail/evolution-mail.schemas.in.h:182
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Level beyond which the message should be logged."
 msgstr "Nivel a partir do que se deberÃa rexistrar a mensaxe."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -9487,13 +9219,11 @@ msgstr ""
 "Isto pode ter tres valores posÃbeis: Â0Â para erros; Â1Â para avisos; Â2Â "
 "para mensaxes de depuraciÃn."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Show original \"Date\" header value."
 msgstr "Mostrar o valor orixinal da cabeceira ÂDataÂ."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -9503,13 +9233,11 @@ msgstr ""
 "distinto). Doutro xeito mostrar o valor da cabeceira ÂData no formato "
 "preferido polo usuario e o fuso de hora local."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "List of Labels and their associated colors"
 msgstr "Lista de etiquetas coas cores asociadas"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -9518,56 +9246,46 @@ msgstr ""
 "lista contÃn cadeas que conteÃen nome:cor, onde a cor usa a codificaciÃn "
 "hexadecimal HTML."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Check incoming mail being junk"
 msgstr "Comprobar se o correo entrante à correo lixo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid "Run junk test on incoming mail."
 msgstr "Realizar a proba do correo lixo no correo entrante."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Empty Junk folders on exit"
 msgstr "Baleirar os cartafoles do correo lixo ao saÃr"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Baleirar todos os cartafoles do correo lixo ao saÃr do Evolution."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid "Minimum days between emptying the junk on exit"
 msgstr "NÃmero mÃnimo de dÃas antes de baleirar o correo lixo ao saÃr"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Tempo mÃnimo antes de baleirar o correo lixo ao saÃr, en dÃas."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Last time Empty Junk was run"
 msgstr "A Ãltima vez que se baleirou o correo lixo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "A Ãltima vez que se baleirou o correo lixo, en dÃas desde o 1 de xaneiro de "
 "1970 (Epoch)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "The default plugin for Junk hook"
 msgstr "O engadido predeterminado para o tratamento do correo lixo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -9577,15 +9295,13 @@ msgstr ""
 "engadidos activados. Se o engadido predeterminado listado està desactivado "
 "non se usarÃn os outros engadidos dispoÃÃbeis."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 "Determina se hai que buscar o enderezo de correo do remitente na axenda de "
 "enderezos"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -9598,8 +9314,7 @@ msgstr ""
 "enderezos remotas (LDAP, por exemplo) estÃn marcadas para o completado "
 "automÃtico."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -9607,8 +9322,7 @@ msgstr ""
 "Determina se hai que buscar enderezos para filtrar correo lixo na axenda de "
 "enderezos local"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -9619,15 +9333,13 @@ msgstr ""
 "para excluÃr os correos enviados por contactos coÃecidos desde o filtro de "
 "correo lixo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Determina se se deben usar as cabeceiras personalizadas para a detecciÃn de "
 "correo lixo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -9637,13 +9349,11 @@ msgstr ""
 "correo lixo. Se esta opciÃn està activada e se mencionan as cabeceiras, "
 "mellorarase a velocidade de detecciÃn do correo lixo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "Custom headers to use while checking for junk."
 msgstr "Cabeceiras personalizadas para usar mentres se comproba o correo lixo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -9651,35 +9361,31 @@ msgstr ""
 "Cabeceiras personalizadas para usar mentres se comproba o correo lixo. A "
 "lista de elementos son cadeas no formato Âheadername=valueÂ."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "UID string of the default account."
 msgstr "Cadea UID para a conta predeterminada."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
-#: ../mail/evolution-mail.schemas.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid "Save directory"
 msgstr "Cartafol onde gardar"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
-#: ../mail/evolution-mail.schemas.in.h:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "Directory for saving mail component files."
 msgstr "Cartafol onde gardar os ficheiros enviados por correo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid "Composer load/attach directory"
 msgstr "Cartafol para cargar/anexar do editor de mensaxes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid "Directory for loading/attaching files to composer."
 msgstr "Cartafol para cargar/anexar os ficheiros no editor de mensaxes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
-#: ../mail/evolution-mail.schemas.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid "Check for new messages on start"
 msgstr "Comprobar se hai mensaxes novas ao iniciar"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
@@ -9687,12 +9393,11 @@ msgstr ""
 "Indica se se debe comprobar se hai novas mensaxes ao iniciar Evolution. "
 "InclÃe tamÃn o envÃo de mensaxes desde a caixa de saÃda."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
-#: ../mail/evolution-mail.schemas.in.h:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid "Check for new messages in all active accounts"
 msgstr "Comprobar se hai mensaxes novas nas contas activas"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid ""
 "Whether to check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
@@ -9703,13 +9408,11 @@ msgstr ""
 "X minutos ao iniciar Evolution. Esta opciÃn Ãsase conxuntamente coa opciÃn "
 "Âsend_recv_on_startÂ."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
-#: ../mail/evolution-mail.schemas.in.h:239
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 msgid "Server synchronization interval"
 msgstr "Intervalo de sincronizaciÃn do servidor"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
-#: ../mail/evolution-mail.schemas.in.h:240
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -9718,7 +9421,6 @@ msgstr ""
 "de correo remoto. O intervalo debe ser de polo menos 30 segundos."
 
 #: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:1
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
@@ -9799,12 +9501,10 @@ msgid "Pidgin last sync time."
 msgstr "Hora da Ãltima sincronizaciÃn de Pidgin."
 
 #: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:1
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
 msgid "List of Custom Headers"
 msgstr "Lista de cabeceiras personalizadas"
 
 #: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:2
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
 msgid ""
 "The key specifies the list of custom headers that you can add to an outgoing "
 "message. The format for specifying a Header and Header value is: Name of the "
@@ -9816,17 +9516,14 @@ msgstr ""
 "separados por Â;Â"
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:1
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
 msgid "Default External Editor"
 msgstr "Editor externo predeterminado"
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:2
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
 msgid "The default command that must be used as the editor."
 msgstr "A orde predeterminada que se debe usar co editor."
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:3
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
 #: ../plugins/external-editor/external-editor.c:125
 msgid "Automatically launch when a new mail is edited"
 msgstr "Iniciar automaticamente cando se edite un novo correo"
@@ -9837,12 +9534,10 @@ msgstr ""
 "Iniciar automaticamente o editor ao presionar unha tecla no editor de correo"
 
 #: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:1
-#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
 msgid "Insert Face picture by default"
 msgstr "Inserir a imaxe predeterminada da cara"
 
 #: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:2
-#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
 msgid ""
 "Whether insert Face picture to outgoing messages by default. The picture "
 "should be set before checking this, otherwise nothing happens."
@@ -9860,12 +9555,10 @@ msgid "Whether to delete processed iTip objects"
 msgstr "Indica se eliminar os obxectos iTip procesados"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:1
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Notify new messages for Inbox only."
 msgstr "Notificar as mensaxes novas sà na caixa de entrada."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:2
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr ""
 "Indica se avisar das mensaxes novas sà no cartafol da caixa de entrada."
@@ -9879,12 +9572,10 @@ msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "Xera unha mensaxe D-Bus cando se reciben mensaxes novas."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:5
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable icon in notification area."
 msgstr "Activar a icona na Ãrea de notificaciÃn."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:6
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr ""
 "Mostrar a icona de correo novo na Ãrea de notificaciÃn cando cheguen "
@@ -9923,7 +9614,6 @@ msgstr ""
 "Indica se se debe reproducir emitir un pitido cando chega un mensaxe novo."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:13
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Sound filename to be played."
 msgstr "Nome do ficheiro de son que reproducir."
 
@@ -9948,12 +9638,10 @@ msgstr ""
 "O nome do ficheiro de son tÃmase da chave Ânotify-sound-fileÂ."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Use sound theme"
 msgstr "Usar un tema sonoro"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:18
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr ""
 "Reproducir un tema sonoro cando chegue unha mensaxe nova, se non està no "
@@ -9978,8 +9666,19 @@ msgstr ""
 msgid "Whether to show suppressed HTML output"
 msgstr "Indica se mostrar a saÃda HTML suprimida"
 
+#: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:1
+msgid "List of Destinations for publishing"
+msgstr "Lista de destinos que publicar."
+
+#: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:2
+msgid ""
+"The key specifies the list of destinations to where publish calendars. Each "
+"values specifies an XML with setup for publishing to one destination."
+msgstr ""
+"A chave especÃfica a lista de destinos onde publicar calendarios. Cada valor "
+"especifica un ficheiro XML con configuraciÃn para publicar nun destino"
+
 #: ../data/org.gnome.evolution.plugin.templates.gschema.xml.in.h:1
-#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
 msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
 "message body."
@@ -9988,12 +9687,10 @@ msgstr ""
 "substitÃa no corpo dunha mensaxe."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:1
-#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Skip development warning dialog"
 msgstr "Saltar o diÃlogo de aviso de desenvolvemento"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:2
-#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
@@ -10001,12 +9698,10 @@ msgstr ""
 "Evolution."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:3
-#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Initial attachment view"
 msgstr "VisiÃn inicial do anexo"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:4
-#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid ""
 "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
 "View."
@@ -10022,13 +9717,11 @@ msgstr "Cartafol inicial do seleccionador de ficheiros"
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "Cartafol inicial para os diÃlogos GtkFileChooser."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7
-#: ../shell/apps_evolution_shell.schemas.in.h:9 ../shell/main.c:316
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:314
 msgid "Start in offline mode"
 msgstr "Iniciar en modo sen conexiÃn"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:8
-#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Indica se o Evolution se iniciarà en modo sen conexiÃn en vez de en modo "
@@ -10046,32 +9739,26 @@ msgstr ""
 "conexiÃn"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
-#: ../shell/apps_evolution_shell.schemas.in.h:61
 msgid "Enable express mode"
 msgstr "Activar o modo express"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:12
-#: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Flag that enables a much simplified user interface."
 msgstr "Marca que activa unha interface de usuario moito mÃis simplificada."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
-#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Window buttons are visible"
 msgstr "Os botÃns da xanela estÃn visÃbeis"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
-#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Whether the window buttons should be visible."
 msgstr "Indica se os botÃns da xanela estÃn visÃbeis."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
-#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "Window button style"
 msgstr "Estilo dos botÃns de xanela"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
-#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -10082,58 +9769,47 @@ msgstr ""
 "botÃns determinarao a configuraciÃn da barra de ferramentas do GNOME."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
-#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Toolbar is visible"
 msgstr "A barra de ferramentas està visÃbel"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
-#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Whether the toolbar should be visible."
 msgstr "Indica se a barra de ferramentas està visÃbel."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
-#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Sidebar is visible"
 msgstr "A barra lateral està visÃbel"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
-#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Whether the sidebar should be visible."
 msgstr "Indica se a barra lateral està visÃbel."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
-#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Statusbar is visible"
 msgstr "A barra de estado à visÃbel"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
-#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Whether the status bar should be visible."
 msgstr "Indica se a barra de estado està visÃbel."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
-#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr ""
 "ID ou alias do compoÃente que se mostrarà de forma predeterminada ao iniciar."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
-#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "Default sidebar width"
 msgstr "Largura predeterminada da barra lateral"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
-#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default width for the sidebar, in pixels."
 msgstr "Largura predeterminada da barra lateral, en pÃxeles."
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
 msgid "Use only local spam tests."
 msgstr "Usar sà probas locais de correo lixo."
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:2
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Usar sà as probas locais de correo lixo (sen DNS)."
 
@@ -10142,12 +9818,10 @@ msgid "Socket path for SpamAssassin"
 msgstr "Ruta do socket para SpamAssassin"
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
 msgid "Use SpamAssassin daemon and client"
 msgstr "Usar o daemon e o cliente SpamAssassin"
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Usar o daemon e o cliente SpamAssassin (spamc/spamd)."
 
@@ -10173,6 +9847,50 @@ msgstr[1] "Anexos"
 msgid "Display as attachment"
 msgstr "Mostrar como anexo"
 
+#: ../em-format/e-mail-formatter.c:1362 ../mail/e-mail-tag-editor.c:327
+#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:67
+msgid "From"
+msgstr "De"
+
+#: ../em-format/e-mail-formatter.c:1363 ../modules/mail/em-mailer-prefs.c:68
+msgid "Reply-To"
+msgstr "Responder a"
+
+#: ../em-format/e-mail-formatter.c:1365
+#: ../em-format/e-mail-formatter-utils.c:182
+#: ../em-format/e-mail-formatter-utils.c:205
+#: ../modules/mail/em-mailer-prefs.c:70
+msgid "Cc"
+msgstr "Cc"
+
+#: ../em-format/e-mail-formatter.c:1366
+#: ../em-format/e-mail-formatter-utils.c:184
+#: ../em-format/e-mail-formatter-utils.c:207
+#: ../modules/mail/em-mailer-prefs.c:71
+msgid "Bcc"
+msgstr "Cco"
+
+#: ../em-format/e-mail-formatter.c:1367 ../mail/e-mail-tag-editor.c:332
+#: ../mail/em-filter-i18n.h:76 ../mail/message-list.etspec.h:6
+#: ../modules/mail/em-mailer-prefs.c:72 ../smime/lib/e-cert.c:1125
+msgid "Subject"
+msgstr "Titular"
+
+#: ../em-format/e-mail-formatter.c:1368 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:73 ../widgets/misc/e-dateedit.c:526
+#: ../widgets/misc/e-dateedit.c:548
+msgid "Date"
+msgstr "Data"
+
+#: ../em-format/e-mail-formatter.c:1369 ../modules/mail/em-mailer-prefs.c:74
+msgid "Newsgroups"
+msgstr "Grupos de discusiÃn"
+
+#: ../em-format/e-mail-formatter.c:1370 ../modules/mail/em-mailer-prefs.c:75
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+msgid "Face"
+msgstr "Cara"
+
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
 #: ../em-format/e-mail-formatter-headers.c:114
@@ -10186,7 +9904,7 @@ msgstr "De: %s:"
 msgid "(no subject)"
 msgstr "(Sen asunto)"
 
-#: ../em-format/e-mail-formatter-headers.c:345
+#: ../em-format/e-mail-formatter-headers.c:339
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Esta mensaxe enviouse por %s no nome de %s"
@@ -10207,6 +9925,21 @@ msgstr "Mensaxe RFC822"
 msgid "Format part as an RFC822 message"
 msgstr "Formatar parte como mensaxe RFC822"
 
+#: ../em-format/e-mail-formatter-print.c:53
+#: ../mail/e-mail-label-tree-view.c:99
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1236
+#: ../modules/cal-config-google/e-google-chooser.c:209
+#: ../modules/plugin-manager/evolution-plugin-manager.c:68
+#: ../widgets/menus/gal-define-views-dialog.c:352
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:92
+msgid "Name"
+msgstr "Nome"
+
+#: ../em-format/e-mail-formatter-print.c:53 ../mail/message-list.etspec.h:10
+#: ../widgets/misc/e-attachment-tree-view.c:574
+msgid "Size"
+msgstr "TamaÃo"
+
 #. Add encryption/signature header
 #: ../em-format/e-mail-formatter-print-headers.c:130
 #: ../mail/e-mail-config-security-page.c:642
@@ -10231,21 +9964,6 @@ msgstr "Cifrado S/MIME"
 msgid "S/MIME encrpyted"
 msgstr "Cifrado con S/MIME"
 
-#: ../em-format/e-mail-formatter-print.c:53
-#: ../mail/e-mail-label-tree-view.c:99
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1236
-#: ../modules/cal-config-google/e-google-chooser.c:209
-#: ../modules/plugin-manager/evolution-plugin-manager.c:68
-#: ../widgets/menus/gal-define-views-dialog.c:352
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:92
-msgid "Name"
-msgstr "Nome"
-
-#: ../em-format/e-mail-formatter-print.c:53 ../mail/message-list.etspec.h:10
-#: ../widgets/misc/e-attachment-tree-view.c:574
-msgid "Size"
-msgstr "TamaÃo"
-
 #: ../em-format/e-mail-formatter-quote-text-enriched.c:102
 #: ../em-format/e-mail-formatter-text-enriched.c:115
 msgid "Richtext"
@@ -10404,54 +10122,12 @@ msgstr "Fonte"
 msgid "Display source of a MIME part"
 msgstr "Mostrar fonte como parte MIME"
 
-#: ../em-format/e-mail-formatter-utils.c:182
-#: ../em-format/e-mail-formatter-utils.c:205
-#: ../em-format/e-mail-formatter.c:1343 ../modules/mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Cc"
-
-#: ../em-format/e-mail-formatter-utils.c:184
-#: ../em-format/e-mail-formatter-utils.c:207
-#: ../em-format/e-mail-formatter.c:1344 ../modules/mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Cco"
-
 #. pseudo-header
 #: ../em-format/e-mail-formatter-utils.c:316
-#: ../modules/mail/em-mailer-prefs.c:1050
+#: ../modules/mail/em-mailer-prefs.c:1048
 msgid "Mailer"
 msgstr "Aplicativo de correo"
 
-#: ../em-format/e-mail-formatter.c:1340 ../mail/e-mail-tag-editor.c:327
-#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:67
-msgid "From"
-msgstr "De"
-
-#: ../em-format/e-mail-formatter.c:1341 ../modules/mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Responder a"
-
-#: ../em-format/e-mail-formatter.c:1345 ../mail/e-mail-tag-editor.c:332
-#: ../mail/em-filter-i18n.h:76 ../mail/message-list.etspec.h:6
-#: ../modules/mail/em-mailer-prefs.c:72 ../smime/lib/e-cert.c:1125
-msgid "Subject"
-msgstr "Titular"
-
-#: ../em-format/e-mail-formatter.c:1346 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:73 ../widgets/misc/e-dateedit.c:526
-#: ../widgets/misc/e-dateedit.c:548
-msgid "Date"
-msgstr "Data"
-
-#: ../em-format/e-mail-formatter.c:1347 ../modules/mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr "Grupos de discusiÃn"
-
-#: ../em-format/e-mail-formatter.c:1348 ../modules/mail/em-mailer-prefs.c:75
-#: ../plugins/face/org-gnome-face.eplug.xml.h:1
-msgid "Face"
-msgstr "Cara"
-
 #: ../em-format/e-mail-parser-application-mbox.c:108
 #, c-format
 msgid "Error parsing MBOX part: %s"
@@ -10945,7 +10621,7 @@ msgstr "_Buscar os elementos:"
 #. protocol:
 #. name:
 #: ../filter/e-filter-rule.c:776 ../libemail-engine/camel-null-store.c:28
-#: ../mail/e-mail-config-summary-page.c:141
+#: ../mail/e-mail-config-summary-page.c:139
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:616
 #: ../widgets/misc/e-mail-signature-combo-box.c:318
 msgid "None"
@@ -11166,32 +10842,32 @@ msgid "Invalid folder URI '%s'"
 msgstr "O URI do cartafol Â%s non à vÃlido"
 
 #: ../libemail-engine/e-mail-session.c:111 ../mail/em-folder-properties.c:333
-#: ../mail/em-folder-tree-model.c:760
+#: ../mail/em-folder-tree-model.c:766
 #: ../modules/mail/e-mail-shell-view-private.c:1033
 #: ../modules/mail/e-mail-shell-view-private.c:1044
 msgid "Inbox"
 msgstr "Caixa de entrada"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:112 ../mail/em-folder-tree-model.c:753
+#: ../libemail-engine/e-mail-session.c:112 ../mail/em-folder-tree-model.c:759
 #: ../modules/mail/e-mail-shell-view-private.c:1031
 msgid "Drafts"
 msgstr "Borradores"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:113 ../mail/em-folder-tree-model.c:764
+#: ../libemail-engine/e-mail-session.c:113 ../mail/em-folder-tree-model.c:770
 #: ../modules/mail/e-mail-shell-view-private.c:1035
 msgid "Outbox"
 msgstr "Caixa de saÃda"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:114 ../mail/em-folder-tree-model.c:768
+#: ../libemail-engine/e-mail-session.c:114 ../mail/em-folder-tree-model.c:774
 #: ../modules/mail/e-mail-shell-view-private.c:1037
 msgid "Sent"
 msgstr "Enviados"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:115 ../mail/em-folder-tree-model.c:756
+#: ../libemail-engine/e-mail-session.c:115 ../mail/em-folder-tree-model.c:762
 #: ../modules/mail/e-mail-shell-view-private.c:1039
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
 #: ../plugins/templates/templates.c:1049 ../plugins/templates/templates.c:1349
@@ -11309,11 +10985,11 @@ msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "Produciuse un fallo ao enviar unha mensaxe"
 msgstr[1] "Produciuse un fallo ao enviar %d de %d mensaxes"
 
-#: ../libemail-engine/mail-ops.c:964 ../mail/mail-send-recv.c:857
+#: ../libemail-engine/mail-ops.c:964 ../mail/mail-send-recv.c:854
 msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../libemail-engine/mail-ops.c:966 ../mail/mail-send-recv.c:859
+#: ../libemail-engine/mail-ops.c:966 ../mail/mail-send-recv.c:856
 msgid "Complete."
 msgstr "Completado."
 
@@ -11429,7 +11105,7 @@ msgstr "Prede_finido"
 #: ../mail/e-mail-account-tree-view.c:85
 #: ../modules/mail/em-composer-prefs.c:505
 #: ../modules/plugin-manager/evolution-plugin-manager.c:360
-#: ../plugins/publish-calendar/publish-calendar.c:849
+#: ../plugins/publish-calendar/publish-calendar.c:866
 msgid "Enabled"
 msgstr "Activado"
 
@@ -11439,7 +11115,7 @@ msgstr "Nome da conta"
 
 #: ../mail/e-mail-account-tree-view.c:116
 #: ../mail/e-mail-config-security-page.c:333
-#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3652
+#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3661
 #: ../mail/mail-config.ui.h:44
 msgid "Default"
 msgstr "predeterminado"
@@ -11472,21 +11148,21 @@ msgstr "Non se forneceu ningÃn enderezo de correo"
 msgid "Missing domain in email address"
 msgstr "Falta o dominio no enderezo de correo"
 
-#: ../mail/e-mail-backend.c:716
+#: ../mail/e-mail-backend.c:723
 msgid "Unknown background operation"
 msgstr "OperaciÃn en segundo plano descoÃecida"
 
-#: ../mail/e-mail-browser.c:131 ../shell/e-shell-window-actions.c:1418
+#: ../mail/e-mail-browser.c:129 ../shell/e-shell-window-actions.c:1418
 #: ../shell/e-shell-window-actions.c:1425
 #: ../shell/e-shell-window-actions.c:1432
 msgid "Close this window"
 msgstr "Pechar esta xanela"
 
-#: ../mail/e-mail-browser.c:288
+#: ../mail/e-mail-browser.c:286
 msgid "(No Subject)"
 msgstr "(Sen asunto)"
 
-#: ../mail/e-mail-config-assistant.c:502
+#: ../mail/e-mail-config-assistant.c:501
 msgid "Evolution Account Assistant"
 msgstr "Asistente de contas do Evolution"
 
@@ -11592,12 +11268,12 @@ msgstr ""
 "que envÃe."
 
 #: ../mail/e-mail-config-identity-page.c:282
-#: ../mail/e-mail-config-summary-page.c:353
+#: ../mail/e-mail-config-summary-page.c:324
 msgid "Account Information"
 msgstr "InformaciÃn da conta"
 
 #: ../mail/e-mail-config-identity-page.c:291
-#: ../mail/e-mail-config-summary-page.c:362
+#: ../mail/e-mail-config-summary-page.c:333
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example, \"Work\" or \"Personal\"."
@@ -11606,7 +11282,7 @@ msgstr ""
 "Por exemplo: ÂTraballo ou ÂPersoalÂ"
 
 #: ../mail/e-mail-config-identity-page.c:299
-#: ../mail/e-mail-config-summary-page.c:370
+#: ../mail/e-mail-config-summary-page.c:341
 #: ../modules/addressbook/ldap-config.ui.h:12
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-mail-signature-script-dialog.c:417
@@ -11646,7 +11322,15 @@ msgstr "Engadir unha sinatura _novaâ"
 msgid "Looking up account details..."
 msgstr "Buscando polos detalles da conta..."
 
-#: ../mail/e-mail-config-provider-page.c:712
+#: ../mail/e-mail-config-provider-page.c:499
+msgid "Checking for New Mail"
+msgstr "Comprobando se hai correo novo"
+
+#: ../mail/e-mail-config-provider-page.c:515
+msgid "Check for _new messages every"
+msgstr "Comprobar automaticamente se hai mensaxes _novas cada"
+
+#: ../mail/e-mail-config-provider-page.c:787
 msgid "Receiving Options"
 msgstr "OpciÃns de recepciÃn"
 
@@ -11749,52 +11433,52 @@ msgstr "Cifrar sempre para min mesmo ao enviar correo cifrado"
 msgid "Sending Email"
 msgstr "EnvÃo de correo"
 
-#: ../mail/e-mail-config-service-page.c:681
+#: ../mail/e-mail-config-service-page.c:688
 msgid "Server _Type:"
 msgstr "_Tipo de servidor:"
 
-#: ../mail/e-mail-config-summary-page.c:144
+#: ../mail/e-mail-config-summary-page.c:142
 msgid "SSL"
 msgstr "SSL"
 
-#: ../mail/e-mail-config-summary-page.c:147
+#: ../mail/e-mail-config-summary-page.c:145
 msgid "TLS"
 msgstr "TLS"
 
-#: ../mail/e-mail-config-summary-page.c:336
+#: ../mail/e-mail-config-summary-page.c:307
 msgid ""
 "This is a summary of the settings which will be used to access your mail."
 msgstr ""
 "Este à un resumo da configuraciÃn que se empregarÃn para acceder ao seu "
 "correo."
 
-#: ../mail/e-mail-config-summary-page.c:407
+#: ../mail/e-mail-config-summary-page.c:372
 msgid "Personal Details"
 msgstr "Detalles persoais"
 
-#: ../mail/e-mail-config-summary-page.c:416
+#: ../mail/e-mail-config-summary-page.c:381
 msgid "Full Name:"
 msgstr "Nome completo"
 
-#: ../mail/e-mail-config-summary-page.c:430
+#: ../mail/e-mail-config-summary-page.c:395
 msgid "Email Address:"
 msgstr "Enderezo de correo"
 
-#: ../mail/e-mail-config-summary-page.c:468
+#: ../mail/e-mail-config-summary-page.c:433
 msgid "Server Type:"
 msgstr "Tipo de servidor:"
 
-#: ../mail/e-mail-config-summary-page.c:489
+#: ../mail/e-mail-config-summary-page.c:454
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:602
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:237
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:244
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../mail/e-mail-config-summary-page.c:531
+#: ../mail/e-mail-config-summary-page.c:496
 msgid "Security:"
 msgstr "Seguranza:"
 
-#: ../mail/e-mail-config-summary-page.c:835
+#: ../mail/e-mail-config-summary-page.c:787
 msgid "Account Summary"
 msgstr "Resumo da conta"
 
@@ -11817,35 +11501,35 @@ msgstr "Benvido/a"
 msgid "Account Editor"
 msgstr "Editor de contas"
 
-#: ../mail/e-mail-display.c:120
+#: ../mail/e-mail-display.c:119
 msgid "_Add to Address Book..."
 msgstr "Eng_adir à axenda de enderezosâ"
 
-#: ../mail/e-mail-display.c:127
+#: ../mail/e-mail-display.c:126
 msgid "_To This Address"
 msgstr "A es_te enderezo"
 
-#: ../mail/e-mail-display.c:134
+#: ../mail/e-mail-display.c:133
 msgid "_From This Address"
 msgstr "_Desde este enderezo"
 
-#: ../mail/e-mail-display.c:141
+#: ../mail/e-mail-display.c:140
 msgid "Send _Reply To..."
 msgstr "Enviar _resposta aâ"
 
-#: ../mail/e-mail-display.c:143
+#: ../mail/e-mail-display.c:142
 msgid "Send a reply message to this address"
 msgstr "Enviar unha mensaxe de resposta a este enderezo"
 
-#: ../mail/e-mail-display.c:150
+#: ../mail/e-mail-display.c:149
 msgid "Create Search _Folder"
 msgstr "Crear un carta_fol de busca"
 
-#: ../mail/e-mail-display.c:160
+#: ../mail/e-mail-display.c:159
 msgid "Save _Image..."
 msgstr "Gardar _imaxeâ"
 
-#: ../mail/e-mail-display.c:162
+#: ../mail/e-mail-display.c:161
 msgid "Save the image to a file"
 msgstr "Gardar a imaxe a un ficheiro"
 
@@ -11904,7 +11588,7 @@ msgstr ""
 msgid "Color"
 msgstr "Cor"
 
-#: ../mail/e-mail-migrate.c:854
+#: ../mail/e-mail-migrate.c:646
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "Non à posÃbel crear os cartafoles de correo local en Â%sÂ: %s"
@@ -12007,32 +11691,32 @@ msgid "Mark the selected messages for deletion"
 msgstr "Marcar as mensaxes seleccionadas para eliminalas"
 
 #: ../mail/e-mail-reader.c:1997
-msgid "Filter on Mailing _List..."
-msgstr "Filtrar pola _lista de correoâ"
+msgid "Create a Filter Rule for Mailing _List..."
+msgstr "Crear unha regra de filtrado segundo a _rolda de correoâ"
 
 #: ../mail/e-mail-reader.c:1999
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Crear unha regra para filtrar as mensaxes a esta lista de correo"
 
 #: ../mail/e-mail-reader.c:2004
-msgid "Filter on _Recipients..."
-msgstr "Filtrar polos _destinatariosâ"
+msgid "Create a Filter Rule for _Recipients..."
+msgstr "Crear unha regra de filtrado segundo os _destinatariosâ"
 
 #: ../mail/e-mail-reader.c:2006
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Crear unha regra para filtrar as mensaxes a estes destinatarios"
 
 #: ../mail/e-mail-reader.c:2011
-msgid "Filter on Se_nder..."
-msgstr "Filtrar polo re_mitenteâ"
+msgid "Create a Filter Rule for Se_nder..."
+msgstr "Crear unha regra de filtrado segundo o re_mitenteâ"
 
 #: ../mail/e-mail-reader.c:2013
 msgid "Create a rule to filter messages from this sender"
 msgstr "Crear unha regra para filtrar as mensaxes deste remitente"
 
 #: ../mail/e-mail-reader.c:2018
-msgid "Filter on _Subject..."
-msgstr "Filtrar polo a_suntoâ"
+msgid "Create a Filter Rule for _Subject..."
+msgstr "Crear unha regra de filtrado segundo o _asuntoâ"
 
 #: ../mail/e-mail-reader.c:2020
 msgid "Create a rule to filter messages with this subject"
@@ -12408,8 +12092,8 @@ msgid "Decrease the text size"
 msgstr "DiminuÃr o tamaÃo do texto"
 
 #: ../mail/e-mail-reader.c:2370
-msgid "Create R_ule"
-msgstr "Crear unha r_egra"
+msgid "Cre_ate"
+msgstr "Cre_ar"
 
 #: ../mail/e-mail-reader.c:2377
 msgid "Ch_aracter Encoding"
@@ -12440,32 +12124,32 @@ msgid "_Zoom"
 msgstr "A_mpliar"
 
 #: ../mail/e-mail-reader.c:2429
-msgid "Search Folder from Mailing _List..."
-msgstr "Cartafol de busca por _lista de correoâ"
+msgid "Create a Search Folder from Mailing _List..."
+msgstr "Crear un cartafol de busca segundo a ro_lda de correoâ"
 
 #: ../mail/e-mail-reader.c:2431
 msgid "Create a search folder for this mailing list"
 msgstr "Crear un cartafol de busca para esta rolda de correo"
 
 #: ../mail/e-mail-reader.c:2436
-msgid "Search Folder from Recipien_ts..."
-msgstr "Cartafol de busca por des_tinatariosâ"
+msgid "Create a Search Folder from Recipien_ts..."
+msgstr "Crear un cartafol de busca segundo os des_tinatariosâ"
 
 #: ../mail/e-mail-reader.c:2438
 msgid "Create a search folder for these recipients"
 msgstr "Crear un cartafol de busca para estes destinatarios"
 
 #: ../mail/e-mail-reader.c:2443
-msgid "Search Folder from Sen_der..."
-msgstr "Cartafol de busca por _remitenteâ"
+msgid "Create a Search Folder from Sen_der..."
+msgstr "Crear un cartafol de busca segundo o _remitenteâ"
 
 #: ../mail/e-mail-reader.c:2445
 msgid "Create a search folder for this sender"
 msgstr "Crear un cartafol de busca para este remitente"
 
 #: ../mail/e-mail-reader.c:2450
-msgid "Search Folder from S_ubject..."
-msgstr "Cartafol de busca por as_untoâ"
+msgid "Create a Search Folder from S_ubject..."
+msgstr "Crear un cartafol de busca segundo o as_untoâ"
 
 #: ../mail/e-mail-reader.c:2452
 msgid "Create a search folder for this subject"
@@ -12519,47 +12203,47 @@ msgstr "Mostrar as mensaxes con todas as cabeceiras de correo electrÃnico"
 msgid "Retrieving message"
 msgstr "Descargando mensaxe"
 
-#: ../mail/e-mail-reader.c:3848
+#: ../mail/e-mail-reader.c:3857
 #: ../modules/mail/e-mail-attachment-handler.c:175
 msgid "_Forward"
 msgstr "_ReencamiÃar"
 
-#: ../mail/e-mail-reader.c:3849
+#: ../mail/e-mail-reader.c:3858
 msgid "Forward the selected message to someone"
 msgstr "ReencamiÃar a mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:3868
+#: ../mail/e-mail-reader.c:3877
 msgid "Group Reply"
 msgstr "Responder ao grupo"
 
-#: ../mail/e-mail-reader.c:3869
+#: ../mail/e-mail-reader.c:3878
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Responder à lista de correo ou a todos os destinatarios"
 
-#: ../mail/e-mail-reader.c:3926 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3935 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../mail/e-mail-reader.c:3959
+#: ../mail/e-mail-reader.c:3968
 #: ../modules/calendar/e-cal-shell-view-actions.c:1398
 msgid "Next"
 msgstr "Seguinte"
 
-#: ../mail/e-mail-reader.c:3963
+#: ../mail/e-mail-reader.c:3972
 #: ../modules/calendar/e-cal-shell-view-actions.c:1391
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../mail/e-mail-reader.c:3972 ../mail/mail-dialogs.ui.h:20
+#: ../mail/e-mail-reader.c:3981 ../mail/mail-dialogs.ui.h:20
 msgid "Reply"
 msgstr "Responder"
 
-#: ../mail/e-mail-reader.c:4696
+#: ../mail/e-mail-reader.c:4711
 #, c-format
 msgid "Folder '%s'"
 msgstr "Cartafol Â%sÂ"
 
-#: ../mail/e-mail-reader-utils.c:155
+#: ../mail/e-mail-reader-utils.c:152
 msgid "Do not warn me again"
 msgstr "Non avisarme de novo."
 
@@ -12569,7 +12253,7 @@ msgstr "Imprimindo"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:742
+#: ../mail/e-mail-reader-utils.c:730
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -12584,7 +12268,7 @@ msgstr[1] ""
 "O cartafol Â%s contÃn %u mensaxes duplicadas. Ten certeza de que quere "
 "eliminalas?"
 
-#: ../mail/e-mail-reader-utils.c:1138
+#: ../mail/e-mail-reader-utils.c:1134
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Gardar mensaxe"
@@ -12595,17 +12279,17 @@ msgstr[1] "Gardar mensaxes"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:1159
+#: ../mail/e-mail-reader-utils.c:1155
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Mensaxe"
 msgstr[1] "Mensaxes"
 
-#: ../mail/e-mail-reader-utils.c:1656
+#: ../mail/e-mail-reader-utils.c:1610
 msgid "Parsing message"
 msgstr "Analizando mensaxe"
 
-#: ../mail/e-mail-request.c:150
+#: ../mail/e-mail-request.c:151
 #, c-format
 msgid "Failed to load part '%s'"
 msgstr "Produciuse un fallo ao cargar a parte Â%sÂ"
@@ -12995,7 +12679,7 @@ msgstr "Non à posÃbel soltar as mensaxe(s) no almacenamento do nivel superior"
 msgid "UNMATCHED"
 msgstr "SEN COINCIDENCIAS"
 
-#: ../mail/em-folder-tree-model.c:844 ../mail/em-folder-tree-model.c:1129
+#: ../mail/em-folder-tree-model.c:850 ../mail/em-folder-tree-model.c:1135
 msgid "Loading..."
 msgstr "Cargandoâ"
 
@@ -13113,7 +12797,7 @@ msgstr "_Non mostrar esta mensaxe outra vez"
 msgid "Message Filters"
 msgstr "Filtros de mensaxe"
 
-#: ../mail/em-utils.c:999
+#: ../mail/em-utils.c:1000
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensaxes de %s"
@@ -13122,473 +12806,67 @@ msgstr "Mensaxes de %s"
 msgid "Search _Folders"
 msgstr "Carta_foles de busca"
 
-#: ../mail/em-vfolder-editor-rule.c:339
+#: ../mail/em-vfolder-editor-rule.c:340
 msgid "Add Folder"
 msgstr "Engadir un cartafol"
 
-#: ../mail/evolution-mail.schemas.in.h:11
-msgid "Digitally sign messages when original message signed (PGP or S/MIME)"
-msgstr ""
-"Firmar mensaxes digitalmente cando a mensaxe original estea firmada (PGP o S/"
-"MIME)"
-
-#: ../mail/evolution-mail.schemas.in.h:39
-msgid "Composer Window default width"
-msgstr "Largura predeterminada da xanela do editor de mensaxes"
-
-#: ../mail/evolution-mail.schemas.in.h:40
-msgid "Default width of the Composer Window."
-msgstr "Largura predeterminada da xanela do editor de mensaxes."
+#: ../mail/importers/elm-importer.c:179
+msgid "Importing Elm data"
+msgstr "Importando datos Elm"
 
-#: ../mail/evolution-mail.schemas.in.h:41
-msgid "Composer Window default height"
-msgstr "Altura predeterminada da xanela do editor de mensaxes"
+#: ../mail/importers/elm-importer.c:332 ../mail/importers/pine-importer.c:423
+#: ../modules/mail/e-mail-shell-view.c:1069
+#: ../widgets/misc/e-send-options.c:538
+msgid "Mail"
+msgstr "Correo"
 
-#: ../mail/evolution-mail.schemas.in.h:42
-msgid "Default height of the Composer Window."
-msgstr "Altura predeterminada da xanela do editor de mensaxes."
+#: ../mail/importers/elm-importer.c:379
+msgid "Evolution Elm importer"
+msgstr "Importador Elm do Evolution"
 
-#: ../mail/evolution-mail.schemas.in.h:45
-msgid "Attribute message."
-msgstr "Mensaxe anexada."
+#: ../mail/importers/elm-importer.c:380
+msgid "Import mail from Elm."
+msgstr "Importar correo desde o Elm."
 
-#: ../mail/evolution-mail.schemas.in.h:46
-msgid ""
-"The text that is inserted when replying to a message, attributing the "
-"message to the original author."
-msgstr ""
-"O texto inserido cando se responde unha mensaxe, atribuÃndolle a mensaxe ao "
-"autor orixinal."
+#: ../mail/importers/evolution-mbox-importer.c:142
+#: ../plugins/dbx-import/dbx-importer.c:255
+msgid "_Destination folder:"
+msgstr "Cartafol de _destino:"
 
-#: ../mail/evolution-mail.schemas.in.h:47
-msgid "Forward message."
-msgstr "ReencamiÃar a mensaxe."
+#: ../mail/importers/evolution-mbox-importer.c:148
+#: ../plugins/dbx-import/dbx-importer.c:261
+#: ../plugins/pst-import/pst-importer.c:570
+msgid "Select folder"
+msgstr "Seleccionar un cartafol"
 
-#: ../mail/evolution-mail.schemas.in.h:48
-msgid ""
-"The text that is inserted when forwarding a message, saying that the "
-"forwarded message follows."
-msgstr ""
-"O texto inserido ao reencamiÃar unha mensaxe, informando que a continuaciÃn "
-"vai a mensaxe reencamiÃada."
+#: ../mail/importers/evolution-mbox-importer.c:149
+#: ../plugins/dbx-import/dbx-importer.c:262
+#: ../plugins/pst-import/pst-importer.c:571
+msgid "Select folder to import into"
+msgstr "Seleccionar un cartafol ao que importar"
 
-#: ../mail/evolution-mail.schemas.in.h:49
-msgid "Original message."
-msgstr "Mensaxe orixinal."
+#: ../mail/importers/evolution-mbox-importer.c:438
+msgctxt "mboxImp"
+msgid "Subject"
+msgstr "Asunto"
 
-#: ../mail/evolution-mail.schemas.in.h:50
-msgid ""
-"The text that is inserted when replying to a message (top posting), saying "
-"that the original message follows."
-msgstr ""
-"O texto inserido ao responder unha mensaxe, informando que a continuaciÃn "
-"vai a mensaxe orixinal."
+#: ../mail/importers/evolution-mbox-importer.c:443
+msgctxt "mboxImp"
+msgid "From"
+msgstr "De"
 
-#: ../mail/evolution-mail.schemas.in.h:52
-msgid ""
-"This value can be an empty string, which means it'll use the system Picture "
-"folder, usually set to ~/Pictures. This folder will be also used when the "
-"set path is not pointing to the existent folder."
-msgstr ""
-"Este valor pode ser unha cadea baleira, isto significa que usarà o cartafol "
-"de imaxes do sistema, xeralmente localizado en ~/Imaxes. Este cartafol "
-"usarase tamÃn cando a ruta estabelecida non apunta a un cartafol existente."
+#: ../mail/importers/evolution-mbox-importer.c:487
+#: ../shell/e-shell-utils.c:195
+msgid "Berkeley Mailbox (mbox)"
+msgstr "Caixa de correo Berkeley (mbox)"
 
-#: ../mail/evolution-mail.schemas.in.h:94
-msgid "Enable search folders"
-msgstr "Activar os cartafoles de busca"
+#: ../mail/importers/evolution-mbox-importer.c:488
+msgid "Importer Berkeley Mailbox format folders"
+msgstr "Importador de cartafoles no formato caixa de correo de Berkeley"
 
-#: ../mail/evolution-mail.schemas.in.h:95
-msgid "Enable search folders on startup."
-msgstr "Activar os cartafoles de busca ao iniciar."
-
-#: ../mail/evolution-mail.schemas.in.h:96
-msgid "Enable local folders"
-msgstr "Activar cartafoles locais"
-
-#: ../mail/evolution-mail.schemas.in.h:97
-msgid "Whether to show local folders (On This Computer) in a folder tree."
-msgstr ""
-"Indica se se deben mostrar os cartafoles locais (Neste equipo) nun Ãrbore de "
-"cartafoles."
-
-#: ../mail/evolution-mail.schemas.in.h:114
-msgid "Display only message texts not exceeding certain size"
-msgstr "Mostrar sà as mensaxes de texto que non excedan de certo tamaÃo"
-
-#: ../mail/evolution-mail.schemas.in.h:115
-msgid ""
-"Enable to display only message texts not exceeding size defined in "
-"'message_text_part_limit' key."
-msgstr ""
-"Activar a vista dos textos das mensaxes que non excedan o tamaÃo definido "
-"pola chave 'message_text_part_limit'."
-
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid "Message text limit for display"
-msgstr "LÃmite do texto da mensaxe para a vista"
-
-#: ../mail/evolution-mail.schemas.in.h:117
-msgid ""
-"This decides the max size of the message text that will be displayed under "
-"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
-"is used only when 'force_message_limit' key is activated."
-msgstr ""
-"Isto decide o tamaÃo mÃximo do texto da mensaxe que se pode mostrar no "
-"Evolution, indicado en KB. O tamaÃo predeterminado à 4096 (4MB). Este valor "
-"Ãsase sà cando a chave 'force_message_limit' està activada."
-
-#: ../mail/evolution-mail.schemas.in.h:123
-msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Requires a restart to apply."
-msgstr ""
-"Esta opciÃn indica se as conversas deben estar despregadas ou pregadas por "
-"omisiÃn. Ã necesario reiniciar o Evolution."
-
-#: ../mail/evolution-mail.schemas.in.h:127
-msgid ""
-"Describes whether message headers in paned view should be collapsed or "
-"expanded by default. \"0\" = expanded \"1\" = collapsed"
-msgstr ""
-"Describe se as cabeceiras dos mensaxes na vista con paneis se deben contraer "
-"ou expandir de maneira predeterminada. Â0Â = expandidas Â1Â = contraÃdas"
-
-#: ../mail/evolution-mail.schemas.in.h:129
-msgid ""
-"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
-"true accounts are sorted alphabetically, with an exception of On This "
-"Computer and Search folders, otherwise accounts are sorted based on an order "
-"given by a user."
-msgstr ""
-"Indica como ordenar contas nunha Ãrbore de cartafoles usado nunha vista de "
-"Correo. Cando està estabelecido a certo as contas ordÃnanse alfabeticamente, "
-"coa excepciÃn de Neste equipo y Cartafoles de busca, pola contra os "
-"cartafoles ordÃnanse pola orde dada polo usuario."
-
-#: ../mail/evolution-mail.schemas.in.h:130
-msgid "Mail browser width"
-msgstr "Largura do buscador de correo"
-
-#: ../mail/evolution-mail.schemas.in.h:131
-msgid "Default width of the mail browser window."
-msgstr "Largura predeterminada da xanela do buscador de mensaxes."
-
-#: ../mail/evolution-mail.schemas.in.h:132
-msgid "Mail browser height"
-msgstr "Altura do buscador de correo"
-
-#: ../mail/evolution-mail.schemas.in.h:133
-msgid "Default height of the mail browser window."
-msgstr "Altura predeterminada da xanela do buscador de correo."
-
-#: ../mail/evolution-mail.schemas.in.h:134
-msgid "Mail browser maximized"
-msgstr "Buscador de correo maximizado"
-
-#: ../mail/evolution-mail.schemas.in.h:135
-msgid "Default maximized state of the mail browser window."
-msgstr "Estado maximizado predeterminado da xanela do buscador de correo."
-
-#: ../mail/evolution-mail.schemas.in.h:136
-msgid "\"Folder Subscriptions\" window height"
-msgstr "Altura da xanela ÂSubscriciÃns de cartafolesÂ"
-
-#: ../mail/evolution-mail.schemas.in.h:137
-msgid ""
-"Initial height of the \"Folder Subscriptions\" window. The value updates as "
-"the user resizes the window vertically."
-msgstr ""
-"Altura inicial da xanela ÂSubscriciÃns de cartafolesÂ. O valor actualÃzase a "
-"medida que o usuario redimensiona a xanela verticalmente."
-
-#: ../mail/evolution-mail.schemas.in.h:138
-msgid "\"Folder Subscriptions\" window maximize state"
-msgstr "Estado maximizado da xanela ÂSubscriciÃns de cartafolesÂ"
-
-#: ../mail/evolution-mail.schemas.in.h:139
-msgid ""
-"Initial maximize state of the \"Folder Subscriptions\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"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 maximizado inicial da xanela ÂSubscriciÃns de cartafolesÂ. O valor "
-"actualÃzase cando o usuario maximiza ou restaura a xanela. Nota: Este valor "
-"en particular non se usa no Evolution desde que a xanela ÂSubscriciÃns de "
-"cartafoles non à maximizÃbel. Esta chave sà existe como un detalle de "
-"implementaciÃn."
-
-#: ../mail/evolution-mail.schemas.in.h:140
-msgid "\"Folder Subscriptions\" window width"
-msgstr "Largura da xanela ÂSubscriciÃns de cartafolesÂ"
-
-#: ../mail/evolution-mail.schemas.in.h:141
-msgid ""
-"Initial width of the \"Folder Subscriptions\" window. The value updates as "
-"the user resizes the window horizontally."
-msgstr ""
-"Largura inicial da xanela ÂSubscriciÃns de cartafolesÂ. O valor actualÃzase "
-"a medida que o usuario redimensiona a xanela horizontalmente."
-
-#: ../mail/evolution-mail.schemas.in.h:149
-msgid "Default reply style"
-msgstr "Estilo de resposta predeterminado"
-
-#: ../mail/evolution-mail.schemas.in.h:172
-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 ""
-"Os valores posÃbeis son: nunca - non pechar nunca a xanela do buscador     "
-"sempre - pechar sempre a xanela do buscador    preguntar - (ou calquera "
-"valor) preguntar ao usuario"
-
-#: ../mail/evolution-mail.schemas.in.h:207
-msgid "List of accounts"
-msgstr "Lista de contas"
-
-#: ../mail/evolution-mail.schemas.in.h:208
-msgid ""
-"List of accounts known to the mail component of Evolution. The list contains "
-"strings naming subdirectories relative to /apps/evolution/mail/accounts."
-msgstr ""
-"Lista de contas coÃecidas para o compoÃente de correo do Evolution. A lista "
-"contÃn cadeas que nomean subcartafoles relativos a /apps/evolution/mail/"
-"accounts."
-
-#: ../mail/evolution-mail.schemas.in.h:209
-msgid "List of accepted licenses"
-msgstr "Lista de licenzas aceptadas"
-
-#: ../mail/evolution-mail.schemas.in.h:210
-msgid "List of protocol names whose license has been accepted."
-msgstr "Lista de nomes de protocolos coa licenza aceptada."
-
-#: ../mail/evolution-mail.schemas.in.h:213
-msgid "\"Filter Editor\" window height"
-msgstr "Altura da xanela ÂEditor de filtrosÂ"
-
-#: ../mail/evolution-mail.schemas.in.h:214
-msgid ""
-"Initial height of the \"Filter Editor\" window. The value updates as the "
-"user resizes the window vertically."
-msgstr ""
-"Altura inicial da xanela ÂEditor de filtrosÂ. O valor actualÃzase a medida "
-"que o usuario redimensiona a xanela verticalmente."
-
-#: ../mail/evolution-mail.schemas.in.h:215
-msgid "\"Filter Editor\" window maximize state"
-msgstr "Estado maximizado da xanela ÂEditor de filtrosÂ"
-
-#: ../mail/evolution-mail.schemas.in.h:216
-msgid ""
-"Initial maximize state of the \"Filter Editor\" window. The value updates "
-"when the user maximizes or unmaximizes the window. Note, this particular "
-"value is not used by Evolution since the \"Filter Editor\" window cannot be "
-"maximized. This key exists only as an implementation detail."
-msgstr ""
-"Estado inicial maximizado da xanela ÂEditor de filtrosÂ. O valor actualÃzase "
-"cando o usuario maximiza ou restaura a xanela. Nota: este valor en "
-"particular non se usa no Evolution desde que non à posÃbel maximizar a "
-"xanela ÂEditor de filtrosÂ. Esta chave sà existe como un detalle de "
-"implementaciÃn."
-
-#: ../mail/evolution-mail.schemas.in.h:217
-msgid "\"Filter Editor\" window width"
-msgstr "Largura da xanela ÂEditor de filtrosÂ"
-
-#: ../mail/evolution-mail.schemas.in.h:218
-msgid ""
-"Initial width of the \"Filter Editor\" window. The value updates as the user "
-"resizes the window horizontally."
-msgstr ""
-"Largura inicial da xanela ÂEditor de filtrosÂ. O valor actualÃzase a medida "
-"que o usuario redimensiona a xanela horizontalmente."
-
-#: ../mail/evolution-mail.schemas.in.h:220
-msgid ""
-"Whether check for new messages when Evolution is started. This includes also "
-"sending messages from Outbox."
-msgstr ""
-"Indica se debe buscar novas mensaxes ao iniciar o Evolution. InclÃe o envÃo "
-"de mensaxes desde a caixa de saÃda."
-
-#: ../mail/evolution-mail.schemas.in.h:222
-msgid ""
-"Whether check for new messages in all active accounts regardless of the "
-"account \"Check for new messages every X minutes\" option when Evolution is "
-"started. This option is used only together with 'send_recv_on_start' option."
-msgstr ""
-"Indica se hai que buscar mensaxes novas nas contas activas ao iniciar o "
-"Evolution aÃnda que estea marcada a opciÃn ÂComprobar se hai mensaxes novas "
-"cada X minutosÂ. Esta opciÃn Ãsase conxuntamente coa opciÃn "
-"'send_recv_on_start'."
-
-#: ../mail/evolution-mail.schemas.in.h:223
-msgid "\"Send and Receive Mail\" window height"
-msgstr "Altura da xanela ÂEnviar e recibir correoÂ"
-
-#: ../mail/evolution-mail.schemas.in.h:224
-msgid ""
-"Initial height of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window vertically."
-msgstr ""
-"Altura inicial da xanela ÂEnviar e recibir correo electrÃnicoÂ. O valor "
-"actualÃzase a medida que o usuario redimensiona a xanela verticalmente."
-
-#: ../mail/evolution-mail.schemas.in.h:225
-msgid "\"Send and Receive Mail\" window maximize state"
-msgstr "Estado maximizado da xanela ÂEnviar e recibir correoÂ"
-
-#: ../mail/evolution-mail.schemas.in.h:226
-msgid ""
-"Initial maximize state of the \"Send and Receive Mail\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Send and Receive Mail"
-"\" window cannot be maximized. This key exists only as an implementation "
-"detail."
-msgstr ""
-"Estado inicial maximizado da xanela ÂEnviar e recibir correoÂ. O valor "
-"actualÃzase cando o usuario maximiza ou restaura a xanela. Nota: este valor "
-"en particular non se usa no Evolution desde que non à posÃbel maximizar a "
-"xanela ÂEnviar e recibir correoÂ. Esta chave sà existe como un detalle de "
-"implementaciÃn."
-
-#: ../mail/evolution-mail.schemas.in.h:227
-msgid "\"Send and Receive Mail\" window width"
-msgstr "Largura da xanela ÂEnviar e recibir correoÂ"
-
-#: ../mail/evolution-mail.schemas.in.h:228
-msgid ""
-"Initial width of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window horizontally."
-msgstr ""
-"Largura inicial da xanela ÂEnviar e recibir correoÂ. O valor actualÃzase a "
-"medida que o usuario redimensiona a xanela horizontalmente."
-
-#: ../mail/evolution-mail.schemas.in.h:229
-msgid "\"Search Folder Editor\" window height"
-msgstr "Altura da xanela ÂEditor de cartafoles de buscaÂ"
-
-#: ../mail/evolution-mail.schemas.in.h:230
-msgid ""
-"Initial height of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window vertically."
-msgstr ""
-"Altura inicial da xanela ÂEditor do cartafol de buscaÂ. O valor actualÃzase "
-"a medida que o usuario redimensiona a xanela verticalmente."
-
-#: ../mail/evolution-mail.schemas.in.h:231
-msgid "\"Search Folder Editor\" window maximize state"
-msgstr "Estado maximizado da xanela ÂEditor de cartafoles de buscaÂ"
-
-#: ../mail/evolution-mail.schemas.in.h:232
-msgid ""
-"Initial maximize state of the \"Search Folder Editor\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Search Folder Editor\" "
-"window cannot be maximized. This key exists only as an implementation detail."
-msgstr ""
-"Estado inicial maximizado da xanela ÂEditor do cartafol de buscaÂ. O valor "
-"actualÃzase cando o usuario maximiza ou restaura a xanela. Nota: este valor "
-"en particular non se usa no Evolution desde que a xanela ÂEditor do cartafol "
-"de busca non à maximizÃbel. Esta chave sà existe como un detalle de "
-"implementaciÃn."
-
-#: ../mail/evolution-mail.schemas.in.h:233
-msgid "\"Search Folder Editor\" window width"
-msgstr "Largura da xanela ÂEditor de cartafoles de buscaÂ"
-
-#: ../mail/evolution-mail.schemas.in.h:234
-msgid ""
-"Initial width of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window horizontally."
-msgstr ""
-"Largura inicial da xanela ÂEditor do cartafol de buscaÂ. O valor actualÃzase "
-"a medida que o usuario redimensiona a xanela horizontalmente."
-
-#: ../mail/evolution-mail.schemas.in.h:235
-msgid "Drag'n'drop export format"
-msgstr "Formato de exportaciÃn de Arrastrar e soltar"
-
-#: ../mail/evolution-mail.schemas.in.h:236
-msgid ""
-"Define the email export format when doing drag'n'drop. Possible values are "
-"mbox or pdf"
-msgstr ""
-"Define o formato de exportaciÃn de correo-e ao arrastrar e soltar. Os "
-"valores posÃbeis son mbox ou pdf"
-
-#: ../mail/evolution-mail.schemas.in.h:237
-msgid "Format of the drag'n'drop export filename"
-msgstr "Formato do nome do ficheiro exportado por arrastrar e soltar"
-
-#: ../mail/evolution-mail.schemas.in.h:238
-msgid ""
-"Exported filename will be YYYYmmDDHHMMSS_email_title Possible values: 1 (: "
-"email sent date), 2 (: drag'n'drop date)"
-msgstr ""
-"O nome do ficheiro exportado serÃ: AAAmmDDHHMMSS_correo-e_titulo. Os valores "
-"posÃbeis: 1 (: data de envÃo do correo), 2 (: data de arrastre)"
-
-#: ../mail/importers/elm-importer.c:181
-msgid "Importing Elm data"
-msgstr "Importando datos Elm"
-
-#: ../mail/importers/elm-importer.c:353 ../mail/importers/pine-importer.c:451
-#: ../modules/mail/e-mail-shell-view.c:1067
-#: ../widgets/misc/e-send-options.c:538
-msgid "Mail"
-msgstr "Correo"
-
-#: ../mail/importers/elm-importer.c:400
-msgid "Evolution Elm importer"
-msgstr "Importador Elm do Evolution"
-
-#: ../mail/importers/elm-importer.c:401
-msgid "Import mail from Elm."
-msgstr "Importar correo desde o Elm."
-
-#: ../mail/importers/evolution-mbox-importer.c:142
-#: ../plugins/dbx-import/dbx-importer.c:255
-msgid "_Destination folder:"
-msgstr "Cartafol de _destino:"
-
-#: ../mail/importers/evolution-mbox-importer.c:148
-#: ../plugins/dbx-import/dbx-importer.c:261
-#: ../plugins/pst-import/pst-importer.c:570
-msgid "Select folder"
-msgstr "Seleccionar un cartafol"
-
-#: ../mail/importers/evolution-mbox-importer.c:149
-#: ../plugins/dbx-import/dbx-importer.c:262
-#: ../plugins/pst-import/pst-importer.c:571
-msgid "Select folder to import into"
-msgstr "Seleccionar un cartafol ao que importar"
-
-#: ../mail/importers/evolution-mbox-importer.c:438
-msgctxt "mboxImp"
-msgid "Subject"
-msgstr "Asunto"
-
-#: ../mail/importers/evolution-mbox-importer.c:443
-msgctxt "mboxImp"
-msgid "From"
-msgstr "De"
-
-#: ../mail/importers/evolution-mbox-importer.c:487
-#: ../shell/e-shell-utils.c:195
-msgid "Berkeley Mailbox (mbox)"
-msgstr "Caixa de correo Berkeley (mbox)"
-
-#: ../mail/importers/evolution-mbox-importer.c:488
-msgid "Importer Berkeley Mailbox format folders"
-msgstr "Importador de cartafoles no formato caixa de correo de Berkeley"
-
-#: ../mail/importers/mail-importer.c:63
-msgid "Importing mailbox"
-msgstr "Importando a caixa de correo"
+#: ../mail/importers/mail-importer.c:63
+msgid "Importing mailbox"
+msgstr "Importando a caixa de correo"
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:153
@@ -13603,19 +12881,19 @@ msgstr "Importando Â%sÂ"
 msgid "Scanning %s"
 msgstr "Examinando %s"
 
-#: ../mail/importers/pine-importer.c:253
+#: ../mail/importers/pine-importer.c:251
 msgid "Importing Pine data"
 msgstr "Importando datos do Pine"
 
-#: ../mail/importers/pine-importer.c:458
+#: ../mail/importers/pine-importer.c:430
 msgid "Address Book"
 msgstr "Axenda de enderezos"
 
-#: ../mail/importers/pine-importer.c:506
+#: ../mail/importers/pine-importer.c:478
 msgid "Evolution Pine importer"
 msgstr "Importador Pine do Evolution"
 
-#: ../mail/importers/pine-importer.c:507
+#: ../mail/importers/pine-importer.c:479
 msgid "Import mail from Pine."
 msgstr "Importar correo do Pine."
 
@@ -14590,7 +13868,7 @@ msgid "Do _Not Disable"
 msgstr "_Non desactivar"
 
 #: ../mail/mail.error.xml.h:87
-#: ../plugins/publish-calendar/publish-calendar.c:611
+#: ../plugins/publish-calendar/publish-calendar.c:628
 msgid "_Disable"
 msgstr "_Desactivar"
 
@@ -14927,27 +14205,27 @@ msgstr "A impresora respondeu &quot;{0}&quot;."
 msgid "Could not perform this operation on {0}."
 msgstr "Non à posÃbel realizar esta operaciÃn en {0}."
 
-#: ../mail/mail-send-recv.c:205
+#: ../mail/mail-send-recv.c:202
 msgid "Canceling..."
 msgstr "Cancelandoâ"
 
-#: ../mail/mail-send-recv.c:521
+#: ../mail/mail-send-recv.c:518
 msgid "Send & Receive Mail"
 msgstr "Enviar e recibir o correo"
 
-#: ../mail/mail-send-recv.c:537
+#: ../mail/mail-send-recv.c:534
 msgid "Cancel _All"
 msgstr "Cancel_ar todo"
 
-#: ../mail/mail-send-recv.c:629 ../mail/mail-send-recv.c:1006
+#: ../mail/mail-send-recv.c:626 ../mail/mail-send-recv.c:1003
 msgid "Updating..."
 msgstr "Actualizandoâ"
 
-#: ../mail/mail-send-recv.c:629 ../mail/mail-send-recv.c:711
+#: ../mail/mail-send-recv.c:626 ../mail/mail-send-recv.c:708
 msgid "Waiting..."
 msgstr "Agardandoâ"
 
-#: ../mail/mail-send-recv.c:986
+#: ../mail/mail-send-recv.c:983
 #, c-format
 msgid "Checking for new mail"
 msgstr "Comprobando se hai correo novo"
@@ -15124,37 +14402,9 @@ msgstr "O remitente contÃn"
 msgid "Body contains"
 msgstr "O corpo contÃn"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
-msgid "EFolderList XML for the list of completion URIs"
-msgstr "EFolderList XML para a lista de completado dos URIs"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
-msgid "EFolderList XML for the list of completion URIs."
-msgstr "EFolderList XML para a lista de completado dos URIs."
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
-msgid ""
-"The UID of the selected (or \"primary\") address book in the sidebar of the "
-"\"Contacts\" view."
-msgstr ""
-"O UID da axenda de enderezos seleccionada (ou a primaria) na barra lateral "
-"da vista de ÂContactosÂ."
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
-msgid "Whether to show maps in preview pane."
-msgstr "Indica se se mostran os mapas no panel de vista previa."
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:22
-msgid ""
-"Whether addresses should be formatted according to standard in their "
-"destination country."
-msgstr ""
-"Indica se se deben formatar os enderezos segundo o estÃndar do paÃs de "
-"destino."
-
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:96
-#: ../modules/mail/em-mailer-prefs.c:1071
+#: ../modules/mail/em-mailer-prefs.c:1069
 msgid "_Table column:"
 msgstr "Columna da _tÃboa:"
 
@@ -15230,7 +14480,7 @@ msgid "Create a new address book"
 msgstr "Crear unha axenda de enderezos nova"
 
 #: ../modules/addressbook/e-book-shell-backend.c:274
-#: ../modules/addressbook/e-book-shell-view.c:346
+#: ../modules/addressbook/e-book-shell-view.c:351
 msgid "Contacts"
 msgstr "Contactos"
 
@@ -15490,23 +14740,23 @@ msgstr "_Gardar como vCardâ"
 msgid "Save selected contacts as a vCard"
 msgstr "Gardar os contactos seleccionados como unha VCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:290
+#: ../modules/addressbook/e-book-shell-view.c:295
 msgid "_Forward Contacts"
 msgstr "_ReencamiÃar os contactos"
 
-#: ../modules/addressbook/e-book-shell-view.c:292
+#: ../modules/addressbook/e-book-shell-view.c:297
 msgid "_Forward Contact"
 msgstr "_ReencamiÃar o contacto"
 
-#: ../modules/addressbook/e-book-shell-view.c:323
+#: ../modules/addressbook/e-book-shell-view.c:328
 msgid "_Send Message to Contacts"
 msgstr "Enviar unha _mensaxe aos contactos"
 
-#: ../modules/addressbook/e-book-shell-view.c:325
+#: ../modules/addressbook/e-book-shell-view.c:330
 msgid "_Send Message to List"
 msgstr "Enviar unha _mensaxe à lista"
 
-#: ../modules/addressbook/e-book-shell-view.c:327
+#: ../modules/addressbook/e-book-shell-view.c:332
 msgid "_Send Message to Contact"
 msgstr "Enviar unha _mensaxe ao contacto"
 
@@ -15683,106 +14933,106 @@ msgstr "R_estabelecer os datos do Evolutionâ"
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Restabelecer os datos e os axustes do Evolution desde un ficheiro"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:75
+#: ../modules/backup-restore/evolution-backup-tool.c:81
 msgid "Back up Evolution directory"
 msgstr "Facer unha copia de seguranza do directorio do Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:77
+#: ../modules/backup-restore/evolution-backup-tool.c:83
 msgid "Restore Evolution directory"
 msgstr "Restabelecer o directorio do Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:79
+#: ../modules/backup-restore/evolution-backup-tool.c:85
 msgid "Check Evolution Back up"
 msgstr "Comprobar a copia de seguranza do Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:81
+#: ../modules/backup-restore/evolution-backup-tool.c:87
 msgid "Restart Evolution"
 msgstr "Reiniciar o Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:83
+#: ../modules/backup-restore/evolution-backup-tool.c:89
 msgid "With Graphical User Interface"
 msgstr "Con interface grÃfica de usuario"
 
 #. FIXME Will the versioned setting always work?
-#: ../modules/backup-restore/evolution-backup-tool.c:306
-#: ../modules/backup-restore/evolution-backup-tool.c:430
+#: ../modules/backup-restore/evolution-backup-tool.c:312
+#: ../modules/backup-restore/evolution-backup-tool.c:441
 msgid "Shutting down Evolution"
 msgstr "Pechando o Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:315
+#: ../modules/backup-restore/evolution-backup-tool.c:321
 msgid "Backing Evolution accounts and settings"
 msgstr "Facendo unha copia de seguranza das contas e axustes do Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:327
+#: ../modules/backup-restore/evolution-backup-tool.c:338
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Facendo unha copia de seguranza dos datos do Evolution (correos, contactos, "
 "calendarios, tarefas e notas)"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:343
+#: ../modules/backup-restore/evolution-backup-tool.c:354
 msgid "Back up complete"
 msgstr "Copia de seguranza completada"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:350
-#: ../modules/backup-restore/evolution-backup-tool.c:579
+#: ../modules/backup-restore/evolution-backup-tool.c:361
+#: ../modules/backup-restore/evolution-backup-tool.c:608
 msgid "Restarting Evolution"
 msgstr "Reiniciando o Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:436
+#: ../modules/backup-restore/evolution-backup-tool.c:447
 msgid "Back up current Evolution data"
 msgstr "Facer unha copia de seguranza dos datos actuais do Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:444
+#: ../modules/backup-restore/evolution-backup-tool.c:455
 msgid "Extracting files from back up"
 msgstr "Extraendo os ficheiros desde a copia de seguranza"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:513
+#: ../modules/backup-restore/evolution-backup-tool.c:524
 msgid "Loading Evolution settings"
 msgstr "Cargando os axustes do Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:549
+#: ../modules/backup-restore/evolution-backup-tool.c:578
 msgid "Removing temporary back up files"
 msgstr "Eliminando os ficheiros temporais da copia de seguranza"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:561
+#: ../modules/backup-restore/evolution-backup-tool.c:590
 msgid "Reloading registry service"
 msgstr "Recargando o servizo de rexistro"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:776
+#: ../modules/backup-restore/evolution-backup-tool.c:815
 msgid "Evolution Back Up"
 msgstr "Respaldo de Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:777
+#: ../modules/backup-restore/evolution-backup-tool.c:816
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Facendo a copia de seguranza no cartafol %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:781
+#: ../modules/backup-restore/evolution-backup-tool.c:820
 msgid "Evolution Restore"
 msgstr "Restabelecemento do Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:782
+#: ../modules/backup-restore/evolution-backup-tool.c:821
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Restabelecendo desde o cartafol %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:850
+#: ../modules/backup-restore/evolution-backup-tool.c:889
 msgid "Backing up Evolution Data"
 msgstr "Facendo unha copia de seguranza dos datos do Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:851
+#: ../modules/backup-restore/evolution-backup-tool.c:890
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Agarde mentres o Evolution fai unha copia de seguranza dos datos."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:853
+#: ../modules/backup-restore/evolution-backup-tool.c:892
 msgid "Restoring Evolution Data"
 msgstr "Restabelecendo os datos do Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:854
+#: ../modules/backup-restore/evolution-backup-tool.c:893
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Agarde mentres o Evolution restabelece os datos."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:872
+#: ../modules/backup-restore/evolution-backup-tool.c:911
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 "Isto poderÃa levar algÃn tempo dependendo da cantidade de datos da sÃa conta."
@@ -15856,15 +15106,15 @@ msgstr ""
 msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr "Bogofilter colgouse ou fallou ao procesar unha mensaxe de correo"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:315
+#: ../modules/bogofilter/evolution-bogofilter.c:318
 msgid "Bogofilter Options"
 msgstr "OpciÃns do Bogofilter"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:324
+#: ../modules/bogofilter/evolution-bogofilter.c:327
 msgid "Convert message text to _Unicode"
 msgstr "Converter o texto da mensaxe a _Unicode"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:480
+#: ../modules/bogofilter/evolution-bogofilter.c:483
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
@@ -15994,19 +15244,6 @@ msgstr "URL:"
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Evitar o IfMatch (necesario no Apache < 2.2.8)"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:264
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:200
-msgid "Choose a Calendar"
-msgstr "Elixir un calendario"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:267
-msgid "Choose a Memo List"
-msgstr "Elixir unha lista de notas"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:270
-msgid "Choose a Task List"
-msgstr "Elixir unha lista de tarefas"
-
 #: ../modules/cal-config-caldav/e-caldav-chooser.c:398
 #, c-format
 msgid "HTTP Error: %s"
@@ -16032,27 +15269,40 @@ msgstr "Non foi posÃbel atopar ningÃn calendario do usuario."
 msgid "Path"
 msgstr "Ruta"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:259
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:264
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:200
+msgid "Choose a Calendar"
+msgstr "Elixir un calendario"
+
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:267
+msgid "Choose a Memo List"
+msgstr "Elixir unha lista de notas"
+
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:270
+msgid "Choose a Task List"
+msgstr "Elixir unha lista de tarefas"
+
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:269
 msgid "Find Calendars"
 msgstr "Buscar calendarios"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:262
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:272
 msgid "Find Memo Lists"
 msgstr "Buscar lista de notas"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:265
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:275
 msgid "Find Task Lists"
 msgstr "Buscar listas de tarefas"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:283
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:293
 msgid "Path:"
 msgstr "Ruta:"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:289
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:299
 msgid "Email:"
 msgstr "Correo electrÃnico:"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:294
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:304
 msgid "Server handles meeting invitations"
 msgstr "O servidor xestiona os convites a reuniÃns"
 
@@ -16109,381 +15359,38 @@ msgstr "Anglo-saxÃn (Fahrenheit, polgadas etc.)"
 msgid "Units:"
 msgstr "Unidades:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
-msgid ""
-"The UID of the selected (or \"primary\") calendar in the sidebar of the "
-"\"Calendar\" view."
-msgstr ""
-"UID do calendario seleccionado ou primario na barra lateral da vista de "
-"ÂCalendariosÂ."
+#: ../modules/calendar/e-cal-attachment-handler.c:323
+#: ../smime/gui/smime-ui.ui.h:32
+msgid "I_mport"
+msgstr "I_mportar"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
-msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
-msgstr ""
-"Fuso horario predeterminado para usar nas datas e horas do calendario, como "
-"unha localizaciÃn sen traducir da base de datos de fusos horarios Olsen, p."
-"e:ÂAmerica/New YorkÂ."
+#: ../modules/calendar/e-cal-attachment-handler.c:409
+msgid "Select a Calendar"
+msgstr "Seleccionar un calendario"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
-msgid "Use the system timezone instead of the timezone selected in Evolution."
-msgstr ""
-"Usar o fuso horario do sistema en vez do fuso horario seleccionado no "
-"Evolution."
+#: ../modules/calendar/e-cal-attachment-handler.c:436
+msgid "Select a Task List"
+msgstr "Seleccionar unha lista de tarefas"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
-msgid ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a 'timezone' key."
-msgstr ""
-"Mostra os fusos horarios secundarios nunha vista diaria se està "
-"estabelecido. O valor à semellante ao usado na chave ÂtimezoneÂ."
+#: ../modules/calendar/e-cal-attachment-handler.c:446
+msgid "I_mport to Calendar"
+msgstr "I_mportar ao calendario"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
-msgid "List of recently used second time zones in a Day View."
-msgstr ""
-"Lista dos fusos horarios secundarios usados recentemente cunha vista diaria."
+#: ../modules/calendar/e-cal-attachment-handler.c:453
+msgid "I_mport to Tasks"
+msgstr "_Importar Ãs tarefas"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
-msgid "Maximum number of recently used timezones to remember."
-msgstr ""
-"O nÃmero mÃximo de fusos horarios usados recentemente que hai que recordar."
+#: ../modules/calendar/e-calendar-preferences.c:406
+msgid "Selected Calendars for Alarms"
+msgstr "Seleccionar calendario para alarmas"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
-msgid ""
-"Maximum number of recently used timezones to remember in a "
-"'day_second_zones' list."
-msgstr ""
-"O nÃmero mÃximo de fusos horarios usados recentemente para recordar nunha "
-"lista 'day_second_zones'."
+#: ../modules/calendar/e-calendar-preferences.c:828
+msgid "Ti_me and date:"
+msgstr "_Hora e data:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
-msgstr ""
-"Indica se se mostran as horas en formato de vinte e catro horas en vez de "
-"usar am/pm."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
-msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-msgstr "O dÃa no que comeza a semana, desde o domingo (0) ata o sÃbado (6)."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
-msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
-msgstr ""
-"Hora do fin da xornada laboral, en formato de vinte e catro horas, de 0 a 23."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
-msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr ""
-"Os intervalos de tempo mostrados nas vistas diaria e de semana laboral, en "
-"minutos."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
-msgid ""
-"Position of the horizontal pane, between the date navigator calendar and the "
-"task list when not in the month view, in pixels."
-msgstr ""
-"PosiciÃn do panel horizontal entre o navegador de datas do calendario e a "
-"lista de tarefas cando non està na vista mensual, en pÃxeles."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
-msgid "Vertical pane position"
-msgstr "PosiciÃn vertical do panel"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list when not in the month view, in pixels."
-msgstr ""
-"PosiciÃn do panel vertical entre a vista, o navegador de datas do calendario "
-"e a lista de tarefas cando non està na vista mensual, en pÃxeles."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
-msgid ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
-msgstr ""
-"PosiciÃn do panel horizontal entre a visualizaciÃn, o navegador de datas do "
-"calendario e a lista de tarefas na vista mensual, en pÃxeles."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
-msgstr ""
-"PosiciÃn do panel vertical entre a vista, o navegador de datas do calendario "
-"e a lista de tarefas na vista mensual, en pÃxeles."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
-msgstr ""
-"PosiciÃn do panel vertical entre as listas do calendario e o navegador de "
-"datas do calendario."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the memo list. \"0\" (Classic View) places the preview pane below the memo "
-"list. \"1\" (Vertical View) places the preview pane next to the memo list."
-msgstr ""
-"O estilo da disposiciÃn determina onde dispoÃer o panel de vista previa en "
-"relaciÃn coa lista de notas. Â0Â (vista clÃsica) mostra o panel de vista "
-"previa embaixo da lista de notas. Â1Â (vista vertical) mostra o panel de "
-"vista previa ao lado da lista de notas."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
-msgid "If \"true\", show the memo preview pane in the main window."
-msgstr ""
-"Se à verdadeiro, mÃstrase o panel de vista previa das notas na xanela "
-"principal."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
-msgid "Position of the task preview pane when oriented horizontally."
-msgstr ""
-"PosiciÃn do panel de vista previa de tarefas cando està orientado "
-"horizontalmente."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
-msgid "Position of the memo preview pane when oriented vertically."
-msgstr ""
-"PosiciÃn do panel de vista previa de notas cando està orientado "
-"verticalmente."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the task list. \"0\" (Classic View) places the preview pane below the task "
-"list. \"1\" (Vertical View) places the preview pane next to the task list."
-msgstr ""
-"O estilo de disposiciÃn determina onde dispoÃer o panel de vista previa en "
-"relaciÃn coa lista de tarefas. Â0Â (vista clÃsica) mostra o panel de vista "
-"previa embaixo da lista de tarefas. Â1Â (vista vertical) mostra o panel de "
-"vista previa ao lado da lista de tarefas."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
-msgid "If \"true\", show the task preview pane in the main window."
-msgstr ""
-"Se à verdadeiro, mÃstrase o panel de vista previa de tarefas na xanela "
-"principal."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
-msgid "Position of the task preview pane when oriented vertically."
-msgstr ""
-"PosiciÃn do panel de vista previa de tarefas cando està orientado "
-"verticalmente."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
-msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday."
-msgstr ""
-"Indica se se comprimen as fins de semana na vista mensual. Isto pon o sÃbado "
-"e o domingo no mesmo espazo que un dÃa laborÃbel."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:66
-msgid "Whether to display the end time of events in the week and month views."
-msgstr ""
-"Indica se se mostra a hora de finalizaciÃn das actividades nas vistas "
-"semanais e mensuais."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:68
-msgid "Days on which the start and end of work hours should be indicated."
-msgstr "DÃas nos que debe indicarse o inicio e fin das horas de traballo."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:70
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-msgstr ""
-"Indica se se debuxa a liÃa Marcus Bains (liÃa na hora actual) no calendario."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
-msgid "Color to draw the Marcus Bains line in the Day View."
-msgstr "Cor para debuxar a liÃa de Marcus Bains na vista diaria."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:74
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
-msgstr ""
-"Cor para debuxar a liÃa de Marcus Bains na barra de tempo (baleiro para a "
-"predeterminada)."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:76
-msgid "Show days with recurrent events in italic font in bottom left calendar."
-msgstr ""
-"Mostrar en cursiva os dÃas con actividades con repeticiÃns no calendario "
-"inferior esquerdo."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:78
-msgid ""
-"The UID of the selected (or \"primary\") memo list in the sidebar of the "
-"\"Memos\" view."
-msgstr ""
-"UID da lista de notas seleccionada ou primaria da barra lateral da vista de "
-"ÂNotasÂ."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:80
-msgid ""
-"The UID of the selected (or \"primary\") task list in the sidebar of the "
-"\"Tasks\" view."
-msgstr ""
-"UID da lista de tarefas seleccionada ou primaria na barra lateral da vista "
-"de ÂTarefasÂ."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:82
-msgid "Whether to hide completed tasks in the tasks view."
-msgstr "Indica se se ocultan as tarefas terminadas na vista de tarefas."
-
-# (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"Unidades para determinar cando ocultar as tarefas: ÂminutosÂ, Âhoras ou "
-"ÂdÃasÂ."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:86
-msgid "Number of units for determining when to hide tasks."
-msgstr "NÃmero de unidades para determinar cando ocultar as tarefas."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
-msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr "Cor de fondo para as tarefas que vencen hoxe, no formato Â#rrggbbÂ."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:90
-msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr "Cor de fondo para as tarefas atrasadas, no formato Â#rrggbbÂ."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:92
-msgid "Whether to ask for confirmation when deleting an appointment or task."
-msgstr "Indica se se solicita confirmaciÃn ao eliminar unha cita ou tarefa."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
-msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr ""
-"Indica se se solicita a confirmaciÃn antes de expurgar as citas ou as "
-"tarefas."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:96
-msgid "Whether to set a default reminder for appointments."
-msgstr "Indica se se estabelece un aviso predeterminado para as citas."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98
-msgid "Number of units for determining a default reminder."
-msgstr "NÃmero de unidades para determinar un aviso predeterminado."
-
-# (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
-msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr "Unidades para un aviso predeterminado:  ÂminutosÂ, Âhoras ou ÂdÃasÂ."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:102
-msgid "Whether to set a reminder for birthdays and anniversaries."
-msgstr "Indica se se estabelece un aviso para os aniversarios."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:104
-msgid "Number of units for determining a birthday or anniversary reminder."
-msgstr "NÃmero de unidades para determinar un aviso de aniversario."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
-msgid ""
-"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-"\"days\"."
-msgstr "Unidades para os avisos de aniversario, ÂminutosÂ, Âhoras ou ÂdÃasÂ."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:108
-msgid "Whether to show week numbers in various places in the Calendar."
-msgstr ""
-"Indica se se mostran os nÃmeros de semana en diferentes lugares do "
-"calendario."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:109
-msgid "Scroll Month View by a week"
-msgstr "Desprazar a vista mensual unha semana"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:110
-msgid "Whether to scroll a Month View by a week, not by a month."
-msgstr "Indica se se despraza a vista mensual por semana e non por mes."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:112
-msgid "Time the last reminder ran, in time_t."
-msgstr "A hora na que se executou o Ãltimo recordatorio, en time_t."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:113
-msgid "Calendars to run reminders for"
-msgstr "Os calendarios nos que se activarÃn os recordatorios"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
-msgid "Programs that are allowed to be run by reminders."
-msgstr "Programas que se poden executar desde os recordatorios"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:117
-msgid "Whether or not to use the notification tray for display reminders."
-msgstr ""
-"Indica se se debe usar a bandexa de notificaciÃn para mostrar os "
-"recordatorios."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:118
-msgid "Free/busy server URLs"
-msgstr "Os URLs dos servidores de dispoÃibilidade"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
-msgid "List of server URLs for free/busy publishing."
-msgstr "Lista dos URLs do servidor para publicaciÃn de dispoÃibilidade."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
-#, no-c-format
-msgid ""
-"The URL template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
-msgstr ""
-"Modelo URL para usar na recuperaciÃn de datos de dispoÃibilidade: %u "
-"substitÃese pola parte de usuario do enderezo de correo, e %d substitÃese "
-"polo dominio."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:127
-msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
-msgstr ""
-"Isto pode ter tres valores diferentes: 0 para erros, 1 para avisos e 2 para "
-"as mensaxes de depuraciÃn."
-
-#: ../modules/calendar/e-cal-attachment-handler.c:323
-#: ../smime/gui/smime-ui.ui.h:32
-msgid "I_mport"
-msgstr "I_mportar"
-
-#: ../modules/calendar/e-cal-attachment-handler.c:409
-msgid "Select a Calendar"
-msgstr "Seleccionar un calendario"
-
-#: ../modules/calendar/e-cal-attachment-handler.c:436
-msgid "Select a Task List"
-msgstr "Seleccionar unha lista de tarefas"
-
-#: ../modules/calendar/e-cal-attachment-handler.c:446
-msgid "I_mport to Calendar"
-msgstr "I_mportar ao calendario"
-
-#: ../modules/calendar/e-cal-attachment-handler.c:453
-msgid "I_mport to Tasks"
-msgstr "_Importar Ãs tarefas"
-
-#: ../modules/calendar/e-calendar-preferences.c:406
-msgid "Selected Calendars for Alarms"
-msgstr "Seleccionar calendario para alarmas"
-
-#: ../modules/calendar/e-calendar-preferences.c:828
-msgid "Ti_me and date:"
-msgstr "_Hora e data:"
-
-#: ../modules/calendar/e-calendar-preferences.c:829
-msgid "_Date only:"
-msgstr "SÃ a _data:"
+#: ../modules/calendar/e-calendar-preferences.c:829
+msgid "_Date only:"
+msgstr "SÃ a _data:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:8
 msgid "Minutes"
@@ -16747,7 +15654,7 @@ msgstr "Cale_ndario"
 msgid "Create a new calendar"
 msgstr "Crear un calendario novo"
 
-#: ../modules/calendar/e-cal-shell-backend.c:593
+#: ../modules/calendar/e-cal-shell-backend.c:597
 msgid "Calendar and Tasks"
 msgstr "Calendario e tarefas"
 
@@ -16759,7 +15666,7 @@ msgstr "Cargando os calendarios"
 msgid "Calendar Selector"
 msgstr "Selector de calendario"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:1054
+#: ../modules/calendar/e-cal-shell-sidebar.c:1066
 #, c-format
 msgid "Opening calendar '%s'"
 msgstr "Abrindo o calendario Â%sÂ"
@@ -17236,7 +16143,7 @@ msgstr "Cargando as notas"
 msgid "Memo List Selector"
 msgstr "Selector de lista de notas"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:939
+#: ../modules/calendar/e-memo-shell-sidebar.c:951
 #, c-format
 msgid "Opening memo list '%s'"
 msgstr "Abrindo a lista de notas Â%sÂ"
@@ -17310,11 +16217,11 @@ msgstr "Imprimir a lista de notas"
 msgid "Preview the list of memos to be printed"
 msgstr "Previsualizar a lista de notas para imprimir"
 
-#: ../modules/calendar/e-memo-shell-view.c:230
+#: ../modules/calendar/e-memo-shell-view.c:233
 msgid "Delete Memos"
 msgstr "Eliminar as notas"
 
-#: ../modules/calendar/e-memo-shell-view.c:232
+#: ../modules/calendar/e-memo-shell-view.c:235
 msgid "Delete Memo"
 msgstr "Eliminar a nota"
 
@@ -17368,7 +16275,7 @@ msgstr "Cargando as tarefas"
 msgid "Task List Selector"
 msgstr "Selector de lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:939
+#: ../modules/calendar/e-task-shell-sidebar.c:951
 #, c-format
 msgid "Opening task list '%s'"
 msgstr "Abrindo as tarefas Â%sÂ"
@@ -17490,11 +16397,11 @@ msgstr "Imprimir a lista de tarefas"
 msgid "Preview the list of tasks to be printed"
 msgstr "Previsualizar a lista de tarefas para imprimir"
 
-#: ../modules/calendar/e-task-shell-view.c:365
+#: ../modules/calendar/e-task-shell-view.c:368
 msgid "Delete Tasks"
 msgstr "Eliminar as tarefas"
 
-#: ../modules/calendar/e-task-shell-view.c:367
+#: ../modules/calendar/e-task-shell-view.c:370
 msgid "Delete Task"
 msgstr "Eliminar a tarefa"
 
@@ -18280,73 +17187,174 @@ msgstr "Formatador iTip"
 msgid "Display \"text/calendar\" MIME parts in mail messages."
 msgstr "Mostrar as partes MIME do texto/calendario nas mensaxes de correo."
 
-# (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../modules/mail/e-mail-attachment-handler.c:390
-#, c-format
-msgid "%d attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "%d mensaxe anexada"
-msgstr[1] "%d mensaxes anexadas"
-
-#: ../modules/mail/e-mail-shell-backend.c:248
-msgctxt "New"
-msgid "_Mail Message"
-msgstr "_Mensaxe de correo"
+#: ../modules/mail-config/e-mail-config-google-summary.c:252
+msgid "Google Features"
+msgstr "CaracterÃsticas de Google"
 
-#: ../modules/mail/e-mail-shell-backend.c:250
-msgid "Compose a new mail message"
-msgstr "Escribir unha mensaxe de correo nova"
+#: ../modules/mail-config/e-mail-config-google-summary.c:261
+msgid "Add Google Ca_lendar to this account"
+msgstr "Engadir un ca_lendario de Google a esta conta"
 
-#: ../modules/mail/e-mail-shell-backend.c:258
-msgctxt "New"
-msgid "Mail Acco_unt"
-msgstr "Conta de _correo"
+#: ../modules/mail-config/e-mail-config-google-summary.c:269
+msgid "Add Google Con_tacts to this account"
+msgstr "Engadir un con_tacto de Google a esta conta"
 
-#: ../modules/mail/e-mail-shell-backend.c:260
-msgid "Create a new mail account"
-msgstr "Crear unha nova conta de correo"
+#: ../modules/mail-config/e-mail-config-google-summary.c:277
+msgid "You may need to enable IMAP access"
+msgstr "Pode que deba activar o acceso IMAP"
 
-#: ../modules/mail/e-mail-shell-backend.c:265
-msgctxt "New"
-msgid "Mail _Folder"
-msgstr "Carta_fol de correo"
+#: ../modules/mail-config/e-mail-config-local-accounts.c:246
+#: ../modules/mail-config/e-mail-config-local-accounts.c:292
+msgid "Mail _Directory:"
+msgstr "_Directorio de correo:"
 
-#: ../modules/mail/e-mail-shell-backend.c:267
-msgid "Create a new mail folder"
-msgstr "Crear un novo cartafol de correo"
+#: ../modules/mail-config/e-mail-config-local-accounts.c:247
+msgid "Choose a MH mail directory"
+msgstr "Seleccione un directorio de correo MH"
 
-#: ../modules/mail/e-mail-shell-backend.c:478
-msgid "Mail Accounts"
-msgstr "Contas de correo"
+#: ../modules/mail-config/e-mail-config-local-accounts.c:269
+msgid "Local Delivery _File:"
+msgstr "_Ficheiro de envÃo local:"
 
-#: ../modules/mail/e-mail-shell-backend.c:487
-msgid "Mail Preferences"
-msgstr "Preferencias de correo"
+#: ../modules/mail-config/e-mail-config-local-accounts.c:270
+msgid "Choose a local delivery file"
+msgstr "Seleccione un ficheiro de envÃo local"
 
-#: ../modules/mail/e-mail-shell-backend.c:496
-msgid "Composer Preferences"
-msgstr "Preferencias do editor"
+#: ../modules/mail-config/e-mail-config-local-accounts.c:293
+msgid "Choose a Maildir mail directory"
+msgstr "Seleccione un cartafol de correo Maildir"
 
-#: ../modules/mail/e-mail-shell-backend.c:505
-msgid "Network Preferences"
-msgstr "Preferencias de rede"
+#: ../modules/mail-config/e-mail-config-local-accounts.c:315
+msgid "Spool _File:"
+msgstr "_Ficheiro Spool:"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1251
-#: ../modules/mail/e-mail-shell-view.c:967
-msgid "_Disable Account"
-msgstr "_Desactivar a conta"
+#: ../modules/mail-config/e-mail-config-local-accounts.c:316
+msgid "Choose a mbox spool file"
+msgstr "Seleccione un ficheiro spool de mbox"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1253
-msgid "Disable this account"
-msgstr "Desactivar esta conta"
+#: ../modules/mail-config/e-mail-config-local-accounts.c:338
+msgid "Spool _Directory:"
+msgstr "_Cartafol Spool"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1260
-msgid "Permanently remove all the deleted messages from all folders"
-msgstr ""
-"Eliminar permanentemente todas as mensaxes eliminadas de todos os cartafoles"
+#: ../modules/mail-config/e-mail-config-local-accounts.c:339
+msgid "Choose a mbox spool directory"
+msgstr "Seleccione un cartafol spool de mbox"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1267
-msgid "Edit properties of this account"
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:149
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:81
+#: ../modules/plugin-manager/evolution-plugin-manager.c:160
+msgid "Configuration"
+msgstr "ConfiguraciÃn"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:167
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:99
+#: ../plugins/publish-calendar/publish-calendar.ui.h:24
+msgid "_Server:"
+msgstr "_Servidor:"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:193
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:228
+msgid "User_name:"
+msgstr "_Nome do usuario:"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:226
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:149
+msgid "Encryption _method:"
+msgstr "_MÃtodo de cifrado:"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:241
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:164
+msgid "STARTTLS after connecting"
+msgstr "STARTTLS despois de conectarse"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:168
+msgid "SSL on a dedicated port"
+msgstr "SSL nun porto adicado"
+
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:124
+msgid "Ser_ver requires authentication"
+msgstr "O ser_vidor solicita autenticaciÃn"
+
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:210
+msgid "T_ype:"
+msgstr "T_ipo:"
+
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:247
+msgid "Yahoo! Features"
+msgstr "CaracterÃsticas de Yahoo!"
+
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:256
+msgid "Add Yahoo! Ca_lendar and Tasks to this account"
+msgstr "Engadir Ca_lendario e Tarefas de Yahoo! a esta conta"
+
+# (pofilter) variables: (u'translation contains variables not in original: %d',)
+#: ../modules/mail/e-mail-attachment-handler.c:390
+#, c-format
+msgid "%d attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "%d mensaxe anexada"
+msgstr[1] "%d mensaxes anexadas"
+
+#: ../modules/mail/e-mail-shell-backend.c:248
+msgctxt "New"
+msgid "_Mail Message"
+msgstr "_Mensaxe de correo"
+
+#: ../modules/mail/e-mail-shell-backend.c:250
+msgid "Compose a new mail message"
+msgstr "Escribir unha mensaxe de correo nova"
+
+#: ../modules/mail/e-mail-shell-backend.c:258
+msgctxt "New"
+msgid "Mail Acco_unt"
+msgstr "Conta de _correo"
+
+#: ../modules/mail/e-mail-shell-backend.c:260
+msgid "Create a new mail account"
+msgstr "Crear unha nova conta de correo"
+
+#: ../modules/mail/e-mail-shell-backend.c:265
+msgctxt "New"
+msgid "Mail _Folder"
+msgstr "Carta_fol de correo"
+
+#: ../modules/mail/e-mail-shell-backend.c:267
+msgid "Create a new mail folder"
+msgstr "Crear un novo cartafol de correo"
+
+#: ../modules/mail/e-mail-shell-backend.c:478
+msgid "Mail Accounts"
+msgstr "Contas de correo"
+
+#: ../modules/mail/e-mail-shell-backend.c:487
+msgid "Mail Preferences"
+msgstr "Preferencias de correo"
+
+#: ../modules/mail/e-mail-shell-backend.c:496
+msgid "Composer Preferences"
+msgstr "Preferencias do editor"
+
+#: ../modules/mail/e-mail-shell-backend.c:505
+msgid "Network Preferences"
+msgstr "Preferencias de rede"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1251
+#: ../modules/mail/e-mail-shell-view.c:970
+msgid "_Disable Account"
+msgstr "_Desactivar a conta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1253
+msgid "Disable this account"
+msgstr "Desactivar esta conta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1260
+msgid "Permanently remove all the deleted messages from all folders"
+msgstr ""
+"Eliminar permanentemente todas as mensaxes eliminadas de todos os cartafoles"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1267
+msgid "Edit properties of this account"
 msgstr "Modificar as propiedades desta conta"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1272
@@ -18648,7 +17656,7 @@ msgstr "Buscar en todas as contas"
 msgid "Account Search"
 msgstr "Buscar na conta"
 
-#: ../modules/mail/e-mail-shell-view.c:965
+#: ../modules/mail/e-mail-shell-view.c:968
 msgid "Proxy _Logout"
 msgstr "_Terminar a sesiÃn proxy"
 
@@ -18737,124 +17745,23 @@ msgstr "Unha vez à semana"
 msgid "Once per month"
 msgstr "Unha vez ao mes"
 
-#: ../modules/mail/em-mailer-prefs.c:290
+#: ../modules/mail/em-mailer-prefs.c:286
 msgid "Header"
 msgstr "Cabeceira"
 
-#: ../modules/mail/em-mailer-prefs.c:294
+#: ../modules/mail/em-mailer-prefs.c:290
 msgid "Contains Value"
 msgstr "ContÃn o valor"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1073
+#: ../modules/mail/em-mailer-prefs.c:1071
 msgid "_Date header:"
 msgstr "_Cabeceira da data:"
 
-#: ../modules/mail/em-mailer-prefs.c:1074
+#: ../modules/mail/em-mailer-prefs.c:1072
 msgid "Show _original header value"
 msgstr "Mostrar o valor _orixinal da cabeceira"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:247
-msgid "Google Features"
-msgstr "CaracterÃsticas de Google"
-
-#: ../modules/mail-config/e-mail-config-google-summary.c:256
-msgid "Add Google Ca_lendar to this account"
-msgstr "Engadir un ca_lendario de Google a esta conta"
-
-#: ../modules/mail-config/e-mail-config-google-summary.c:264
-msgid "Add Google Con_tacts to this account"
-msgstr "Engadir un con_tacto de Google a esta conta"
-
-#: ../modules/mail-config/e-mail-config-google-summary.c:272
-msgid "You may need to enable IMAP access"
-msgstr "Pode que deba activar o acceso IMAP"
-
-#: ../modules/mail-config/e-mail-config-local-accounts.c:246
-#: ../modules/mail-config/e-mail-config-local-accounts.c:292
-msgid "Mail _Directory:"
-msgstr "_Directorio de correo:"
-
-#: ../modules/mail-config/e-mail-config-local-accounts.c:247
-msgid "Choose a MH mail directory"
-msgstr "Seleccione un directorio de correo MH"
-
-#: ../modules/mail-config/e-mail-config-local-accounts.c:269
-msgid "Local Delivery _File:"
-msgstr "_Ficheiro de envÃo local:"
-
-#: ../modules/mail-config/e-mail-config-local-accounts.c:270
-msgid "Choose a local delivery file"
-msgstr "Seleccione un ficheiro de envÃo local"
-
-#: ../modules/mail-config/e-mail-config-local-accounts.c:293
-msgid "Choose a Maildir mail directory"
-msgstr "Seleccione un cartafol de correo Maildir"
-
-#: ../modules/mail-config/e-mail-config-local-accounts.c:315
-msgid "Spool _File:"
-msgstr "_Ficheiro Spool:"
-
-#: ../modules/mail-config/e-mail-config-local-accounts.c:316
-msgid "Choose a mbox spool file"
-msgstr "Seleccione un ficheiro spool de mbox"
-
-#: ../modules/mail-config/e-mail-config-local-accounts.c:338
-msgid "Spool _Directory:"
-msgstr "_Cartafol Spool"
-
-#: ../modules/mail-config/e-mail-config-local-accounts.c:339
-msgid "Choose a mbox spool directory"
-msgstr "Seleccione un cartafol spool de mbox"
-
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:149
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:81
-#: ../modules/plugin-manager/evolution-plugin-manager.c:160
-msgid "Configuration"
-msgstr "ConfiguraciÃn"
-
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:167
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:99
-#: ../plugins/publish-calendar/publish-calendar.ui.h:24
-msgid "_Server:"
-msgstr "_Servidor:"
-
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:193
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:228
-msgid "User_name:"
-msgstr "_Nome do usuario:"
-
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:226
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:149
-msgid "Encryption _method:"
-msgstr "_MÃtodo de cifrado:"
-
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:241
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:164
-msgid "STARTTLS after connecting"
-msgstr "STARTTLS despois de conectarse"
-
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:168
-msgid "SSL on a dedicated port"
-msgstr "SSL nun porto adicado"
-
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:124
-msgid "Ser_ver requires authentication"
-msgstr "O ser_vidor solicita autenticaciÃn"
-
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:210
-msgid "T_ype:"
-msgstr "T_ipo:"
-
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:242
-msgid "Yahoo! Features"
-msgstr "CaracterÃsticas de Yahoo!"
-
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:251
-msgid "Add Yahoo! Ca_lendar and Tasks to this account"
-msgstr "Engadir Ca_lendario e Tarefas de Yahoo! a esta conta"
-
 #: ../modules/mailto-handler/evolution-mailto-handler.c:146
 msgid "Do you want to make Evolution your default email client?"
 msgstr ""
@@ -18961,22 +17868,6 @@ msgstr "_Engadidos"
 msgid "Enable and disable plugins"
 msgstr "Activar e desactivar os engadidos"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
-msgstr "Engadido de proba de Python"
-
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
-msgstr "Engadido de proba do cargador Eplugin para Python."
-
-#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
-msgid "Python Plugin Loader tests"
-msgstr "Probas do cargador de engadidos de Python"
-
-#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
-msgid "Hello Python"
-msgstr "Ola Python"
-
 #: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
 #: ../modules/prefer-plain/plugin/config-ui.c:46
 msgid "Show HTML if present"
@@ -19036,42 +17927,42 @@ msgstr "Modo de texto simple"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "Ver as mensaxes de correo como texto plano aÃnda que conteÃan HTML."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:190
+#: ../modules/spamassassin/evolution-spamassassin.c:192
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
 msgstr "Produciuse un fallo ao iniciar SpamAssassin (%s) "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:213
+#: ../modules/spamassassin/evolution-spamassassin.c:215
 msgid "Failed to stream mail message content to SpamAssassin: "
 msgstr ""
 "Produciuse un fallo ao enviar o fluxo do contido dos correos a SpamAssassin: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:232
+#: ../modules/spamassassin/evolution-spamassassin.c:234
 #, c-format
 msgid "Failed to write '%s' to SpamAssassin: "
 msgstr "Produciuse un fallo ao escribir Â%s a SpamAssasin: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:260
+#: ../modules/spamassassin/evolution-spamassassin.c:262
 msgid "Failed to read output from SpamAssassin: "
 msgstr "Produciuse un fallo ao ler a saÃda de SpamAssassin: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:315
+#: ../modules/spamassassin/evolution-spamassassin.c:317
 msgid "SpamAssassin either crashed or failed to process a mail message"
 msgstr "SpamAssasin colgouse ou fallou ao procesar unha mensaxe de correo"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:834
+#: ../modules/spamassassin/evolution-spamassassin.c:885
 msgid "SpamAssassin Options"
 msgstr "OpciÃns do SpamAssassin"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:849
+#: ../modules/spamassassin/evolution-spamassassin.c:900
 msgid "I_nclude remote tests"
 msgstr "I_ncluÃr probas remotas"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:863
+#: ../modules/spamassassin/evolution-spamassassin.c:914
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "Isto farà que SpamAssassin sexa mÃis fiÃbel, pero tamÃn mÃis lento"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:1072
+#: ../modules/spamassassin/evolution-spamassassin.c:1123
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
@@ -19277,52 +18168,52 @@ msgstr "Cartafol persoal do Outlook Express 5/6 (.dbx)"
 msgid "Import Outlook Express messages from DBX file"
 msgstr "Importar as mensaxes do Outlook desde un ficheiro DBX"
 
-#: ../plugins/email-custom-header/email-custom-header.c:300
+#: ../plugins/email-custom-header/email-custom-header.c:291
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "Seguranza:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:304
+#: ../plugins/email-custom-header/email-custom-header.c:295
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "Persoal"
 
-#: ../plugins/email-custom-header/email-custom-header.c:305
+#: ../plugins/email-custom-header/email-custom-header.c:296
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "Sen clasificar"
 
-#: ../plugins/email-custom-header/email-custom-header.c:306
+#: ../plugins/email-custom-header/email-custom-header.c:297
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "Protexido"
 
-#: ../plugins/email-custom-header/email-custom-header.c:307
+#: ../plugins/email-custom-header/email-custom-header.c:298
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: ../plugins/email-custom-header/email-custom-header.c:308
+#: ../plugins/email-custom-header/email-custom-header.c:299
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "Secreto"
 
-#: ../plugins/email-custom-header/email-custom-header.c:309
+#: ../plugins/email-custom-header/email-custom-header.c:300
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "Alto secreto"
 
-#: ../plugins/email-custom-header/email-custom-header.c:366
+#: ../plugins/email-custom-header/email-custom-header.c:357
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "NingÃn"
 
-#: ../plugins/email-custom-header/email-custom-header.c:539
+#: ../plugins/email-custom-header/email-custom-header.c:530
 msgid "_Custom Header"
 msgstr "Cabeceira p_ersonalizada"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:802
+#: ../plugins/email-custom-header/email-custom-header.c:799
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -19330,11 +18221,11 @@ msgstr ""
 "O formato para indicar un valor de chave de cabeceira personalizada Ã:\n"
 "nome dos valores da chave da cabeceira personalizada separados por Â;Â."
 
-#: ../plugins/email-custom-header/email-custom-header.c:856
+#: ../plugins/email-custom-header/email-custom-header.c:851
 msgid "Key"
 msgstr "Chave"
 
-#: ../plugins/email-custom-header/email-custom-header.c:872
+#: ../plugins/email-custom-header/email-custom-header.c:867
 #: ../plugins/templates/templates.c:478
 msgid "Values"
 msgstr "Valores"
@@ -19352,11 +18243,6 @@ msgstr "Engadir cabeceiras personalizadas Ãs mensaxes de correo saÃntes."
 msgid "Email Custom Header"
 msgstr "Cabeceira personalizada de correo electrÃnico"
 
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
-msgid "Automatically launch editor when key is pressed in the mail composer"
-msgstr ""
-"Iniciar automaticamente o editor ao presionar unha tecla no editor de correo"
-
 #: ../plugins/external-editor/external-editor.c:114
 msgid "Command to be executed to launch the editor: "
 msgstr "A orde que se executarà para iniciar o editor: "
@@ -19622,33 +18508,6 @@ msgstr ""
 "\n"
 "Cabeceira: {0}"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
-msgid "Play sound when new messages arrive."
-msgstr "Reproducir un son cando cheguen mensaxes novas."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-msgid "Whether play sound or beep when new messages arrive."
-msgstr ""
-"Indica se reproducir un son ou un ton de aviso cando cheguen mensaxes novas."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
-msgid "Beep or play sound file."
-msgstr "Emitir un ton de aviso ou un ficheiro de son."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
-msgid ""
-"If \"true\", then beep, otherwise will play sound file when new messages "
-"arrive."
-msgstr ""
-"Se à Âcerto emitirà un ton de aviso, en caso contrario reproducirà un "
-"ficheiro de son cando cheguen mensaxes novas."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
-msgid "Sound file to be played when new messages arrive, if not in beep mode."
-msgstr ""
-"Ficheiro de son que desexa reproducir cando chegue unha mensaxe nova, se non "
-"està no modo de ton de aviso."
-
 #: ../plugins/mail-notification/mail-notification.c:385
 #: ../plugins/mail-notification/mail-notification.c:421
 #, c-format
@@ -19843,8 +18702,8 @@ msgid "No writable calendar is available."
 msgstr "Non hai ningÃn calendario escribÃbel dispoÃÃbel."
 
 #: ../plugins/mail-to-task/mail-to-task.c:1271
-msgid "Create an _Event"
-msgstr "Cr_ear unha actividade"
+msgid "Create an _Appointment"
+msgstr "Crear unha cit_a"
 
 #: ../plugins/mail-to-task/mail-to-task.c:1273
 msgid "Create a new event from the selected message"
@@ -19951,8 +18810,8 @@ msgid "Importing Outlook data"
 msgstr "ImportaciÃn de datos do Outlook"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#: ../plugins/publish-calendar/publish-calendar.c:146
-#: ../plugins/publish-calendar/publish-calendar.c:153
+#: ../plugins/publish-calendar/publish-calendar.c:145
+#: ../plugins/publish-calendar/publish-calendar.c:152
 msgid "Calendar Publishing"
 msgstr "PublicaciÃn de calendarios"
 
@@ -19964,49 +18823,49 @@ msgstr "LocalizaciÃns"
 msgid "Publish calendars to the web."
 msgstr "Publicar calendarios na web."
 
-#: ../plugins/publish-calendar/publish-calendar.c:212
-#: ../plugins/publish-calendar/publish-calendar.c:463
+#: ../plugins/publish-calendar/publish-calendar.c:211
+#: ../plugins/publish-calendar/publish-calendar.c:465
 #, c-format
 msgid "Could not open %s:"
 msgstr "Non foi posÃbel abrir %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:214
+#: ../plugins/publish-calendar/publish-calendar.c:213
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "Non foi posÃbel abrir %s: erro descoÃecido"
 
-#: ../plugins/publish-calendar/publish-calendar.c:234
+#: ../plugins/publish-calendar/publish-calendar.c:233
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "Produciuse un erro ao publicar en %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:236
+#: ../plugins/publish-calendar/publish-calendar.c:235
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "Rematouse con Ãxito a publicaciÃn en %s"
 
-#: ../plugins/publish-calendar/publish-calendar.c:280
+#: ../plugins/publish-calendar/publish-calendar.c:279
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "Produciuse un fallo ao montar %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:611
+#: ../plugins/publish-calendar/publish-calendar.c:628
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "E_nable"
 msgstr "A_ctivar"
 
-#: ../plugins/publish-calendar/publish-calendar.c:759
+#: ../plugins/publish-calendar/publish-calendar.c:776
 msgid "Are you sure you want to remove this location?"
 msgstr "Està seguro de que desexa eliminar esta localizaciÃn?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. * where the publishing should be done, fails. Basically, this shouldn't
 #. * ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1093
+#: ../plugins/publish-calendar/publish-calendar.c:1106
 msgid "Could not create publish thread."
 msgstr "Non foi posÃbel crear a conversa para publicar."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1101
+#: ../plugins/publish-calendar/publish-calendar.c:1114
 msgid "_Publish Calendar Information"
 msgstr "_Publicar a informaciÃn do calendario"
 
@@ -20105,11 +18964,11 @@ msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr ""
 "Non foi posÃbel publicar o calendario: o backend do calendario xa non existe"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:526
+#: ../plugins/publish-calendar/url-editor-dialog.c:539
 msgid "New Location"
 msgstr "LocalizaciÃn nova"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:528
+#: ../plugins/publish-calendar/url-editor-dialog.c:541
 msgid "Edit Location"
 msgstr "Editar a localizaciÃn"
 
@@ -20209,11 +19068,11 @@ msgstr "Garda un calendario ou unha lista de tarefas no disco."
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:147
+#: ../plugins/save-calendar/rdf-format.c:146
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:378
+#: ../plugins/save-calendar/rdf-format.c:377
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
@@ -20259,222 +19118,33 @@ msgstr "Gardar como un _modelo"
 msgid "Save as Template"
 msgstr "Gardar como un modelo"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
-msgstr ""
-"Lista das rutas aos cartafoles que se sincronizarÃn co disco para o uso sen "
-"conexiÃn"
+#: ../shell/e-shell.c:313
+msgid "Preparing to go offline..."
+msgstr "Preparando a desconexiÃnâ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
-msgid "Default window Y coordinate"
-msgstr "Coordenada Y predeterminada da xanela"
+#: ../shell/e-shell.c:366
+msgid "Preparing to go online..."
+msgstr "Preparando a conexiÃnâ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
-msgid "The default Y coordinate for the main window."
-msgstr "A coordenada Y predeterminada da xanela principal."
+#: ../shell/e-shell.c:437
+msgid "Preparing to quit..."
+msgstr "Preparando a saÃdaâ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
-msgid "Default window X coordinate"
-msgstr "Coordenada X predeterminada da xanela"
+#: ../shell/e-shell-content.c:727 ../shell/e-shell-content.c:728
+msgid "Searches"
+msgstr "Buscas"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
-msgid "The default X coordinate for the main window."
-msgstr "A coordenada X predeterminada da xanela principal."
+#: ../shell/e-shell-content.c:771
+msgid "Save Search"
+msgstr "Gardar a busca"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
-msgid "Default window width"
-msgstr "Largura predeterminada da xanela"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:17
-msgid "The default width for the main window, in pixels."
-msgstr "Largura predeterminada da xanela principal, en pÃxeles."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:18
-msgid "Default window height"
-msgstr "Altura predeterminada da xanela"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:19
-msgid "The default height for the main window, in pixels."
-msgstr "Altura predeterminada da xanela principal, en pÃxeles."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:20
-msgid "Default window state"
-msgstr "Estado predeterminado da xanela"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:21
-msgid "Whether or not the window should be maximized."
-msgstr "Indica se a xanela deberÃa ou non estar maximizada."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:35
-msgid "Proxy configuration mode"
-msgstr "Modo de configuraciÃn do proxy"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:36
-msgid ""
-"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
-"representing \"use system settings\", \"no proxy\", \"use manual proxy "
-"configuration\" and \"use proxy configuration provided in the autoconfig url"
-"\" respectively."
-msgstr ""
-"Seleccionar o modo de configuraciÃn do proxy. Os valores compatÃbeis son 0, "
-"1, 2 e 3, que representan Âusar os axustes do sistemaÂ, Âsen proxyÂ, Âusar a "
-"configuraciÃn manual do proxy e Âusar a configuraciÃn do proxy fornecida no "
-"url autoconfigurado respectivamente."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:37
-msgid "HTTP proxy port"
-msgstr "Porto do proxy HTTP"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:38
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"http_host\" that you proxy through."
-msgstr ""
-"Porto da mÃquina definido en Â/apps/evolution/shell/network_config/"
-"http_host  a travÃs do que usar o proxy ."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:39
-msgid "HTTP proxy host name"
-msgstr "Nome do servidor proxy HTTP"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:40
-msgid "The machine name to proxy HTTP through."
-msgstr "Nome da mÃquina a travÃs da que usar o proxy HTTP."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:41
-msgid "Secure HTTP proxy port"
-msgstr "Porto do proxy HTTP seguro"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:42
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"secure_host\" that you proxy through."
-msgstr ""
-"Porto da mÃquina definido en Â/apps/evolution/shell/network_config/"
-"secure_host a travÃs do que usar o proxy ."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:43
-msgid "Secure HTTP proxy host name"
-msgstr "Nome do servidor do proxy HTTP seguro"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:44
-msgid "The machine name to proxy secure HTTP through."
-msgstr "Nome da mÃquina a travÃs da que usar o proxy HTTP seguro."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:45
-msgid "SOCKS proxy port"
-msgstr "Porto do proxy SOCKS"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:46
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"socks_host\" that you proxy through."
-msgstr ""
-"Porto da mÃquina definido en Â/apps/evolution/shell/network_config/"
-"socks_host a travÃs do que usar o proxy ."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:47
-msgid "SOCKS proxy host name"
-msgstr "Nome do servidor do proxy SOCKS"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:48
-msgid "The machine name to proxy socks through."
-msgstr "Nome da mÃquina a travÃs da que usar o proxy socks."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:49
-msgid "Use HTTP proxy"
-msgstr "Usar proxy HTTP"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:50
-msgid ""
-"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-msgstr "Activa os axustes do proxy ao acceder a HTTP/HTTP seguro na Internet."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:51
-msgid "Authenticate proxy server connections"
-msgstr "Autenticar as conexiÃns co servidor proxy"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:52
-msgid ""
-"If true, then connections to the proxy server require authentication. The "
-"username is retrieved from the \"/apps/evolution/shell/network_config/"
-"authentication_user\" GConf key, and the password is retrieved from either "
-"gnome-keyring or the ~/.gnome2_private/Evolution password file."
-msgstr ""
-"Se à ÂverdadeiroÂ, entÃn as conexiÃns co servidor proxy requiren "
-"autenticaciÃn. O nome do usuario obtense da chave GConf \"/apps/evolution/"
-"shell/network_config/authentication_user\" e o contrasinal obtense do gnome-"
-"keyring ou do ficheiro de contrasinais ~/.gnome2_private/Evolution."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:53
-msgid "HTTP proxy username"
-msgstr "Nome de usuario para o proxy HTTP"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:54
-msgid "Username to pass as authentication when doing HTTP proxying."
-msgstr "Nome do usuario para pasar como autenticaciÃn ao usar un proxy HTTP."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "HTTP proxy password"
-msgstr "Contrasinal do proxy HTTP"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:56
-msgid "Password to pass as authentication when doing HTTP proxying."
-msgstr "Contrasinal requirido como autenticaciÃn ao usar o proxy HTTP."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:57
-msgid "Non-proxy hosts"
-msgstr "Servidores que non usan proxy"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:58
-msgid ""
-"This key contains a list of hosts which are connected to directly, rather "
-"than via the proxy (if it is active). The values can be hostnames, domains "
-"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
-"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
-msgstr ""
-"Esta chave contÃn unha lista de servidores cos que està conectado "
-"directamente, en vez de a travÃs dun proxy (se està activo). Os valores "
-"poden ser nomes de servidor, dominios (usando un caracter de substituciÃn "
-"inicial como *.foo.com), enderezos IP de servidores (tanto IPv4 como IPv6) e "
-"enderezos de rede cunha mÃscara (do tipo 192.168.0.0/24)."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:59
-msgid "Automatic proxy configuration URL"
-msgstr "URL de configuraciÃn automÃtica do proxy"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:60
-msgid "URL that provides proxy configuration values."
-msgstr "O URL que proporciona os valores de configuraciÃn de proxy."
-
-#: ../shell/e-shell.c:313
-msgid "Preparing to go offline..."
-msgstr "Preparando a desconexiÃnâ"
-
-#: ../shell/e-shell.c:366
-msgid "Preparing to go online..."
-msgstr "Preparando a conexiÃnâ"
-
-#: ../shell/e-shell.c:437
-msgid "Preparing to quit..."
-msgstr "Preparando a saÃdaâ"
-
-#: ../shell/e-shell-content.c:727 ../shell/e-shell-content.c:728
-msgid "Searches"
-msgstr "Buscas"
-
-#: ../shell/e-shell-content.c:771
-msgid "Save Search"
-msgstr "Gardar a busca"
-
-#. Translators: The "Show:" label precedes a combo box that
-#. * allows the user to filter the current view.  Examples of
-#. * items that appear in the combo box are "Unread Messages",
-#. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:940
-msgid "Sho_w:"
-msgstr "Mos_trar:"
+#. Translators: The "Show:" label precedes a combo box that
+#. * allows the user to filter the current view.  Examples of
+#. * items that appear in the combo box are "Unread Messages",
+#. * "Important Messages", or "Active Appointments".
+#: ../shell/e-shell-searchbar.c:940
+msgid "Sho_w:"
+msgstr "Mos_trar:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
@@ -20784,13 +19454,13 @@ msgid "New"
 msgstr "Novo"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:582
+#: ../shell/e-shell-window-private.c:585
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:188
+#: ../shell/main.c:186
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20827,7 +19497,7 @@ msgstr ""
 "Esperamos que lles sexa de proveito o resultado do noso duro traballo, e\n"
 "agardamos con ansias as sÃas colaboraciÃns!\n"
 
-#: ../shell/main.c:212
+#: ../shell/main.c:210
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20835,13 +19505,13 @@ msgstr ""
 "Grazas\n"
 "O equipo do Evolution\n"
 
-#: ../shell/main.c:219
+#: ../shell/main.c:217
 msgid "Do not tell me again"
 msgstr "Non preguntarme de novo"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:310
+#: ../shell/main.c:308
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -20849,47 +19519,47 @@ msgstr ""
 "Iniciar o Evolution mostrando o compoÃente indicado. As opciÃn dispoÃÃbeis "
 "son 'mail', 'calendar', 'contacts', 'tasks' e 'memos'"
 
-#: ../shell/main.c:314
+#: ../shell/main.c:312
 msgid "Apply the given geometry to the main window"
 msgstr "Aplicar a xeometrÃa indicada à xanela principal"
 
-#: ../shell/main.c:318
+#: ../shell/main.c:316
 msgid "Start in online mode"
 msgstr "Iniciar en modo conectado"
 
-#: ../shell/main.c:320
+#: ../shell/main.c:318
 msgid "Ignore network availability"
 msgstr "Ignorar a dispoÃibilidade da rede"
 
-#: ../shell/main.c:322
+#: ../shell/main.c:320
 msgid "Start in \"express\" mode"
 msgstr "Iniciar en modo ÂexpressÂ"
 
-#: ../shell/main.c:325
+#: ../shell/main.c:323
 msgid "Forcibly shut down Evolution"
 msgstr "Forzar o peche do Evolution"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:326
 msgid "Disable loading of any plugins."
 msgstr "Desactivar a carga de todos os engadidos."
 
-#: ../shell/main.c:330
+#: ../shell/main.c:328
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desactivar o panel de vista previa de correo, contactos e tarefas."
 
-#: ../shell/main.c:334
+#: ../shell/main.c:332
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "Importar URI ou nomes de ficheiros fornecidos como argumentos."
 
-#: ../shell/main.c:336
+#: ../shell/main.c:334
 msgid "Request a running Evolution process to quit"
 msgstr "Solicitar a saÃda dun proceso de execuciÃn do Evolution"
 
-#: ../shell/main.c:513 ../shell/main.c:521
+#: ../shell/main.c:508 ../shell/main.c:516
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Cliente de correo e XIP Evolution"
 
-#: ../shell/main.c:586
+#: ../shell/main.c:581
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20898,7 +19568,7 @@ msgstr ""
 "%s: --online e --offline non poden usarse à vez.\n"
 "  Use Â%s --help para mÃis informaciÃn.\n"
 
-#: ../shell/main.c:592
+#: ../shell/main.c:587
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -21729,6 +20399,16 @@ msgstr "elemento de calendario do Evolution"
 msgid "Close this message"
 msgstr "Pehcar esta mensaxe"
 
+#: ../widgets/misc/e-attachment-bar.c:658
+#: ../widgets/misc/e-attachment-paned.c:703
+msgid "Icon View"
+msgstr "Vista de iconas"
+
+#: ../widgets/misc/e-attachment-bar.c:660
+#: ../widgets/misc/e-attachment-paned.c:705
+msgid "List View"
+msgstr "Vista de lista"
+
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
 #. To Translators: This text is set as a description of an attached
 #. * message when, for example, attaching it to a composer. When the
@@ -21786,16 +20466,6 @@ msgstr "Non foi posÃbel gardar Â%sÂ"
 msgid "Could not save the attachment"
 msgstr "Non foi posÃbel gardar o anexo"
 
-#: ../widgets/misc/e-attachment-bar.c:658
-#: ../widgets/misc/e-attachment-paned.c:703
-msgid "Icon View"
-msgstr "Vista de iconas"
-
-#: ../widgets/misc/e-attachment-bar.c:660
-#: ../widgets/misc/e-attachment-paned.c:705
-msgid "List View"
-msgstr "Vista de lista"
-
 #: ../widgets/misc/e-attachment-dialog.c:311
 msgid "Attachment Properties"
 msgstr "Propiedades dos anexos"
@@ -21907,6 +20577,19 @@ msgstr "Abrir con Â%sÂ"
 msgid "Open this attachment in %s"
 msgstr "Abrir este anexo en %s"
 
+#: ../widgets/misc/e-book-source-config.c:98
+msgid "Mark as default address book"
+msgstr "Marcar como axenda de enderezos predefinida"
+
+#: ../widgets/misc/e-book-source-config.c:103
+msgid "Autocomplete with this address book"
+msgstr "Completar automaticamente con esta axenda de enderezos"
+
+#: ../widgets/misc/e-book-source-config.c:277
+msgid "Copy book content locally for offline operation"
+msgstr ""
+"Copiar o contido da axenda de enderezos localmente para operar sen conexiÃn"
+
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
 #: ../widgets/misc/e-buffer-tagger.c:389
 msgid "Ctrl-click to open a link"
@@ -21951,6 +20634,39 @@ msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B de %Y"
 
+#: ../widgets/misc/e-cal-source-config.c:170
+msgid "Mark as default calendar"
+msgstr "Marcar como calendario predefinido"
+
+#: ../widgets/misc/e-cal-source-config.c:173
+msgid "Mark as default task list"
+msgstr "Marcar como lista de tarefas predefinida"
+
+#: ../widgets/misc/e-cal-source-config.c:176
+msgid "Mark as default memo list"
+msgstr "Marcar como a lista de notas predefinida"
+
+#: ../widgets/misc/e-cal-source-config.c:201
+msgid "Color:"
+msgstr "Cor:"
+
+#: ../widgets/misc/e-cal-source-config.c:406
+msgid "Copy calendar contents locally for offline operation"
+msgstr ""
+"Copiar localmente os contidos do calendario para unha operaciÃn sen conexiÃn"
+
+#: ../widgets/misc/e-cal-source-config.c:410
+msgid "Copy task list contents locally for offline operation"
+msgstr ""
+"Copiar localmente os contidos da lista de tarefas para unha operaciÃn sen "
+"conexiÃn"
+
+#: ../widgets/misc/e-cal-source-config.c:414
+msgid "Copy memo list contents locally for offline operation"
+msgstr ""
+"Copiar localmente os contidos da lista de notas para unha operaciÃn sen "
+"conexiÃn"
+
 #: ../widgets/misc/e-charset-combo-box.c:100
 msgid "Character Encoding"
 msgstr "CodificaciÃn de caracteres"
@@ -21999,16 +20715,16 @@ msgstr "_Ningunha"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1694 ../widgets/misc/e-dateedit.c:1927
+#: ../widgets/misc/e-dateedit.c:1697 ../widgets/misc/e-dateedit.c:1930
 msgctxt "date"
 msgid "None"
 msgstr "Ningunha"
 
-#: ../widgets/misc/e-dateedit.c:1821
+#: ../widgets/misc/e-dateedit.c:1824
 msgid "Invalid Date Value"
 msgstr "O valor da data non à vÃlido"
 
-#: ../widgets/misc/e-dateedit.c:1865
+#: ../widgets/misc/e-dateedit.c:1868
 msgid "Invalid Time Value"
 msgstr "O valor da hora non à vÃlido"
 
@@ -22376,50 +21092,50 @@ msgstr "Devolver notificaciÃn"
 msgid "Sta_tus Tracking"
 msgstr "Seguimento de es_tado"
 
-#: ../widgets/misc/e-source-config.c:470 ../widgets/misc/e-source-config.c:474
+#: ../widgets/misc/e-source-config.c:669 ../widgets/misc/e-source-config.c:673
 msgid "Type:"
 msgstr "Tipo:"
 
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../widgets/misc/e-source-config.c:1024
+#: ../widgets/misc/e-source-config.c:1276
 msgid "Refresh every"
 msgstr "Actualizar cada"
 
-#: ../widgets/misc/e-source-config.c:1054
-#: ../widgets/misc/e-source-config.c:1082
+#: ../widgets/misc/e-source-config.c:1306
+#: ../widgets/misc/e-source-config.c:1334
 msgid "Use a secure connection"
 msgstr "Usar unha conexiÃn segura"
 
-#: ../widgets/misc/e-source-config.c:1096
+#: ../widgets/misc/e-source-config.c:1348
 msgid "Ignore invalid SSL certificate"
 msgstr "Ignorar certificado SSL non vÃlido"
 
-#: ../widgets/misc/e-source-config.c:1133
+#: ../widgets/misc/e-source-config.c:1385
 msgid "User"
 msgstr "Usuario"
 
 #. no suggestions. Put something in the menu anyway...
-#: ../widgets/misc/e-spell-entry.c:348
+#: ../widgets/misc/e-spell-entry.c:351
 msgid "(no suggestions)"
 msgstr "(non hai suxestiÃns)"
 
-#: ../widgets/misc/e-spell-entry.c:372
+#: ../widgets/misc/e-spell-entry.c:375
 msgid "More..."
 msgstr "MÃisâ"
 
 #. + Add to Dictionary
-#: ../widgets/misc/e-spell-entry.c:441
+#: ../widgets/misc/e-spell-entry.c:444
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "Engadir \"%s\" ao Dicionario"
 
 #. - Ignore All
-#: ../widgets/misc/e-spell-entry.c:484
+#: ../widgets/misc/e-spell-entry.c:487
 msgid "Ignore All"
 msgstr "Ignorar todo"
 
-#: ../widgets/misc/e-spell-entry.c:510
+#: ../widgets/misc/e-spell-entry.c:513
 msgid "Spelling Suggestions"
 msgstr "SuxestiÃns de ortografÃa"
 
@@ -22455,25 +21171,25 @@ msgstr "_Copiar imaxe"
 msgid "Copy the image to the clipboard"
 msgstr "Copiar a imaxe ao portapapeis"
 
-#: ../widgets/misc/e-web-view.c:338 ../widgets/misc/e-web-view.c:1419
+#: ../widgets/misc/e-web-view.c:338 ../widgets/misc/e-web-view.c:1424
 #: ../widgets/misc/e-web-view-gtkhtml.c:467
 #: ../widgets/misc/e-web-view-gtkhtml.c:1312
 msgid "Select all text and images"
 msgstr "Seleccionar todo o texto e as imaxes"
 
-#: ../widgets/misc/e-web-view.c:1091 ../widgets/misc/e-web-view.c:1093
-#: ../widgets/misc/e-web-view.c:1095 ../widgets/misc/e-web-view-gtkhtml.c:976
+#: ../widgets/misc/e-web-view.c:1088 ../widgets/misc/e-web-view.c:1090
+#: ../widgets/misc/e-web-view.c:1092 ../widgets/misc/e-web-view-gtkhtml.c:976
 #: ../widgets/misc/e-web-view-gtkhtml.c:978
 #: ../widgets/misc/e-web-view-gtkhtml.c:980
 #, c-format
 msgid "Click to call %s"
 msgstr "Prema para chamar a %s"
 
-#: ../widgets/misc/e-web-view.c:1097 ../widgets/misc/e-web-view-gtkhtml.c:982
+#: ../widgets/misc/e-web-view.c:1094 ../widgets/misc/e-web-view-gtkhtml.c:982
 msgid "Click to hide/unhide addresses"
 msgstr "Prema para ocultar/mostrar os enderezos"
 
-#: ../widgets/misc/e-web-view.c:1099 ../widgets/misc/e-web-view-gtkhtml.c:984
+#: ../widgets/misc/e-web-view.c:1096 ../widgets/misc/e-web-view-gtkhtml.c:984
 #, c-format
 msgid "Click to open %s"
 msgstr "Prema para abrir %s"
@@ -22535,7 +21251,7 @@ msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 "A porcentaxe ten que ser un valor entre 0 e 100, ambos os dous incluÃdos"
 
-#: ../widgets/table/e-table-click-to-add.c:610
+#: ../widgets/table/e-table-click-to-add.c:609
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:62
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:143
 msgid "click to add"
@@ -22776,14 +21492,889 @@ msgstr "premer"
 msgid "sort"
 msgstr "ordenar"
 
-#: ../widgets/text/e-text.c:2338
+#: ../widgets/text/e-text.c:2074
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: ../widgets/text/e-text.c:2351
+#: ../widgets/text/e-text.c:2087
 msgid "Input Methods"
 msgstr "MÃtodos de entrada"
 
+#~ msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
+#~ msgstr ""
+#~ "Estilo de vista da mensaxe (ÂnormalÂ, Âcabeceiras completasÂ, ÂfonteÂ)"
+
+#~ msgid "Create R_ule"
+#~ msgstr "Crear unha r_egra"
+
+#~ msgid "Digitally sign messages when original message signed (PGP or S/MIME)"
+#~ msgstr ""
+#~ "Firmar mensaxes digitalmente cando a mensaxe original estea firmada (PGP "
+#~ "o S/MIME)"
+
+#~ msgid "Composer Window default width"
+#~ msgstr "Largura predeterminada da xanela do editor de mensaxes"
+
+#~ msgid "Default width of the Composer Window."
+#~ msgstr "Largura predeterminada da xanela do editor de mensaxes."
+
+#~ msgid "Composer Window default height"
+#~ msgstr "Altura predeterminada da xanela do editor de mensaxes"
+
+#~ msgid "Default height of the Composer Window."
+#~ msgstr "Altura predeterminada da xanela do editor de mensaxes."
+
+#~ msgid "Attribute message."
+#~ msgstr "Mensaxe anexada."
+
+#~ msgid ""
+#~ "The text that is inserted when replying to a message, attributing the "
+#~ "message to the original author."
+#~ msgstr ""
+#~ "O texto inserido cando se responde unha mensaxe, atribuÃndolle a mensaxe "
+#~ "ao autor orixinal."
+
+#~ msgid "Forward message."
+#~ msgstr "ReencamiÃar a mensaxe."
+
+#~ msgid ""
+#~ "The text that is inserted when forwarding a message, saying that the "
+#~ "forwarded message follows."
+#~ msgstr ""
+#~ "O texto inserido ao reencamiÃar unha mensaxe, informando que a "
+#~ "continuaciÃn vai a mensaxe reencamiÃada."
+
+#~ msgid "Original message."
+#~ msgstr "Mensaxe orixinal."
+
+#~ msgid ""
+#~ "The text that is inserted when replying to a message (top posting), "
+#~ "saying that the original message follows."
+#~ msgstr ""
+#~ "O texto inserido ao responder unha mensaxe, informando que a continuaciÃn "
+#~ "vai a mensaxe orixinal."
+
+#~ msgid ""
+#~ "This value can be an empty string, which means it'll use the system "
+#~ "Picture folder, usually set to ~/Pictures. This folder will be also used "
+#~ "when the set path is not pointing to the existent folder."
+#~ msgstr ""
+#~ "Este valor pode ser unha cadea baleira, isto significa que usarà o "
+#~ "cartafol de imaxes do sistema, xeralmente localizado en ~/Imaxes. Este "
+#~ "cartafol usarase tamÃn cando a ruta estabelecida non apunta a un cartafol "
+#~ "existente."
+
+#~ msgid "Enable search folders"
+#~ msgstr "Activar os cartafoles de busca"
+
+#~ msgid "Enable search folders on startup."
+#~ msgstr "Activar os cartafoles de busca ao iniciar."
+
+#~ msgid "Enable local folders"
+#~ msgstr "Activar cartafoles locais"
+
+#~ msgid "Whether to show local folders (On This Computer) in a folder tree."
+#~ msgstr ""
+#~ "Indica se se deben mostrar os cartafoles locais (Neste equipo) nun Ãrbore "
+#~ "de cartafoles."
+
+#~ msgid "Display only message texts not exceeding certain size"
+#~ msgstr "Mostrar sà as mensaxes de texto que non excedan de certo tamaÃo"
+
+#~ msgid ""
+#~ "Enable to display only message texts not exceeding size defined in "
+#~ "'message_text_part_limit' key."
+#~ msgstr ""
+#~ "Activar a vista dos textos das mensaxes que non excedan o tamaÃo definido "
+#~ "pola chave 'message_text_part_limit'."
+
+#~ msgid "Message text limit for display"
+#~ msgstr "LÃmite do texto da mensaxe para a vista"
+
+#~ msgid ""
+#~ "This decides the max size of the message text that will be displayed "
+#~ "under Evolution, specified in terms of KB. The default is 4096 (4MB). "
+#~ "This value is used only when 'force_message_limit' key is activated."
+#~ msgstr ""
+#~ "Isto decide o tamaÃo mÃximo do texto da mensaxe que se pode mostrar no "
+#~ "Evolution, indicado en KB. O tamaÃo predeterminado à 4096 (4MB). Este "
+#~ "valor Ãsase sà cando a chave 'force_message_limit' està activada."
+
+#~ msgid ""
+#~ "This setting specifies whether the threads should be in expanded or "
+#~ "collapsed state by default. Requires a restart to apply."
+#~ msgstr ""
+#~ "Esta opciÃn indica se as conversas deben estar despregadas ou pregadas "
+#~ "por omisiÃn. Ã necesario reiniciar o Evolution."
+
+#~ msgid ""
+#~ "Describes whether message headers in paned view should be collapsed or "
+#~ "expanded by default. \"0\" = expanded \"1\" = collapsed"
+#~ msgstr ""
+#~ "Describe se as cabeceiras dos mensaxes na vista con paneis se deben "
+#~ "contraer ou expandir de maneira predeterminada. Â0Â = expandidas Â1Â = "
+#~ "contraÃdas"
+
+#~ msgid ""
+#~ "Tells how to sort accounts in a folder tree used in a Mail view. When set "
+#~ "to true accounts are sorted alphabetically, with an exception of On This "
+#~ "Computer and Search folders, otherwise accounts are sorted based on an "
+#~ "order given by a user."
+#~ msgstr ""
+#~ "Indica como ordenar contas nunha Ãrbore de cartafoles usado nunha vista "
+#~ "de Correo. Cando està estabelecido a certo as contas ordÃnanse "
+#~ "alfabeticamente, coa excepciÃn de Neste equipo y Cartafoles de busca, "
+#~ "pola contra os cartafoles ordÃnanse pola orde dada polo usuario."
+
+#~ msgid "Mail browser width"
+#~ msgstr "Largura do buscador de correo"
+
+#~ msgid "Default width of the mail browser window."
+#~ msgstr "Largura predeterminada da xanela do buscador de mensaxes."
+
+#~ msgid "Mail browser height"
+#~ msgstr "Altura do buscador de correo"
+
+#~ msgid "Default height of the mail browser window."
+#~ msgstr "Altura predeterminada da xanela do buscador de correo."
+
+#~ msgid "Mail browser maximized"
+#~ msgstr "Buscador de correo maximizado"
+
+#~ msgid "Default maximized state of the mail browser window."
+#~ msgstr "Estado maximizado predeterminado da xanela do buscador de correo."
+
+#~ msgid "\"Folder Subscriptions\" window height"
+#~ msgstr "Altura da xanela ÂSubscriciÃns de cartafolesÂ"
+
+#~ msgid ""
+#~ "Initial height of the \"Folder Subscriptions\" window. The value updates "
+#~ "as the user resizes the window vertically."
+#~ msgstr ""
+#~ "Altura inicial da xanela ÂSubscriciÃns de cartafolesÂ. O valor "
+#~ "actualÃzase a medida que o usuario redimensiona a xanela verticalmente."
+
+#~ msgid "\"Folder Subscriptions\" window maximize state"
+#~ msgstr "Estado maximizado da xanela ÂSubscriciÃns de cartafolesÂ"
+
+#~ msgid ""
+#~ "Initial maximize state of the \"Folder Subscriptions\" window. The value "
+#~ "updates when the user maximizes or unmaximizes the window. Note, this "
+#~ "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 maximizado inicial da xanela ÂSubscriciÃns de cartafolesÂ. O valor "
+#~ "actualÃzase cando o usuario maximiza ou restaura a xanela. Nota: Este "
+#~ "valor en particular non se usa no Evolution desde que a xanela "
+#~ "ÂSubscriciÃns de cartafoles non à maximizÃbel. Esta chave sà existe como "
+#~ "un detalle de implementaciÃn."
+
+#~ msgid "\"Folder Subscriptions\" window width"
+#~ msgstr "Largura da xanela ÂSubscriciÃns de cartafolesÂ"
+
+#~ msgid ""
+#~ "Initial width of the \"Folder Subscriptions\" window. The value updates "
+#~ "as the user resizes the window horizontally."
+#~ msgstr ""
+#~ "Largura inicial da xanela ÂSubscriciÃns de cartafolesÂ. O valor "
+#~ "actualÃzase a medida que o usuario redimensiona a xanela horizontalmente."
+
+#~ msgid "Default reply style"
+#~ msgstr "Estilo de resposta predeterminado"
+
+#~ 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 ""
+#~ "Os valores posÃbeis son: nunca - non pechar nunca a xanela do "
+#~ "buscador     sempre - pechar sempre a xanela do buscador    preguntar - "
+#~ "(ou calquera valor) preguntar ao usuario"
+
+#~ msgid "List of accounts"
+#~ msgstr "Lista de contas"
+
+#~ msgid ""
+#~ "List of accounts known to the mail component of Evolution. The list "
+#~ "contains strings naming subdirectories relative to /apps/evolution/mail/"
+#~ "accounts."
+#~ msgstr ""
+#~ "Lista de contas coÃecidas para o compoÃente de correo do Evolution. A "
+#~ "lista contÃn cadeas que nomean subcartafoles relativos a /apps/evolution/"
+#~ "mail/accounts."
+
+#~ msgid "List of accepted licenses"
+#~ msgstr "Lista de licenzas aceptadas"
+
+#~ msgid "List of protocol names whose license has been accepted."
+#~ msgstr "Lista de nomes de protocolos coa licenza aceptada."
+
+#~ msgid "\"Filter Editor\" window height"
+#~ msgstr "Altura da xanela ÂEditor de filtrosÂ"
+
+#~ msgid ""
+#~ "Initial height of the \"Filter Editor\" window. The value updates as the "
+#~ "user resizes the window vertically."
+#~ msgstr ""
+#~ "Altura inicial da xanela ÂEditor de filtrosÂ. O valor actualÃzase a "
+#~ "medida que o usuario redimensiona a xanela verticalmente."
+
+#~ msgid "\"Filter Editor\" window maximize state"
+#~ msgstr "Estado maximizado da xanela ÂEditor de filtrosÂ"
+
+#~ msgid ""
+#~ "Initial maximize state of the \"Filter Editor\" window. The value updates "
+#~ "when the user maximizes or unmaximizes the window. Note, this particular "
+#~ "value is not used by Evolution since the \"Filter Editor\" window cannot "
+#~ "be maximized. This key exists only as an implementation detail."
+#~ msgstr ""
+#~ "Estado inicial maximizado da xanela ÂEditor de filtrosÂ. O valor "
+#~ "actualÃzase cando o usuario maximiza ou restaura a xanela. Nota: este "
+#~ "valor en particular non se usa no Evolution desde que non à posÃbel "
+#~ "maximizar a xanela ÂEditor de filtrosÂ. Esta chave sà existe como un "
+#~ "detalle de implementaciÃn."
+
+#~ msgid "\"Filter Editor\" window width"
+#~ msgstr "Largura da xanela ÂEditor de filtrosÂ"
+
+#~ msgid ""
+#~ "Initial width of the \"Filter Editor\" window. The value updates as the "
+#~ "user resizes the window horizontally."
+#~ msgstr ""
+#~ "Largura inicial da xanela ÂEditor de filtrosÂ. O valor actualÃzase a "
+#~ "medida que o usuario redimensiona a xanela horizontalmente."
+
+#~ msgid ""
+#~ "Whether check for new messages when Evolution is started. This includes "
+#~ "also sending messages from Outbox."
+#~ msgstr ""
+#~ "Indica se debe buscar novas mensaxes ao iniciar o Evolution. InclÃe o "
+#~ "envÃo de mensaxes desde a caixa de saÃda."
+
+#~ msgid ""
+#~ "Whether check for new messages in all active accounts regardless of the "
+#~ "account \"Check for new messages every X minutes\" option when Evolution "
+#~ "is started. This option is used only together with 'send_recv_on_start' "
+#~ "option."
+#~ msgstr ""
+#~ "Indica se hai que buscar mensaxes novas nas contas activas ao iniciar o "
+#~ "Evolution aÃnda que estea marcada a opciÃn ÂComprobar se hai mensaxes "
+#~ "novas cada X minutosÂ. Esta opciÃn Ãsase conxuntamente coa opciÃn "
+#~ "'send_recv_on_start'."
+
+#~ msgid "\"Send and Receive Mail\" window height"
+#~ msgstr "Altura da xanela ÂEnviar e recibir correoÂ"
+
+#~ msgid ""
+#~ "Initial height of the \"Send and Receive Mail\" window. The value updates "
+#~ "as the user resizes the window vertically."
+#~ msgstr ""
+#~ "Altura inicial da xanela ÂEnviar e recibir correo electrÃnicoÂ. O valor "
+#~ "actualÃzase a medida que o usuario redimensiona a xanela verticalmente."
+
+#~ msgid "\"Send and Receive Mail\" window maximize state"
+#~ msgstr "Estado maximizado da xanela ÂEnviar e recibir correoÂ"
+
+#~ msgid ""
+#~ "Initial maximize state of the \"Send and Receive Mail\" window. The value "
+#~ "updates when the user maximizes or unmaximizes the window. Note, this "
+#~ "particular value is not used by Evolution since the \"Send and Receive "
+#~ "Mail\" window cannot be maximized. This key exists only as an "
+#~ "implementation detail."
+#~ msgstr ""
+#~ "Estado inicial maximizado da xanela ÂEnviar e recibir correoÂ. O valor "
+#~ "actualÃzase cando o usuario maximiza ou restaura a xanela. Nota: este "
+#~ "valor en particular non se usa no Evolution desde que non à posÃbel "
+#~ "maximizar a xanela ÂEnviar e recibir correoÂ. Esta chave sà existe como "
+#~ "un detalle de implementaciÃn."
+
+#~ msgid "\"Send and Receive Mail\" window width"
+#~ msgstr "Largura da xanela ÂEnviar e recibir correoÂ"
+
+#~ msgid ""
+#~ "Initial width of the \"Send and Receive Mail\" window. The value updates "
+#~ "as the user resizes the window horizontally."
+#~ msgstr ""
+#~ "Largura inicial da xanela ÂEnviar e recibir correoÂ. O valor actualÃzase "
+#~ "a medida que o usuario redimensiona a xanela horizontalmente."
+
+#~ msgid "\"Search Folder Editor\" window height"
+#~ msgstr "Altura da xanela ÂEditor de cartafoles de buscaÂ"
+
+#~ msgid ""
+#~ "Initial height of the \"Search Folder Editor\" window. The value updates "
+#~ "as the user resizes the window vertically."
+#~ msgstr ""
+#~ "Altura inicial da xanela ÂEditor do cartafol de buscaÂ. O valor "
+#~ "actualÃzase a medida que o usuario redimensiona a xanela verticalmente."
+
+#~ msgid "\"Search Folder Editor\" window maximize state"
+#~ msgstr "Estado maximizado da xanela ÂEditor de cartafoles de buscaÂ"
+
+#~ msgid ""
+#~ "Initial maximize state of the \"Search Folder Editor\" window. The value "
+#~ "updates when the user maximizes or unmaximizes the window. Note, this "
+#~ "particular value is not used by Evolution since the \"Search Folder Editor"
+#~ "\" window cannot be maximized. This key exists only as an implementation "
+#~ "detail."
+#~ msgstr ""
+#~ "Estado inicial maximizado da xanela ÂEditor do cartafol de buscaÂ. O "
+#~ "valor actualÃzase cando o usuario maximiza ou restaura a xanela. Nota: "
+#~ "este valor en particular non se usa no Evolution desde que a xanela "
+#~ "ÂEditor do cartafol de busca non à maximizÃbel. Esta chave sà existe "
+#~ "como un detalle de implementaciÃn."
+
+#~ msgid "\"Search Folder Editor\" window width"
+#~ msgstr "Largura da xanela ÂEditor de cartafoles de buscaÂ"
+
+#~ msgid ""
+#~ "Initial width of the \"Search Folder Editor\" window. The value updates "
+#~ "as the user resizes the window horizontally."
+#~ msgstr ""
+#~ "Largura inicial da xanela ÂEditor do cartafol de buscaÂ. O valor "
+#~ "actualÃzase a medida que o usuario redimensiona a xanela horizontalmente."
+
+#~ msgid "Drag'n'drop export format"
+#~ msgstr "Formato de exportaciÃn de Arrastrar e soltar"
+
+#~ msgid ""
+#~ "Define the email export format when doing drag'n'drop. Possible values "
+#~ "are mbox or pdf"
+#~ msgstr ""
+#~ "Define o formato de exportaciÃn de correo-e ao arrastrar e soltar. Os "
+#~ "valores posÃbeis son mbox ou pdf"
+
+#~ msgid "Format of the drag'n'drop export filename"
+#~ msgstr "Formato do nome do ficheiro exportado por arrastrar e soltar"
+
+#~ msgid ""
+#~ "Exported filename will be YYYYmmDDHHMMSS_email_title Possible values: 1 "
+#~ "(: email sent date), 2 (: drag'n'drop date)"
+#~ msgstr ""
+#~ "O nome do ficheiro exportado serÃ: AAAmmDDHHMMSS_correo-e_titulo. Os "
+#~ "valores posÃbeis: 1 (: data de envÃo do correo), 2 (: data de arrastre)"
+
+#~ msgid "EFolderList XML for the list of completion URIs"
+#~ msgstr "EFolderList XML para a lista de completado dos URIs"
+
+#~ msgid "EFolderList XML for the list of completion URIs."
+#~ msgstr "EFolderList XML para a lista de completado dos URIs."
+
+#~ msgid ""
+#~ "The UID of the selected (or \"primary\") address book in the sidebar of "
+#~ "the \"Contacts\" view."
+#~ msgstr ""
+#~ "O UID da axenda de enderezos seleccionada (ou a primaria) na barra "
+#~ "lateral da vista de ÂContactosÂ."
+
+#~ msgid "Whether to show maps in preview pane."
+#~ msgstr "Indica se se mostran os mapas no panel de vista previa."
+
+#~ msgid ""
+#~ "Whether addresses should be formatted according to standard in their "
+#~ "destination country."
+#~ msgstr ""
+#~ "Indica se se deben formatar os enderezos segundo o estÃndar do paÃs de "
+#~ "destino."
+
+#~ msgid ""
+#~ "The UID of the selected (or \"primary\") calendar in the sidebar of the "
+#~ "\"Calendar\" view."
+#~ msgstr ""
+#~ "UID do calendario seleccionado ou primario na barra lateral da vista de "
+#~ "ÂCalendariosÂ."
+
+#~ msgid ""
+#~ "The default timezone to use for dates and times in the calendar, as an "
+#~ "untranslated Olsen timezone database location like \"America/New York\"."
+#~ msgstr ""
+#~ "Fuso horario predeterminado para usar nas datas e horas do calendario, "
+#~ "como unha localizaciÃn sen traducir da base de datos de fusos horarios "
+#~ "Olsen, p.e:ÂAmerica/New YorkÂ."
+
+#~ msgid ""
+#~ "Use the system timezone instead of the timezone selected in Evolution."
+#~ msgstr ""
+#~ "Usar o fuso horario do sistema en vez do fuso horario seleccionado no "
+#~ "Evolution."
+
+#~ msgid ""
+#~ "Shows the second time zone in a Day View, if set. Value is similar to one "
+#~ "used in a 'timezone' key."
+#~ msgstr ""
+#~ "Mostra os fusos horarios secundarios nunha vista diaria se està "
+#~ "estabelecido. O valor à semellante ao usado na chave ÂtimezoneÂ."
+
+#~ msgid "List of recently used second time zones in a Day View."
+#~ msgstr ""
+#~ "Lista dos fusos horarios secundarios usados recentemente cunha vista "
+#~ "diaria."
+
+#~ msgid "Maximum number of recently used timezones to remember."
+#~ msgstr ""
+#~ "O nÃmero mÃximo de fusos horarios usados recentemente que hai que "
+#~ "recordar."
+
+#~ msgid ""
+#~ "Maximum number of recently used timezones to remember in a "
+#~ "'day_second_zones' list."
+#~ msgstr ""
+#~ "O nÃmero mÃximo de fusos horarios usados recentemente para recordar nunha "
+#~ "lista 'day_second_zones'."
+
+#~ msgid ""
+#~ "Whether to show times in twenty four hour format instead of using am/pm."
+#~ msgstr ""
+#~ "Indica se se mostran as horas en formato de vinte e catro horas en vez de "
+#~ "usar am/pm."
+
+#~ msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
+#~ msgstr "O dÃa no que comeza a semana, desde o domingo (0) ata o sÃbado (6)."
+
+#~ msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
+#~ msgstr ""
+#~ "Hora do fin da xornada laboral, en formato de vinte e catro horas, de 0 a "
+#~ "23."
+
+#~ msgid "Intervals shown in Day and Work Week views, in minutes."
+#~ msgstr ""
+#~ "Os intervalos de tempo mostrados nas vistas diaria e de semana laboral, "
+#~ "en minutos."
+
+#~ msgid ""
+#~ "Position of the horizontal pane, between the date navigator calendar and "
+#~ "the task list when not in the month view, in pixels."
+#~ msgstr ""
+#~ "PosiciÃn do panel horizontal entre o navegador de datas do calendario e a "
+#~ "lista de tarefas cando non està na vista mensual, en pÃxeles."
+
+#~ msgid "Vertical pane position"
+#~ msgstr "PosiciÃn vertical do panel"
+
+#~ msgid ""
+#~ "Position of the vertical pane, between the view and the date navigator "
+#~ "calendar and task list when not in the month view, in pixels."
+#~ msgstr ""
+#~ "PosiciÃn do panel vertical entre a vista, o navegador de datas do "
+#~ "calendario e a lista de tarefas cando non està na vista mensual, en "
+#~ "pÃxeles."
+
+#~ msgid ""
+#~ "Position of the horizontal pane, between the view and the date navigator "
+#~ "calendar and task list in the month view, in pixels."
+#~ msgstr ""
+#~ "PosiciÃn do panel horizontal entre a visualizaciÃn, o navegador de datas "
+#~ "do calendario e a lista de tarefas na vista mensual, en pÃxeles."
+
+#~ msgid ""
+#~ "Position of the vertical pane, between the view and the date navigator "
+#~ "calendar and task list in the month view, in pixels."
+#~ msgstr ""
+#~ "PosiciÃn do panel vertical entre a vista, o navegador de datas do "
+#~ "calendario e a lista de tarefas na vista mensual, en pÃxeles."
+
+#~ msgid ""
+#~ "Position of the vertical pane, between the calendar lists and the date "
+#~ "navigator calendar."
+#~ msgstr ""
+#~ "PosiciÃn do panel vertical entre as listas do calendario e o navegador de "
+#~ "datas do calendario."
+
+#~ msgid ""
+#~ "The layout style determines where to place the preview pane in relation "
+#~ "to the memo list. \"0\" (Classic View) places the preview pane below the "
+#~ "memo list. \"1\" (Vertical View) places the preview pane next to the memo "
+#~ "list."
+#~ msgstr ""
+#~ "O estilo da disposiciÃn determina onde dispoÃer o panel de vista previa "
+#~ "en relaciÃn coa lista de notas. Â0Â (vista clÃsica) mostra o panel de "
+#~ "vista previa embaixo da lista de notas. Â1Â (vista vertical) mostra o "
+#~ "panel de vista previa ao lado da lista de notas."
+
+#~ msgid "If \"true\", show the memo preview pane in the main window."
+#~ msgstr ""
+#~ "Se à verdadeiro, mÃstrase o panel de vista previa das notas na xanela "
+#~ "principal."
+
+#~ msgid "Position of the task preview pane when oriented horizontally."
+#~ msgstr ""
+#~ "PosiciÃn do panel de vista previa de tarefas cando està orientado "
+#~ "horizontalmente."
+
+#~ msgid "Position of the memo preview pane when oriented vertically."
+#~ msgstr ""
+#~ "PosiciÃn do panel de vista previa de notas cando està orientado "
+#~ "verticalmente."
+
+#~ msgid ""
+#~ "The layout style determines where to place the preview pane in relation "
+#~ "to the task list. \"0\" (Classic View) places the preview pane below the "
+#~ "task list. \"1\" (Vertical View) places the preview pane next to the task "
+#~ "list."
+#~ msgstr ""
+#~ "O estilo de disposiciÃn determina onde dispoÃer o panel de vista previa "
+#~ "en relaciÃn coa lista de tarefas. Â0Â (vista clÃsica) mostra o panel de "
+#~ "vista previa embaixo da lista de tarefas. Â1Â (vista vertical) mostra o "
+#~ "panel de vista previa ao lado da lista de tarefas."
+
+#~ msgid "If \"true\", show the task preview pane in the main window."
+#~ msgstr ""
+#~ "Se à verdadeiro, mÃstrase o panel de vista previa de tarefas na xanela "
+#~ "principal."
+
+#~ msgid "Position of the task preview pane when oriented vertically."
+#~ msgstr ""
+#~ "PosiciÃn do panel de vista previa de tarefas cando està orientado "
+#~ "verticalmente."
+
+#~ msgid ""
+#~ "Whether to compress weekends in the month view, which puts Saturday and "
+#~ "Sunday in the space of one weekday."
+#~ msgstr ""
+#~ "Indica se se comprimen as fins de semana na vista mensual. Isto pon o "
+#~ "sÃbado e o domingo no mesmo espazo que un dÃa laborÃbel."
+
+#~ msgid ""
+#~ "Whether to display the end time of events in the week and month views."
+#~ msgstr ""
+#~ "Indica se se mostra a hora de finalizaciÃn das actividades nas vistas "
+#~ "semanais e mensuais."
+
+#~ msgid "Days on which the start and end of work hours should be indicated."
+#~ msgstr "DÃas nos que debe indicarse o inicio e fin das horas de traballo."
+
+#~ msgid ""
+#~ "Whether to draw the Marcus Bains Line (line at current time) in the "
+#~ "calendar."
+#~ msgstr ""
+#~ "Indica se se debuxa a liÃa Marcus Bains (liÃa na hora actual) no "
+#~ "calendario."
+
+#~ msgid "Color to draw the Marcus Bains line in the Day View."
+#~ msgstr "Cor para debuxar a liÃa de Marcus Bains na vista diaria."
+
+#~ msgid ""
+#~ "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+#~ msgstr ""
+#~ "Cor para debuxar a liÃa de Marcus Bains na barra de tempo (baleiro para a "
+#~ "predeterminada)."
+
+#~ msgid ""
+#~ "Show days with recurrent events in italic font in bottom left calendar."
+#~ msgstr ""
+#~ "Mostrar en cursiva os dÃas con actividades con repeticiÃns no calendario "
+#~ "inferior esquerdo."
+
+#~ msgid ""
+#~ "The UID of the selected (or \"primary\") memo list in the sidebar of the "
+#~ "\"Memos\" view."
+#~ msgstr ""
+#~ "UID da lista de notas seleccionada ou primaria da barra lateral da vista "
+#~ "de ÂNotasÂ."
+
+#~ msgid ""
+#~ "The UID of the selected (or \"primary\") task list in the sidebar of the "
+#~ "\"Tasks\" view."
+#~ msgstr ""
+#~ "UID da lista de tarefas seleccionada ou primaria na barra lateral da "
+#~ "vista de ÂTarefasÂ."
+
+#~ msgid "Whether to hide completed tasks in the tasks view."
+#~ msgstr "Indica se se ocultan as tarefas terminadas na vista de tarefas."
+
+# (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
+#~ msgid ""
+#~ "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days"
+#~ "\"."
+#~ msgstr ""
+#~ "Unidades para determinar cando ocultar as tarefas: ÂminutosÂ, Âhoras ou "
+#~ "ÂdÃasÂ."
+
+#~ msgid "Number of units for determining when to hide tasks."
+#~ msgstr "NÃmero de unidades para determinar cando ocultar as tarefas."
+
+#~ msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
+#~ msgstr "Cor de fondo para as tarefas que vencen hoxe, no formato Â#rrggbbÂ."
+
+#~ msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
+#~ msgstr "Cor de fondo para as tarefas atrasadas, no formato Â#rrggbbÂ."
+
+#~ msgid ""
+#~ "Whether to ask for confirmation when deleting an appointment or task."
+#~ msgstr "Indica se se solicita confirmaciÃn ao eliminar unha cita ou tarefa."
+
+#~ msgid ""
+#~ "Whether to ask for confirmation when expunging appointments and tasks."
+#~ msgstr ""
+#~ "Indica se se solicita a confirmaciÃn antes de expurgar as citas ou as "
+#~ "tarefas."
+
+#~ msgid "Whether to set a default reminder for appointments."
+#~ msgstr "Indica se se estabelece un aviso predeterminado para as citas."
+
+#~ msgid "Number of units for determining a default reminder."
+#~ msgstr "NÃmero de unidades para determinar un aviso predeterminado."
+
+# (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
+#~ msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+#~ msgstr ""
+#~ "Unidades para un aviso predeterminado:  ÂminutosÂ, Âhoras ou ÂdÃasÂ."
+
+#~ msgid "Whether to set a reminder for birthdays and anniversaries."
+#~ msgstr "Indica se se estabelece un aviso para os aniversarios."
+
+#~ msgid "Number of units for determining a birthday or anniversary reminder."
+#~ msgstr "NÃmero de unidades para determinar un aviso de aniversario."
+
+#~ msgid ""
+#~ "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+#~ "\"days\"."
+#~ msgstr ""
+#~ "Unidades para os avisos de aniversario, ÂminutosÂ, Âhoras ou ÂdÃasÂ."
+
+#~ msgid "Whether to show week numbers in various places in the Calendar."
+#~ msgstr ""
+#~ "Indica se se mostran os nÃmeros de semana en diferentes lugares do "
+#~ "calendario."
+
+#~ msgid "Scroll Month View by a week"
+#~ msgstr "Desprazar a vista mensual unha semana"
+
+#~ msgid "Whether to scroll a Month View by a week, not by a month."
+#~ msgstr "Indica se se despraza a vista mensual por semana e non por mes."
+
+#~ msgid "Time the last reminder ran, in time_t."
+#~ msgstr "A hora na que se executou o Ãltimo recordatorio, en time_t."
+
+#~ msgid "Calendars to run reminders for"
+#~ msgstr "Os calendarios nos que se activarÃn os recordatorios"
+
+#~ msgid "Programs that are allowed to be run by reminders."
+#~ msgstr "Programas que se poden executar desde os recordatorios"
+
+#~ msgid "Whether or not to use the notification tray for display reminders."
+#~ msgstr ""
+#~ "Indica se se debe usar a bandexa de notificaciÃn para mostrar os "
+#~ "recordatorios."
+
+#~ msgid "Free/busy server URLs"
+#~ msgstr "Os URLs dos servidores de dispoÃibilidade"
+
+#~ msgid ""
+#~ "The URL template to use as a free/busy data fallback, %u is replaced by "
+#~ "the user part of the mail address and %d is replaced by the domain."
+#~ msgstr ""
+#~ "Modelo URL para usar na recuperaciÃn de datos de dispoÃibilidade: %u "
+#~ "substitÃese pola parte de usuario do enderezo de correo, e %d substitÃese "
+#~ "polo dominio."
+
+#~ msgid ""
+#~ "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+#~ "debug messages."
+#~ msgstr ""
+#~ "Isto pode ter tres valores diferentes: 0 para erros, 1 para avisos e 2 "
+#~ "para as mensaxes de depuraciÃn."
+
+#~ msgid "Python Test Plugin"
+#~ msgstr "Engadido de proba de Python"
+
+#~ msgid "Test Plugin for Python EPlugin loader."
+#~ msgstr "Engadido de proba do cargador Eplugin para Python."
+
+#~ msgid "Python Plugin Loader tests"
+#~ msgstr "Probas do cargador de engadidos de Python"
+
+#~ msgid "Hello Python"
+#~ msgstr "Ola Python"
+
+#~ msgid "Automatically launch editor when key is pressed in the mail composer"
+#~ msgstr ""
+#~ "Iniciar automaticamente o editor ao presionar unha tecla no editor de "
+#~ "correo"
+
+#~ msgid "Play sound when new messages arrive."
+#~ msgstr "Reproducir un son cando cheguen mensaxes novas."
+
+#~ msgid "Whether play sound or beep when new messages arrive."
+#~ msgstr ""
+#~ "Indica se reproducir un son ou un ton de aviso cando cheguen mensaxes "
+#~ "novas."
+
+#~ msgid "Beep or play sound file."
+#~ msgstr "Emitir un ton de aviso ou un ficheiro de son."
+
+#~ msgid ""
+#~ "If \"true\", then beep, otherwise will play sound file when new messages "
+#~ "arrive."
+#~ msgstr ""
+#~ "Se à Âcerto emitirà un ton de aviso, en caso contrario reproducirà un "
+#~ "ficheiro de son cando cheguen mensaxes novas."
+
+#~ msgid ""
+#~ "Sound file to be played when new messages arrive, if not in beep mode."
+#~ msgstr ""
+#~ "Ficheiro de son que desexa reproducir cando chegue unha mensaxe nova, se "
+#~ "non està no modo de ton de aviso."
+
+#~ msgid "Create an _Event"
+#~ msgstr "Cr_ear unha actividade"
+
+#~ msgid ""
+#~ "List of paths for the folders to be synchronized to disk for offline usage"
+#~ msgstr ""
+#~ "Lista das rutas aos cartafoles que se sincronizarÃn co disco para o uso "
+#~ "sen conexiÃn"
+
+#~ msgid "Default window Y coordinate"
+#~ msgstr "Coordenada Y predeterminada da xanela"
+
+#~ msgid "The default Y coordinate for the main window."
+#~ msgstr "A coordenada Y predeterminada da xanela principal."
+
+#~ msgid "Default window X coordinate"
+#~ msgstr "Coordenada X predeterminada da xanela"
+
+#~ msgid "The default X coordinate for the main window."
+#~ msgstr "A coordenada X predeterminada da xanela principal."
+
+#~ msgid "Default window width"
+#~ msgstr "Largura predeterminada da xanela"
+
+#~ msgid "The default width for the main window, in pixels."
+#~ msgstr "Largura predeterminada da xanela principal, en pÃxeles."
+
+#~ msgid "Default window height"
+#~ msgstr "Altura predeterminada da xanela"
+
+#~ msgid "The default height for the main window, in pixels."
+#~ msgstr "Altura predeterminada da xanela principal, en pÃxeles."
+
+#~ msgid "Default window state"
+#~ msgstr "Estado predeterminado da xanela"
+
+#~ msgid "Whether or not the window should be maximized."
+#~ msgstr "Indica se a xanela deberÃa ou non estar maximizada."
+
+#~ msgid "Proxy configuration mode"
+#~ msgstr "Modo de configuraciÃn do proxy"
+
+#~ msgid ""
+#~ "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
+#~ "representing \"use system settings\", \"no proxy\", \"use manual proxy "
+#~ "configuration\" and \"use proxy configuration provided in the autoconfig "
+#~ "url\" respectively."
+#~ msgstr ""
+#~ "Seleccionar o modo de configuraciÃn do proxy. Os valores compatÃbeis son "
+#~ "0, 1, 2 e 3, que representan Âusar os axustes do sistemaÂ, Âsen proxyÂ, "
+#~ "Âusar a configuraciÃn manual do proxy e Âusar a configuraciÃn do proxy "
+#~ "fornecida no url autoconfigurado respectivamente."
+
+#~ msgid "HTTP proxy port"
+#~ msgstr "Porto do proxy HTTP"
+
+#~ msgid ""
+#~ "The port on the machine defined by \"/apps/evolution/shell/network_config/"
+#~ "http_host\" that you proxy through."
+#~ msgstr ""
+#~ "Porto da mÃquina definido en Â/apps/evolution/shell/network_config/"
+#~ "http_host  a travÃs do que usar o proxy ."
+
+#~ msgid "HTTP proxy host name"
+#~ msgstr "Nome do servidor proxy HTTP"
+
+#~ msgid "The machine name to proxy HTTP through."
+#~ msgstr "Nome da mÃquina a travÃs da que usar o proxy HTTP."
+
+#~ msgid "Secure HTTP proxy port"
+#~ msgstr "Porto do proxy HTTP seguro"
+
+#~ msgid ""
+#~ "The port on the machine defined by \"/apps/evolution/shell/network_config/"
+#~ "secure_host\" that you proxy through."
+#~ msgstr ""
+#~ "Porto da mÃquina definido en Â/apps/evolution/shell/network_config/"
+#~ "secure_host a travÃs do que usar o proxy ."
+
+#~ msgid "Secure HTTP proxy host name"
+#~ msgstr "Nome do servidor do proxy HTTP seguro"
+
+#~ msgid "The machine name to proxy secure HTTP through."
+#~ msgstr "Nome da mÃquina a travÃs da que usar o proxy HTTP seguro."
+
+#~ msgid "SOCKS proxy port"
+#~ msgstr "Porto do proxy SOCKS"
+
+#~ msgid ""
+#~ "The port on the machine defined by \"/apps/evolution/shell/network_config/"
+#~ "socks_host\" that you proxy through."
+#~ msgstr ""
+#~ "Porto da mÃquina definido en Â/apps/evolution/shell/network_config/"
+#~ "socks_host a travÃs do que usar o proxy ."
+
+#~ msgid "SOCKS proxy host name"
+#~ msgstr "Nome do servidor do proxy SOCKS"
+
+#~ msgid "The machine name to proxy socks through."
+#~ msgstr "Nome da mÃquina a travÃs da que usar o proxy socks."
+
+#~ msgid "Use HTTP proxy"
+#~ msgstr "Usar proxy HTTP"
+
+#~ msgid ""
+#~ "Enables the proxy settings when accessing HTTP/Secure HTTP over the "
+#~ "Internet."
+#~ msgstr ""
+#~ "Activa os axustes do proxy ao acceder a HTTP/HTTP seguro na Internet."
+
+#~ msgid "Authenticate proxy server connections"
+#~ msgstr "Autenticar as conexiÃns co servidor proxy"
+
+#~ msgid ""
+#~ "If true, then connections to the proxy server require authentication. The "
+#~ "username is retrieved from the \"/apps/evolution/shell/network_config/"
+#~ "authentication_user\" GConf key, and the password is retrieved from "
+#~ "either gnome-keyring or the ~/.gnome2_private/Evolution password file."
+#~ msgstr ""
+#~ "Se à ÂverdadeiroÂ, entÃn as conexiÃns co servidor proxy requiren "
+#~ "autenticaciÃn. O nome do usuario obtense da chave GConf \"/apps/evolution/"
+#~ "shell/network_config/authentication_user\" e o contrasinal obtense do "
+#~ "gnome-keyring ou do ficheiro de contrasinais ~/.gnome2_private/Evolution."
+
+#~ msgid "HTTP proxy username"
+#~ msgstr "Nome de usuario para o proxy HTTP"
+
+#~ msgid "Username to pass as authentication when doing HTTP proxying."
+#~ msgstr ""
+#~ "Nome do usuario para pasar como autenticaciÃn ao usar un proxy HTTP."
+
+#~ msgid "HTTP proxy password"
+#~ msgstr "Contrasinal do proxy HTTP"
+
+#~ msgid "Password to pass as authentication when doing HTTP proxying."
+#~ msgstr "Contrasinal requirido como autenticaciÃn ao usar o proxy HTTP."
+
+#~ msgid "Non-proxy hosts"
+#~ msgstr "Servidores que non usan proxy"
+
+#~ msgid ""
+#~ "This key contains a list of hosts which are connected to directly, rather "
+#~ "than via the proxy (if it is active). The values can be hostnames, "
+#~ "domains (using an initial wildcard like *.foo.com), IP host addresses "
+#~ "(both IPv4 and IPv6) and network addresses with a netmask (something like "
+#~ "192.168.0.0/24)."
+#~ msgstr ""
+#~ "Esta chave contÃn unha lista de servidores cos que està conectado "
+#~ "directamente, en vez de a travÃs dun proxy (se està activo). Os valores "
+#~ "poden ser nomes de servidor, dominios (usando un caracter de substituciÃn "
+#~ "inicial como *.foo.com), enderezos IP de servidores (tanto IPv4 como "
+#~ "IPv6) e enderezos de rede cunha mÃscara (do tipo 192.168.0.0/24)."
+
+#~ msgid "Automatic proxy configuration URL"
+#~ msgstr "URL de configuraciÃn automÃtica do proxy"
+
+#~ msgid "URL that provides proxy configuration values."
+#~ msgstr "O URL que proporciona os valores de configuraciÃn de proxy."
+
 #~ msgid "Whether to show local folders (On This Computer) in a folder tree"
 #~ msgstr ""
 #~ "Indica se se deben mostrar os cartafoles locais (Neste equipo) nun Ãrbore "
@@ -22910,9 +22501,6 @@ msgstr "MÃtodos de entrada"
 #~ "està seguro, pregunte ao administrador do sistema ou provedor de acceso a "
 #~ "Internet."
 
-#~ msgid "Check for _new messages every"
-#~ msgstr "Comprobar automaticamente se hai mensaxes _novas cada"
-
 #~ msgid "minu_tes"
 #~ msgstr "minu_tos"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]