[evolution] Updated Portuguese translation



commit b66710e0da4257b8d5a9f30d7a4bc3fcd588af8c
Author: Tiago Santos <tiagofsantos81 sapo pt>
Date:   Sat May 21 20:13:25 2016 +0000

    Updated Portuguese translation

 po/pt.po | 1761 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 918 insertions(+), 843 deletions(-)
---
diff --git a/po/pt.po b/po/pt.po
index 4b0e25e..5bc20d2 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -3,26 +3,25 @@
 # Distributed under the same licence as the evolution package.
 # Duarte Loreto <happyguy_pt hotmail com>, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 
2013, 2014.
 # Tiago Antão <tiagoantao bigfoot com>, 2000.
-# Tiago S. <almosthumane portugalmail pt>
+# Tiago Santos <tiagofsantos81 sapo pt> 2014 - 2016.
 # Pedro Albuquerque <palbuquerque73 gmail com>, 2015.
 # Sérgio Cardeira <cardeira dot sergio at gmail dot com>, 2016.
 #
-#: ../shell/main.c:522
 msgid ""
 msgstr ""
 "Project-Id-Version: 3.12\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2016-03-03 18:03+0000\n"
-"PO-Revision-Date: 2016-02-18 21:41-0100\n"
-"Last-Translator: Sérgio Cardeira <cardeira dot sergio at gmail dot com>\n"
+"POT-Creation-Date: 2016-05-18 09:51+0000\n"
+"PO-Revision-Date: 2016-05-21 21:12+0100\n"
+"Last-Translator: Tiago Santos <tiagofsantos81 sapo pt>\n"
 "Language-Team: Português <>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Poedit 1.5.4\n"
 "X-Language: pt_PT\n"
 "X-Source-Language: C\n"
 "X-Project-Style: gnome\n"
@@ -93,8 +92,8 @@ msgstr "Eliminar o livro de endereços \"{0}\"?"
 msgid "This address book will be removed permanently."
 msgstr "Este livro de endereços será definitivamente removido."
 
-#: ../addressbook/addressbook.error.xml.h:13 ../calendar/calendar.error.xml.h:7
-#: ../mail/mail.error.xml.h:67
+#: ../addressbook/addressbook.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:67
 msgid "Do _Not Delete"
 msgstr "_Não eliminar"
 
@@ -208,7 +207,7 @@ msgstr ""
 #: ../plugins/attachment-reminder/attachment-reminder.c:457
 #: ../plugins/email-custom-header/email-custom-header.c:839
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../plugins/templates/templates.c:453
+#: ../plugins/templates/templates.c:470
 msgid "_Add"
 msgstr "_Adicionar"
 
@@ -338,7 +337,7 @@ msgid "Instant Messaging"
 msgstr "Mensagens instantâneas"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
-#: ../addressbook/importers/evolution-vcard-importer.c:979
+#: ../addressbook/importers/evolution-vcard-importer.c:983
 msgid "Contact"
 msgstr "Contacto"
 
@@ -438,14 +437,14 @@ msgstr "_Aniversário:"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:875
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:47
-#: ../calendar/gui/e-calendar-view.c:2037
+#: ../calendar/gui/e-calendar-view.c:2044
 msgid "Anniversary"
 msgstr "Aniversário"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:874
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:46
-#: ../calendar/gui/e-calendar-view.c:2036
+#: ../calendar/gui/e-calendar-view.c:2043
 msgid "Birthday"
 msgstr "Data de nascimento"
 
@@ -537,7 +536,7 @@ msgstr "Adicionar _X.509"
 #: ../plugins/email-custom-header/email-custom-header.c:849
 #: ../plugins/publish-calendar/publish-calendar.c:791
 #: ../plugins/publish-calendar/publish-calendar.ui.h:34
-#: ../plugins/templates/templates.c:463
+#: ../plugins/templates/templates.c:480
 msgid "_Remove"
 msgstr "_Remover"
 
@@ -556,11 +555,11 @@ msgstr "_Carregar X.509"
 #: ../calendar/calendar.error.xml.h:47 ../calendar/gui/e-comp-editor.c:2103
 #: ../composer/e-composer-actions.c:215 ../composer/e-composer-actions.c:355
 #: ../e-util/e-attachment-store.c:641
-#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3318
+#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3334
 #: ../e-util/gal-view-instance-save-as-dialog.c:270
 #: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:137
-#: ../smime/gui/certificate-manager.c:655
-#: ../smime/gui/certificate-manager.c:732
+#: ../smime/gui/certificate-manager.c:657
+#: ../smime/gui/certificate-manager.c:734
 msgid "_Save"
 msgstr "_Gravar"
 
@@ -578,7 +577,7 @@ msgid "_Help"
 msgstr "A_juda"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:60
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1997
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1998
 #: ../mail/mail-config.ui.h:37
 msgid "Options"
 msgstr "Opções"
@@ -605,7 +604,7 @@ msgstr "Opções"
 #: ../e-util/e-categories-dialog.c:82 ../e-util/e-category-editor.c:138
 #: ../e-util/e-category-editor.c:208 ../e-util/e-charset-combo-box.c:101
 #: ../e-util/e-color-chooser-widget.c:127 ../e-util/e-filter-datespec.c:291
-#: ../e-util/e-html-editor-actions.c:593 ../e-util/e-html-editor-actions.c:688
+#: ../e-util/e-html-editor-actions.c:589 ../e-util/e-html-editor-actions.c:684
 #: ../e-util/e-image-chooser-dialog.c:171
 #: ../e-util/e-mail-signature-script-dialog.c:365 ../e-util/e-passwords.c:470
 #: ../e-util/e-rule-context.c:815 ../e-util/e-rule-editor.c:180
@@ -613,7 +612,7 @@ msgstr "Opções"
 #: ../e-util/e-send-options.ui.h:42 ../e-util/e-source-config-dialog.c:379
 #: ../e-util/e-source-selector-dialog.c:372 ../e-util/e-table-config.c:548
 #: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
-#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3317
+#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3333
 #: ../e-util/gal-view-instance-save-as-dialog.c:269
 #: ../mail/e-mail-config-window.c:330 ../mail/e-mail-label-dialog.c:196
 #: ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:317
@@ -628,10 +627,10 @@ msgstr "Opções"
 #: ../plugins/publish-calendar/url-editor-dialog.c:421
 #: ../plugins/save-calendar/save-calendar.c:187 ../shell/e-shell-content.c:659
 #: ../shell/e-shell-content.c:766 ../shell/e-shell-utils.c:72
-#: ../shell/e-shell-utils.c:136 ../smime/gui/certificate-manager.c:654
-#: ../smime/gui/certificate-manager.c:731
-#: ../smime/gui/certificate-manager.c:955
-#: ../smime/gui/certificate-manager.c:1337 ../smime/gui/e-cert-selector.c:237
+#: ../shell/e-shell-utils.c:136 ../smime/gui/certificate-manager.c:656
+#: ../smime/gui/certificate-manager.c:733
+#: ../smime/gui/certificate-manager.c:957
+#: ../smime/gui/certificate-manager.c:1339 ../smime/gui/e-cert-selector.c:237
 #: ../smime/gui/smime-ui.ui.h:23
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -681,7 +680,7 @@ msgid "Show Certificates"
 msgstr "Mostrar certificados"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:262
-#: ../calendar/gui/e-comp-editor.c:2035 ../e-util/e-html-editor-actions.c:1111
+#: ../calendar/gui/e-comp-editor.c:2035 ../e-util/e-html-editor-actions.c:1107
 msgid "_Undo"
 msgstr "_Desfazer"
 
@@ -691,7 +690,7 @@ msgid "Undo"
 msgstr "Desfazer"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:269
-#: ../calendar/gui/e-comp-editor.c:2042 ../e-util/e-html-editor-actions.c:1097
+#: ../calendar/gui/e-comp-editor.c:2042 ../e-util/e-html-editor-actions.c:1093
 msgid "_Redo"
 msgstr "_Refazer"
 
@@ -728,8 +727,8 @@ msgid "PGP keys"
 msgstr "Chaves PGP"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3251
-#: ../smime/gui/certificate-manager.c:678
-#: ../smime/gui/certificate-manager.c:967
+#: ../smime/gui/certificate-manager.c:680
+#: ../smime/gui/certificate-manager.c:969
 msgid "All files"
 msgstr "Todos os ficheiros"
 
@@ -744,9 +743,9 @@ msgstr "Abrir certificado X.509"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3274
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:4322
 #: ../e-util/e-attachment-store.c:494 ../e-util/e-category-editor.c:146
-#: ../e-util/e-html-editor-actions.c:594 ../e-util/e-html-editor-actions.c:689
+#: ../e-util/e-html-editor-actions.c:590 ../e-util/e-html-editor-actions.c:685
 #: ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:298
-#: ../shell/e-shell-utils.c:73 ../smime/gui/certificate-manager.c:956
+#: ../shell/e-shell-utils.c:73 ../smime/gui/certificate-manager.c:958
 msgid "_Open"
 msgstr "_Abrir"
 
@@ -845,7 +844,7 @@ msgstr "Contacto inválido."
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
 #: ../plugins/publish-calendar/url-editor-dialog.c:422
 #: ../shell/e-shell-content.c:661 ../shell/e-shell-content.c:767
-#: ../shell/main.c:180 ../smime/gui/certificate-manager.c:1338
+#: ../shell/main.c:180 ../smime/gui/certificate-manager.c:1340
 #: ../smime/gui/e-cert-selector.c:238 ../smime/gui/smime-ui.ui.h:24
 msgid "_OK"
 msgstr "_Aceitar"
@@ -1040,7 +1039,7 @@ msgstr "Qualquer campo contém"
 
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:94
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:103
-#: ../addressbook/gui/widgets/ea-minicard-view.c:193
+#: ../addressbook/gui/widgets/ea-minicard-view.c:225
 msgid "evolution address book"
 msgstr "livro de endereços do Evolution"
 
@@ -1159,7 +1158,7 @@ msgid "Video Chat"
 msgstr "Chat de vídeo"
 
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:827
-#: ../e-util/e-send-options.c:546
+#: ../data/evolution.desktop.in.in.h:9 ../e-util/e-send-options.c:546
 #: ../modules/calendar/e-cal-shell-view-actions.c:199
 #: ../modules/calendar/e-cal-shell-view.c:579
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
@@ -1230,7 +1229,12 @@ msgid "Blog"
 msgstr "Blogue"
 
 #: ../addressbook/gui/widgets/eab-contact-merging.c:261
-#: ../calendar/gui/tasktypes.xml.h:14
+#: ../calendar/gui/e-cal-component-preview.c:308
+#: ../calendar/gui/e-cal-model-tasks.c:316
+#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:610
+#: ../calendar/gui/print.c:3588 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/mail-send-recv.c:964
 msgid "Cancelled"
 msgstr "Cancelada"
 
@@ -1465,14 +1469,15 @@ msgstr "Tem a certeza que deseja eliminar este contacto (%s)?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1366
 #: ../calendar/gui/e-comp-editor.c:1993 ../e-util/e-focus-tracker.c:785
-#: ../e-util/evolution-source-viewer.c:805 ../mail/e-mail-account-manager.c:736
+#: ../e-util/evolution-source-viewer.c:805
+#: ../mail/e-mail-account-manager.c:736
 #: ../modules/addressbook/e-book-shell-view-actions.c:1089
 #: ../modules/calendar/e-cal-shell-view-actions.c:1479
 #: ../modules/calendar/e-memo-shell-view-actions.c:678
 #: ../modules/calendar/e-task-shell-view-actions.c:832
 #: ../modules/mail/e-mail-shell-view-actions.c:1680
 #: ../shell/e-shell-window-actions.c:813
-#: ../smime/gui/certificate-manager.c:1661 ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/certificate-manager.c:1663 ../smime/gui/smime-ui.ui.h:10
 msgid "_Delete"
 msgstr "_Eliminar"
 
@@ -1607,7 +1612,7 @@ msgid "Title"
 msgstr "Título"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:659
+#: ../calendar/gui/e-meeting-list-view.c:660
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Cargo"
@@ -1639,7 +1644,7 @@ msgstr "Lista de contactos: "
 msgid "Contact: "
 msgstr "Contacto: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:187
+#: ../addressbook/gui/widgets/ea-minicard.c:182
 msgid "evolution minicard"
 msgstr "minicartão evolution"
 
@@ -1651,7 +1656,7 @@ msgstr "Novo contacto"
 msgid "New Contact List"
 msgstr "Nova lista de contactos"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:176
+#: ../addressbook/gui/widgets/ea-minicard-view.c:208
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -1675,7 +1680,7 @@ msgstr "Red_uzir"
 
 #. Search button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:450
-#: ../e-util/e-html-editor-actions.c:2106
+#: ../e-util/e-html-editor-actions.c:2102
 #: ../e-util/e-html-editor-find-dialog.c:195
 #: ../shell/e-shell-window-actions.c:890
 msgid "_Find"
@@ -1739,52 +1744,61 @@ msgstr ""
 "\n"
 "Não existem itens a mostrar nesta vista."
 
-#: ../addressbook/importers/evolution-csv-importer.c:746
-#: ../addressbook/importers/evolution-ldif-importer.c:548
+#: ../addressbook/importers/evolution-csv-importer.c:747
+#: ../addressbook/importers/evolution-ldif-importer.c:549
 #: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:485
-#: ../calendar/importers/icalendar-importer.c:980
-#: ../calendar/importers/icalendar-importer.c:1019 ../shell/shell.error.xml.h:1
+#: ../calendar/importers/icalendar-importer.c:481
+#: ../calendar/importers/icalendar-importer.c:978
+#: ../calendar/importers/icalendar-importer.c:1018
+#: ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "A importar..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1089
+#: ../addressbook/importers/evolution-csv-importer.c:929
+msgid "Can't open .csv file"
+msgstr "Impossível abrir o ficheiro .csv"
+
+#: ../addressbook/importers/evolution-csv-importer.c:1098
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Ficheiro CSV ou Tab de contactos do Outlook (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1090
+#: ../addressbook/importers/evolution-csv-importer.c:1099
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Importador de ficheiros CSV e Tab de contactos do Outlook"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1098
+#: ../addressbook/importers/evolution-csv-importer.c:1107
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Ficheiro CSV ou Tab de contactos do Mozilla (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1099
+#: ../addressbook/importers/evolution-csv-importer.c:1108
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Importador de ficheiros CSV e Tab de contactos do Mozilla"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1107
+#: ../addressbook/importers/evolution-csv-importer.c:1116
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Ficheiro CSV ou Tab de contactos do Evolution (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1108
+#: ../addressbook/importers/evolution-csv-importer.c:1117
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Importador de ficheiros CSV e Tab de contactos do Evolution"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:814
+#: ../addressbook/importers/evolution-ldif-importer.c:719
+msgid "Can't open .ldif file"
+msgstr "Impossível abrir o ficheiro .ldif"
+
+#: ../addressbook/importers/evolution-ldif-importer.c:821
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Formato de intercâmbio de dados LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:815
+#: ../addressbook/importers/evolution-ldif-importer.c:822
 msgid "Evolution LDIF importer"
 msgstr "Importador de ficheiros LDIF do Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:642
+#: ../addressbook/importers/evolution-vcard-importer.c:646
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:643
+#: ../addressbook/importers/evolution-vcard-importer.c:647
 msgid "Evolution vCard Importer"
 msgstr "Importador de vCard do Evolution"
 
@@ -1981,7 +1995,7 @@ msgid "Start time"
 msgstr "Hora de início"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:1
-#: ../calendar/alarm-notify/alarm-queue.c:1949
+#: ../calendar/alarm-notify/alarm-queue.c:1947
 msgid "Appointments"
 msgstr "Compromissos"
 
@@ -1996,14 +2010,14 @@ msgstr "_Adiar"
 #: ../calendar/alarm-notify/alarm-notify.ui.h:4
 #: ../calendar/gui/e-comp-editor-page-general.c:1365
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:2240
-#: ../calendar/gui/e-comp-editor.c:2058 ../e-util/e-html-editor-actions.c:1120
+#: ../calendar/gui/e-comp-editor.c:2058 ../e-util/e-html-editor-actions.c:1116
 #: ../e-util/e-mail-signature-manager.c:357 ../e-util/filter.ui.h:17
 #: ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:173
 #: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:63
 #: ../plugins/attachment-reminder/attachment-reminder.c:462
 #: ../plugins/email-custom-header/email-custom-header.c:844
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
-#: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:941
+#: ../plugins/templates/templates.c:475 ../shell/e-shell-window-actions.c:941
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "_Edit"
 msgstr "_Editar"
@@ -2017,8 +2031,8 @@ msgid "_Dismiss"
 msgstr "_Dispensar"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/alarm-notify/alarm-queue.c:1916
-#: ../calendar/alarm-notify/alarm-queue.c:1926
+#: ../calendar/alarm-notify/alarm-queue.c:1914
+#: ../calendar/alarm-notify/alarm-queue.c:1924
 #: ../modules/cal-config-weather/evolution-cal-config-weather.c:248
 #: ../modules/itip-formatter/itip-view.c:1514
 #: ../modules/itip-formatter/itip-view.c:1625
@@ -2053,23 +2067,23 @@ msgstr "horas"
 msgid "minutes"
 msgstr "minutos"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1714
-#: ../calendar/alarm-notify/alarm-queue.c:1896
+#: ../calendar/alarm-notify/alarm-queue.c:1715
+#: ../calendar/alarm-notify/alarm-queue.c:1895
 msgid "No summary available."
 msgstr "Nenhum resumo disponível."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1723
-#: ../calendar/alarm-notify/alarm-queue.c:1725
+#: ../calendar/alarm-notify/alarm-queue.c:1724
+#: ../calendar/alarm-notify/alarm-queue.c:1726
 msgid "No description available."
 msgstr "Nenhuma descrição disponível."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1733
+#: ../calendar/alarm-notify/alarm-queue.c:1734
 msgid "No location information available."
 msgstr "Nenhuma informação de local disponível."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1738
-#: ../calendar/alarm-notify/alarm-queue.c:1887
-#: ../calendar/alarm-notify/alarm-queue.c:2240
+#: ../calendar/alarm-notify/alarm-queue.c:1739
+#: ../calendar/alarm-notify/alarm-queue.c:1886
+#: ../calendar/alarm-notify/alarm-queue.c:2237
 msgid "Evolution Reminders"
 msgstr "Lembretes do Evolution"
 
@@ -2080,21 +2094,21 @@ msgid_plural "You have %d reminders"
 msgstr[0] "Tem %d lembrete"
 msgstr[1] "Tem %d lembretes"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2058
+#: ../calendar/alarm-notify/alarm-queue.c:2055
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2059 ../mail/mail-dialogs.ui.h:21
+#: ../calendar/alarm-notify/alarm-queue.c:2056 ../mail/mail-dialogs.ui.h:21
 #: ../modules/mailto-handler/evolution-mailto-handler.c:114
 msgid "_No"
 msgstr "_Não"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2060
+#: ../calendar/alarm-notify/alarm-queue.c:2057
 #: ../modules/mailto-handler/evolution-mailto-handler.c:115
 msgid "_Yes"
 msgstr "_Sim"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2064
+#: ../calendar/alarm-notify/alarm-queue.c:2061
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2111,16 +2125,25 @@ msgstr ""
 "\n"
 "Tem a certeza que deseja executar esta aplicação?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2079
+#: ../calendar/alarm-notify/alarm-queue.c:2076
 msgid "Do not ask me about this program again."
 msgstr "Não perguntar novamente sobre esta aplicação."
 
-#: ../calendar/alarm-notify/util.c:43
+#: ../calendar/alarm-notify/util.c:67
 msgid "invalid time"
 msgstr "hora inválida"
 
+#. Translator: Entire string is like "Pop up an alert %d days before start"
+#: ../calendar/alarm-notify/util.c:93 ../calendar/gui/e-alarm-list.c:370
+#: ../calendar/gui/misc.c:97
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d dia"
+msgstr[1] "%d dias"
+
 #. Translator: Entire string is like "Pop up an alert %d hours before start"
-#: ../calendar/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:382
+#: ../calendar/alarm-notify/util.c:99 ../calendar/gui/e-alarm-list.c:382
 #: ../calendar/gui/misc.c:103
 #, c-format
 msgid "%d hour"
@@ -2129,7 +2152,7 @@ msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start"
-#: ../calendar/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:388
+#: ../calendar/alarm-notify/util.c:105 ../calendar/gui/e-alarm-list.c:388
 #: ../calendar/gui/misc.c:109
 #, c-format
 msgid "%d minute"
@@ -2140,7 +2163,7 @@ msgstr[1] "%d minutos"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:394
+#: ../calendar/alarm-notify/util.c:109 ../calendar/gui/e-alarm-list.c:394
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d second"
@@ -2298,7 +2321,8 @@ msgstr "Efetuou alterações a esta reunião, mas ainda não as gravou."
 msgid "_Save Changes"
 msgstr "_Gravar as alterações"
 
-#: ../calendar/calendar.error.xml.h:31 ../composer/mail-composer.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:13
 msgid "_Discard Changes"
 msgstr "_Descartar as alterações"
 
@@ -2337,8 +2361,8 @@ msgstr ""
 "Serão enviados convites a todos os participantes e ser-lhes-á possível "
 "responder."
 
-#: ../calendar/calendar.error.xml.h:40 ../composer/mail-composer.error.xml.h:36
-#: ../mail/mail.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:40
+#: ../composer/mail-composer.error.xml.h:36 ../mail/mail.error.xml.h:8
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Enviar"
@@ -2801,7 +2825,7 @@ msgstr "não contém"
 
 #: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
 #: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
-#: ../e-util/e-attachment-tree-view.c:533 ../e-util/e-table-config.ui.h:7
+#: ../e-util/e-attachment-tree-view.c:149 ../e-util/e-table-config.ui.h:7
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Description"
 msgstr "Descrição"
@@ -2841,8 +2865,8 @@ msgstr "Privado"
 
 #: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:243
 #: ../calendar/gui/e-cal-model.c:316 ../calendar/gui/e-task-table.c:500
-#: ../calendar/gui/memotypes.xml.h:12 ../e-util/e-html-editor-page-dialog.c:117
-#: ../e-util/e-send-options.ui.h:7
+#: ../calendar/gui/memotypes.xml.h:12
+#: ../e-util/e-html-editor-page-dialog.c:117 ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Confidencial"
 
@@ -2857,8 +2881,8 @@ msgstr "Organizador"
 msgid "Attendee"
 msgstr "Participante"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../mail/message-list.etspec.h:14
+#: ../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:862
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
 #: ../plugins/save-calendar/csv-format.c:389
@@ -3014,14 +3038,6 @@ msgstr "Botão de ir para"
 msgid "Click here, you can find more events."
 msgstr "Clique aqui, pode encontrar mais eventos."
 
-#. Translator: Entire string is like "Pop up an alert %d days before start"
-#: ../calendar/gui/e-alarm-list.c:370 ../calendar/gui/misc.c:97
-#, c-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d dia"
-msgstr[1] "%d dias"
-
 #. Translator: Entire string is like "Pop up an alert %d weeks before start"
 #: ../calendar/gui/e-alarm-list.c:376
 #, c-format
@@ -3032,28 +3048,28 @@ msgstr[1] "%d semanas"
 
 #. Translators: Part of: [ Play a sound ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../calendar/gui/e-alarm-list.c:421
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1828
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1829
 msgctxt "cal-reminders"
 msgid "Play a sound"
 msgstr "Reproduzir um som"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../calendar/gui/e-alarm-list.c:425
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1826
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1827
 msgctxt "cal-reminders"
 msgid "Pop up an alert"
 msgstr "Mostrar um balão de alerta"
 
 #. Translators: Part of: [ Send an email ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../calendar/gui/e-alarm-list.c:429
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1832
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1833
 msgctxt "cal-reminders"
 msgid "Send an email"
 msgstr "Enviar uma mensagem"
 
 #. Translators: Part of: [ Run a program ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../calendar/gui/e-alarm-list.c:433
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1830
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1831
 msgctxt "cal-reminders"
 msgid "Run a program"
 msgstr "Executar uma aplicação"
@@ -3183,18 +3199,11 @@ msgstr "Em curso"
 #: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
 #: ../calendar/gui/e-task-table.c:211 ../calendar/gui/e-task-table.c:226
 #: ../calendar/gui/e-task-table.c:609 ../calendar/gui/print.c:3585
-#: ../calendar/gui/tasktypes.xml.h:13 ../plugins/save-calendar/csv-format.c:379
+#: ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:379
 msgid "Completed"
 msgstr "Terminada"
 
-#: ../calendar/gui/e-cal-component-preview.c:308
-#: ../calendar/gui/e-cal-model-tasks.c:316
-#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:610
-#: ../calendar/gui/print.c:3588 ../mail/mail-send-recv.c:963
-msgid "Canceled"
-msgstr "Cancelado"
-
 #: ../calendar/gui/e-cal-component-preview.c:312
 #: ../calendar/gui/e-cal-model-tasks.c:310
 #: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:207
@@ -3209,20 +3218,20 @@ msgstr "Prioridade:"
 
 #: ../calendar/gui/e-cal-component-preview.c:327
 #: ../calendar/gui/e-task-table.c:524 ../calendar/gui/tasktypes.xml.h:19
-#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:316
+#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:318
 msgid "High"
 msgstr "Alta"
 
 #: ../calendar/gui/e-cal-component-preview.c:329
 #: ../calendar/gui/e-cal-model.c:1890 ../calendar/gui/e-task-table.c:525
 #: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
-#: ../mail/message-list.c:315
+#: ../mail/message-list.c:317
 msgid "Normal"
 msgstr "Normal"
 
 #: ../calendar/gui/e-cal-component-preview.c:331
 #: ../calendar/gui/e-task-table.c:526 ../calendar/gui/tasktypes.xml.h:21
-#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:314
+#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:316
 msgid "Low"
 msgstr "Baixa"
 
@@ -3422,7 +3431,7 @@ msgstr "A colar dados iCalendar"
 #. 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:1830 ../calendar/gui/e-memo-table.c:492
+#: ../calendar/gui/e-calendar-view.c:1830 ../calendar/gui/e-memo-table.c:495
 #: ../calendar/gui/e-task-table.c:794
 #, c-format
 msgid "Organizer: %s <%s>"
@@ -3431,7 +3440,7 @@ 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:1834 ../calendar/gui/e-memo-table.c:497
+#: ../calendar/gui/e-calendar-view.c:1834 ../calendar/gui/e-memo-table.c:500
 #: ../calendar/gui/e-task-table.c:798
 #, c-format
 msgid "Organizer: %s"
@@ -3439,7 +3448,7 @@ msgstr "Organizador: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
 #: ../calendar/gui/e-calendar-view.c:1850
-#: ../calendar/gui/e-meeting-time-sel.c:2731 ../calendar/gui/print.c:3533
+#: ../calendar/gui/e-meeting-time-sel.c:2727 ../calendar/gui/print.c:3533
 #, c-format
 msgid "Location: %s"
 msgstr "Localização: %s"
@@ -3450,10 +3459,10 @@ msgstr "Localização: %s"
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
 
-#: ../calendar/gui/e-calendar-view.c:2269
 #: ../calendar/gui/e-calendar-view.c:2276
 #: ../calendar/gui/e-calendar-view.c:2283
-#: ../calendar/gui/e-calendar-view.c:2286
+#: ../calendar/gui/e-calendar-view.c:2290
+#: ../calendar/gui/e-calendar-view.c:2293
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -3462,13 +3471,13 @@ msgstr "%d %b %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/e-calendar-view.c:2274 ../calendar/gui/e-day-view.c:3050
+#: ../calendar/gui/e-calendar-view.c:2281 ../calendar/gui/e-day-view.c:3080
 #: ../calendar/gui/e-day-view-top-item.c:851
 #: ../calendar/gui/e-week-view-main-item.c:230
 msgid "%d %b"
 msgstr "%d %b"
 
-#: ../calendar/gui/e-calendar-view.c:2296
+#: ../calendar/gui/e-calendar-view.c:2303
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -3478,15 +3487,15 @@ msgstr "%A %d %b %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/e-calendar-view.c:2300 ../calendar/gui/e-day-view.c:3034
+#: ../calendar/gui/e-calendar-view.c:2307 ../calendar/gui/e-day-view.c:3064
 #: ../calendar/gui/e-day-view-top-item.c:847
 #: ../calendar/gui/e-week-view-main-item.c:216
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: ../calendar/gui/e-calendar-view.c:2303
-#: ../calendar/gui/e-calendar-view.c:2309
-#: ../calendar/gui/e-calendar-view.c:2312
+#: ../calendar/gui/e-calendar-view.c:2310
+#: ../calendar/gui/e-calendar-view.c:2316
+#: ../calendar/gui/e-calendar-view.c:2319
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -3519,13 +3528,13 @@ msgstr "Última alteração"
 msgid "Source"
 msgstr "Origem"
 
-#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-meeting-list-view.c:184
-#: ../calendar/gui/e-meeting-list-view.c:198
+#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-meeting-list-view.c:185
+#: ../calendar/gui/e-meeting-list-view.c:199
 #: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:169
 #: ../calendar/gui/e-meeting-store.c:232 ../calendar/gui/print.c:1249
 #: ../calendar/gui/print.c:1266 ../e-util/e-charset.c:51
 #: ../modules/itip-formatter/itip-view.c:3604
-#: ../modules/itip-formatter/itip-view.c:6218
+#: ../modules/itip-formatter/itip-view.c:6213
 #: ../modules/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "Desconhecida"
@@ -3561,39 +3570,43 @@ msgid "Assigned"
 msgstr "Atribuída"
 
 #: ../calendar/gui/e-cal-model.c:1896 ../calendar/gui/e-cal-model-tasks.c:1138
-#: ../calendar/gui/e-meeting-list-view.c:208
+#: ../calendar/gui/e-meeting-list-view.c:209
 #: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:186
 #: ../calendar/gui/e-meeting-store.c:1023
 msgid "Yes"
 msgstr "Sim"
 
 #: ../calendar/gui/e-cal-model.c:1896 ../calendar/gui/e-cal-model-tasks.c:1138
-#: ../calendar/gui/e-meeting-list-view.c:209
+#: ../calendar/gui/e-meeting-list-view.c:210
 #: ../calendar/gui/e-meeting-store.c:188
 msgid "No"
 msgstr "Não"
 
-#: ../calendar/gui/e-cal-model.c:3820 ../calendar/gui/e-meeting-list-view.c:220
+#: ../calendar/gui/e-cal-model.c:3820
+#: ../calendar/gui/e-meeting-list-view.c:221
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../modules/itip-formatter/itip-view.c:6206
+#: ../modules/itip-formatter/itip-view.c:6201
 msgid "Accepted"
 msgstr "Aceite"
 
-#: ../calendar/gui/e-cal-model.c:3821 ../calendar/gui/e-meeting-list-view.c:221
+#: ../calendar/gui/e-cal-model.c:3821
+#: ../calendar/gui/e-meeting-list-view.c:222
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../modules/itip-formatter/itip-view.c:6212
+#: ../modules/itip-formatter/itip-view.c:6207
 msgid "Declined"
 msgstr "Recusada"
 
-#: ../calendar/gui/e-cal-model.c:3822 ../calendar/gui/e-meeting-list-view.c:222
+#: ../calendar/gui/e-cal-model.c:3822
+#: ../calendar/gui/e-meeting-list-view.c:223
 #: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
 #: ../calendar/gui/e-meeting-time-sel.c:535
 msgid "Tentative"
 msgstr "Tentativa"
 
-#: ../calendar/gui/e-cal-model.c:3823 ../calendar/gui/e-meeting-list-view.c:223
+#: ../calendar/gui/e-cal-model.c:3823
+#: ../calendar/gui/e-meeting-list-view.c:224
 #: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../modules/itip-formatter/itip-view.c:6215
+#: ../modules/itip-formatter/itip-view.c:6210
 msgid "Delegated"
 msgstr "Delegada"
 
@@ -3603,7 +3616,8 @@ msgstr "Requer ação"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/e-cal-model.c:3879 ../calendar/gui/e-meeting-list-view.c:688
+#: ../calendar/gui/e-cal-model.c:3879
+#: ../calendar/gui/e-meeting-list-view.c:689
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../calendar/gui/e-task-table.etspec.h:11 ../calendar/gui/tasktypes.xml.h:8
 #: ../mail/filtertypes.xml.in.h:36 ../mail/message-list.etspec.h:1
@@ -3855,9 +3869,9 @@ msgstr "Hora de início incorreta"
 #: ../calendar/gui/e-comp-editor-page-attachments.c:211
 #: ../calendar/gui/e-comp-editor.c:339 ../mail/e-mail-display.c:2057
 #: ../mail/e-mail-reader-utils.c:650 ../mail/mail-send-recv.c:486
-#: ../mail/mail-send-recv.c:1285 ../plugins/face/face.c:176
+#: ../mail/mail-send-recv.c:1286 ../plugins/face/face.c:176
 #: ../shell/e-shell.c:991 ../shell/e-shell.c:1013
-#: ../smime/gui/certificate-manager.c:346
+#: ../smime/gui/certificate-manager.c:348
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
@@ -4083,12 +4097,12 @@ msgid "Show attachments"
 msgstr "Mostrar anexos"
 
 #: ../calendar/gui/e-comp-editor-page-attachments.c:781
-#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:735
+#: ../e-util/e-attachment-bar.c:701 ../e-util/e-attachment-paned.c:735
 msgid "Icon View"
 msgstr "Vista Ícon"
 
 #: ../calendar/gui/e-comp-editor-page-attachments.c:783
-#: ../e-util/e-attachment-bar.c:663 ../e-util/e-attachment-paned.c:737
+#: ../e-util/e-attachment-bar.c:703 ../e-util/e-attachment-paned.c:737
 msgid "List View"
 msgstr "Vista Lista"
 
@@ -4423,13 +4437,13 @@ msgid "Exceptions"
 msgstr "Exceções"
 
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:2232
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1778
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1779
 #: ../mail/mail-config.ui.h:62
 msgid "A_dd"
 msgstr "A_dicionar"
 
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:2248
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1786
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1787
 #: ../mail/mail-config.ui.h:64
 msgid "Re_move"
 msgstr "Re_mover"
@@ -4442,38 +4456,38 @@ msgstr "Antever"
 msgid "Send To"
 msgstr "Enviar para"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1555
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1556
 msgid "_Reminders"
 msgstr "_Lembretes"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1557
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1558
 msgid "Set or unset reminders"
 msgstr "Definir ou remover lembretes"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1610
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1611
 #: ../modules/calendar/e-calendar-preferences.ui.h:66
 msgid "Reminders"
 msgstr "Lembretes"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1639
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1640
 msgid "_Reminder"
 msgstr "_Lembrete"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1672
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1673
 #, c-format
 msgid "%d day before"
 msgid_plural "%d days before"
 msgstr[0] "%d dia antes"
 msgstr[1] "%d dias antes"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1679
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1680
 #, c-format
 msgid "%d hour before"
 msgid_plural "%d hours before"
 msgstr[0] "%d hora antes"
 msgstr[1] "%d horas antes"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1686
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1687
 #, c-format
 msgid "%d minute before"
 msgid_plural "%d minutes before"
@@ -4481,131 +4495,131 @@ msgstr[0] "%d minuto antes"
 msgstr[1] "%d minutos antes"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1694
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1695
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Nenhum"
 
 #. Translators: Predefined reminder's description
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1696
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1697
 msgctxt "cal-reminders"
 msgid "15 minutes before"
 msgstr "15 minutos antes"
 
 #. Translators: Predefined reminder's description
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1698
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1699
 msgctxt "cal-reminders"
 msgid "1 hour before"
 msgstr "1 hora antes"
 
 #. Translators: Predefined reminder's description
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1700
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1701
 msgctxt "cal-reminders"
 msgid "1 day before"
 msgstr "1 dia antes"
 
 #. Translators: "Custom" for "Custom reminder set"
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1712
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1713
 msgctxt "cal-reminders"
 msgid "Custom"
 msgstr "Personalizado"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1863
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1864
 msgctxt "cal-reminders"
 msgid "minute(s)"
 msgstr "minuto(s)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ hour(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1865
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1866
 msgctxt "cal-reminders"
 msgid "hour(s)"
 msgstr "hora(s)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ day(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1867
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1868
 msgctxt "cal-reminders"
 msgid "day(s)"
 msgstr "dia(s)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1884
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1885
 msgctxt "cal-reminders"
 msgid "before"
 msgstr "antes"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ after ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1886
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1887
 msgctxt "cal-reminders"
 msgid "after"
 msgstr "após"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1902
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1903
 msgctxt "cal-reminders"
 msgid "start"
 msgstr "início"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ end ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1904
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1905
 msgctxt "cal-reminders"
 msgid "end"
 msgstr "fim"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1927
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1928
 msgid "Re_peat the reminder"
 msgstr "_Repetir o lembrete"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1952
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1953
 msgctxt "cal-reminders"
 msgid "extra times every"
 msgstr "tempos extra a cada"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1989
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1990
 msgctxt "cal-reminders"
 msgid "minutes"
 msgstr "minutos"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ hours ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1991
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1992
 msgctxt "cal-reminders"
 msgid "hours"
 msgstr "horas"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ days ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1993
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1994
 msgctxt "cal-reminders"
 msgid "days"
 msgstr "dias"
 
 #. page_reminders->priv->custom_email_entry is initialized on demand
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2034
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2191
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2035
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2192
 msgctxt "cal-reminders"
 msgid "Custom _message"
 msgstr "_Mensagem personalizada"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2078
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2079
 msgctxt "cal-reminders"
 msgid "Custom reminder _sound"
 msgstr "_Som personalizado de lembrete"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2089
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2090
 msgid "Select a sound file"
 msgstr "Selecione um ficheiro de som"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2117
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2118
 msgid "_Program:"
 msgstr "_Programa:"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2142
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2143
 msgid "_Arguments:"
 msgstr "_Argumentos:"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2174
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2175
 msgid "_Send To:"
 msgstr "_Enviar para:"
 
@@ -4688,9 +4702,10 @@ msgid "Completed"
 msgstr "Terminada"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:1173
+#| msgid "Cancelled"
 msgctxt "ECompEditor"
-msgid "Canceled"
-msgstr "Cancelado"
+msgid "Cancelled"
+msgstr "Cancelada"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:1182
 msgctxt "ECompEditor"
@@ -4803,14 +4818,15 @@ msgstr "Sem resumo"
 
 #. == Button box ==
 #: ../calendar/gui/e-comp-editor.c:1972 ../composer/e-composer-actions.c:334
-#: ../e-util/e-html-editor-dialog.c:196 ../e-util/e-mail-signature-editor.c:295
+#: ../e-util/e-html-editor-dialog.c:196
+#: ../e-util/e-mail-signature-editor.c:299
 #: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:391
 #: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:129
 #: ../mail/e-mail-notes.c:903 ../mail/em-folder-properties.c:688
-#: ../mail/em-subscription-editor.c:1759
+#: ../mail/em-subscription-editor.c:1765
 #: ../modules/plugin-manager/evolution-plugin-manager.c:256
 #: ../shell/e-shell-window-actions.c:280 ../shell/e-shell-window-actions.c:778
-#: ../smime/gui/certificate-manager.c:2068
+#: ../smime/gui/certificate-manager.c:2203
 msgid "_Close"
 msgstr "_Fechar"
 
@@ -4820,7 +4836,7 @@ msgstr "Fechar a janela atual"
 
 #. copy menu item
 #: ../calendar/gui/e-comp-editor.c:1979 ../e-util/e-focus-tracker.c:775
-#: ../e-util/e-html-editor-actions.c:1076 ../e-util/e-text.c:2109
+#: ../e-util/e-html-editor-actions.c:1072 ../e-util/e-text.c:2109
 #: ../e-util/e-web-view.c:379 ../mail/e-mail-browser.c:136
 #: ../mail/mail.error.xml.h:140 ../shell/e-shell-window-actions.c:799
 msgid "_Copy"
@@ -4836,7 +4852,7 @@ msgstr "Copiar a seleção"
 
 #. cut menu item
 #: ../calendar/gui/e-comp-editor.c:1986 ../e-util/e-focus-tracker.c:770
-#: ../e-util/e-html-editor-actions.c:1083 ../e-util/e-text.c:2095
+#: ../e-util/e-html-editor-actions.c:1079 ../e-util/e-text.c:2095
 #: ../mail/e-mail-browser.c:143 ../shell/e-shell-window-actions.c:806
 msgid "Cu_t"
 msgstr "Cor_tar"
@@ -4860,7 +4876,7 @@ msgstr "Ver a ajuda"
 
 #. paste menu item
 #: ../calendar/gui/e-comp-editor.c:2007 ../e-util/e-focus-tracker.c:780
-#: ../e-util/e-html-editor-actions.c:1090 ../e-util/e-text.c:2121
+#: ../e-util/e-html-editor-actions.c:1086 ../e-util/e-text.c:2121
 #: ../mail/e-mail-browser.c:150 ../shell/e-shell-window-actions.c:834
 msgid "_Paste"
 msgstr "_Colar"
@@ -4888,7 +4904,7 @@ msgid "Pre_view..."
 msgstr "Ante_ver..."
 
 #: ../calendar/gui/e-comp-editor.c:2028 ../e-util/e-focus-tracker.c:790
-#: ../e-util/e-html-editor-actions.c:1104 ../e-util/e-web-view.c:389
+#: ../e-util/e-html-editor-actions.c:1100 ../e-util/e-web-view.c:389
 #: ../mail/e-mail-browser.c:157 ../shell/e-shell-window-actions.c:911
 msgid "Select _All"
 msgstr "Seleccion_ar tudo"
@@ -4903,13 +4919,13 @@ msgstr "Selecionar todo o texto"
 msgid "_Classification"
 msgstr "_Classificação"
 
-#: ../calendar/gui/e-comp-editor.c:2065 ../e-util/e-html-editor-actions.c:1127
-#: ../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:166
+#: ../calendar/gui/e-comp-editor.c:2065 ../e-util/e-html-editor-actions.c:1123
+#: ../e-util/e-mail-signature-editor.c:313 ../mail/e-mail-browser.c:166
 #: ../mail/e-mail-notes.c:917 ../shell/e-shell-window-actions.c:948
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../calendar/gui/e-comp-editor.c:2079 ../e-util/e-html-editor-actions.c:1148
+#: ../calendar/gui/e-comp-editor.c:2079 ../e-util/e-html-editor-actions.c:1144
 msgid "_Insert"
 msgstr "_Inserir"
 
@@ -4917,9 +4933,9 @@ msgstr "_Inserir"
 msgid "_Options"
 msgstr "_Opções"
 
-#: ../calendar/gui/e-comp-editor.c:2093 ../e-util/e-html-editor-actions.c:1169
+#: ../calendar/gui/e-comp-editor.c:2093 ../e-util/e-html-editor-actions.c:1165
 #: ../mail/e-mail-browser.c:180 ../shell/e-shell-window-actions.c:991
-#: ../smime/gui/certificate-manager.c:1651 ../smime/gui/smime-ui.ui.h:5
+#: ../smime/gui/certificate-manager.c:1653 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "_Ver"
 
@@ -4927,8 +4943,8 @@ msgstr "_Ver"
 msgid "Save current changes"
 msgstr "Gravar as alterações atuais"
 
-#: ../calendar/gui/e-comp-editor.c:2110 ../e-util/e-mail-signature-editor.c:304
-#: ../mail/e-mail-notes.c:912
+#: ../calendar/gui/e-comp-editor.c:2110
+#: ../e-util/e-mail-signature-editor.c:308 ../mail/e-mail-notes.c:912
 msgid "Save and Close"
 msgstr "Gravar e fechar"
 
@@ -4956,13 +4972,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:3017 ../calendar/gui/e-day-view-top-item.c:843
+#: ../calendar/gui/e-day-view.c:3047 ../calendar/gui/e-day-view-top-item.c:843
 #: ../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2095
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:3742
+#: ../calendar/gui/e-day-view.c:3772
 #, c-format
 msgid "Week %d"
 msgstr "Semana %d"
@@ -4997,94 +5013,94 @@ msgstr "Nenhum"
 msgid "Select..."
 msgstr "Selecionar..."
 
-#: ../calendar/gui/e-meeting-list-view.c:63
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "Coordenadores"
 
-#: ../calendar/gui/e-meeting-list-view.c:64
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Required Participants"
 msgstr "Participantes requeridos"
 
-#: ../calendar/gui/e-meeting-list-view.c:65
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Optional Participants"
 msgstr "Participantes opcionais"
 
-#: ../calendar/gui/e-meeting-list-view.c:66
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Resources"
 msgstr "Recursos"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-list-view.c:165
 msgid "Attendees"
 msgstr "Participantes"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-list-view.c:181
 #: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:126
 #: ../calendar/gui/e-meeting-store.c:1017 ../calendar/gui/print.c:1245
 msgid "Individual"
 msgstr "Individual"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
 #: ../calendar/gui/print.c:1246 ../e-util/e-table-config.ui.h:8
 msgid "Group"
 msgstr "Grupo"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-meeting-list-view.c:183
 #: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
 #: ../calendar/gui/print.c:1247
 msgid "Resource"
 msgstr "Recurso"
 
-#: ../calendar/gui/e-meeting-list-view.c:183
+#: ../calendar/gui/e-meeting-list-view.c:184
 #: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
 #: ../calendar/gui/print.c:1248
 msgid "Room"
 msgstr "Sala"
 
-#: ../calendar/gui/e-meeting-list-view.c:194
+#: ../calendar/gui/e-meeting-list-view.c:195
 #: ../calendar/gui/e-meeting-store.c:144 ../calendar/gui/e-meeting-store.c:161
 #: ../calendar/gui/print.c:1262
 msgid "Chair"
 msgstr "Coordenador"
 
-#: ../calendar/gui/e-meeting-list-view.c:195
+#: ../calendar/gui/e-meeting-list-view.c:196
 #: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
 #: ../calendar/gui/e-meeting-store.c:1020 ../calendar/gui/print.c:1263
 msgid "Required Participant"
 msgstr "Participante requerido"
 
-#: ../calendar/gui/e-meeting-list-view.c:196
+#: ../calendar/gui/e-meeting-list-view.c:197
 #: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
 #: ../calendar/gui/print.c:1264
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
-#: ../calendar/gui/e-meeting-list-view.c:197
+#: ../calendar/gui/e-meeting-list-view.c:198
 #: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
 #: ../calendar/gui/print.c:1265
 msgid "Non-Participant"
 msgstr "Não participante"
 
-#: ../calendar/gui/e-meeting-list-view.c:219
+#: ../calendar/gui/e-meeting-list-view.c:220
 #: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
 #: ../calendar/gui/e-meeting-store.c:1030
 msgid "Needs Action"
 msgstr "Requer ação"
 
-#: ../calendar/gui/e-meeting-list-view.c:619
+#: ../calendar/gui/e-meeting-list-view.c:620
 msgid "Attendee                          "
 msgstr "Participante                      "
 
-#: ../calendar/gui/e-meeting-list-view.c:645
+#: ../calendar/gui/e-meeting-list-view.c:646
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
 #: ../calendar/gui/e-task-table.etspec.h:3
-#: ../e-util/e-attachment-tree-view.c:591
+#: ../e-util/e-attachment-tree-view.c:207
 #: ../mail/e-mail-account-tree-view.c:157
 msgid "Type"
 msgstr "Tipo"
 
-#: ../calendar/gui/e-meeting-list-view.c:674
+#: ../calendar/gui/e-meeting-list-view.c:675
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "Responder SFF"
@@ -5175,7 +5191,7 @@ msgstr "Hora de _início:"
 msgid "_End time:"
 msgstr "_Hora de fim:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2727
+#: ../calendar/gui/e-meeting-time-sel.c:2723
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -5184,7 +5200,7 @@ msgstr ""
 "Resumo: %s\n"
 "Localização: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2729 ../calendar/gui/print.c:3522
+#: ../calendar/gui/e-meeting-time-sel.c:2725 ../calendar/gui/print.c:3522
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumo: %s"
@@ -5213,7 +5229,7 @@ msgstr "Nome comum"
 msgid "Language"
 msgstr "Idioma"
 
-#: ../calendar/gui/e-memo-table.c:370
+#: ../calendar/gui/e-memo-table.c:370 ../data/evolution.desktop.in.in.h:11
 #: ../modules/calendar/e-cal-shell-content.c:1667
 #: ../modules/calendar/e-memo-shell-view-actions.c:196
 #: ../modules/calendar/e-memo-shell-view-actions.c:211
@@ -5221,38 +5237,38 @@ msgstr "Idioma"
 msgid "Memos"
 msgstr "Memorandos"
 
-#: ../calendar/gui/e-memo-table.c:454 ../calendar/gui/e-task-table.c:757
+#: ../calendar/gui/e-memo-table.c:457 ../calendar/gui/e-task-table.c:757
 msgid "* No Summary *"
 msgstr "* Sem resumo *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:539 ../calendar/gui/e-task-table.c:839
+#: ../calendar/gui/e-memo-table.c:542 ../calendar/gui/e-task-table.c:839
 msgid "Start: "
 msgstr "Início: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:559 ../calendar/gui/e-task-table.c:858
+#: ../calendar/gui/e-memo-table.c:562 ../calendar/gui/e-task-table.c:858
 msgid "Due: "
 msgstr "Limite: "
 
-#: ../calendar/gui/e-memo-table.c:682
+#: ../calendar/gui/e-memo-table.c:685
 msgid "Cut selected memos to the clipboard"
 msgstr "Cortar os memorandos selecionados para a área de transferência"
 
-#: ../calendar/gui/e-memo-table.c:688
+#: ../calendar/gui/e-memo-table.c:691
 msgid "Copy selected memos to the clipboard"
 msgstr "Copiar os memorandos selecionados para a área de transferência"
 
-#: ../calendar/gui/e-memo-table.c:694
+#: ../calendar/gui/e-memo-table.c:697
 msgid "Paste memos from the clipboard"
 msgstr "Colar memorandos da área de transferência"
 
-#: ../calendar/gui/e-memo-table.c:700
+#: ../calendar/gui/e-memo-table.c:703
 #: ../modules/calendar/e-memo-shell-view-actions.c:560
 msgid "Delete selected memos"
 msgstr "Eliminar os memorandos selecionados"
 
-#: ../calendar/gui/e-memo-table.c:706
+#: ../calendar/gui/e-memo-table.c:709
 msgid "Select all visible memos"
 msgstr "Selecionar todos os memorandos visíveis"
 
@@ -5276,7 +5292,8 @@ msgstr "%d%%"
 
 #: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2410
 #: ../calendar/importers/icalendar-importer.c:79
-#: ../calendar/importers/icalendar-importer.c:1117
+#: ../calendar/importers/icalendar-importer.c:1116
+#: ../data/evolution.desktop.in.in.h:12
 #: ../modules/calendar/e-calendar-preferences.ui.h:65
 #: ../modules/calendar/e-cal-shell-content.c:1627
 #: ../modules/calendar/e-task-shell-view-actions.c:220
@@ -5318,7 +5335,7 @@ msgstr "Data de início"
 msgid "Completion date"
 msgstr "Data de fim"
 
-#: ../calendar/gui/e-task-table.etspec.h:6 ../mail/mail-send-recv.c:965
+#: ../calendar/gui/e-task-table.etspec.h:6 ../mail/mail-send-recv.c:966
 msgid "Complete"
 msgstr "Terminada"
 
@@ -5347,32 +5364,32 @@ msgstr "Selecione o fuso horário"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/itip-utils.c:650 ../calendar/gui/itip-utils.c:708
-#: ../calendar/gui/itip-utils.c:842
+#: ../calendar/gui/itip-utils.c:657 ../calendar/gui/itip-utils.c:715
+#: ../calendar/gui/itip-utils.c:849
 msgid "An organizer must be set."
 msgstr "Tem de ser definido um organizador."
 
-#: ../calendar/gui/itip-utils.c:699
+#: ../calendar/gui/itip-utils.c:706
 msgid "At least one attendee is necessary"
 msgstr "É necessário pelo menos um participante"
 
-#: ../calendar/gui/itip-utils.c:930 ../calendar/gui/itip-utils.c:1091
+#: ../calendar/gui/itip-utils.c:937 ../calendar/gui/itip-utils.c:1098
 msgid "Event information"
 msgstr "Informação do evento"
 
-#: ../calendar/gui/itip-utils.c:933 ../calendar/gui/itip-utils.c:1094
+#: ../calendar/gui/itip-utils.c:940 ../calendar/gui/itip-utils.c:1101
 msgid "Task information"
 msgstr "Informação da tarefa"
 
-#: ../calendar/gui/itip-utils.c:936 ../calendar/gui/itip-utils.c:1097
+#: ../calendar/gui/itip-utils.c:943 ../calendar/gui/itip-utils.c:1104
 msgid "Memo information"
 msgstr "Informação do memorando"
 
-#: ../calendar/gui/itip-utils.c:939 ../calendar/gui/itip-utils.c:1115
+#: ../calendar/gui/itip-utils.c:946 ../calendar/gui/itip-utils.c:1122
 msgid "Free/Busy information"
 msgstr "Informação de livre/ocupado"
 
-#: ../calendar/gui/itip-utils.c:942
+#: ../calendar/gui/itip-utils.c:949
 msgid "Calendar information"
 msgstr "Informação de calendário"
 
@@ -5380,7 +5397,7 @@ msgstr "Informação de calendário"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:979
+#: ../calendar/gui/itip-utils.c:986
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Aceite"
@@ -5389,7 +5406,7 @@ msgstr "Aceite"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:986
+#: ../calendar/gui/itip-utils.c:993
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Aceite provisoriamente"
@@ -5401,7 +5418,7 @@ msgstr "Aceite provisoriamente"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:993 ../calendar/gui/itip-utils.c:1041
+#: ../calendar/gui/itip-utils.c:1000 ../calendar/gui/itip-utils.c:1048
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Recusada"
@@ -5410,7 +5427,7 @@ msgstr "Recusada"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1000
+#: ../calendar/gui/itip-utils.c:1007
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegada"
@@ -5418,7 +5435,7 @@ msgstr "Delegada"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1013
+#: ../calendar/gui/itip-utils.c:1020
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Atualizada"
@@ -5426,7 +5443,7 @@ msgstr "Atualizada"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1020
+#: ../calendar/gui/itip-utils.c:1027
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Cancelada"
@@ -5434,7 +5451,7 @@ msgstr "Cancelada"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1027
+#: ../calendar/gui/itip-utils.c:1034
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Revista"
@@ -5442,42 +5459,42 @@ msgstr "Revista"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1034
+#: ../calendar/gui/itip-utils.c:1041
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Contraproposta"
 
-#: ../calendar/gui/itip-utils.c:1112
+#: ../calendar/gui/itip-utils.c:1119
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informação de livre/ocupado (%s para %s)"
 
-#: ../calendar/gui/itip-utils.c:1120
+#: ../calendar/gui/itip-utils.c:1127
 msgid "iCalendar information"
 msgstr "Informação de iCalendar"
 
-#: ../calendar/gui/itip-utils.c:1149
+#: ../calendar/gui/itip-utils.c:1156
 #, c-format
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "Impossível reservar um recurso, o novo evento colide com outro."
 
-#: ../calendar/gui/itip-utils.c:1154
+#: ../calendar/gui/itip-utils.c:1161
 msgid "Unable to book a resource, error: "
 msgstr "Impossível reservar um recurso, erro: "
 
-#: ../calendar/gui/itip-utils.c:1325
+#: ../calendar/gui/itip-utils.c:1332
 msgid "You must be an attendee of the event."
 msgstr "Tem de ser um participante do evento."
 
-#: ../calendar/gui/itip-utils.c:1933
+#: ../calendar/gui/itip-utils.c:1940
 msgid "Sending an event"
 msgstr "A enviar um evento"
 
-#: ../calendar/gui/itip-utils.c:1937
+#: ../calendar/gui/itip-utils.c:1944
 msgid "Sending a memo"
 msgstr "A enviar um memorando"
 
-#: ../calendar/gui/itip-utils.c:1941
+#: ../calendar/gui/itip-utils.c:1948
 msgid "Sending a task"
 msgstr "A enviar uma mensagem"
 
@@ -5743,40 +5760,40 @@ msgstr "é menor que"
 msgid "Appointments and Meetings"
 msgstr "Compromissos e reuniões"
 
-#: ../calendar/importers/icalendar-importer.c:312
+#: ../calendar/importers/icalendar-importer.c:308
 #: ../modules/calendar/e-cal-base-shell-backend.c:183
 #: ../modules/calendar/e-cal-shell-view-actions.c:180
 msgid "New Calendar"
 msgstr "Novo calendário"
 
-#: ../calendar/importers/icalendar-importer.c:315
+#: ../calendar/importers/icalendar-importer.c:311
 #: ../modules/calendar/e-cal-base-shell-backend.c:191
 #: ../modules/calendar/e-task-shell-view-actions.c:204
 msgid "New Task List"
 msgstr "Nova lista de tarefas"
 
-#: ../calendar/importers/icalendar-importer.c:357
+#: ../calendar/importers/icalendar-importer.c:353
 msgid "Cre_ate new calendar"
 msgstr "Cri_ar um novo calendário"
 
-#: ../calendar/importers/icalendar-importer.c:361
+#: ../calendar/importers/icalendar-importer.c:357
 msgid "Cre_ate new task list"
 msgstr "Cri_ar uma nova lista de tarefas"
 
-#: ../calendar/importers/icalendar-importer.c:507
+#: ../calendar/importers/icalendar-importer.c:503
 #: ../calendar/importers/icalendar-importer.c:946
 msgid "Opening calendar"
 msgstr "A abrir o calendário"
 
-#: ../calendar/importers/icalendar-importer.c:655
+#: ../calendar/importers/icalendar-importer.c:654
 msgid "iCalendar files (.ics)"
 msgstr "Ficheiros iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:656
+#: ../calendar/importers/icalendar-importer.c:655
 msgid "Evolution iCalendar importer"
 msgstr "Importador de iCalendar Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:748
+#: ../calendar/importers/icalendar-importer.c:747
 msgid "Reminder!"
 msgstr "Lembrete!"
 
@@ -5788,156 +5805,156 @@ msgstr "Ficheiros vCalendar (.vcs)"
 msgid "Evolution vCalendar importer"
 msgstr "Importador de vCalendar Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:1110
+#: ../calendar/importers/icalendar-importer.c:1109
 msgid "Calendar Events"
 msgstr "Eventos do calendário"
 
-#: ../calendar/importers/icalendar-importer.c:1153
+#: ../calendar/importers/icalendar-importer.c:1152
 msgid "GNOME Calendar"
 msgstr "Calendário GNOME"
 
-#: ../calendar/importers/icalendar-importer.c:1154
+#: ../calendar/importers/icalendar-importer.c:1153
 msgid "Evolution Calendar intelligent importer"
 msgstr "Importador inteligente de calendário Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:1225
-#: ../calendar/importers/icalendar-importer.c:1539
+#: ../calendar/importers/icalendar-importer.c:1224
+#: ../calendar/importers/icalendar-importer.c:1538
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Reunião"
 
-#: ../calendar/importers/icalendar-importer.c:1225
-#: ../calendar/importers/icalendar-importer.c:1539
+#: ../calendar/importers/icalendar-importer.c:1224
+#: ../calendar/importers/icalendar-importer.c:1538
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Evento"
 
-#: ../calendar/importers/icalendar-importer.c:1228
-#: ../calendar/importers/icalendar-importer.c:1540
+#: ../calendar/importers/icalendar-importer.c:1227
+#: ../calendar/importers/icalendar-importer.c:1539
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Tarefa"
 
-#: ../calendar/importers/icalendar-importer.c:1231
-#: ../calendar/importers/icalendar-importer.c:1541
+#: ../calendar/importers/icalendar-importer.c:1230
+#: ../calendar/importers/icalendar-importer.c:1540
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Memorando"
 
-#: ../calendar/importers/icalendar-importer.c:1240
+#: ../calendar/importers/icalendar-importer.c:1239
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "tem recorrências"
 
-#: ../calendar/importers/icalendar-importer.c:1245
+#: ../calendar/importers/icalendar-importer.c:1244
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "é uma instância"
 
-#: ../calendar/importers/icalendar-importer.c:1250
+#: ../calendar/importers/icalendar-importer.c:1249
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "tem lembretes"
 
-#: ../calendar/importers/icalendar-importer.c:1255
+#: ../calendar/importers/icalendar-importer.c:1254
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "tem anexos"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1268
+#: ../calendar/importers/icalendar-importer.c:1267
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Público"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1271
+#: ../calendar/importers/icalendar-importer.c:1270
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Privado"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1274
+#: ../calendar/importers/icalendar-importer.c:1273
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Confidencial"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1278
+#: ../calendar/importers/icalendar-importer.c:1277
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Classificação"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1283
-#: ../calendar/importers/icalendar-importer.c:1583
+#: ../calendar/importers/icalendar-importer.c:1282
+#: ../calendar/importers/icalendar-importer.c:1582
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Resumo"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1289
+#: ../calendar/importers/icalendar-importer.c:1288
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Localização"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1297
-#: ../calendar/importers/icalendar-importer.c:1578
+#: ../calendar/importers/icalendar-importer.c:1296
+#: ../calendar/importers/icalendar-importer.c:1577
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Início"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1308
+#: ../calendar/importers/icalendar-importer.c:1307
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Limite"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1320
+#: ../calendar/importers/icalendar-importer.c:1319
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Fim"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1330
+#: ../calendar/importers/icalendar-importer.c:1329
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "Categorias"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1354
+#: ../calendar/importers/icalendar-importer.c:1353
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Terminado"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1362
+#: ../calendar/importers/icalendar-importer.c:1361
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1373
-#: ../calendar/importers/icalendar-importer.c:1376
+#: ../calendar/importers/icalendar-importer.c:1372
+#: ../calendar/importers/icalendar-importer.c:1375
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organizador"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1396
-#: ../calendar/importers/icalendar-importer.c:1399
+#: ../calendar/importers/icalendar-importer.c:1395
+#: ../calendar/importers/icalendar-importer.c:1398
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Participantes"
 
-#: ../calendar/importers/icalendar-importer.c:1413
+#: ../calendar/importers/icalendar-importer.c:1412
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Descrição"
 
-#: ../calendar/importers/icalendar-importer.c:1573
+#: ../calendar/importers/icalendar-importer.c:1572
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Tipo"
@@ -7742,11 +7759,12 @@ msgstr ""
 "Impossível encriptar a mensagem a enviar: nenhum certificado de encriptação "
 "para esta conta"
 
-#: ../composer/e-msg-composer.c:1619 ../composer/e-msg-composer.c:2645
+#: ../composer/e-msg-composer.c:1599 ../composer/e-msg-composer.c:2598
+#: ../data/evolution.desktop.in.in.h:7
 msgid "Compose Message"
 msgstr "Escrever uma mensagem"
 
-#: ../composer/e-msg-composer.c:4995
+#: ../composer/e-msg-composer.c:4893
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "O compositor contém um corpo de mensagem que não é texto, pelo que não pode "
@@ -7938,6 +7956,11 @@ msgstr "_Não perder a formatação"
 msgid "Lose _formatting"
 msgstr "Perder a _formatação"
 
+#: ../composer/mail-composer.error.xml.h:41
+#| msgid "An error occurred while saving to your Drafts folder."
+msgid "An error occurred while saving to your Templates folder."
+msgstr "Ocorreu um erro ao gravar na sua pasta de Modelos."
+
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Evolution Alarm Notify"
 msgstr "Notificação de alarmes do Evolution"
@@ -7975,6 +7998,20 @@ msgstr ""
 msgid "New Window"
 msgstr "Nova _janela"
 
+#: ../data/evolution.desktop.in.in.h:8 ../e-util/e-name-selector-dialog.c:451
+#: ../modules/addressbook/e-book-shell-backend.c:303
+#: ../modules/addressbook/e-book-shell-view.c:373
+msgid "Contacts"
+msgstr "Contactos"
+
+#: ../data/evolution.desktop.in.in.h:10 ../e-util/e-send-options.c:538
+#: ../mail/importers/elm-importer.c:329 ../mail/importers/kmail-importer.c:253
+#: ../mail/importers/pine-importer.c:422
+#: ../modules/mail/e-mail-shell-view.c:1242
+#: ../smime/gui/certificate-manager.c:1673
+msgid "Mail"
+msgstr "Correio"
+
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
 msgid "Enable address formatting"
 msgstr "Ativar a formatação de endereços"
@@ -8908,7 +8945,7 @@ msgstr "Domingo é um dia útil"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
 msgid "Create events, memos and tasks as Private by default"
-msgstr ""
+msgstr "Criar por predefinição eventos, memorandos e tarefas como Privados"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
 msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
@@ -10710,21 +10747,18 @@ msgid "Flag that enables a much simplified user interface."
 msgstr "Parâmetro que ativa um ambiente de utilizador muito simplificado."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
-#, fuzzy
-#| msgid "Zoom large images to not be wider than the window width"
 msgid "List of button names to hide in the window switcher"
-msgstr "Reduzir imagens grandes para caberem na largura da janela"
+msgstr "Lista de nomes de butões a esconder no alternador de janelas"
 
 #
 # Saber se os valores são traduzidos ou não
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
-#, fuzzy
 msgid ""
 "Valid values are 'mail', 'addressbook', 'calendar', 'tasks' and 'memos'. "
 "Change of this requires restart of the application."
 msgstr ""
 "Os valores válidos são 'mail', 'addressbook', 'calendar', 'tasks' and "
-"'memos'. A mundança destes valores requer o reinicio da aplicação."
+"'memos'. A mudança destes valores requer o reinicio da aplicação."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
 msgid "Window buttons are visible"
@@ -10873,7 +10907,7 @@ msgid "Name"
 msgstr "Nome"
 
 #: ../em-format/e-mail-formatter-print.c:51
-#: ../e-util/e-attachment-tree-view.c:579 ../mail/message-list.etspec.h:10
+#: ../e-util/e-attachment-tree-view.c:195 ../mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Tamanho"
 
@@ -10881,7 +10915,8 @@ msgstr "Tamanho"
 #: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:282
 #: ../mail/filtertypes.xml.in.h:16 ../mail/message-list.etspec.h:6
 #: ../mail/searchtypes.xml.in.h:17 ../mail/vfoldertypes.xml.in.h:17
-#: ../modules/mail/em-mailer-prefs.c:67 ../smime/gui/certificate-manager.c:1632
+#: ../modules/mail/em-mailer-prefs.c:67
+#: ../smime/gui/certificate-manager.c:1634
 msgid "Subject"
 msgstr "Assunto"
 
@@ -10914,7 +10949,7 @@ msgstr "Formatar parte como HTML"
 
 #: ../em-format/e-mail-formatter-quote-text-plain.c:123
 #: ../em-format/e-mail-formatter-text-plain.c:198
-#: ../e-util/e-html-editor-actions.c:1526
+#: ../e-util/e-html-editor-actions.c:1522
 msgid "Plain Text"
 msgstr "Texto simples"
 
@@ -11300,12 +11335,12 @@ msgstr "Impossível gravar o anexo"
 msgid "Attachment Properties"
 msgstr "Propriedades do anexo"
 
-#: ../e-util/e-attachment-dialog.c:339 ../e-util/e-import-assistant.c:273
+#: ../e-util/e-attachment-dialog.c:339 ../e-util/e-import-assistant.c:278
 msgid "F_ilename:"
 msgstr "Nome do f_icheiro:"
 
 #: ../e-util/e-attachment-dialog.c:356
-#: ../e-util/e-html-editor-image-dialog.c:558
+#: ../e-util/e-html-editor-image-dialog.c:568
 #: ../e-util/e-html-editor-link-dialog.c:422
 msgid "_Description:"
 msgstr "_Descrição:"
@@ -11326,13 +11361,13 @@ msgstr "Impossível definir como fundo"
 msgid "Set as _Background"
 msgstr "Definir como _fundo"
 
-#: ../e-util/e-attachment-icon-view.c:168
-#: ../e-util/e-attachment-tree-view.c:554
+#: ../e-util/e-attachment-icon-view.c:170
+#: ../e-util/e-attachment-tree-view.c:170
 msgid "Loading"
 msgstr "A carregar"
 
-#: ../e-util/e-attachment-icon-view.c:180
-#: ../e-util/e-attachment-tree-view.c:566
+#: ../e-util/e-attachment-icon-view.c:182
+#: ../e-util/e-attachment-tree-view.c:182
 msgid "Saving"
 msgstr "A gravar"
 
@@ -11466,40 +11501,40 @@ msgstr "Copiar o conteúdo do livro localmente para trabalhar em modo offline"
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-clique para abrir uma ligação"
 
-#: ../e-util/e-calendar.c:207
+#: ../e-util/e-calendar.c:272
 msgid "Previous month"
 msgstr "Mês anterior"
 
-#: ../e-util/e-calendar.c:232
+#: ../e-util/e-calendar.c:291
 msgid "Next month"
 msgstr "Mês seguinte"
 
-#: ../e-util/e-calendar.c:258
+#: ../e-util/e-calendar.c:311
 msgid "Previous year"
 msgstr "Ano anterior"
 
-#: ../e-util/e-calendar.c:283
+#: ../e-util/e-calendar.c:330
 msgid "Next year"
 msgstr "Ano seguinte"
 
-#: ../e-util/e-calendar.c:307
+#: ../e-util/e-calendar.c:354
 msgid "Month Calendar"
 msgstr "Calendário do mês"
 
 #. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1337 ../e-util/e-calendar-item.c:2215
+#: ../e-util/e-calendar-item.c:1340 ../e-util/e-calendar-item.c:2220
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1339
+#: ../e-util/e-calendar-item.c:1342
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1376
+#: ../e-util/e-calendar-item.c:1379
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B %Y"
@@ -11602,7 +11637,7 @@ msgid "popup list"
 msgstr "lista em balão"
 
 #: ../e-util/e-cell-date.c:51 ../e-util/e-cell-date.c:139
-#: ../e-util/e-cell-date.c:159 ../mail/message-list.c:2052
+#: ../e-util/e-cell-date.c:159 ../mail/message-list.c:2054
 msgid "?"
 msgstr "?"
 
@@ -11895,7 +11930,7 @@ msgstr "púrpura claro"
 msgid "white"
 msgstr "branco"
 
-#: ../e-util/e-color-combo.c:639 ../mail/e-mail-account-tree-view.c:134
+#: ../e-util/e-color-combo.c:644 ../mail/e-mail-account-tree-view.c:134
 #: ../mail/e-mail-config-security-page.c:426
 #: ../mail/e-mail-config-security-page.c:590 ../mail/e-mail-reader.c:4037
 #: ../mail/mail-config.ui.h:73
@@ -11918,7 +11953,8 @@ msgstr "Clique neste botão para mostrar um calendário"
 msgid "Drop-down combination box to select time"
 msgstr "Caixa de combinação para escolher a hora"
 
-#: ../e-util/e-dateedit.c:629 ../modules/calendar/e-calendar-preferences.ui.h:9
+#: ../e-util/e-dateedit.c:629
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "Hora"
 
@@ -12294,7 +12330,7 @@ msgstr "Localizar itens que respeitem as seguintes condições"
 #. protocol:
 #. name:
 #: ../e-util/e-filter-rule.c:856 ../e-util/e-html-editor-page-dialog.c:63
-#: ../e-util/e-mail-identity-combo-box.c:476
+#: ../e-util/e-mail-identity-combo-box.c:479
 #: ../e-util/e-mail-signature-combo-box.c:367
 #: ../libemail-engine/camel-null-store.c:27
 #: ../mail/e-mail-config-summary-page.c:139
@@ -12343,521 +12379,521 @@ msgstr "Falha ao inserir ficheiro HTML."
 msgid "Failed to insert text file."
 msgstr "Falha ao inserir ficheiro de texto."
 
-#: ../e-util/e-html-editor-actions.c:591
+#: ../e-util/e-html-editor-actions.c:587
 msgid "Insert HTML File"
 msgstr "Inserir ficheiro HTML"
 
-#: ../e-util/e-html-editor-actions.c:597
+#: ../e-util/e-html-editor-actions.c:593
 msgid "HTML file"
 msgstr "Ficheiro HTML"
 
-#: ../e-util/e-html-editor-actions.c:624
+#: ../e-util/e-html-editor-actions.c:620
 msgctxt "dialog-title"
 msgid "Insert Image"
 msgstr "Inserir imagem"
 
-#: ../e-util/e-html-editor-actions.c:686
+#: ../e-util/e-html-editor-actions.c:682
 msgid "Insert text file"
 msgstr "Inserir ficheiro de texto"
 
-#: ../e-util/e-html-editor-actions.c:692
+#: ../e-util/e-html-editor-actions.c:688
 msgid "Text file"
 msgstr "Ficheiro de texto"
 
-#: ../e-util/e-html-editor-actions.c:1078
+#: ../e-util/e-html-editor-actions.c:1074
 msgid "Copy selected text to the clipboard"
 msgstr "Copiar texto selecionado para a área de transferência"
 
-#: ../e-util/e-html-editor-actions.c:1085
+#: ../e-util/e-html-editor-actions.c:1081
 msgid "Cut selected text to the clipboard"
 msgstr "Cortar texto selecionado para a área de transferência"
 
 #. Widgets are treating Ctrl + v shortcut themselves
-#: ../e-util/e-html-editor-actions.c:1092
+#: ../e-util/e-html-editor-actions.c:1088
 msgid "Paste text from the clipboard"
 msgstr "Colar texto da área de transferência"
 
-#: ../e-util/e-html-editor-actions.c:1099
+#: ../e-util/e-html-editor-actions.c:1095
 msgid "Redo the last undone action"
 msgstr "Refazer a última ação desfeita"
 
-#: ../e-util/e-html-editor-actions.c:1113
+#: ../e-util/e-html-editor-actions.c:1109
 msgid "Undo the last action"
 msgstr "Desfazer a última ação"
 
-#: ../e-util/e-html-editor-actions.c:1134
+#: ../e-util/e-html-editor-actions.c:1130
 msgid "For_mat"
 msgstr "For_matar"
 
-#: ../e-util/e-html-editor-actions.c:1141
+#: ../e-util/e-html-editor-actions.c:1137
 msgid "_Paragraph Style"
 msgstr "Estilo do _parágrafo"
 
-#: ../e-util/e-html-editor-actions.c:1155
-#: ../e-util/e-html-editor-image-dialog.c:635
+#: ../e-util/e-html-editor-actions.c:1151
+#: ../e-util/e-html-editor-image-dialog.c:645
 msgid "_Alignment"
 msgstr "_Alinhamento"
 
-#: ../e-util/e-html-editor-actions.c:1162
+#: ../e-util/e-html-editor-actions.c:1158
 msgid "Current _Languages"
 msgstr "_Idiomas atuais"
 
-#: ../e-util/e-html-editor-actions.c:1179
+#: ../e-util/e-html-editor-actions.c:1175
 msgid "_Increase Indent"
 msgstr "Aumentar _indentação"
 
-#: ../e-util/e-html-editor-actions.c:1181
+#: ../e-util/e-html-editor-actions.c:1177
 msgid "Increase Indent"
 msgstr "Aumentar indentação"
 
-#: ../e-util/e-html-editor-actions.c:1186
+#: ../e-util/e-html-editor-actions.c:1182
 msgid "_HTML File..."
 msgstr "Ficheiro _HTML..."
 
-#: ../e-util/e-html-editor-actions.c:1193
+#: ../e-util/e-html-editor-actions.c:1189
 msgid "Te_xt File..."
 msgstr "Ficheiro de te_xto..."
 
-#: ../e-util/e-html-editor-actions.c:1200
+#: ../e-util/e-html-editor-actions.c:1196
 msgid "Paste _Quotation"
 msgstr "Colar _citação"
 
-#: ../e-util/e-html-editor-actions.c:1207
+#: ../e-util/e-html-editor-actions.c:1203
 msgid "_Find..."
 msgstr "_Localizar..."
 
-#: ../e-util/e-html-editor-actions.c:1209
+#: ../e-util/e-html-editor-actions.c:1205
 msgid "Search for text"
 msgstr "Procurar por texto"
 
-#: ../e-util/e-html-editor-actions.c:1214
+#: ../e-util/e-html-editor-actions.c:1210
 msgid "Find A_gain"
 msgstr "Locali_zar novamente"
 
-#: ../e-util/e-html-editor-actions.c:1221
+#: ../e-util/e-html-editor-actions.c:1217
 msgid "Re_place..."
 msgstr "_Substituir..."
 
-#: ../e-util/e-html-editor-actions.c:1223
+#: ../e-util/e-html-editor-actions.c:1219
 msgid "Search for and replace text"
 msgstr "Procurar e substituir texto"
 
-#: ../e-util/e-html-editor-actions.c:1228
+#: ../e-util/e-html-editor-actions.c:1224
 msgid "Check _Spelling..."
 msgstr "Verificar _Ortogafia..."
 
-#: ../e-util/e-html-editor-actions.c:1235
+#: ../e-util/e-html-editor-actions.c:1231
 msgid "_Decrease Indent"
 msgstr "_Diminuir indentação"
 
-#: ../e-util/e-html-editor-actions.c:1237
+#: ../e-util/e-html-editor-actions.c:1233
 msgid "Decrease Indent"
 msgstr "Diminuir indentação"
 
-#: ../e-util/e-html-editor-actions.c:1242
+#: ../e-util/e-html-editor-actions.c:1238
 msgid "_Wrap Lines"
 msgstr "_Qebrar linhas"
 
-#: ../e-util/e-html-editor-actions.c:1249
+#: ../e-util/e-html-editor-actions.c:1245
 msgid "Open Inspector"
 msgstr "Abrir inspetor"
 
 #. Center
-#: ../e-util/e-html-editor-actions.c:1259
+#: ../e-util/e-html-editor-actions.c:1255
 #: ../e-util/e-html-editor-paragraph-dialog.c:110
 msgid "_Center"
 msgstr "_Centrar"
 
-#: ../e-util/e-html-editor-actions.c:1261
+#: ../e-util/e-html-editor-actions.c:1257
 msgid "Center Alignment"
 msgstr "Alinhamento central"
 
 #. Left
-#: ../e-util/e-html-editor-actions.c:1266
+#: ../e-util/e-html-editor-actions.c:1262
 #: ../e-util/e-html-editor-paragraph-dialog.c:101
 msgid "_Left"
 msgstr "_Esquerdo"
 
-#: ../e-util/e-html-editor-actions.c:1268
+#: ../e-util/e-html-editor-actions.c:1264
 msgid "Left Alignment"
 msgstr "Alinhamento esquerdo"
 
 #. Right
-#: ../e-util/e-html-editor-actions.c:1273
+#: ../e-util/e-html-editor-actions.c:1269
 #: ../e-util/e-html-editor-paragraph-dialog.c:119
 msgid "_Right"
 msgstr "_Direita"
 
-#: ../e-util/e-html-editor-actions.c:1275
+#: ../e-util/e-html-editor-actions.c:1271
 msgid "Right Alignment"
 msgstr "Alinhamento direito"
 
-#: ../e-util/e-html-editor-actions.c:1283
+#: ../e-util/e-html-editor-actions.c:1279
 #: ../modules/text-highlight/languages.c:72
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../e-util/e-html-editor-actions.c:1285
+#: ../e-util/e-html-editor-actions.c:1281
 msgid "HTML editing mode"
 msgstr "Modo de edição HTML"
 
-#: ../e-util/e-html-editor-actions.c:1290
+#: ../e-util/e-html-editor-actions.c:1286
 msgid "Plain _Text"
 msgstr "_Texto simples"
 
-#: ../e-util/e-html-editor-actions.c:1292
+#: ../e-util/e-html-editor-actions.c:1288
 msgid "Plain text editing mode"
 msgstr "Modo de edição de texto simples"
 
-#: ../e-util/e-html-editor-actions.c:1300
+#: ../e-util/e-html-editor-actions.c:1296
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../e-util/e-html-editor-actions.c:1307
+#: ../e-util/e-html-editor-actions.c:1303
 msgid "Header _1"
 msgstr "Cabeçalho _1"
 
-#: ../e-util/e-html-editor-actions.c:1314
+#: ../e-util/e-html-editor-actions.c:1310
 msgid "Header _2"
 msgstr "Cabeçalho _2"
 
-#: ../e-util/e-html-editor-actions.c:1321
+#: ../e-util/e-html-editor-actions.c:1317
 msgid "Header _3"
 msgstr "Cabeçalho _3"
 
-#: ../e-util/e-html-editor-actions.c:1328
+#: ../e-util/e-html-editor-actions.c:1324
 msgid "Header _4"
 msgstr "Cabeçalho _4"
 
-#: ../e-util/e-html-editor-actions.c:1335
+#: ../e-util/e-html-editor-actions.c:1331
 msgid "Header _5"
 msgstr "Cabeçalho _5"
 
-#: ../e-util/e-html-editor-actions.c:1342
+#: ../e-util/e-html-editor-actions.c:1338
 msgid "Header _6"
 msgstr "Cabeçalho _6"
 
-#: ../e-util/e-html-editor-actions.c:1349
+#: ../e-util/e-html-editor-actions.c:1345
 msgid "_Preformatted"
 msgstr "_Preformatado"
 
-#: ../e-util/e-html-editor-actions.c:1356
+#: ../e-util/e-html-editor-actions.c:1352
 msgid "A_ddress"
 msgstr "En_dereço"
 
-#: ../e-util/e-html-editor-actions.c:1363
+#: ../e-util/e-html-editor-actions.c:1359
 msgid "_Blockquote"
 msgstr "_Bloco"
 
-#: ../e-util/e-html-editor-actions.c:1370
+#: ../e-util/e-html-editor-actions.c:1366
 msgid "_Bulleted List"
 msgstr "Lista com _marcas"
 
-#: ../e-util/e-html-editor-actions.c:1377
+#: ../e-util/e-html-editor-actions.c:1373
 msgid "_Roman Numeral List"
 msgstr "Lista _numerada em romanos"
 
-#: ../e-util/e-html-editor-actions.c:1384
+#: ../e-util/e-html-editor-actions.c:1380
 msgid "Numbered _List"
 msgstr "_Lista numerada"
 
-#: ../e-util/e-html-editor-actions.c:1391
+#: ../e-util/e-html-editor-actions.c:1387
 msgid "_Alphabetical List"
 msgstr "Lista _alfabética"
 
-#: ../e-util/e-html-editor-actions.c:1407
-#: ../e-util/e-html-editor-actions.c:1445
+#: ../e-util/e-html-editor-actions.c:1403
+#: ../e-util/e-html-editor-actions.c:1441
 msgid "_Image..."
 msgstr "_Imagem..."
 
 #. Translators: This is an action tooltip
-#: ../e-util/e-html-editor-actions.c:1410
+#: ../e-util/e-html-editor-actions.c:1406
 msgid "Insert Image"
 msgstr "Inserir imagem"
 
-#: ../e-util/e-html-editor-actions.c:1415
-#: ../e-util/e-html-editor-actions.c:1452
+#: ../e-util/e-html-editor-actions.c:1411
+#: ../e-util/e-html-editor-actions.c:1448
 msgid "_Link..."
 msgstr "_Ligação..."
 
-#: ../e-util/e-html-editor-actions.c:1417
+#: ../e-util/e-html-editor-actions.c:1413
 msgid "Insert Link"
 msgstr "Inserir ligação"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1423
-#: ../e-util/e-html-editor-actions.c:1467
+#: ../e-util/e-html-editor-actions.c:1419
+#: ../e-util/e-html-editor-actions.c:1463
 msgid "_Rule..."
 msgstr "_Régua..."
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1426
+#: ../e-util/e-html-editor-actions.c:1422
 msgid "Insert Rule"
 msgstr "Inserir régua"
 
-#: ../e-util/e-html-editor-actions.c:1431
-#: ../e-util/e-html-editor-actions.c:1474
+#: ../e-util/e-html-editor-actions.c:1427
+#: ../e-util/e-html-editor-actions.c:1470
 msgid "_Table..."
 msgstr "_Tabela..."
 
-#: ../e-util/e-html-editor-actions.c:1433
+#: ../e-util/e-html-editor-actions.c:1429
 msgid "Insert Table"
 msgstr "Inserir tabela"
 
-#: ../e-util/e-html-editor-actions.c:1438
+#: ../e-util/e-html-editor-actions.c:1434
 msgid "_Cell..."
 msgstr "_Célula..."
 
-#: ../e-util/e-html-editor-actions.c:1459
+#: ../e-util/e-html-editor-actions.c:1455
 msgid "Pa_ge..."
 msgstr "Pá_gina..."
 
-#: ../e-util/e-html-editor-actions.c:1483
+#: ../e-util/e-html-editor-actions.c:1479
 msgid "Font _Size"
 msgstr "Tamanho da _letra"
 
-#: ../e-util/e-html-editor-actions.c:1490
+#: ../e-util/e-html-editor-actions.c:1486
 msgid "_Font Style"
 msgstr "_Estilo da letra:"
 
-#: ../e-util/e-html-editor-actions.c:1497
+#: ../e-util/e-html-editor-actions.c:1493
 msgid "Paste As _Text"
 msgstr "Colar como _texto"
 
-#: ../e-util/e-html-editor-actions.c:1508
+#: ../e-util/e-html-editor-actions.c:1504
 #: ../e-util/e-html-editor-text-dialog.c:214
 msgid "_Bold"
 msgstr "_Negrito"
 
-#: ../e-util/e-html-editor-actions.c:1510
+#: ../e-util/e-html-editor-actions.c:1506
 msgid "Bold"
 msgstr "Negrito"
 
-#: ../e-util/e-html-editor-actions.c:1516
+#: ../e-util/e-html-editor-actions.c:1512
 #: ../e-util/e-html-editor-text-dialog.c:225
 msgid "_Italic"
 msgstr "_Itálico"
 
-#: ../e-util/e-html-editor-actions.c:1518
+#: ../e-util/e-html-editor-actions.c:1514
 msgid "Italic"
 msgstr "Itálico"
 
-#: ../e-util/e-html-editor-actions.c:1524
+#: ../e-util/e-html-editor-actions.c:1520
 msgid "_Plain Text"
 msgstr "Texto _simples"
 
-#: ../e-util/e-html-editor-actions.c:1532
+#: ../e-util/e-html-editor-actions.c:1528
 #: ../e-util/e-html-editor-text-dialog.c:246
 msgid "_Strikethrough"
 msgstr "_Rasurado"
 
-#: ../e-util/e-html-editor-actions.c:1534
+#: ../e-util/e-html-editor-actions.c:1530
 msgid "Strikethrough"
 msgstr "Rasurado"
 
-#: ../e-util/e-html-editor-actions.c:1540
+#: ../e-util/e-html-editor-actions.c:1536
 #: ../e-util/e-html-editor-text-dialog.c:236
 msgid "_Underline"
 msgstr "S_ublinhado"
 
-#: ../e-util/e-html-editor-actions.c:1542
+#: ../e-util/e-html-editor-actions.c:1538
 msgid "Underline"
 msgstr "Sublinhado"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1552
+#: ../e-util/e-html-editor-actions.c:1548
 msgid "-2"
 msgstr "-2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1560
+#: ../e-util/e-html-editor-actions.c:1556
 msgid "-1"
 msgstr "-1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1568
+#: ../e-util/e-html-editor-actions.c:1564
 msgid "+0"
 msgstr "+0"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1576
+#: ../e-util/e-html-editor-actions.c:1572
 msgid "+1"
 msgstr "+1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1584
+#: ../e-util/e-html-editor-actions.c:1580
 msgid "+2"
 msgstr "+2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1592
+#: ../e-util/e-html-editor-actions.c:1588
 msgid "+3"
 msgstr "+3"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1600
+#: ../e-util/e-html-editor-actions.c:1596
 msgid "+4"
 msgstr "+4"
 
-#: ../e-util/e-html-editor-actions.c:1619
+#: ../e-util/e-html-editor-actions.c:1615
 msgid "Cell Contents"
 msgstr "Conteúdo da célula"
 
-#: ../e-util/e-html-editor-actions.c:1626
+#: ../e-util/e-html-editor-actions.c:1622
 msgid "Column"
 msgstr "Coluna"
 
-#: ../e-util/e-html-editor-actions.c:1633
+#: ../e-util/e-html-editor-actions.c:1629
 msgid "Row"
 msgstr "Linha"
 
-#: ../e-util/e-html-editor-actions.c:1640
-#: ../e-util/e-html-editor-actions.c:1725
+#: ../e-util/e-html-editor-actions.c:1636
+#: ../e-util/e-html-editor-actions.c:1721
 msgid "Table"
 msgstr "Tabela"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
-#: ../e-util/e-html-editor-actions.c:1650
+#: ../e-util/e-html-editor-actions.c:1646
 msgid "Table Delete"
 msgstr "Eliminações da tabela"
 
-#: ../e-util/e-html-editor-actions.c:1657 ../e-util/e-text.c:2147
+#: ../e-util/e-html-editor-actions.c:1653 ../e-util/e-text.c:2147
 msgid "Input Methods"
 msgstr "Métodos de introdução"
 
 #. Translators: Popup menu item caption, containing all the Insert options for a table
-#: ../e-util/e-html-editor-actions.c:1665
+#: ../e-util/e-html-editor-actions.c:1661
 msgid "Table Insert"
 msgstr "Inserções da tabela"
 
-#: ../e-util/e-html-editor-actions.c:1672
+#: ../e-util/e-html-editor-actions.c:1668
 msgid "Properties"
 msgstr "Propriedades"
 
-#: ../e-util/e-html-editor-actions.c:1690
+#: ../e-util/e-html-editor-actions.c:1686
 msgid "Column After"
 msgstr "Coluna após"
 
-#: ../e-util/e-html-editor-actions.c:1697
+#: ../e-util/e-html-editor-actions.c:1693
 msgid "Column Before"
 msgstr "Coluna antes"
 
-#: ../e-util/e-html-editor-actions.c:1704
+#: ../e-util/e-html-editor-actions.c:1700
 msgid "Insert _Link"
 msgstr "Inserir _ligação"
 
-#: ../e-util/e-html-editor-actions.c:1711
+#: ../e-util/e-html-editor-actions.c:1707
 msgid "Row Above"
 msgstr "Linha acima"
 
-#: ../e-util/e-html-editor-actions.c:1718
+#: ../e-util/e-html-editor-actions.c:1714
 msgid "Row Below"
 msgstr "Linha abaixo"
 
-#: ../e-util/e-html-editor-actions.c:1732
+#: ../e-util/e-html-editor-actions.c:1728
 msgid "Cell..."
 msgstr "Célula..."
 
-#: ../e-util/e-html-editor-actions.c:1739
+#: ../e-util/e-html-editor-actions.c:1735
 msgid "Image..."
 msgstr "Imagem..."
 
-#: ../e-util/e-html-editor-actions.c:1746
+#: ../e-util/e-html-editor-actions.c:1742
 msgid "Link..."
 msgstr "Ligação..."
 
-#: ../e-util/e-html-editor-actions.c:1753
+#: ../e-util/e-html-editor-actions.c:1749
 msgid "Page..."
 msgstr "Página..."
 
-#: ../e-util/e-html-editor-actions.c:1760
+#: ../e-util/e-html-editor-actions.c:1756
 msgid "Paragraph..."
 msgstr "Parágrafo..."
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1768
+#: ../e-util/e-html-editor-actions.c:1764
 msgid "Rule..."
 msgstr "Régua..."
 
-#: ../e-util/e-html-editor-actions.c:1775
+#: ../e-util/e-html-editor-actions.c:1771
 msgid "Table..."
 msgstr "Tabela..."
 
-#: ../e-util/e-html-editor-actions.c:1782
+#: ../e-util/e-html-editor-actions.c:1778
 msgid "Text..."
 msgstr "Texto..."
 
-#: ../e-util/e-html-editor-actions.c:1789
+#: ../e-util/e-html-editor-actions.c:1785
 msgid "Remove Link"
 msgstr "Remover ligação"
 
-#: ../e-util/e-html-editor-actions.c:1806
+#: ../e-util/e-html-editor-actions.c:1802
 msgid "Add Word to Dictionary"
 msgstr "Adicionar palavra ao dicionário"
 
-#: ../e-util/e-html-editor-actions.c:1813
+#: ../e-util/e-html-editor-actions.c:1809
 msgid "Ignore Misspelled Word"
 msgstr "Ignorar palavra mal escrita"
 
-#: ../e-util/e-html-editor-actions.c:1820
+#: ../e-util/e-html-editor-actions.c:1816
 msgid "Add Word To"
 msgstr "Adicionar palavra a"
 
-#: ../e-util/e-html-editor-actions.c:1829
+#: ../e-util/e-html-editor-actions.c:1825
 msgid "More Suggestions"
 msgstr "Mais sugestões"
 
 #. Translators: %s will be replaced with the actual dictionary
 #. * name, where a user can add a word to. This is part of an
 #. * "Add Word To" submenu.
-#: ../e-util/e-html-editor-actions.c:1950
+#: ../e-util/e-html-editor-actions.c:1946
 #, c-format
 msgid "%s Dictionary"
 msgstr "Dicionário %s"
 
-#: ../e-util/e-html-editor-actions.c:2040
+#: ../e-util/e-html-editor-actions.c:2036
 msgid "_Emoticon"
 msgstr "_Risonho"
 
-#: ../e-util/e-html-editor-actions.c:2041
+#: ../e-util/e-html-editor-actions.c:2037
 msgid "Insert Emoticon"
 msgstr "Inserir risonho"
 
-#: ../e-util/e-html-editor-actions.c:2109
+#: ../e-util/e-html-editor-actions.c:2105
 msgid "Re_place"
 msgstr "_Substituir"
 
-#: ../e-util/e-html-editor-actions.c:2112
+#: ../e-util/e-html-editor-actions.c:2108
 msgid "_Image"
 msgstr "_Imagem"
 
-#: ../e-util/e-html-editor-actions.c:2115
+#: ../e-util/e-html-editor-actions.c:2111
 msgid "_Link"
 msgstr "_Ligação"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:2119
+#: ../e-util/e-html-editor-actions.c:2115
 msgid "_Rule"
 msgstr "_Régua"
 
-#: ../e-util/e-html-editor-actions.c:2122
+#: ../e-util/e-html-editor-actions.c:2118
 #: ../e-util/e-html-editor-cell-dialog.c:738
 msgid "_Table"
 msgstr "_Tabela"
 
-#: ../e-util/e-html-editor.c:704
+#: ../e-util/e-html-editor.c:707
 msgid "Paragraph Style"
 msgstr "Estilo do parágrafo"
 
-#: ../e-util/e-html-editor.c:718
+#: ../e-util/e-html-editor.c:721
 msgid "Editing Mode"
 msgstr "Modo de edição"
 
-#: ../e-util/e-html-editor.c:730
+#: ../e-util/e-html-editor.c:733
 msgid "Font Color"
 msgstr "Cor da letra"
 
-#: ../e-util/e-html-editor.c:748
+#: ../e-util/e-html-editor.c:751
 msgid "Font Size"
 msgstr "Tamanho da letra"
 
@@ -12904,17 +12940,17 @@ msgid "_Horizontal:"
 msgstr "_Horizontal:"
 
 #: ../e-util/e-html-editor-cell-dialog.c:792
-#: ../e-util/e-html-editor-image-dialog.c:625
+#: ../e-util/e-html-editor-image-dialog.c:635
 msgid "Top"
 msgstr "Topo"
 
 #: ../e-util/e-html-editor-cell-dialog.c:793
-#: ../e-util/e-html-editor-image-dialog.c:626
+#: ../e-util/e-html-editor-image-dialog.c:636
 msgid "Middle"
 msgstr "Meio:"
 
 #: ../e-util/e-html-editor-cell-dialog.c:794
-#: ../e-util/e-html-editor-image-dialog.c:627
+#: ../e-util/e-html-editor-image-dialog.c:637
 msgid "Bottom"
 msgstr "Fundo"
 
@@ -12933,7 +12969,7 @@ msgid "_Header Style"
 msgstr "Estilo do cabeçal_ho"
 
 #: ../e-util/e-html-editor-cell-dialog.c:830
-#: ../e-util/e-html-editor-image-dialog.c:565
+#: ../e-util/e-html-editor-image-dialog.c:575
 #: ../e-util/e-html-editor-table-dialog.c:812
 msgid "<b>Layout</b>"
 msgstr "<b>Disposição</b>"
@@ -12966,13 +13002,13 @@ msgid "C_olor:"
 msgstr "C_or:"
 
 #: ../e-util/e-html-editor-cell-dialog.c:930
-#: ../e-util/e-html-editor-image-dialog.c:527
+#: ../e-util/e-html-editor-image-dialog.c:537
 #: ../e-util/e-html-editor-table-dialog.c:945
 msgid "Choose Background Image"
 msgstr "Escolha a imagem de fundo"
 
 #: ../e-util/e-html-editor-cell-dialog.c:935
-#: ../e-util/e-html-editor-image-dialog.c:533
+#: ../e-util/e-html-editor-image-dialog.c:543
 #: ../e-util/e-html-editor-table-dialog.c:950
 msgid "Images"
 msgstr "Imagens"
@@ -13020,7 +13056,7 @@ msgstr "<b>Tamanho</b>"
 
 #. Width
 #: ../e-util/e-html-editor-hrule-dialog.c:368
-#: ../e-util/e-html-editor-image-dialog.c:583
+#: ../e-util/e-html-editor-image-dialog.c:593
 #: ../e-util/e-html-editor-table-dialog.c:823
 msgid "_Width:"
 msgstr "_Largura:"
@@ -13047,48 +13083,48 @@ msgstr "Som_breado"
 msgid "Rule properties"
 msgstr "Propriedades da régua"
 
-#: ../e-util/e-html-editor-image-dialog.c:515
+#: ../e-util/e-html-editor-image-dialog.c:525
 #: ../e-util/e-html-editor-paragraph-dialog.c:66
 #: ../e-util/e-html-editor-table-dialog.c:766
 msgid "<b>General</b>"
 msgstr "<b>Geral</b>"
 
-#: ../e-util/e-html-editor-image-dialog.c:544
+#: ../e-util/e-html-editor-image-dialog.c:554
 msgid "_Source:"
 msgstr "_Origem:"
 
-#: ../e-util/e-html-editor-image-dialog.c:607
+#: ../e-util/e-html-editor-image-dialog.c:617
 msgid "_Height:"
 msgstr "_Altura:"
 
-#: ../e-util/e-html-editor-image-dialog.c:648
+#: ../e-util/e-html-editor-image-dialog.c:658
 msgid "_X-Padding:"
 msgstr "Espaço _X:"
 
-#: ../e-util/e-html-editor-image-dialog.c:664
+#: ../e-util/e-html-editor-image-dialog.c:674
 msgid "_Y-Padding:"
 msgstr "Espaço _Y:"
 
-#: ../e-util/e-html-editor-image-dialog.c:680
+#: ../e-util/e-html-editor-image-dialog.c:690
 #: ../e-util/e-html-editor-table-dialog.c:890
 msgid "_Border:"
 msgstr "_Contorno:"
 
-#: ../e-util/e-html-editor-image-dialog.c:690
+#: ../e-util/e-html-editor-image-dialog.c:700
 msgid "<b>Link</b>"
 msgstr "<b>Ligação</b>"
 
-#: ../e-util/e-html-editor-image-dialog.c:708
+#: ../e-util/e-html-editor-image-dialog.c:718
 #: ../e-util/e-html-editor-link-dialog.c:400
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../e-util/e-html-editor-image-dialog.c:713
+#: ../e-util/e-html-editor-image-dialog.c:723
 #: ../e-util/e-html-editor-link-dialog.c:405
 msgid "_Test URL..."
 msgstr "_Testar URL..."
 
-#: ../e-util/e-html-editor-image-dialog.c:730
+#: ../e-util/e-html-editor-image-dialog.c:740
 msgid "Image Properties"
 msgstr "Propriedades da imagem"
 
@@ -13158,7 +13194,8 @@ msgstr "<b>Imagem de fundo</b>"
 msgid "_Template:"
 msgstr "_Modelo:"
 
-#: ../e-util/e-html-editor-page-dialog.c:646 ../e-util/e-import-assistant.c:283
+#: ../e-util/e-html-editor-page-dialog.c:646
+#: ../e-util/e-import-assistant.c:288
 msgid "Select a file"
 msgstr "Selecione um ficheiro"
 
@@ -13228,46 +13265,47 @@ msgstr "Substituir"
 msgid "<b>Suggestions for '%s'</b>"
 msgstr "<b>Sugestões para \"%s\"</b>"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:520
+#: ../e-util/e-html-editor-spell-check-dialog.c:522
 msgid "<b>Suggestions</b>"
 msgstr "<b>Sugestões</b>"
 
 #. Replace
-#: ../e-util/e-html-editor-spell-check-dialog.c:555
+#: ../e-util/e-html-editor-spell-check-dialog.c:557
 msgid "Replace"
 msgstr "Substituir"
 
 #. Replace All
-#: ../e-util/e-html-editor-spell-check-dialog.c:564
+#: ../e-util/e-html-editor-spell-check-dialog.c:566
 msgid "Replace All"
 msgstr "Substituir tudo"
 
 #. Ignore
-#: ../e-util/e-html-editor-spell-check-dialog.c:573
+#: ../e-util/e-html-editor-spell-check-dialog.c:575
 #: ../mail/mail.error.xml.h:110
 msgid "Ignore"
 msgstr "Ignorar"
 
 #. Skip
-#: ../e-util/e-html-editor-spell-check-dialog.c:582
+#: ../e-util/e-html-editor-spell-check-dialog.c:584
 msgid "Skip"
 msgstr "Saltar"
 
 #. Back
-#: ../e-util/e-html-editor-spell-check-dialog.c:591
+#: ../e-util/e-html-editor-spell-check-dialog.c:593
 msgid "Back"
 msgstr "Recuar"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:600
+#: ../e-util/e-html-editor-spell-check-dialog.c:602
 msgid "<b>Dictionary</b>"
 msgstr "<b>Dicionário</b>"
 
 #. Add Word button
-#: ../e-util/e-html-editor-spell-check-dialog.c:620
+#: ../e-util/e-html-editor-spell-check-dialog.c:622
 msgid "Add word"
 msgstr "Adicionar palavra"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:637 ../mail/mail-config.ui.h:39
+#: ../e-util/e-html-editor-spell-check-dialog.c:639
+#: ../mail/mail-config.ui.h:39
 msgid "Spell Checking"
 msgstr "Verificar a ortografia"
 
@@ -13308,15 +13346,15 @@ msgstr "Ta_manho:"
 msgid "Text Properties"
 msgstr "Propriedades do texto"
 
-#: ../e-util/e-html-editor-view.c:6381
+#: ../e-util/e-html-editor-view.c:6425
 msgid "Changed property"
 msgstr "Propriedade alterada"
 
-#: ../e-util/e-html-editor-view.c:6382
+#: ../e-util/e-html-editor-view.c:6426
 msgid "Whether editor changed"
 msgstr "Se o editor mudou"
 
-#: ../e-util/e-import-assistant.c:256
+#: ../e-util/e-import-assistant.c:261
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -13324,80 +13362,75 @@ msgstr ""
 "Selecione o ficheiro que deseja importar para o Evolution e selecione da "
 "lista qual o seu tipo de ficheiro."
 
-#: ../e-util/e-import-assistant.c:297 ../e-util/e-import-assistant.c:472
+#: ../e-util/e-import-assistant.c:302 ../e-util/e-import-assistant.c:477
 msgid "File _type:"
 msgstr "_Tipo de ficheiro:"
 
-#: ../e-util/e-import-assistant.c:340 ../e-util/e-import-assistant.c:917
+#: ../e-util/e-import-assistant.c:345 ../e-util/e-import-assistant.c:925
 msgid "Choose the destination for this import"
 msgstr "Escolha o destino desta importação"
 
-#: ../e-util/e-import-assistant.c:365
+#: ../e-util/e-import-assistant.c:370
 msgid "Choose the type of importer to run:"
 msgstr "Escolha o tipo de importador a executar:"
 
-#: ../e-util/e-import-assistant.c:373
+#: ../e-util/e-import-assistant.c:378
 msgid "Import data and settings from _older programs"
 msgstr "Imp_ortar dados e configurações de aplicações antigas"
 
-#: ../e-util/e-import-assistant.c:381
+#: ../e-util/e-import-assistant.c:386
 msgid "Import a _single file"
 msgstr "Importar _um único ficheiro"
 
-#: ../e-util/e-import-assistant.c:403
-#: ../modules/startup-wizard/e-mail-config-import-page.c:200
+#: ../e-util/e-import-assistant.c:408
+#: ../modules/startup-wizard/e-mail-config-import-page.c:210
 msgid "Please select the information that you would like to import:"
 msgstr "Por favor, selecione a informação que deseja importar:"
 
-#: ../e-util/e-import-assistant.c:533
-#, fuzzy
-#| msgid ""
-#| "Evolution checked for settings to import from the following applications: "
-#| "Pine, Netscape, Elm, iCalendar. No importable settings found. If you "
-#| "would like to try again, please click the \"Back\" button."
+#: ../e-util/e-import-assistant.c:538
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar, KMail. No importable settings found. If you "
 "would like to try again, please click the \"Back\" button."
 msgstr ""
 "O Evolution procurou configurações para importar das seguintes aplicações: "
-"Pine, Netscape, Elm, iCalendar. Não foram encontradas definições para "
-"importação. Se desejar tentar novamente, clique em \"Recuar\"."
+"Pine, Netscape, Elm, iCalendar e Kmail. Não foram encontradas definições "
+"para importação. Se desejar tentar novamente, clique em \"Recuar\"."
 
-#: ../e-util/e-import-assistant.c:559
-#: ../modules/startup-wizard/e-mail-config-import-page.c:229
+#: ../e-util/e-import-assistant.c:564
+#: ../modules/startup-wizard/e-mail-config-import-page.c:239
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
 #. Install a custom "Cancel Import" button.
-#: ../e-util/e-import-assistant.c:775
+#: ../e-util/e-import-assistant.c:783
 msgid "_Cancel Import"
 msgstr "_Cancelar importação"
 
-#: ../e-util/e-import-assistant.c:916
+#: ../e-util/e-import-assistant.c:924
 msgid "Preview data to be imported"
 msgstr "Antever os dados a serem importados"
 
-#: ../e-util/e-import-assistant.c:922 ../e-util/e-import-assistant.c:935
-#: ../e-util/e-import-assistant.c:1288 ../e-util/e-import-assistant.c:1364
-#: ../e-util/e-import-assistant.c:1373
+#: ../e-util/e-import-assistant.c:930 ../e-util/e-import-assistant.c:943
+#: ../e-util/e-import-assistant.c:1296 ../e-util/e-import-assistant.c:1372
+#: ../e-util/e-import-assistant.c:1381
 msgid "Import Data"
 msgstr "Importar dados"
 
-#: ../e-util/e-import-assistant.c:930
+#: ../e-util/e-import-assistant.c:938
 msgid "Select what type of file you want to import from the list."
 msgstr "Selecione da lista que tipo de ficheiro deseja importar."
 
-#: ../e-util/e-import-assistant.c:1278 ../e-util/e-import-assistant.c:1313
+#: ../e-util/e-import-assistant.c:1286 ../e-util/e-import-assistant.c:1321
 msgid "Evolution Import Assistant"
 msgstr "Assistente de importação do Evolution"
 
-#: ../e-util/e-import-assistant.c:1295 ../e-util/e-import-assistant.c:1351
+#: ../e-util/e-import-assistant.c:1303 ../e-util/e-import-assistant.c:1359
 msgid "Import Location"
 msgstr "Importar localização"
 
-#: ../e-util/e-import-assistant.c:1306
+#: ../e-util/e-import-assistant.c:1314
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -13407,19 +13440,19 @@ msgstr ""
 "Este assistente guiá-lo-á através do processo de importação de ficheiros "
 "externos para o Evolution."
 
-#: ../e-util/e-import-assistant.c:1323
+#: ../e-util/e-import-assistant.c:1331
 msgid "Importer Type"
 msgstr "Tipo de importador"
 
-#: ../e-util/e-import-assistant.c:1333
+#: ../e-util/e-import-assistant.c:1341
 msgid "Select Information to Import"
 msgstr "Selecionar a informação a importar"
 
-#: ../e-util/e-import-assistant.c:1342
+#: ../e-util/e-import-assistant.c:1350
 msgid "Select a File"
 msgstr "Selecionar um ficheiro"
 
-#: ../e-util/e-import-assistant.c:1359
+#: ../e-util/e-import-assistant.c:1367
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr ""
 "Clique em \"Aplicar\" para iniciar a importação do ficheiro para o Evolution."
@@ -13428,23 +13461,23 @@ msgstr ""
 msgid "Autogenerated"
 msgstr "Gerada automaticamente"
 
-#: ../e-util/e-mail-signature-editor.c:297 ../mail/e-mail-notes.c:905
+#: ../e-util/e-mail-signature-editor.c:301 ../mail/e-mail-notes.c:905
 msgid "Close"
 msgstr "Fechar"
 
-#: ../e-util/e-mail-signature-editor.c:302 ../mail/e-mail-notes.c:910
+#: ../e-util/e-mail-signature-editor.c:306 ../mail/e-mail-notes.c:910
 msgid "_Save and Close"
 msgstr "_Gravar e fechar"
 
-#: ../e-util/e-mail-signature-editor.c:529
+#: ../e-util/e-mail-signature-editor.c:533
 msgid "Edit Signature"
 msgstr "Editar a assinatura"
 
-#: ../e-util/e-mail-signature-editor.c:562
+#: ../e-util/e-mail-signature-editor.c:566
 msgid "_Signature Name:"
 msgstr "Nome da a_Ssinatura:"
 
-#: ../e-util/e-mail-signature-editor.c:598
+#: ../e-util/e-mail-signature-editor.c:602
 msgid "Unnamed"
 msgstr "Sem nome"
 
@@ -13491,35 +13524,35 @@ msgstr ""
 "Utilizadores só com teclado deverão antes selecionar o fuso horário na caixa "
 "de seleção abaixo."
 
-#: ../e-util/e-misc-utils.c:251
+#: ../e-util/e-misc-utils.c:252
 msgid "Could not open the link."
 msgstr "Impossível abrir a ligação."
 
-#: ../e-util/e-misc-utils.c:334
+#: ../e-util/e-misc-utils.c:335
 msgid "Could not display help for Evolution."
 msgstr "Impossível mostrar a ajuda do Evolution."
 
-#: ../e-util/e-misc-utils.c:2387
+#: ../e-util/e-misc-utils.c:2440
 #, c-format
 msgid "Opening calendar '%s'"
 msgstr "A abrir o calendário \"%s\""
 
-#: ../e-util/e-misc-utils.c:2390
+#: ../e-util/e-misc-utils.c:2443
 #, c-format
 msgid "Opening memo list '%s'"
 msgstr "A abrir a lista de memorandos \"%s\""
 
-#: ../e-util/e-misc-utils.c:2393
+#: ../e-util/e-misc-utils.c:2446
 #, c-format
 msgid "Opening task list '%s'"
 msgstr "A abrir a lista de tarefas \"%s\""
 
-#: ../e-util/e-misc-utils.c:2396
+#: ../e-util/e-misc-utils.c:2449
 #, c-format
 msgid "Opening address book '%s'"
 msgstr "A abrir o livro de endereços \"%s\""
 
-#: ../e-util/e-misc-utils.c:3138
+#: ../e-util/e-misc-utils.c:3191
 #: ../modules/mailto-handler/evolution-mailto-handler.c:148
 msgid "_Do not show this message again"
 msgstr "_Não mostrar esta mensagem novamente"
@@ -13557,16 +13590,11 @@ msgstr "Co_ntactos"
 msgid "Search"
 msgstr "Procurar"
 
-#: ../e-util/e-name-selector-dialog.c:448 ../mail/importers/pine-importer.c:429
+#: ../e-util/e-name-selector-dialog.c:448
+#: ../mail/importers/pine-importer.c:429
 msgid "Address Book"
 msgstr "Livro de endereços"
 
-#: ../e-util/e-name-selector-dialog.c:451
-#: ../modules/addressbook/e-book-shell-backend.c:303
-#: ../modules/addressbook/e-book-shell-view.c:373
-msgid "Contacts"
-msgstr "Contactos"
-
 #: ../e-util/e-name-selector-dialog.c:576
 msgid "Select Contacts from Address Book"
 msgstr "Selecionar contactos do livro de endereços"
@@ -13751,53 +13779,46 @@ msgstr "Editar regra"
 msgid "Matches: %u"
 msgstr "Equivalências: %u"
 
-#: ../e-util/e-search-bar.c:569
+#: ../e-util/e-search-bar.c:572
 msgid "Close the find bar"
 msgstr "Fechar a barra de localização"
 
-#: ../e-util/e-search-bar.c:577
+#: ../e-util/e-search-bar.c:580
 msgid "Fin_d:"
 msgstr "_Localizar:"
 
-#: ../e-util/e-search-bar.c:589
+#: ../e-util/e-search-bar.c:592
 msgid "Clear the search"
 msgstr "Limpar a procura"
 
-#: ../e-util/e-search-bar.c:613
+#: ../e-util/e-search-bar.c:616
 msgid "_Previous"
 msgstr "_Anterior"
 
-#: ../e-util/e-search-bar.c:616
+#: ../e-util/e-search-bar.c:619
 msgid "Find the previous occurrence of the phrase"
 msgstr "Procurar a ocorrência anterior da frase"
 
-#: ../e-util/e-search-bar.c:625
+#: ../e-util/e-search-bar.c:628
 msgid "_Next"
 msgstr "_Seguinte"
 
-#: ../e-util/e-search-bar.c:628
+#: ../e-util/e-search-bar.c:631
 msgid "Find the next occurrence of the phrase"
 msgstr "Procurar a ocorrência seguinte da frase"
 
-#: ../e-util/e-search-bar.c:637
+#: ../e-util/e-search-bar.c:640
 msgid "Mat_ch case"
 msgstr "_Comparar maiúsculas"
 
-#: ../e-util/e-search-bar.c:665
+#: ../e-util/e-search-bar.c:668
 msgid "Reached bottom of page, continued from top"
 msgstr "Alcançado o fundo da página, continuada a partir do topo"
 
-#: ../e-util/e-search-bar.c:687
+#: ../e-util/e-search-bar.c:690
 msgid "Reached top of page, continued from bottom"
 msgstr "Alcançado o topo da página, continuada a partir do fundo"
 
-#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:329
-#: ../mail/importers/kmail-importer.c:253 ../mail/importers/pine-importer.c:422
-#: ../modules/mail/e-mail-shell-view.c:1242
-#: ../smime/gui/certificate-manager.c:1671
-msgid "Mail"
-msgstr "Correio"
-
 #: ../e-util/e-send-options.c:570
 msgid "When de_leted:"
 msgstr "Quando e_liminado:"
@@ -14221,11 +14242,11 @@ msgstr "Limp_ar todos"
 msgid "_Show field in View"
 msgstr "_Mostrar o campo na vista"
 
-#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1755
+#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1775
 msgid "Ascending"
 msgstr "Ascendente"
 
-#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1755
+#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1775
 msgid "Descending"
 msgstr "Descendente"
 
@@ -14287,60 +14308,61 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d item)"
 msgstr[1] "%s (%d itens)"
 
-#: ../e-util/e-table-header-item.c:1578
+#: ../e-util/e-table-header-item.c:1598
 msgid "Customize Current View"
 msgstr "Personalizar a vista atual"
 
-#: ../e-util/e-table-header-item.c:1601
+#: ../e-util/e-table-header-item.c:1621
 msgid "Sort _Ascending"
 msgstr "Ordem _ascendente"
 
-#: ../e-util/e-table-header-item.c:1604
+#: ../e-util/e-table-header-item.c:1624
 msgid "Sort _Descending"
 msgstr "Ordem _descendente"
 
-#: ../e-util/e-table-header-item.c:1607
-msgid "_Unsort"
-msgstr "_Desordenar"
+#: ../e-util/e-table-header-item.c:1627
+#| msgid "_Reset Order"
+msgid "_Reset sort"
+msgstr "_Repor ordenação"
 
-#: ../e-util/e-table-header-item.c:1610
+#: ../e-util/e-table-header-item.c:1630
 msgid "Group By This _Field"
 msgstr "Agrupar por _este campo"
 
-#: ../e-util/e-table-header-item.c:1613
+#: ../e-util/e-table-header-item.c:1633
 msgid "Group By _Box"
 msgstr "Agrupar por _caixa"
 
-#: ../e-util/e-table-header-item.c:1617
+#: ../e-util/e-table-header-item.c:1637
 msgid "Remove This _Column"
 msgstr "Remover esta _coluna"
 
-#: ../e-util/e-table-header-item.c:1620
+#: ../e-util/e-table-header-item.c:1640
 msgid "Add a C_olumn..."
 msgstr "Adicionar uma c_oluna..."
 
-#: ../e-util/e-table-header-item.c:1624
+#: ../e-util/e-table-header-item.c:1644
 msgid "A_lignment"
 msgstr "A_linhamento"
 
-#: ../e-util/e-table-header-item.c:1627
+#: ../e-util/e-table-header-item.c:1647
 msgid "B_est Fit"
 msgstr "Melhor a_juste"
 
-#: ../e-util/e-table-header-item.c:1630
+#: ../e-util/e-table-header-item.c:1650
 msgid "Format Column_s..."
 msgstr "Formatar as coluna_s..."
 
-#: ../e-util/e-table-header-item.c:1634
+#: ../e-util/e-table-header-item.c:1654
 msgid "Custo_mize Current View..."
 msgstr "Personali_zar a vista atual..."
 
-#: ../e-util/e-table-header-item.c:1705
+#: ../e-util/e-table-header-item.c:1725
 msgid "_Sort By"
 msgstr "_Ordenar por"
 
 #. Custom
-#: ../e-util/e-table-header-item.c:1728
+#: ../e-util/e-table-header-item.c:1748
 msgid "_Custom"
 msgstr "_Personalizado"
 
@@ -14403,7 +14425,7 @@ msgid "Flags"
 msgstr "Parâmetros"
 
 #: ../e-util/evolution-source-viewer.c:728
-#: ../mail/e-mail-config-identity-page.c:760
+#: ../mail/e-mail-config-identity-page.c:761
 msgid "Identity"
 msgstr "Identidade"
 
@@ -14478,15 +14500,15 @@ msgstr "Ir para o início da mensagem"
 msgid "Click to open %s"
 msgstr "Clique para abrir %s"
 
-#: ../e-util/e-web-view.c:3127
+#: ../e-util/e-web-view.c:3143
 msgid "Copying image to clipboard"
 msgstr "A copiar a imagem para a área de transferência"
 
-#: ../e-util/e-web-view.c:3315
+#: ../e-util/e-web-view.c:3331
 msgid "Save Image"
 msgstr "Gravar imagem"
 
-#: ../e-util/e-web-view.c:3351
+#: ../e-util/e-web-view.c:3367
 #, c-format
 msgid "Saving image to '%s'"
 msgstr "A gravar a imagem para \"%s\""
@@ -14568,10 +14590,8 @@ msgid "One or more values cannot be empty."
 msgstr "Um ou mais valores não podem ser vazios."
 
 #: ../e-util/filter.error.xml.h:16
-#, fuzzy
-#| msgid "Are you sure you want to delete the '{0}' task?"
 msgid "Are you sure you want to remove rule '{0}'?"
-msgstr "Tem a certeza que deseja eliminar a tarefa \"{0}\"?"
+msgstr "Tem a certeza que deseja eliminar a tarefa '{0}'?"
 
 #: ../e-util/filter.error.xml.h:17
 msgid "_Keep"
@@ -14597,7 +14617,8 @@ msgstr "segundos"
 msgid "weeks"
 msgstr "semanas"
 
-#: ../e-util/filter.ui.h:10 ../plugins/publish-calendar/publish-calendar.ui.h:8
+#: ../e-util/filter.ui.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
 msgid "months"
 msgstr "meses"
 
@@ -14669,12 +14690,12 @@ msgid "toggle the cell"
 msgstr "alternar a célula"
 
 #. Translators: description of an "expand" action
-#: ../e-util/gal-a11y-e-cell-tree.c:213
+#: ../e-util/gal-a11y-e-cell-tree.c:215
 msgid "expands the row in the ETree containing this cell"
 msgstr "expande a linha na ETree que contém esta célula"
 
 #. Translators: description of a "collapse" action
-#: ../e-util/gal-a11y-e-cell-tree.c:221
+#: ../e-util/gal-a11y-e-cell-tree.c:223
 msgid "collapses the row in the ETree containing this cell"
 msgstr "colapsar a linha na ETree que contém esta célula"
 
@@ -14829,50 +14850,49 @@ msgid "Invalid folder URI '%s'"
 msgstr "URI de pasta \"%s\" inválido"
 
 #. Some local folders
-#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-properties.c:680
-#: ../mail/em-folder-tree-model.c:1229 ../mail/importers/kmail-libs.c:141
+#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-properties.c:680
+#: ../mail/em-folder-tree-model.c:1212 ../mail/importers/kmail-libs.c:141
 #: ../modules/mail/e-mail-shell-view-private.c:1052
 #: ../modules/mail/e-mail-shell-view-private.c:1063
 msgid "Inbox"
 msgstr "Entrada"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1222
+#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1205
 #: ../mail/importers/kmail-libs.c:147
 #: ../modules/mail/e-mail-shell-view-private.c:1050
 msgid "Drafts"
 msgstr "Rascunhos"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1233
+#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1216
 #: ../mail/importers/kmail-libs.c:143
 #: ../modules/mail/e-mail-shell-view-private.c:1054
 msgid "Outbox"
 msgstr "Saída"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1237
+#: ../libemail-engine/e-mail-session.c:129 ../mail/em-folder-tree-model.c:1220
 #: ../mail/importers/kmail-libs.c:145
 #: ../modules/mail/e-mail-shell-view-private.c:1056
 msgid "Sent"
 msgstr "Enviadas"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:129 ../mail/em-folder-tree-model.c:1225
+#: ../libemail-engine/e-mail-session.c:130 ../mail/em-folder-tree-model.c:1208
 #: ../mail/importers/kmail-libs.c:149
 #: ../modules/mail/e-mail-shell-view-private.c:1058
+#: ../plugins/templates/e-templates-store.c:2214
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1176 ../plugins/templates/templates.c:1478
-#: ../plugins/templates/templates.c:1488
 msgid "Templates"
 msgstr "Modelos"
 
-#: ../libemail-engine/e-mail-session.c:1262
+#: ../libemail-engine/e-mail-session.c:1302
 #, c-format
 msgid "User cancelled operation"
 msgstr "O utilizador cancelou a operação"
 
-#: ../libemail-engine/e-mail-session.c:1319
+#: ../libemail-engine/e-mail-session.c:1359
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
@@ -14881,14 +14901,14 @@ msgstr ""
 "Não foi indicado nenhum endereço de destino, o reencaminhar da mensagem foi "
 "cancelado."
 
-#: ../libemail-engine/e-mail-session.c:1332
+#: ../libemail-engine/e-mail-session.c:1372
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr ""
 "Não foi encontrada nenhuma identidade a utilizar, o reencaminhar da mensagem "
 "foi cancelado."
 
-#: ../libemail-engine/e-mail-session.c:2362
+#: ../libemail-engine/e-mail-session.c:2402
 #, c-format
 msgid "Waiting for '%s'"
 msgstr "A esperar por \"%s\""
@@ -14898,26 +14918,26 @@ msgid "No mail transport service available"
 msgstr "Nenhum serviço de transporte de email disponível"
 
 #: ../libemail-engine/e-mail-session-utils.c:630
-#: ../libemail-engine/mail-ops.c:719
+#: ../libemail-engine/mail-ops.c:720
 #, c-format
 msgid "Posting message to '%s'"
 msgstr "A publicar mensagem em \"%s\""
 
 #: ../libemail-engine/e-mail-session-utils.c:667
-#: ../libemail-engine/mail-ops.c:755
+#: ../libemail-engine/mail-ops.c:756
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Falha ao aplicar os filtros de envio: %s"
 
 #: ../libemail-engine/e-mail-session-utils.c:697
 #: ../libemail-engine/e-mail-session-utils.c:732
-#: ../libemail-engine/mail-ops.c:779 ../libemail-engine/mail-ops.c:814
+#: ../libemail-engine/mail-ops.c:780 ../libemail-engine/mail-ops.c:815
 #, c-format
 msgid "Storing sent message to '%s'"
 msgstr "A mover mensagem enviada para \"%s\""
 
 #: ../libemail-engine/e-mail-session-utils.c:721
-#: ../libemail-engine/mail-ops.c:803
+#: ../libemail-engine/mail-ops.c:804
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14927,13 +14947,13 @@ msgstr ""
 "A anexar à pasta \"Enviadas\"."
 
 #: ../libemail-engine/e-mail-session-utils.c:751
-#: ../libemail-engine/mail-ops.c:831
+#: ../libemail-engine/mail-ops.c:832
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Falha ao anexar à pasta local \"Enviadas\": %s"
 
 #: ../libemail-engine/e-mail-session-utils.c:953
-#: ../libemail-engine/mail-ops.c:979 ../libemail-engine/mail-ops.c:1081
+#: ../libemail-engine/mail-ops.c:995 ../libemail-engine/mail-ops.c:1097
 msgid "Sending message"
 msgstr "A enviar a mensagem"
 
@@ -14974,7 +14994,7 @@ msgstr ""
 msgid "Fetching mail from '%s'"
 msgstr "A obter as mensagens de \"%s\""
 
-#: ../libemail-engine/mail-ops.c:749
+#: ../libemail-engine/mail-ops.c:750
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -14987,57 +15007,58 @@ msgstr ""
 "os seus filtros em Editar->Filtros de Mensagens.\n"
 "O erro original foi: %s"
 
-#: ../libemail-engine/mail-ops.c:990
+#: ../libemail-engine/mail-ops.c:1006
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "A enviar a mensagem %d de %d"
 
-#: ../libemail-engine/mail-ops.c:1042
+#: ../libemail-engine/mail-ops.c:1058
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "Falha ao enviar uma mensagem"
 msgstr[1] "Falha ao enviar %d de %d mensagens"
 
-#: ../libemail-engine/mail-ops.c:1048
-msgid "Canceled."
-msgstr "Cancelado."
+#: ../libemail-engine/mail-ops.c:1064
+#| msgid "Cancelled"
+msgid "Cancelled."
+msgstr "Cancelada."
 
-#: ../libemail-engine/mail-ops.c:1050
+#: ../libemail-engine/mail-ops.c:1066
 msgid "Complete."
 msgstr "Terminado."
 
-#: ../libemail-engine/mail-ops.c:1164
+#: ../libemail-engine/mail-ops.c:1182
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "A mover as mensagens para \"%s\""
 
-#: ../libemail-engine/mail-ops.c:1165
+#: ../libemail-engine/mail-ops.c:1183
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "A copiar as mensagens para \"%s\""
 
-#: ../libemail-engine/mail-ops.c:1284
+#: ../libemail-engine/mail-ops.c:1302
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "A armazenar a pasta \"%s\""
 
-#: ../libemail-engine/mail-ops.c:1412
+#: ../libemail-engine/mail-ops.c:1430
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "A expurgar e armazenar a conta \"%s\""
 
-#: ../libemail-engine/mail-ops.c:1413
+#: ../libemail-engine/mail-ops.c:1431
 #, c-format
 msgid "Storing account '%s'"
 msgstr "A armazenar a conta \"%s\""
 
-#: ../libemail-engine/mail-ops.c:1488
+#: ../libemail-engine/mail-ops.c:1506
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "A esvaziar o lixo em \"%s\""
 
-#: ../libemail-engine/mail-ops.c:1580
+#: ../libemail-engine/mail-ops.c:1598
 #, c-format
 msgid "Processing folder changes in '%s'"
 msgstr "A processar alterações de pastas em \"%s\""
@@ -15156,7 +15177,7 @@ msgstr "_Ignorar procura"
 msgid "Evolution Account Assistant"
 msgstr "Assistente de contas Evolution"
 
-#: ../mail/e-mail-config-assistant.c:952
+#: ../mail/e-mail-config-assistant.c:954
 msgid "_Revise Details"
 msgstr "_Rever detalhes"
 
@@ -15186,131 +15207,139 @@ msgstr ""
 msgid "Done"
 msgstr "Terminado"
 
-#: ../mail/e-mail-config-defaults-page.c:371
+#: ../mail/e-mail-config-defaults-page.c:377
 msgid "Checking server settings..."
 msgstr "A verificar definições do servidor..."
 
-#: ../mail/e-mail-config-defaults-page.c:489
+#: ../mail/e-mail-config-defaults-page.c:495
 msgctxt "ReplyForward"
 msgid "Use global setting"
 msgstr "Utilizar predefinição global"
 
-#: ../mail/e-mail-config-defaults-page.c:491 ../mail/mail-config.ui.h:26
+#: ../mail/e-mail-config-defaults-page.c:497 ../mail/mail-config.ui.h:26
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "Anexo"
 
-#: ../mail/e-mail-config-defaults-page.c:493 ../mail/mail-config.ui.h:27
+#: ../mail/e-mail-config-defaults-page.c:499 ../mail/mail-config.ui.h:27
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "Embutida (estilo Outlook)"
 
-#: ../mail/e-mail-config-defaults-page.c:495 ../mail/mail-config.ui.h:28
+#: ../mail/e-mail-config-defaults-page.c:501 ../mail/mail-config.ui.h:28
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "Citada"
 
-#: ../mail/e-mail-config-defaults-page.c:497 ../mail/mail-config.ui.h:29
+#: ../mail/e-mail-config-defaults-page.c:503 ../mail/mail-config.ui.h:29
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr "Não citar"
 
-#: ../mail/e-mail-config-defaults-page.c:822
+#: ../mail/e-mail-config-defaults-page.c:829
 msgid "Special Folders"
 msgstr "Pastas especiais"
 
-#: ../mail/e-mail-config-defaults-page.c:831
+#: ../mail/e-mail-config-defaults-page.c:838
 msgid "Draft Messages _Folder:"
 msgstr "Pasta de _rascunhos:"
 
-#: ../mail/e-mail-config-defaults-page.c:841
+#: ../mail/e-mail-config-defaults-page.c:848
 msgid "Choose a folder for saving draft messages."
 msgstr "Escolha uma pasta onde gravar rascunhos de mensagens."
 
-#: ../mail/e-mail-config-defaults-page.c:855
+#: ../mail/e-mail-config-defaults-page.c:862
 msgid "Sent _Messages Folder:"
 msgstr "Pasta de _mensagens enviadas:"
 
-#: ../mail/e-mail-config-defaults-page.c:865
+#: ../mail/e-mail-config-defaults-page.c:872
 msgid "Choose a folder for saving sent messages."
 msgstr "Escolha uma pasta onde gravar mensagens enviadas."
 
-#: ../mail/e-mail-config-defaults-page.c:884
+#: ../mail/e-mail-config-defaults-page.c:891
 msgid "S_ave replies in the folder of the message being replied to"
 msgstr "Gr_avar as respostas na pasta da mensagem que está a ser respondida"
 
-#: ../mail/e-mail-config-defaults-page.c:901
+#: ../mail/e-mail-config-defaults-page.c:908
 msgid "Archi_ve Folder:"
 msgstr "Pasta de arqui_vo:"
 
-#: ../mail/e-mail-config-defaults-page.c:911
+#: ../mail/e-mail-config-defaults-page.c:918
 #: ../modules/mail/em-mailer-prefs.c:1403
 msgid "Choose a folder to archive messages to."
 msgstr "Escolha uma pasta onde arquivar mensagens."
 
-#: ../mail/e-mail-config-defaults-page.c:929
+#: ../mail/e-mail-config-defaults-page.c:932
+#| msgid "_Template:"
+msgid "_Templates Folder:"
+msgstr "Pasta de _Modelos:"
+
+#: ../mail/e-mail-config-defaults-page.c:942
+#| msgid "Choose a folder for deleted messages."
+msgid "Choose a folder to use for template messages."
+msgstr "Escolha uma pasta para mensagens modelo."
+
+#: ../mail/e-mail-config-defaults-page.c:964
 msgid "_Restore Defaults"
 msgstr "_Restaurar predefinições"
 
-#: ../mail/e-mail-config-defaults-page.c:946
-#, fuzzy
-#| msgid "Local Folders"
+#: ../mail/e-mail-config-defaults-page.c:981
 msgid "_Lookup Folders"
-msgstr "Pastas Locais"
+msgstr "Pastas de consulta"
 
-#: ../mail/e-mail-config-defaults-page.c:964
+#: ../mail/e-mail-config-defaults-page.c:999
 msgid "Use a Real Folder for _Trash:"
 msgstr "Utilizar uma pasta real para _lixo:"
 
-#: ../mail/e-mail-config-defaults-page.c:965
+#: ../mail/e-mail-config-defaults-page.c:1000
 msgid "Choose a folder for deleted messages."
 msgstr "Escolha uma pasta para mensagens eliminadas."
 
-#: ../mail/e-mail-config-defaults-page.c:974
+#: ../mail/e-mail-config-defaults-page.c:1009
 msgid "Use a Real Folder for _Junk:"
 msgstr "Utilizar uma pasta real para _não solicitado:"
 
-#: ../mail/e-mail-config-defaults-page.c:975
+#: ../mail/e-mail-config-defaults-page.c:1010
 msgid "Choose a folder for junk messages."
 msgstr "Escolha uma pasta para mensagens não solicitadas."
 
-#: ../mail/e-mail-config-defaults-page.c:992
+#: ../mail/e-mail-config-defaults-page.c:1027
 msgid "Composing Messages"
 msgstr "Compor mensagens"
 
-#: ../mail/e-mail-config-defaults-page.c:1001
+#: ../mail/e-mail-config-defaults-page.c:1036
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Enviar _sempre cópia (cc) para:"
 
-#: ../mail/e-mail-config-defaults-page.c:1026
+#: ../mail/e-mail-config-defaults-page.c:1061
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Enviar sempre cópia _escondida (bcc) para:"
 
-#: ../mail/e-mail-config-defaults-page.c:1057
+#: ../mail/e-mail-config-defaults-page.c:1092
 msgid "Re_ply style:"
 msgstr "Estilo de res_posta:"
 
-#: ../mail/e-mail-config-defaults-page.c:1093
+#: ../mail/e-mail-config-defaults-page.c:1128
 msgid "Message Receipts"
 msgstr "Recibos das mensagens"
 
-#: ../mail/e-mail-config-defaults-page.c:1102
+#: ../mail/e-mail-config-defaults-page.c:1137
 msgid "S_end message receipts:"
 msgstr "_Enviar recibos de mensagem:"
 
-#: ../mail/e-mail-config-defaults-page.c:1127
+#: ../mail/e-mail-config-defaults-page.c:1162
 msgid "Never"
 msgstr "Nunca"
 
-#: ../mail/e-mail-config-defaults-page.c:1133
+#: ../mail/e-mail-config-defaults-page.c:1168
 msgid "Always"
 msgstr "Sempre"
 
-#: ../mail/e-mail-config-defaults-page.c:1139
+#: ../mail/e-mail-config-defaults-page.c:1174
 msgid "Ask for each message"
 msgstr "Perguntar para cada mensagem"
 
-#: ../mail/e-mail-config-defaults-page.c:1246
+#: ../mail/e-mail-config-defaults-page.c:1281
 msgid "Defaults"
 msgstr "Predefinições"
 
@@ -15373,23 +15402,26 @@ msgstr ""
 "Procurar detalhes do servidor de correio com base no endereço eletrónico "
 "inserido"
 
-#: ../mail/e-mail-config-identity-page.c:611
-msgid "Full Name cannot be empty"
+#. This is only a warning, not a blocker
+#. complete = complete && correct;
+#: ../mail/e-mail-config-identity-page.c:612
+#| msgid "Full Name cannot be empty"
+msgid "Full Name should not be empty"
 msgstr "O nome completo não pode estar vazio"
 
-#: ../mail/e-mail-config-identity-page.c:618
+#: ../mail/e-mail-config-identity-page.c:619
 msgid "Email Address cannot be empty"
 msgstr "O endereço eletrónico não pode estar vazio"
 
-#: ../mail/e-mail-config-identity-page.c:623
+#: ../mail/e-mail-config-identity-page.c:624
 msgid "Email Address is not a valid email"
 msgstr "O endereço eletrónico é um email inválido"
 
-#: ../mail/e-mail-config-identity-page.c:635
+#: ../mail/e-mail-config-identity-page.c:636
 msgid "Reply To is not a valid email"
 msgstr "Responder a não é um email válido"
 
-#: ../mail/e-mail-config-identity-page.c:646
+#: ../mail/e-mail-config-identity-page.c:647
 #: ../mail/e-mail-config-summary-page.c:632
 msgid "Account Name cannot be empty"
 msgstr "O nome de conta não pode estar vazio"
@@ -15422,8 +15454,8 @@ msgctxt "PGPKeyDescription"
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: ../mail/e-mail-config-security-page.c:340 ../mail/em-folder-properties.c:603
-#: ../mail/mail-config.ui.h:31
+#: ../mail/e-mail-config-security-page.c:340
+#: ../mail/em-folder-properties.c:603 ../mail/mail-config.ui.h:31
 #: ../modules/addressbook/autocompletion-config.c:113
 #: ../modules/calendar/e-calendar-preferences.c:620
 #: ../modules/calendar/e-calendar-preferences.ui.h:48
@@ -15981,10 +16013,12 @@ msgid "Flag the selected messages for follow-up"
 msgstr "Marcar as mensagens selecionadas para dar seguimento"
 
 #: ../mail/e-mail-reader.c:2084
+#: ../modules/mail/e-mail-attachment-handler.c:364
 msgid "_Attached"
 msgstr "_Anexado"
 
 #: ../mail/e-mail-reader.c:2086 ../mail/e-mail-reader.c:2093
+#: ../modules/mail/e-mail-attachment-handler.c:366
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Reencaminhar a mensagem selecionada como anexo para alguém"
 
@@ -15993,10 +16027,12 @@ msgid "Forward As _Attached"
 msgstr "Reencaminhar como _Anexo"
 
 #: ../mail/e-mail-reader.c:2098
+#: ../modules/mail/e-mail-attachment-handler.c:371
 msgid "_Inline"
 msgstr "_Embutida"
 
 #: ../mail/e-mail-reader.c:2100 ../mail/e-mail-reader.c:2107
+#: ../modules/mail/e-mail-attachment-handler.c:373
 msgid "Forward the selected message in the body of a new message"
 msgstr "Reencaminhar a mensagem selecionada no corpo de uma nova mensagem"
 
@@ -16005,10 +16041,12 @@ msgid "Forward As _Inline"
 msgstr "Reencaminhar como _embutida"
 
 #: ../mail/e-mail-reader.c:2112
+#: ../modules/mail/e-mail-attachment-handler.c:378
 msgid "_Quoted"
 msgstr "_Citada"
 
 #: ../mail/e-mail-reader.c:2114 ../mail/e-mail-reader.c:2121
+#: ../modules/mail/e-mail-attachment-handler.c:380
 msgid "Forward the selected message quoted like a reply"
 msgstr "Reencaminhar a mensagem selecionada citada como uma resposta"
 
@@ -16105,10 +16143,12 @@ msgid "Mark the selected messages as not having been read"
 msgstr "Marcar as mensagens selecionadas como não lidas"
 
 #: ../mail/e-mail-reader.c:2203
+#: ../modules/mail/e-mail-attachment-handler.c:350
 msgid "_Edit as New Message..."
 msgstr "_Editar como nova mensagem..."
 
 #: ../mail/e-mail-reader.c:2205
+#: ../modules/mail/e-mail-attachment-handler.c:352
 msgid "Open the selected messages in the composer for editing"
 msgstr "Abrir as mensagens selecionadas no compositor para serem editadas"
 
@@ -16209,10 +16249,12 @@ msgid "Preview the message to be printed"
 msgstr "Antever a mensagem a ser impressa"
 
 #: ../mail/e-mail-reader.c:2301
+#: ../modules/mail/e-mail-attachment-handler.c:385
 msgid "Re_direct"
 msgstr "Re_Direcionar"
 
 #: ../mail/e-mail-reader.c:2303
+#: ../modules/mail/e-mail-attachment-handler.c:387
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redirecionar a mensagem selecionada para alguém"
 
@@ -16234,29 +16276,34 @@ msgstr "Verifica nas mensagens selecionadas a existência de duplicados"
 
 #: ../mail/e-mail-reader.c:2322 ../mail/mail.error.xml.h:28
 #: ../modules/calendar/e-cal-shell-view-actions.c:1432
-#: ../modules/mail/e-mail-attachment-handler.c:213
+#: ../modules/mail/e-mail-attachment-handler.c:329
 msgid "Reply to _All"
 msgstr "Responder _a todos"
 
 #: ../mail/e-mail-reader.c:2324
+#: ../modules/mail/e-mail-attachment-handler.c:331
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr ""
 "Compor uma resposta para todos os destinatários da mensagem selecionada"
 
 #: ../mail/e-mail-reader.c:2329 ../mail/mail.error.xml.h:26
+#: ../modules/mail/e-mail-attachment-handler.c:336
 msgid "Reply to _List"
 msgstr "Responder à _lista"
 
 #: ../mail/e-mail-reader.c:2331
+#: ../modules/mail/e-mail-attachment-handler.c:338
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 "Compor uma resposta para a lista de distribuição da mensagem selecionada"
 
-#: ../mail/e-mail-reader.c:2336 ../modules/mail/e-mail-attachment-handler.c:220
+#: ../mail/e-mail-reader.c:2336
+#: ../modules/mail/e-mail-attachment-handler.c:343
 msgid "_Reply to Sender"
 msgstr "_Responder ao remetente"
 
 #: ../mail/e-mail-reader.c:2338
+#: ../modules/mail/e-mail-attachment-handler.c:345
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Compor uma resposta para o remetente da mensagem selecionada"
 
@@ -16313,6 +16360,7 @@ msgid "Ch_aracter Encoding"
 msgstr "Codificação de c_aracteres"
 
 #: ../mail/e-mail-reader.c:2408
+#: ../modules/mail/e-mail-attachment-handler.c:357
 msgid "F_orward As"
 msgstr "_Reencaminhar como"
 
@@ -16416,11 +16464,13 @@ msgstr "Mostrar as mensagens com todos os cabeçalhos de correio eletrónico"
 msgid "Retrieving message"
 msgstr "A obter mensagem"
 
-#: ../mail/e-mail-reader.c:4216 ../modules/mail/e-mail-attachment-handler.c:206
+#: ../mail/e-mail-reader.c:4216
+#: ../modules/mail/e-mail-attachment-handler.c:322
 msgid "_Forward"
 msgstr "R_encaminhar"
 
 #: ../mail/e-mail-reader.c:4217
+#: ../modules/mail/e-mail-attachment-handler.c:324
 msgid "Forward the selected message to someone"
 msgstr "Reencaminhar a mensagem selecionada para alguém"
 
@@ -16560,24 +16610,16 @@ msgstr "Nenhuma origem de dados encontrada para o UID \"%s\""
 
 #. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
 #: ../mail/em-composer-utils.c:390
-#, fuzzy, c-format
-#| msgid ""
-#| "Are you sure you want to send a message with {0} To and CC recipients?"
+#, c-format
 msgid "Are you sure you want to send a message with %d To and CC recipients?"
 msgid_plural ""
 "Are you sure you want to send a message with %d To and CC recipients?"
-msgstr[0] "Deseja mesmo enviar uma mensagem com {0} destinatários Para e CC?"
-msgstr[1] "Deseja mesmo enviar uma mensagem com {0} destinatários Para e CC?"
+msgstr[0] "Deseja mesmo enviar uma mensagem com %d destinatários Para e CC?"
+msgstr[1] "Deseja mesmo enviar uma mensagem com %d destinatários Para e CC?"
 
 #. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
 #: ../mail/em-composer-utils.c:396
-#, fuzzy, c-format
-#| msgid ""
-#| "You are trying to send a message to {0} recipients in To and CC fields. "
-#| "This would result in all recipients seeing the email addresses of each "
-#| "other. In some cases this behaviour is undesired, especially if they do "
-#| "not know each other or if privacy is a concern. Consider adding "
-#| "recipients to the BCC field instead."
+#, c-format
 msgid ""
 "You are trying to send a message to %d recipients in To and CC fields. This "
 "would result in all recipients seeing the email addresses of each other. In "
@@ -16594,13 +16636,13 @@ msgstr[0] ""
 "Está a tentar enviar uma mensagem a {0} destinatários nos campos Para e CC. "
 "Isto resultaria em mostrar a todos o endereço de cada um. Nalguns casos, "
 "este comportamento é indesejável, especialmente se eles não se conhecem ou "
-"se a provacidade for importante. Ao invés, considere adicionar os "
+"se a privacidade for importante. Ao invés, considere adicionar os "
 "destinatários ao campo BCC."
 msgstr[1] ""
-"Está a tentar enviar uma mensagem a {0} destinatários nos campos Para e CC. "
+"Está a tentar enviar uma mensagem a %d destinatários nos campos Para e CC. "
 "Isto resultaria em mostrar a todos o endereço de cada um. Nalguns casos, "
 "este comportamento é indesejável, especialmente se eles não se conhecem ou "
-"se a provacidade for importante. Ao invés, considere adicionar os "
+"se a privacidade for importante. Ao invés, considere adicionar os "
 "destinatários ao campo BCC."
 
 #. This message is never removed from the camel operation, otherwise the GtkInfoBar
@@ -16613,7 +16655,7 @@ msgstr "A aguardar pelo anexo a carregar..."
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1686
+#: ../mail/em-composer-utils.c:1692
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -16621,24 +16663,24 @@ msgstr ""
 "A ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} às ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escreveu:"
 
-#: ../mail/em-composer-utils.c:1692
+#: ../mail/em-composer-utils.c:1698
 msgid "-------- Forwarded Message --------"
 msgstr "------ Mensagem reencaminhada ------"
 
-#: ../mail/em-composer-utils.c:1697
+#: ../mail/em-composer-utils.c:1703
 msgid "-----Original Message-----"
 msgstr "----- Mensagem original-----"
 
-#: ../mail/em-composer-utils.c:2984
+#: ../mail/em-composer-utils.c:3001
 msgid "an unknown sender"
 msgstr "um remetente desconhecido"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../mail/em-composer-utils.c:3471
+#: ../mail/em-composer-utils.c:3488
 msgid "Posting destination"
 msgstr "Destino da publicação"
 
-#: ../mail/em-composer-utils.c:3476
+#: ../mail/em-composer-utils.c:3493
 msgid "Choose folders to post the message to."
 msgstr "Escolha as pastas onde publicar a mensagem."
 
@@ -16771,12 +16813,12 @@ msgstr "A mover a pasta %s"
 msgid "Copying folder %s"
 msgstr "A copiar a pasta %s"
 
-#: ../mail/em-folder-tree.c:2261 ../mail/message-list.c:2494
+#: ../mail/em-folder-tree.c:2261 ../mail/message-list.c:2496
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "A mover as mensagens para a pasta %s"
 
-#: ../mail/em-folder-tree.c:2265 ../mail/message-list.c:2496
+#: ../mail/em-folder-tree.c:2265 ../mail/message-list.c:2498
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "A copiar as mensagens para a pasta %s"
@@ -16792,7 +16834,7 @@ msgstr ""
 msgid "UNMATCHED"
 msgstr "SEMEQUIVALÊNCIA"
 
-#: ../mail/em-folder-tree-model.c:1313 ../mail/em-folder-tree-model.c:1689
+#: ../mail/em-folder-tree-model.c:1301 ../mail/em-folder-tree-model.c:1677
 msgid "Loading..."
 msgstr "A carregar..."
 
@@ -16816,7 +16858,7 @@ msgstr "Su_bscrever a mostrada"
 msgid "Subscribe To _All"
 msgstr "Subscrever _todas"
 
-#: ../mail/em-subscription-editor.c:970 ../mail/em-subscription-editor.c:1912
+#: ../mail/em-subscription-editor.c:970 ../mail/em-subscription-editor.c:1914
 #: ../modules/mail/e-mail-shell-view-actions.c:1751
 msgid "_Unsubscribe"
 msgstr "_Remover a subscrição"
@@ -16845,66 +16887,66 @@ msgid_plural "%d total"
 msgstr[0] "%d no total"
 msgstr[1] "%d no total"
 
-#: ../mail/em-subscription-editor.c:1749
+#: ../mail/em-subscription-editor.c:1755
 msgid "Folder Subscriptions"
 msgstr "Subscrições de pasta"
 
-#: ../mail/em-subscription-editor.c:1788
+#: ../mail/em-subscription-editor.c:1790
 msgid "_Account:"
 msgstr "Cont_a:"
 
-#: ../mail/em-subscription-editor.c:1801
+#: ../mail/em-subscription-editor.c:1803
 msgid "Clear Search"
 msgstr "Limpar a procura"
 
-#: ../mail/em-subscription-editor.c:1818
+#: ../mail/em-subscription-editor.c:1820
 msgid "Sho_w items that contain:"
 msgstr "Mostrar itens que conten_ham:"
 
-#: ../mail/em-subscription-editor.c:1865
+#: ../mail/em-subscription-editor.c:1867
 msgid "Subscribe to the selected folder"
 msgstr "Subscrever a pasta selecionada"
 
-#: ../mail/em-subscription-editor.c:1866
+#: ../mail/em-subscription-editor.c:1868
 msgid "Su_bscribe"
 msgstr "Su_bscrever"
 
-#: ../mail/em-subscription-editor.c:1911
+#: ../mail/em-subscription-editor.c:1913
 #: ../modules/mail/e-mail-shell-view-actions.c:1753
 msgid "Unsubscribe from the selected folder"
 msgstr "Remover a subscrição sobre a pasta selecionada"
 
-#: ../mail/em-subscription-editor.c:1951
+#: ../mail/em-subscription-editor.c:1953
 msgid "Collapse all folders"
 msgstr "Colapsar todas as pastas"
 
-#: ../mail/em-subscription-editor.c:1952
+#: ../mail/em-subscription-editor.c:1954
 msgid "C_ollapse All"
 msgstr "C_olapsar todas"
 
-#: ../mail/em-subscription-editor.c:1962
+#: ../mail/em-subscription-editor.c:1964
 msgid "Expand all folders"
 msgstr "Expandir todas as pastas"
 
-#: ../mail/em-subscription-editor.c:1963
+#: ../mail/em-subscription-editor.c:1965
 msgid "E_xpand All"
 msgstr "E_xpandir todas"
 
-#: ../mail/em-subscription-editor.c:1973
+#: ../mail/em-subscription-editor.c:1975
 msgid "Refresh the folder list"
 msgstr "Atualizar a lista de pastas"
 
-#: ../mail/em-subscription-editor.c:1974
+#: ../mail/em-subscription-editor.c:1976
 #: ../modules/mail/e-mail-shell-view-actions.c:1652
 #: ../modules/mail/e-mail-shell-view-actions.c:1723
 msgid "_Refresh"
 msgstr "Atualiza_r"
 
-#: ../mail/em-subscription-editor.c:1985
+#: ../mail/em-subscription-editor.c:1987
 msgid "Stop the current operation"
 msgstr "Cancelar a operação atual"
 
-#: ../mail/em-subscription-editor.c:1986
+#: ../mail/em-subscription-editor.c:1988
 #: ../modules/addressbook/e-book-shell-view-actions.c:1001
 msgid "_Stop"
 msgstr "_Parar"
@@ -17310,7 +17352,8 @@ msgctxt "mboxImp"
 msgid "From"
 msgstr "De"
 
-#: ../mail/importers/evolution-mbox-importer.c:568 ../shell/e-shell-utils.c:173
+#: ../mail/importers/evolution-mbox-importer.c:568
+#: ../shell/e-shell-utils.c:173
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Caixa de correio Berkeley (mbox)"
 
@@ -18134,7 +18177,8 @@ msgstr ""
 "Deseja mesmo remover definitivamente todas as mensagens eliminadas em todas "
 "as pastas?"
 
-#: ../mail/mail.error.xml.h:40 ../modules/mail/e-mail-shell-view-actions.c:1638
+#: ../mail/mail.error.xml.h:40
+#: ../modules/mail/e-mail-shell-view-actions.c:1638
 msgid "_Empty Trash"
 msgstr "_Esvaziar o lixo"
 
@@ -18805,7 +18849,7 @@ msgstr "Enviar & receber mensagens"
 msgid "Cancel _All"
 msgstr "Cancelar _tudo"
 
-#: ../mail/mail-send-recv.c:740 ../mail/mail-send-recv.c:1259
+#: ../mail/mail-send-recv.c:740 ../mail/mail-send-recv.c:1260
 msgid "Updating..."
 msgstr "A atualizar..."
 
@@ -18813,22 +18857,22 @@ msgstr "A atualizar..."
 msgid "Waiting..."
 msgstr "A aguardar..."
 
-#: ../mail/mail-send-recv.c:1225
+#: ../mail/mail-send-recv.c:1226
 #, c-format
 msgid "Checking for new mail at '%s'"
 msgstr "A procurar novas mensagens em \"%s\""
 
-#: ../mail/mail-send-recv.c:1452
+#: ../mail/mail-send-recv.c:1453
 #, c-format
 msgid "Deleting junk and expunging trash at '%s'"
 msgstr "A eliminar não solicitado e expurgar lixo em \"%s\""
 
-#: ../mail/mail-send-recv.c:1454
+#: ../mail/mail-send-recv.c:1455
 #, c-format
 msgid "Deleting junk at '%s'"
 msgstr "A eliminar não solicitado em \"%s\""
 
-#: ../mail/mail-send-recv.c:1456
+#: ../mail/mail-send-recv.c:1457
 #, c-format
 msgid "Expunging trash at '%s'"
 msgstr "A expurgar o lixo em \"%s\""
@@ -18845,86 +18889,86 @@ msgstr "Editar a pasta de procura"
 msgid "New Search Folder"
 msgstr "Nova pasta de procura"
 
-#: ../mail/message-list.c:294
+#: ../mail/message-list.c:296
 msgid "Unseen"
 msgstr "Por ler"
 
-#: ../mail/message-list.c:295
+#: ../mail/message-list.c:297
 msgid "Seen"
 msgstr "Lida"
 
-#: ../mail/message-list.c:296
+#: ../mail/message-list.c:298
 msgid "Answered"
 msgstr "Respondida"
 
-#: ../mail/message-list.c:297
+#: ../mail/message-list.c:299
 msgid "Forwarded"
 msgstr "Reencaminhada"
 
-#: ../mail/message-list.c:298
+#: ../mail/message-list.c:300
 msgid "Multiple Unseen Messages"
 msgstr "Múltiplas mensagens por ler"
 
-#: ../mail/message-list.c:299
+#: ../mail/message-list.c:301
 msgid "Multiple Messages"
 msgstr "Múltiplas mensagens"
 
-#: ../mail/message-list.c:312
+#: ../mail/message-list.c:314
 msgid "Lowest"
 msgstr "Mais baixo"
 
-#: ../mail/message-list.c:313
+#: ../mail/message-list.c:315
 msgid "Lower"
 msgstr "Baixo"
 
-#: ../mail/message-list.c:317
+#: ../mail/message-list.c:319
 msgid "Higher"
 msgstr "Alto"
 
-#: ../mail/message-list.c:318
+#: ../mail/message-list.c:320
 msgid "Highest"
 msgstr "Mais alto"
 
-#: ../mail/message-list.c:464 ../mail/message-list.c:6168
+#: ../mail/message-list.c:466 ../mail/message-list.c:6186
 msgid "Generating message list"
 msgstr "A gerar a lista de mensagens"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:2060 ../modules/itip-formatter/itip-view.c:235
+#: ../mail/message-list.c:2062 ../modules/itip-formatter/itip-view.c:235
 msgid "Today %l:%M %p"
 msgstr "Hoje %l:%M %p"
 
-#: ../mail/message-list.c:2069
+#: ../mail/message-list.c:2071
 msgid "Yesterday %l:%M %p"
 msgstr "Ontem %l:%M %p"
 
-#: ../mail/message-list.c:2081
+#: ../mail/message-list.c:2083
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:2089
+#: ../mail/message-list.c:2091
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:2091
+#: ../mail/message-list.c:2093
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2997
+#: ../mail/message-list.c:3001
 msgid "Select all visible messages"
 msgstr "Selecionar todas as mensagens visíveis"
 
-#: ../mail/message-list.c:3699 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3703 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "Mensagens"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:5105
+#: ../mail/message-list.c:5117
 msgid "Follow-up"
 msgstr "Dar seguimento"
 
-#: ../mail/message-list.c:6107
+#: ../mail/message-list.c:6125
 msgid ""
 "No message satisfies your search criteria. Change search criteria by "
 "selecting a new Show message filter from the drop down list above or by "
@@ -18936,7 +18980,7 @@ msgstr ""
 "executando uma nova procura, seja limpando esta através do menu Procurar-"
 ">Limpar, seja alterando a consulta anterior."
 
-#: ../mail/message-list.c:6115
+#: ../mail/message-list.c:6133
 msgid "There are no messages in this folder."
 msgstr "Não existem mensagens nesta pasta."
 
@@ -20165,7 +20209,7 @@ msgstr "Dia t_ermina:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
 msgid "Create events, memos and tasks as _Private by default"
-msgstr ""
+msgstr "Criar por predefinição eventos, memorandos e tarefas como _Privados"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:49
 msgid "View Options"
@@ -20689,29 +20733,29 @@ msgstr "Abrir página _Web"
 msgid "Print the selected memo"
 msgstr "Imprimir o memorando selecionado"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:810
+#: ../modules/calendar/e-cal-shell-view-private.c:816
 msgid "Searching next matching event"
 msgstr "A procurar o evento seguinte coincidente"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:811
+#: ../modules/calendar/e-cal-shell-view-private.c:817
 msgid "Searching previous matching event"
 msgstr "A procurar o evento anterior coincidente"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:832
+#: ../modules/calendar/e-cal-shell-view-private.c:838
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
 msgstr[0] "Impossível encontrar um evento coincidente no próximo %d ano"
 msgstr[1] "Impossível encontrar um evento coincidente nos próximos %d anos"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:836
+#: ../modules/calendar/e-cal-shell-view-private.c:842
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
 msgstr[0] "Impossível encontrar um evento coincidente no %d ano anterior"
 msgstr[1] "Impossível encontrar um evento coincidente nos %d anos anteriores"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:859
+#: ../modules/calendar/e-cal-shell-view-private.c:865
 msgid "Cannot search with no active calendar"
 msgstr "Impossível procurar sem um calendário ativo"
 
@@ -21283,12 +21327,14 @@ msgstr "%s enviou a seguinte resposta à reunião:"
 
 #: ../modules/itip-formatter/itip-view.c:442
 #, c-format
-msgid "%s through %s has canceled the following meeting:"
+#| msgid "%s through %s has canceled the following meeting:"
+msgid "%s through %s has cancelled the following meeting:"
 msgstr "%s através de %s cancelou a seguinte reunião:"
 
 #: ../modules/itip-formatter/itip-view.c:444
 #, c-format
-msgid "%s has canceled the following meeting:"
+#| msgid "%s has canceled the following meeting:"
+msgid "%s has cancelled the following meeting:"
 msgstr "%s cancelou a seguinte reunião:"
 
 #: ../modules/itip-formatter/itip-view.c:448
@@ -21375,12 +21421,14 @@ msgstr "%s enviou a seguinte resposta à tarefa atribuída:"
 
 #: ../modules/itip-formatter/itip-view.c:532
 #, c-format
-msgid "%s through %s has canceled the following assigned task:"
+#| msgid "%s through %s has canceled the following assigned task:"
+msgid "%s through %s has cancelled the following assigned task:"
 msgstr "%s através de %s cancelou a seguinte tarefa atribuída:"
 
 #: ../modules/itip-formatter/itip-view.c:534
 #, c-format
-msgid "%s has canceled the following assigned task:"
+#| msgid "%s has canceled the following assigned task:"
+msgid "%s has cancelled the following assigned task:"
 msgstr "%s cancelou a seguinte tarefa atribuída:"
 
 #: ../modules/itip-formatter/itip-view.c:538
@@ -21426,12 +21474,14 @@ msgstr "%s deseja adicionar a um memorando existente:"
 
 #: ../modules/itip-formatter/itip-view.c:598
 #, c-format
-msgid "%s through %s has canceled the following shared memo:"
+#| msgid "%s through %s has canceled the following shared memo:"
+msgid "%s through %s has cancelled the following shared memo:"
 msgstr "%s através de %s cancelou o seguinte memorando partilhado:"
 
 #: ../modules/itip-formatter/itip-view.c:600
 #, c-format
-msgid "%s has canceled the following shared memo:"
+#| msgid "%s has canceled the following shared memo:"
+msgid "%s has cancelled the following shared memo:"
 msgstr "%s cancelou o seguinte memorando partilhado:"
 
 #: ../modules/itip-formatter/itip-view.c:674
@@ -21493,7 +21543,7 @@ msgid "_Update Attendee Status"
 msgstr "_Atualizar estado dos participantes"
 
 #: ../modules/itip-formatter/itip-view.c:1066
-#: ../smime/gui/certificate-manager.c:1666
+#: ../smime/gui/certificate-manager.c:1668
 msgid "_Update"
 msgstr "_Atualizar"
 
@@ -21543,7 +21593,7 @@ msgid "Sa_ve"
 msgstr "Gra_var"
 
 #: ../modules/itip-formatter/itip-view.c:3679
-#: ../modules/itip-formatter/itip-view.c:5151
+#: ../modules/itip-formatter/itip-view.c:5146
 msgid "Attendee status updated"
 msgstr "Estado de participante atualizado"
 
@@ -21582,113 +21632,114 @@ msgstr "A abrir o calendário. Aguarde por favor..."
 msgid "Searching for an existing version of this appointment"
 msgstr "A procurar por uma versão existente deste compromisso"
 
-#: ../modules/itip-formatter/itip-view.c:4787
+#: ../modules/itip-formatter/itip-view.c:4782
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Impossível enviar o item para o calendário \"%s\".  %s"
 
-#: ../modules/itip-formatter/itip-view.c:4802
+#: ../modules/itip-formatter/itip-view.c:4797
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Enviar para o calendário \"%s\" como aceite"
 
-#: ../modules/itip-formatter/itip-view.c:4807
+#: ../modules/itip-formatter/itip-view.c:4802
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviar para o calendário \"%s\" como tentativa"
 
-#: ../modules/itip-formatter/itip-view.c:4813
+#: ../modules/itip-formatter/itip-view.c:4808
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviar para o calendário \"%s\" como recusada"
 
-#: ../modules/itip-formatter/itip-view.c:4819
+#: ../modules/itip-formatter/itip-view.c:4814
 #, c-format
-msgid "Sent to calendar '%s' as canceled"
+#| msgid "Sent to calendar '%s' as canceled"
+msgid "Sent to calendar '%s' as cancelled"
 msgstr "Enviada para o calendário \"%s\" como cancelada"
 
-#: ../modules/itip-formatter/itip-view.c:4840
-#: ../modules/itip-formatter/itip-view.c:5298
-#: ../modules/itip-formatter/itip-view.c:5404
+#: ../modules/itip-formatter/itip-view.c:4835
+#: ../modules/itip-formatter/itip-view.c:5293
+#: ../modules/itip-formatter/itip-view.c:5399
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "A gravar as alterações no calendário. Aguarde por favor..."
 
-#: ../modules/itip-formatter/itip-view.c:4881
+#: ../modules/itip-formatter/itip-view.c:4876
 msgid "Unable to parse item"
 msgstr "Impossível processar o item"
 
-#: ../modules/itip-formatter/itip-view.c:5074
+#: ../modules/itip-formatter/itip-view.c:5069
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizador removeu o delegado %s "
 
-#: ../modules/itip-formatter/itip-view.c:5091
+#: ../modules/itip-formatter/itip-view.c:5086
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Enviada uma notificação de cancelamento ao delegado"
 
-#: ../modules/itip-formatter/itip-view.c:5095
+#: ../modules/itip-formatter/itip-view.c:5090
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Impossível enviar uma notificação de cancelamento ao delegado"
 
-#: ../modules/itip-formatter/itip-view.c:5143
+#: ../modules/itip-formatter/itip-view.c:5138
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Impossível atualizar o participante. %s"
 
-#: ../modules/itip-formatter/itip-view.c:5187
+#: ../modules/itip-formatter/itip-view.c:5182
 msgid "The meeting is invalid and cannot be updated"
 msgstr "A reunião é inválida e não pode ser atualizada"
 
-#: ../modules/itip-formatter/itip-view.c:5263
+#: ../modules/itip-formatter/itip-view.c:5258
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Impossível atualizar o estado de participante pois o estado é inválido"
 
-#: ../modules/itip-formatter/itip-view.c:5335
-#: ../modules/itip-formatter/itip-view.c:5374
+#: ../modules/itip-formatter/itip-view.c:5330
+#: ../modules/itip-formatter/itip-view.c:5369
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Estado de participante não pode ser atualizado pois o item já não existe"
 
-#: ../modules/itip-formatter/itip-view.c:5437
+#: ../modules/itip-formatter/itip-view.c:5432
 msgid "Meeting information sent"
 msgstr "Enviada a informação de reunião"
 
-#: ../modules/itip-formatter/itip-view.c:5442
+#: ../modules/itip-formatter/itip-view.c:5437
 msgid "Task information sent"
 msgstr "Enviada a informação da tarefa"
 
-#: ../modules/itip-formatter/itip-view.c:5447
+#: ../modules/itip-formatter/itip-view.c:5442
 msgid "Memo information sent"
 msgstr "Enviada a informação do memorando"
 
-#: ../modules/itip-formatter/itip-view.c:5458
+#: ../modules/itip-formatter/itip-view.c:5453
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Impossível enviar a informação de reunião, a reunião não existe"
 
-#: ../modules/itip-formatter/itip-view.c:5463
+#: ../modules/itip-formatter/itip-view.c:5458
 msgid "Unable to send task information, the task does not exist"
 msgstr "Impossível enviar a informação de tarefa, a tarefa não existe"
 
-#: ../modules/itip-formatter/itip-view.c:5468
+#: ../modules/itip-formatter/itip-view.c:5463
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Impossível enviar a informação de memorando, o memorando não existe"
 
 #. Translators: This is a default filename for a calendar.
-#: ../modules/itip-formatter/itip-view.c:5533
+#: ../modules/itip-formatter/itip-view.c:5528
 msgid "calendar.ics"
 msgstr "calendario.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5538
+#: ../modules/itip-formatter/itip-view.c:5533
 msgid "Save Calendar"
 msgstr "Gravar calendário"
 
-#: ../modules/itip-formatter/itip-view.c:5587
-#: ../modules/itip-formatter/itip-view.c:5600
+#: ../modules/itip-formatter/itip-view.c:5582
+#: ../modules/itip-formatter/itip-view.c:5595
 msgid "The calendar attached is not valid"
 msgstr "O calendário anexo é inválido"
 
-#: ../modules/itip-formatter/itip-view.c:5588
-#: ../modules/itip-formatter/itip-view.c:5601
+#: ../modules/itip-formatter/itip-view.c:5583
+#: ../modules/itip-formatter/itip-view.c:5596
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -21696,15 +21747,15 @@ msgstr ""
 "A mensagem indica conter um calendário, mas este não é um calendário "
 "iCalendar válido."
 
-#: ../modules/itip-formatter/itip-view.c:5643
-#: ../modules/itip-formatter/itip-view.c:5673
-#: ../modules/itip-formatter/itip-view.c:5774
+#: ../modules/itip-formatter/itip-view.c:5638
+#: ../modules/itip-formatter/itip-view.c:5668
+#: ../modules/itip-formatter/itip-view.c:5769
 msgid "The item in the calendar is not valid"
 msgstr "O item no calendário é inválido"
 
-#: ../modules/itip-formatter/itip-view.c:5644
-#: ../modules/itip-formatter/itip-view.c:5674
-#: ../modules/itip-formatter/itip-view.c:5775
+#: ../modules/itip-formatter/itip-view.c:5639
+#: ../modules/itip-formatter/itip-view.c:5669
+#: ../modules/itip-formatter/itip-view.c:5770
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -21712,11 +21763,11 @@ msgstr ""
 "A mensagem contém um calendário mas este não contém quaisquer eventos, "
 "tarefas ou informação de livre/ocupado"
 
-#: ../modules/itip-formatter/itip-view.c:5689
+#: ../modules/itip-formatter/itip-view.c:5684
 msgid "The calendar attached contains multiple items"
 msgstr "O calendário anexo contém múltiplos itens"
 
-#: ../modules/itip-formatter/itip-view.c:5690
+#: ../modules/itip-formatter/itip-view.c:5685
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -21724,24 +21775,24 @@ msgstr ""
 "Para processar todos estes itens, o ficheiro deverá ser gravado e o "
 "calendário importado"
 
-#: ../modules/itip-formatter/itip-view.c:6193
+#: ../modules/itip-formatter/itip-view.c:6188
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Nenhum"
 
-#: ../modules/itip-formatter/itip-view.c:6209
+#: ../modules/itip-formatter/itip-view.c:6204
 msgid "Tentatively Accepted"
 msgstr "Aceite provisoriamente"
 
-#: ../modules/itip-formatter/itip-view.c:6369
+#: ../modules/itip-formatter/itip-view.c:6364
 msgid "This meeting recurs"
 msgstr "Esta reunião é recorrente"
 
-#: ../modules/itip-formatter/itip-view.c:6372
+#: ../modules/itip-formatter/itip-view.c:6367
 msgid "This task recurs"
 msgstr "Esta tarefa é recorrente"
 
-#: ../modules/itip-formatter/itip-view.c:6375
+#: ../modules/itip-formatter/itip-view.c:6370
 msgid "This memo recurs"
 msgstr "Este memorando é recorrente"
 
@@ -21760,19 +21811,19 @@ msgstr "Esta reunião foi delegada"
 msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 msgstr "\"{0}\" delegou a reunião. Deseja adicionar o delegado \"{1}\"?"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:261
+#: ../modules/mail-config/e-mail-config-google-summary.c:265
 msgid "Google Features"
 msgstr "Funcionalidades Google"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:270
+#: ../modules/mail-config/e-mail-config-google-summary.c:274
 msgid "Add Google Ca_lendar to this account"
 msgstr "Adicionar ca_lendário Google a esta conta"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:279
+#: ../modules/mail-config/e-mail-config-google-summary.c:283
 msgid "Add Google Con_tacts to this account"
 msgstr "Adicionar con_tactos Google a esta conta"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:288
+#: ../modules/mail-config/e-mail-config-google-summary.c:292
 msgid "You may need to enable IMAP access"
 msgstr "Poderá ter de ativar o acesso IMAP"
 
@@ -21869,10 +21920,8 @@ msgstr "STARTTLS após ligar"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:242
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:192
-#, fuzzy
-#| msgid "SSL on a dedicated port"
 msgid "TLS on a dedicated port"
-msgstr "SSL numa porta dedicada"
+msgstr "TLS numa porta dedicada"
 
 #: ../modules/mail-config/e-mail-config-sendmail-backend.c:77
 msgid "_Use custom binary, instead of 'sendmail'"
@@ -21917,15 +21966,15 @@ msgstr "Ser_vidor requer autenticação"
 msgid "T_ype:"
 msgstr "T_ipo:"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:245
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:251
 msgid "Yahoo! Features"
 msgstr "Funcionalidades Yahoo!"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:254
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:260
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "Adicionar ca_lendário e tarefas Yahoo! a esta conta"
 
-#: ../modules/mail/e-mail-attachment-handler.c:440
+#: ../modules/mail/e-mail-attachment-handler.c:605
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
@@ -22304,10 +22353,8 @@ msgid "Unread Messages"
 msgstr "Mensagens por ler"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:2120
-#, fuzzy
-#| msgid "Message Header"
 msgid "Message Thread"
-msgstr "Cabeçalho da mensagem"
+msgstr "Fluxo de mensagens"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:2180
 msgid "Subject or Addresses contain"
@@ -22674,7 +22721,7 @@ msgstr "Filtrar não solicitado usando SpamAssassin"
 
 #. Keep the title identical to EMailConfigImportPage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/startup-wizard/e-mail-config-import-page.c:260
+#: ../modules/startup-wizard/e-mail-config-import-page.c:270
 #: ../modules/startup-wizard/e-mail-config-import-progress-page.c:339
 msgid "Importing Files"
 msgstr "A importar ficheiros"
@@ -22969,7 +23016,7 @@ msgid "_Do not show this message again."
 msgstr "_Não mostrar esta mensagem novamente."
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:484
-#: ../plugins/templates/templates.c:478
+#: ../plugins/templates/templates.c:495
 msgid "Keywords"
 msgstr "Palavras chave"
 
@@ -23129,7 +23176,7 @@ msgid "Key"
 msgstr "Chave"
 
 #: ../plugins/email-custom-header/email-custom-header.c:879
-#: ../plugins/templates/templates.c:487
+#: ../plugins/templates/templates.c:504
 msgid "Values"
 msgstr "Valores"
 
@@ -23295,10 +23342,8 @@ msgid "Copy _Message Archive URL"
 msgstr "Código fonte da _mensagem"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:389
-#, fuzzy
-#| msgid "Edit a note for the selected message"
 msgid "Copy direct URL for the selected message in its archive"
-msgstr "Editar a nota da mensagem selecionada"
+msgstr "Copiar diretamente o URL das mensagens selecionadas no seu arquivo"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:394
 msgid "Get List _Usage Information"
@@ -23852,7 +23897,7 @@ msgid "_Username:"
 msgstr "_Utilizador:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:29
-#: ../smime/gui/certificate-manager.c:774
+#: ../smime/gui/certificate-manager.c:776
 msgid "_Password:"
 msgstr "_Senha:"
 
@@ -24002,6 +24047,10 @@ msgstr "Gravar a lista de memorandos selecionada no disco"
 msgid "Save the selected task list to disk"
 msgstr "Gravar a lista de tarefas selecionada no disco"
 
+#: ../plugins/templates/e-templates-store.c:117
+msgid "No Title"
+msgstr "Sem título"
+
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid ""
 "Drafts based template plugin. You can use variables like $ORIG[subject], "
@@ -24012,15 +24061,16 @@ msgstr ""
 "$ORIG[subject], $ORIG[from], $ORIG[to] ou $ORIG[body], que serão "
 "substituídas por valores da mensagem de email à qual está a responder."
 
-#: ../plugins/templates/templates.c:1245
-msgid "No Title"
-msgstr "Sem título"
+#: ../plugins/templates/templates.c:1247
+#| msgid "Saving message to Outbox."
+msgid "Saving message template"
+msgstr "A gravar a mensagem modelo"
 
-#: ../plugins/templates/templates.c:1354
+#: ../plugins/templates/templates.c:1268
 msgid "Save as _Template"
 msgstr "Gravar como _modelo"
 
-#: ../plugins/templates/templates.c:1356
+#: ../plugins/templates/templates.c:1270
 msgid "Save as Template"
 msgstr "Gravar como modelo"
 
@@ -24103,7 +24153,7 @@ msgstr "Todos os ficheiros (*)"
 msgid "translator-credits"
 msgstr ""
 "Duarte Loreto <happyguy_pt hotmail com>\n"
-"Tiago S. <almosthumane portugalmail pt>\n"
+"Tiago Santos <tiagofsantos81 sapo pt>\n"
 "Pedro Albuquerque <palbuquerque73 gmail com>"
 
 #: ../shell/e-shell-utils.c:420
@@ -24655,60 +24705,72 @@ msgstr ""
 "\n"
 "Editar definições de credibilidade:"
 
-#: ../smime/gui/certificate-manager.c:84 ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:84
+#: ../smime/gui/certificate-manager.c:103
 #: ../smime/gui/certificate-manager.c:123
 msgid "Certificate Name"
 msgstr "Nome do certificado"
 
-#: ../smime/gui/certificate-manager.c:85 ../smime/gui/certificate-manager.c:105
+#: ../smime/gui/certificate-manager.c:85
+#: ../smime/gui/certificate-manager.c:105
 msgid "Issued To Organization"
 msgstr "Emitido para a organização"
 
-#: ../smime/gui/certificate-manager.c:86 ../smime/gui/certificate-manager.c:106
+#: ../smime/gui/certificate-manager.c:86
+#: ../smime/gui/certificate-manager.c:106
 msgid "Issued To Organizational Unit"
 msgstr "Emitido para a unidade organizacional"
 
-#: ../smime/gui/certificate-manager.c:87 ../smime/gui/certificate-manager.c:107
+#: ../smime/gui/certificate-manager.c:87
+#: ../smime/gui/certificate-manager.c:107
 #: ../smime/gui/certificate-manager.c:125
 msgid "Serial Number"
 msgstr "Número de série"
 
-#: ../smime/gui/certificate-manager.c:88 ../smime/gui/certificate-manager.c:108
+#: ../smime/gui/certificate-manager.c:88
+#: ../smime/gui/certificate-manager.c:108
 #: ../smime/gui/certificate-manager.c:126
 msgid "Purposes"
 msgstr "Propósitos"
 
-#: ../smime/gui/certificate-manager.c:89 ../smime/gui/certificate-manager.c:109
+#: ../smime/gui/certificate-manager.c:89
+#: ../smime/gui/certificate-manager.c:109
 #: ../smime/gui/certificate-manager.c:127
 msgid "Issued By"
 msgstr "Emitido por"
 
-#: ../smime/gui/certificate-manager.c:90 ../smime/gui/certificate-manager.c:110
+#: ../smime/gui/certificate-manager.c:90
+#: ../smime/gui/certificate-manager.c:110
 #: ../smime/gui/certificate-manager.c:128
 msgid "Issued By Organization"
 msgstr "Emitido pela organização"
 
-#: ../smime/gui/certificate-manager.c:91 ../smime/gui/certificate-manager.c:111
+#: ../smime/gui/certificate-manager.c:91
+#: ../smime/gui/certificate-manager.c:111
 #: ../smime/gui/certificate-manager.c:129
 msgid "Issued By Organizational Unit"
 msgstr "Emitido pela unidade organizacional"
 
-#: ../smime/gui/certificate-manager.c:92 ../smime/gui/certificate-manager.c:112
+#: ../smime/gui/certificate-manager.c:92
+#: ../smime/gui/certificate-manager.c:112
 #: ../smime/gui/certificate-manager.c:130
 msgid "Issued"
 msgstr "Emitido"
 
-#: ../smime/gui/certificate-manager.c:93 ../smime/gui/certificate-manager.c:113
+#: ../smime/gui/certificate-manager.c:93
+#: ../smime/gui/certificate-manager.c:113
 #: ../smime/gui/certificate-manager.c:131
 msgid "Expires"
 msgstr "Expira"
 
-#: ../smime/gui/certificate-manager.c:94 ../smime/gui/certificate-manager.c:114
+#: ../smime/gui/certificate-manager.c:94
+#: ../smime/gui/certificate-manager.c:114
 #: ../smime/gui/certificate-manager.c:132
 msgid "SHA1 Fingerprint"
 msgstr "Impressão digital SHA1"
 
-#: ../smime/gui/certificate-manager.c:95 ../smime/gui/certificate-manager.c:115
+#: ../smime/gui/certificate-manager.c:95
+#: ../smime/gui/certificate-manager.c:115
 #: ../smime/gui/certificate-manager.c:133
 msgid "MD5 Fingerprint"
 msgstr "Impressão digital MD5"
@@ -24718,7 +24780,7 @@ msgstr "Impressão digital MD5"
 msgid "Email Address"
 msgstr "Endereço eletrónico"
 
-#: ../smime/gui/certificate-manager.c:652
+#: ../smime/gui/certificate-manager.c:654
 msgid "Select a file to backup your key and certificate..."
 msgstr "Selecione um ficheiro para gravar a sua chave e certificado..."
 
@@ -24727,31 +24789,31 @@ msgstr "Selecione um ficheiro para gravar a sua chave e certificado..."
 #. * when a user wants to backup one of her/his private keys/certificates.
 #. * For example: gnomedev-backup.p12
 #.
-#: ../smime/gui/certificate-manager.c:664
+#: ../smime/gui/certificate-manager.c:666
 #, c-format
 msgid "%s-backup.p12"
 msgstr "%s-seguranca.p12"
 
-#: ../smime/gui/certificate-manager.c:730
+#: ../smime/gui/certificate-manager.c:732
 msgid "Backup Certificate"
 msgstr "Cópia de segurança do certificado"
 
 #. filename selection
-#: ../smime/gui/certificate-manager.c:744
+#: ../smime/gui/certificate-manager.c:746
 msgid "_File name:"
 msgstr "_Ficheiro:"
 
 #. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
-#: ../smime/gui/certificate-manager.c:749
+#: ../smime/gui/certificate-manager.c:751
 msgid "Please select a file..."
 msgstr "Por favor, selecione um ficheiro..."
 
-#: ../smime/gui/certificate-manager.c:763
+#: ../smime/gui/certificate-manager.c:765
 msgid "_Include certificate chain in the backup"
 msgstr "_Incluir cadeia do certificado na cópia"
 
 #. To Translators: this text was copied from Firefox
-#: ../smime/gui/certificate-manager.c:769
+#: ../smime/gui/certificate-manager.c:771
 msgid ""
 "The certificate backup password you set here protects the backup file that "
 "you are about to create.\n"
@@ -24761,16 +24823,16 @@ msgstr ""
 "ficheiro de segurança que está prestes a criar.\n"
 "Tem de definir esta senha para continuar com a cópia de segurança."
 
-#: ../smime/gui/certificate-manager.c:788
+#: ../smime/gui/certificate-manager.c:790
 msgid "_Repeat Password:"
 msgstr "_Repetir senha:"
 
-#: ../smime/gui/certificate-manager.c:807
+#: ../smime/gui/certificate-manager.c:809
 msgid "Passwords do not match"
 msgstr "A senhas não coincidem"
 
 #. To Translators: this text was copied from Firefox
-#: ../smime/gui/certificate-manager.c:815
+#: ../smime/gui/certificate-manager.c:817
 msgid ""
 "Important:\n"
 "If you forget your certificate backup password, you will not be able to "
@@ -24782,92 +24844,92 @@ msgstr ""
 "restaurar mais tarde.\n"
 "Por favor, registe-a num local seguro."
 
-#: ../smime/gui/certificate-manager.c:860
+#: ../smime/gui/certificate-manager.c:862
 msgid "No file name provided"
 msgstr "Nenhum ficheiro fornecido"
 
-#: ../smime/gui/certificate-manager.c:864
+#: ../smime/gui/certificate-manager.c:866
 msgid "Failed to backup key and certificate"
 msgstr "Falha na cópia de segurança da chave e certificado"
 
-#: ../smime/gui/certificate-manager.c:953
+#: ../smime/gui/certificate-manager.c:955
 msgid "Select a certificate to import..."
 msgstr "Selecionar um certificado a importar..."
 
-#: ../smime/gui/certificate-manager.c:1003
+#: ../smime/gui/certificate-manager.c:1005
 msgid "Failed to import certificate"
 msgstr "Falha ao importar o certificado"
 
-#: ../smime/gui/certificate-manager.c:1119
+#: ../smime/gui/certificate-manager.c:1121
 msgctxt "CamelTrust"
 msgid "Ask when used"
 msgstr "Perguntar quando usado"
 
-#: ../smime/gui/certificate-manager.c:1121
+#: ../smime/gui/certificate-manager.c:1123
 msgctxt "CamelTrust"
 msgid "Never"
 msgstr "Nunca"
 
-#: ../smime/gui/certificate-manager.c:1123
+#: ../smime/gui/certificate-manager.c:1125
 msgctxt "CamelTrust"
 msgid "Marginally"
 msgstr "Marginalmente"
 
-#: ../smime/gui/certificate-manager.c:1125
+#: ../smime/gui/certificate-manager.c:1127
 msgctxt "CamelTrust"
 msgid "Fully"
 msgstr "Total"
 
-#: ../smime/gui/certificate-manager.c:1127
+#: ../smime/gui/certificate-manager.c:1129
 msgctxt "CamelTrust"
 msgid "Ultimately"
 msgstr "Finalmente"
 
-#: ../smime/gui/certificate-manager.c:1129
+#: ../smime/gui/certificate-manager.c:1131
 msgctxt "CamelTrust"
 msgid "Temporarily"
 msgstr "Temporariamente"
 
-#: ../smime/gui/certificate-manager.c:1335
+#: ../smime/gui/certificate-manager.c:1337
 msgid "Change certificate trust"
 msgstr "Alterar confiança do certificado"
 
-#: ../smime/gui/certificate-manager.c:1347
+#: ../smime/gui/certificate-manager.c:1349
 #, c-format
 msgid "Change trust for the host '%s':"
 msgstr "Alterar confiança do anfitrião \"%s\":"
 
-#: ../smime/gui/certificate-manager.c:1371
+#: ../smime/gui/certificate-manager.c:1373
 msgctxt "CamelTrust"
 msgid "_Ask when used"
 msgstr "_Perguntar quando usado"
 
-#: ../smime/gui/certificate-manager.c:1372
+#: ../smime/gui/certificate-manager.c:1374
 msgctxt "CamelTrust"
 msgid "_Never trust this certificate"
 msgstr "_Nunca confiar neste certificado"
 
-#: ../smime/gui/certificate-manager.c:1373
+#: ../smime/gui/certificate-manager.c:1375
 msgctxt "CamelTrust"
 msgid "_Temporarily trusted (this session only)"
 msgstr "_Temporariamente de confiança (só nesta sessão)"
 
-#: ../smime/gui/certificate-manager.c:1374
+#: ../smime/gui/certificate-manager.c:1376
 msgctxt "CamelTrust"
 msgid "_Marginally trusted"
 msgstr "_Marginalmente de confiança"
 
-#: ../smime/gui/certificate-manager.c:1375
+#: ../smime/gui/certificate-manager.c:1377
 msgctxt "CamelTrust"
 msgid "_Fully trusted"
 msgstr "_Totalmente de confiança"
 
-#: ../smime/gui/certificate-manager.c:1376
+#: ../smime/gui/certificate-manager.c:1378
 msgctxt "CamelTrust"
 msgid "_Ultimately trusted"
 msgstr "_Completamente de confiança"
 
-#: ../smime/gui/certificate-manager.c:1380
+#: ../smime/gui/certificate-manager.c:1382
 msgid ""
 "Before trusting this site, you should examine its certificate and its policy "
 "and procedures (if available)."
@@ -24875,44 +24937,44 @@ msgstr ""
 "Antes de confiar neste site, deverá examinar o seu certificado, políticas e "
 "procedimentos (se disponíveis)."
 
-#: ../smime/gui/certificate-manager.c:1395
+#: ../smime/gui/certificate-manager.c:1397
 msgid "_Display certificate"
 msgstr "_Mostrar certificado"
 
-#: ../smime/gui/certificate-manager.c:1600
+#: ../smime/gui/certificate-manager.c:1602
 msgid "You have certificates on file that identify these mail servers:"
 msgstr ""
 "Tem certificados em ficheiro que identificam estes servidores de correio:"
 
-#: ../smime/gui/certificate-manager.c:1631
+#: ../smime/gui/certificate-manager.c:1633
 msgid "Host name"
 msgstr "Nome da máquina:"
 
-#: ../smime/gui/certificate-manager.c:1633
+#: ../smime/gui/certificate-manager.c:1635
 msgid "Issuer"
 msgstr "Emissor"
 
-#: ../smime/gui/certificate-manager.c:1634
+#: ../smime/gui/certificate-manager.c:1636
 msgid "Fingerprint"
 msgstr "Impressão digital"
 
-#: ../smime/gui/certificate-manager.c:1635
+#: ../smime/gui/certificate-manager.c:1637
 msgid "Trust"
 msgstr "Confiança"
 
-#: ../smime/gui/certificate-manager.c:1656
+#: ../smime/gui/certificate-manager.c:1658
 msgid "_Edit Trust"
 msgstr "_Editar conafiança"
 
-#: ../smime/gui/certificate-manager.c:1977
+#: ../smime/gui/certificate-manager.c:2112
 msgid "All PKCS12 files"
 msgstr "Todos os ficheiro PKCS12"
 
-#: ../smime/gui/certificate-manager.c:1994
+#: ../smime/gui/certificate-manager.c:2129
 msgid "All email certificate files"
 msgstr "Todos os ficheiros de certificação de correio"
 
-#: ../smime/gui/certificate-manager.c:2011
+#: ../smime/gui/certificate-manager.c:2146
 msgid "All CA certificate files"
 msgstr "Todos os ficheiros de certificado de AC"
 
@@ -25169,6 +25231,19 @@ msgstr "Com _data limite"
 msgid "With _Status"
 msgstr "Com _estado"
 
+#~ msgid "Canceled"
+#~ msgstr "Cancelado"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Canceled"
+#~ msgstr "Cancelado"
+
+#~ msgid "_Unsort"
+#~ msgstr "_Desordenar"
+
+#~ msgid "Canceled."
+#~ msgstr "Cancelado."
+
 #~ msgid "SSL"
 #~ msgstr "SSL"
 


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