[evolution/wip/gsettings] Updated Brazilian Portuguese translation. Reviewed by Antonio Fernandes C. Neto <fernandesn gnome or



commit 9173e894544bca9fc4a5f51ad3708bd409877733
Author: Djavan Fagundes <djavanf gnome org>
Date:   Tue Sep 20 11:30:19 2011 -0300

    Updated Brazilian Portuguese translation. Reviewed by Antonio Fernandes C. Neto <fernandesn gnome org>

 po/pt_BR.po |10805 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 5406 insertions(+), 5399 deletions(-)
---
diff --git a/po/pt_BR.po b/po/pt_BR.po
index af296eb..962ca61 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -11,22 +11,22 @@
 # Og Maciel <ogmaciel gnome org>, 2008.
 # Leonardo Ferreira Fontenelle <leonardof gnome org>, 2008, 2009.
 # Andrà Gondim <andregondim ubuntu com>, 2009
-# Djavan Fagundes <djavan comum org>, 2010, 2011.
-#: ../shell/main.c:615
+# Djavan Fagundes <djavanf gnome org>, 2010, 2011.
+#: ../shell/main.c:570
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: "
-"http://bugzilla.gnome.org/enter_bug.cgi?product=evolution\n";
-"POT-Creation-Date: 2011-02-28 11:31+0000\n"
-"PO-Revision-Date: 2011-03-22 12:32-0200\n"
-"Last-Translator: Djavan Fagundes <djavan comum org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=evolution&keywords=I18N+L10N\n"
+"POT-Creation-Date: 2011-09-19 12:29+0000\n"
+"PO-Revision-Date: 2011-09-19 22:48-0300\n"
+"Last-Translator: Antonio Fernandes C. Neto <fernandesn gnome org>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list gnome org>\n"
-"Language: pt_BR\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"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.6.1\n"
 
 #. For Translators: {0} is the name of the address book source
@@ -48,22 +48,34 @@ msgstr ""
 "novo contato com o mesmo endereÃo?"
 
 #: ../addressbook/addressbook.error.xml.h:4
+msgid ""
+"A contact list named '{0}' is already in this contact list. Would you like "
+"to add it anyway?"
+msgstr ""
+"Uma lista de contatos chamada \"{0}\" jà està nesta lista de contatos. "
+"Gostaria de adicionÃ-lo assim mesmo?"
+
+#: ../addressbook/addressbook.error.xml.h:5
+msgid "Add with duplicates"
+msgstr "Adicionar como duplicados"
+
+#: ../addressbook/addressbook.error.xml.h:6
 msgid "Address '{0}' already exists."
 msgstr "O endereÃo \"{0}\" jà existe."
 
-#: ../addressbook/addressbook.error.xml.h:5
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Cannot add new contact"
 msgstr "NÃo foi possivel adicionar um novo contato"
 
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../addressbook/addressbook.error.xml.h:8
 msgid "Cannot move contact."
 msgstr "NÃo à possÃvel mover o contato."
 
-#: ../addressbook/addressbook.error.xml.h:7
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Category editor not available."
 msgstr "O editor de categorias nÃo està disponÃvel."
 
-#: ../addressbook/addressbook.error.xml.h:8
+#: ../addressbook/addressbook.error.xml.h:10
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
 "a supported login method. Remember that many passwords are case sensitive; "
@@ -73,15 +85,15 @@ msgstr ""
 "sessÃo com suporte. Lembre-se de que vÃrias senhas diferenciam maiÃsculas de "
 "minÃsculas; sua tecla CapsLock pode estar ligada."
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:11
 msgid "Could not get schema information for LDAP server."
 msgstr "NÃo foi possÃvel obter informaÃÃo de esquema do servidor LDAP."
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Could not remove address book."
 msgstr "NÃo foi possÃvel remover o catÃlogo de endereÃos."
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:13
 msgid ""
 "Currently you can only access the GroupWise System Address Book from "
 "Evolution. Please use some other GroupWise mail client once to get your "
@@ -92,54 +104,65 @@ msgstr ""
 "para obter os seus contatos freqÃentes do GroupWise e as pastas de contatos "
 "pessoais do GroupWise."
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Delete address book '{0}'?"
 msgstr "Excluir o catÃlogo de endereÃos \"{0}\"?"
 
-#: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:46
+#: ../addressbook/addressbook.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
 msgid "Do _Not Delete"
 msgstr "_NÃo excluir"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Erro ao salvar {0} para {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "Failed to authenticate with LDAP server."
 msgstr "Falha ao autenticar-se com o servidor LDAP."
 
-#. Unknown error
-#: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1276
+#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Failed to delete contact"
 msgstr "Falha ao excluir contatos"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "GroupWise Address book creation:"
 msgstr "CriaÃÃo do catÃlogo de endereÃos do GroupWise:"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "LDAP server did not respond with valid schema information."
 msgstr "O servidor LDAP nÃo respondeu com informaÃÃo de esquema vÃlido."
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:21
+msgid "List '{0}' is already in this contact list."
+msgstr "Lista \"{0}\" jà està nesta lista de contatos."
+
+#: ../addressbook/addressbook.error.xml.h:22
+msgid "Skip duplicates"
+msgstr "Pular duplicados"
+
+#: ../addressbook/addressbook.error.xml.h:23
+msgid "Some addresses already exist in this contact list."
+msgstr "Alguns endereÃos jà existem nesta lista de contato."
+
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "Some features may not work properly with your current server"
 msgstr ""
 "Alguns recursos podem nÃo funcionar corretamente com o seu servidor atual"
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "O catÃlogo de endereÃos do Evolution saiu inesperadamente."
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:26
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "A imagem que vocà selecionou à grande. Vocà deseja alterar o seu tamanho e "
 "armazenÃ-la?"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:27
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -149,17 +172,17 @@ msgstr ""
 "suporta esta funcionalidade ou ele pode estar mal configurado. Pergunte ao "
 "seu administrador quais sÃo as bases de pesquisa com suporte."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This address book could not be opened."
 msgstr "Este catÃlogo de endereÃos nÃo pÃde ser aberto."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "This address book server does not have any suggested search bases."
 msgstr ""
 "Este servidor de catÃlogo de endereÃos nÃo possui qualquer base de pesquisa "
 "sugerida."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:30
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -167,31 +190,31 @@ msgstr ""
 "Este servidor de catÃlogo de endereÃos pode estar inalcanÃÃvel, seu nome "
 "pode estar errado ou a sua conexÃo de rede pode ter caÃdo."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "This address book will be removed permanently."
 msgstr "Este catÃlogo de endereÃos serà removido permanentemente."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Este servidor nÃo suporta informaÃÃo de esquema LDAPv3."
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:33
 msgid "Unable to open address book"
 msgstr "NÃo foi possÃvel abrir o catÃlogo de endereÃos"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "Unable to perform search."
 msgstr "NÃo foi possÃvel realizar pesquisa."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:35
 msgid "Unable to save {0}."
 msgstr "NÃo foi possÃvel salvar {0}."
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:36
 msgid "Would you like to save your changes?"
 msgstr "Vocà deseja salvar suas alteraÃÃes?"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:37
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -200,7 +223,7 @@ msgstr ""
 "mas ele nÃo pode ser removido da fonte. Ao invÃs disso vocà deseja salvar "
 "uma cÃpia?"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:38
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -210,52 +233,58 @@ msgstr ""
 "problemas utilizando o Evolution. Para melhores resultados o servidor "
 "deveria ser atualizado para uma versÃo com suporte"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:39
+msgid ""
+"You are trying to add addresses that are part of this list already. Would "
+"you like to add them anyway?"
+msgstr ""
+"Vocà està tentando adicionar endereÃos que jà fazem parte dessa lista. "
+"Gostaria de adicionÃ-los de qualquer forma?"
+
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "You do not have permission to delete contacts in this address book."
 msgstr ""
 "Vocà nÃo possui permissÃo para excluir os contatos neste catÃlogo de "
 "endereÃos."
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:41
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "Vocà fez modificaÃÃes neste contato. Deseja salvar estas alteraÃÃes?"
 
 #. Translators: {0} is replaced with an address book name which will not be available
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:43
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Os seus contatos para {0} nÃo estarÃo disponÃveis atà que o Evolution seja "
 "reiniciado."
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:609
-#: ../plugins/groupwise-features/junk-settings.ui.h:4
-#: ../plugins/groupwise-features/properties.ui.h:9
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:618
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "_Adicionar"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:45
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "_Do not save"
 msgstr "_NÃo salvar"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:47
 msgid "_Resize"
 msgstr "_Redefinir"
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:48
 msgid "_Use as it is"
 msgstr "_Usar como estÃ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
-#: ../calendar/gui/e-calendar-view.c:2076
+#: ../addressbook/gui/widgets/eab-contact-display.c:715
+#: ../calendar/gui/e-calendar-view.c:2104
 msgid "Anniversary"
 msgstr "Bodas"
 
@@ -265,9 +294,9 @@ msgstr "Bodas"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
-#: ../calendar/gui/e-calendar-view.c:2075 ../capplet/anjal-settings-main.c:116
-#: ../shell/main.c:133
+#: ../addressbook/gui/widgets/eab-contact-display.c:714
+#: ../calendar/gui/e-calendar-view.c:2103 ../capplet/anjal-settings-main.c:79
+#: ../shell/main.c:140
 msgid "Birthday"
 msgstr "AniversÃrio"
 
@@ -277,7 +306,7 @@ msgid "Blog:"
 msgstr "Blog:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tegorias..."
@@ -287,24 +316,24 @@ msgid "Calendar:"
 msgstr "CalendÃrio:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/importers/evolution-vcard-importer.c:950
+#: ../addressbook/importers/evolution-vcard-importer.c:991
 msgid "Contact"
 msgstr "Contato"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:623
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:643
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2654
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:654
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:676
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2925
 msgid "Contact Editor"
 msgstr "Editor de contatos"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:295
+#: ../addressbook/gui/merging/eab-contact-merging.c:386
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:494
-#: ../addressbook/gui/widgets/eab-contact-display.c:502
-#: ../addressbook/gui/widgets/eab-contact-display.c:844
-#: ../plugins/groupwise-features/junk-settings.c:409 ../smime/lib/e-cert.c:832
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../addressbook/gui/widgets/eab-contact-display.c:641
+#: ../addressbook/gui/widgets/eab-contact-display.c:1019
+#: ../smime/lib/e-cert.c:837
 msgid "Email"
 msgstr "E-mail"
 
@@ -317,8 +346,10 @@ msgid "Full _Name..."
 msgstr "_Nome completo..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:198
+#: ../addressbook/gui/widgets/eab-contact-display.c:78
+#: ../addressbook/gui/widgets/eab-contact-display.c:1323
+#: ../widgets/misc/e-contact-map.c:295
 msgid "Home"
 msgstr "Casa"
 
@@ -352,18 +383,14 @@ msgid "Nic_kname:"
 msgstr "_Apelido:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
-#: ../modules/calendar/e-memo-shell-migrate.c:260
-#: ../plugins/groupwise-features/camel-gw-listener.c:423
-#: ../plugins/groupwise-features/camel-gw-listener.c:448
-#: ../plugins/groupwise-features/camel-gw-listener.c:564
 msgid "Notes"
 msgstr "Notas"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:69
-#: ../addressbook/gui/widgets/eab-contact-display.c:359
-#: ../calendar/gui/e-calendar-view.c:1781
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:199
+#: ../addressbook/gui/widgets/eab-contact-display.c:79
+#: ../addressbook/gui/widgets/eab-contact-display.c:409
+#: ../calendar/gui/e-calendar-view.c:1806
 msgid "Other"
 msgstr "Outro"
 
@@ -388,9 +415,11 @@ msgid "Web addresses"
 msgstr "EndereÃos Web"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:67
-#: ../addressbook/gui/widgets/eab-contact-display.c:554
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
+#: ../addressbook/gui/widgets/eab-contact-display.c:77
+#: ../addressbook/gui/widgets/eab-contact-display.c:694
+#: ../addressbook/gui/widgets/eab-contact-display.c:1320
+#: ../widgets/misc/e-contact-map.c:303
 msgid "Work"
 msgstr "Trabalho"
 
@@ -415,9 +444,9 @@ msgid "_Blog:"
 msgstr "_Blog:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:880
-#: ../calendar/gui/dialogs/event-page.ui.h:11
-#: ../plugins/itip-formatter/itip-view.c:1922
+#: ../calendar/gui/dialogs/event-page.c:710
+#: ../calendar/gui/dialogs/event-page.ui.h:10
+#: ../plugins/itip-formatter/itip-view.c:1963
 msgid "_Calendar:"
 msgstr "Agen_da:"
 
@@ -495,74 +524,74 @@ msgstr "On_de:"
 msgid "_Zip/Postal Code:"
 msgstr "CEP/CÃdi_go postal:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:167
-#: ../addressbook/gui/widgets/eab-contact-display.c:516
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
-#: ../addressbook/gui/widgets/eab-contact-display.c:521
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-display.c:660
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
-#: ../addressbook/gui/widgets/eab-contact-display.c:522
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/widgets/eab-contact-display.c:661
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-display.c:520
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-display.c:518
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/widgets/eab-contact-display.c:656
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:523
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/widgets/eab-contact-display.c:662
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:208
-#: ../addressbook/gui/widgets/eab-gui-util.c:381
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:220
+#: ../addressbook/gui/widgets/eab-gui-util.c:469
 msgid "Error adding contact"
 msgstr "Erro ao adicionar contato"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:235
 msgid "Error modifying contact"
 msgstr "Erro ao modificar contato"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
 msgid "Error removing contact"
 msgstr "Erro ao remover contato"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:638
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2649
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:670
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2919
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de contatos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3070
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3398
 msgid "Please select an image for this contact"
 msgstr "Por favor, selecione uma imagem para este contato"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3071
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3399
 msgid "_No image"
 msgstr "_Sem imagem"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3352
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3730
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -570,43 +599,43 @@ msgstr ""
 "Os dados do contato sÃo invÃlidos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3356
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3735
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "\"%s\" possui um formato invÃlido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3363
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3743
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s\"%s\" possui um formato invÃlido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3378
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3389
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3756
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3770
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s\"%s\" està vazio"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3404
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3785
 msgid "Invalid contact."
 msgstr "Contato invÃlido."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:392
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:437
 msgid "Contact Quick-Add"
 msgstr "AdiÃÃo rÃpida de contato"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:395
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:440
 msgid "_Edit Full"
 msgstr "_Editar completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:443
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:488
 msgid "_Full name"
 msgstr "Nome _completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:454
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:499
 msgid "E_mail"
 msgstr "E-mai_l"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:465
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:510
 msgid "_Select Address Book"
 msgstr "_Selecionar catÃlogo de endereÃos"
 
@@ -676,7 +705,7 @@ msgid "_Suffix:"
 msgstr "S_ufixo:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:652
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:742
 msgid "Contact List Editor"
 msgstr "Editor de lista de contatos"
 
@@ -693,7 +722,7 @@ msgid "_List name:"
 msgstr "_Nome da lista:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:159
+#: ../mail/mail-config.ui.h:163
 msgid "_Select..."
 msgstr "_Selecionar..."
 
@@ -702,27 +731,26 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "_Digite um endereÃo de e-mail ou arraste um contato para a lista abaixo:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:746
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:865
 msgid "Contact List Members"
 msgstr "Membros da lista de contatos"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1315
-msgid "_Members"
-msgstr "_Membros"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1153
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1440
 msgid "Error adding list"
 msgstr "Erro ao adicionar lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1167
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1455
 msgid "Error modifying list"
 msgstr "Erro ao modificar lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1181
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1470
 msgid "Error removing list"
 msgstr "Erro ao remover lista"
 
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1601
+msgid "_Members"
+msgstr "_Membros"
+
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "Contato alterado:"
@@ -739,11 +767,11 @@ msgstr "Detectado um contato duplicado"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
 msgid ""
-"The name or email of this contact already exists in this folder.  Would you "
-"like to add it anyway?"
+"The name or email of this contact already exists in this folder. Would you "
+"like to save the changes anyway?"
 msgstr ""
-"O nome ou e-mail deste contato jà existe nesta pasta. Vocà deseja adicionÃ-"
-"lo mesmo assim?"
+"O nome ou e-mail deste contato jà existe nesta pasta. Vocà gostaria de "
+"salvar as alteraÃÃes mesmo assim?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
 msgid "New Contact:"
@@ -762,60 +790,54 @@ msgstr ""
 "Vocà deseja adicionÃ-lo mesmo assim?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:241
+#: ../addressbook/gui/merging/eab-contact-merging.c:332
 msgid "_Merge"
 msgstr "_Juntar"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:166
-#: ../calendar/gui/tasktypes.xml.h:7
-#, c-format
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:224
+#: ../addressbook/gui/merging/eab-contact-merging.c:315
 msgid "Merge Contact"
 msgstr "Juntar contatos"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:920
-#: ../modules/calendar/e-cal-shell-view-actions.c:1693
-#: ../modules/calendar/e-memo-shell-view-actions.c:774
-#: ../modules/calendar/e-task-shell-view-actions.c:973
+#: ../modules/addressbook/e-book-shell-view-actions.c:1059
+#: ../modules/calendar/e-cal-shell-view-actions.c:1727
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:987
 msgid "Any field contains"
 msgstr "Qualquer campo contÃm"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:1066
 msgid "Email begins with"
 msgstr "E-mail comeÃa com"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:1073
 msgid "Name contains"
 msgstr "Nome contÃm"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:145
+#: ../addressbook/gui/widgets/e-addressbook-model.c:157
 msgid "No contacts"
 msgstr "Sem contatos"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:149
+#: ../addressbook/gui/widgets/e-addressbook-model.c:161
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d contato"
 msgstr[1] "%d contatos"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:323
+#: ../addressbook/gui/widgets/e-addressbook-model.c:357
 msgid "Error getting book view"
 msgstr "Erro ao obter exibiÃÃo do catÃlogo"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:736
+#: ../addressbook/gui/widgets/e-addressbook-model.c:771
 msgid "Search Interrupted"
 msgstr "Pesquisa interrompida"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:158
 msgid "Error modifying card"
 msgstr "Erro ao modificar o cartÃo"
 
@@ -832,7 +854,7 @@ msgid "Paste contacts from the clipboard"
 msgstr "Cola os contatos da Ãrea de transferÃncia"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:642
-#: ../modules/addressbook/e-book-shell-view-actions.c:745
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
 msgid "Delete selected contacts"
 msgstr "Exclui os contatos selecionados"
 
@@ -840,38 +862,35 @@ msgstr "Exclui os contatos selecionados"
 msgid "Select all visible contacts"
 msgstr "Seleciona todos os contatos visÃveis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1294
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1326
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Vocà tem certeza de que deseja excluir estas listas de contatos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1298
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Vocà tem certeza de que deseja excluir estas listas de contatos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1302
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1334
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Vocà tem certeza de que deseja excluir a lista de contatos (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1308
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1340
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Vocà tem certeza de que deseja excluir estes contatos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1344
 msgid "Are you sure you want to delete this contact?"
 msgstr "Vocà tem certeza de que deseja excluir este contato?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1348
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Vocà tem certeza de que deseja excluir este contato (%s)?"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1473
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1504
 #, c-format
-#| msgid ""
-#| "Opening %d contacts will open %d new windows as well.\n"
-#| "Do you really want to display all of these contacts?"
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
@@ -885,16 +904,16 @@ msgstr[1] ""
 "Abrir %d contatos tambÃm abrirà %d novas janelas.\n"
 "Vocà realmente deseja exibir todos estes contatos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1481
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1512
 msgid "_Don't Display"
 msgstr "NÃo _mostrar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1482
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1513
 msgid "Display _All Contacts"
 msgstr "Mostr_ar todos os contatos"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
+#: ../addressbook/gui/widgets/eab-contact-display.c:685
 msgid "Assistant"
 msgstr "Assistente"
 
@@ -923,7 +942,7 @@ msgid "Car Phone"
 msgstr "Telefone do carro"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -931,7 +950,7 @@ msgid "Categories"
 msgstr "Categorias"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/widgets/eab-contact-display.c:680
 msgid "Company"
 msgstr "Empresa"
 
@@ -980,22 +999,22 @@ msgid "Journal"
 msgstr "DiÃrio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:544
+#: ../addressbook/gui/widgets/eab-contact-display.c:684
 msgid "Manager"
 msgstr "Gerente"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
+#: ../addressbook/gui/widgets/eab-contact-display.c:712
 msgid "Mobile Phone"
 msgstr "Telefone celular"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:509
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
 msgid "Nickname"
 msgstr "Apelido"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:739
 msgid "Note"
 msgstr "Nota"
 
@@ -1024,13 +1043,13 @@ msgid "Radio"
 msgstr "RÃdio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:571
+#: ../calendar/gui/e-meeting-list-view.c:610
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Papel"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
+#: ../addressbook/gui/widgets/eab-contact-display.c:716
 msgid "Spouse"
 msgstr "CÃnjuge"
 
@@ -1060,7 +1079,7 @@ msgstr "Unidade"
 msgid "Web Site"
 msgstr "Site da web"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:192
 msgid ""
 "\n"
 "\n"
@@ -1070,7 +1089,7 @@ msgstr ""
 "\n"
 "Pesquisando por contatos..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:186
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1084,7 +1103,7 @@ msgstr ""
 "\n"
 "ou clique duas vezes aqui para criar um novo contato."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1098,7 +1117,7 @@ msgstr ""
 "\n"
 "Clique duas vezes aqui para criar um novo contato."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:202
 msgid ""
 "\n"
 "\n"
@@ -1108,7 +1127,7 @@ msgstr ""
 "\n"
 "Pesquisa pelo contato."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:195
+#: ../addressbook/gui/widgets/e-minicard-view.c:204
 msgid ""
 "\n"
 "\n"
@@ -1118,136 +1137,137 @@ msgstr ""
 "\n"
 "NÃo hà itens neste modo de exibiÃÃo."
 
-#: ../addressbook/gui/widgets/e-minicard.c:98
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Work Email"
 msgstr "E-mail profissional"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Home Email"
 msgstr "E-mail particular"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
-#: ../addressbook/gui/widgets/e-minicard.c:805
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:819
 msgid "Other Email"
 msgstr "Outro e-mail"
 
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
-#: ../addressbook/gui/widgets/ea-minicard-view.c:184
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:97
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:106
+#: ../addressbook/gui/widgets/ea-minicard-view.c:187
 msgid "evolution address book"
 msgstr "catÃlogo de endereÃos do Evolution"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:33
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
 msgid "New Contact"
 msgstr "Novo contato"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:34
+#: ../addressbook/gui/widgets/ea-minicard-view.c:37
 msgid "New Contact List"
 msgstr "Nova lista de contatos"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:167
+#: ../addressbook/gui/widgets/ea-minicard-view.c:170
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "pasta atual do catÃlogo de endereÃos %s possui %d cartÃo"
 msgstr[1] "pasta atual do catÃlogo de endereÃos %s possui %d cartÃes"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:31
+#: ../addressbook/gui/widgets/ea-minicard.c:34
 msgid "Open"
 msgstr "Abrir"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:153
+#: ../addressbook/gui/widgets/ea-minicard.c:156
 msgid "Contact List: "
 msgstr "Lista de contatos: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:154
+#: ../addressbook/gui/widgets/ea-minicard.c:157
 msgid "Contact: "
 msgstr "Contato: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:180
+#: ../addressbook/gui/widgets/ea-minicard.c:183
 msgid "evolution minicard"
 msgstr "minicartÃo do Evolution"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:182
 msgid "Copy _Email Address"
 msgstr "Copiar _endereÃo de e-mail"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174
-#: ../widgets/misc/e-web-view.c:391
+#: ../addressbook/gui/widgets/eab-contact-display.c:184
+#: ../widgets/misc/e-web-view.c:432
 msgid "Copy the email address to the clipboard"
 msgstr "Copia o endereÃo de e-mail para a Ãrea de transferÃncia"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:179
-#: ../widgets/misc/e-web-view.c:396
+#: ../addressbook/gui/widgets/eab-contact-display.c:189
+#: ../widgets/misc/e-web-view.c:437
 msgid "_Send New Message To..."
 msgstr "En_viar nova mensagem para..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:398
+#: ../addressbook/gui/widgets/eab-contact-display.c:191
+#: ../widgets/misc/e-web-view.c:439
 msgid "Send a mail message to this address"
 msgstr "Envia uma mensagem para estes endereÃos"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:424
-#: ../addressbook/gui/widgets/eab-contact-display.c:811
-msgid "List Members"
-msgstr "Listar membros"
+#: ../addressbook/gui/widgets/eab-contact-display.c:215
+msgid "Open map"
+msgstr "Abrir mapa"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:528
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
+msgid "List Members:"
+msgstr "Listar membros:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:541
+#: ../addressbook/gui/widgets/eab-contact-display.c:681
 msgid "Department"
 msgstr "Departamento"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
+#: ../addressbook/gui/widgets/eab-contact-display.c:682
 msgid "Profession"
 msgstr "ProfissÃo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:543
+#: ../addressbook/gui/widgets/eab-contact-display.c:683
 msgid "Position"
 msgstr "Cargo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:546
+#: ../addressbook/gui/widgets/eab-contact-display.c:686
 msgid "Video Chat"
 msgstr "Bate-papo com vÃdeo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:547
-#: ../calendar/gui/dialogs/calendar-setup.c:376
-#: ../modules/calendar/e-cal-shell-view-actions.c:218
-#: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:497
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
-#: ../plugins/groupwise-features/camel-gw-listener.c:562
+#: ../addressbook/gui/widgets/eab-contact-display.c:687
+#: ../calendar/gui/dialogs/calendar-setup.c:449
+#: ../modules/calendar/e-cal-shell-view-actions.c:232
+#: ../modules/calendar/e-cal-shell-view-actions.c:261
+#: ../modules/calendar/e-cal-shell-view.c:513
+#: ../modules/online-accounts/e-online-accounts-google.c:294
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
-#: ../widgets/misc/e-send-options.c:519
+#: ../widgets/misc/e-send-options.c:528
 msgid "Calendar"
 msgstr "Agenda"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:548
+#: ../addressbook/gui/widgets/eab-contact-display.c:688
 #: ../calendar/gui/dialogs/event-editor.c:123
 #: ../calendar/gui/dialogs/event-editor.c:350
-#: ../modules/calendar/e-calendar-preferences.ui.h:17
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "Disponibilidade"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:549
-#: ../addressbook/gui/widgets/eab-contact-display.c:570
+#: ../addressbook/gui/widgets/eab-contact-display.c:689
+#: ../addressbook/gui/widgets/eab-contact-display.c:711
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:550
+#: ../addressbook/gui/widgets/eab-contact-display.c:690
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:551
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:691
+#: ../addressbook/gui/widgets/eab-contact-display.c:713
 msgid "Address"
 msgstr "EndereÃo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:567
+#: ../addressbook/gui/widgets/eab-contact-display.c:708
 msgid "Home Page"
 msgstr "PÃgina web"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:568
+#: ../addressbook/gui/widgets/eab-contact-display.c:709
 msgid "Web Log"
 msgstr "Web log"
 
@@ -1255,38 +1275,42 @@ msgstr "Web log"
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
-#: ../capplet/settings/mail-capplet-shell.c:361
-#: ../modules/addressbook/e-book-shell-backend.c:112
-#: ../modules/addressbook/e-book-shell-migrate.c:143
-#: ../modules/calendar/e-cal-shell-backend.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:161
-#: ../modules/calendar/e-memo-shell-backend.c:112
-#: ../modules/calendar/e-memo-shell-migrate.c:117
-#: ../modules/calendar/e-task-shell-backend.c:112
-#: ../modules/calendar/e-task-shell-migrate.c:128
+#: ../addressbook/gui/widgets/eab-contact-display.c:718
+#: ../capplet/settings/mail-capplet-shell.c:385
+#: ../modules/addressbook/e-book-shell-backend.c:120
+#: ../modules/addressbook/e-book-shell-migrate.c:144
+#: ../modules/calendar/e-cal-shell-backend.c:138
+#: ../modules/calendar/e-cal-shell-migrate.c:165
+#: ../modules/calendar/e-memo-shell-backend.c:122
+#: ../modules/calendar/e-memo-shell-migrate.c:120
+#: ../modules/calendar/e-task-shell-backend.c:122
+#: ../modules/calendar/e-task-shell-migrate.c:132
 msgid "Personal"
 msgstr "Pessoal"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:829
+#: ../addressbook/gui/widgets/eab-contact-display.c:986
+msgid "List Members"
+msgstr "Listar membros"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:1004
 msgid "Job Title"
 msgstr "FunÃÃo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:866
+#: ../addressbook/gui/widgets/eab-contact-display.c:1041
 msgid "Home page"
 msgstr "PÃgina web"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:875
+#: ../addressbook/gui/widgets/eab-contact-display.c:1050
 msgid "Blog"
 msgstr "Blog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1055
-#: ../widgets/misc/e-web-view.c:848
+#: ../addressbook/gui/widgets/eab-contact-display.c:1248
+#: ../widgets/misc/e-web-view.c:980
 #, c-format
 msgid "Click to mail %s"
 msgstr "Clique para enviar correio para %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -1297,7 +1321,7 @@ msgstr ""
 "para uso desconectado. Por favor, carregue o catÃlogo de endereÃos quando "
 "estiver no modo conectado para baixar seu conteÃdo."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:104
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1306,7 +1330,7 @@ msgstr ""
 "NÃo foi possÃvel abrir este catÃlogo de endereÃos. Por favor, verifique se o "
 "caminho %s existe e se vocà possui as permissÃes para acessÃ-lo."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:161
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -1315,7 +1339,7 @@ msgstr ""
 "LDAP no Evolution, vocà deve instalar um pacote do Evolution com LDAP "
 "habilitado."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:126
+#: ../addressbook/gui/widgets/eab-gui-util.c:170
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1323,12 +1347,12 @@ msgstr ""
 "NÃo foi possÃvel abrir este catÃlogo de endereÃos. Isto significa que vocà "
 "digitou um URI incorreto ou que o servidor està fora do ar."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:134
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
 msgid "Detailed error message:"
 msgstr "Mennsagem detalhada do erro:"
 
 # alterei para ter o mesmo tamanho
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
+#: ../addressbook/gui/widgets/eab-gui-util.c:209
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1340,7 +1364,7 @@ msgstr ""
 "Por favor, torne a sua pesquisa mais especÃfica ou aumente o limite \n"
 "nas preferÃncias do servidor de diretÃrio para este catÃlogo de endereÃos."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:171
+#: ../addressbook/gui/widgets/eab-gui-util.c:216
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1353,14 +1377,14 @@ msgstr ""
 "preferÃncias do servidor de diretÃrio para este catÃlogo de endereÃos."
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:179
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
 #, c-format
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr ""
 "O backend para este catÃlogo de endereÃos nÃo pÃde analisar esta consulta. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:184
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
 #, c-format
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr ""
@@ -1368,138 +1392,154 @@ msgstr ""
 "consulta. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:189
+#: ../addressbook/gui/widgets/eab-gui-util.c:235
+#: ../addressbook/gui/widgets/eab-gui-util.c:241
 #, c-format
 msgid "This query did not complete successfully. %s"
 msgstr "Esta consulta nÃo foi concluÃda com sucesso. %s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:214
+#: ../addressbook/gui/widgets/eab-gui-util.c:263
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:254
+#: ../addressbook/gui/widgets/eab-gui-util.c:308
 msgid "Select Address Book"
 msgstr "Selecionar catÃlogo de endereÃos"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:317
+#: ../addressbook/gui/widgets/eab-gui-util.c:371
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:455
+#: ../addressbook/gui/widgets/eab-gui-util.c:552
 msgid "Move contact to"
 msgstr "Mover contato para"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:457
+#: ../addressbook/gui/widgets/eab-gui-util.c:554
 msgid "Copy contact to"
 msgstr "Copiar contato para"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:460
+#: ../addressbook/gui/widgets/eab-gui-util.c:557
 msgid "Move contacts to"
 msgstr "Mover contatos para"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:462
+#: ../addressbook/gui/widgets/eab-gui-util.c:559
 msgid "Copy contacts to"
 msgstr "Copiar contatos para"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:39
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:38
 msgid "Card View"
 msgstr "ExibiÃÃo de cartÃo"
 
-#: ../addressbook/importers/evolution-csv-importer.c:721
-#: ../addressbook/importers/evolution-ldif-importer.c:519
-#: ../addressbook/importers/evolution-vcard-importer.c:278
-#: ../calendar/importers/icalendar-importer.c:325
-#: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-csv-importer.c:748
+#: ../addressbook/importers/evolution-ldif-importer.c:546
+#: ../addressbook/importers/evolution-vcard-importer.c:280
+#: ../calendar/importers/icalendar-importer.c:413
+#: ../calendar/importers/icalendar-importer.c:902
+#: ../calendar/importers/icalendar-importer.c:941 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Importando..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1016
+#: ../addressbook/importers/evolution-csv-importer.c:1072
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "CSV ou Tab do Outlook (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1017
+#: ../addressbook/importers/evolution-csv-importer.c:1073
 msgid "Outlook CSV and Tab Importer"
 msgstr "Importador CSV e Tab do Outlook"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1025
+#: ../addressbook/importers/evolution-csv-importer.c:1081
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "CSV ou Tab do Mozilla (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1026
+#: ../addressbook/importers/evolution-csv-importer.c:1082
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Importador CSV e Tab do Mozilla"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1034
+#: ../addressbook/importers/evolution-csv-importer.c:1090
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "CSV ou Tab do Evolution (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1035
+#: ../addressbook/importers/evolution-csv-importer.c:1091
 msgid "Evolution CSV and Tab Importer"
 msgstr "Importador CSV e Tab do Evolution"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:753
+#: ../addressbook/importers/evolution-ldif-importer.c:796
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Formato de troca de dados LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:754
+#: ../addressbook/importers/evolution-ldif-importer.c:797
 msgid "Evolution LDIF importer"
 msgstr "Importador LDIF do Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:639
+#: ../addressbook/importers/evolution-vcard-importer.c:658
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:640
+#: ../addressbook/importers/evolution-vcard-importer.c:659
 msgid "Evolution vCard Importer"
 msgstr "Importador vCard do Evolution"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:741
+#: ../addressbook/printing/e-contact-print.c:719
 #, c-format
 msgid "Page %d"
 msgstr "PÃgina %d"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:654
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:689
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:53
 msgid "Can not open file"
 msgstr "NÃo foi possÃvel abrir o arquivo"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
-msgid "Couldn't get list of address books"
-msgstr "NÃo foi possÃvel obter a lista de catÃlogos de endereÃos"
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
+#, c-format
+msgid "Couldn't get list of address books: %s"
+msgstr "NÃo foi possÃvel obter lista de catÃlogos de endereÃos: %s"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#: ../calendar/gui/dialogs/event-page.c:2923
+#: ../calendar/gui/dialogs/memo-page.c:938
+#: ../calendar/gui/dialogs/task-page.c:1759 ../em-format/em-format.c:2324
+#: ../mail/em-folder-tree.c:678 ../mail/mail-ops.c:658
+#: ../plugins/caldav/caldav-browse-server.c:220
+#: ../plugins/caldav/caldav-browse-server.c:1469 ../plugins/face/face.c:174
+#: ../smime/gui/certificate-manager.c:314
+msgid "Unknown error"
+msgstr "Erro desconhecido"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
-msgid "failed to open book"
-msgstr "falha ao abrir o catÃlogo"
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#, c-format
+msgid "Failed to open client '%s': %s"
+msgstr "Falha ao abrir o cliente \"%s\": %s"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Specify the output file instead of standard output"
 msgstr "Especifique um arquivo de saÃda no lugar da saÃda padrÃo"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "OUTPUTFILE"
 msgstr "ARQUIVO_DE_SAÃDA"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:64
 msgid "List local address book folders"
 msgstr "Listar as pastas locais do catÃlogo de endereÃos"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:66
+#: ../addressbook/tools/evolution-addressbook-export.c:67
 msgid "Show cards as vcard or csv file"
 msgstr "Mostrar cartÃes como vCard ou um arquivo csv"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:67
+#: ../addressbook/tools/evolution-addressbook-export.c:68
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:70
+#: ../addressbook/tools/evolution-addressbook-export.c:71
 msgid "Export in asynchronous mode"
 msgstr "Exportar em modo assÃncrono"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:73
+#: ../addressbook/tools/evolution-addressbook-export.c:74
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
@@ -1507,30 +1547,30 @@ msgstr ""
 "O nÃmero de cartÃes em um arquivo de saÃda no modo assÃncrono, tamanho "
 "padrÃo 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:75
+#: ../addressbook/tools/evolution-addressbook-export.c:76
 msgid "NUMBER"
 msgstr "NÃMERO"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:137
+#: ../addressbook/tools/evolution-addressbook-export.c:139
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Erro nos argumentos de linha de comando. Por favor, use a opÃÃo --help para "
 "ver o uso correto."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:151
+#: ../addressbook/tools/evolution-addressbook-export.c:153
 msgid "Only support csv or vcard format."
 msgstr "Apenas os formatos csv ou vCard com suporte."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:160
+#: ../addressbook/tools/evolution-addressbook-export.c:162
 msgid "In async mode, output must be file."
 msgstr "No modo assÃncrono a saÃda deve ser um arquivo."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:168
+#: ../addressbook/tools/evolution-addressbook-export.c:170
 msgid "In normal mode, there is no need for the size option."
 msgstr "No modo normal nÃo à necessÃria a opÃÃo de tamanho."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:199
+#: ../addressbook/tools/evolution-addressbook-export.c:201
 msgid "Unhandled error"
 msgstr "Erro nÃo manipulado"
 
@@ -1655,19 +1695,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Vocà tem certeza de que deseja excluir este compromisso?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:187
+#: ../calendar/gui/dialogs/delete-comp.c:191
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Vocà tem certeza de que deseja excluir esta reuniÃo?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:193
+#: ../calendar/gui/dialogs/delete-comp.c:197
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Vocà tem certeza de que deseja excluir este memorando?"
 
 #: ../calendar/calendar.error.xml.h:25
-#: ../calendar/gui/dialogs/delete-comp.c:190
+#: ../calendar/gui/dialogs/delete-comp.c:194
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Vocà tem certeza de que deseja excluir esta tarefa?"
@@ -1750,7 +1790,6 @@ msgstr "Erro ao carregar a lista de tarefas"
 #. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
 #. {1} is replaced with a calendar/task/memo list name, where the error happened
 #: ../calendar/calendar.error.xml.h:46
-#| msgid "Error saving {0} to {1}: {2}"
 msgid "Error on {0}: {1}"
 msgstr "Erro em {0}: {1}"
 
@@ -1942,7 +1981,7 @@ msgstr ""
 msgid "_Discard Changes"
 msgstr "_Descartar alteraÃÃes"
 
-#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:313
+#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:317
 msgid "_Save"
 msgstr "_Salvar"
 
@@ -1951,7 +1990,7 @@ msgid "_Save Changes"
 msgstr "_Salvar alteraÃÃes"
 
 #: ../calendar/calendar.error.xml.h:86
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:158
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:165
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Enviar"
@@ -1960,47 +1999,33 @@ msgstr "_Enviar"
 msgid "_Send Notice"
 msgstr "_Enviar notificaÃÃo"
 
-#: ../calendar/common/authentication.c:53
-#: ../calendar/gui/e-meeting-store.c:1775
-#: ../plugins/caldav/caldav-browse-server.c:921
-#: ../plugins/google-account-setup/google-source.c:439
-#: ../plugins/publish-calendar/publish-calendar.c:332
-#: ../smime/gui/component.c:49
-msgid "Enter password"
-msgstr "Digite a senha"
-
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:107
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:114
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#. Translators: This is the last part of the sentence:
-#. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:126
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
-#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:377
-#: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#| msgid "days"
-msgid "days"
+#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
+#. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:133
+#: ../calendar/gui/dialogs/recurrence-page.c:1190
+msgid "day"
 msgid_plural "days"
-msgstr[0] "dias"
+msgstr[0] "dia"
 msgstr[1] "dias"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:313
 msgid "Start time"
 msgstr "Hora de inÃcio"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:3
 msgid "Appointments"
 msgstr "Compromissos"
 
@@ -2010,9 +2035,9 @@ msgstr "Desc_artar tudo"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1631
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1641
-#: ../plugins/itip-formatter/itip-view.c:1044
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1739
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1749
+#: ../plugins/itip-formatter/itip-view.c:1052
 msgid "Location:"
 msgstr "Local:"
 
@@ -2020,7 +2045,7 @@ msgstr "Local:"
 msgid "Snooze _time:"
 msgstr "_Tempo de adiamento:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:883
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:919
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
 msgid "_Dismiss"
 msgstr "_Descartar"
@@ -2029,11 +2054,21 @@ msgstr "_Descartar"
 msgid "_Snooze"
 msgstr "_Adiar"
 
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:454
+#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:350
+#: ../plugins/google-account-setup/google-contacts-source.c:387
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+msgid "days"
+msgstr "dias"
+
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:424
+#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:453
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:376
+#: ../plugins/google-account-setup/google-contacts-source.c:386
 msgid "hours"
 msgstr "horas"
 
@@ -2044,40 +2079,39 @@ msgstr "localizaÃÃo do compromisso"
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
-#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:452
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:375
+#: ../plugins/google-account-setup/google-contacts-source.c:385
 msgid "minutes"
 msgstr "minutos"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1612
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1588
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
 msgid "No summary available."
 msgstr "Sem resumo disponÃvel."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1494
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1496
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1597
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
 msgid "No description available."
 msgstr "Sem descriÃÃo disponÃvel."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1504
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1607
 msgid "No location information available."
 msgstr "Sem informaÃÃo de local disponÃvel."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1548
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1653
 #, c-format
-#| msgid "You have %d alarms"
-msgid "You have %d alarm"
-msgid_plural "You have %d alarms"
-msgstr[0] "Vocà tem %d alarme"
-msgstr[1] "Vocà tem %d alarmes"
+msgid "You have %d reminder"
+msgid_plural "You have %d reminders"
+msgstr[0] "Vocà tem %d lembrete"
+msgstr[1] "Vocà tem %d lembretes"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1737
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1770
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1853
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1888
 msgid "Warning"
 msgstr "Alerta"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1741
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1857
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2089,7 +2123,7 @@ msgstr ""
 "com notificaÃÃes por e-mail. Em lugar disso, o Evolution\n"
 "exibirà uma caixa de diÃlogo de lembrete normal."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1776
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1894
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2106,17 +2140,17 @@ msgstr ""
 "\n"
 "Vocà tem certeza de que deseja executar este programa?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1791
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1909
 msgid "Do not ask me about this program again."
 msgstr "NÃo me pergunte sobre este programa novamente."
 
-#: ../calendar/gui/alarm-notify/util.c:44
+#: ../calendar/gui/alarm-notify/util.c:45
 msgid "invalid time"
 msgstr "hora invÃlida"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:393
-#: ../calendar/gui/misc.c:116
+#: ../calendar/gui/alarm-notify/util.c:71 ../calendar/gui/e-alarm-list.c:405
+#: ../calendar/gui/misc.c:118
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -2124,8 +2158,8 @@ msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:399
-#: ../calendar/gui/misc.c:122
+#: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/e-alarm-list.c:411
+#: ../calendar/gui/misc.c:124
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -2135,31 +2169,27 @@ 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 of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:405
-#: ../calendar/gui/misc.c:126
+#: ../calendar/gui/alarm-notify/util.c:81 ../calendar/gui/e-alarm-list.c:417
+#: ../calendar/gui/misc.c:128
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: ../calendar/gui/cal-editor-utils.c:105
-msgid "Invalid object"
-msgstr "Objeto invÃlido"
-
-#: ../calendar/gui/calendar-view-factory.c:117
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Day View"
 msgstr "VisÃo de dia"
 
-#: ../calendar/gui/calendar-view-factory.c:120
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Work Week View"
 msgstr "VisÃo de semana Ãtil"
 
-#: ../calendar/gui/calendar-view-factory.c:123
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Week View"
 msgstr "VisÃo de semana"
 
-#: ../calendar/gui/calendar-view-factory.c:126
+#: ../calendar/gui/calendar-view-factory.c:125
 msgid "Month View"
 msgstr "VisÃo de mÃs"
 
@@ -2188,16 +2218,16 @@ msgstr "Categoria"
 msgid "Classification"
 msgstr "ClassificaÃÃo"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:242
-#: ../calendar/gui/e-cal-model.c:771 ../calendar/gui/e-task-table.c:494
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:243
+#: ../calendar/gui/e-cal-model.c:774 ../calendar/gui/e-task-table.c:504
 #: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "Confidencial"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
-#: ../modules/plugin-manager/evolution-plugin-manager.c:68
-#: ../widgets/misc/e-attachment-tree-view.c:520
+#: ../modules/plugin-manager/evolution-plugin-manager.c:71
+#: ../widgets/misc/e-attachment-tree-view.c:526
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "DescriÃÃo"
@@ -2219,9 +2249,9 @@ msgstr "Existe"
 
 #: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:835
+#: ../plugins/publish-calendar/publish-calendar.c:863
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:397
 msgid "Location"
 msgstr "Local"
 
@@ -2230,15 +2260,15 @@ msgstr "Local"
 msgid "Organizer"
 msgstr "Organizador"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:769 ../calendar/gui/e-task-table.c:493
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:242
+#: ../calendar/gui/e-cal-model.c:772 ../calendar/gui/e-task-table.c:503
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Particular"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:760 ../calendar/gui/e-cal-model.c:767
-#: ../calendar/gui/e-task-table.c:492 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:241
+#: ../calendar/gui/e-cal-model.c:763 ../calendar/gui/e-cal-model.c:770
+#: ../calendar/gui/e-task-table.c:502 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "PÃblico"
 
@@ -2254,7 +2284,7 @@ msgstr "RecorrÃncia"
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "Summary"
 msgstr "Resumo"
 
@@ -2283,55 +2313,55 @@ msgstr "Ã"
 msgid "is not"
 msgstr "nÃo Ã"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:626
-msgid "Edit Alarm"
-msgstr "Editar alarme"
+#: ../calendar/gui/dialogs/alarm-dialog.c:636
+msgid "Edit Reminder"
+msgstr "Editar lembrete"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:817
-#: ../calendar/gui/e-alarm-list.c:435
+#: ../calendar/gui/dialogs/alarm-dialog.c:827
+#: ../calendar/gui/e-alarm-list.c:447
 msgid "Pop up an alert"
 msgstr "Exibir um alerta"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:818
-#: ../calendar/gui/e-alarm-list.c:431
+#: ../calendar/gui/dialogs/alarm-dialog.c:828
+#: ../calendar/gui/e-alarm-list.c:443
 msgid "Play a sound"
 msgstr "Tocar um som"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:819
-#: ../calendar/gui/e-alarm-list.c:443
+#: ../calendar/gui/dialogs/alarm-dialog.c:829
+#: ../calendar/gui/e-alarm-list.c:455
 msgid "Run a program"
 msgstr "Executar um programa"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:820
-#: ../calendar/gui/e-alarm-list.c:439
+#: ../calendar/gui/dialogs/alarm-dialog.c:830
+#: ../calendar/gui/e-alarm-list.c:451
 msgid "Send an email"
 msgstr "Enviar um e-mail"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "Add Alarm"
-msgstr "Adicionar alarme"
+msgid "Add Reminder"
+msgstr "Adicionar lembrete"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:360
-msgid "Alarm"
-msgstr "Alarme"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
 msgstr "Mensagem _personalizada"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-msgid "Custom alarm sound"
-msgstr "Som de alarme personalizado"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
+msgid "Custom reminder sound"
+msgstr "Som do lembrete personalizado"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 msgid "Mes_sage:"
 msgstr "Men_sagem:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:72
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:75
 msgid "Options"
 msgstr "OpÃÃes"
 
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../calendar/gui/dialogs/event-editor.c:360
+msgid "Reminder"
+msgstr "Lembrete"
+
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
 msgid "Repeat"
 msgstr "Repetir"
@@ -2353,8 +2383,8 @@ msgid "_Program:"
 msgstr "_Programa:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-msgid "_Repeat the alarm"
-msgstr "_Repetir o alarme"
+msgid "_Repeat the reminder"
+msgstr "_Repetir o lembrete"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
 msgid "_Sound:"
@@ -2376,7 +2406,7 @@ msgstr "dia(s)"
 msgid "end of appointment"
 msgstr "fim do compromisso"
 
-#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "vezes extra a cada"
@@ -2393,7 +2423,7 @@ msgstr "minuto(s)"
 msgid "start of appointment"
 msgstr "inÃcio do compromisso"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:245
 msgid "Action/Trigger"
 msgstr "AÃÃo ou gatilho"
 
@@ -2402,460 +2432,470 @@ msgid "A_dd"
 msgstr "A_dicionar"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-page.ui.h:1
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
-msgid "Alarms"
-msgstr "Alarmes"
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../modules/calendar/e-calendar-preferences.ui.h:23
+msgid "Reminders"
+msgstr "Lembretes"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:159
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:175
-#: ../modules/addressbook/addressbook-config.c:509
+#: ../calendar/gui/dialogs/calendar-setup.c:185
+#: ../modules/addressbook/addressbook-config.c:530
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:232 ../mail/mail-config.ui.h:152
+#: ../calendar/gui/dialogs/calendar-setup.c:248 ../mail/mail-config.ui.h:155
 #: ../modules/addressbook/ldap-config.ui.h:26
-#: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:278
+#: ../widgets/misc/e-signature-script-dialog.c:284
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:300
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "Cop_iar localmente o conteÃdo da agenda para operaÃÃes desconectadas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:278
+#: ../calendar/gui/dialogs/calendar-setup.c:302
 msgid "Cop_y task list contents locally for offline operation"
 msgstr ""
 "Cop_iar localmente o conteÃdo da lista de tarefas para operaÃÃes "
 "desconectadas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:280
+#: ../calendar/gui/dialogs/calendar-setup.c:304
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr ""
 "Cop_iar conteÃdo da lista de memorandos localmente para operaÃÃes "
 "desconectadas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:352
+#: ../calendar/gui/dialogs/calendar-setup.c:350
+msgid "Sh_ow reminder notifications"
+msgstr "Exibir n_otificaÃÃes de lembrete"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:425
 msgid "Colo_r:"
 msgstr "Co_r:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:375
-#: ../calendar/gui/dialogs/calendar-setup.c:386
-#: ../calendar/gui/dialogs/calendar-setup.c:397
-#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:51
-#: ../modules/addressbook/addressbook-config.c:1010
-#: ../modules/calendar/e-calendar-preferences.ui.h:19
-#: ../plugins/itip-formatter/itip-formatter.c:2818
+#: ../calendar/gui/dialogs/calendar-setup.c:448
+#: ../calendar/gui/dialogs/calendar-setup.c:460
+#: ../calendar/gui/dialogs/calendar-setup.c:471
+#: ../mail/em-folder-properties.c:235 ../mail/mail-config.ui.h:52
+#: ../modules/addressbook/addressbook-config.c:1080
+#: ../modules/addressbook/autocompletion-config.c:228
+#: ../modules/calendar/e-calendar-preferences.ui.h:17
+#: ../plugins/itip-formatter/itip-formatter.c:3045
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "Geral"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:387
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 #: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Task List"
 msgstr "Lista de tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:398
+#: ../calendar/gui/dialogs/calendar-setup.c:472
 msgid "Memo List"
 msgstr "Lista de memorandos"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:483
+#: ../calendar/gui/dialogs/calendar-setup.c:564
 msgid "Calendar Properties"
 msgstr "Propriedades da agenda"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:483
+#: ../calendar/gui/dialogs/calendar-setup.c:564
 msgid "New Calendar"
 msgstr "Nova agenda"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:539
+#: ../calendar/gui/dialogs/calendar-setup.c:624
 msgid "Task List Properties"
 msgstr "Propriedades da lista de tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:539
+#: ../calendar/gui/dialogs/calendar-setup.c:624
 msgid "New Task List"
 msgstr "Nova lista de tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/dialogs/calendar-setup.c:684
 msgid "Memo List Properties"
 msgstr "Propriedades da lista de memorandos"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/dialogs/calendar-setup.c:684
 msgid "New Memo List"
 msgstr "Nova Lista de memorandos"
 
-#: ../calendar/gui/dialogs/changed-comp.c:59
+#: ../calendar/gui/dialogs/changed-comp.c:62
 msgid "This event has been deleted."
 msgstr "Este evento foi excluÃdo."
 
-#: ../calendar/gui/dialogs/changed-comp.c:63
+#: ../calendar/gui/dialogs/changed-comp.c:66
 msgid "This task has been deleted."
 msgstr "Esta tarefa foi excluÃda."
 
-#: ../calendar/gui/dialogs/changed-comp.c:67
+#: ../calendar/gui/dialogs/changed-comp.c:70
 msgid "This memo has been deleted."
 msgstr "Este memorando foi excluÃdo."
 
-#: ../calendar/gui/dialogs/changed-comp.c:76
+#: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Vocà fez alteraÃÃes. Esquecer estas alteraÃÃes e fechar o editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:78
+#: ../calendar/gui/dialogs/changed-comp.c:81
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Vocà nÃo fez alteraÃÃes, fechar o editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:83
+#: ../calendar/gui/dialogs/changed-comp.c:86
 msgid "This event has been changed."
 msgstr "Este evento foi alterado."
 
-#: ../calendar/gui/dialogs/changed-comp.c:87
+#: ../calendar/gui/dialogs/changed-comp.c:90
 msgid "This task has been changed."
 msgstr "Esta tarefa foi alterada."
 
-#: ../calendar/gui/dialogs/changed-comp.c:91
+#: ../calendar/gui/dialogs/changed-comp.c:94
 msgid "This memo has been changed."
 msgstr "Este memorando foi alterado."
 
-#: ../calendar/gui/dialogs/changed-comp.c:100
+#: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Vocà fez alteraÃÃes. Esquecer estas alteraÃÃes e atualizar o editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:102
+#: ../calendar/gui/dialogs/changed-comp.c:105
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Vocà nÃo fez alteraÃÃes, atualizar o editor?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:444
+#: ../calendar/gui/dialogs/comp-editor-page.c:461
 #, c-format
 msgid "Validation error: %s"
 msgstr "Erro de validaÃÃo: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:260
+#: ../calendar/gui/dialogs/comp-editor.c:273
 msgid "Could not save attachments"
 msgstr "NÃo foi possÃvel salvar os anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:535
+#: ../calendar/gui/dialogs/comp-editor.c:613
 msgid "Could not update object"
 msgstr "NÃo foi possÃvel atualizar objeto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:650
+#: ../calendar/gui/dialogs/comp-editor.c:741
 msgid "Edit Appointment"
 msgstr "Editar compromisso"
 
-#: ../calendar/gui/dialogs/comp-editor.c:657
+#: ../calendar/gui/dialogs/comp-editor.c:748
 #, c-format
 msgid "Meeting - %s"
 msgstr "ReuniÃo - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:659
+#: ../calendar/gui/dialogs/comp-editor.c:750
 #, c-format
 msgid "Appointment - %s"
 msgstr "Compromisso - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:665
+#: ../calendar/gui/dialogs/comp-editor.c:756
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tarefa atribuÃda - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:667
+#: ../calendar/gui/dialogs/comp-editor.c:758
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:672
+#: ../calendar/gui/dialogs/comp-editor.c:763
 #, c-format
 msgid "Memo - %s"
 msgstr "Memorandos - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:688
+#: ../calendar/gui/dialogs/comp-editor.c:779
 msgid "No Summary"
 msgstr "Sem resumo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:809
+#: ../calendar/gui/dialogs/comp-editor.c:900
 msgid "Keep original item?"
 msgstr "Manter o item original?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1005
-msgid "Click here to close the current window"
-msgstr "Clicar aqui para fechar a janela atual"
+#: ../calendar/gui/dialogs/comp-editor.c:1101
+msgid "Close the current window"
+msgstr "Fechar a janela atual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1012 ../mail/e-mail-browser.c:132
-#: ../shell/e-shell-window-actions.c:1433
-#: ../widgets/misc/e-focus-tracker.c:114 ../widgets/misc/e-focus-tracker.c:551
-#: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1061
+#: ../calendar/gui/dialogs/comp-editor.c:1108 ../mail/e-mail-browser.c:141
+#: ../shell/e-shell-window-actions.c:1455
+#: ../widgets/misc/e-focus-tracker.c:117 ../widgets/misc/e-focus-tracker.c:555
+#: ../widgets/misc/e-web-view.c:459 ../widgets/misc/e-web-view.c:1306
 msgid "Copy the selection"
 msgstr "Copia a seleÃÃo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1019 ../mail/e-mail-browser.c:139
-#: ../shell/e-shell-window-actions.c:1440
-#: ../widgets/misc/e-focus-tracker.c:107 ../widgets/misc/e-focus-tracker.c:546
-#: ../widgets/misc/e-web-view.c:1055
+#: ../calendar/gui/dialogs/comp-editor.c:1115 ../mail/e-mail-browser.c:148
+#: ../shell/e-shell-window-actions.c:1462
+#: ../widgets/misc/e-focus-tracker.c:110 ../widgets/misc/e-focus-tracker.c:550
+#: ../widgets/misc/e-web-view.c:1300
 msgid "Cut the selection"
 msgstr "Recorta a seleÃÃo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1026
-#: ../shell/e-shell-window-actions.c:1447
-#: ../widgets/misc/e-focus-tracker.c:128 ../widgets/misc/e-focus-tracker.c:561
+#: ../calendar/gui/dialogs/comp-editor.c:1122
+#: ../shell/e-shell-window-actions.c:1469
+#: ../widgets/misc/e-focus-tracker.c:131 ../widgets/misc/e-focus-tracker.c:565
 msgid "Delete the selection"
 msgstr "Apaga a seleÃÃo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1033
-msgid "Click here to view help available"
-msgstr "Clicar aqui para ver a ajuda disponÃvel"
+#: ../calendar/gui/dialogs/comp-editor.c:1129
+msgid "View help"
+msgstr "Ver a ajuda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1040 ../mail/e-mail-browser.c:146
-#: ../shell/e-shell-window-actions.c:1482
-#: ../widgets/misc/e-focus-tracker.c:121 ../widgets/misc/e-focus-tracker.c:556
-#: ../widgets/misc/e-web-view.c:1067
+#: ../calendar/gui/dialogs/comp-editor.c:1136 ../mail/e-mail-browser.c:155
+#: ../shell/e-shell-window-actions.c:1497
+#: ../widgets/misc/e-focus-tracker.c:124 ../widgets/misc/e-focus-tracker.c:560
+#: ../widgets/misc/e-web-view.c:1312
 msgid "Paste the clipboard"
 msgstr "Cola o conteÃdo da Ãrea de transferÃncia"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1061
-msgid "Click here to save the current window"
-msgstr "Clicar aqui para salvar a janela atual"
+#: ../calendar/gui/dialogs/comp-editor.c:1157
+msgid "Save current changes"
+msgstr "Salvar alteraÃÃes atuais"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1068 ../mail/e-mail-browser.c:153
-#: ../shell/e-shell-window-actions.c:1552
-#: ../widgets/misc/e-focus-tracker.c:135 ../widgets/misc/e-focus-tracker.c:566
+#: ../calendar/gui/dialogs/comp-editor.c:1164 ../mail/e-mail-browser.c:162
+#: ../shell/e-shell-window-actions.c:1574
+#: ../widgets/misc/e-focus-tracker.c:138 ../widgets/misc/e-focus-tracker.c:570
 msgid "Select all text"
 msgstr "Selecionar todo o texto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1075
+#: ../calendar/gui/dialogs/comp-editor.c:1171
 msgid "_Classification"
 msgstr "C_lassificaÃÃo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1082
+#: ../calendar/gui/dialogs/comp-editor.c:1178
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:167
+#: ../mail/e-mail-browser.c:176
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1580
+#: ../shell/e-shell-window-actions.c:1602
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1089 ../mail/e-mail-browser.c:160
-#: ../shell/e-shell-window-actions.c:1587
-#: ../widgets/misc/e-signature-editor.c:217
+#: ../calendar/gui/dialogs/comp-editor.c:1185 ../mail/e-mail-browser.c:169
+#: ../shell/e-shell-window-actions.c:1609
+#: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
 msgstr "_Arquivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1096
-#: ../shell/e-shell-window-actions.c:1594
+#: ../calendar/gui/dialogs/comp-editor.c:1192
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Help"
 msgstr "Aj_uda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1103
+#: ../calendar/gui/dialogs/comp-editor.c:1199
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1110
-#: ../composer/e-composer-actions.c:336
+#: ../calendar/gui/dialogs/comp-editor.c:1206
+#: ../composer/e-composer-actions.c:340
 msgid "_Options"
 msgstr "_OpÃÃes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117 ../mail/e-mail-browser.c:174
-#: ../shell/e-shell-window-actions.c:1629 ../smime/gui/smime-ui.ui.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1213 ../mail/e-mail-browser.c:183
+#: ../shell/e-shell-window-actions.c:1651 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "_Ver"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1127
-#: ../composer/e-composer-actions.c:285
+#: ../calendar/gui/dialogs/comp-editor.c:1223
+#: ../composer/e-composer-actions.c:289
 msgid "_Attachment..."
 msgstr "_Anexo..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
-msgid "Click here to attach a file"
-msgstr "Clicar aqui para anexar um arquivo"
+#: ../calendar/gui/dialogs/comp-editor.c:1225
+#: ../composer/e-composer-actions.c:291
+#: ../widgets/misc/e-attachment-view.c:439
+msgid "Attach a file"
+msgstr "Anexar um arquivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1137
+#: ../calendar/gui/dialogs/comp-editor.c:1233
 msgid "_Categories"
 msgstr "_Categorias"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1139
+#: ../calendar/gui/dialogs/comp-editor.c:1235
 msgid "Toggles whether to display categories"
 msgstr "Alterna a exibiÃÃo do campo de categorias"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1145
+#: ../calendar/gui/dialogs/comp-editor.c:1241
 msgid "Time _Zone"
 msgstr "F_uso horÃrio"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1147
+#: ../calendar/gui/dialogs/comp-editor.c:1243
 msgid "Toggles whether the time zone is displayed"
 msgstr "Alterna a exibiÃÃo do campo de fuso horÃrio"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1156
+#: ../calendar/gui/dialogs/comp-editor.c:1252
 msgid "Pu_blic"
 msgstr "PÃ_blico"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1158
+#: ../calendar/gui/dialogs/comp-editor.c:1254
 msgid "Classify as public"
 msgstr "Classificar como pÃblico"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1163
+#: ../calendar/gui/dialogs/comp-editor.c:1259
 msgid "_Private"
 msgstr "_Particular"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1165
+#: ../calendar/gui/dialogs/comp-editor.c:1261
 msgid "Classify as private"
 msgstr "Classificar como privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1170
+#: ../calendar/gui/dialogs/comp-editor.c:1266
 msgid "_Confidential"
 msgstr "_Confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1172
+#: ../calendar/gui/dialogs/comp-editor.c:1268
 msgid "Classify as confidential"
 msgstr "Classificar como confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1180
+#: ../calendar/gui/dialogs/comp-editor.c:1276
 msgid "R_ole Field"
 msgstr "Campo _papel"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1182
+#: ../calendar/gui/dialogs/comp-editor.c:1278
 msgid "Toggles whether the Role field is displayed"
 msgstr "Alterna a exibiÃÃo do campo papel"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1188
+#: ../calendar/gui/dialogs/comp-editor.c:1284
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1190
+#: ../calendar/gui/dialogs/comp-editor.c:1286
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Alterna a exibiÃÃo do campo RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1196
+#: ../calendar/gui/dialogs/comp-editor.c:1292
 msgid "_Status Field"
 msgstr "_Campo Status"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1198
+#: ../calendar/gui/dialogs/comp-editor.c:1294
 msgid "Toggles whether the Status field is displayed"
 msgstr "Alterna a exibiÃÃo do campo Status"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1204
+#: ../calendar/gui/dialogs/comp-editor.c:1300
 msgid "_Type Field"
 msgstr "Campo _tipo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1206
+#: ../calendar/gui/dialogs/comp-editor.c:1302
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Alterna a exibiÃÃo do campo de tipo de participante"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1230
-#: ../composer/e-composer-private.c:73
+#: ../calendar/gui/dialogs/comp-editor.c:1326
+#: ../composer/e-composer-private.c:77
 msgid "Recent _Documents"
 msgstr "_Documentos recentes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1935
-#: ../composer/e-composer-actions.c:504
+#: ../calendar/gui/dialogs/comp-editor.c:2059
+#: ../composer/e-composer-actions.c:508
 msgid "Attach"
 msgstr "Anexar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2264
-#: ../calendar/gui/dialogs/comp-editor.c:2427
-#: ../calendar/gui/dialogs/comp-editor.c:3402
+#: ../calendar/gui/dialogs/comp-editor.c:2397
+#: ../calendar/gui/dialogs/comp-editor.c:2560
+#: ../calendar/gui/dialogs/comp-editor.c:3549
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "As alteraÃÃes feitas a este item poderÃo ser descartadas se houver uma "
 "atualizaÃÃo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3366
-#: ../plugins/prefer-plain/prefer-plain.c:64
+#: ../calendar/gui/dialogs/comp-editor.c:3513
+#: ../plugins/prefer-plain/prefer-plain.c:67
 msgid "attachment"
 msgstr "anexo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3434
+#: ../calendar/gui/dialogs/comp-editor.c:3581
 msgid "Unable to use current version!"
 msgstr "NÃo foi possÃvel usar a versÃo atual!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:92
-msgid "Could not open source"
-msgstr "NÃo foi possÃvel abrir a fonte"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:100
+#: ../calendar/gui/dialogs/copy-source-dialog.c:114
 msgid "Could not open destination"
 msgstr "NÃo foi possÃvel abrir o destino"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:109
+#: ../calendar/gui/dialogs/copy-source-dialog.c:130
 msgid "Destination is read only"
 msgstr "Destino à apenas para leitura"
 
-#: ../calendar/gui/dialogs/delete-comp.c:210
+#: ../calendar/gui/dialogs/copy-source-dialog.c:164
+msgid "Cannot create object"
+msgstr "NÃo à possÃvel criar objeto"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:193
+msgid "Could not open source"
+msgstr "NÃo foi possÃvel abrir a fonte"
+
+#: ../calendar/gui/dialogs/delete-comp.c:214
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 "_Excluir esse item nas caixas de correio de todos os outros destinatÃrios?"
 
-#: ../calendar/gui/dialogs/delete-comp.c:213
+#: ../calendar/gui/dialogs/delete-comp.c:217
 msgid "_Retract comment"
 msgstr "_Retratar comentÃrio:"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:56
+#: ../calendar/gui/dialogs/delete-error.c:57
 #, c-format
 msgid "The event could not be deleted due to a dbus error: %s"
 msgstr "O evento nÃo pÃde ser excluÃdo devido a um erro do dbus: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:61
 #, c-format
 msgid "The task could not be deleted due to a dbus error: %s"
 msgstr "A tarefa nÃo pÃde ser excluÃda devido a um erro do dbus: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:64
+#: ../calendar/gui/dialogs/delete-error.c:65
 #, c-format
 msgid "The memo could not be deleted due to a dbus error: %s"
 msgstr "O memorando nÃo pÃde ser excluÃdo devido a um erro do dbus: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:68
+#: ../calendar/gui/dialogs/delete-error.c:69
 #, c-format
 msgid "The item could not be deleted due to a dbus error: %s"
 msgstr "O item nÃo pÃde ser excluÃdo devido a um erro do dbus: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:75
+#: ../calendar/gui/dialogs/delete-error.c:76
 msgid "The event could not be deleted because permission was denied"
 msgstr "O evento nÃo pÃde ser excluÃdo porque a permissÃo foi negada"
 
-#: ../calendar/gui/dialogs/delete-error.c:78
+#: ../calendar/gui/dialogs/delete-error.c:79
 msgid "The task could not be deleted because permission was denied"
 msgstr "A tarefa nÃo pÃde ser excluÃda porque a permissÃo foi negada"
 
-#: ../calendar/gui/dialogs/delete-error.c:81
+#: ../calendar/gui/dialogs/delete-error.c:82
 msgid "The memo could not be deleted because permission was denied"
 msgstr "O memorando nÃo pÃde ser excluÃdo porque a permissÃo foi negada"
 
-#: ../calendar/gui/dialogs/delete-error.c:84
+#: ../calendar/gui/dialogs/delete-error.c:85
 msgid "The item could not be deleted because permission was denied"
 msgstr "O item nÃo pÃde ser excluÃdo porque a permissÃo foi negada"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:93
 #, c-format
 msgid "The event could not be deleted due to an error: %s"
 msgstr "O evento nÃo pÃde ser excluÃdo devido a um erro: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:96
+#: ../calendar/gui/dialogs/delete-error.c:97
 #, c-format
 msgid "The task could not be deleted due to an error: %s"
 msgstr "A tarefa nÃo pÃde ser excluÃda devido a um erro: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:100
+#: ../calendar/gui/dialogs/delete-error.c:101
 #, c-format
 msgid "The memo could not be deleted due to an error: %s"
 msgstr "O memorando nÃo pÃde ser excluÃdo devido a um erro: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:104
+#: ../calendar/gui/dialogs/delete-error.c:105
 #, c-format
 msgid "The item could not be deleted due to an error: %s"
 msgstr "O item nÃo pÃde ser excluÃdo devido a um erro: %s"
@@ -2873,12 +2913,12 @@ msgid "Enter Delegate"
 msgstr "Informar representante"
 
 #: ../calendar/gui/dialogs/event-editor.c:212
-msgid "_Alarms"
-msgstr "Alarmes"
+msgid "_Reminders"
+msgstr "Lemb_retes"
 
 #: ../calendar/gui/dialogs/event-editor.c:214
-msgid "Click here to set or unset alarms for this event"
-msgstr "Clicar aqui para ativar ou desativar alarmes para este evento"
+msgid "Set or unset reminders for this event"
+msgstr "Definir ou remover lembretes para este evento"
 
 #: ../calendar/gui/dialogs/event-editor.c:222
 msgid "Show Time as _Busy"
@@ -2897,14 +2937,12 @@ msgid "Make this a recurring event"
 msgstr "Tornar este evento recorrente"
 
 #: ../calendar/gui/dialogs/event-editor.c:240
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:212
 #: ../widgets/misc/e-send-options.ui.h:22
 msgid "Send Options"
 msgstr "OpÃÃes de envio"
 
 #: ../calendar/gui/dialogs/event-editor.c:242
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/task-editor.c:128
 msgid "Insert advanced send options"
 msgstr "Insira opÃÃes avanÃadas de envio"
 
@@ -2924,182 +2962,176 @@ msgstr "Disponibilidade"
 msgid "Query free / busy information for the attendees"
 msgstr "Pedir informaÃÃo de disponibilidade para os representantes"
 
-#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3172
+#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3310
 msgid "Appointment"
 msgstr "Compromisso"
 
 #: ../calendar/gui/dialogs/event-editor.c:384
-#: ../calendar/gui/dialogs/event-page.ui.h:3
-#: ../calendar/gui/e-meeting-list-view.c:148
+#: ../calendar/gui/dialogs/event-page.ui.h:2
+#: ../calendar/gui/e-meeting-list-view.c:161
 msgid "Attendees"
 msgstr "Participantes"
 
-#: ../calendar/gui/dialogs/event-editor.c:581
+#: ../calendar/gui/dialogs/event-editor.c:582
 msgid "Print this event"
 msgstr "Imprime este evento"
 
-#: ../calendar/gui/dialogs/event-page.c:764
+#: ../calendar/gui/dialogs/event-page.c:558
 msgid "Event's start time is in the past"
 msgstr "A hora de inÃcio do evento està no passado"
 
-#: ../calendar/gui/dialogs/event-page.c:805
+#: ../calendar/gui/dialogs/event-page.c:635
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr ""
 "O evento nÃo pode ser editado porque o calendÃrio selecionado à somente para "
 "leitura"
 
-#: ../calendar/gui/dialogs/event-page.c:809
+#: ../calendar/gui/dialogs/event-page.c:639
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr ""
 "O evento nÃo pode ser completamente editado porque vocà nÃo à o organizador"
 
 # ConsistÃncia com outras traduÃÃes "This even has..."
-#: ../calendar/gui/dialogs/event-page.c:821
-#: ../calendar/gui/dialogs/event-page.c:2779
-msgid "This event has alarms"
-msgstr "Este evento tem alarmes."
+#: ../calendar/gui/dialogs/event-page.c:651
+#: ../calendar/gui/dialogs/event-page.c:3080
+msgid "This event has reminders"
+msgstr "Este evento tem lembretes"
 
-#: ../calendar/gui/dialogs/event-page.c:888
-#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/event-page.c:718
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganizador:"
 
-#: ../calendar/gui/dialogs/event-page.c:935
-msgid "_Delegatees"
-msgstr "_Representantes"
-
-#: ../calendar/gui/dialogs/event-page.c:937
-msgid "Atte_ndees"
-msgstr "Participa_ntes"
-
-#: ../calendar/gui/dialogs/event-page.c:1154
+#: ../calendar/gui/dialogs/event-page.c:1263
 msgid "Event with no start date"
 msgstr "Evento sem data de inÃcio"
 
-#: ../calendar/gui/dialogs/event-page.c:1157
+#: ../calendar/gui/dialogs/event-page.c:1266
 msgid "Event with no end date"
 msgstr "Evento sem data de tÃrmino"
 
-#: ../calendar/gui/dialogs/event-page.c:1328
-#: ../calendar/gui/dialogs/memo-page.c:670
-#: ../calendar/gui/dialogs/task-page.c:904
+#: ../calendar/gui/dialogs/event-page.c:1439
+#: ../calendar/gui/dialogs/memo-page.c:708
+#: ../calendar/gui/dialogs/task-page.c:819
 msgid "Start date is wrong"
 msgstr "A data de inÃcio està errada"
 
-#: ../calendar/gui/dialogs/event-page.c:1338
+#: ../calendar/gui/dialogs/event-page.c:1449
 msgid "End date is wrong"
 msgstr "A data de tÃrmino està errada"
 
-#: ../calendar/gui/dialogs/event-page.c:1361
+#: ../calendar/gui/dialogs/event-page.c:1472
 msgid "Start time is wrong"
 msgstr "A hora de inÃcio està errada"
 
-#: ../calendar/gui/dialogs/event-page.c:1368
+#: ../calendar/gui/dialogs/event-page.c:1479
 msgid "End time is wrong"
 msgstr "A hora de tÃrmino està errada"
 
-#: ../calendar/gui/dialogs/event-page.c:1532
-#: ../calendar/gui/dialogs/memo-page.c:711
-#: ../calendar/gui/dialogs/task-page.c:966
-msgid "The organizer selected no longer has an account."
-msgstr "O organizador selecionado nÃo possui mais uma conta."
-
-#: ../calendar/gui/dialogs/event-page.c:1538
-#: ../calendar/gui/dialogs/memo-page.c:717
-#: ../calendar/gui/dialogs/task-page.c:972
+#: ../calendar/gui/dialogs/event-page.c:1644
+#: ../calendar/gui/dialogs/memo-page.c:749
+#: ../calendar/gui/dialogs/task-page.c:873
 msgid "An organizer is required."
 msgstr "Ã necessÃrio um organizador."
 
-#: ../calendar/gui/dialogs/event-page.c:1563
-#: ../calendar/gui/dialogs/task-page.c:996
+#: ../calendar/gui/dialogs/event-page.c:1678
+#: ../calendar/gui/dialogs/task-page.c:907
 msgid "At least one attendee is required."
 msgstr "Ã necessÃrio pelo menos um participante."
 
-#: ../calendar/gui/dialogs/event-page.c:2653
+#: ../calendar/gui/dialogs/event-page.c:1885
+msgid "_Delegatees"
+msgstr "_Representantes"
+
+#: ../calendar/gui/dialogs/event-page.c:1887
+msgid "Atte_ndees"
+msgstr "Participa_ntes"
+
+#: ../calendar/gui/dialogs/event-page.c:2921
 #, c-format
-msgid "Unable to open the calendar '%s'."
-msgstr "NÃo à possÃvel abrir a agenda \"%s\"."
+msgid "Unable to open the calendar '%s': %s"
+msgstr "NÃo à possÃvel abrir o calendÃrio \"%s\": %s"
 
 #. Translators: This string is used when we are creating an Event
-#. (meeting or appointment)  on behalf of some other user
+#. * (meeting or appointment)  on behalf of some other user
 #. Translators: This string is used when we are creating a Memo
-#. on behalf of some other user
+#. * on behalf of some other user
 #. Translators: This string is used when we are creating a Task
-#. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2697
-#: ../calendar/gui/dialogs/memo-page.c:930
-#: ../calendar/gui/dialogs/task-page.c:1786
+#. * on behalf of some other user
+#: ../calendar/gui/dialogs/event-page.c:2998
+#: ../calendar/gui/dialogs/memo-page.c:1012
+#: ../calendar/gui/dialogs/task-page.c:1838
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Vocà esta atuando em nome de %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3008
+#: ../calendar/gui/dialogs/event-page.c:3325
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dia para o compromisso"
 msgstr[1] "%d dias para o compromisso"
 
-#: ../calendar/gui/dialogs/event-page.c:3014
+#: ../calendar/gui/dialogs/event-page.c:3331
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hora para o compromisso"
 msgstr[1] "%d horas para o compromisso"
 
-#: ../calendar/gui/dialogs/event-page.c:3020
+#: ../calendar/gui/dialogs/event-page.c:3337
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuto para o compromisso"
 msgstr[1] "%d minutos para o compromisso"
 
-#: ../calendar/gui/dialogs/event-page.c:3039
+#: ../calendar/gui/dialogs/event-page.c:3356
 msgid "Customize"
 msgstr "Personalizar"
 
-#. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:3045
-msgctxt "cal-alarms"
+#. Translators: "None" for "No reminder set"
+#: ../calendar/gui/dialogs/event-page.c:3362
+msgctxt "cal-reminders"
 msgid "None"
 msgstr "Nenhum"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:2
+#: ../calendar/gui/dialogs/event-page.ui.h:1
 #: ../calendar/gui/dialogs/task-page.ui.h:1
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:564
 msgid "Atte_ndees..."
 msgstr "Participa_ntes..."
 
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-msgid "Custom Alarm:"
-msgstr "Som de alarme personalizado"
+#: ../calendar/gui/dialogs/event-page.ui.h:5
+msgid "Custom Reminder:"
+msgstr "Lembrete personalizado:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 msgid "Event Description"
 msgstr "DescriÃÃo do evento"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:9
-#: ../modules/calendar/e-calendar-preferences.ui.h:44
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Time _zone:"
 msgstr "F_uso horÃrio:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:10
-msgid "_Alarm"
-msgstr "_Alarme"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../widgets/misc/e-attachment-dialog.c:342
+#: ../widgets/misc/e-attachment-dialog.c:347
 msgid "_Description:"
 msgstr "_DescriÃÃo:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:13
-#: ../plugins/calendar-weather/calendar-weather.c:362
+#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../plugins/calendar-weather/calendar-weather.c:381
 msgid "_Location:"
 msgstr "_Local:"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:13
+msgid "_Reminder"
+msgstr "_Lembrete"
+
 #: ../calendar/gui/dialogs/event-page.ui.h:14
 msgid "_Summary:"
 msgstr "Re_sumo:"
@@ -3108,19 +3140,19 @@ msgstr "Re_sumo:"
 msgid "_Time:"
 msgstr "_Hora:"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:17
 msgctxt "eventpage"
 msgid "1 day before appointment"
 msgstr "1 dia antes do compromisso"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:19
 msgctxt "eventpage"
 msgid "1 hour before appointment"
 msgstr "1 hora antes do compromisso"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:21
 msgctxt "eventpage"
 msgid "15 minutes before appointment"
@@ -3138,39 +3170,96 @@ msgctxt "eventpage"
 msgid "until"
 msgstr "atÃ"
 
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3176
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:1
+msgid "April"
+msgstr "Abril"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:2
+msgid "August"
+msgstr "Agosto"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:3
+msgid "December"
+msgstr "Dezembro"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:4
+msgid "February"
+msgstr "Fevereiro"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:5
+msgid "January"
+msgstr "Janeiro"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:6
+msgid "July"
+msgstr "Julho"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
+msgid "June"
+msgstr "Junho"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:8
+msgid "March"
+msgstr "MarÃo"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:9
+msgid "May"
+msgstr "Maio"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:10
+msgid "November"
+msgstr "Novembro"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
+msgid "October"
+msgstr "Outubro"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:12
+msgid "Select Date"
+msgstr "Selecionar data"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
+#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+msgid "Select _Today"
+msgstr "Selecionar _hoje"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
+msgid "September"
+msgstr "Setembro"
+
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3314
 msgid "Memo"
 msgstr "Memorando"
 
-#: ../calendar/gui/dialogs/memo-editor.c:155
+#: ../calendar/gui/dialogs/memo-editor.c:156
 msgid "Print this memo"
 msgstr "Imprime este memorando"
 
-#: ../calendar/gui/dialogs/memo-page.c:336
+#: ../calendar/gui/dialogs/memo-page.c:405
 msgid "Memo's start date is in the past"
 msgstr "A data de inÃcio do memorando està no passado"
 
-#: ../calendar/gui/dialogs/memo-page.c:374
+#: ../calendar/gui/dialogs/memo-page.c:442
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr ""
 "O memorando nÃo pode ser editado porque a lista de memorandos selecionada à "
 "somente para leitura"
 
-#: ../calendar/gui/dialogs/memo-page.c:378
+#: ../calendar/gui/dialogs/memo-page.c:446
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr ""
 "O memorando nÃo poder ser completamente editado porque vocà nÃo à o "
 "organizador"
 
-#: ../calendar/gui/dialogs/memo-page.c:891
+#: ../calendar/gui/dialogs/memo-page.c:936
 #, c-format
-msgid "Unable to open memos in '%s'."
-msgstr "NÃo à possÃvel abrir memorandos em \"%s\"."
+msgid "Unable to open memos in '%s': %s"
+msgstr "NÃo à possÃvel abrir memorandos em \"%s\":% s"
 
-#: ../calendar/gui/dialogs/memo-page.c:1062 ../em-format/em-format-quote.c:283
-#: ../em-format/em-format.c:1048 ../mail/em-format-html.c:2395
-#: ../mail/em-format-html.c:2460 ../mail/em-format-html.c:2484
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:72
+#: ../calendar/gui/dialogs/memo-page.c:1144 ../em-format/em-format-quote.c:319
+#: ../em-format/em-format.c:1062 ../mail/em-format-html.c:2592
+#: ../mail/em-format-html.c:2657 ../mail/em-format-html.c:2681
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
 msgstr "Para"
 
@@ -3189,65 +3278,65 @@ msgid "T_o:"
 msgstr "_Para:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:421
+#: ../calendar/gui/dialogs/task-page.c:333
 #: ../calendar/gui/dialogs/task-page.ui.h:9
-msgid "_Group:"
-msgstr "_Grupo:"
+msgid "_List:"
+msgstr "_Lista:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:55
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr ""
 "Vocà està modificando um evento recorrente. O que vocà deseja modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:56
+#: ../calendar/gui/dialogs/recur-comp.c:57
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Vocà està delegando um evento recorrente. O que vocà deseja delegar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:60
+#: ../calendar/gui/dialogs/recur-comp.c:61
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr ""
 "Vocà està modificando uma tarefa recorrente. O que vocà deseja modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:64
+#: ../calendar/gui/dialogs/recur-comp.c:65
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr ""
 "Vocà està modificando um evento recorrente. O que vocà deseja modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:90
+#: ../calendar/gui/dialogs/recur-comp.c:91
 msgid "This Instance Only"
 msgstr "Apenas esta instÃncia"
 
-#: ../calendar/gui/dialogs/recur-comp.c:94
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Prior Instances"
 msgstr "Esta instÃncia e as anteriores"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:101
 msgid "This and Future Instances"
 msgstr "Esta instÃncia e as prÃximas"
 
-#: ../calendar/gui/dialogs/recur-comp.c:105
+#: ../calendar/gui/dialogs/recur-comp.c:106
 msgid "All Instances"
 msgstr "Todas as instÃncias"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:562
+#: ../calendar/gui/dialogs/recurrence-page.c:575
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Este compromisso possui recorrÃncias que o Evolution nÃo pode editar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:894
+#: ../calendar/gui/dialogs/recurrence-page.c:964
 msgid "Recurrence date is invalid"
 msgstr "A data da recorrÃncia à invÃlida"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:934
+#: ../calendar/gui/dialogs/recurrence-page.c:1004
 msgid "End time of the recurrence was before event's start"
 msgstr "O perÃodo final da recorrÃncia acontece antes do inÃcio do evento"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:964
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "on"
 msgstr "no"
 
@@ -3255,7 +3344,7 @@ msgstr "no"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1022
+#: ../calendar/gui/dialogs/recurrence-page.c:1097
 msgid "first"
 msgstr "primeiro"
 
@@ -3264,7 +3353,7 @@ msgstr "primeiro"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1028
+#: ../calendar/gui/dialogs/recurrence-page.c:1103
 msgid "second"
 msgstr "segundo"
 
@@ -3272,7 +3361,7 @@ msgstr "segundo"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1033
+#: ../calendar/gui/dialogs/recurrence-page.c:1108
 msgid "third"
 msgstr "terceiro"
 
@@ -3280,7 +3369,7 @@ msgstr "terceiro"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1038
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 msgid "fourth"
 msgstr "quarto"
 
@@ -3288,7 +3377,7 @@ msgstr "quarto"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 msgid "fifth"
 msgstr "quinto(a)"
 
@@ -3296,13 +3385,13 @@ msgstr "quinto(a)"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/dialogs/recurrence-page.c:1123
 msgid "last"
 msgstr "Ãltimo"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1072
+#: ../calendar/gui/dialogs/recurrence-page.c:1147
 msgid "Other Date"
 msgstr "Outra data"
 
@@ -3310,7 +3399,7 @@ msgstr "Outra data"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1078
+#: ../calendar/gui/dialogs/recurrence-page.c:1153
 msgid "1st to 10th"
 msgstr "1Â ao 10Â"
 
@@ -3318,7 +3407,7 @@ msgstr "1Â ao 10Â"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1159
 msgid "11th to 20th"
 msgstr "11Â ao 20Â"
 
@@ -3326,48 +3415,41 @@ msgstr "11Â ao 20Â"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
+#: ../calendar/gui/dialogs/recurrence-page.c:1165
 msgid "21st to 31st"
 msgstr "21Â ao 31Â"
 
-#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
-#. (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
-#. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
-msgid "day"
-msgstr "dia"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../modules/calendar/e-calendar-preferences.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1191
+#: ../modules/calendar/e-calendar-preferences.ui.h:20
 msgid "Monday"
 msgstr "Segunda-feira"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
+#: ../calendar/gui/dialogs/recurrence-page.c:1192
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
 msgid "Tuesday"
 msgstr "TerÃa-feira"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../modules/calendar/e-calendar-preferences.ui.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1193
+#: ../modules/calendar/e-calendar-preferences.ui.h:49
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
-#: ../modules/calendar/e-calendar-preferences.ui.h:42
+#: ../calendar/gui/dialogs/recurrence-page.c:1194
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Thursday"
 msgstr "Quinta-feira"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
-#: ../modules/calendar/e-calendar-preferences.ui.h:18
+#: ../calendar/gui/dialogs/recurrence-page.c:1195
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
 msgid "Friday"
 msgstr "Sexta-feira"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
+#: ../calendar/gui/dialogs/recurrence-page.c:1196
 #: ../modules/calendar/e-calendar-preferences.ui.h:26
 msgid "Saturday"
 msgstr "SÃbado"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
+#: ../calendar/gui/dialogs/recurrence-page.c:1197
 #: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "Sunday"
 msgstr "Domingo"
@@ -3375,31 +3457,31 @@ msgstr "Domingo"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1244
+#: ../calendar/gui/dialogs/recurrence-page.c:1321
 msgid "on the"
 msgstr "no"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1418
+#: ../calendar/gui/dialogs/recurrence-page.c:1496
 msgid "occurrences"
 msgstr "ocorrÃncias"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2122
+#: ../calendar/gui/dialogs/recurrence-page.c:2214
 msgid "Add exception"
 msgstr "Adicionar exceÃÃo"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2163
+#: ../calendar/gui/dialogs/recurrence-page.c:2255
 msgid "Could not get a selection to modify."
 msgstr "nÃo foi possÃvel selecionar para modificar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2169
+#: ../calendar/gui/dialogs/recurrence-page.c:2261
 msgid "Modify exception"
 msgstr "Modificar exceÃÃo"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2213
+#: ../calendar/gui/dialogs/recurrence-page.c:2305
 msgid "Could not get a selection to delete."
 msgstr "NÃo foi possÃvel obter seleÃÃo para exclusÃo."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2347
+#: ../calendar/gui/dialogs/recurrence-page.c:2439
 msgid "Date/Time"
 msgstr "Data/Hora"
 
@@ -3411,7 +3493,7 @@ msgstr "A cada"
 msgid "Exceptions"
 msgstr "ExceÃÃes"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:79
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:82
 msgid "Preview"
 msgstr "PrÃ-visualizar"
 
@@ -3461,30 +3543,30 @@ msgctxt "recurrpage"
 msgid "year(s)"
 msgstr "ano(s)"
 
-#: ../calendar/gui/dialogs/send-comp.c:192
-msgid "Send my alarms with this event"
-msgstr "Enviar meus alarmes com este evento"
+#: ../calendar/gui/dialogs/send-comp.c:198
+msgid "Send my reminders with this event"
+msgstr "Enviar meus lembretes com este evento"
 
-#: ../calendar/gui/dialogs/send-comp.c:194
+#: ../calendar/gui/dialogs/send-comp.c:200
 msgid "Notify new attendees _only"
 msgstr "Notificar s_omente os novos participantes"
 
-#: ../calendar/gui/dialogs/task-details-page.c:352
-#: ../calendar/gui/dialogs/task-details-page.c:374
+#: ../calendar/gui/dialogs/task-details-page.c:351
+#: ../calendar/gui/dialogs/task-details-page.c:373
 msgid "Completed date is wrong"
 msgstr "A data de conclusÃo està errada"
 
-#: ../calendar/gui/dialogs/task-details-page.c:485
+#: ../calendar/gui/dialogs/task-details-page.c:488
 msgid "Web Page"
 msgstr "PÃgina da Web"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:294
-#: ../calendar/gui/e-cal-model-tasks.c:438
-#: ../calendar/gui/e-cal-model-tasks.c:712 ../calendar/gui/e-task-table.c:210
-#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:596
-#: ../calendar/gui/print.c:3262 ../mail/em-sync-stream.c:152
+#: ../calendar/gui/e-cal-component-preview.c:300
+#: ../calendar/gui/e-cal-model-tasks.c:440
+#: ../calendar/gui/e-cal-model-tasks.c:725 ../calendar/gui/e-task-table.c:219
+#: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:606
+#: ../calendar/gui/print.c:3400 ../mail/em-sync-stream.c:152
 #: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
@@ -3492,59 +3574,59 @@ msgstr "Cancelado"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:291
-#: ../calendar/gui/e-cal-model-tasks.c:436
-#: ../calendar/gui/e-cal-model-tasks.c:710
-#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
-#: ../calendar/gui/e-task-table.c:208 ../calendar/gui/e-task-table.c:223
-#: ../calendar/gui/e-task-table.c:595 ../calendar/gui/print.c:3259
-#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:367
+#: ../calendar/gui/e-cal-component-preview.c:297
+#: ../calendar/gui/e-cal-model-tasks.c:438
+#: ../calendar/gui/e-cal-model-tasks.c:723
+#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
+#: ../calendar/gui/e-task-table.c:217 ../calendar/gui/e-task-table.c:232
+#: ../calendar/gui/e-task-table.c:605 ../calendar/gui/print.c:3397
+#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:387
 msgid "Completed"
 msgstr "ConcluÃda"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:313
-#: ../calendar/gui/e-task-table.c:516 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1228 ../widgets/misc/e-send-options.ui.h:13
+#: ../calendar/gui/e-cal-component-preview.c:319
+#: ../calendar/gui/e-task-table.c:526 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1274 ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "Alta"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:288
-#: ../calendar/gui/e-cal-model-tasks.c:434
-#: ../calendar/gui/e-cal-model-tasks.c:708
-#: ../calendar/gui/e-cal-model-tasks.c:785 ../calendar/gui/e-task-table.c:206
-#: ../calendar/gui/e-task-table.c:221 ../calendar/gui/e-task-table.c:594
-#: ../calendar/gui/print.c:3256
+#: ../calendar/gui/e-cal-component-preview.c:294
+#: ../calendar/gui/e-cal-model-tasks.c:436
+#: ../calendar/gui/e-cal-model-tasks.c:721
+#: ../calendar/gui/e-cal-model-tasks.c:799 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:604
+#: ../calendar/gui/print.c:3394
 msgid "In Progress"
 msgstr "Em progresso"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:317
-#: ../calendar/gui/e-task-table.c:518 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1226 ../widgets/misc/e-send-options.ui.h:14
+#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-task-table.c:528 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1272 ../widgets/misc/e-send-options.ui.h:14
 msgid "Low"
 msgstr "Baixa"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:315
-#: ../calendar/gui/e-cal-model.c:1517 ../calendar/gui/e-task-table.c:517
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1227
+#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-cal-model.c:1578 ../calendar/gui/e-task-table.c:527
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1273
 #: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
 msgstr "Normal"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:298
-#: ../calendar/gui/e-cal-model-tasks.c:432
-#: ../calendar/gui/e-cal-model-tasks.c:706 ../calendar/gui/e-task-table.c:204
-#: ../calendar/gui/e-task-table.c:219 ../calendar/gui/e-task-table.c:593
-#: ../calendar/gui/print.c:3253 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-component-preview.c:304
+#: ../calendar/gui/e-cal-model-tasks.c:434
+#: ../calendar/gui/e-cal-model-tasks.c:719 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:603
+#: ../calendar/gui/print.c:3391 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "NÃo iniciada"
 
@@ -3557,11 +3639,11 @@ msgid "Stat_us:"
 msgstr "_Estado:"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
-#. Status: Accepted: X   Declined: Y   ...
+#. * Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1829
-#: ../calendar/gui/e-meeting-list-view.c:596
+#: ../calendar/gui/e-calendar-view.c:1854
+#: ../calendar/gui/e-meeting-list-view.c:635
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
@@ -3570,7 +3652,7 @@ msgstr "Status"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:519 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:529 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:27
 msgid "Undefined"
 msgstr "Indefinida"
@@ -3588,65 +3670,64 @@ msgstr "_Prioridade:"
 msgid "_Web Page:"
 msgstr "PÃgina da _Web:"
 
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:116
 msgid "_Status Details"
 msgstr "Detalhes do _status"
 
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../calendar/gui/dialogs/task-editor.c:118
 msgid "Click to change or view the status details of the task"
 msgstr "Clique para alterar ou ver os detalhes de status da tarefa"
 
-#: ../calendar/gui/dialogs/task-editor.c:122
-#: ../plugins/groupwise-features/mail-send-options.c:200
+#: ../calendar/gui/dialogs/task-editor.c:126
 msgid "_Send Options"
 msgstr "OpÃÃes de _envio"
 
-#: ../calendar/gui/dialogs/task-editor.c:327 ../calendar/gui/print.c:3174
-#: ../widgets/misc/e-send-options.c:526
+#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3312
+#: ../widgets/misc/e-send-options.c:535
 msgid "Task"
 msgstr "Tarefa"
 
-#: ../calendar/gui/dialogs/task-editor.c:330
+#: ../calendar/gui/dialogs/task-editor.c:324
 msgid "Task Details"
 msgstr "Detalhes da tarefa"
 
-#: ../calendar/gui/dialogs/task-editor.c:372
+#: ../calendar/gui/dialogs/task-editor.c:366
 msgid "Print this task"
 msgstr "Imprime a esta tarefa"
 
-#: ../calendar/gui/dialogs/task-page.c:338
+#: ../calendar/gui/dialogs/task-page.c:251
 msgid "Task's start date is in the past"
 msgstr "A data de inÃcio da tarefa està no passado"
 
-#: ../calendar/gui/dialogs/task-page.c:339
+#: ../calendar/gui/dialogs/task-page.c:252
 msgid "Task's due date is in the past"
 msgstr "A data de conclusÃo da tarefa està no passado"
 
-#: ../calendar/gui/dialogs/task-page.c:374
+#: ../calendar/gui/dialogs/task-page.c:286
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr ""
 "A tarefa nÃo pode ser editada porque a lista de tarefas selecionada à "
 "somente para leitura"
 
-#: ../calendar/gui/dialogs/task-page.c:378
+#: ../calendar/gui/dialogs/task-page.c:290
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr ""
 "Esta tarefa nÃo pode ser completamente editada porque vocà nÃo à o "
 "organizador"
 
-#: ../calendar/gui/dialogs/task-page.c:429
+#: ../calendar/gui/dialogs/task-page.c:341
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "Organi_zador:"
 
-#: ../calendar/gui/dialogs/task-page.c:877
+#: ../calendar/gui/dialogs/task-page.c:801
 msgid "Due date is wrong"
 msgstr "O prazo de conclusÃo està errado"
 
-#: ../calendar/gui/dialogs/task-page.c:1743
+#: ../calendar/gui/dialogs/task-page.c:1757
 #, c-format
-msgid "Unable to open tasks in '%s'."
-msgstr "NÃo à possÃvel abrir tarefas em \"%s\"."
+msgid "Unable to open tasks in '%s': %s"
+msgstr "NÃo à possÃvel abrir tarefas em \"%s\": %s"
 
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
@@ -3661,7 +3742,7 @@ msgid "Time zone:"
 msgstr "Fuso horÃrio:"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:381
+#: ../calendar/gui/e-alarm-list.c:393
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -3669,116 +3750,116 @@ msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:387
+#: ../calendar/gui/e-alarm-list.c:399
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: ../calendar/gui/e-alarm-list.c:449
+#: ../calendar/gui/e-alarm-list.c:461
 msgid "Unknown action to be performed"
 msgstr "AÃÃo desconhecida a ser executada"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:463
+#: ../calendar/gui/e-alarm-list.c:475
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s antes do inÃcio do compromisso"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:468
+#: ../calendar/gui/e-alarm-list.c:480
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s apÃs o inÃcio do compromisso"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:475
+#: ../calendar/gui/e-alarm-list.c:487
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s no inÃcio do compromisso"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:486
+#: ../calendar/gui/e-alarm-list.c:498
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s antes do tÃrmino do compromisso"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:491
+#: ../calendar/gui/e-alarm-list.c:503
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s apÃs o tÃrmino do compromisso"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:498
+#: ../calendar/gui/e-alarm-list.c:510
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s no tÃrmino do compromisso"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:522
+#: ../calendar/gui/e-alarm-list.c:534
 #, c-format
 msgid "%s at %s"
 msgstr "%s em %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:530
+#: ../calendar/gui/e-alarm-list.c:542
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s para um tipo de gatilho desconhecido"
 
-#: ../calendar/gui/e-cal-component-preview.c:188 ../filter/e-filter-rule.c:667
+#: ../calendar/gui/e-cal-component-preview.c:194 ../filter/e-filter-rule.c:671
 msgid "Untitled"
 msgstr "Sem tÃtulo"
 
-#: ../calendar/gui/e-cal-component-preview.c:194
+#: ../calendar/gui/e-cal-component-preview.c:200
 msgid "Categories:"
 msgstr "Categorias:"
 
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Summary:"
 msgstr "Resumo:"
 
-#: ../calendar/gui/e-cal-component-preview.c:243
-#: ../calendar/gui/e-cal-component-preview.c:257
+#: ../calendar/gui/e-cal-component-preview.c:249
+#: ../calendar/gui/e-cal-component-preview.c:263
 msgid "Start Date:"
 msgstr "Data de inÃcio:"
 
-#: ../calendar/gui/e-cal-component-preview.c:271
+#: ../calendar/gui/e-cal-component-preview.c:277
 msgid "Due Date:"
 msgstr "Data de conclusÃo:"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:284
-#: ../plugins/itip-formatter/itip-view.c:1075
+#: ../calendar/gui/e-cal-component-preview.c:290
+#: ../plugins/itip-formatter/itip-view.c:1083
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:311
+#: ../calendar/gui/e-cal-component-preview.c:317
 msgid "Priority:"
 msgstr "Prioridade:"
 
-#: ../calendar/gui/e-cal-component-preview.c:336 ../mail/mail-config.ui.h:36
+#: ../calendar/gui/e-cal-component-preview.c:342 ../mail/mail-config.ui.h:37
 msgid "Description:"
 msgstr "DescriÃÃo:"
 
-#: ../calendar/gui/e-cal-component-preview.c:367
+#: ../calendar/gui/e-cal-component-preview.c:373
 msgid "Web Page:"
 msgstr "PÃgina da Web:"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:388
 msgid "Created"
 msgstr "Criado"
 
@@ -3797,17 +3878,17 @@ msgstr "Modificado"
 msgid "Start Date"
 msgstr "Data de inÃcio"
 
-#: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:570
+#: ../calendar/gui/e-cal-model-calendar.c:188
+#: ../calendar/gui/e-task-table.c:580
 msgid "Free"
 msgstr "Livre"
 
-#: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:544 ../calendar/gui/e-task-table.c:571
+#: ../calendar/gui/e-cal-model-calendar.c:191
+#: ../calendar/gui/e-meeting-time-sel.c:547 ../calendar/gui/e-task-table.c:581
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../calendar/gui/e-cal-model-tasks.c:654
+#: ../calendar/gui/e-cal-model-tasks.c:665
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3818,44 +3899,44 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:704
+#: ../calendar/gui/e-cal-model-tasks.c:717
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "Nenhum"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1060 ../calendar/gui/e-cal-model.c:1523
-#: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:187
-#: ../calendar/gui/e-meeting-store.c:1026
+#: ../calendar/gui/e-cal-model-tasks.c:1090 ../calendar/gui/e-cal-model.c:1584
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:188
+#: ../calendar/gui/e-meeting-store.c:1053
 msgid "Yes"
 msgstr "Sim"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1060 ../calendar/gui/e-cal-model.c:1523
-#: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:189
+#: ../calendar/gui/e-cal-model-tasks.c:1090 ../calendar/gui/e-cal-model.c:1584
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:190
 msgid "No"
 msgstr "NÃo"
 
-#: ../calendar/gui/e-cal-model.c:773 ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:170
-#: ../calendar/gui/e-meeting-store.c:233 ../calendar/gui/print.c:1092
-#: ../calendar/gui/print.c:1109 ../e-util/e-charset.c:52
-#: ../modules/plugin-manager/evolution-plugin-manager.c:98
-#: ../plugins/itip-formatter/itip-formatter.c:457
-#: ../plugins/itip-formatter/itip-formatter.c:2485
+#: ../calendar/gui/e-cal-model.c:776 ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-list-view.c:192
+#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:171
+#: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1151
+#: ../calendar/gui/print.c:1168 ../e-util/e-charset.c:52
+#: ../modules/plugin-manager/evolution-plugin-manager.c:102
+#: ../plugins/itip-formatter/itip-formatter.c:469
+#: ../plugins/itip-formatter/itip-formatter.c:2697
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../calendar/gui/e-cal-model.c:1519
+#: ../calendar/gui/e-cal-model.c:1580
 msgid "Recurring"
 msgstr "Repetindo"
 
-#: ../calendar/gui/e-cal-model.c:1521
+#: ../calendar/gui/e-cal-model.c:1582
 msgid "Assigned"
 msgstr "AtribuÃdo"
 
-#: ../calendar/gui/e-cal-model.c:2639
+#: ../calendar/gui/e-cal-model.c:2937
 #, c-format
 msgid "Opening %s"
 msgstr "Abrindo %s"
@@ -3883,7 +3964,7 @@ msgstr "Prazo de conclusÃo"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:394
 msgid "Priority"
 msgstr "Prioridade"
 
@@ -3892,95 +3973,97 @@ msgid "Start date"
 msgstr "Data de inÃcio"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:559
+#: ../calendar/gui/e-meeting-list-view.c:598
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:578
+#: ../widgets/misc/e-attachment-tree-view.c:584
 msgid "Type"
 msgstr "Tipo"
 
-#: ../calendar/gui/e-calendar-view.c:422
+#: ../calendar/gui/e-calendar-view.c:420
 msgid "Cut selected events to the clipboard"
 msgstr "Recortar os eventos selecionados para a Ãrea de transferÃncia"
 
-#: ../calendar/gui/e-calendar-view.c:428
+#: ../calendar/gui/e-calendar-view.c:426
 msgid "Copy selected events to the clipboard"
 msgstr "Copiar os eventos selecionados para a Ãrea de transferÃncia"
 
-#: ../calendar/gui/e-calendar-view.c:434
+#: ../calendar/gui/e-calendar-view.c:432
 msgid "Paste events from the clipboard"
 msgstr "Colar os eventos da Ãrea de transferÃncia"
 
-#: ../calendar/gui/e-calendar-view.c:440
+#: ../calendar/gui/e-calendar-view.c:438
 msgid "Delete selected events"
 msgstr "Exclui os eventos selecionados"
 
-#: ../calendar/gui/e-calendar-view.c:459 ../calendar/gui/e-memo-table.c:183
-#: ../calendar/gui/e-task-table.c:261
+#: ../calendar/gui/e-calendar-view.c:457 ../calendar/gui/e-memo-table.c:182
+#: ../calendar/gui/e-task-table.c:269
 msgid "Deleting selected objects"
 msgstr "Excluindo objetos selecionados"
 
-#: ../calendar/gui/e-calendar-view.c:653 ../calendar/gui/e-memo-table.c:855
-#: ../calendar/gui/e-task-table.c:1084
+#: ../calendar/gui/e-calendar-view.c:650 ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/e-task-table.c:1104
 msgid "Updating objects"
 msgstr "Atualizando objetos"
 
-#: ../calendar/gui/e-calendar-view.c:1776
-#: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
-#: ../plugins/itip-formatter/itip-formatter.c:2473
+#: ../calendar/gui/e-calendar-view.c:1801
+#: ../calendar/gui/e-meeting-list-view.c:214
+#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../plugins/itip-formatter/itip-formatter.c:2685
 msgid "Accepted"
 msgstr "Aceito"
 
-#: ../calendar/gui/e-calendar-view.c:1777
-#: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
-#: ../plugins/itip-formatter/itip-formatter.c:2479
+#: ../calendar/gui/e-calendar-view.c:1802
+#: ../calendar/gui/e-meeting-list-view.c:215
+#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
+#: ../plugins/itip-formatter/itip-formatter.c:2691
 msgid "Declined"
 msgstr "Recusado"
 
-#: ../calendar/gui/e-calendar-view.c:1778
-#: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
-#: ../calendar/gui/e-meeting-time-sel.c:543
+#: ../calendar/gui/e-calendar-view.c:1803
+#: ../calendar/gui/e-meeting-list-view.c:216
+#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
+#: ../calendar/gui/e-meeting-time-sel.c:546
 msgid "Tentative"
 msgstr "Preliminar"
 
-#: ../calendar/gui/e-calendar-view.c:1779
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
-#: ../plugins/itip-formatter/itip-formatter.c:2482
+#: ../calendar/gui/e-calendar-view.c:1804
+#: ../calendar/gui/e-meeting-list-view.c:217
+#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
+#: ../plugins/itip-formatter/itip-formatter.c:2694
 msgid "Delegated"
 msgstr "Representado"
 
-#: ../calendar/gui/e-calendar-view.c:1780
+#: ../calendar/gui/e-calendar-view.c:1805
 msgid "Needs action"
 msgstr "Precisa de aÃÃo"
 
 #. 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:1924 ../calendar/gui/e-memo-table.c:538
-#: ../calendar/gui/e-task-table.c:759
+#. To Translators: It will display
+#. * "Organizer: NameOfTheUser <email ofuser com>"
+#: ../calendar/gui/e-calendar-view.c:1949 ../calendar/gui/e-memo-table.c:539
+#: ../calendar/gui/e-task-table.c:770
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizador: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1928 ../calendar/gui/e-memo-table.c:543
-#: ../calendar/gui/e-task-table.c:762
+#. With SunOne accounts, there may be no ':' in
+#. * organizer.value.
+#: ../calendar/gui/e-calendar-view.c:1953 ../calendar/gui/e-memo-table.c:544
+#: ../calendar/gui/e-task-table.c:774
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizador: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1944 ../calendar/gui/print.c:3208
+#: ../calendar/gui/e-calendar-view.c:1969 ../calendar/gui/print.c:3346
 #, c-format
 msgid "Location: %s"
 msgstr "Local: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1975
+#: ../calendar/gui/e-calendar-view.c:2000
 #, c-format
 msgid "Time: %s %s"
 msgstr "Data: %s %s"
@@ -4008,82 +4091,82 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:744
+#: ../calendar/gui/e-day-view-time-item.c:809
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i fraÃÃes de minuto"
 
-#: ../calendar/gui/e-day-view-time-item.c:765
+#: ../calendar/gui/e-day-view-time-item.c:830
 msgid "Show the second time zone"
 msgstr "Mostrar o fuso horÃrio secundÃrio"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:782
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
-#: ../modules/calendar/e-calendar-preferences.c:175
-#: ../modules/calendar/e-calendar-preferences.c:224
+#: ../calendar/gui/e-day-view-time-item.c:847
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../modules/calendar/e-calendar-preferences.c:179
+#: ../modules/calendar/e-calendar-preferences.c:231
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Nenhum"
 
-#: ../calendar/gui/e-day-view-time-item.c:809
-#: ../calendar/gui/e-timezone-entry.c:315
-#: ../modules/calendar/e-calendar-preferences.c:251
+#: ../calendar/gui/e-day-view-time-item.c:879
+#: ../calendar/gui/e-timezone-entry.c:319
+#: ../modules/calendar/e-calendar-preferences.c:258
 msgid "Select..."
 msgstr "Selecionar..."
 
 #. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
+#. * %B = full month name. Don't use any other specifiers.
 #. strftime format %A = full weekday name, %d = day of
-#. month, %B = full month name. You can change the
-#. order but don't change the specifiers or add
-#. anything.
-#: ../calendar/gui/e-day-view-top-item.c:840 ../calendar/gui/e-day-view.c:1793
-#: ../calendar/gui/e-week-view-main-item.c:208 ../calendar/gui/print.c:1866
+#. * month, %B = full month name. You can change the
+#. * order but don't change the specifiers or add
+#. * anything.
+#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1819
+#: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1968
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
+#. * %b = abbreviated month name. Don't use any other specifiers.
 #. strftime format %a = abbreviated weekday name,
-#. %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-day-view-top-item.c:844 ../calendar/gui/e-day-view.c:1810
-#: ../calendar/gui/e-week-view-main-item.c:217
-#: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:1005
+#. * %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-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1836
+#: ../calendar/gui/e-week-view-main-item.c:224
+#: ../calendar/gui/ea-gnome-calendar.c:204
+#: ../modules/calendar/e-cal-shell-view-private.c:1054
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
+#. * Don't use any other specifiers.
 #. 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-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1826
-#: ../calendar/gui/e-week-view-main-item.c:231
-#: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:1041
+#. * month name. You can change the order but don't
+#. * change the specifiers or add anything.
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1852
+#: ../calendar/gui/e-week-view-main-item.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:234
+#: ../modules/calendar/e-cal-shell-view-private.c:1090
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1002 ../calendar/gui/e-week-view.c:757
-#: ../calendar/gui/print.c:920 ../calendar/gui/print.c:939
-#: ../calendar/gui/print.c:2363 ../calendar/gui/print.c:2383
+#: ../calendar/gui/e-day-view.c:1019 ../calendar/gui/e-week-view.c:757
+#: ../calendar/gui/print.c:977 ../calendar/gui/print.c:996
+#: ../calendar/gui/print.c:2484 ../calendar/gui/print.c:2504
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1005 ../calendar/gui/e-week-view.c:760
-#: ../calendar/gui/print.c:925 ../calendar/gui/print.c:941
-#: ../calendar/gui/print.c:2368 ../calendar/gui/print.c:2385
+#: ../calendar/gui/e-day-view.c:1022 ../calendar/gui/e-week-view.c:760
+#: ../calendar/gui/print.c:982 ../calendar/gui/print.c:998
+#: ../calendar/gui/print.c:2489 ../calendar/gui/print.c:2506
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2606
+#: ../calendar/gui/e-day-view.c:2636
 #, c-format
 msgid "Week %d"
 msgstr "Semana %d"
@@ -4104,168 +4187,174 @@ msgstr "Participantes opcionais"
 msgid "Resources"
 msgstr "Recursos"
 
-#: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:127
-#: ../calendar/gui/e-meeting-store.c:1020 ../calendar/gui/print.c:1088
+#: ../calendar/gui/e-meeting-list-view.c:174
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
+#: ../calendar/gui/e-meeting-store.c:1047 ../calendar/gui/print.c:1147
 msgid "Individual"
 msgstr "IndivÃduo"
 
-#: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:129
-#: ../calendar/gui/print.c:1089 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/e-meeting-list-view.c:175
+#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
+#: ../calendar/gui/print.c:1148 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Grupo"
 
-#: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
-#: ../calendar/gui/print.c:1090
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
+#: ../calendar/gui/print.c:1149
 msgid "Resource"
 msgstr "Recurso"
 
-#: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
-#: ../calendar/gui/print.c:1091
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:117 ../calendar/gui/e-meeting-store.c:134
+#: ../calendar/gui/print.c:1150
 msgid "Room"
 msgstr "Sala"
 
-#: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:145 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/print.c:1105
+#: ../calendar/gui/e-meeting-list-view.c:188
+#: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/print.c:1164
 msgid "Chair"
 msgstr "Moderador"
 
-#: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:147 ../calendar/gui/e-meeting-store.c:164
-#: ../calendar/gui/e-meeting-store.c:1023 ../calendar/gui/print.c:1106
+#: ../calendar/gui/e-meeting-list-view.c:189
+#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/e-meeting-store.c:1050 ../calendar/gui/print.c:1165
 msgid "Required Participant"
 msgstr "Participante necessÃrio"
 
-#: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/print.c:1107
+#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
+#: ../calendar/gui/print.c:1166
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
-#: ../calendar/gui/print.c:1108
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:169
+#: ../calendar/gui/print.c:1167
 msgid "Non-Participant"
 msgstr "NÃo participante"
 
-#: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
-#: ../calendar/gui/e-meeting-store.c:1033
+#: ../calendar/gui/e-meeting-list-view.c:213
+#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:1060
 msgid "Needs Action"
 msgstr "Necessita de aÃÃo"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:539
+#: ../calendar/gui/e-meeting-list-view.c:578
 msgid "Attendee                          "
 msgstr "Participante                      "
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:584
+#: ../calendar/gui/e-meeting-list-view.c:623
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
+#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
 msgid "In Process"
 msgstr "Em andamento"
 
-#: ../calendar/gui/e-meeting-store.c:1762
+#: ../calendar/gui/e-meeting-store.c:1876
 #, c-format
-#| msgid "Enter password for user %s on server %s"
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr ""
 "Digite a senha para acessar informaÃÃo de livre/ocupado no servidor %s como "
 "usuÃrio %s"
 
-#: ../calendar/gui/e-meeting-store.c:1771
+#: ../calendar/gui/e-meeting-store.c:1886
 #, c-format
-#| msgid "Failed to create thread: %s"
 msgid "Failure reason: %s"
 msgstr "RazÃo da falha: %s"
 
+#: ../calendar/gui/e-meeting-store.c:1891
+#: ../plugins/caldav/caldav-browse-server.c:957
+#: ../plugins/google-account-setup/google-source.c:460
+#: ../plugins/publish-calendar/publish-calendar.c:345
+#: ../smime/gui/component.c:53
+msgid "Enter password"
+msgstr "Digite a senha"
+
 #. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:431
-#: ../calendar/gui/e-meeting-time-sel.c:2378
+#. * %B = full month name, %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:2379
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
+#. * name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:435
-#: ../calendar/gui/e-meeting-time-sel.c:2409
+#. * %m = month number, %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:449
+#: ../calendar/gui/e-meeting-time-sel.c:2410
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:439
+#. * %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:453
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:548
 msgid "Out of Office"
 msgstr "Fora do escritÃrio"
 
-#: ../calendar/gui/e-meeting-time-sel.c:546
+#: ../calendar/gui/e-meeting-time-sel.c:549
 msgid "No Information"
 msgstr "Sem informaÃÃo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:582
+#: ../calendar/gui/e-meeting-time-sel.c:585
 msgid "O_ptions"
 msgstr "O_pÃÃes"
 
-#: ../calendar/gui/e-meeting-time-sel.c:600
+#: ../calendar/gui/e-meeting-time-sel.c:603
 msgid "Show _only working hours"
 msgstr "Mostrar apenas _horas de expediente"
 
-#: ../calendar/gui/e-meeting-time-sel.c:611
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "Show _zoomed out"
 msgstr "Mostrar com _menos ampliaÃÃo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:627
+#: ../calendar/gui/e-meeting-time-sel.c:630
 msgid "_Update free/busy"
 msgstr "_Atualizar disponibilidade"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:645
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:660
+#: ../calendar/gui/e-meeting-time-sel.c:663
 msgid "_Autopick"
 msgstr "Auto_seleÃÃo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:675
+#: ../calendar/gui/e-meeting-time-sel.c:678
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:693
+#: ../calendar/gui/e-meeting-time-sel.c:696
 msgid "_All people and resources"
 msgstr "Todas as _pessoas e recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:703
+#: ../calendar/gui/e-meeting-time-sel.c:706
 msgid "All _people and one resource"
 msgstr "Todas as pessoas e um _recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:713
+#: ../calendar/gui/e-meeting-time-sel.c:716
 msgid "_Required people"
 msgstr "Pessoas _necessÃrias"
 
-#: ../calendar/gui/e-meeting-time-sel.c:722
+#: ../calendar/gui/e-meeting-time-sel.c:725
 msgid "Required people and _one resource"
 msgstr "Pessoas necessÃrias e _um recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:771
+#: ../calendar/gui/e-meeting-time-sel.c:774
 msgid "_Start time:"
 msgstr "_Hora de inÃcio:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:811
+#: ../calendar/gui/e-meeting-time-sel.c:814
 msgid "_End time:"
 msgstr "Hora de tÃr_mino:"
 
@@ -4293,47 +4382,47 @@ msgstr "Idioma"
 msgid "Member"
 msgstr "Membro"
 
-#: ../calendar/gui/e-memo-table.c:419
-#: ../modules/calendar/e-cal-shell-content.c:469
-#: ../modules/calendar/e-memo-shell-view-actions.c:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:233
-#: ../modules/calendar/e-memo-shell-view.c:289
-#: ../plugins/caldav/caldav-browse-server.c:438
+#: ../calendar/gui/e-memo-table.c:420
+#: ../modules/calendar/e-cal-shell-content.c:473
+#: ../modules/calendar/e-memo-shell-view-actions.c:231
+#: ../modules/calendar/e-memo-shell-view-actions.c:246
+#: ../modules/calendar/e-memo-shell-view.c:293
+#: ../plugins/caldav/caldav-browse-server.c:458
 msgid "Memos"
 msgstr "Memorandos"
 
-#: ../calendar/gui/e-memo-table.c:500 ../calendar/gui/e-task-table.c:723
+#: ../calendar/gui/e-memo-table.c:501 ../calendar/gui/e-task-table.c:733
 msgid "* No Summary *"
 msgstr "* Sem resumo *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:585 ../calendar/gui/e-task-table.c:803
+#: ../calendar/gui/e-memo-table.c:588 ../calendar/gui/e-task-table.c:817
 msgid "Start: "
 msgstr "InÃcio: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:604 ../calendar/gui/e-task-table.c:821
+#: ../calendar/gui/e-memo-table.c:607 ../calendar/gui/e-task-table.c:835
 msgid "Due: "
 msgstr "Prazo: "
 
-#: ../calendar/gui/e-memo-table.c:720
+#: ../calendar/gui/e-memo-table.c:726
 msgid "Cut selected memos to the clipboard"
 msgstr "Recorta os memorandos selecionadas para a Ãrea de transferÃncia"
 
-#: ../calendar/gui/e-memo-table.c:726
+#: ../calendar/gui/e-memo-table.c:732
 msgid "Copy selected memos to the clipboard"
 msgstr "Copia os memorandos selecionadas para a Ãrea de transferÃncia"
 
-#: ../calendar/gui/e-memo-table.c:732
+#: ../calendar/gui/e-memo-table.c:738
 msgid "Paste memos from the clipboard"
 msgstr "Cola memorandos da Ãrea de transferÃncia"
 
-#: ../calendar/gui/e-memo-table.c:738
-#: ../modules/calendar/e-memo-shell-view-actions.c:572
+#: ../calendar/gui/e-memo-table.c:744
+#: ../modules/calendar/e-memo-shell-view-actions.c:586
 msgid "Delete selected memos"
 msgstr "Exclui os memorandos selecionados"
 
-#: ../calendar/gui/e-memo-table.c:744
+#: ../calendar/gui/e-memo-table.c:750
 msgid "Select all visible memos"
 msgstr "Seleciona todos os memorandos visÃveis"
 
@@ -4342,115 +4431,113 @@ msgid "Click to add a memo"
 msgstr "Clique para adicionar um memorando"
 
 #. Translators: "%d%%" is the percentage of a task done.
-#. %d is the actual value, %% is replaced with a percent sign.
-#. Result values will be 0%, 10%, 20%, ... 100%
+#. * %d is the actual value, %% is replaced with a percent sign.
+#. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:545
+#: ../calendar/gui/e-task-table.c:555
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:642 ../calendar/gui/print.c:2159
-#: ../calendar/importers/icalendar-importer.c:81
-#: ../calendar/importers/icalendar-importer.c:828
-#: ../modules/calendar/e-cal-shell-content.c:430
-#: ../modules/calendar/e-task-shell-view-actions.c:241
-#: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view.c:444
-#: ../plugins/caldav/caldav-browse-server.c:436
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:563
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
+#: ../calendar/gui/e-task-table.c:652 ../calendar/gui/print.c:2273
+#: ../calendar/importers/icalendar-importer.c:85
+#: ../calendar/importers/icalendar-importer.c:1043
+#: ../modules/calendar/e-calendar-preferences.ui.h:41
+#: ../modules/calendar/e-cal-shell-content.c:434
+#: ../modules/calendar/e-task-shell-view-actions.c:254
+#: ../modules/calendar/e-task-shell-view-actions.c:269
+#: ../modules/calendar/e-task-shell-view.c:448
+#: ../plugins/caldav/caldav-browse-server.c:456
 msgid "Tasks"
 msgstr "Tarefas"
 
-#: ../calendar/gui/e-task-table.c:949
+#: ../calendar/gui/e-task-table.c:968
 msgid "Cut selected tasks to the clipboard"
 msgstr "Recortar as tarefas selecionadas para a Ãrea de transferÃncia"
 
-#: ../calendar/gui/e-task-table.c:955
+#: ../calendar/gui/e-task-table.c:974
 msgid "Copy selected tasks to the clipboard"
 msgstr "Copiar as tarefas selecionadas para a Ãrea de transferÃncia"
 
-#: ../calendar/gui/e-task-table.c:961
+#: ../calendar/gui/e-task-table.c:980
 msgid "Paste tasks from the clipboard"
 msgstr "Cola as tarefas da Ãrea de transferÃncia"
 
-#: ../calendar/gui/e-task-table.c:967
-#: ../modules/calendar/e-task-shell-view-actions.c:696
+#: ../calendar/gui/e-task-table.c:986
+#: ../modules/calendar/e-task-shell-view-actions.c:710
 msgid "Delete selected tasks"
 msgstr "Exclui as tarefas selecionadas"
 
-#: ../calendar/gui/e-task-table.c:973
+#: ../calendar/gui/e-task-table.c:992
 msgid "Select all visible tasks"
 msgstr "Seleciona todas as tarefas visÃveis"
 
-#: ../calendar/gui/e-timezone-entry.c:326
+#: ../calendar/gui/e-timezone-entry.c:330
 msgid "Select Timezone"
 msgstr "Selecionar um fuso horÃrio"
 
 #. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:225 ../calendar/gui/print.c:1847
+#. * month name. You can change the order but don't
+#. * change the specifiers or add anything.
+#: ../calendar/gui/e-week-view-main-item.c:232 ../calendar/gui/print.c:1949
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/ea-cal-view-event.c:286
-msgid "It has alarms."
-msgstr "Tem alarmes."
+#: ../calendar/gui/ea-cal-view-event.c:290
+msgid "It has reminders."
+msgstr "Tem lembretes."
 
-#: ../calendar/gui/ea-cal-view-event.c:289
+#: ../calendar/gui/ea-cal-view-event.c:293
 msgid "It has recurrences."
 msgstr "Tem recorrÃncias."
 
-#: ../calendar/gui/ea-cal-view-event.c:292
+#: ../calendar/gui/ea-cal-view-event.c:296
 msgid "It is a meeting."
 msgstr "Ã uma reuniÃo."
 
-#: ../calendar/gui/ea-cal-view-event.c:298
+#: ../calendar/gui/ea-cal-view-event.c:303
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Evento de agenda: o resumo à %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:300
+#: ../calendar/gui/ea-cal-view-event.c:306
 msgid "Calendar Event: It has no summary."
 msgstr "Evento de agenda: nÃo tem resumo."
 
-#: ../calendar/gui/ea-cal-view-event.c:322
+#: ../calendar/gui/ea-cal-view-event.c:328
 msgid "calendar view event"
 msgstr "exibiÃÃo de evento da agenda"
 
-#: ../calendar/gui/ea-cal-view-event.c:551
+#: ../calendar/gui/ea-cal-view-event.c:557
 msgid "Grab Focus"
 msgstr "Capturar foco"
 
-#: ../calendar/gui/ea-cal-view.c:302
+#: ../calendar/gui/ea-cal-view.c:315
 msgid "New Appointment"
 msgstr "Novo compromisso"
 
-#: ../calendar/gui/ea-cal-view.c:303
+#: ../calendar/gui/ea-cal-view.c:316
 msgid "New All Day Event"
 msgstr "Novo evento de dia inteiro"
 
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:317
 msgid "New Meeting"
 msgstr "Nova reuniÃo"
 
-#: ../calendar/gui/ea-cal-view.c:305
+#: ../calendar/gui/ea-cal-view.c:318
 msgid "Go to Today"
 msgstr "Ir para hoje"
 
-#: ../calendar/gui/ea-cal-view.c:306
+#: ../calendar/gui/ea-cal-view.c:319
 msgid "Go to Date"
 msgstr "Ir para data"
 
-#: ../calendar/gui/ea-day-view-main-item.c:308
-#: ../calendar/gui/ea-week-view-main-item.c:340
+#: ../calendar/gui/ea-day-view-main-item.c:318
+#: ../calendar/gui/ea-week-view-main-item.c:344
 msgid "a table to view and select the current time range"
 msgstr "uma tabela para ver e selecionar o intervalo de tempo vigente"
 
-#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:147
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:151
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -4459,14 +4546,14 @@ msgstr[1] "Tem %d eventos."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:156 ../calendar/gui/ea-week-view.c:154
 msgid "It has no events."
 msgstr "NÃo tem eventos."
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:160
+#: ../calendar/gui/ea-day-view.c:163
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "ExibiÃÃo de semana Ãtil: %s. %s"
@@ -4474,163 +4561,106 @@ msgstr "ExibiÃÃo de semana Ãtil: %s. %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:166
+#: ../calendar/gui/ea-day-view.c:169
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "ExibiÃÃo de dia: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:200
+#: ../calendar/gui/ea-day-view.c:203
 msgid "calendar view for a work week"
 msgstr "exibiÃÃo de agenda para uma semana Ãtil"
 
-#: ../calendar/gui/ea-day-view.c:202
+#: ../calendar/gui/ea-day-view.c:205
 msgid "calendar view for one or more days"
 msgstr "exibiÃÃo de agenda para um ou mais dias"
 
-#: ../calendar/gui/ea-gnome-calendar.c:46
-#: ../calendar/gui/ea-gnome-calendar.c:54
-#: ../calendar/importers/icalendar-importer.c:860
+#: ../calendar/gui/ea-gnome-calendar.c:50
+#: ../calendar/gui/ea-gnome-calendar.c:58
+#: ../calendar/importers/icalendar-importer.c:1077
 msgid "Gnome Calendar"
 msgstr "Agenda do GNOME"
 
-#: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:1001
+#: ../calendar/gui/ea-gnome-calendar.c:201
+#: ../modules/calendar/e-cal-shell-view-private.c:1050
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:202
-#: ../calendar/gui/ea-gnome-calendar.c:207
-#: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:1008
-#: ../modules/calendar/e-cal-shell-view-private.c:1014
-#: ../modules/calendar/e-cal-shell-view-private.c:1017
+#: ../calendar/gui/ea-gnome-calendar.c:206
+#: ../calendar/gui/ea-gnome-calendar.c:211
+#: ../calendar/gui/ea-gnome-calendar.c:213
+#: ../modules/calendar/e-cal-shell-view-private.c:1057
+#: ../modules/calendar/e-cal-shell-view-private.c:1063
+#: ../modules/calendar/e-cal-shell-view-private.c:1066
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:226
-#: ../calendar/gui/ea-gnome-calendar.c:232
-#: ../calendar/gui/ea-gnome-calendar.c:238
-#: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:1034
-#: ../modules/calendar/e-cal-shell-view-private.c:1045
-#: ../modules/calendar/e-cal-shell-view-private.c:1052
-#: ../modules/calendar/e-cal-shell-view-private.c:1055
+#: ../calendar/gui/ea-gnome-calendar.c:230
+#: ../calendar/gui/ea-gnome-calendar.c:236
+#: ../calendar/gui/ea-gnome-calendar.c:242
+#: ../calendar/gui/ea-gnome-calendar.c:244
+#: ../modules/calendar/e-cal-shell-view-private.c:1083
+#: ../modules/calendar/e-cal-shell-view-private.c:1094
+#: ../modules/calendar/e-cal-shell-view-private.c:1101
+#: ../modules/calendar/e-cal-shell-view-private.c:1104
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
-#: ../calendar/gui/ea-jump-button.c:147
+#: ../calendar/gui/ea-jump-button.c:150
 msgid "Jump button"
 msgstr "BotÃo de salto"
 
-#: ../calendar/gui/ea-jump-button.c:156
+#: ../calendar/gui/ea-jump-button.c:159
 msgid "Click here, you can find more events."
 msgstr "Clique aqui, vocà pode localizar mais eventos."
 
-#: ../calendar/gui/ea-week-view.c:155
+#: ../calendar/gui/ea-week-view.c:159
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "VisÃo de mÃs: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:159
+#: ../calendar/gui/ea-week-view.c:163
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "VisÃo de semana: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:193
+#: ../calendar/gui/ea-week-view.c:197
 msgid "calendar view for a month"
 msgstr "exibiÃÃo de agenda para um mÃs"
 
-#: ../calendar/gui/ea-week-view.c:195
+#: ../calendar/gui/ea-week-view.c:199
 msgid "calendar view for one or more weeks"
 msgstr "exibiÃÃo de agenda para uma ou mais semanas"
 
-#: ../calendar/gui/gnome-cal.c:2198
+#: ../calendar/gui/gnome-cal.c:2250
 msgid "Purging"
 msgstr "Excluindo permanentemente"
 
-#: ../calendar/gui/goto-dialog.ui.h:1
-msgid "April"
-msgstr "Abril"
-
-#: ../calendar/gui/goto-dialog.ui.h:2
-msgid "August"
-msgstr "Agosto"
-
-#: ../calendar/gui/goto-dialog.ui.h:3
-msgid "December"
-msgstr "Dezembro"
-
-#: ../calendar/gui/goto-dialog.ui.h:4
-msgid "February"
-msgstr "Fevereiro"
-
-#: ../calendar/gui/goto-dialog.ui.h:5
-msgid "January"
-msgstr "Janeiro"
-
-#: ../calendar/gui/goto-dialog.ui.h:6
-msgid "July"
-msgstr "Julho"
-
-#: ../calendar/gui/goto-dialog.ui.h:7
-msgid "June"
-msgstr "Junho"
-
-#: ../calendar/gui/goto-dialog.ui.h:8
-msgid "March"
-msgstr "MarÃo"
-
-#: ../calendar/gui/goto-dialog.ui.h:9
-msgid "May"
-msgstr "Maio"
-
-#: ../calendar/gui/goto-dialog.ui.h:10
-msgid "November"
-msgstr "Novembro"
-
-#: ../calendar/gui/goto-dialog.ui.h:11
-msgid "October"
-msgstr "Outubro"
-
-#: ../calendar/gui/goto-dialog.ui.h:12
-msgid "Select Date"
-msgstr "Selecionar data"
-
-#: ../calendar/gui/goto-dialog.ui.h:13
-#: ../modules/calendar/e-cal-shell-view-actions.c:1318
-msgid "Select _Today"
-msgstr "Selecionar _hoje"
-
-#: ../calendar/gui/goto-dialog.ui.h:14
-msgid "September"
-msgstr "Setembro"
-
-#: ../calendar/gui/itip-utils.c:422 ../calendar/gui/itip-utils.c:477
-#: ../calendar/gui/itip-utils.c:573
+#: ../calendar/gui/itip-utils.c:511 ../calendar/gui/itip-utils.c:566
+#: ../calendar/gui/itip-utils.c:669
 msgid "An organizer must be set."
 msgstr "Ã necessÃrio configurar um organizador."
 
-#: ../calendar/gui/itip-utils.c:469
+#: ../calendar/gui/itip-utils.c:558
 msgid "At least one attendee is necessary"
 msgstr "Ã necessÃrio pelo menos um participante"
 
-#: ../calendar/gui/itip-utils.c:657 ../calendar/gui/itip-utils.c:811
+#: ../calendar/gui/itip-utils.c:755 ../calendar/gui/itip-utils.c:916
 msgid "Event information"
 msgstr "InformaÃÃo de evento"
 
-#: ../calendar/gui/itip-utils.c:660 ../calendar/gui/itip-utils.c:814
+#: ../calendar/gui/itip-utils.c:758 ../calendar/gui/itip-utils.c:919
 msgid "Task information"
 msgstr "InformaÃÃo de tarefa"
 
-#: ../calendar/gui/itip-utils.c:663 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:761 ../calendar/gui/itip-utils.c:922
 msgid "Memo information"
 msgstr "InformaÃÃo do memorando"
 
-#: ../calendar/gui/itip-utils.c:666 ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:764 ../calendar/gui/itip-utils.c:940
 msgid "Free/Busy information"
 msgstr "InformaÃÃo de disponibilidade"
 
-#: ../calendar/gui/itip-utils.c:669
+#: ../calendar/gui/itip-utils.c:767
 msgid "Calendar information"
 msgstr "InformaÃÃo de agenda"
 
@@ -4638,7 +4668,7 @@ msgstr "InformaÃÃo de agenda"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:706
+#: ../calendar/gui/itip-utils.c:804
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Aceito"
@@ -4647,7 +4677,7 @@ msgstr "Aceito"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:713
+#: ../calendar/gui/itip-utils.c:811
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Aceito preliminarmente"
@@ -4659,7 +4689,7 @@ msgstr "Aceito preliminarmente"
 #. 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:720 ../calendar/gui/itip-utils.c:768
+#: ../calendar/gui/itip-utils.c:818 ../calendar/gui/itip-utils.c:866
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Recusado"
@@ -4668,7 +4698,7 @@ msgstr "Recusado"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:727
+#: ../calendar/gui/itip-utils.c:825
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Representado"
@@ -4676,7 +4706,7 @@ msgstr "Representado"
 #. 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:740
+#: ../calendar/gui/itip-utils.c:838
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Atualizado"
@@ -4684,7 +4714,7 @@ msgstr "Atualizado"
 #. 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:747
+#: ../calendar/gui/itip-utils.c:845
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Cancelar"
@@ -4692,7 +4722,7 @@ msgstr "Cancelar"
 #. 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:754
+#: ../calendar/gui/itip-utils.c:852
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Atualizar"
@@ -4700,240 +4730,253 @@ msgstr "Atualizar"
 #. 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:761
+#: ../calendar/gui/itip-utils.c:859
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Contraproposta"
 
-#: ../calendar/gui/itip-utils.c:832
+#: ../calendar/gui/itip-utils.c:937
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "InformaÃÃo de disponibilidade (%s para %s)"
 
-#: ../calendar/gui/itip-utils.c:840
+#: ../calendar/gui/itip-utils.c:945
 msgid "iCalendar information"
 msgstr "InformaÃÃo do iCalendar"
 
-#: ../calendar/gui/itip-utils.c:865
+#: ../calendar/gui/itip-utils.c:970
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 "NÃo foi possÃvel agendar um recurso, o novo evento coincide com algum outro."
 
-#: ../calendar/gui/itip-utils.c:869
+#: ../calendar/gui/itip-utils.c:974
 msgid "Unable to book a resource, error: "
 msgstr "NÃo foi possÃvel agendar um recurso, erro: "
 
-#: ../calendar/gui/itip-utils.c:1032
+#: ../calendar/gui/itip-utils.c:1137
 msgid "You must be an attendee of the event."
 msgstr "Vocà deve ser um participante do evento."
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:581
 msgid "1st"
 msgstr "1Â de"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:581
 msgid "2nd"
 msgstr "2 de"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:581
 msgid "3rd"
 msgstr "3 de"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:581
 msgid "4th"
 msgstr "4 de"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:581
 msgid "5th"
 msgstr "5 de"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:582
 msgid "6th"
 msgstr "6 de"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:582
 msgid "7th"
 msgstr "7 de"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:582
 msgid "8th"
 msgstr "8 de"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:582
 msgid "9th"
 msgstr "9 de"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:582
 msgid "10th"
 msgstr "10 de"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:583
 msgid "11th"
 msgstr "11 de"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:583
 msgid "12th"
 msgstr "12 de"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:583
 msgid "13th"
 msgstr "13 de"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:583
 msgid "14th"
 msgstr "14 de"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:583
 msgid "15th"
 msgstr "15 de"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:584
 msgid "16th"
 msgstr "16 de"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:584
 msgid "17th"
 msgstr "17 de"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:584
 msgid "18th"
 msgstr "18 de"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:584
 msgid "19th"
 msgstr "19 de"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:584
 msgid "20th"
 msgstr "20 de"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:585
 msgid "21st"
 msgstr "21 de"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:585
 msgid "22nd"
 msgstr "22 de"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:585
 msgid "23rd"
 msgstr "23 de"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:585
 msgid "24th"
 msgstr "24 de"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:585
 msgid "25th"
 msgstr "25 de"
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:586
 msgid "26th"
 msgstr "26 de"
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:586
 msgid "27th"
 msgstr "27 de"
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:586
 msgid "28th"
 msgstr "28 de"
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:586
 msgid "29th"
 msgstr "29 de"
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:586
 msgid "30th"
 msgstr "30 de"
 
-#: ../calendar/gui/print.c:555
+#: ../calendar/gui/print.c:587
 msgid "31st"
 msgstr "31 de"
 
-#: ../calendar/gui/print.c:612
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
+#: ../calendar/gui/print.c:644
 msgid "Su"
 msgstr "D"
 
-#: ../calendar/gui/print.c:612
+#: ../calendar/gui/print.c:644
 msgid "Mo"
 msgstr "S"
 
-#: ../calendar/gui/print.c:612
+#: ../calendar/gui/print.c:644
 msgid "Tu"
 msgstr "T"
 
-#: ../calendar/gui/print.c:612
+#: ../calendar/gui/print.c:644
 msgid "We"
 msgstr "Q"
 
-#: ../calendar/gui/print.c:613
+#: ../calendar/gui/print.c:645
 msgid "Th"
 msgstr "Q"
 
-#: ../calendar/gui/print.c:613
+#: ../calendar/gui/print.c:645
 msgid "Fr"
 msgstr "S"
 
-#: ../calendar/gui/print.c:613
+#: ../calendar/gui/print.c:645
 msgid "Sa"
 msgstr "S"
 
-#: ../calendar/gui/print.c:3001
+#. Translators: This is part of "START to END" text,
+#. * where START and END are date/times.
+#: ../calendar/gui/print.c:3139
 msgid " to "
 msgstr " para "
 
-#: ../calendar/gui/print.c:3011
+#. Translators: This is part of "START to END
+#. * (Completed COMPLETED)", where COMPLETED is a
+#. * completed date/time.
+#: ../calendar/gui/print.c:3149
 msgid " (Completed "
 msgstr " (ConcluÃda "
 
-#: ../calendar/gui/print.c:3017
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
+#: ../calendar/gui/print.c:3155
 msgid "Completed "
 msgstr "ConcluÃda "
 
-#: ../calendar/gui/print.c:3027
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
+#: ../calendar/gui/print.c:3165
 msgid " (Due "
 msgstr " (Prazo "
 
-#: ../calendar/gui/print.c:3034
+#. Translators: This is part of "Due DUE",
+#. * where DUE is a date/time due the event
+#. * should be finished.
+#: ../calendar/gui/print.c:3172
 msgid "Due "
 msgstr "Prazo "
 
-#: ../calendar/gui/print.c:3199
+#: ../calendar/gui/print.c:3337
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumo: %s"
 
-#: ../calendar/gui/print.c:3226
+#: ../calendar/gui/print.c:3364
 msgid "Attendees: "
 msgstr "Participantes: "
 
-#: ../calendar/gui/print.c:3269
+#: ../calendar/gui/print.c:3407
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:3284
+#: ../calendar/gui/print.c:3422
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridade: %s"
 
-#: ../calendar/gui/print.c:3302
+#: ../calendar/gui/print.c:3440
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentagem concluÃda: %i"
 
-#: ../calendar/gui/print.c:3313
+#: ../calendar/gui/print.c:3451
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3326
+#: ../calendar/gui/print.c:3464
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorias: %s"
 
-#: ../calendar/gui/print.c:3337
+#: ../calendar/gui/print.c:3475
 msgid "Contacts: "
 msgstr "Contatos: "
 
@@ -4942,6 +4985,10 @@ msgstr "Contatos: "
 msgid "% Completed"
 msgstr "% concluÃdo"
 
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Cancelled"
+msgstr "Cancelado"
+
 #: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
 msgstr "Em progresso"
@@ -4954,185 +5001,185 @@ msgstr "Ã maior que"
 msgid "is less than"
 msgstr "Ã menor que"
 
-#: ../calendar/importers/icalendar-importer.c:80
+#: ../calendar/importers/icalendar-importer.c:84
 msgid "Appointments and Meetings"
 msgstr "Compromissos e reuniÃes"
 
-#: ../calendar/importers/icalendar-importer.c:350
-#: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:1958
+#: ../calendar/importers/icalendar-importer.c:435
+#: ../calendar/importers/icalendar-importer.c:868
+#: ../plugins/itip-formatter/itip-formatter.c:2170
 msgid "Opening calendar"
 msgstr "Abrindo agenda"
 
-#: ../calendar/importers/icalendar-importer.c:493
+#: ../calendar/importers/icalendar-importer.c:583
 msgid "iCalendar files (.ics)"
 msgstr "Arquivos iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:494
+#: ../calendar/importers/icalendar-importer.c:584
 msgid "Evolution iCalendar importer"
 msgstr "Importador iCalendar do Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:582
+#: ../calendar/importers/icalendar-importer.c:674
 msgid "Reminder!"
 msgstr "Lembrete!"
 
-#: ../calendar/importers/icalendar-importer.c:662
+#: ../calendar/importers/icalendar-importer.c:758
 msgid "vCalendar files (.vcs)"
 msgstr "Arquivos vCalendar (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:663
+#: ../calendar/importers/icalendar-importer.c:759
 msgid "Evolution vCalendar importer"
 msgstr "Importador vCalendar do Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:823
+#: ../calendar/importers/icalendar-importer.c:1038
 msgid "Calendar Events"
 msgstr "Eventos de agenda"
 
-#: ../calendar/importers/icalendar-importer.c:861
+#: ../calendar/importers/icalendar-importer.c:1078
 msgid "Evolution Calendar intelligent importer"
 msgstr "Importador inteligente da agenda do Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:926
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1146
+#: ../calendar/importers/icalendar-importer.c:1464
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "ReuniÃo"
 
-#: ../calendar/importers/icalendar-importer.c:926
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1146
+#: ../calendar/importers/icalendar-importer.c:1464
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Evento"
 
-#: ../calendar/importers/icalendar-importer.c:929
-#: ../calendar/importers/icalendar-importer.c:1244
+#: ../calendar/importers/icalendar-importer.c:1149
+#: ../calendar/importers/icalendar-importer.c:1465
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Tarefa"
 
-#: ../calendar/importers/icalendar-importer.c:932
-#: ../calendar/importers/icalendar-importer.c:1245
+#: ../calendar/importers/icalendar-importer.c:1152
+#: ../calendar/importers/icalendar-importer.c:1466
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Memorando"
 
-#: ../calendar/importers/icalendar-importer.c:941
+#: ../calendar/importers/icalendar-importer.c:1161
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "tem recorrÃncias"
 
-#: ../calendar/importers/icalendar-importer.c:946
+#: ../calendar/importers/icalendar-importer.c:1166
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "em uma instÃncia"
 
-#: ../calendar/importers/icalendar-importer.c:951
+#: ../calendar/importers/icalendar-importer.c:1171
 msgctxt "iCalImp"
-msgid "has alarms"
-msgstr "tem alarmes"
+msgid "has reminders"
+msgstr "tem lembretes"
 
-#: ../calendar/importers/icalendar-importer.c:956
+#: ../calendar/importers/icalendar-importer.c:1176
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "tem anexos"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:969
+#: ../calendar/importers/icalendar-importer.c:1189
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "PÃblico"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:972
+#: ../calendar/importers/icalendar-importer.c:1192
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Particular"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:975
+#: ../calendar/importers/icalendar-importer.c:1195
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Confidencial"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:979
+#: ../calendar/importers/icalendar-importer.c:1199
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "ClassificaÃÃo"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../calendar/importers/icalendar-importer.c:984
-#: ../calendar/importers/icalendar-importer.c:1284
+#: ../calendar/importers/icalendar-importer.c:1204
+#: ../calendar/importers/icalendar-importer.c:1505
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Resumo"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:990
+#: ../calendar/importers/icalendar-importer.c:1210
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Local"
 
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
-#: ../calendar/importers/icalendar-importer.c:998
-#: ../calendar/importers/icalendar-importer.c:1280
+#: ../calendar/importers/icalendar-importer.c:1218
+#: ../calendar/importers/icalendar-importer.c:1501
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "InÃcio"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1009
+#: ../calendar/importers/icalendar-importer.c:1229
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Prazo"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1021
+#: ../calendar/importers/icalendar-importer.c:1241
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Fim"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1031
+#: ../calendar/importers/icalendar-importer.c:1251
 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:1055
+#: ../calendar/importers/icalendar-importer.c:1275
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "ConcluÃda"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1063
+#: ../calendar/importers/icalendar-importer.c:1283
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1074
-#: ../calendar/importers/icalendar-importer.c:1077
+#: ../calendar/importers/icalendar-importer.c:1294
+#: ../calendar/importers/icalendar-importer.c:1297
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organizador"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1097
-#: ../calendar/importers/icalendar-importer.c:1100
+#: ../calendar/importers/icalendar-importer.c:1317
+#: ../calendar/importers/icalendar-importer.c:1320
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Participantes"
 
-#: ../calendar/importers/icalendar-importer.c:1114
+#: ../calendar/importers/icalendar-importer.c:1334
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "DescriÃÃo"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../calendar/importers/icalendar-importer.c:1276
+#: ../calendar/importers/icalendar-importer.c:1497
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Tipo"
@@ -6686,171 +6733,166 @@ msgstr "PacÃfico/Wallis"
 msgid "Pacific/Yap"
 msgstr "PacÃfico/Yap"
 
-#: ../composer/e-composer-actions.c:204
+#: ../composer/e-composer-actions.c:208
 msgid "Save as..."
 msgstr "Salvar como..."
 
-#: ../composer/e-composer-actions.c:287
-#: ../widgets/misc/e-attachment-view.c:377
-msgid "Attach a file"
-msgstr "Anexar um arquivo"
-
-#: ../composer/e-composer-actions.c:292
-#: ../widgets/misc/e-signature-editor.c:203
+#: ../composer/e-composer-actions.c:296
+#: ../widgets/misc/e-signature-editor.c:207
 msgid "_Close"
 msgstr "_Fechar"
 
-#: ../composer/e-composer-actions.c:294
+#: ../composer/e-composer-actions.c:298
 msgid "Close the current file"
 msgstr "Fecha o arquivo atual"
 
-#: ../composer/e-composer-actions.c:299
+#: ../composer/e-composer-actions.c:303
 msgid "New _Message"
 msgstr "Nova _mensagem"
 
-#: ../composer/e-composer-actions.c:301
+#: ../composer/e-composer-actions.c:305
 msgid "Open New Message window"
 msgstr "Abrir nova janela de mensagem"
 
-#: ../composer/e-composer-actions.c:308 ../shell/e-shell-window-actions.c:1489
+#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1511
 msgid "Configure Evolution"
 msgstr "Configurar Evolution"
 
-#: ../composer/e-composer-actions.c:315
+#: ../composer/e-composer-actions.c:319
 msgid "Save the current file"
 msgstr "Salvar o arquivo atual"
 
-#: ../composer/e-composer-actions.c:320
+#: ../composer/e-composer-actions.c:324
 msgid "Save _As..."
 msgstr "Salvar _como..."
 
-#: ../composer/e-composer-actions.c:322
+#: ../composer/e-composer-actions.c:326
 msgid "Save the current file with a different name"
 msgstr "Salvar o arquivo atual com um nome diferente"
 
-#: ../composer/e-composer-actions.c:329
+#: ../composer/e-composer-actions.c:333
 msgid "Character _Encoding"
 msgstr "CodificaÃÃo de caract_eres"
 
-#: ../composer/e-composer-actions.c:346
+#: ../composer/e-composer-actions.c:350
 msgid "_Print..."
 msgstr "Im_primir..."
 
-#: ../composer/e-composer-actions.c:353
+#: ../composer/e-composer-actions.c:357
 msgid "Print Pre_view"
 msgstr "_Visualizar impressÃo"
 
-#: ../composer/e-composer-actions.c:360
+#: ../composer/e-composer-actions.c:364
 msgid "Save as _Draft"
 msgstr "Salvar como _rascunho"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:366
 msgid "Save as draft"
 msgstr "Salvar como rascunho"
 
-#: ../composer/e-composer-actions.c:367 ../composer/e-composer-private.c:347
+#: ../composer/e-composer-actions.c:371 ../composer/e-composer-private.c:352
 msgid "S_end"
 msgstr "_Enviar"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:373
 msgid "Send this message"
 msgstr "Enviar esta mensagem"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:381
 msgid "PGP _Encrypt"
 msgstr "Criptografar com PGP"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:383
 msgid "Encrypt this message with PGP"
 msgstr "Criptografar esta mensagem com PGP"
 
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:389
 msgid "PGP _Sign"
 msgstr "A_ssinar com PGP"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:391
 msgid "Sign this message with your PGP key"
 msgstr "Assinar esta mensagem com a sua chave PGP"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:397
 msgid "_Picture Gallery"
 msgstr "Galeria de _imagem"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:399
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr ""
 "Exibir uma coleÃÃo de imagens que vocà pode arrastar para a sua mensagem"
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:405
 msgid "_Prioritize Message"
 msgstr "_Priorizar mensagem"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:407
 msgid "Set the message priority to high"
 msgstr "Mudar a prioridade da mensagem para alta"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:413
 msgid "Re_quest Read Receipt"
 msgstr "_Solicitar recibo de leitura"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:415
 msgid "Get delivery notification when your message is read"
 msgstr "Receber notificaÃÃo de entrega quando sua mensagem for lida"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:421
 msgid "S/MIME En_crypt"
 msgstr "Criptografar com S/MIME"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:423
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr ""
 "Criptografar esta mensagem usando o seu Certificado de Criptografia S/MIME"
 
-#: ../composer/e-composer-actions.c:425
+#: ../composer/e-composer-actions.c:429
 msgid "S/MIME Sig_n"
 msgstr "Assinar S/MIME"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:431
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Assinar esta mensagem com o seu certificado de assinatura S/MIME"
 
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:437
 msgid "_Bcc Field"
 msgstr "Campo CCO"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:439
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Alterna a exibiÃÃo do campo CCO"
 
-#: ../composer/e-composer-actions.c:441
+#: ../composer/e-composer-actions.c:445
 msgid "_Cc Field"
 msgstr "Campo _CC"
 
-#: ../composer/e-composer-actions.c:443
+#: ../composer/e-composer-actions.c:447
 msgid "Toggles whether the CC field is displayed"
 msgstr "Exibe/oculta o campo CC"
 
-#: ../composer/e-composer-actions.c:449
+#: ../composer/e-composer-actions.c:453
 msgid "_Reply-To Field"
 msgstr "Campo _Responder a"
 
-#: ../composer/e-composer-actions.c:451
+#: ../composer/e-composer-actions.c:455
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Exibe/oculta o campo Responder a"
 
-#: ../composer/e-composer-actions.c:510
+#: ../composer/e-composer-actions.c:514
 msgid "Save Draft"
 msgstr "Salvar rascunho"
 
-#: ../composer/e-composer-header-table.c:36
+#: ../composer/e-composer-header-table.c:40
 msgid "Enter the recipients of the message"
 msgstr "Digite os destinatÃrios da mensagem"
 
-#: ../composer/e-composer-header-table.c:38
+#: ../composer/e-composer-header-table.c:42
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Digite os endereÃos que receberÃo uma cÃpia da mensagem"
 
-#: ../composer/e-composer-header-table.c:41
+#: ../composer/e-composer-header-table.c:45
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -6858,67 +6900,67 @@ msgstr ""
 "Digite os endereÃos que receberÃo uma cÃpia da mensagem sem aparecer na "
 "lista de destinatÃrios da mensagem"
 
-#: ../composer/e-composer-header-table.c:1002
+#: ../composer/e-composer-header-table.c:1021
 msgid "Fr_om:"
 msgstr "_De:"
 
-#: ../composer/e-composer-header-table.c:1011
+#: ../composer/e-composer-header-table.c:1030
 msgid "_Reply-To:"
 msgstr "_Responder a:"
 
-#: ../composer/e-composer-header-table.c:1015
+#: ../composer/e-composer-header-table.c:1034
 msgid "_To:"
 msgstr "_Para:"
 
-#: ../composer/e-composer-header-table.c:1020
+#: ../composer/e-composer-header-table.c:1039
 msgid "_Cc:"
 msgstr "_CC:"
 
-#: ../composer/e-composer-header-table.c:1025
+#: ../composer/e-composer-header-table.c:1044
 msgid "_Bcc:"
 msgstr "CC_O:"
 
-#: ../composer/e-composer-header-table.c:1030
+#: ../composer/e-composer-header-table.c:1049
 msgid "_Post To:"
 msgstr "_Publicar em:"
 
-#: ../composer/e-composer-header-table.c:1034
+#: ../composer/e-composer-header-table.c:1053
 msgid "S_ubject:"
 msgstr "Ass_unto:"
 
-#: ../composer/e-composer-header-table.c:1043
+#: ../composer/e-composer-header-table.c:1062
 msgid "Si_gnature:"
 msgstr "Assi_natura:"
 
-#: ../composer/e-composer-name-header.c:137
+#: ../composer/e-composer-name-header.c:141
 msgid "Click here for the address book"
 msgstr "Clique aqui para abrir o catÃlogo de endereÃos"
 
-#: ../composer/e-composer-post-header.c:127
+#: ../composer/e-composer-post-header.c:131
 msgid "Click here to select folders to post to"
 msgstr "Clique aqui para selecionar as pastas onde publicar"
 
-#: ../composer/e-composer-private.c:245
+#: ../composer/e-composer-private.c:249
 msgid "Undo the last action"
 msgstr "Desfaz a Ãltima aÃÃo"
 
-#: ../composer/e-composer-private.c:249
+#: ../composer/e-composer-private.c:253
 msgid "Redo the last undone action"
 msgstr "Refaz a Ãltima aÃÃo desfeita"
 
-#: ../composer/e-composer-private.c:253
+#: ../composer/e-composer-private.c:257
 msgid "Search for text"
 msgstr "Pesquisar por texto"
 
-#: ../composer/e-composer-private.c:257
+#: ../composer/e-composer-private.c:261
 msgid "Search for and replace text"
 msgstr "Pesquisar por texto e substituir"
 
-#: ../composer/e-composer-private.c:367
+#: ../composer/e-composer-private.c:372
 msgid "Save draft"
 msgstr "Salvar rascunho"
 
-#: ../composer/e-msg-composer.c:784
+#: ../composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -6926,7 +6968,7 @@ msgstr ""
 "NÃo foi possÃvel assinar a mensagem a ser enviada: NÃo existe certificado de "
 "assinatura configurado para esta conta"
 
-#: ../composer/e-msg-composer.c:793
+#: ../composer/e-msg-composer.c:821
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -6935,16 +6977,16 @@ msgstr ""
 "NÃo foi possÃvel criptografar a mensagem a ser enviada: NÃo existe "
 "certificado de criptografia configurado para esta conta"
 
-#: ../composer/e-msg-composer.c:1675 ../composer/e-msg-composer.c:2058
+#: ../composer/e-msg-composer.c:1699 ../composer/e-msg-composer.c:2083
 msgid "Compose Message"
 msgstr "Redigir mensagem"
 
-#: ../composer/e-msg-composer.c:4134
+#: ../composer/e-msg-composer.c:4228
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "O redator contÃm um corpo de mensagem nÃo texto, o qual nÃo pode ser editado."
 
-#: ../composer/e-msg-composer.c:4839
+#: ../composer/e-msg-composer.c:4933
 msgid "Untitled Message"
 msgstr "Mensagem sem tÃtulo"
 
@@ -6961,17 +7003,14 @@ msgid "All accounts have been removed."
 msgstr "Todas as contas foram removidas."
 
 #: ../composer/mail-composer.error.xml.h:3
-#| msgid "Error occurred while spawning %s: %s."
 msgid "An error occurred while saving to your Drafts folder."
 msgstr "Ocorreu um erro ao salvar na sua pasta de rascunhos."
 
 #: ../composer/mail-composer.error.xml.h:4
-#| msgid "An error occurred while printing"
 msgid "An error occurred while saving to your Outbox folder."
 msgstr "Ocorreu um erro ao salvar na sua pasta de saÃda."
 
 #: ../composer/mail-composer.error.xml.h:5
-#| msgid "An error occurred while printing"
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "Ocorreu um erro ao enviar. O que vocà gostaria de fazer?"
 
@@ -7055,7 +7094,6 @@ msgstr ""
 "parou."
 
 #: ../composer/mail-composer.error.xml.h:19
-#| msgid "Saving message to folder '%s'"
 msgid "Saving message to Outbox."
 msgstr "Salvando mensagem na caixa de saÃda."
 
@@ -7065,8 +7103,7 @@ msgstr ""
 "O arquivo \"{0}\" nÃo à um arquivo comum e nÃo pode ser enviado em uma "
 "mensagem."
 
-#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:117
-#| msgid "Bad regular expression &quot;{0}&quot;."
+#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:124
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "O erro informado foi &quot;{0}&quot;."
 
@@ -7091,7 +7128,6 @@ msgid "You need to configure an account before you can compose mail."
 msgstr "Vocà deve configurar uma conta antes de poder redigir uma mensagem."
 
 #: ../composer/mail-composer.error.xml.h:26
-#| msgid "An error occurred during processing: %s"
 msgid "Your message was sent, but an error occurred during post-processing."
 msgstr "Sua mensagem foi enviada, mas um erro ocorreu durante o processamento."
 
@@ -7113,7 +7149,6 @@ msgid "_Save Draft"
 msgstr "_Salvar rascunho"
 
 #: ../composer/mail-composer.error.xml.h:33
-#| msgid "_Save as mbox..."
 msgid "_Save to Outbox"
 msgstr "_Salvar para caixa de saÃda"
 
@@ -7121,27 +7156,15 @@ msgstr "_Salvar para caixa de saÃda"
 msgid "_Try Again"
 msgstr "_Tentar novamente"
 
-#: ../capplet/anjal-settings-main.c:216
-msgid "Run Anjal in a window"
-msgstr "Executar Anjal em uma janela"
-
-#: ../capplet/anjal-settings-main.c:217
-msgid "Make Anjal the default email client"
-msgstr "Definir o Anjal como cliente de e-mail padrÃo"
-
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:224
+#: ../capplet/anjal-settings-main.c:154
 msgid "ID of the socket to embed in"
 msgstr "ID do socket para ser embarcado"
 
-#: ../capplet/anjal-settings-main.c:225
+#: ../capplet/anjal-settings-main.c:155
 msgid "socket"
 msgstr "socket"
 
-#: ../capplet/anjal-settings-main.c:238
-msgid "Anjal email client"
-msgstr "Cliente de e-mail Anjal"
-
 #: ../capplet/settings/mail-account-view.c:77
 msgid "Please enter your full name."
 msgstr "Por favor, digite seu nome completo."
@@ -7159,63 +7182,65 @@ msgid "Please enter your password."
 msgstr "Por favor, digite a sua senha."
 
 #: ../capplet/settings/mail-account-view.c:259
-#: ../plugins/caldav/caldav-source.c:66
+#: ../plugins/caldav/caldav-source.c:67
 msgid "CalDAV"
 msgstr "CalDAV"
 
 #: ../capplet/settings/mail-account-view.c:361
 #: ../capplet/settings/mail-account-view.c:413
-#: ../plugins/google-account-setup/google-contacts-source.c:53
-#: ../plugins/google-account-setup/google-source.c:81
+#: ../modules/online-accounts/e-online-accounts-google.c:287
+#: ../modules/online-accounts/e-online-accounts-google.c:359
+#: ../plugins/google-account-setup/google-contacts-source.c:55
+#: ../plugins/google-account-setup/google-source.c:87
 msgid "Google"
 msgstr "Google"
 
-#: ../capplet/settings/mail-account-view.c:463
+#: ../capplet/settings/mail-account-view.c:480
 msgid "Personal details:"
 msgstr "Detalhes pessoais:"
 
-#: ../capplet/settings/mail-account-view.c:470
+#: ../capplet/settings/mail-account-view.c:487
 msgid "Name:"
 msgstr "_Nome:"
 
-#: ../capplet/settings/mail-account-view.c:479
+#: ../capplet/settings/mail-account-view.c:496
 msgid "Email address:"
 msgstr "EndereÃo de e_mail:"
 
-#: ../capplet/settings/mail-account-view.c:489
+#: ../capplet/settings/mail-account-view.c:506
 msgid "Details:"
 msgstr "Detalhes:"
 
-#: ../capplet/settings/mail-account-view.c:497
+#: ../capplet/settings/mail-account-view.c:514
 msgid "Receiving"
 msgstr "Recebendo"
 
-#: ../capplet/settings/mail-account-view.c:504
+#: ../capplet/settings/mail-account-view.c:521
 msgid "Server type:"
 msgstr "_Tipo do servidor:"
 
-#: ../capplet/settings/mail-account-view.c:513
+#: ../capplet/settings/mail-account-view.c:530
 msgid "Server address:"
 msgstr "EndereÃo do servidor:"
 
-#: ../capplet/settings/mail-account-view.c:522
+#: ../capplet/settings/mail-account-view.c:539
 msgid "Username:"
 msgstr "Nom_e de usuÃrio:"
 
-#: ../capplet/settings/mail-account-view.c:531
+#: ../capplet/settings/mail-account-view.c:548
 msgid "Use encryption:"
 msgstr "Utilizar encriptaÃÃo:"
 
-#: ../capplet/settings/mail-account-view.c:536
-#: ../capplet/settings/mail-account-view.c:571
+#: ../capplet/settings/mail-account-view.c:553
+#: ../capplet/settings/mail-account-view.c:588
 msgid "never"
 msgstr "nunca"
 
-#: ../capplet/settings/mail-account-view.c:548
+#: ../capplet/settings/mail-account-view.c:565
 msgid "Sending"
 msgstr "Enviando"
 
-#: ../capplet/settings/mail-account-view.c:590
+#: ../capplet/settings/mail-account-view.c:607
 msgid ""
 "To use the email application you'll need to setup an account. Put your email "
 "address and password in below and we'll try and work out all the settings. "
@@ -7226,7 +7251,7 @@ msgstr ""
 "configuraÃÃes. Se nÃo for possÃvel fazer isso automaticamente, nÃs "
 "precisaremos dos detalhes do servidor."
 
-#: ../capplet/settings/mail-account-view.c:592
+#: ../capplet/settings/mail-account-view.c:609
 msgid ""
 "Sorry, we can't work out the settings to get your mail automatically. Please "
 "enter them below. We've tried to make a start with the details you just "
@@ -7237,11 +7262,11 @@ msgstr ""
 "processo com os detalhes que vocà digitou mas vocà provavelmente precisa "
 "alterÃ-los."
 
-#: ../capplet/settings/mail-account-view.c:594
+#: ../capplet/settings/mail-account-view.c:611
 msgid "You can specify more options to configure the account."
 msgstr "Vocà pode especificar mais opÃÃes para configurar a conta."
 
-#: ../capplet/settings/mail-account-view.c:596
+#: ../capplet/settings/mail-account-view.c:613
 msgid ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
@@ -7249,11 +7274,11 @@ msgstr ""
 "Agora precisamos das suas configuraÃÃes para enviar e-mail. NÃs tentamos "
 "adivinhar algumas coisas mas vocà deve verificÃ-las para ter certeza."
 
-#: ../capplet/settings/mail-account-view.c:597
+#: ../capplet/settings/mail-account-view.c:614
 msgid "You can specify your default settings for your account."
 msgstr "Vocà pode especificar suas definiÃÃes padrÃes para sua conta."
 
-#: ../capplet/settings/mail-account-view.c:598
+#: ../capplet/settings/mail-account-view.c:615
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
@@ -7261,166 +7286,165 @@ msgstr ""
 "Ã hora de verificar as coisas antes que tentemos conectar ao servidor e "
 "trazer seus e-mails."
 
-#: ../capplet/settings/mail-account-view.c:613
-#: ../mail/em-account-editor.c:2089 ../mail/em-account-editor.c:2210
+#: ../capplet/settings/mail-account-view.c:630
+#: ../mail/em-account-editor.c:2289 ../mail/em-account-editor.c:2425
 msgid "Identity"
 msgstr "Identidade"
 
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:630
 msgid "Next - Receiving mail"
 msgstr "PrÃximo - Recebendo e-mail"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Receiving mail"
 msgstr "Recebendo e-mail"
 
-#: ../capplet/settings/mail-account-view.c:614
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:631
+#: ../capplet/settings/mail-account-view.c:632
 msgid "Next - Sending mail"
 msgstr "PrÃximo - Enviando e-mail"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Back - Identity"
 msgstr "Voltar - Identidade"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Next - Receiving options"
 msgstr "PrÃximo - OpÃÃes de recepÃÃo"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:632
 msgid "Receiving options"
 msgstr "OpÃÃes de recepÃÃo"
 
-#: ../capplet/settings/mail-account-view.c:615
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:632
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Back - Receiving mail"
 msgstr "Voltar - Recebendo e-mail"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Sending mail"
 msgstr "Enviando e-mail"
 
-#: ../capplet/settings/mail-account-view.c:617
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:635
 msgid "Next - Review account"
 msgstr "PrÃximo - Revisar conta"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Next - Defaults"
 msgstr "PrÃximo - PadrÃes"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Back - Receiving options"
 msgstr "PrÃximos - OpÃÃes de recebimento"
 
-#: ../capplet/settings/mail-account-view.c:618
-#: ../mail/em-account-editor.c:3041
+#: ../capplet/settings/mail-account-view.c:635
+#: ../mail/em-account-editor.c:3377
 msgid "Defaults"
 msgstr "PadrÃes"
 
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:635
 msgid "Back - Sending mail"
 msgstr "Voltar - Enviando e-mail"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Review account"
 msgstr "Revisar conta"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Finish"
 msgstr "Terminar"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Back - Sending"
 msgstr "Voltar - Enviando"
 
-#: ../capplet/settings/mail-account-view.c:740
+#: ../capplet/settings/mail-account-view.c:760
 msgid "Setup Google contacts with Evolution"
 msgstr "Adicionar Contatos do Google ao Evolution"
 
-#: ../capplet/settings/mail-account-view.c:741
+#: ../capplet/settings/mail-account-view.c:761
 msgid "Setup Google calendar with Evolution"
 msgstr "Adicionar calendÃrios do Google ao Evolution."
 
-#: ../capplet/settings/mail-account-view.c:746
+#: ../capplet/settings/mail-account-view.c:766
 msgid "You may need to enable IMAP access."
 msgstr "Vocà deve habilitar o acesso IMAP."
 
-#: ../capplet/settings/mail-account-view.c:754
+#: ../capplet/settings/mail-account-view.c:774
 msgid "Google account settings:"
 msgstr "ConfiguraÃÃes da conta do Google:"
 
-#: ../capplet/settings/mail-account-view.c:780
+#: ../capplet/settings/mail-account-view.c:800
 msgid "Setup Yahoo calendar with Evolution"
 msgstr "Adicionar calendÃrios do Yahoo ao Evolution."
 
-#: ../capplet/settings/mail-account-view.c:784
+#: ../capplet/settings/mail-account-view.c:804
 msgid ""
 "Yahoo calendars are named as firstname_lastname. We have tried to form the "
 "calendar name. So please confirm and re-enter the calendar name if it is not "
 "correct."
 msgstr ""
-"CalendÃrios do Yahoo sÃo nomeados como primeironome_sobrenome. Tentei formar "
-"o nome do calendÃrio. Por favor, confirme e reinsira o nome do calendÃrio se "
-"nÃo estiver correto."
+"CalendÃrios do Yahoo sÃo nomeados como primeironome_sobrenome. NÃs tentamos "
+"formar o nome do calendÃrio. Por favor, confirme e reinsira o nome do "
+"calendÃrio se nÃo estiver correto."
 
-#: ../capplet/settings/mail-account-view.c:793
+#: ../capplet/settings/mail-account-view.c:813
 msgid "Yahoo account settings:"
 msgstr "ConfiguraÃÃes da conta do Yahoo:"
 
-#: ../capplet/settings/mail-account-view.c:807
+#: ../capplet/settings/mail-account-view.c:827
 msgid "Yahoo Calendar name:"
 msgstr "Nome de calendÃrio do Yahoo"
 
-#: ../capplet/settings/mail-account-view.c:1079
+#: ../capplet/settings/mail-account-view.c:1098
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../capplet/settings/mail-account-view.c:1130
-#: ../capplet/settings/mail-settings-view.c:248
+#: ../capplet/settings/mail-account-view.c:1150
+#: ../capplet/settings/mail-settings-view.c:254
 msgid "Close Tab"
 msgstr "_Fechar aba"
 
-#: ../capplet/settings/mail-account-view.c:1140
+#: ../capplet/settings/mail-account-view.c:1160
 msgid "Account Wizard"
 msgstr "Assistente de conta"
 
-#: ../capplet/settings/mail-capplet-shell.c:209
+#: ../capplet/settings/mail-capplet-shell.c:215
 msgid "Evolution account assistant"
 msgstr "Assistente de contas do Evolution"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:353 ../mail/e-mail-migrate.c:680
-#: ../mail/e-mail-store.c:228 ../mail/em-folder-tree-model.c:146
-#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
-#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:161
-#: ../mail/em-folder-tree-model.c:163 ../mail/mail-vfolder.c:218
-#: ../mail/message-list.c:1721
-#: ../modules/addressbook/e-book-shell-backend.c:92
-#: ../modules/addressbook/e-book-shell-migrate.c:135
-#: ../modules/calendar/e-cal-shell-backend.c:103
-#: ../modules/calendar/e-cal-shell-migrate.c:150
-#: ../modules/calendar/e-memo-shell-backend.c:92
-#: ../modules/calendar/e-memo-shell-migrate.c:106
-#: ../modules/calendar/e-task-shell-backend.c:92
-#: ../modules/calendar/e-task-shell-migrate.c:117
+#: ../capplet/settings/mail-capplet-shell.c:377 ../mail/e-mail-local.c:81
+#: ../mail/e-mail-migrate.c:750 ../mail/em-folder-tree-model.c:153
+#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:159
+#: ../mail/em-folder-tree-model.c:161 ../mail/em-folder-tree-model.c:168
+#: ../mail/em-folder-tree-model.c:170
+#: ../modules/addressbook/e-book-shell-backend.c:100
+#: ../modules/addressbook/e-book-shell-migrate.c:136
+#: ../modules/calendar/e-cal-shell-backend.c:113
+#: ../modules/calendar/e-cal-shell-migrate.c:154
+#: ../modules/calendar/e-memo-shell-backend.c:102
+#: ../modules/calendar/e-memo-shell-migrate.c:109
+#: ../modules/calendar/e-task-shell-backend.c:102
+#: ../modules/calendar/e-task-shell-migrate.c:121
 msgid "On This Computer"
 msgstr "Neste computador"
 
-#: ../capplet/settings/mail-settings-view.c:145
+#: ../capplet/settings/mail-settings-view.c:150
 #, c-format
 msgid "Modify %s..."
 msgstr "Modificar %s..."
 
-#: ../capplet/settings/mail-settings-view.c:147
+#: ../capplet/settings/mail-settings-view.c:152
 msgid "Add a new account"
 msgstr "Adicionar uma nova conta"
 
-#: ../capplet/settings/mail-settings-view.c:183
+#: ../capplet/settings/mail-settings-view.c:188
 msgid "Account management"
 msgstr "Gerenciamento de conta"
 
-#: ../capplet/settings/mail-settings-view.c:258
+#: ../capplet/settings/mail-settings-view.c:264
 msgid "Settings"
 msgstr "PreferÃncias"
 
@@ -7432,9 +7456,9 @@ msgstr "NotificaÃÃes de eventos do calendÃrio"
 msgid "Evolution Alarm Notify"
 msgstr "Alarme de notificaÃÃo do Evolution"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:951
-#: ../modules/mailto-handler/evolution-mailto-handler.c:212
-#: ../shell/e-shell-window-private.c:253
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:999
+#: ../modules/mailto-handler/evolution-mailto-handler.c:215
+#: ../shell/e-shell-window-private.c:257
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -7442,7 +7466,7 @@ msgstr "Evolution"
 msgid "Evolution Mail and Calendar"
 msgstr "Correio e agenda do Evolution"
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:652
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
 msgid "Groupware Suite"
 msgstr "SuÃte de Groupware"
 
@@ -7459,37 +7483,36 @@ msgid "Email Settings"
 msgstr "ConfiguraÃÃes de e-mail"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:223
+#: ../e-util/e-activity.c:227
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (cancelado)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:226
+#: ../e-util/e-activity.c:230
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (concluÃdo)"
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:229
+#: ../e-util/e-activity.c:233
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (aguardando)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../e-util/e-activity.c:233
+#: ../e-util/e-activity.c:237
 #, c-format
-#| msgid "%s (cancelled)"
 msgid "%s (cancelling)"
 msgstr "%s (cancelando)"
 
-#: ../e-util/e-activity.c:235
+#: ../e-util/e-activity.c:239
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:240
+#: ../e-util/e-activity.c:244
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% concluÃdo)"
@@ -7572,132 +7595,125 @@ msgid "Visual"
 msgstr "Visual"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:196
-#: ../modules/calendar/e-cal-shell-view-actions.c:1796
+#: ../e-util/e-datetime-format.c:206
+#: ../modules/calendar/e-cal-shell-view-actions.c:1856
 #: ../plugins/itip-formatter/itip-view.c:191
-#: ../widgets/table/e-cell-date-edit.c:308
+#: ../widgets/table/e-cell-date-edit.c:307
 msgid "Today"
 msgstr "Hoje"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:207 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:217 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "AmanhÃ"
 
-#: ../e-util/e-datetime-format.c:209
+#: ../e-util/e-datetime-format.c:219
 msgid "Yesterday"
 msgstr "Ontem"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:217
-#| msgid "Next"
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:227
 msgctxt "DateFmt"
 msgid "Next Mon"
 msgstr "PrÃxima Seg"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:223
-#| msgid "Next _Thread"
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:233
 msgctxt "DateFmt"
 msgid "Next Tue"
 msgstr "PrÃxima Ter"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:229
-#| msgid "Next _Thread"
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:239
 msgctxt "DateFmt"
 msgid "Next Wed"
 msgstr "PrÃxima Qua"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:235
-#| msgid "Next _Thread"
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:245
 msgctxt "DateFmt"
 msgid "Next Thu"
 msgstr "PrÃxima Qui"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:241
-#| msgid "Next"
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:251
 msgctxt "DateFmt"
 msgid "Next Fri"
 msgstr "PrÃxima Sex"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:247
-#| msgid "Next"
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:257
 msgctxt "DateFmt"
 msgid "Next Sat"
 msgstr "PrÃximo Sab"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:253
-#| msgid "Next"
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:263
 msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "PrÃxima Dom"
 
-#: ../e-util/e-datetime-format.c:335 ../e-util/e-datetime-format.c:345
-#: ../e-util/e-datetime-format.c:354
+#: ../e-util/e-datetime-format.c:350 ../e-util/e-datetime-format.c:360
+#: ../e-util/e-datetime-format.c:369
 msgid "Use locale default"
 msgstr "Usar localizaÃÃo padrÃo"
 
-#: ../e-util/e-datetime-format.c:551
+#: ../e-util/e-datetime-format.c:574
 msgid "Format:"
 msgstr "Formato:"
 
-#: ../e-util/e-file-utils.c:152
+#: ../e-util/e-file-utils.c:151
 msgid "(Unknown Filename)"
 msgstr "(Nome de arquivo desconhecido)"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:156
+#: ../e-util/e-file-utils.c:155
 #, c-format
 msgid "Writing \"%s\""
 msgstr "Escrevendo \"%s\""
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:161
+#: ../e-util/e-file-utils.c:160
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "Escrevendo \"%s\" para %s"
 
-#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:378
+#: ../e-util/e-plugin-util.c:455 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:388
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "semanas"
 
-#: ../e-util/e-print.c:157
+#: ../e-util/e-print.c:161
 msgid "An error occurred while printing"
 msgstr "Ocorreu um erro ao imprimir"
 
-#: ../e-util/e-print.c:164
+#: ../e-util/e-print.c:168
 msgid "The printing system reported the following details about the error:"
 msgstr "O sistema de impressÃo relatou os seguintes detalhes sobre o erro:"
 
-#: ../e-util/e-print.c:170
+#: ../e-util/e-print.c:174
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr ""
 "O sistema de impressÃo nÃo relatou nenhum detalhe adicional sobre o erro."
 
-#: ../e-util/e-signature.c:703
+#: ../e-util/e-signature.c:708
 msgid "Autogenerated"
 msgstr "Gerado automaticamente"
 
@@ -7721,132 +7737,124 @@ msgstr "Vocà deseja sobrescrevÃ-lo?"
 msgid "File exists \"{0}\"."
 msgstr "Existe o arquivo \"{0}\"."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:157
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:164
 msgid "_Overwrite"
 msgstr "S_obrescrever"
 
-#: ../e-util/e-util.c:146
+#: ../e-util/e-util.c:117
 msgid "Could not open the link."
 msgstr "NÃo foi possÃvel abrir o link."
 
-#: ../e-util/e-util.c:193
+#: ../e-util/e-util.c:164
 msgid "Could not display help for Evolution."
 msgstr "NÃo foi possÃvel exibir a ajuda do Evolution."
 
-#: ../e-util/gconf-bridge.c:1281
+#: ../e-util/gconf-bridge.c:1332
 #, c-format
 msgid "GConf error: %s"
 msgstr "Erro do GConf: %s"
 
-#: ../e-util/gconf-bridge.c:1292
+#: ../e-util/gconf-bridge.c:1343
 msgid "All further errors shown only on terminal."
 msgstr "Todos os demais erros mostrados apenas no terminal."
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1046
-#: ../mail/e-mail-tag-editor.c:324 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:70
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1060
+#: ../mail/e-mail-tag-editor.c:325 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:72
 msgid "From"
 msgstr "De"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1047
-#: ../modules/mail/em-mailer-prefs.c:71
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1061
+#: ../modules/mail/em-mailer-prefs.c:73
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1049
-#: ../mail/em-format-html.c:2396 ../mail/em-format-html.c:2464
-#: ../mail/em-format-html.c:2487 ../modules/mail/em-mailer-prefs.c:73
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1063
+#: ../mail/em-format-html.c:2593 ../mail/em-format-html.c:2661
+#: ../mail/em-format-html.c:2684 ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1050
-#: ../mail/em-format-html.c:2397 ../mail/em-format-html.c:2468
-#: ../mail/em-format-html.c:2490 ../modules/mail/em-mailer-prefs.c:74
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1064
+#: ../mail/em-format-html.c:2594 ../mail/em-format-html.c:2665
+#: ../mail/em-format-html.c:2687 ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
 msgstr "CCO"
 
-#: ../em-format/em-format-quote.c:427 ../em-format/em-format.c:1051
-#: ../mail/e-mail-tag-editor.c:329 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:75
-#: ../plugins/groupwise-features/notification.ui.h:2
-#: ../plugins/groupwise-features/properties.ui.h:5 ../smime/lib/e-cert.c:1140
+#: ../em-format/em-format-quote.c:464 ../em-format/em-format.c:1065
+#: ../mail/e-mail-tag-editor.c:330 ../mail/em-filter-i18n.h:74
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:77
+#: ../smime/lib/e-cert.c:1151
 msgid "Subject"
 msgstr "Assunto"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:438 ../mail/em-format-html.c:2584
-#: ../modules/mail/em-mailer-prefs.c:1119
+#: ../em-format/em-format-quote.c:475 ../mail/em-format-html.c:2786
+#: ../modules/mail/em-mailer-prefs.c:1028
 msgid "Mailer"
 msgstr "Programa de correio"
 
-#: ../em-format/em-format-quote.c:519 ../mail/em-composer-utils.c:1159
+#: ../em-format/em-format-quote.c:565 ../mail/em-composer-utils.c:1203
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mensagem encaminhada --------"
 
-#: ../em-format/em-format.c:1052 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:76 ../widgets/misc/e-dateedit.c:522
-#: ../widgets/misc/e-dateedit.c:544
+#: ../em-format/em-format.c:1066 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Date"
 msgstr "Data"
 
-#: ../em-format/em-format.c:1053 ../modules/mail/em-mailer-prefs.c:77
+#: ../em-format/em-format.c:1067 ../modules/mail/em-mailer-prefs.c:79
 msgid "Newsgroups"
 msgstr "Grupos de notÃcias"
 
-#: ../em-format/em-format.c:1054 ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format.c:1068 ../modules/mail/em-mailer-prefs.c:80
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Face"
 
-#: ../em-format/em-format.c:1451
+#: ../em-format/em-format.c:1472
 #, c-format
 msgid "%s attachment"
 msgstr "anexo %s"
 
-#: ../em-format/em-format.c:1555
+#: ../em-format/em-format.c:1583
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "NÃo foi possÃvel analisar a mensagem S/MIME: Erro desconhecido"
 
-#: ../em-format/em-format.c:1737 ../em-format/em-format.c:1931
+#: ../em-format/em-format.c:1777 ../em-format/em-format.c:2005
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "NÃo foi possÃvel analisar a mensagem MIME. Exibindo como fonte."
 
-#: ../em-format/em-format.c:1747
+#: ../em-format/em-format.c:1788
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tipo de criptografia sem suporte para multiparte/criptografado"
 
-#: ../em-format/em-format.c:1767
+#: ../em-format/em-format.c:1808
 msgid "Could not parse PGP/MIME message"
 msgstr "NÃo foi possÃvel analisar a mensagem PGP/MIME"
 
-#: ../em-format/em-format.c:1768
+#: ../em-format/em-format.c:1809
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "NÃo foi possÃvel analisar a mensagem PGP/MIME: Erro desconhecido"
 
-#: ../em-format/em-format.c:1956
+#: ../em-format/em-format.c:2030
 msgid "Unsupported signature format"
 msgstr "Formato de assinatura sem suporte"
 
-#: ../em-format/em-format.c:1969 ../em-format/em-format.c:2141
+#: ../em-format/em-format.c:2043 ../em-format/em-format.c:2225
 msgid "Error verifying signature"
 msgstr "Erro ao verificar assinatura"
 
-#: ../em-format/em-format.c:1970 ../em-format/em-format.c:2128
-#: ../em-format/em-format.c:2142
+#: ../em-format/em-format.c:2044 ../em-format/em-format.c:2210
+#: ../em-format/em-format.c:2226
 msgid "Unknown error verifying signature"
 msgstr "Erro desconhecido ao verificar assinatura"
 
-#: ../em-format/em-format.c:2233
+#: ../em-format/em-format.c:2318
 msgid "Could not parse PGP message: "
 msgstr "NÃo foi possÃvel analisar a mensagem PGP:"
 
-#: ../em-format/em-format.c:2239 ../mail/em-folder-tree.c:656
-#: ../mail/mail-ops.c:624 ../plugins/caldav/caldav-browse-server.c:210
-#: ../plugins/caldav/caldav-browse-server.c:1407 ../plugins/face/face.c:169
-#: ../smime/gui/certificate-manager.c:100
-msgid "Unknown error"
-msgstr "Erro desconhecido"
-
 #. Don't delete this code, since it is needed so that xgettext can extract the translations.
 #. * Please, keep these strings in sync with the strings in the timespans array
 #: ../filter/e-filter-datespec.c:66
@@ -7961,78 +7969,78 @@ msgstr "agora"
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/e-filter-datespec.c:282
+#: ../filter/e-filter-datespec.c:286
 msgid "Select a time to compare against"
 msgstr "Selecionar um instante em relaÃÃo ao qual comparar"
 
-#: ../filter/e-filter-file.c:188
+#: ../filter/e-filter-file.c:190
 msgid "Choose a File"
 msgstr "Escolher um arquivo"
 
-#: ../filter/e-filter-rule.c:662
+#: ../filter/e-filter-rule.c:666
 msgid "R_ule name:"
 msgstr "_Nome da regra:"
 
-#: ../filter/e-filter-rule.c:692
+#: ../filter/e-filter-rule.c:696
 msgid "Find items that meet the following conditions"
 msgstr "Localizar itens que atendam aos seguintes critÃrios"
 
-#: ../filter/e-filter-rule.c:717
+#: ../filter/e-filter-rule.c:721
 msgid "If all conditions are met"
 msgstr "Se todos os critÃrios forem atendidos"
 
-#: ../filter/e-filter-rule.c:718
+#: ../filter/e-filter-rule.c:722
 msgid "If any conditions are met"
 msgstr "Se algum critÃrio for atendido"
 
-#: ../filter/e-filter-rule.c:721
+#: ../filter/e-filter-rule.c:725
 msgid "_Find items:"
 msgstr "_Localizar os itens:"
 
 #. Translators: "None" for not including threads;
 #. * part of "Include threads: None"
-#: ../filter/e-filter-rule.c:750
+#: ../filter/e-filter-rule.c:754
 msgid "None"
 msgstr "Nenhum"
 
-#: ../filter/e-filter-rule.c:751
+#: ../filter/e-filter-rule.c:755
 msgid "All related"
 msgstr "Tudo relacionado"
 
-#: ../filter/e-filter-rule.c:752 ../widgets/misc/e-send-options.ui.h:19
+#: ../filter/e-filter-rule.c:756 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "Respostas"
 
-#: ../filter/e-filter-rule.c:753
+#: ../filter/e-filter-rule.c:757
 msgid "Replies and parents"
 msgstr "Respostas e anteriores"
 
-#: ../filter/e-filter-rule.c:754
+#: ../filter/e-filter-rule.c:758
 msgid "No reply or parent"
 msgstr "Nenhuma rÃplica ou parente"
 
-#: ../filter/e-filter-rule.c:757
-msgid "I_nclude threads"
-msgstr "I_ncluir discussÃes"
+#: ../filter/e-filter-rule.c:761
+msgid "I_nclude threads:"
+msgstr "I_ncluir discussÃes:"
 
-#: ../filter/e-filter-rule.c:782
+#: ../filter/e-filter-rule.c:786
 msgid "A_dd Condition"
 msgstr "A_dicionar critÃrio"
 
-#: ../filter/e-filter-rule.c:1129 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:316
+#: ../filter/e-filter-rule.c:1135 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:321
 msgid "Incoming"
 msgstr "Recebidas"
 
-#: ../filter/e-filter-rule.c:1129 ../mail/em-utils.c:317
+#: ../filter/e-filter-rule.c:1135 ../mail/em-utils.c:322
 msgid "Outgoing"
 msgstr "Enviadas"
 
-#: ../filter/e-rule-editor.c:263
+#: ../filter/e-rule-editor.c:270
 msgid "Add Rule"
 msgstr "Adicionar regra"
 
-#: ../filter/e-rule-editor.c:349
+#: ../filter/e-rule-editor.c:359
 msgid "Edit Rule"
 msgstr "Editar regra"
 
@@ -8056,7 +8064,7 @@ msgstr "Data faltando."
 msgid "Missing file name."
 msgstr "Nome do arquivo faltando."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:83
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:90
 msgid "Missing name."
 msgstr "Nome faltando."
 
@@ -8112,7 +8120,7 @@ msgstr ""
 "A data da mensagem serà comparada em relaÃÃo\n"
 "ao instante atual quando a filtragem ocorrer."
 
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:193
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:194
 msgid "_Filter Rules"
 msgstr "_Regras de filtro"
 
@@ -8149,161 +8157,351 @@ msgstr "um instante especificado por vocÃ"
 msgid "years"
 msgstr "anos"
 
-#: ../mail/e-mail-attachment-bar.c:86 ../mail/e-mail-attachment-bar.c:91
-#: ../mail/em-format-html-display.c:1049 ../mail/mail-config.ui.h:13
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:124
-#: ../widgets/misc/e-attachment-paned.c:129
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "Anexo"
-msgstr[1] "Anexos"
-
-#: ../mail/e-mail-attachment-bar.c:602
-#: ../widgets/misc/e-attachment-paned.c:617
-msgid "Icon View"
-msgstr "VisualizaÃÃo de Ãcones"
-
-#: ../mail/e-mail-attachment-bar.c:604
-#: ../widgets/misc/e-attachment-paned.c:619
-msgid "List View"
-msgstr "VisualizaÃÃo de listas"
-
-#: ../mail/e-mail-browser.c:125 ../shell/e-shell-window-actions.c:1405
-#: ../shell/e-shell-window-actions.c:1412
-#: ../shell/e-shell-window-actions.c:1419
-msgid "Close this window"
-msgstr "Fecha esta janela"
+#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
+#: ../mail/em-account-editor.c:863 ../widgets/misc/e-signature-combo-box.c:75
+msgctxt "mail-signature"
+msgid "None"
+msgstr "Nenhum"
 
-#: ../mail/e-mail-browser.c:282
-msgid "(No Subject)"
-msgstr "(Sem assunto)"
+#: ../mail/em-account-editor.c:946
+msgid "Never"
+msgstr "Nunca"
 
-#: ../mail/e-mail-display.c:62
-msgid "_Add to Address Book..."
-msgstr "_Adicionar ao catÃlogo de endereÃos..."
+#: ../mail/em-account-editor.c:947
+msgid "Always"
+msgstr "Sempre"
 
-#: ../mail/e-mail-display.c:69
-msgid "_To This Address"
-msgstr "Para es_te endereÃo"
+#: ../mail/em-account-editor.c:948
+msgid "Ask for each message"
+msgstr "Perguntar para cada mensagem"
 
-#: ../mail/e-mail-display.c:76
-msgid "_From This Address"
-msgstr "_Deste endereÃo"
+#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
+#: ../mail/em-account-editor.c:1833 ../widgets/misc/e-account-tree-view.c:131
+msgctxt "mail-receiving"
+msgid "None"
+msgstr "Nenhum"
 
-#: ../mail/e-mail-display.c:85
-msgid "Create Search _Folder"
-msgstr "Criar pasta de _pesquisa"
+#: ../mail/em-account-editor.c:2237
+msgid "Fil_e:"
+msgstr "_Arquivo:"
 
-#: ../mail/e-mail-folder-utils.c:88
-#, c-format
-msgid "Saving message to folder '%s'"
-msgstr "Salvando mensagem na pasta \"%s\""
+#: ../mail/em-account-editor.c:2237 ../mail/mail-config.ui.h:157
+msgid "_Path:"
+msgstr "_Caminho:"
 
-#: ../mail/e-mail-label-dialog.c:218
-msgid "_Label name:"
-msgstr "_Nome do rÃtulo:"
+#: ../mail/em-account-editor.c:2286
+msgid "Mail Configuration"
+msgstr "ConfiguraÃÃo de correio"
 
-#: ../mail/e-mail-label-list-store.c:37
-msgid "I_mportant"
-msgstr "I_mportante"
+#: ../mail/em-account-editor.c:2287
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Continue\" to begin."
+msgstr ""
+"Bem-vindo ao assistente de configuraÃÃes de correio do Evolution.\n"
+"\n"
+"Pressione \"Continuar\" para iniciar. "
 
-#. red
-#: ../mail/e-mail-label-list-store.c:38
-msgid "_Work"
-msgstr "_Trabalho"
+#: ../mail/em-account-editor.c:2290
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"Por favor, digite seu nome e endereÃo de e-mail abaixo. Os campos em "
+"\"InformaÃÃes Opcionais\", mais abaixo, nÃo precisam ser preenchidos, a "
+"menos que vocà queira estas informaÃÃes incluÃdas em toda mensagem de "
+"correio enviada."
 
-#. orange
-#: ../mail/e-mail-label-list-store.c:39
-msgid "_Personal"
-msgstr "_Pessoal"
+#: ../mail/em-account-editor.c:2292 ../mail/em-account-editor.c:2484
+msgid "Receiving Email"
+msgstr "Recebendo e-mail"
 
-#. green
-#: ../mail/e-mail-label-list-store.c:40
-msgid "_To Do"
-msgstr "A fa_zer"
+#: ../mail/em-account-editor.c:2293
+msgid "Please configure the following account settings."
+msgstr "Por favor, configure as seguintes configuraÃÃes de conta."
 
-#. blue
-#: ../mail/e-mail-label-list-store.c:41
-msgid "_Later"
-msgstr "Mais _tarde"
+#: ../mail/em-account-editor.c:2295 ../mail/em-account-editor.c:3081
+msgid "Sending Email"
+msgstr "Enviando e-mail"
 
-#: ../mail/e-mail-label-manager.c:161
-#: ../modules/mail/e-mail-shell-view-actions.c:627
-msgid "Add Label"
-msgstr "Adicionar rÃtulo"
+#: ../mail/em-account-editor.c:2296
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+"Por favor, digite informaÃÃes sobre como vocà enviarà correio. Se vocà nÃo "
+"tiver certeza, consulte o seu administrador de sistema ou o seu provedor de "
+"Internet."
 
-#: ../mail/e-mail-label-manager.c:212
-msgid "Edit Label"
-msgstr "Editar rÃtulo"
+#: ../mail/em-account-editor.c:2298 ../mail/mail-config.ui.h:1
+msgid "Account Information"
+msgstr "InformaÃÃes da conta"
 
-#: ../mail/e-mail-label-manager.c:345
+#: ../mail/em-account-editor.c:2299
 msgid ""
-"Note: Underscore in the label name is used\n"
-"as mnemonic identifier in menu."
+"Please enter a descriptive name for this account below.\n"
+"This name will be used for display purposes only."
 msgstr ""
-"Nota: O sublinhado no nome do rÃtulo indica que ele à usado\n"
+"Por favor, digite um nome descritivo para esta conta abaixo.\n"
+"Este nome serà usado apenas com o propÃsito de exibiÃÃo."
+
+#: ../mail/em-account-editor.c:2303
+msgid "Done"
+msgstr "Terminado"
+
+#: ../mail/em-account-editor.c:2304
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"ParabÃns, sua configuraÃÃo de correio està concluÃda.\n"
+"\n"
+"Agora vocà està pronto para enviar e receber e-mails \n"
+"utilizando o Evolution. \n"
+"\n"
+"Clique em \"Aplicar\" para salvar suas configuraÃÃes."
+
+#: ../mail/em-account-editor.c:2843
+msgid "Check for _new messages every"
+msgstr "Verificar _novas mensagens a cada"
+
+#: ../mail/em-account-editor.c:2851
+msgid "minu_tes"
+msgstr "minu_tos"
+
+#: ../mail/em-account-editor.c:3520 ../mail/mail-config.ui.h:101
+msgid "Security"
+msgstr "SeguranÃa"
+
+#. Most sections for this is auto-generated from the camel config
+#. Most sections for this is auto-generated fromt the camel config
+#: ../mail/em-account-editor.c:3575 ../mail/em-account-editor.c:3658
+msgid "Receiving Options"
+msgstr "OpÃÃes de recepÃÃo"
+
+#: ../mail/em-account-editor.c:3576 ../mail/em-account-editor.c:3659
+msgid "Checking for New Messages"
+msgstr "Verificando novas mensagens"
+
+#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
+#: ../mail/em-format-html-display.c:1416 ../mail/mail-config.ui.h:14
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:128
+#: ../widgets/misc/e-attachment-paned.c:133
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Anexo"
+msgstr[1] "Anexos"
+
+#: ../mail/e-mail-attachment-bar.c:608
+#: ../widgets/misc/e-attachment-paned.c:623
+msgid "Icon View"
+msgstr "VisualizaÃÃo de Ãcones"
+
+#: ../mail/e-mail-attachment-bar.c:610
+#: ../widgets/misc/e-attachment-paned.c:625
+msgid "List View"
+msgstr "VisualizaÃÃo de listas"
+
+#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1427
+#: ../shell/e-shell-window-actions.c:1434
+#: ../shell/e-shell-window-actions.c:1441
+msgid "Close this window"
+msgstr "Fecha esta janela"
+
+#: ../mail/e-mail-browser.c:293
+msgid "(No Subject)"
+msgstr "(Sem assunto)"
+
+#: ../mail/e-mail-display.c:66
+msgid "_Add to Address Book..."
+msgstr "_Adicionar ao catÃlogo de endereÃos..."
+
+#: ../mail/e-mail-display.c:73
+msgid "_To This Address"
+msgstr "Para es_te endereÃo"
+
+#: ../mail/e-mail-display.c:80
+msgid "_From This Address"
+msgstr "_Deste endereÃo"
+
+#: ../mail/e-mail-display.c:87
+msgid "Send _Reply To..."
+msgstr "Enviar _responder para..."
+
+#: ../mail/e-mail-display.c:89
+msgid "Send a reply message to this address"
+msgstr "Enviar uma mensagem de resposta para este endereÃo"
+
+#: ../mail/e-mail-display.c:96
+msgid "Create Search _Folder"
+msgstr "Criar pasta de _pesquisa"
+
+#: ../mail/e-mail-folder-utils.c:111
+#, c-format
+msgid "Saving message to folder '%s'"
+msgstr "Salvando mensagem na pasta \"%s\""
+
+#: ../mail/e-mail-folder-utils.c:274
+msgid "Forwarded messages"
+msgstr "Mensagens encaminhadas"
+
+#: ../mail/e-mail-folder-utils.c:391
+msgid "Scanning messages for duplicates"
+msgstr "Verificar por mensagens duplicadas"
+
+#: ../mail/e-mail-folder-utils.c:584
+#, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "Buscando %d mensagem"
+msgstr[1] "Buscando %d mensagens"
+
+#: ../mail/e-mail-folder-utils.c:834
+#, c-format
+msgid "Removing folder '%s'"
+msgstr "Removendo pasta \"%s\""
+
+#: ../mail/e-mail-folder-utils.c:968
+#, c-format
+msgid "File \"%s\" has been removed."
+msgstr "Arquivo \"%s\" foi removido."
+
+#: ../mail/e-mail-folder-utils.c:972
+msgid "File has been removed."
+msgstr "Arquivo foi removido."
+
+#: ../mail/e-mail-folder-utils.c:1031
+msgid "Removing attachments"
+msgstr "Removendo anexos"
+
+#: ../mail/e-mail-folder-utils.c:1195
+#, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messages"
+msgstr[0] "Salvando %d mensagem"
+msgstr[1] "Salvando %d mensagens"
+
+#: ../mail/e-mail-folder-utils.c:1539 ../mail/em-folder-utils.c:613
+#, c-format
+msgid "Invalid folder URI '%s'"
+msgstr "URI da pasta invÃlida \"%s\""
+
+#. Label + combo box has a 12px left margin so it's
+#. * aligned with the junk mail options above it.
+#: ../mail/e-mail-junk-options.c:252
+msgid "Junk filtering software:"
+msgstr "Software de filtragem de lixo:"
+
+#: ../mail/e-mail-label-dialog.c:223
+msgid "_Label name:"
+msgstr "_Nome do rÃtulo:"
+
+#: ../mail/e-mail-label-list-store.c:41
+msgid "I_mportant"
+msgstr "I_mportante"
+
+#. red
+#: ../mail/e-mail-label-list-store.c:42
+msgid "_Work"
+msgstr "_Trabalho"
+
+#. orange
+#: ../mail/e-mail-label-list-store.c:43
+msgid "_Personal"
+msgstr "_Pessoal"
+
+#. green
+#: ../mail/e-mail-label-list-store.c:44
+msgid "_To Do"
+msgstr "A fa_zer"
+
+#. blue
+#: ../mail/e-mail-label-list-store.c:45
+msgid "_Later"
+msgstr "Mais _tarde"
+
+#: ../mail/e-mail-label-manager.c:165
+#: ../modules/mail/e-mail-shell-view-actions.c:684
+msgid "Add Label"
+msgstr "Adicionar rÃtulo"
+
+#: ../mail/e-mail-label-manager.c:216
+msgid "Edit Label"
+msgstr "Editar rÃtulo"
+
+#: ../mail/e-mail-label-manager.c:350
+msgid ""
+"Note: Underscore in the label name is used\n"
+"as mnemonic identifier in menu."
+msgstr ""
+"Nota: O sublinhado no nome do rÃtulo indica que ele à usado\n"
 "como identificador mnemÃnico no menu."
 
-#: ../mail/e-mail-label-tree-view.c:82
+#: ../mail/e-mail-label-tree-view.c:88
 msgid "Color"
 msgstr "Cor"
 
-#: ../mail/e-mail-label-tree-view.c:92
-#: ../modules/plugin-manager/evolution-plugin-manager.c:66
-#: ../plugins/caldav/caldav-browse-server.c:1296
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../widgets/menus/gal-define-views-dialog.c:334
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+#: ../mail/e-mail-label-tree-view.c:98
+#: ../modules/plugin-manager/evolution-plugin-manager.c:69
+#: ../plugins/caldav/caldav-browse-server.c:1358
+#: ../widgets/menus/gal-define-views-dialog.c:347
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:92
 msgid "Name"
 msgstr "Nome"
 
-#: ../mail/e-mail-local.c:35 ../mail/em-folder-properties.c:285
-#: ../mail/em-folder-tree-model.c:737 ../mail/em-folder-tree.c:3132
-#: ../modules/mail/e-mail-shell-view-private.c:1118
-#: ../modules/mail/e-mail-shell-view-private.c:1129
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-properties.c:312
+#: ../mail/em-folder-tree-model.c:720
+#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../modules/mail/e-mail-shell-view-private.c:1077
 msgid "Inbox"
 msgstr "Entrada"
 
-#: ../mail/e-mail-local.c:36 ../mail/em-folder-tree-model.c:729
-#: ../modules/mail/e-mail-shell-view-private.c:1116
+#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:713
+#: ../modules/mail/e-mail-shell-view-private.c:1064
 msgid "Drafts"
 msgstr "Rascunhos"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-tree-model.c:741
-#: ../modules/mail/e-mail-shell-view-private.c:1120
+#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:724
+#: ../modules/mail/e-mail-shell-view-private.c:1068
 msgid "Outbox"
 msgstr "SaÃda"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:743
-#: ../modules/mail/e-mail-shell-view-private.c:1122
+#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:728
+#: ../modules/mail/e-mail-shell-view-private.c:1070
 msgid "Sent"
 msgstr "Enviadas"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:732
-#: ../modules/mail/e-mail-shell-view-private.c:1124
+#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:716
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:581
+#: ../plugins/templates/templates.c:1034 ../plugins/templates/templates.c:1312
+#: ../plugins/templates/templates.c:1322
 msgid "Templates"
 msgstr "Modelos"
 
-#: ../mail/e-mail-migrate.c:131
+#: ../mail/e-mail-migrate.c:134
 msgid "Migrating..."
 msgstr "Migrando..."
 
-#: ../mail/e-mail-migrate.c:164
+#: ../mail/e-mail-migrate.c:169
 msgid "Migration"
 msgstr "MigraÃÃo"
 
-#: ../mail/e-mail-migrate.c:204
+#: ../mail/e-mail-migrate.c:210
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Migrando \"%s\":"
 
-#: ../mail/e-mail-migrate.c:660
+#: ../mail/e-mail-migrate.c:728
 msgid "Migrating Folders"
 msgstr "Migrando pastas"
 
-#: ../mail/e-mail-migrate.c:661
+#: ../mail/e-mail-migrate.c:729
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -8313,722 +8511,701 @@ msgstr ""
 "O formato de resumo das pastas da caixa de correio do Evolution foi movido "
 "para SQLite desde o Evolution 2.24.\n"
 "\n"
-"Por favor seja paciente enquanto o Evolution migra suas pastas..."
+"Por favor, seja paciente enquanto o Evolution migra suas pastas..."
 
-#: ../mail/e-mail-migrate.c:1126
+#: ../mail/e-mail-migrate.c:1527
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "NÃo foi possÃvel criar pastas locais de correio em \"%s\": %s"
 
-#: ../mail/e-mail-notebook-view.c:562
+#: ../mail/e-mail-notebook-view.c:621
 msgid "Please select a folder"
 msgstr "Por favor, selecione uma pasta"
 
-#. XXX e-error should provide a widget layout and API suitable
-#. *     for packing additional widgets to the right of the alert
-#. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:111
-#: ../modules/calendar/e-task-shell-view-actions.c:576
-msgid "Do not ask me again"
-msgstr "NÃo me pergunte novamente"
-
-#: ../mail/e-mail-reader.c:306 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:308 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Copiar para pasta"
 
-#: ../mail/e-mail-reader.c:306 ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:308 ../mail/em-folder-utils.c:487
 msgid "C_opy"
 msgstr "C_opiar"
 
-#. Translators: %s is replaced with a folder name
-#. %d with count of duplicate messages.
-#: ../mail/e-mail-reader.c:523
-#, c-format
-msgid ""
-"Folder '%s' contains %d duplicate message. Are you sure you want to delete "
-"it?"
-msgid_plural ""
-"Folder '%s' contains %d duplicate messages. Are you sure you want to delete "
-"them?"
-msgstr[0] ""
-"Pasta \"%s\" contÃm %d mensagem duplicada. Vocà tem certeza que deseja apagÃ-"
-"la?"
-msgstr[1] ""
-"Pasta \"%s\" contÃm %d mensagens duplicadas. Vocà tem certeza que deseja "
-"apagÃ-las?"
-
-#: ../mail/e-mail-reader.c:986 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:814 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Mover para a pasta"
 
-#: ../mail/e-mail-reader.c:986 ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:814 ../mail/em-folder-utils.c:487
 msgid "_Move"
 msgstr "_Mover"
 
-#. Check buttons
-#: ../mail/e-mail-reader.c:1265 ../mail/e-mail-reader.c:1421
-#: ../mail/e-mail-reader.c:1463
+#: ../mail/e-mail-reader.c:1175 ../mail/e-mail-reader.c:1363
+#: ../mail/e-mail-reader.c:1403
 msgid "_Do not ask me again."
 msgstr "_NÃo me pergunte novamente."
 
-#: ../mail/e-mail-reader.c:1468
+#: ../mail/e-mail-reader.c:1409
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Sempre ignorar Responder para: para listas de e-mail."
 
-#: ../mail/e-mail-reader.c:1575
-msgid "Save Message"
-msgid_plural "Save Messages"
-msgstr[0] "Salvar mensagem"
-msgstr[1] "Salvar mensagens"
-
-#. Translators: This is a part of a suggested file name
-#. * used when saving a message or multiple messages to an
-#. * mbox format, when the first message doesn't have a
-#. * Subject. The extension ".mbox" is appended to this
-#. * string, thus it will be something like "Message.mbox"
-#. * at the end.
-#: ../mail/e-mail-reader.c:1596
-#: ../plugins/groupwise-features/notification.ui.h:1
-#: ../plugins/groupwise-features/properties.ui.h:3
-msgid "Message"
-msgid_plural "Messages"
-msgstr[0] "Mensagem"
-msgstr[1] "Mensagens"
-
-#: ../mail/e-mail-reader.c:1870
+#: ../mail/e-mail-reader.c:1775
 msgid "A_dd Sender to Address Book"
 msgstr "A_dicionar remetente ao catÃlogo de endereÃos"
 
-#: ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:1777
 msgid "Add sender to address book"
 msgstr "Adiciona o remetente ao catÃlogo de endereÃos"
 
-#: ../mail/e-mail-reader.c:1877
+#: ../mail/e-mail-reader.c:1782
 msgid "Check for _Junk"
 msgstr "Verificar por _spam"
 
-#: ../mail/e-mail-reader.c:1879
+#: ../mail/e-mail-reader.c:1784
 msgid "Filter the selected messages for junk status"
 msgstr "Filtra as mensagens selecionadas pelo status de spam"
 
-#: ../mail/e-mail-reader.c:1884
+#: ../mail/e-mail-reader.c:1789
 msgid "_Copy to Folder..."
 msgstr "Copiar para p_asta..."
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:1791
 msgid "Copy selected messages to another folder"
 msgstr "Copia as mensagens selecionadas para outra pasta"
 
-#: ../mail/e-mail-reader.c:1891
+#: ../mail/e-mail-reader.c:1796
 msgid "_Delete Message"
 msgstr "E_xcluir mensagem"
 
-#: ../mail/e-mail-reader.c:1893
+#: ../mail/e-mail-reader.c:1798
 msgid "Mark the selected messages for deletion"
 msgstr "Marca as mensagens selecionadas para exclusÃo"
 
-#: ../mail/e-mail-reader.c:1898
+#: ../mail/e-mail-reader.c:1803
 msgid "Filter on Mailing _List..."
 msgstr "Filtro por _lista de discussÃo..."
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:1805
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Cria uma regra para filtrar mensagens para esta lista de discussÃo"
 
-#: ../mail/e-mail-reader.c:1905
+#: ../mail/e-mail-reader.c:1810
 msgid "Filter on _Recipients..."
 msgstr "Filtro por _destinatÃrios..."
 
-#: ../mail/e-mail-reader.c:1907
+#: ../mail/e-mail-reader.c:1812
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Cria uma regra para filtrar mensagens para estes destinatÃrios"
 
-#: ../mail/e-mail-reader.c:1912
+#: ../mail/e-mail-reader.c:1817
 msgid "Filter on Se_nder..."
 msgstr "Filtro por _remetente..."
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:1819
 msgid "Create a rule to filter messages from this sender"
 msgstr "Cria uma regra para filtrar mensagens deste remetente"
 
-#: ../mail/e-mail-reader.c:1919
+#: ../mail/e-mail-reader.c:1824
 msgid "Filter on _Subject..."
 msgstr "Filtro por _assunto..."
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:1826
 msgid "Create a rule to filter messages with this subject"
 msgstr "Cria uma regra para filtrar mensagens com este assunto"
 
-#: ../mail/e-mail-reader.c:1926
+#: ../mail/e-mail-reader.c:1831
 msgid "A_pply Filters"
 msgstr "A_plicar filtros"
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:1833
 msgid "Apply filter rules to the selected messages"
 msgstr "Aplica as regras de filtros Ãs mensagens selecionadas"
 
-#: ../mail/e-mail-reader.c:1933
+#: ../mail/e-mail-reader.c:1838
 msgid "_Find in Message..."
 msgstr "_Localizar na mensagem..."
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:1840
 msgid "Search for text in the body of the displayed message"
 msgstr "Pesquisa texto no corpo da mensagem exibida"
 
-#: ../mail/e-mail-reader.c:1940
+#: ../mail/e-mail-reader.c:1845
 msgid "_Clear Flag"
 msgstr "Lim_par marca"
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:1847
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Remove o sinalizador de acompanhamento das mensagens selecionadas"
 
-#: ../mail/e-mail-reader.c:1947
+#: ../mail/e-mail-reader.c:1852
 msgid "_Flag Completed"
 msgstr "Marcar como concl_uÃda"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:1854
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Define o sinalizador de acompanhamento nas mensagens selecionadas"
 
-#: ../mail/e-mail-reader.c:1954
+#: ../mail/e-mail-reader.c:1859
 msgid "Follow _Up..."
 msgstr "_Lembrete..."
 
-#: ../mail/e-mail-reader.c:1956
+#: ../mail/e-mail-reader.c:1861
 msgid "Flag the selected messages for follow-up"
 msgstr "Sinaliza as mensagens selecionadas para acompanhamento"
 
-#: ../mail/e-mail-reader.c:1961
+#: ../mail/e-mail-reader.c:1866
 msgid "_Attached"
 msgstr "_Anexada"
 
-#: ../mail/e-mail-reader.c:1963 ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:1868 ../mail/e-mail-reader.c:1875
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Encaminha a mensagem selecionada a alguÃm como um anexo"
 
-#: ../mail/e-mail-reader.c:1968
+#: ../mail/e-mail-reader.c:1873
 msgid "Forward As _Attached"
 msgstr "_Encaminhar como anexada"
 
-#: ../mail/e-mail-reader.c:1975
+#: ../mail/e-mail-reader.c:1880
 msgid "_Inline"
 msgstr "_Embutida"
 
-#: ../mail/e-mail-reader.c:1977 ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1889
 msgid "Forward the selected message in the body of a new message"
 msgstr "Encaminha a mensagem selecionada no corpo da nova mensagem"
 
-#: ../mail/e-mail-reader.c:1982
+#: ../mail/e-mail-reader.c:1887
 msgid "Forward As _Inline"
 msgstr "Encaminhar como _inline"
 
-#: ../mail/e-mail-reader.c:1989
+#: ../mail/e-mail-reader.c:1894
 msgid "_Quoted"
 msgstr "_Citada"
 
-#: ../mail/e-mail-reader.c:1991 ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:1896 ../mail/e-mail-reader.c:1903
 msgid "Forward the selected message quoted like a reply"
 msgstr "Encaminha a mensagem selecionada citada como uma resposta"
 
-#: ../mail/e-mail-reader.c:1996
+#: ../mail/e-mail-reader.c:1901
 msgid "Forward As _Quoted"
 msgstr "Encaminhar como _citada"
 
-#: ../mail/e-mail-reader.c:2003
+#: ../mail/e-mail-reader.c:1908
 msgid "_Load Images"
 msgstr "Carregar _imagens"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:1910
 msgid "Force images in HTML mail to be loaded"
 msgstr "ForÃa as imagens em correio HTML a serem carregadas"
 
-#: ../mail/e-mail-reader.c:2010
+#: ../mail/e-mail-reader.c:1915
 msgid "_Important"
 msgstr "_Importante"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:1917
 msgid "Mark the selected messages as important"
 msgstr "Marca as mensagens selecionadas como importantes"
 
-#: ../mail/e-mail-reader.c:2017
+#: ../mail/e-mail-reader.c:1922
 msgid "_Junk"
 msgstr "_Spam"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:1924
 msgid "Mark the selected messages as junk"
 msgstr "Marca as mensagens selecionadas como spam"
 
-#: ../mail/e-mail-reader.c:2024
+#: ../mail/e-mail-reader.c:1929
 msgid "_Not Junk"
 msgstr "_NÃo à spam"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:1931
 msgid "Mark the selected messages as not being junk"
 msgstr "Marca as mensagens selecionadas como nÃo sendo spam"
 
-#: ../mail/e-mail-reader.c:2031
+#: ../mail/e-mail-reader.c:1936
 msgid "_Read"
 msgstr "_Lida"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:1938
 msgid "Mark the selected messages as having been read"
 msgstr "Marca as mensagens selecionadas como lidas"
 
-#: ../mail/e-mail-reader.c:2038
+#: ../mail/e-mail-reader.c:1943
 msgid "Uni_mportant"
 msgstr "NÃo i_mportante"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:1945
 msgid "Mark the selected messages as unimportant"
 msgstr "Marca as mensagens selecionadas como sem importÃncia"
 
-#: ../mail/e-mail-reader.c:2045
+#: ../mail/e-mail-reader.c:1950
 msgid "_Unread"
 msgstr "_NÃo lida"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:1952
 msgid "Mark the selected messages as not having been read"
 msgstr "Marca as mensagens selecionadas como nÃo lidas"
 
-#: ../mail/e-mail-reader.c:2052
+#: ../mail/e-mail-reader.c:1957
 msgid "_Edit as New Message..."
 msgstr "_Editar como nova mensagem..."
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:1959
 msgid "Open the selected messages in the composer for editing"
 msgstr "Abre a mensagem selecionada para ediÃÃo"
 
-#: ../mail/e-mail-reader.c:2059
+#: ../mail/e-mail-reader.c:1964
 msgid "Compose _New Message"
 msgstr "Redigir _nova mensagem"
 
-#: ../mail/e-mail-reader.c:2061
+#: ../mail/e-mail-reader.c:1966
 msgid "Open a window for composing a mail message"
 msgstr "Abre uma janela para redigir uma mensagem"
 
-#: ../mail/e-mail-reader.c:2066
+#: ../mail/e-mail-reader.c:1971
 msgid "_Open in New Window"
 msgstr "Abrir em n_ova janela"
 
-#: ../mail/e-mail-reader.c:2068
+#: ../mail/e-mail-reader.c:1973
 msgid "Open the selected messages in a new window"
 msgstr "Abre a mensagem selecionada em uma nova janela"
 
-#: ../mail/e-mail-reader.c:2073
+#: ../mail/e-mail-reader.c:1978
 msgid "_Move to Folder..."
 msgstr "_Mover para pasta..."
 
-#: ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:1980
 msgid "Move selected messages to another folder"
 msgstr "Moveras mensagens selecionadas para outra pasta"
 
-#: ../mail/e-mail-reader.c:2080
+#: ../mail/e-mail-reader.c:1985
 msgid "_Switch to Folder"
 msgstr "Al_ternar para pasta"
 
-#: ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:1987
 msgid "Display the parent folder"
 msgstr "Exibir a pasta pai"
 
-#: ../mail/e-mail-reader.c:2087
+#: ../mail/e-mail-reader.c:1992
 msgid "Switch to _next tab"
 msgstr "Alternar para prÃxi_ma aba"
 
-#: ../mail/e-mail-reader.c:2089
+#: ../mail/e-mail-reader.c:1994
 msgid "Switch to the next tab"
 msgstr "Alterna para prÃxima aba"
 
-#: ../mail/e-mail-reader.c:2094
+#: ../mail/e-mail-reader.c:1999
 msgid "Switch to _previous tab"
 msgstr "Alternar para aba an_terior"
 
-#: ../mail/e-mail-reader.c:2096
+#: ../mail/e-mail-reader.c:2001
 msgid "Switch to the previous tab"
 msgstr "Alterna para aba anterior"
 
-#: ../mail/e-mail-reader.c:2101
+#: ../mail/e-mail-reader.c:2006
 msgid "Cl_ose current tab"
 msgstr "Fe_char a aba atual"
 
-#: ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:2008
 msgid "Close current tab"
 msgstr "Fecha a aba atual"
 
-#: ../mail/e-mail-reader.c:2108
+#: ../mail/e-mail-reader.c:2013
 msgid "_Next Message"
 msgstr "_PrÃxima mensagem"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2015
 msgid "Display the next message"
 msgstr "Exibe a prÃxima mensagem"
 
-#: ../mail/e-mail-reader.c:2115
+#: ../mail/e-mail-reader.c:2020
 msgid "Next _Important Message"
 msgstr "PrÃxima mensagem _importante"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2022
 msgid "Display the next important message"
 msgstr "Exibe a prÃxima mensagem importante"
 
-#: ../mail/e-mail-reader.c:2122
+#: ../mail/e-mail-reader.c:2027
 msgid "Next _Thread"
 msgstr "PrÃxima _discussÃo"
 
-#: ../mail/e-mail-reader.c:2124
+#: ../mail/e-mail-reader.c:2029
 msgid "Display the next thread"
 msgstr "Exibe o prÃximo tÃpico"
 
-#: ../mail/e-mail-reader.c:2129
+#: ../mail/e-mail-reader.c:2034
 msgid "Next _Unread Message"
 msgstr "PrÃxima mensagem _nÃo lida"
 
-#: ../mail/e-mail-reader.c:2131
+#: ../mail/e-mail-reader.c:2036
 msgid "Display the next unread message"
 msgstr "Exibe a prÃxima mensagem nÃo lida"
 
-#: ../mail/e-mail-reader.c:2136
+#: ../mail/e-mail-reader.c:2041
 msgid "_Previous Message"
 msgstr "_Mensagem anterior"
 
-#: ../mail/e-mail-reader.c:2138
+#: ../mail/e-mail-reader.c:2043
 msgid "Display the previous message"
 msgstr "Exibe a mensagem anterior"
 
-#: ../mail/e-mail-reader.c:2143
+#: ../mail/e-mail-reader.c:2048
 msgid "Pr_evious Important Message"
 msgstr "Mensagem im_portante anterior"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2050
 msgid "Display the previous important message"
 msgstr "Exibe a mensagem importante anterior"
 
-#: ../mail/e-mail-reader.c:2150
-#| msgid "_Previous Message"
+#: ../mail/e-mail-reader.c:2055
 msgid "Previous T_hread"
 msgstr "DiscussÃo an_terior"
 
-#: ../mail/e-mail-reader.c:2152
-#| msgid "Display the previous message"
+#: ../mail/e-mail-reader.c:2057
 msgid "Display the previous thread"
 msgstr "Exibe a discussÃo anterior"
 
-#: ../mail/e-mail-reader.c:2157
+#: ../mail/e-mail-reader.c:2062
 msgid "P_revious Unread Message"
 msgstr "Mensagem nÃo lida an_terior"
 
-#: ../mail/e-mail-reader.c:2159
+#: ../mail/e-mail-reader.c:2064
 msgid "Display the previous unread message"
 msgstr "Exibe a mensagem nÃo lida anterior"
 
-#: ../mail/e-mail-reader.c:2166
+#: ../mail/e-mail-reader.c:2071
 msgid "Print this message"
 msgstr "Imprime esta mensagem"
 
-#: ../mail/e-mail-reader.c:2173
+#: ../mail/e-mail-reader.c:2078
 msgid "Preview the message to be printed"
 msgstr "Visualiza a mensagem a ser impressa"
 
-#: ../mail/e-mail-reader.c:2178
+#: ../mail/e-mail-reader.c:2083
 msgid "Re_direct"
 msgstr "_Redirecionada"
 
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2085
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redireciona (bounce) a mensagem selecionada para alguÃm"
 
-#: ../mail/e-mail-reader.c:2185
-#| msgid "Save Attachment"
-#| msgid_plural "Save Attachments"
+#: ../mail/e-mail-reader.c:2090
 msgid "Remo_ve Attachments"
 msgstr "Remo_ver anexos"
 
-#: ../mail/e-mail-reader.c:2187
-#| msgid "Save Attachment"
-#| msgid_plural "Save Attachments"
+#: ../mail/e-mail-reader.c:2092
 msgid "Remove attachments"
 msgstr "Remove os anexos"
 
-#: ../mail/e-mail-reader.c:2192
-#| msgid "Recent Messages"
+#: ../mail/e-mail-reader.c:2097
 msgid "Remove Du_plicate Messages"
 msgstr "Remove as mensagens du_plicadas"
 
-#: ../mail/e-mail-reader.c:2194
-#| msgid "Mark the selected messages for deletion"
+#: ../mail/e-mail-reader.c:2099
 msgid "Checks selected messages for duplicates"
 msgstr "Marca as mensagens selecionadas para duplicaÃÃo"
 
-#: ../mail/e-mail-reader.c:2199 ../mail/mail.error.xml.h:102
-#: ../modules/calendar/e-cal-shell-view-actions.c:1465
-#: ../modules/mail/e-mail-attachment-handler.c:173
+#: ../mail/e-mail-reader.c:2104 ../mail/mail.error.xml.h:109
+#: ../modules/calendar/e-cal-shell-view-actions.c:1510
+#: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: ../mail/e-mail-reader.c:2201
+#: ../mail/e-mail-reader.c:2106
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr ""
 "Redige uma resposta para todos os destinatÃrios da mensagem selecionada"
 
-#: ../mail/e-mail-reader.c:2206 ../mail/mail.error.xml.h:103
+#: ../mail/e-mail-reader.c:2111 ../mail/mail.error.xml.h:110
 msgid "Reply to _List"
 msgstr "Responder à _lista"
 
-#: ../mail/e-mail-reader.c:2208
+#: ../mail/e-mail-reader.c:2113
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Redige uma resposta à lista de discussÃo da mensagem selecionada"
 
-#: ../mail/e-mail-reader.c:2213
-#: ../modules/mail/e-mail-attachment-handler.c:180
+#: ../mail/e-mail-reader.c:2118
+#: ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "Responder ao _remetente"
 
-#: ../mail/e-mail-reader.c:2215
+#: ../mail/e-mail-reader.c:2120
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Redige uma resposta ao remetente da mensagem selecionada"
 
-#: ../mail/e-mail-reader.c:2220
+#: ../mail/e-mail-reader.c:2125
 msgid "_Save as mbox..."
 msgstr "_Salvar como mbox..."
 
-#: ../mail/e-mail-reader.c:2222
+#: ../mail/e-mail-reader.c:2127
 msgid "Save selected messages as an mbox file"
 msgstr "Salva a mensagem selecionada como um arquivo mbox"
 
-#: ../mail/e-mail-reader.c:2227
-msgid "Search Folder from Mailing _List..."
-msgstr "Pasta de pesquisa a partir de _lista de discussÃo..."
-
-#: ../mail/e-mail-reader.c:2229
-msgid "Create a search folder for this mailing list"
-msgstr "Cria uma pasta de pesquisa para esta lista de discussÃo"
-
-#: ../mail/e-mail-reader.c:2234
-msgid "Search Folder from Recipien_ts..."
-msgstr "Pasta de Pesquisa a partir de des_tinatÃrios..."
-
-#: ../mail/e-mail-reader.c:2236
-msgid "Create a search folder for these recipients"
-msgstr "Cria uma pasta de pesquisa para estes destinatÃrios"
-
-#: ../mail/e-mail-reader.c:2241
-msgid "Search Folder from Sen_der..."
-msgstr "Pasta _de pesquisa a partir de remetente..."
-
-#: ../mail/e-mail-reader.c:2243
-msgid "Create a search folder for this sender"
-msgstr "Cria uma pasta de pesquisa para este remetente"
-
-#: ../mail/e-mail-reader.c:2248
-msgid "Search Folder from S_ubject..."
-msgstr "Pasta de Pesquisa a partir de ass_unto..."
-
-#: ../mail/e-mail-reader.c:2250
-msgid "Create a search folder for this subject"
-msgstr "Cria uma pasta de pesquisa para este assunto"
-
-#: ../mail/e-mail-reader.c:2255
+#: ../mail/e-mail-reader.c:2132
 msgid "_Message Source"
 msgstr "_CÃdigo-fonte da mensagem"
 
-#: ../mail/e-mail-reader.c:2257
+#: ../mail/e-mail-reader.c:2134
 msgid "Show the raw email source of the message"
 msgstr "Mostra o cÃdigo-fonte bruto do e-mail"
 
-#: ../mail/e-mail-reader.c:2269
+#: ../mail/e-mail-reader.c:2146
 msgid "_Undelete Message"
 msgstr "_Desfazer exclusÃo da mensagem"
 
-#: ../mail/e-mail-reader.c:2271
+#: ../mail/e-mail-reader.c:2148
 msgid "Undelete the selected messages"
 msgstr "Desfaz a exclusÃo das mensagens selecionadas"
 
-#: ../mail/e-mail-reader.c:2276
+#: ../mail/e-mail-reader.c:2153
 msgid "_Normal Size"
 msgstr "Tamanho _normal"
 
-#: ../mail/e-mail-reader.c:2278
+#: ../mail/e-mail-reader.c:2155
 msgid "Reset the text to its original size"
 msgstr "Restaura o tamanho original do texto"
 
-#: ../mail/e-mail-reader.c:2283
+#: ../mail/e-mail-reader.c:2160
 msgid "_Zoom In"
 msgstr "_Ampliar"
 
-#: ../mail/e-mail-reader.c:2285
+#: ../mail/e-mail-reader.c:2162
 msgid "Increase the text size"
 msgstr "Aumenta o tamanho do texto"
 
-#: ../mail/e-mail-reader.c:2290
+#: ../mail/e-mail-reader.c:2167
 msgid "Zoom _Out"
 msgstr "_Reduzir"
 
-#: ../mail/e-mail-reader.c:2292
+#: ../mail/e-mail-reader.c:2169
 msgid "Decrease the text size"
 msgstr "Diminui o tamanho do texto"
 
-#: ../mail/e-mail-reader.c:2299
+#: ../mail/e-mail-reader.c:2176
 msgid "Create R_ule"
 msgstr "Criar re_gra"
 
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2183
 msgid "Ch_aracter Encoding"
 msgstr "C_odificaÃÃo de caracteres"
 
-#: ../mail/e-mail-reader.c:2313
+#: ../mail/e-mail-reader.c:2190
 msgid "F_orward As"
 msgstr "E_ncaminhar como"
 
-#: ../mail/e-mail-reader.c:2320
+#: ../mail/e-mail-reader.c:2197
 msgid "_Group Reply"
 msgstr "_Responder grupo"
 
-#: ../mail/e-mail-reader.c:2327
+#: ../mail/e-mail-reader.c:2204
 msgid "_Go To"
 msgstr "_Ir para"
 
-#: ../mail/e-mail-reader.c:2334
+#: ../mail/e-mail-reader.c:2211
 msgid "Mar_k As"
 msgstr "M_arcar como"
 
-#: ../mail/e-mail-reader.c:2341
+#: ../mail/e-mail-reader.c:2218
 msgid "_Message"
 msgstr "_Mensagem"
 
-#: ../mail/e-mail-reader.c:2348
+#: ../mail/e-mail-reader.c:2225
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../mail/e-mail-reader.c:2373
+#: ../mail/e-mail-reader.c:2235
+msgid "Search Folder from Mailing _List..."
+msgstr "Pasta de pesquisa a partir de _lista de discussÃo..."
+
+#: ../mail/e-mail-reader.c:2237
+msgid "Create a search folder for this mailing list"
+msgstr "Cria uma pasta de pesquisa para esta lista de discussÃo"
+
+#: ../mail/e-mail-reader.c:2242
+msgid "Search Folder from Recipien_ts..."
+msgstr "Pasta de Pesquisa a partir de des_tinatÃrios..."
+
+#: ../mail/e-mail-reader.c:2244
+msgid "Create a search folder for these recipients"
+msgstr "Cria uma pasta de pesquisa para estes destinatÃrios"
+
+#: ../mail/e-mail-reader.c:2249
+msgid "Search Folder from Sen_der..."
+msgstr "Pasta _de pesquisa a partir de remetente..."
+
+#: ../mail/e-mail-reader.c:2251
+msgid "Create a search folder for this sender"
+msgstr "Cria uma pasta de pesquisa para este remetente"
+
+#: ../mail/e-mail-reader.c:2256
+msgid "Search Folder from S_ubject..."
+msgstr "Pasta de Pesquisa a partir de ass_unto..."
+
+#: ../mail/e-mail-reader.c:2258
+msgid "Create a search folder for this subject"
+msgstr "Cria uma pasta de pesquisa para este assunto"
+
+#: ../mail/e-mail-reader.c:2281
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar como _lembrete..."
 
-#: ../mail/e-mail-reader.c:2381
+#: ../mail/e-mail-reader.c:2289
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: ../mail/e-mail-reader.c:2385
+#: ../mail/e-mail-reader.c:2293
 msgid "Mark as _Junk"
 msgstr "Marcar como _spam"
 
-#: ../mail/e-mail-reader.c:2389
+#: ../mail/e-mail-reader.c:2297
 msgid "Mark as _Not Junk"
 msgstr "Marcar como _nÃo spam"
 
-#: ../mail/e-mail-reader.c:2393
+#: ../mail/e-mail-reader.c:2301
 msgid "Mar_k as Read"
 msgstr "Marcar como li_da"
 
-#: ../mail/e-mail-reader.c:2397
+#: ../mail/e-mail-reader.c:2305
 msgid "Mark as Uni_mportant"
 msgstr "Marcar como sem _importÃncia"
 
-#: ../mail/e-mail-reader.c:2401
+#: ../mail/e-mail-reader.c:2309
 msgid "Mark as _Unread"
 msgstr "Marcar como _nÃo lida"
 
-#: ../mail/e-mail-reader.c:2445
+#: ../mail/e-mail-reader.c:2353
 msgid "_Caret Mode"
 msgstr "Modo _cursor"
 
-#: ../mail/e-mail-reader.c:2447
+#: ../mail/e-mail-reader.c:2355
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Mostra um cursor intermitente no corpo das mensagens exibidas"
 
-#: ../mail/e-mail-reader.c:2453
+#: ../mail/e-mail-reader.c:2361
 msgid "All Message _Headers"
 msgstr "Todos os ca_beÃalhos de mensagem"
 
-#: ../mail/e-mail-reader.c:2455
+#: ../mail/e-mail-reader.c:2363
 msgid "Show messages with all email headers"
 msgstr "Mostra a mensagem com todos os cabeÃalhos de e-mail"
 
-#: ../mail/e-mail-reader.c:2693
-msgid "Unable to retrieve message"
-msgstr "NÃo foi possÃvel obter a mensagem"
-
-#: ../mail/e-mail-reader.c:2755 ../mail/mail-ops.c:2068
+#: ../mail/e-mail-reader.c:2659
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Recuperando mensagem '%s'"
 
 #. we changed user, thus reset the chosen calendar combo too, because
-#. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:3373 ../mail/mail-config.ui.h:31
-#: ../plugins/google-account-setup/google-source.c:304
-#: ../plugins/google-account-setup/google-source.c:538
-#: ../plugins/google-account-setup/google-source.c:674
-#: ../widgets/misc/e-account-tree-view.c:249
+#. * other user means other calendars subscribed
+#: ../mail/e-mail-reader.c:3246 ../mail/mail-config.ui.h:32
+#: ../plugins/google-account-setup/google-source.c:316
+#: ../plugins/google-account-setup/google-source.c:565
+#: ../plugins/google-account-setup/google-source.c:704
+#: ../widgets/misc/e-account-tree-view.c:253
 msgid "Default"
 msgstr "PadrÃo"
 
-#: ../mail/e-mail-reader.c:3544
-#: ../modules/mail/e-mail-attachment-handler.c:166
+#: ../mail/e-mail-reader.c:3415
+#: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "E_ncaminhar"
 
-#: ../mail/e-mail-reader.c:3545
+#: ../mail/e-mail-reader.c:3416
 msgid "Forward the selected message to someone"
 msgstr "Encaminha a mensagem selecionada a alguÃm"
 
-#: ../mail/e-mail-reader.c:3564
+#: ../mail/e-mail-reader.c:3435
 msgid "Group Reply"
 msgstr "Responder ao grupo"
 
-#: ../mail/e-mail-reader.c:3565
+#: ../mail/e-mail-reader.c:3436
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Redige uma resposta à lista de discussÃo, ou a todos os destinatÃrios"
 
-#: ../mail/e-mail-reader.c:3610 ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:746
+#: ../mail/e-mail-reader.c:3489 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "Excluir"
 
-#: ../mail/e-mail-reader.c:3643
-#: ../modules/calendar/e-cal-shell-view-actions.c:1311
-#: ../widgets/misc/e-calendar.c:201
+#: ../mail/e-mail-reader.c:3522
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../widgets/misc/e-calendar.c:202
 msgid "Next"
 msgstr "PrÃxima"
 
-#: ../mail/e-mail-reader.c:3647
-#: ../modules/calendar/e-cal-shell-view-actions.c:1304
-#: ../widgets/misc/e-calendar.c:177
+#: ../mail/e-mail-reader.c:3526
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../widgets/misc/e-calendar.c:178
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../mail/e-mail-reader.c:3657 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:3535 ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "Responder"
 
-#: ../mail/e-mail-reader.c:4292
+#: ../mail/e-mail-reader.c:4205
 #, c-format
 msgid "Folder '%s'"
 msgstr "Pasta \"%s\""
 
-#: ../mail/e-mail-session.c:643
+#: ../mail/e-mail-reader-utils.c:145
+msgid "Do not warn me again"
+msgstr "NÃo me avise novamente"
+
+#. Translators: %s is replaced with a folder
+#. * name %u with count of duplicate messages.
+#: ../mail/e-mail-reader-utils.c:670
+#, c-format
+msgid ""
+"Folder '%s' contains %u duplicate message. Are you sure you want to delete "
+"it?"
+msgid_plural ""
+"Folder '%s' contains %u duplicate messages. Are you sure you want to delete "
+"them?"
+msgstr[0] ""
+"Pasta \"%s\" contÃm %u mensagem duplicada. Vocà tem certeza que deseja apagÃ-"
+"la?"
+msgstr[1] ""
+"Pasta \"%s\" contÃm %u mensagens duplicadas. Vocà tem certeza que deseja "
+"apagÃ-las?"
+
+#: ../mail/e-mail-reader-utils.c:1047
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "Salvar mensagem"
+msgstr[1] "Salvar mensagens"
+
+#. Translators: This is part of a suggested file name
+#. * used when saving a message or multiple messages to
+#. * mbox format, when the first message doesn't have a
+#. * subject.  The extension ".mbox" is appended to the
+#. * string; for example "Message.mbox".
+#: ../mail/e-mail-reader-utils.c:1068
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "Mensagem"
+msgstr[1] "Mensagens"
+
+#: ../mail/e-mail-session.c:870
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Digite a frase secreta para %s"
 
-#: ../mail/e-mail-session.c:645
+#: ../mail/e-mail-session.c:874
 msgid "Enter Passphrase"
 msgstr "Digite a frase secreta"
 
-#: ../mail/e-mail-session.c:648
+#: ../mail/e-mail-session.c:878
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Digite a senha para %s"
 
-#: ../mail/e-mail-session.c:650
+#: ../mail/e-mail-session.c:882
 msgid "Enter Password"
 msgstr "Digite a senha"
 
-#: ../mail/e-mail-session.c:701
+#: ../mail/e-mail-session.c:933
 #, c-format
 msgid "User canceled operation."
 msgstr "O usuÃrio cancelou a operaÃÃo."
 
-#: ../mail/e-mail-session.c:871
+#: ../mail/e-mail-session.c:1046
 #, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
@@ -9036,31 +9213,25 @@ msgstr ""
 "Nenhum e-mail de destino foi fornecido, o encaminhamento da mensagem foi "
 "cancelado."
 
-#: ../mail/e-mail-session.c:880
+#: ../mail/e-mail-session.c:1055
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr ""
 "NÃo foi encontrada nenhuma conta vÃlida para uso, o encaminhamento da "
 "mensagem foi cancelado."
 
-#: ../mail/e-mail-session.c:1283 ../mail/mail-ops.c:1220
-#, c-format
-msgid "Opening folder '%s'"
-msgstr "Abrindo pasta \"%s\""
-
-#: ../mail/e-mail-session.c:1299
+#: ../mail/e-mail-session-utils.c:419
 #, c-format
-#| msgid "Invalid folder: '%s'"
-msgid "Invalid folder: %s"
-msgstr "Pasta invÃlida: %s"
+msgid "Cannot get transport for account '%s'"
+msgstr "NÃo à possÃvel obter transporte para a conta \"%s\""
 
-#: ../mail/e-mail-session-utils.c:490 ../mail/mail-ops.c:605
+#: ../mail/e-mail-session-utils.c:508 ../mail/mail-ops.c:634
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Falha ao aplicar filtros de saÃda: %s"
 
-#: ../mail/e-mail-session-utils.c:514 ../mail/e-mail-session-utils.c:548
-#: ../mail/mail-ops.c:622 ../mail/mail-ops.c:653
+#: ../mail/e-mail-session-utils.c:532 ../mail/e-mail-session-utils.c:566
+#: ../mail/mail-ops.c:653 ../mail/mail-ops.c:687
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -9069,229 +9240,81 @@ msgstr ""
 "Falha ao acrescentar a %s: %s\n"
 "Acrescentando à pasta local \"Enviadas\" no lugar."
 
-#: ../mail/e-mail-session-utils.c:568 ../mail/mail-ops.c:673
+#: ../mail/e-mail-session-utils.c:586 ../mail/mail-ops.c:707
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Falha ao acrescentar à pasta local \"Enviadas\": %s"
 
-#: ../mail/e-mail-session-utils.c:779 ../mail/mail-ops.c:774
-#: ../mail/mail-ops.c:866
+#: ../mail/e-mail-session-utils.c:797 ../mail/mail-ops.c:810
+#: ../mail/mail-ops.c:906
 msgid "Sending message"
 msgstr "Enviando mensagem"
 
-#: ../mail/e-mail-session-utils.c:850
+#: ../mail/e-mail-session-utils.c:873
 #, c-format
-#| msgid "Unsubscribing from folder \"%s\""
 msgid "Unsubscribing from folder '%s'"
 msgstr "Cancelando a inscriÃÃo da pasta \"%s\""
 
-#: ../mail/e-mail-store-utils.c:39
+#: ../mail/e-mail-store-utils.c:168
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Desconectando de \"%s\""
 
-#: ../mail/e-mail-store-utils.c:130
+#: ../mail/e-mail-store-utils.c:259
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Reconectando a \"%s\""
 
-#: ../mail/e-mail-tag-editor.c:290
+#: ../mail/e-mail-store-utils.c:334
+#, c-format
+msgid "Preparing account '%s' for offline"
+msgstr "Preparando conta \"%s\" para desconexÃo"
+
+#: ../mail/e-mail-tag-editor.c:291
 msgid "Flag to Follow Up"
 msgstr "Marcar como lembrete"
 
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:563 ../mail/mail-config.ui.h:69
-#: ../modules/addressbook/ldap-config.ui.h:9
-msgid "No encryption"
-msgstr "Sem criptografia"
+#. Note to translators: this is the attribution string used
+#. * when quoting messages.  Each ${Variable} gets replaced
+#. * with a value.  To see a full list of available variables,
+#. * see mail/em-composer-utils.c:attribvars array.
+#: ../mail/em-composer-utils.c:1197
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+"Em ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} Ãs ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} escreveu:"
 
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. TLS (Transport Layer Security) is commonly known by
-#. this abbreviation.
-#: ../mail/em-account-editor.c:567 ../mail/mail-config.ui.h:126
-#: ../modules/addressbook/ldap-config.ui.h:20
-msgid "TLS encryption"
-msgstr "Criptografia TLS"
+#: ../mail/em-composer-utils.c:1208
+msgid "-----Original Message-----"
+msgstr "-------- Mensagem original --------"
 
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
-#. abbreviation.
-#: ../mail/em-account-editor.c:571 ../mail/mail-config.ui.h:91
-#: ../modules/addressbook/ldap-config.ui.h:12
-msgid "SSL encryption"
-msgstr "Criptografia SSL"
+#. Translators: First %s is an email address, second %s
+#. * is the subject of the email, third %s is the date.
+#: ../mail/em-composer-utils.c:1992
+#, c-format
+msgid "Your message to %s about \"%s\" on %s has been read."
+msgstr "Sua mensagem para %s sobre \"%s\" enviada em %s foi lida."
 
-#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:834 ../widgets/misc/e-signature-combo-box.c:75
-msgctxt "mail-signature"
-msgid "None"
-msgstr "Nenhum"
-
-#: ../mail/em-account-editor.c:915
-msgid "Never"
-msgstr "Nunca"
-
-#: ../mail/em-account-editor.c:916
-msgid "Always"
-msgstr "Sempre"
-
-#: ../mail/em-account-editor.c:917
-msgid "Ask for each message"
-msgstr "Perguntar para cada mensagem"
-
-#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1699 ../widgets/misc/e-account-tree-view.c:127
-msgctxt "mail-receiving"
-msgid "None"
-msgstr "Nenhum"
-
-#: ../mail/em-account-editor.c:2086
-msgid "Mail Configuration"
-msgstr "ConfiguraÃÃo de correio"
-
-#: ../mail/em-account-editor.c:2087
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin."
-msgstr ""
-"Bem-vindo ao assistente de configuraÃÃes de correio do Evolution.\n"
-"\n"
-"Pressione \"AvanÃar\" para iniciar. "
-
-#: ../mail/em-account-editor.c:2090
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-msgstr ""
-"Por favor, digite seu nome e endereÃo de e-mail abaixo. Os campos em "
-"\"InformaÃÃes Opcionais\", mais abaixo, nÃo precisam ser preenchidos, a "
-"menos que vocà queira estas informaÃÃes incluÃdas em toda mensagem de "
-"correio enviada."
-
-#: ../mail/em-account-editor.c:2092 ../mail/em-account-editor.c:2255
-msgid "Receiving Email"
-msgstr "Recebendo e-mail"
-
-#: ../mail/em-account-editor.c:2093
-msgid "Please configure the following account settings."
-msgstr "Por favor configure as seguintes configuraÃÃes de conta."
-
-#: ../mail/em-account-editor.c:2095 ../mail/em-account-editor.c:2755
-msgid "Sending Email"
-msgstr "Enviando e-mail"
-
-#: ../mail/em-account-editor.c:2096
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"Por favor, digite informaÃÃes sobre como vocà enviarà correio. Se vocà nÃo "
-"tiver certeza, consulte o seu administrador de sistema ou o seu provedor de "
-"Internet."
-
-#: ../mail/em-account-editor.c:2098 ../mail/mail-config.ui.h:1
-msgid "Account Information"
-msgstr "InformaÃÃes da conta"
-
-#: ../mail/em-account-editor.c:2099
-#| msgid ""
-#| "Please enter a descriptive name for this account in the space below.\n"
-#| "This name will be used for display purposes only."
-msgid ""
-"Please enter a descriptive name for this account below.\n"
-"This name will be used for display purposes only."
-msgstr ""
-"Por favor, digite um nome descritivo para esta conta abaixo.\n"
-"Este nome serà usado apenas com o propÃsito de exibiÃÃo."
-
-#: ../mail/em-account-editor.c:2103
-msgid "Done"
-msgstr "Terminado"
-
-#: ../mail/em-account-editor.c:2104
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email using Evolution.\n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
-"ParabÃns, sua configuraÃÃo de correio està concluÃda.\n"
-"\n"
-"Agora vocà està pronto para enviar e receber e-mails \n"
-"utilizando o Evolution. \n"
-"\n"
-"Clique em \"Aplicar\" para salvar suas configuraÃÃes."
-
-#: ../mail/em-account-editor.c:2569
-msgid "Check for _new messages every"
-msgstr "Verificar _novas mensagens a cada"
-
-#: ../mail/em-account-editor.c:2577
-msgid "minu_tes"
-msgstr "minu_tos"
-
-#: ../mail/em-account-editor.c:2860
-msgid "Please select a folder from the current account."
-msgstr "Por favor, selecione uma pasta para a conta atual."
-
-#: ../mail/em-account-editor.c:3170 ../mail/mail-config.ui.h:98
-msgid "Security"
-msgstr "SeguranÃa"
-
-#. Most sections for this is auto-generated from the camel config
-#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:3216 ../mail/em-account-editor.c:3284
-msgid "Receiving Options"
-msgstr "OpÃÃes de recepÃÃo"
-
-#: ../mail/em-account-editor.c:3217 ../mail/em-account-editor.c:3285
-msgid "Checking for New Messages"
-msgstr "Verificando novas mensagens"
-
-#. Note to translators: this is the attribution string used when quoting messages.
-#. * each ${Variable} gets replaced with a value. To see a full list of available
-#. * variables, see mail/em-composer-utils.c:attribvars array
-#: ../mail/em-composer-utils.c:1154
-msgid ""
-"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} wrote:"
-msgstr ""
-"Em ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} Ãs ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} escreveu:"
-
-#: ../mail/em-composer-utils.c:1164
-msgid "-----Original Message-----"
-msgstr "-------- Mensagem original --------"
-
-#. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1821
-#, c-format
-msgid "Your message to %s about \"%s\" on %s has been read."
-msgstr "Sua mensagem para %s sobre \"%s\" enviada em %s foi lida."
-
-#. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1871
+#: ../mail/em-composer-utils.c:2052
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "NotificaÃÃo de recebimento para: \"%s\""
 
-#: ../mail/em-composer-utils.c:2291
+#: ../mail/em-composer-utils.c:2592
 msgid "an unknown sender"
 msgstr "um remetente desconhecido"
 
-#: ../mail/em-composer-utils.c:2715
+#: ../mail/em-composer-utils.c:2998
 msgid "Posting destination"
 msgstr "Publicando destino"
 
-#: ../mail/em-composer-utils.c:2716
+#: ../mail/em-composer-utils.c:2999
 msgid "Choose folders to post the message to."
 msgstr "Escolha as pastas onde publicar a mensagem."
 
-#: ../mail/em-filter-folder-element.c:337
+#: ../mail/em-filter-folder-element.c:241
 msgid "Select Folder"
 msgstr "Selecionar pasta"
 
@@ -9408,7 +9431,7 @@ msgstr "nÃo està definido"
 msgid "is set"
 msgstr "està definido"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:60
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:63
 msgid "Junk"
 msgstr "Spam"
 
@@ -9457,7 +9480,7 @@ msgid "Play Sound"
 msgstr "Reproduzir som"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:15
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
 msgid "Read"
 msgstr "Lida"
 
@@ -9538,145 +9561,223 @@ msgid "Unset Status"
 msgstr "Reverter status"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:536
+#: ../mail/em-filter-rule.c:561
 msgid "Then"
 msgstr "EntÃo"
 
-#: ../mail/em-filter-rule.c:567
+#: ../mail/em-filter-rule.c:592
 msgid "Add Ac_tion"
 msgstr "Adicionar aÃÃ_o"
 
-#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:124
+#: ../mail/em-folder-properties.c:145
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Mensagem nÃo lida:"
 msgstr[1] "Mensagens nÃo lidas:"
 
-#. TODO: can this be done in a loop?
-#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:128
+#: ../mail/em-folder-properties.c:156
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Total de mensagem:"
 msgstr[1] "Total de mensagens:"
 
-#: ../mail/em-folder-properties.c:146
+#: ../mail/em-folder-properties.c:177
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Uso da cota (%s):"
 
-#: ../mail/em-folder-properties.c:148
+#: ../mail/em-folder-properties.c:179
 #, c-format
 msgid "Quota usage"
 msgstr "Uso da cota"
 
-#: ../mail/em-folder-properties.c:290
+#: ../mail/em-folder-properties.c:317
 msgid "Folder Properties"
 msgstr "Propriedades da pasta"
 
-#: ../mail/em-folder-selection-button.c:77
+#: ../mail/em-folder-selection-button.c:79
 msgid "<click here to select a folder>"
 msgstr "<clique aqui para selecionar uma pasta>"
 
-#: ../mail/em-folder-selector.c:261
+#: ../mail/em-folder-selector.c:436
 msgid "C_reate"
 msgstr "C_riar"
 
-#: ../mail/em-folder-selector.c:265
+#: ../mail/em-folder-selector.c:442
 msgid "Folder _name:"
 msgstr "_Nome da pasta:"
 
-#. load store to mail component
-#: ../mail/em-folder-tree-model.c:147 ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:158
-#: ../mail/em-folder-tree-model.c:165 ../mail/em-folder-tree-model.c:167
-#: ../mail/mail-vfolder.c:1164 ../mail/mail-vfolder.c:1239
-msgid "Search Folders"
-msgstr "Pastas de pesquisa"
-
-#. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:172 ../mail/em-folder-tree-model.c:174
-msgid "UNMATCHED"
-msgstr "SEM OCORRÃNCIA"
-
-#: ../mail/em-folder-tree-model.c:807 ../mail/em-folder-tree-model.c:1084
-msgid "Loading..."
-msgstr "Carregando..."
-
-#: ../mail/em-folder-tree.c:197
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "Varrendo pastas em \"%s\""
-
-#: ../mail/em-folder-tree.c:625
+#: ../mail/em-folder-tree.c:647
 msgid "Folder names cannot contain '/'"
 msgstr "O nome da pasta nÃo pode conter o caractere \"/\""
 
-#: ../mail/em-folder-tree.c:1245
+#: ../mail/em-folder-tree.c:768
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1481
+#: ../mail/em-folder-tree.c:1590
 msgid "Mail Folder Tree"
 msgstr "Ãrvore de pastas de correio"
 
-#: ../mail/em-folder-tree.c:1937 ../mail/em-folder-utils.c:90
+#: ../mail/em-folder-tree.c:2069 ../mail/em-folder-utils.c:115
 #, c-format
 msgid "Moving folder %s"
 msgstr "Movendo pasta %s"
 
-#: ../mail/em-folder-tree.c:1941 ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:2072 ../mail/em-folder-utils.c:117
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando pasta %s"
 
-#: ../mail/em-folder-tree.c:1950 ../mail/message-list.c:2243
+#: ../mail/em-folder-tree.c:2079 ../mail/message-list.c:2303
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo mensagens para pasta %s"
 
-#: ../mail/em-folder-tree.c:1954 ../mail/message-list.c:2245
+#: ../mail/em-folder-tree.c:2083 ../mail/message-list.c:2305
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando mensagens para pasta %s"
 
-#: ../mail/em-folder-tree.c:1973
+#: ../mail/em-folder-tree.c:2102
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "NÃo foi possÃvel depositar mensagem(ns) no repositÃrio topo"
 
-#: ../mail/em-folder-utils.c:422
+#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:157
+#: ../mail/em-folder-tree-model.c:163 ../mail/em-folder-tree-model.c:165
+#: ../mail/em-folder-tree-model.c:172 ../mail/em-folder-tree-model.c:174
+#: ../mail/mail-vfolder.c:1125 ../mail/mail-vfolder.c:1239
+msgid "Search Folders"
+msgstr "Pastas de pesquisa"
+
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:179 ../mail/em-folder-tree-model.c:181
+msgid "UNMATCHED"
+msgstr "SEM OCORRÃNCIA"
+
+#: ../mail/em-folder-tree-model.c:790 ../mail/em-folder-tree-model.c:1075
+msgid "Loading..."
+msgstr "Carregando..."
+
+#: ../mail/em-folder-utils.c:488
 msgid "Move Folder To"
 msgstr "Mover pasta para"
 
-#: ../mail/em-folder-utils.c:422
+#: ../mail/em-folder-utils.c:488
 msgid "Copy Folder To"
 msgstr "Copiar pasta para"
 
-#: ../mail/em-folder-utils.c:571
-#: ../plugins/groupwise-features/share-folder-common.c:138
-#, c-format
-msgid "Creating folder '%s'"
-msgstr "Criando pasta \"%s\""
-
-#: ../mail/em-folder-utils.c:741
+#: ../mail/em-folder-utils.c:590
 msgid "Create Folder"
 msgstr "Criar pasta"
 
-#: ../mail/em-folder-utils.c:742
-#: ../plugins/groupwise-features/install-shared.c:178
-#: ../plugins/groupwise-features/share-folder-common.c:353
+#: ../mail/em-folder-utils.c:591
 msgid "Specify where to create the folder:"
 msgstr "Especificar onde criar a pasta:"
 
-#: ../mail/em-format-html-display.c:84 ../mail/em-format-html.c:1600
+#: ../mail/em-format-html.c:166
+msgid "Formatting message"
+msgstr "Formatando mensagem"
+
+#: ../mail/em-format-html.c:378
+msgid "Formatting Message..."
+msgstr "Formatando mensagem..."
+
+#: ../mail/em-format-html.c:1562 ../mail/em-format-html.c:1572
+#, c-format
+msgid "Retrieving '%s'"
+msgstr "Buscando \"%s\""
+
+#: ../mail/em-format-html.c:1723 ../mail/em-format-html-display.c:89
 msgid "Unsigned"
 msgstr "NÃo assinada"
 
-#: ../mail/em-format-html-display.c:84
+#: ../mail/em-format-html.c:1724 ../mail/em-format-html-display.c:90
+msgid "Valid signature"
+msgstr "Assinatura vÃlida"
+
+#: ../mail/em-format-html.c:1725 ../mail/em-format-html-display.c:91
+msgid "Invalid signature"
+msgstr "Assinatura invÃlida"
+
+#: ../mail/em-format-html.c:1726 ../mail/em-format-html-display.c:92
+msgid "Valid signature, but cannot verify sender"
+msgstr "Assinatura vÃlida, mas nÃo à possÃvel verificar o remetente"
+
+#: ../mail/em-format-html.c:1727 ../mail/em-format-html-display.c:93
+msgid "Signature exists, but need public key"
+msgstr "A assinatura existe, mas precisa de uma chave pÃblica"
+
+#: ../mail/em-format-html.c:1733 ../mail/em-format-html-display.c:100
+msgid "Unencrypted"
+msgstr "NÃo criptografada"
+
+#: ../mail/em-format-html.c:1734 ../mail/em-format-html-display.c:101
+msgid "Encrypted, weak"
+msgstr "Criptografada, fraca"
+
+#: ../mail/em-format-html.c:1735 ../mail/em-format-html-display.c:102
+msgid "Encrypted"
+msgstr "Criptografada"
+
+#: ../mail/em-format-html.c:1736 ../mail/em-format-html-display.c:103
+msgid "Encrypted, strong"
+msgstr "Criptografada, forte"
+
+#: ../mail/em-format-html.c:2136
+msgid "Unknown external-body part."
+msgstr "Parte external-body malformada."
+
+#: ../mail/em-format-html.c:2146
+msgid "Malformed external-body part."
+msgstr "Parte external-body malformada."
+
+#: ../mail/em-format-html.c:2177
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Ponteiro para site FTP (%s)"
+
+#: ../mail/em-format-html.c:2188
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Ponteiro para arquivo local (%s) vÃlido no site \"%s\""
+
+#: ../mail/em-format-html.c:2190
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Ponteiro para arquivo local (%s)"
+
+#: ../mail/em-format-html.c:2211
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Ponteiro para dados remotos (%s)"
+
+#: ../mail/em-format-html.c:2226
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Ponteiro para dados externos desconhecidos (tipo \"%s\")"
+
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../mail/em-format-html.c:2934
+#: ../plugins/mail-notification/mail-notification.c:402
+#, c-format
+msgid "From: %s"
+msgstr "De: %s"
+
+#: ../mail/em-format-html.c:2956
+msgid "(no subject)"
+msgstr "(sem assunto)"
+
+#: ../mail/em-format-html.c:3032
+#, c-format
+msgid "This message was sent by %s on behalf of %s"
+msgstr "Esta mensagem foi enviada por %s em nome de %s"
+
+#: ../mail/em-format-html-display.c:89
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -9684,11 +9785,7 @@ msgstr ""
 "Esta mensagem nÃo està assinada. NÃo hà garantias de que esta mensagem seja "
 "autÃntica."
 
-#: ../mail/em-format-html-display.c:85 ../mail/em-format-html.c:1601
-msgid "Valid signature"
-msgstr "Assinatura vÃlida"
-
-#: ../mail/em-format-html-display.c:85
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -9696,11 +9793,7 @@ msgstr ""
 "Esta mensagem està assinada e à vÃlida. à muito provÃvel que esta mensagem "
 "seja autÃntica."
 
-#: ../mail/em-format-html-display.c:86 ../mail/em-format-html.c:1602
-msgid "Invalid signature"
-msgstr "Assinatura invÃlida"
-
-#: ../mail/em-format-html-display.c:86
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -9708,11 +9801,7 @@ msgstr ""
 "NÃo à possÃvel verificar a assinatura desta mensagem. Ela pode ter sido "
 "alterada em trÃnsito."
 
-#: ../mail/em-format-html-display.c:87 ../mail/em-format-html.c:1603
-msgid "Valid signature, but cannot verify sender"
-msgstr "Assinatura vÃlida, mas nÃo à possÃvel verificar o remetente"
-
-#: ../mail/em-format-html-display.c:87
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -9720,11 +9809,7 @@ msgstr ""
 "Esta mensagem està assinada com uma assinatura vÃlida, mas o remetente nÃo "
 "pode ser verificado."
 
-#: ../mail/em-format-html-display.c:88 ../mail/em-format-html.c:1604
-msgid "Signature exists, but need public key"
-msgstr "A assinatura existe, mas precisa de uma chave pÃblica"
-
-#: ../mail/em-format-html-display.c:88
+#: ../mail/em-format-html-display.c:93
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -9732,11 +9817,7 @@ msgstr ""
 "Esta mensagem està assinada com uma assinatura, mas nÃo hà chave pÃblica "
 "correspondente."
 
-#: ../mail/em-format-html-display.c:95 ../mail/em-format-html.c:1610
-msgid "Unencrypted"
-msgstr "NÃo criptografada"
-
-#: ../mail/em-format-html-display.c:95
+#: ../mail/em-format-html-display.c:100
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -9744,11 +9825,7 @@ msgstr ""
 "Esta mensagem nÃo està criptografada. O seu conteÃdo pode ser visto em "
 "trÃnsito atravÃs da Internet."
 
-#: ../mail/em-format-html-display.c:96 ../mail/em-format-html.c:1611
-msgid "Encrypted, weak"
-msgstr "Criptografada, fraca"
-
-#: ../mail/em-format-html-display.c:96
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -9758,11 +9835,7 @@ msgstr ""
 "fraco. Seria difÃcil, mas nÃo impossÃvel, que um estranho conseguisse ver o "
 "conteÃdo desta mensagem em uma quantidade de tempo razoÃvel."
 
-#: ../mail/em-format-html-display.c:97 ../mail/em-format-html.c:1612
-msgid "Encrypted"
-msgstr "Criptografada"
-
-#: ../mail/em-format-html-display.c:97
+#: ../mail/em-format-html-display.c:102
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -9770,11 +9843,7 @@ msgstr ""
 "Esta mensagem està criptografada. Seria difÃcil que um estranho conseguisse "
 "ver o conteÃdo desta mensagem."
 
-#: ../mail/em-format-html-display.c:98 ../mail/em-format-html.c:1613
-msgid "Encrypted, strong"
-msgstr "Criptografada, forte"
-
-#: ../mail/em-format-html-display.c:98
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -9784,15 +9853,15 @@ msgstr ""
 "Seria muito difÃcil para um estranho conseguir ver o conteÃdo desta mensagem "
 "em uma quantidade de tempo razoÃvel."
 
-#: ../mail/em-format-html-display.c:234 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:241 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "_Ver certificado"
 
-#: ../mail/em-format-html-display.c:247
+#: ../mail/em-format-html-display.c:254
 msgid "This certificate is not viewable"
 msgstr "Este certificado nÃo à observÃvel"
 
-#: ../mail/em-format-html-display.c:502
+#: ../mail/em-format-html-display.c:566
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -9800,28 +9869,39 @@ msgstr ""
 "O Evolution nÃo pode renderizar este e-mail por ser muito grande para "
 "processar. Vocà pode vÃ-lo sem formataÃÃo ou com um editor de textos externo."
 
-#: ../mail/em-format-html-display.c:745
+#: ../mail/em-format-html-display.c:756
+msgid "Save Image"
+msgstr "Salvar mensagem"
+
+#: ../mail/em-format-html-display.c:804
+msgid "Save _Image..."
+msgstr "Salvar _imagem..."
+
+#: ../mail/em-format-html-display.c:806
+msgid "Save the image to a file"
+msgstr "Salvar a imagem em um arquivo"
+
+#: ../mail/em-format-html-display.c:1034
 msgid "Completed on"
 msgstr "ConcluÃda em"
 
-#: ../mail/em-format-html-display.c:753
+#: ../mail/em-format-html-display.c:1046
 msgid "Overdue:"
 msgstr "Atrasada:"
 
-#. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:757
+#: ../mail/em-format-html-display.c:1054
 msgid "by"
 msgstr "atÃ"
 
-#: ../mail/em-format-html-display.c:974 ../mail/em-format-html-display.c:1021
+#: ../mail/em-format-html-display.c:1335 ../mail/em-format-html-display.c:1386
 msgid "View _Unformatted"
 msgstr "Ver nÃo _formatadas"
 
-#: ../mail/em-format-html-display.c:976
+#: ../mail/em-format-html-display.c:1337
 msgid "Hide _Unformatted"
 msgstr "Ocultar nÃo _formatadas"
 
-#: ../mail/em-format-html-display.c:1041
+#: ../mail/em-format-html-display.c:1408
 msgid "O_pen With"
 msgstr "A_brir com"
 
@@ -9830,131 +9910,67 @@ msgstr "A_brir com"
 msgid "Page %d of %d"
 msgstr "PÃgina %d de %d"
 
-#: ../mail/em-format-html.c:161
-msgid "Formatting message"
-msgstr "Formatando mensagem"
-
-#: ../mail/em-format-html.c:360
-msgid "Formatting Message..."
-msgstr "Formatando mensagem..."
-
-#: ../mail/em-format-html.c:1444 ../mail/em-format-html.c:1454
-#, c-format
-msgid "Retrieving '%s'"
-msgstr "Buscando \"%s\""
-
-#: ../mail/em-format-html.c:1975
-msgid "Unknown external-body part."
-msgstr "Parte external-body malformada."
-
-#: ../mail/em-format-html.c:1983
-msgid "Malformed external-body part."
-msgstr "Parte external-body malformada."
-
-#: ../mail/em-format-html.c:2013
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Ponteiro para site FTP (%s)"
-
-#: ../mail/em-format-html.c:2024
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Ponteiro para arquivo local (%s) vÃlido no site \"%s\""
-
-#: ../mail/em-format-html.c:2026
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Ponteiro para arquivo local (%s)"
-
-#: ../mail/em-format-html.c:2047
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Ponteiro para dados remotos (%s)"
-
-#: ../mail/em-format-html.c:2058
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Ponteiro para dados externos desconhecidos (tipo \"%s\")"
-
-#. To translators: This message suggests to the receipients that the sender of the mail is
-#. different from the one listed in From field.
-#: ../mail/em-format-html.c:2762
-#, c-format
-msgid "This message was sent by %s on behalf of %s"
-msgstr "Esta mensagem foi enviada por %s em nome de %s"
-
 #: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
 #: ../mail/em-html-stream.c:122
 #, c-format
 msgid "No HTML stream available"
 msgstr "Sem fluxo HTML disponÃvel."
 
-#: ../mail/em-subscription-editor.c:1103
+#: ../mail/em-subscription-editor.c:1162
 msgid "Folder Subscriptions"
 msgstr "InscriÃÃes de pastas"
 
-#: ../mail/em-subscription-editor.c:1142
-#| msgid "_Country:"
+#: ../mail/em-subscription-editor.c:1201
 msgid "_Account:"
 msgstr "Cont_a:"
 
-#: ../mail/em-subscription-editor.c:1157
-#| msgid "Clear the search"
+#: ../mail/em-subscription-editor.c:1216
 msgid "Clear Search"
 msgstr "Limpar pesquisa"
 
-#: ../mail/em-subscription-editor.c:1175
-#| msgid "S_how only items containing:"
+#: ../mail/em-subscription-editor.c:1234
 msgid "Sho_w items that contain:"
 msgstr "Exibir it_ens contendo:"
 
-#: ../mail/em-subscription-editor.c:1214
-#| msgid "Unsubscribe from the selected folder"
+#: ../mail/em-subscription-editor.c:1273
 msgid "Subscribe to the selected folder"
 msgstr "Inscreve-se na pasta selecionada"
 
-#: ../mail/em-subscription-editor.c:1215
-#| msgid "Subscribed"
+#: ../mail/em-subscription-editor.c:1274
 msgid "Su_bscribe"
 msgstr "Ins_crito"
 
-#: ../mail/em-subscription-editor.c:1226
-#: ../modules/mail/e-mail-shell-view-actions.c:1178
+#: ../mail/em-subscription-editor.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1222
 msgid "Unsubscribe from the selected folder"
 msgstr "Cancela a inscriÃÃo da pasta selecionada"
 
-#: ../mail/em-subscription-editor.c:1227
-#: ../modules/mail/e-mail-shell-view-actions.c:1176
+#: ../mail/em-subscription-editor.c:1286
+#: ../modules/mail/e-mail-shell-view-actions.c:1220
 msgid "_Unsubscribe"
 msgstr "_Cancelar a inscriÃÃo"
 
-#: ../mail/em-subscription-editor.c:1238
-#| msgid "Collapse _all"
+#: ../mail/em-subscription-editor.c:1297
 msgid "Collapse all folders"
 msgstr "Recolher todas as pastas"
 
-#: ../mail/em-subscription-editor.c:1239
-#| msgid "Collapse _all"
+#: ../mail/em-subscription-editor.c:1298
 msgid "C_ollapse All"
 msgstr "Recolher t_odas"
 
-#: ../mail/em-subscription-editor.c:1249
-#| msgid "E_xpand all"
+#: ../mail/em-subscription-editor.c:1308
 msgid "Expand all folders"
 msgstr "Expandir todas as pastas"
 
-#: ../mail/em-subscription-editor.c:1250
-#| msgid "E_xpand all"
+#: ../mail/em-subscription-editor.c:1309
 msgid "E_xpand All"
 msgstr "E_xpandir todas"
 
-#: ../mail/em-subscription-editor.c:1260
-#| msgid "Refresh the folder"
+#: ../mail/em-subscription-editor.c:1319
 msgid "Refresh the folder list"
 msgstr "Atualizar a lista de pastas"
 
-#: ../mail/em-subscription-editor.c:1272
-#| msgid "Cancel the current mail operation"
+#: ../mail/em-subscription-editor.c:1331
 msgid "Stop the current operation"
 msgstr "Parar a operaÃÃo atual"
 
@@ -9962,23 +9978,23 @@ msgstr "Parar a operaÃÃo atual"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:101
+#: ../mail/em-utils.c:102
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "Vocà tem certeza de que deseja abrir %d mensagem de uma vez?"
 msgstr[1] "Vocà tem certeza de que deseja abrir %d mensagens de uma vez?"
 
-#: ../mail/em-utils.c:153
-#: ../modules/mailto-handler/evolution-mailto-handler.c:151
+#: ../mail/em-utils.c:158
+#: ../modules/mailto-handler/evolution-mailto-handler.c:154
 msgid "_Do not show this message again"
 msgstr "NÃo mostrar esta mensagem no_vamente."
 
-#: ../mail/em-utils.c:326
+#: ../mail/em-utils.c:333
 msgid "Message Filters"
 msgstr "Filtros de mensagens"
 
-#: ../mail/em-utils.c:882
+#: ../mail/em-utils.c:918
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensagens de %s"
@@ -9987,7 +10003,7 @@ msgstr "Mensagens de %s"
 msgid "Search _Folders"
 msgstr "Pastas de P_esquisa"
 
-#: ../mail/em-vfolder-rule.c:609
+#: ../mail/em-vfolder-rule.c:618
 msgid "Add Folder"
 msgstr "Adicionar pasta"
 
@@ -10004,17 +10020,14 @@ msgid "\"Filter Editor\" window width"
 msgstr "Largura padrÃo da janela \"Editor de filtros\""
 
 #: ../mail/evolution-mail.schemas.in.h:4
-#| msgid "\"Filter Editor\" window height"
 msgid "\"Folder Subscriptions\" window height"
 msgstr "Altura da janela \"InscriÃÃes de pasta\""
 
 #: ../mail/evolution-mail.schemas.in.h:5
-#| msgid "\"Filter Editor\" window maximize state"
 msgid "\"Folder Subscriptions\" window maximize state"
 msgstr "Estado de maximizaÃÃo da janela \"InscriÃÃes da pasta\""
 
 #: ../mail/evolution-mail.schemas.in.h:6
-#| msgid "\"Filter Editor\" window width"
 msgid "\"Folder Subscriptions\" window width"
 msgstr "Largura da janela \"InscriÃÃes da pasta\""
 
@@ -10047,7 +10060,7 @@ msgid "Always request read receipt"
 msgstr "Sempre solicitar um recibo de leitura"
 
 #: ../mail/evolution-mail.schemas.in.h:14
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Tempo em segundos que o erro deve ser mostrado na barra de status."
 
@@ -10060,7 +10073,6 @@ msgstr ""
 "ou responder uma mensagem exibida"
 
 #: ../mail/evolution-mail.schemas.in.h:16
-#| msgid "Attached message"
 msgid "Attribute message."
 msgstr "Mensagem de atributo."
 
@@ -10073,12 +10085,10 @@ msgid "Automatic link recognition"
 msgstr "Reconhecimento automÃtico de links"
 
 #: ../mail/evolution-mail.schemas.in.h:19
-#| msgid "Check for _new messages every"
 msgid "Check for new messages in all active accounts"
 msgstr "Verificar novas mensagens em todas as contas ativas"
 
 #: ../mail/evolution-mail.schemas.in.h:20
-#| msgid "Check for _new messages every"
 msgid "Check for new messages on start"
 msgstr "Verificar novas mensagens ao iniciar"
 
@@ -10188,15 +10198,23 @@ msgstr "Largura padrÃo da janela de navegaÃÃo de mensagens."
 
 #: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
+"Describes whether message headers in paned view should be collapsed or "
+"expanded by default. \"0\" = expanded \"1\" = collapsed"
+msgstr ""
+"Descreve se os cabeÃalhos de mensagens no modo de exibiÃÃo no painel devem "
+"ser recolhidos ou expandidos por padrÃo. \"0\" = \"1\" expandido = recolhido"
+
+#: ../mail/evolution-mail.schemas.in.h:45
+msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr "Procurar apenas no catÃlogo local endereÃos para filtrar spam"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Procurar no catÃlogo de endereÃos o e-mail do remetente"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -10208,11 +10226,11 @@ msgstr ""
 "completamentoautomÃtico, e pode ser lenta se catÃlogos de endereÃos remotos "
 "(como LDAP) estiverem marcados para completamento automÃtico."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "Utilizar cabeÃalhos personalizados para procurar por SPAM"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -10222,7 +10240,7 @@ msgstr ""
 "estiver habilitada e os cabeÃalhos forem mencionados, a verificaÃÃo de SPAM "
 "serà mais rÃpida."
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -10230,47 +10248,47 @@ msgstr ""
 "Utiliza as mesmas fontes para ambas as linhas \"De\" e \"Assunto\" na coluna "
 "\"Mensagens\" na visÃo vertical."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Directory for loading/attaching files to composer."
 msgstr "DiretÃrio para carregar/anexar arquivos no redator."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Directory for saving mail component files."
 msgstr "DiretÃrio para salvar arquivos de e-mail."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "Desabilita ou habilita abreviaÃÃo dos nomes das pastas"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Display only message texts not exceeding certain size"
 msgstr "Exibir somente textos das mensagens que nÃo excederem certo tamanho "
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Do not add signature delimiter"
 msgstr "NÃo adicione delimitador de assinatura"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Exibir indicadores de erros ortogrÃficos enquanto vocà digita."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Empty Junk folders on exit"
 msgstr "Esvaziar pastas de spam ao sair"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Empty Trash folders on exit"
 msgstr "Esvaziar pastas lixeira ao sair"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Esvaziar todas as pastas de Spam ao sair do Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Esvaziar todas as pastas lixeiras ao sair do Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -10278,32 +10296,32 @@ msgstr ""
 "Habilitar animaÃÃo de imagens em mensagens em HTML. Muitos usuÃrios nÃo "
 "gostam de imagens animadas e preferem ver imagens estÃticas."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Habilitar o modo cursor, de forma que vocà veja um cursor ao ler correio."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "Enable or disable magic space bar"
 msgstr "habilitar ou desabilitar a barra de espaÃo magica"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Habilitar ou desabilitar o aviso enquanto marca mÃltiplas mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable or disable type ahead search feature"
 msgstr "Habilitar ou desabilitar o recurso de pesquisa à medida que se escreve"
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "Enable search folders"
 msgstr "Habilitar pastas de pesquisa"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Enable search folders on startup."
 msgstr "Habilitar pastas de pesquisa ao iniciar."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -10311,7 +10329,7 @@ msgstr ""
 "Habilitar o recurso de barra de busca lateral para permitir uma busca de "
 "interativa de nomes de pastas."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -10319,7 +10337,7 @@ msgstr ""
 "Habilite isto para usar a tecla Barra de EspaÃos para rolar na visualizaÃÃo "
 "de mensagem, lista de mensagens e pastas."
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid ""
 "Enable to display only message texts not exceeding size defined in "
 "'message_text_part_limit' key."
@@ -10327,27 +10345,27 @@ msgstr ""
 "Habilite para exibir somente textos de mensagens que nÃo excederem o tamanho "
 "na chave \"message_text_part_limit\"."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 "Habilite para usar as configuraÃÃes de visÃo de lista de mensagens similares "
 "para todas as pastas"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 "Habilite para usar as configuraÃÃes de visÃo de lista de mensagens similares "
 "para todas as pastas."
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Enable/disable caret mode"
 msgstr "Habilitar/desabilitar o modo cursor"
 
-#: ../mail/evolution-mail.schemas.in.h:73 ../mail/mail-config.ui.h:44
+#: ../mail/evolution-mail.schemas.in.h:74 ../mail/mail-config.ui.h:45
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Codificar nomes de arquivos da mesma forma que o Outlook/GMail"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "Encode file names in the mail headers same as Outlook or GMail do, to let "
 "them display correctly file names with UTF-8 letters sent by Evolution, "
@@ -10359,32 +10377,31 @@ msgstr ""
 "arquivos com letras em UTF-8 enviados pelo Evolution, porque eles nÃo seguem "
 "o padrÃo RFC 2231, e sim o incorreto padrÃo RFC 2047."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "Flush Outbox after filtering"
 msgstr "Descarregar caixa de saÃda apÃs filtrar"
 
-#: ../mail/evolution-mail.schemas.in.h:76
-#| msgid "Forwarded message"
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "Forward message."
 msgstr "Mensagem encaminhada."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Group Reply replies to list"
 msgstr "Responder para grupo responde para lista"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Height of the message-list pane"
 msgstr "Altura do painel de lista de mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Height of the message-list pane."
 msgstr "Altura do painel de lista de mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Oculta a visualizaÃÃo por pasta e remove a seleÃÃo"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -10392,7 +10409,7 @@ msgstr ""
 "Se um usuÃrio tentar abrir 10 ou mais mensagens ao mesmo tempo, perguntar ao "
 "usuÃrio se ele realmente deseja fazÃ-lo."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -10403,11 +10420,11 @@ msgstr ""
 "componente visualizador Bonobo no banco de dados de tipos MIME do GNOME "
 "podem ser usados para exibir o conteÃdo."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Ignore list Reply-To:"
 msgstr "Ignorar lista responder-para:"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
@@ -10415,10 +10432,7 @@ msgstr ""
 "Altura inicial da janela \"Editor de filtros\". O valor atualiza à medida "
 "que o usuÃrio redimensiona a janela verticalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:85
-#| msgid ""
-#| "Initial height of the \"Filter Editor\" window. The value updates as the "
-#| "user resizes the window vertically."
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid ""
 "Initial height of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10426,7 +10440,7 @@ msgstr ""
 "Altura inicial da janela \"InscriÃÃes da pasta\". O valor atualiza à medida "
 "que o usuÃrio redimensiona a janela verticalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10434,7 +10448,7 @@ msgstr ""
 "Altura inicial da janela \"Editor de pasta de pesquisa\". O valor atualiza à "
 "medida que o usuÃrio redimensiona a janela verticalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10442,7 +10456,7 @@ msgstr ""
 "Altura inicial da janela \"Enviar e receber correio\". O valor atualiza à "
 "medida que o usuÃrio redimensiona a janela verticalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
@@ -10455,12 +10469,7 @@ msgstr ""
 "de filtros\" nÃo possa ser maximizada. Esta chave existe apenas como um "
 "detalhes de implementaÃÃo."
 
-#: ../mail/evolution-mail.schemas.in.h:89
-#| msgid ""
-#| "Initial maximize state of the \"Filter Editor\" window. The value updates "
-#| "when the user maximizes or unmaximizes the window. Note, this particular "
-#| "value is not used by Evolution since the \"Filter Editor\" window cannot "
-#| "be maximized. This key exists only as an implementation detail."
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid ""
 "Initial maximize state of the \"Folder Subscriptions\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -10473,7 +10482,7 @@ msgstr ""
 "\"InscriÃÃes da pasta\" nÃo possa ser maximizada. Esta chave existe apenas "
 "como um detalhes de implementaÃÃo."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -10486,7 +10495,7 @@ msgstr ""
 "\"Editor de pasta de pesquisa\" nÃo possa ser maximizada. Esta chave existe "
 "apenas como um detalhes de implementaÃÃo."
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -10500,7 +10509,7 @@ msgstr ""
 "\"Enviar e receber correio\" nÃo possa ser maximizada. Esta chave existe "
 "apenas como um detalhes de implementaÃÃo."
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
@@ -10508,10 +10517,7 @@ msgstr ""
 "Largura inicial da janela \"Editor de filtros\". O valor atualiza à medida "
 "que o usuÃrio redimensiona a janela horizontalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:93
-#| msgid ""
-#| "Initial width of the \"Filter Editor\" window. The value updates as the "
-#| "user resizes the window horizontally."
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid ""
 "Initial width of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -10519,7 +10525,7 @@ msgstr ""
 "Largura inicial da janela \"InscriÃÃes da pasta\". O valor atualiza à medida "
 "que o usuÃrio redimensiona a janela horizontalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -10527,7 +10533,7 @@ msgstr ""
 "Largura inicial da janela \"Editor da pasta de pesquisa\". O valor atualiza "
 "Ã medida que o usuÃrio redimensiona a janela horizontalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -10535,7 +10541,7 @@ msgstr ""
 "Largura inicial da janela \"Enviar e receber correio\". O valor atualiza à "
 "medida que o usuÃrio redimensiona a janela horizontalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid ""
 "Instead of the normal \"Reply to All\" behaviour, this option will make the "
 "'Group Reply' toolbar button try to reply only to the mailing list through "
@@ -10547,7 +10553,7 @@ msgstr ""
 "responder somente para a lista de e-mails do endereÃo que vocà recebeu uma "
 "cÃpia desta mensagem que vocà està respondendo."
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -10557,7 +10563,7 @@ msgstr ""
 "mensagens da pasta de pesquisa apaga-as permanentemente e nao simplesmente "
 "as remove do resultado da procura."
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
@@ -10566,7 +10572,7 @@ msgstr ""
 "enviando uma resposta privada para uma mensagem que foi recebida via lista "
 "de e-mails."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
@@ -10574,7 +10580,7 @@ msgstr ""
 "Habilita/Desabilita o recurso onde lembretes repetem para lembrar que vocà "
 "està enviando uma resposta para muitas pessoas."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
@@ -10585,10 +10591,7 @@ msgstr ""
 "listas definem uma resposta para: cabeÃalho que redireciona sua resposta de "
 "volta para a lista."
 
-#: ../mail/evolution-mail.schemas.in.h:101
-#| msgid ""
-#| "It disables/enables the repeated prompts to warn that you are sending a "
-#| "private reply to a message which arrived via a mailing list."
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -10597,41 +10600,41 @@ msgstr ""
 "enviando uma mensagem para destinatÃrios que com endereÃos de e-mail nÃo "
 "inseridos."
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Last time Empty Junk was run"
 msgstr "A Ãltima vez que a lista de foi esvaziada"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Last time Empty Trash was run"
 msgstr "A Ãltima vez que a lixeira foi esvaziada"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Layout style"
 msgstr "DisposiÃÃo"
 
-#: ../mail/evolution-mail.schemas.in.h:105
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:106
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
 msgid "Level beyond which the message should be logged."
 msgstr "NÃvel alÃm de que a mensagem dever ser registrada."
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "List of Labels and their associated colors"
 msgstr "Lista de rÃtulos e suas respectivas cores"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr ""
 "Lista de tipos MIME onde procurar os componentes de visualizaÃÃo Bonobo"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "List of accepted licenses"
 msgstr "Lista de licenÃas aceitas"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "List of accounts"
 msgstr "Lista de contas"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -10640,17 +10643,17 @@ msgstr ""
 "contÃm strings com nomes de subdiretÃrios relativos a /apps/evolution/mail/"
 "accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista de cabeÃalhos personalizados e se eles estÃo habilitados."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 "Lista dos cÃdigos de idiomas de dicionÃrios usados para verificaÃÃo "
 "ortogrÃfica."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -10659,15 +10662,15 @@ msgstr ""
 "contÃm strings contendo nome:cor, onde cor usa a codificaÃÃo hexadecimal "
 "HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lista de nomes de protocolos para os quais a licenÃa foi aceita."
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Load images for HTML messages over HTTP"
 msgstr "Carregar imagens de mensagens HTML usando HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
@@ -10677,90 +10680,89 @@ msgstr ""
 "\"0\" - Nunca carrega imagens da rede; \"1\" - Carrega imagens nos e-mails "
 "de algum contato seu. \"2\" - Sempre carrega imagens da rede."
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Log filter actions"
 msgstr "Registrar aÃÃes dos filtros"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Log filter actions to the specified log file."
 msgstr "Registrar aÃÃes dos filtros no arquivo de registro especificado."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Logfile to log filter actions"
 msgstr "Arquivo de registro onde registrar aÃÃes dos filtros"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Logfile to log filter actions."
 msgstr "Arquivo de registro onde registrar aÃÃes dos filtros."
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Mail browser height"
 msgstr "Altura do navegador de mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Mail browser maximized"
 msgstr "Navegador de mensagens maximizado"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Mail browser width"
 msgstr "Largura do navegador de mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Mark as Seen after specified timeout"
 msgstr "Marcar como lida apÃs o tempo limite especificado"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcar como lida apÃs o tempo limite especificado."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marcar citaÃÃes na \"VisualizaÃÃo\" da mensagem"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcar citaÃÃes na \"VisualizaÃÃo\" da mensagem."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Message text limit for display"
 msgstr "Limite de mensagem de texto para exibiÃÃo"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Estilo de exibiÃÃo de mensagem (\"normal\", \"full headers\" (todos os "
 "cabeÃalhos), \"source\" (fonte))"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Minimum days between emptying the junk on exit"
 msgstr "NÃmero mÃnimo de dias para esvaziar o spam ao sair"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Minimum days between emptying the trash on exit"
 msgstr "NÃmero mÃnimo em dias para esvaziar a lixeira ao sair"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Tempo mÃnimo em dias para esvaziar o spam ao sair."
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Tempo mÃnimo em dias para esvaziar a lixeira ao sair."
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "NÃmero de endereÃos a serem exibidos nos campos PARA/CC/CCO"
 
-#: ../mail/evolution-mail.schemas.in.h:135
-#| msgid "-----Original Message-----"
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Original message."
 msgstr "Mensagem original."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Path where picture gallery should search for its content"
 msgstr "Caminho na qual a galeria de imagens deve procurar por conteÃdo"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "Possible values are: never - to never close browser window always - to "
 "always close browser window ask - (or any other value) will ask user"
@@ -10769,60 +10771,57 @@ msgstr ""
 "sempre - para sempre fechar a pergunta da janela - (ou qualquer outro valor) "
 "irà perguntar ao usuÃrio"
 
-#: ../mail/evolution-mail.schemas.in.h:138
-#| msgid ""
-#| "The following recipients were not recognized as valid mail addresses:\n"
-#| "{0}"
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr ""
 "Perguntar antes de enviar para destinatÃrios que nÃo tiveram um endereÃo de "
 "e-mail inserido"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Prompt on empty subject"
 msgstr "Perguntar em caso de assunto vazio"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 "Perguntar ao usuÃrio quando ele tenta excluir permanentemente uma pasta."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Perguntar ao usuÃrio quando ele tenta enviar uma mensagem com assunto vazio."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Prompt when deleting messages in search folder"
 msgstr "Perguntar ao excluir mensagens na pasta de pesquisa"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Avisar quando listas de e-mail desviarem respostas privadas"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Prompt when replying privately to list messages"
 msgstr "Avisar ao responder privadamente para listas de mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Prompt when replying to many recipients"
 msgstr "Perguntar ao responder para muitos destinatÃrios"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Prompt when user expunges"
 msgstr "Perguntar quando o usuÃrio exclui permanentemente"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Prompt when user only fills Bcc"
 msgstr "Perguntar quando o usuÃrio preenche apenas o CCO"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Perguntar quando o usuÃrio tentar abrir 10 ou mais mensagens de uma vez"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -10830,65 +10829,65 @@ msgstr ""
 "Perguntar quando o usuÃrio tenta enviar mensagem HTML para contatos que nÃo "
 "as desejam."
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Perguntar quando o usuÃrio tenta enviar uma mensagem sem destinatÃrios Para "
 "ou Cc."
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Perguntar quando o usuÃrio tenta enviar HTML indesejado"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Prompt while marking multiple messages"
 msgstr "Avisar enquanto marcar mensagens mÃltiplas"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Put personalized signatures at the top of replies"
 msgstr "Coloque assinaturas personalizadas no comeÃo das respostas"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Put the cursor at the bottom of replies"
 msgstr "Posicionar o cursor no final de respostas"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Reconhecer carinhas no texto e substituÃ-las por imagens."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Recognize links in text and replace them."
 msgstr "Reconhecer links no texto e substituÃ-los."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Run junk test on incoming mail."
 msgstr "Executar teste de spam nas recebidas."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Save directory"
 msgstr "Salvar diretÃrio"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Search for the sender photo in local address books"
 msgstr "Pesquisar pela foto do remetente no catÃlogo de endereÃos local"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Send HTML mail by default"
 msgstr "Enviar correio HTML por padrÃo"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Send HTML mail by default."
 msgstr "Enviar correio HTML por padrÃo."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Sender email-address column in the message list"
 msgstr "Mostrar coluna do e-mail do remetente na lista de mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Server synchronization interval"
 msgstr "Intervalo da sincronizaÃÃo do servidor"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -10896,64 +10895,64 @@ msgstr ""
 "Defina como VERDADEIRO se vocà nÃo deseja adicionar um delimitador de "
 "assinatura antes da sua assinatura quando estiver escrevendo uma mensagem."
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Mostrar o campo \"Bcc\" quando enviando uma mensagem"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Mostrar o campo \"Cc\" quando enviando uma mensagem"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Mostrar o campo \"De\" quando enviando uma mensagem a um newsgroup"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr ""
 "Mostrar o campo \"Responder a\" quando enviando uma mensagem a um newsgroup"
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Mostrar o campo \"Responder a\" ao enviar uma mensagem"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Show Animations"
 msgstr "Mostrar animaÃÃes"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show all message headers"
 msgstr "Exibe todos os cabeÃalhos das mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "Show all the headers when viewing a messages."
 msgstr "Mostrar todos os cabeÃalhos ao visualizar uma mensagem."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Show animated images as animations."
 msgstr "Mostrar imagens animadas como animaÃÃes."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Mostrar mensagens excluÃdas (com um risco) na lista de mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Show deleted messages in the message-list"
 msgstr "Mostrar mensagens excluÃdas na lista de mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Show image animations"
 msgstr "Mostrar animaÃÃes de imagens"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Show original \"Date\" header value."
 msgstr "Exibe o valor original do cabeÃalho de \"Data\"."
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Show photo of the sender"
 msgstr "Mostrar foto do remetente"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -10961,7 +10960,7 @@ msgstr ""
 "Mostrar o campo \"Bcc\" quando enviando uma mensagem. Isto à controlado do "
 "menu Ver quando uma conta de e-mail à escolhida."
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -10969,7 +10968,7 @@ msgstr ""
 "Mostrar o campo \"Cc\" quando enviando uma mensagem. Isto à controlado do "
 "menu Ver quando uma conta de e-mail à escolhida."
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -10977,7 +10976,7 @@ msgstr ""
 "Mostrar o campo \"De\" quando enviando uma mensagem a um newsgroup. Isto à "
 "controlado do menu Ver quando uma conta de e-mail à escolhida."
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -10985,7 +10984,7 @@ msgstr ""
 "Mostrar o campo \"Responder a\" quando enviando uma mensagem a um newsgroup. "
 "Isto à controlado do menu Ver quando uma conta de e-mail à escolhida."
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -10993,14 +10992,14 @@ msgstr ""
 "Mostrar o campo \"Responder a\" quando enviando uma mensagem. Isto à "
 "controlado do menu Ver quando uma conta de e-mail à escolhida."
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr ""
 "Mostra o e-mail do remetente em uma coluna separada na lista de mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -11010,11 +11009,11 @@ msgstr ""
 "horÃrio for diferente). Caso contrÃrio, sempre exibe o valor do cabeÃalho "
 "\"Data\" no formato preferido do usuÃrio e no fuso horÃrio local."
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Mostra a foto do remetente no painÃl de leitura da mensagem"
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid ""
 "Some mailing lists set a Reply-To: header to trick users into sending "
 "replies to the list, even when they ask Evolution to make a private reply. "
@@ -11034,41 +11033,45 @@ msgstr ""
 "cabeÃalho de Responder para com um cabeÃalho de postagem em lista, se houver "
 "um."
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Spell check inline"
 msgstr "Verificar ortografia durante a digitaÃÃo"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Spell checking color"
 msgstr "Cor da verificaÃÃo ortogrÃfica"
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Spell checking languages"
 msgstr "Idiomas da verificaÃÃo ortogrÃfica"
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:192
+msgid "State of message headers in paned view"
+msgstr "Estado de cabeÃalhos de mensagens na visÃo de painÃis"
+
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "Terminal font"
 msgstr "Fonte de terminal"
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "The default plugin for Junk hook"
 msgstr "O plug-in padrÃo associado ao Spam"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "A Ãltima vez que o spam foi esvaziada, em dias desde a 1 de Janeiro de 1970 "
 "(Ãpoca)."
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "A Ãltima vez que a lixeira foi esvaziada, em dias desde 1 de Janeiro de 1970 "
 "(Ãpoca)."
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -11080,11 +11083,11 @@ msgstr ""
 "prà visualizaÃÃo da lista de tarefas. \"1\" (visÃo vertical) lugares para "
 "prÃ-visualizar o painel para a prÃxima lista de tarefas."
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "The terminal font for mail display."
 msgstr "A fonte de terminal para exibiÃÃo de correio."
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid ""
 "The text that is inserted when forwarding a message, saying that the "
 "forwarded message follows."
@@ -11092,7 +11095,7 @@ msgstr ""
 "O texto que à inserido quando à encaminhada uma mensagem dizendo que segue "
 "uma mensagem encaminhada."
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid ""
 "The text that is inserted when replying to a message (top posting), saying "
 "that the original message follows."
@@ -11100,7 +11103,7 @@ msgstr ""
 "O texto que à inserido quando à respondida uma mensagem dizendo que segue a "
 "mensagem original."
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid ""
 "The text that is inserted when replying to a message, attributing the "
 "message to the original author."
@@ -11108,19 +11111,19 @@ msgstr ""
 "O texto que à inserido quando à respondida uma mensagem, atribuindo a "
 "mensagem ao autor original."
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "The variable width font for mail display."
 msgstr "A fonte de largura variÃvel para exibiÃÃo de correio."
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr ""
-"Isso admite trÃs valores possÃveis: \"0\" para erros, \"1\" para avisos. "
-"\"2\" para mensagens de depuraÃÃo."
+"Isso admite trÃs valores possÃveis: \"0\" para erros, \"1\" para avisos. \"2"
+"\" para mensagens de depuraÃÃo."
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid ""
 "This decides the max size of the message text that will be displayed under "
 "Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
@@ -11130,7 +11133,7 @@ msgstr ""
 "Evolution. O padrÃo à 4996 (4MB). Este valor à usado somente quando a chave "
 "\"force_message_limit\" Ã ativada"
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -11140,7 +11143,7 @@ msgstr ""
 "habilitados. Se a lista de plug-ins padrÃo estiver desabilitado, entÃo "
 "retorne para outros plug-ins disponÃveis."
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -11148,7 +11151,7 @@ msgstr ""
 "Esta chave à lida apenas uma vez e restaurada para \"false\" depois de lida. "
 "Isto desmarca o e-mail na lista e remove a visualizaÃÃo para aquela pasta."
 
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -11160,7 +11163,7 @@ msgstr ""
 "&lt;header enabled&gt; - defina \"enabled\" se o cabeÃalho deve ser exibido "
 "junto com a mensagem."
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:208
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -11170,11 +11173,11 @@ msgstr ""
 "excluÃdos do filtro de spam. Essa opÃÃo està relacionada à chave "
 "lookup_addressbook."
 
-#: ../mail/evolution-mail.schemas.in.h:207
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid "This option would help in improving the speed of fetching."
 msgstr "Esta opÃÃo ajuda a melhorar a velocidade de obtenÃÃo."
 
-#: ../mail/evolution-mail.schemas.in.h:208
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -11182,10 +11185,7 @@ msgstr ""
 "Esta opÃÃo define o nÃmero de endereÃos mostrados na visualizaÃÃo em lista "
 "de mensagens, alÃm desse nÃmero serà mostrado \"...\"."
 
-#: ../mail/evolution-mail.schemas.in.h:209
-#| msgid ""
-#| "This setting specifies whether the threads should be in expanded or "
-#| "collapsed state by default. Evolution requires a restart."
+#: ../mail/evolution-mail.schemas.in.h:211
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Requires a restart to apply."
@@ -11193,7 +11193,7 @@ msgstr ""
 "Este ajuste especifica se as discussÃes ficarÃo expandidas ou contraÃdas por "
 "padrÃo. Requer reinicializaÃÃo para entrar em vigor."
 
-#: ../mail/evolution-mail.schemas.in.h:210
+#: ../mail/evolution-mail.schemas.in.h:212
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -11203,7 +11203,7 @@ msgstr ""
 "mensagem em cada conversaÃÃo ao invÃs da data da mensagem. O Evolution "
 "necessita ser reiniciado."
 
-#: ../mail/evolution-mail.schemas.in.h:211
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid ""
 "This value can be an empty string, which means it'll use the system Picture "
 "folder, usually set to ~/Pictures. This folder will be also used when the "
@@ -11214,35 +11214,27 @@ msgstr ""
 "serà tambÃm usada quando à definido um caminho que aponta para uma pasta "
 "inexistente."
 
-#: ../mail/evolution-mail.schemas.in.h:212
+#: ../mail/evolution-mail.schemas.in.h:214
 msgid "Thread the message-list based on Subject"
 msgstr "Encadear a lista de mensagens baseado no assunto"
 
-#: ../mail/evolution-mail.schemas.in.h:213
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "Timeout for marking message as seen"
 msgstr "Tempo limite para marcar a mensagem como lida"
 
-#: ../mail/evolution-mail.schemas.in.h:214
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Timeout for marking message as seen."
 msgstr "Tempo limite para marcar a mensagem como lida."
 
-#: ../mail/evolution-mail.schemas.in.h:215
+#: ../mail/evolution-mail.schemas.in.h:217
 msgid "UID string of the default account."
 msgstr "String UID da conta padrÃo."
 
-#: ../mail/evolution-mail.schemas.in.h:216
+#: ../mail/evolution-mail.schemas.in.h:218
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
 "Cor de sublinhado para palavras incorretas ao usar o corretor embutido."
 
-#: ../mail/evolution-mail.schemas.in.h:217
-msgid "Use SpamAssassin daemon and client"
-msgstr "Usar o daemon e cliente do SpamAssassin"
-
-#: ../mail/evolution-mail.schemas.in.h:218
-msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr "Usa o daemon e cliente do SpamAssassin (spamc/spamd)."
-
 #: ../mail/evolution-mail.schemas.in.h:219
 msgid "Use custom fonts"
 msgstr "Usar fontes personalizadas"
@@ -11252,14 +11244,6 @@ msgid "Use custom fonts for displaying mail."
 msgstr "Usa fontes personalizadas para exibir as mensagens."
 
 #: ../mail/evolution-mail.schemas.in.h:221
-msgid "Use only local spam tests."
-msgstr "Usar apenas testes de SPAM locais."
-
-#: ../mail/evolution-mail.schemas.in.h:222
-msgid "Use only the local spam tests (no DNS)."
-msgstr "Usa apenas os testes de SPAM locais (sem DNS)."
-
-#: ../mail/evolution-mail.schemas.in.h:223
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
@@ -11269,7 +11253,7 @@ msgstr ""
 "quando respondendo a uma mensagem. Isto determina se o cursor à posicionado "
 "na parte superior ou inferior da mensagem."
 
-#: ../mail/evolution-mail.schemas.in.h:224
+#: ../mail/evolution-mail.schemas.in.h:222
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
@@ -11279,15 +11263,15 @@ msgstr ""
 "posicionadas quando respondendo a uma mensagem. Isto determina se as "
 "assinaturas sÃo posicionadas na parte superior ou inferior da mensagem."
 
-#: ../mail/evolution-mail.schemas.in.h:225
+#: ../mail/evolution-mail.schemas.in.h:223
 msgid "Variable width font"
 msgstr "Fonte de largura variÃvel"
 
-#: ../mail/evolution-mail.schemas.in.h:226
+#: ../mail/evolution-mail.schemas.in.h:224
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "Envia um pedido de recibo de leitura a cada mensagem por padrÃo."
 
-#: ../mail/evolution-mail.schemas.in.h:227
+#: ../mail/evolution-mail.schemas.in.h:225
 msgid ""
 "Whether check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
@@ -11298,7 +11282,7 @@ msgstr ""
 "for iniciado. Esta opÃÃo à usada somente junto com a opÃÃo "
 "\"send_recv_on_start\"."
 
-#: ../mail/evolution-mail.schemas.in.h:228
+#: ../mail/evolution-mail.schemas.in.h:226
 msgid ""
 "Whether check for new messages when Evolution is started. This includes also "
 "sending messages from Outbox."
@@ -11306,11 +11290,11 @@ msgstr ""
 "Verificar por novas mensagens quando o Evolution for iniciado. Isto inclui "
 "tambÃm o envio de mensagens da caixa de saÃda."
 
-#: ../mail/evolution-mail.schemas.in.h:229
+#: ../mail/evolution-mail.schemas.in.h:227
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "Se deve ou nÃo abreviar o nome das pastas na barra lateral."
 
-#: ../mail/evolution-mail.schemas.in.h:230
+#: ../mail/evolution-mail.schemas.in.h:228
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -11318,11 +11302,11 @@ msgstr ""
 "Se o encadeamento por assunto deve ser revertido quando as mensagens nÃo "
 "contÃm cabeÃalhos In-Reply-To ou References."
 
-#: ../mail/evolution-mail.schemas.in.h:231
+#: ../mail/evolution-mail.schemas.in.h:229
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Ordenar as conversaÃÃes com base na sua Ãltima mensagem"
 
-#: ../mail/evolution-mail.schemas.in.h:232
+#: ../mail/evolution-mail.schemas.in.h:230
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any 'Forward to' filter action and approximately "
@@ -11332,101 +11316,99 @@ msgstr ""
 "caixa de saÃda irà acontecer somente quando for usado algum filtro de aÃÃo "
 "\"Encaminhar para\" e aproximadamente um minuto depois da aÃÃo de invocaÃÃo."
 
-#: ../mail/evolution-mail.schemas.in.h:233
+#: ../mail/evolution-mail.schemas.in.h:231
 msgid "Width of the message-list pane"
 msgstr "Largura do painel de lista de mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:234
+#: ../mail/evolution-mail.schemas.in.h:232
 msgid "Width of the message-list pane."
 msgstr "Largura do painel de lista de mensagens."
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:181
 msgid "Importing Elm data"
 msgstr "Importando dados do Elm"
 
-#: ../mail/importers/elm-importer.c:339 ../mail/importers/pine-importer.c:415
-#: ../modules/mail/e-mail-shell-view.c:1044
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
-#: ../widgets/misc/e-send-options.c:511
+#: ../mail/importers/elm-importer.c:351 ../mail/importers/pine-importer.c:458
+#: ../modules/mail/e-mail-shell-view.c:1051
+#: ../widgets/misc/e-send-options.c:520
 msgid "Mail"
 msgstr "Correio"
 
-#: ../mail/importers/elm-importer.c:380
+#: ../mail/importers/elm-importer.c:396
 msgid "Evolution Elm importer"
 msgstr "Importador Elm do Evolution"
 
-#: ../mail/importers/elm-importer.c:381
+#: ../mail/importers/elm-importer.c:397
 msgid "Import mail from Elm."
 msgstr "Importar caixa de correio do Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:127
-#: ../plugins/dbx-import/dbx-importer.c:227
+#: ../mail/importers/evolution-mbox-importer.c:138
+#: ../plugins/dbx-import/dbx-importer.c:250
 msgid "_Destination folder:"
 msgstr "Pasta _destino:"
 
-#: ../mail/importers/evolution-mbox-importer.c:133
-#: ../plugins/dbx-import/dbx-importer.c:237
-#: ../plugins/pst-import/pst-importer.c:320
+#: ../mail/importers/evolution-mbox-importer.c:145
+#: ../plugins/dbx-import/dbx-importer.c:260
+#: ../plugins/pst-import/pst-importer.c:460
 msgid "Select folder"
 msgstr "Selecionar pasta"
 
-#: ../mail/importers/evolution-mbox-importer.c:134
-#: ../plugins/dbx-import/dbx-importer.c:238
-#: ../plugins/pst-import/pst-importer.c:320
+#: ../mail/importers/evolution-mbox-importer.c:146
+#: ../plugins/dbx-import/dbx-importer.c:261
+#: ../plugins/pst-import/pst-importer.c:461
 msgid "Select folder to import into"
 msgstr "Selecionar pasta para onde importar"
 
-#: ../mail/importers/evolution-mbox-importer.c:403
+#: ../mail/importers/evolution-mbox-importer.c:433
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Assunto"
 
-#: ../mail/importers/evolution-mbox-importer.c:408
+#: ../mail/importers/evolution-mbox-importer.c:438
 msgctxt "mboxImp"
 msgid "From"
 msgstr "De"
 
-#: ../mail/importers/evolution-mbox-importer.c:452
-#: ../shell/e-shell-utils.c:253
+#: ../mail/importers/evolution-mbox-importer.c:482
+#: ../shell/e-shell-utils.c:221
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:453
+#: ../mail/importers/evolution-mbox-importer.c:483
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importador de pastas no formato Berkeley Mailbox"
 
-#: ../mail/importers/mail-importer.c:65
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "Importando caixa de correio"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:150
-#: ../plugins/dbx-import/dbx-importer.c:574
-#: ../plugins/pst-import/pst-importer.c:482
-#: ../plugins/pst-import/pst-importer.c:591
+#: ../mail/importers/mail-importer.c:153
+#: ../plugins/dbx-import/dbx-importer.c:610
+#: ../plugins/pst-import/pst-importer.c:648
 #, c-format
 msgid "Importing '%s'"
 msgstr "Importando \"%s\""
 
-#: ../mail/importers/mail-importer.c:308
+#: ../mail/importers/mail-importer.c:316
 #, c-format
 msgid "Scanning %s"
 msgstr "Varrendo %s"
 
-#: ../mail/importers/pine-importer.c:223
+#: ../mail/importers/pine-importer.c:260
 msgid "Importing Pine data"
 msgstr "Importando dados do Pine"
 
-#: ../mail/importers/pine-importer.c:420
-#: ../modules/addressbook/addressbook-config.c:1011
+#: ../mail/importers/pine-importer.c:463
+#: ../modules/addressbook/addressbook-config.c:1081
 msgid "Address Book"
 msgstr "CatÃlogo de endereÃos"
 
-#: ../mail/importers/pine-importer.c:462
+#: ../mail/importers/pine-importer.c:509
 msgid "Evolution Pine importer"
 msgstr "Importador Pine do Evolution"
 
-#: ../mail/importers/pine-importer.c:463
+#: ../mail/importers/pine-importer.c:510
 msgid "Import mail from Pine."
 msgstr "Importar caixa de correio do Pine."
 
@@ -11435,22 +11417,22 @@ msgstr "Importar caixa de correio do Pine."
 msgid "Mail to %s"
 msgstr "Correio para %s"
 
-#: ../mail/mail-autofilter.c:238 ../mail/mail-autofilter.c:280
+#: ../mail/mail-autofilter.c:228 ../mail/mail-autofilter.c:271
 #, c-format
 msgid "Mail from %s"
 msgstr "Correio de %s"
 
-#: ../mail/mail-autofilter.c:264
+#: ../mail/mail-autofilter.c:254
 #, c-format
 msgid "Subject is %s"
 msgstr "Assunto à %s"
 
-#: ../mail/mail-autofilter.c:303
+#: ../mail/mail-autofilter.c:295
 #, c-format
 msgid "%s mailing list"
 msgstr "Lista de discussÃo %s"
 
-#: ../mail/mail-autofilter.c:394
+#: ../mail/mail-autofilter.c:404
 msgid "Add Filter Rule"
 msgstr "Adicionar regra de filtro"
 
@@ -11459,7 +11441,7 @@ msgstr "Adicionar regra de filtro"
 #. * folder. For more than one filter rule is each of
 #. * them on a separate line, with four spaces in front
 #. * of its name, without quotes.
-#: ../mail/mail-autofilter.c:492
+#: ../mail/mail-autofilter.c:507
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -11484,467 +11466,484 @@ msgstr "Adicionar nova a_ssinatura..."
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "_Sempre assinar mensagens enviadas ao usar esta conta"
 
+#: ../mail/mail-config.ui.h:4
+msgid ""
+"All new emails with header that matches given content will be automatically "
+"filtered as junk"
+msgstr ""
+"Todos os novos e-mails com cabeÃalho que correspondem ao conteÃdo serÃo "
+"automaticamente filtrados como lixo eletrÃnico"
+
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:5
-#| msgid "Prompt when mailing list redirects private reply back to list"
+#: ../mail/mail-config.ui.h:6
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr ""
 "Permitir que uma _listas de e-mail redirecione uma resposta privada para a "
 "lista"
 
-#: ../mail/mail-config.ui.h:6
+#: ../mail/mail-config.ui.h:7
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "TambÃm criptogra_far para mim mesmo ao enviar mensagens criptografadas"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:8
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "_Enviar sempre uma cÃpia (Cc) para:"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:9
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Enviar sempre uma cÃpia _oculta (CCO) para:"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Con_fiar sempre nas chaves em meu chaveiro ao criptografar"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Sempre criptografar para mim _mesmo ao enviar mensagens criptografadas"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "Sempre solicitar um recibo _de leitura"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Apply the same _view settings to all folders"
 msgstr "Aplicar a mesma configuraÃÃo de _visÃo para todas as pastas"
 
-#: ../mail/mail-config.ui.h:14
-#: ../modules/addressbook/addressbook-config.c:1018
+#: ../mail/mail-config.ui.h:15
+#: ../modules/addressbook/addressbook-config.c:1088
 msgid "Authentication"
 msgstr "AutenticaÃÃo"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:16
 msgid "Automatically insert _emoticon images"
 msgstr "Inserir automaticamente imag_ens de carinhas"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
 msgid "C_haracter set:"
 msgstr "Con_junto de caracteres:"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
 msgid "Ch_eck for Supported Types"
 msgstr "_Verificar por tipos com suporte"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
 msgid "Check cu_stom headers for junk"
 msgstr "Verificar cabeÃalhos per_sonalizados por spam"
 
-#: ../mail/mail-config.ui.h:19
-#| msgid "Check for _new messages every"
+#: ../mail/mail-config.ui.h:20
 msgid "Check for new _messages on start"
 msgstr "Verificar novas _mensagens ao iniciar"
 
-#: ../mail/mail-config.ui.h:20
-#| msgid "Check for _new messages every"
+#: ../mail/mail-config.ui.h:21
 msgid "Check for new messa_ges in all active accounts"
 msgstr "Verificar novas mensa_gens em todas as contas ativas"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Check incoming _messages for junk"
 msgstr "Procurar em mensagens _recebidas por spam"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Check spelling while I _type"
 msgstr "Verificar a ortografia enquanto eu _digito"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:24
 msgid "Cle_ar"
 msgstr "Limp_ar"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
 msgid "Clea_r"
 msgstr "Limpa_r"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
 msgid "Color for _misspelled words:"
 msgstr "Cor das palavras _erradas:"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:27
 msgid "Composing Messages"
 msgstr "Redigir mensagens"
 
-#: ../mail/mail-config.ui.h:27
-#: ../modules/plugin-manager/evolution-plugin-manager.c:157
+#: ../mail/mail-config.ui.h:28
+#: ../modules/plugin-manager/evolution-plugin-manager.c:161
 msgid "Configuration"
 msgstr "ConfiguraÃÃo"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:29
 msgid "Confirm _when expunging a folder"
 msgstr "C_onfirmar ao excluir permanentemente uma pasta"
 
-#: ../mail/mail-config.ui.h:29
-#| msgid "Configuration"
+#: ../mail/mail-config.ui.h:30
 msgid "Confirmations"
 msgstr "ConfirmaÃÃes"
 
-#: ../mail/mail-config.ui.h:30
-#: ../modules/addressbook/autocompletion-config.c:155
-#: ../modules/calendar/e-calendar-preferences.ui.h:11
+#: ../mail/mail-config.ui.h:31
+#: ../modules/addressbook/autocompletion-config.c:188
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
 msgid "Date/Time Format"
 msgstr "Formato de data/hora"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:33
 msgid "Default Behavior"
 msgstr "Comportamento padrÃo"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:34
 msgid "Default character e_ncoding:"
 msgstr "Co_dificaÃÃo de caracteres padrÃo:"
 
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:35
 msgid "Delete Mail"
 msgstr "Apagar mensagem"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:36
 msgid "Delete junk messages on e_xit"
 msgstr "Remover mensagens marcadas como spam ao sai_r"
 
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:38
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "_Assinar digitalmente mensagens enviadas (por padrÃo)"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:39
 msgid "Displayed Message Headers"
 msgstr "CabeÃalhos das mensagens exibidas"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:40
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 "NÃo mar_car mensagens como spam se o remetente estiver no meu catÃlogo de "
 "endereÃos"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:41
 msgid "Do not quote"
 msgstr "NÃo citar"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
 msgid "Drafts _Folder:"
 msgstr "_Pasta de rascunhos:"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:43
 msgid "Email _Address:"
-msgstr "EndereÃo de e_mail:"
+msgstr "EndereÃo de e-m_ail:"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
 msgid "Empty trash folders on e_xit"
 msgstr "_Esvaziar lixeiras ao sair"
 
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:46
 msgid "Encry_ption certificate:"
 msgstr "Ce_rtificado de criptografia:"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:47
 msgid "Encrypt out_going messages (by default)"
 msgstr "Criptografar _mensagens enviadas (por padrÃo)"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:48
 msgid "F_all back to threading messages by subject"
 msgstr "_Agrupar mensagens por assunto"
 
-#: ../mail/mail-config.ui.h:48
-#| msgid "Fix_ed width Font:"
+#: ../mail/mail-config.ui.h:49
 msgid "Fix_ed Width Font:"
 msgstr "Font_e de largura fixa:"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:50
 msgid "Format messages in _HTML"
 msgstr "Formatar mensagens em _HTML"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:51
 msgid "Full Nam_e:"
 msgstr "Nome _completo:"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:53
 msgid "Group Reply goes only to mailing list, if possible"
 msgstr ""
 "Responder para grupo irà responder somente para listas de e-mail, se "
 "possÃvel."
 
-#: ../mail/mail-config.ui.h:53
+#: ../mail/mail-config.ui.h:54
 msgid "HTML Messages"
 msgstr "Mensagens HTML"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:55
 msgid "H_TTP Proxy:"
 msgstr "Proxy H_TTP:"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:56
+msgid "Header content"
+msgstr "ConteÃdo de cabeÃalho"
+
+#: ../mail/mail-config.ui.h:57
+msgid "Header name"
+msgstr "Nome de cabeÃalho"
+
+#: ../mail/mail-config.ui.h:58
 msgid "Headers"
 msgstr "CabeÃalhos"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:59
 msgid "Highlight _quotations with"
 msgstr "_RealÃar citaÃÃes com"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:60
 msgid "Ignore Reply-To: for mailing lists"
 msgstr "_Ignorar Responder para: para listas de e-mail."
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:61
 msgid "Inline"
 msgstr "Embutido"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:62
 msgid "Inline (Outlook style)"
 msgstr "Embutido (estilo Outlook)"
 
-#: ../mail/mail-config.ui.h:61 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "RÃtulo"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:65
 msgid "Languages Table"
 msgstr "Tabela de idiomas"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:66
 msgid "Loading Images"
 msgstr "Carregando imagens"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:67
 msgid "Mail Headers Table"
 msgstr "Tabela de cabeÃalhos de correio"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:68
 msgid "Mailbox location"
 msgstr "LocalizaÃÃo da caixa de correio"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:69
 msgid "Message Display"
 msgstr "ExibiÃÃo da mensagem"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:70
 msgid "Message Receipts"
 msgstr "Receptores da mensagem"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:71
 msgid "No _Proxy for:"
 msgstr "Nenhum _proxy para:"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:72 ../modules/addressbook/ldap-config.ui.h:9
+msgid "No encryption"
+msgstr "Sem criptografia"
+
+#: ../mail/mail-config.ui.h:73
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "A opÃÃo à ignorada se uma ocorrÃncia para cabeÃalhos de spam personalizados "
 "for localizada."
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:74
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "InformaÃÃes opcionais"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:76
 msgid "Or_ganization:"
 msgstr "_Empresa:"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:77
 msgid "PGP/GPG _Key ID:"
 msgstr "ID da C_have PGP/GPG:"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:78
 msgid "Pass_word:"
 msgstr "Sen_ha:"
 
-#: ../mail/mail-config.ui.h:76
-#: ../modules/calendar/e-calendar-preferences.ui.h:23
+#: ../mail/mail-config.ui.h:79
+#: ../modules/calendar/e-calendar-preferences.ui.h:21
 msgid "Pick a color"
 msgstr "Escolha uma cor"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:80
 msgid "Port:"
 msgstr "Porta:"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:81
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:83
 msgid "Proxy Settings"
 msgstr "ConfiguraÃÃes de proxy"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:84
 msgid "Quoted"
 msgstr "Citado"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:85
 msgid "Re_member password"
 msgstr "_Lembrar senha"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:86
 msgid "Re_ply-To:"
 msgstr "_Responder a:"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:87
 msgid "Remember _password"
 msgstr "_Lembrar senha"
 
-#: ../mail/mail-config.ui.h:85
-#| msgid "Replies and parents"
+#: ../mail/mail-config.ui.h:88
 msgid "Replies and Forwards"
 msgstr "Respostas e encaminhamentos"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:89
 msgid "Required Information"
 msgstr "InformaÃÃo solicitada"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:90
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:91
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:92
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:93
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:94 ../modules/addressbook/ldap-config.ui.h:12
+msgid "SSL encryption"
+msgstr "Criptografia SSL"
+
+#: ../mail/mail-config.ui.h:95
 msgid "SSL is not supported in this build of Evolution"
 msgstr "Esta compilaÃÃo do Evolution nÃo tem suporte a SSL"
 
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:96
 msgid "S_earch for sender photograph only in local address books"
 msgstr ""
 "P_esquisar pela foto do remetente apenas em catÃlogos de endereÃos locais"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:97
 msgid "S_elect..."
 msgstr "S_elecionar..."
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:98
 msgid "S_end message receipts:"
 msgstr "Enviar destinatÃrio_s da mensagem:"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:99
 msgid "S_tandard Font:"
 msgstr "Fonte _padrÃo:"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:100
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME seguro (S/MIME)"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:102
 msgid "Select HTML fixed width font"
 msgstr "Selecionar fonte HTML de largura fixa"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML variable width font"
 msgstr "Selecionar fonte HTML de largura variÃvel"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:104
 msgid "Sender Photograph"
 msgstr "Foto do remetente"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:103
-#| msgid "Prompt when sending private replies to mailing _list messages"
+#: ../mail/mail-config.ui.h:106
 msgid "Sending a _private reply to a mailing list message"
 msgstr "Enviando uma resposta _privada para listas de e-mail"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:105
-#| msgid ""
-#| "The following recipients were not recognized as valid mail addresses:\n"
-#| "{0}"
+#: ../mail/mail-config.ui.h:108
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "Enviando uma mensagem com _destinatÃrios sem endereÃo de e-mail"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:107
-#| msgid "_Prompt when sending messages with an empty subject line"
+#: ../mail/mail-config.ui.h:110
 msgid "Sending a message with an _empty subject line"
 msgstr "Enviando uma mensagem com um a_ssunto vazio"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:109
-#| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+#: ../mail/mail-config.ui.h:112
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Enviando uma mensagem com apenas destinatÃrios CC_O"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:111
-#| msgid "Send reply to all recipients?"
+#: ../mail/mail-config.ui.h:114
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Enviando resposta para um _nÃmero grande de destinatÃrios"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:115
 msgid "Sent _Messages Folder:"
 msgstr "Pasta de _mensagens enviadas:"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:116
 msgid "Ser_ver requires authentication"
 msgstr "Servi_dor requer autenticaÃÃo"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:117
 msgid "Server Configuration"
 msgstr "ConfiguraÃÃo do servidor"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:118
 msgid "Server _Type:"
 msgstr "_Tipo do servidor:"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:119
+msgid "Set custom junk header"
+msgstr "Definir cabeÃalho personalizado de lixo"
+
+#: ../mail/mail-config.ui.h:120
 msgid "Si_gning algorithm:"
 msgstr "Algoritmo de assi_natura:"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:121
 msgid "Sig_natures"
 msgstr "Assi_naturas"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:122
 msgid "Sig_ning certificate:"
 msgstr "Certificado de assi_natura:"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:123
 msgid "Signat_ure:"
 msgstr "_Assinatura:"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:124
 msgid "Signatures"
 msgstr "Assinaturas"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:125
 msgid "Signing _algorithm:"
 msgstr "Algoritmo de assi_natura:"
 
-#: ../mail/mail-config.ui.h:122
-#| msgid "Local Folders"
+#: ../mail/mail-config.ui.h:126
 msgid "Special Folders"
 msgstr "Pastas especiais"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:127
 msgid "Spell Checking"
 msgstr "VerificaÃÃo ortogrÃfica"
 
-#: ../mail/mail-config.ui.h:124
+#: ../mail/mail-config.ui.h:128
 msgid "Start _typing at the bottom on replying"
 msgstr "Iniciar digi_tando embaixo ao responder"
 
-#: ../mail/mail-config.ui.h:125
-#| msgid "Start: "
+#: ../mail/mail-config.ui.h:129
 msgid "Start up"
 msgstr "InÃcio"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:130 ../modules/addressbook/ldap-config.ui.h:20
+msgid "TLS encryption"
+msgstr "Criptografia TLS"
+
+#: ../mail/mail-config.ui.h:131
 msgid "T_ype:"
 msgstr "Ti_po: "
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:132
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -11952,7 +11951,7 @@ msgstr ""
 "A lista de idiomas aqui reflete apenas os idiomas para os quais vocà tem um "
 "dicionÃrio instalado."
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:133
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -11962,7 +11961,7 @@ msgstr ""
 "assinatura. O nome que vocà especificar serÃ\n"
 "usado apenas com o propÃsito de exibiÃÃo. "
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:136
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -11970,7 +11969,7 @@ msgstr ""
 "Para ajudar contra acidentes e embaraÃos por e-mail, peÃa confirmaÃÃo antes "
 "de realizar as seguintes aÃÃes marcadas:"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:137
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -11978,145 +11977,137 @@ msgstr ""
 "Digite o nome pelo qual vocà deseja chamar esta conta.\n"
 "Por exemplo: \"Trabalho\" ou \"Pessoal\""
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:139
 msgid "Us_ername:"
 msgstr "Nom_e de usuÃrio:"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:140
 msgid "Use Authe_ntication"
 msgstr "Usar aute_nticaÃÃo"
 
-#: ../mail/mail-config.ui.h:137
-#| msgid "User_name:"
+#: ../mail/mail-config.ui.h:141
 msgid "User _Name:"
 msgstr "_Nome do usuÃrio:"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:142
 msgid "_Add Signature"
 msgstr "_Adicionar assinatura"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:143
 msgid "_Always load images from the Internet"
 msgstr "_Sempre carregar imagens da Internet"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:144
 msgid "_Authentication Type"
 msgstr "_Tipo de autenticaÃÃo"
 
-#: ../mail/mail-config.ui.h:141
-msgid "_Default junk plugin:"
-msgstr "Plug-in pa_drÃo de spam"
-
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:145
 msgid "_Direct connection to the Internet"
 msgstr "ConexÃo _direta à internet"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:146
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_NÃo assinar pedidos de reuniÃo (para compatibilidade com o Outlook)"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:147
 msgid "_Forward style:"
 msgstr "Estilo de _encaminhamento:"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:148
 msgid "_Junk Folder:"
 msgstr "Pasta de s_pam:"
 
-#: ../mail/mail-config.ui.h:146
-#| msgid "_Keep Signature above the original message on replying"
+#: ../mail/mail-config.ui.h:149
 msgid "_Keep signature above the original message on replying"
 msgstr "_Manter assinatura sobre a mensagem original ao responder"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:150
 msgid "_Languages"
 msgstr "Idi_oma"
 
-#: ../mail/mail-config.ui.h:148
-#| msgid "_Load images in messages from contacts"
+#: ../mail/mail-config.ui.h:151
 msgid "_Load images only in messages from contacts"
 msgstr "_Carregar imagens nas mensagens a partir dos contatos"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:152
 msgid "_Lookup in local address book only"
 msgstr "P_rocurar apenas em catÃlogos de endereÃos locais"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:153
 msgid "_Make this my default account"
 msgstr "_Torne esta a minha conta padrÃo"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:154
 msgid "_Manual proxy configuration:"
 msgstr "ConfiguraÃÃo de proxy _manual:"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:156
 msgid "_Never load images from the Internet"
 msgstr "_Nunca carregar imagens da Internet"
 
-#: ../mail/mail-config.ui.h:154
-msgid "_Path:"
-msgstr "_Caminho:"
+#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:27
+msgid "_Port:"
+msgstr "_Porta:"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:159
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Perguntar ao enviar e-mails em HTML para contatos que nÃo os desejam"
 
-#: ../mail/mail-config.ui.h:156
+#: ../mail/mail-config.ui.h:160
 msgid "_Reply style:"
 msgstr "Estilo de _resposta:"
 
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:161
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:162
 msgid "_Secure HTTP Proxy:"
 msgstr "Proxy HTTP _seguro:"
 
-#: ../mail/mail-config.ui.h:160 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:164 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "_Servidor:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:162
-#| msgid "Show animated images as animations."
+#: ../mail/mail-config.ui.h:166
 msgid "_Show animated images"
 msgstr "Mo_strar imagens animadas"
 
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:167
 msgid "_Show the photograph of sender in the message preview"
 msgstr "Mo_strar a foto do remetente na visualizaÃÃo do e-mail"
 
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.ui.h:168
 msgid "_Trash Folder:"
 msgstr "L_ixeira:"
 
-#: ../mail/mail-config.ui.h:165
-msgid "_Use Secure Connection:"
+#: ../mail/mail-config.ui.h:169 ../modules/addressbook/ldap-config.ui.h:31
+msgid "_Use secure connection:"
 msgstr "_Usar conexÃo segura:"
 
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:170
 msgid "_Use system defaults"
 msgstr "_Usar padrÃes do sistema"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:171
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar as mesmas fontes que outros aplicativos usam"
 
-#: ../mail/mail-config.ui.h:168 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:172 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:169 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:170
+#: ../mail/mail-config.ui.h:174
 msgid "color"
 msgstr "cor"
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:175
 msgid "description"
 msgstr "descriÃÃo"
 
@@ -12136,63 +12127,64 @@ msgstr "Todas as pastas locais"
 msgid "Call"
 msgstr "Ligar"
 
-#: ../mail/mail-dialogs.ui.h:5
+#. Translators: Flag Completed
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr "Co_ncluÃda"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "Editar assinatura"
 
-#: ../mail/mail-dialogs.ui.h:7
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Do Not Forward"
 msgstr "NÃo encaminhar"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Encryption"
 msgstr "Criptografia"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Follow-Up"
 msgstr "Lembrete"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "For Your Information"
 msgstr "Para seu conhecimento"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Forward"
 msgstr "Encaminhar"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "License Agreement"
 msgstr "Acordo de licenÃa"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:14
 msgid "No Response Necessary"
 msgstr "NÃo à necessÃrio responder"
 
-#: ../mail/mail-dialogs.ui.h:17
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Reply to All"
 msgstr "Responder a todos"
 
-#: ../mail/mail-dialogs.ui.h:18
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Review"
 msgstr "Revisar"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Search Folder Sources"
 msgstr "Fonte da pasta de pesquisa"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Security Information"
 msgstr "InformaÃÃo de seguranÃa"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Specific folders"
 msgstr "Apenas pastas especÃficas"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:23
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12200,23 +12192,23 @@ msgstr ""
 "As mensagens que vocà selecionou para lembrete estÃo relacionadas abaixo.\n"
 "Por favor, selecione uma aÃÃo de lembrete no menu \"Marca\"."
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:25
 msgid "_Accept License"
 msgstr "_Aceitar licenÃa"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Due By:"
 msgstr "_Prazo:"
 
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Flag:"
 msgstr "_Marca:"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Tick this to accept the license agreement"
 msgstr "Marque aqui para acei_tar o acordo de licenÃa"
 
-#: ../mail/mail-folder-cache.c:789
+#: ../mail/mail-folder-cache.c:779
 #, c-format
 msgid "Pinging %s"
 msgstr "Chamando %s"
@@ -12225,207 +12217,133 @@ msgstr "Chamando %s"
 msgid "Filtering Selected Messages"
 msgstr "Filtrar mensagens selecionadas"
 
-#: ../mail/mail-ops.c:226
+#: ../mail/mail-ops.c:205
 msgid "Fetching Mail"
 msgstr "Obtendo correio"
 
-#: ../mail/mail-ops.c:785
+#: ../mail/mail-ops.c:821
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensagem %d de %d"
 
-#: ../mail/mail-ops.c:831
+#: ../mail/mail-ops.c:869
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Falha ao enviar %d de %d mensagens"
 
-#: ../mail/mail-ops.c:833 ../mail/mail-send-recv.c:787
-msgid "Canceled."
-msgstr "Cancelada."
-
-#: ../mail/mail-ops.c:835 ../mail/mail-send-recv.c:789
-msgid "Complete."
-msgstr "ConcluÃda."
-
-#: ../mail/mail-ops.c:941
-#, c-format
-msgid "Moving messages to '%s'"
-msgstr "Movendo mensagens para \"%s\""
-
-#: ../mail/mail-ops.c:941
-#, c-format
-msgid "Copying messages to '%s'"
-msgstr "Copiando mensagens para \"%s\""
-
-#: ../mail/mail-ops.c:1062
-#, c-format
-msgid "Scanning folders in '%s'"
-msgstr "Varrendo pastas em \"%s\""
-
-#: ../mail/mail-ops.c:1178
-msgid "Forwarded messages"
-msgstr "Mensagens encaminhadas"
+#: ../mail/mail-ops.c:873 ../mail/mail-send-recv.c:837
+msgid "Canceled."
+msgstr "Cancelada."
 
-#: ../mail/mail-ops.c:1295
-#, c-format
-msgid "Retrieving quota information for folder '%s'"
-msgstr "Recuperando informaÃÃes de cota da pasta \"%s\""
+#: ../mail/mail-ops.c:875 ../mail/mail-send-recv.c:839
+msgid "Complete."
+msgstr "ConcluÃda."
 
-#: ../mail/mail-ops.c:1370
+#: ../mail/mail-ops.c:985
 #, c-format
-msgid "Opening store '%s'"
-msgstr "Abrindo repositÃrio \"%s\""
+msgid "Moving messages to '%s'"
+msgstr "Movendo mensagens para \"%s\""
 
-#: ../mail/mail-ops.c:1446
+#: ../mail/mail-ops.c:986
 #, c-format
-msgid "Removing folder '%s'"
-msgstr "Removendo pasta \"%s\""
+msgid "Copying messages to '%s'"
+msgstr "Copiando mensagens para \"%s\""
 
-#: ../mail/mail-ops.c:1609
+#: ../mail/mail-ops.c:1104
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Armazenando pasta \"%s\""
 
-#: ../mail/mail-ops.c:1678
+#: ../mail/mail-ops.c:1179
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Excluindo permanentemente e armazenando conta \"%s\""
 
-#: ../mail/mail-ops.c:1679
+#: ../mail/mail-ops.c:1180
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Armazenando a conta \"%s\""
 
-#: ../mail/mail-ops.c:1737
+#: ../mail/mail-ops.c:1242
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Atualizando a pasta \"%s\""
 
-#: ../mail/mail-ops.c:1901
+#: ../mail/mail-ops.c:1432
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Excluindo a pasta \"%s\""
 
-#: ../mail/mail-ops.c:1973
+#: ../mail/mail-ops.c:1517
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Esvaziando a lixeira em \"%s\""
 
-#: ../mail/mail-ops.c:1974
-msgid "Local Folders"
-msgstr "Pastas locais"
-
-#: ../mail/mail-ops.c:2147
-#, c-format
-msgid "Retrieving %d message"
-msgid_plural "Retrieving %d messages"
-msgstr[0] "Buscando %d mensagem"
-msgstr[1] "Buscando %d mensagens"
-
-#: ../mail/mail-ops.c:2240
-#, c-format
-msgid "Saving %d message"
-msgid_plural "Saving %d messages"
-msgstr[0] "Salvando %d mensagem"
-msgstr[1] "Salvando %d mensagens"
-
-#: ../mail/mail-ops.c:2336
+#: ../mail/mail-ops.c:1619
 #, c-format
-msgid "Error saving messages to: %s:\n"
-msgstr "Erro ao salvar mensagens para: %s:\n"
-
-#: ../mail/mail-ops.c:2411
-#, c-format
-msgid "Preparing account '%s' for offline"
-msgstr "Preparando conta \"%s\" para desconexÃo"
-
-#: ../mail/mail-ops.c:2502
-msgid "Checking Service"
-msgstr "Verificando serviÃo"
-
-#: ../mail/mail-ops.c:2582
-#, c-format
-#| msgid "Disconnecting from '%s'"
 msgid "Disconnecting %s"
 msgstr "Desconectando de %s"
 
-#: ../mail/mail-ops.c:2639
-#, c-format
-#| msgid "Saving attachment"
-msgid "Removing attachments"
-msgstr "Removendo anexos"
-
-#: ../mail/mail-ops.c:2686
-#, c-format
-#| msgid "All accounts have been removed."
-msgid "File \"%s\" has been removed."
-msgstr "Arquivo \"%s\" foi removido."
-
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:198
 msgid "Canceling..."
 msgstr "Cancelando..."
 
-#: ../mail/mail-send-recv.c:435
+#: ../mail/mail-send-recv.c:454
 msgid "Send & Receive Mail"
 msgstr "Enviar e receber correio"
 
-#: ../mail/mail-send-recv.c:451
+#: ../mail/mail-send-recv.c:470
 msgid "Cancel _All"
 msgstr "Cancelar _tudo"
 
-#: ../mail/mail-send-recv.c:568
+#: ../mail/mail-send-recv.c:596 ../mail/mail-send-recv.c:979
 msgid "Updating..."
 msgstr "Atualizando..."
 
-#: ../mail/mail-send-recv.c:568 ../mail/mail-send-recv.c:652
+#: ../mail/mail-send-recv.c:596 ../mail/mail-send-recv.c:691
 msgid "Waiting..."
 msgstr "Esperando..."
 
-#: ../mail/mail-send-recv.c:902
+#: ../mail/mail-send-recv.c:959
 #, c-format
 msgid "Checking for new mail"
 msgstr "Verificando novas mensagens"
 
-#: ../mail/mail-tools.c:69
+#: ../mail/mail-tools.c:72
 #, c-format
 msgid "Could not create spool directory '%s': %s"
 msgstr "NÃo foi possÃvel criar o diretÃrio de fila \"%s\": %s"
 
-#: ../mail/mail-tools.c:102
+#: ../mail/mail-tools.c:106
 #, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "Tentando executar movemail sobre uma fonte que nÃo à mbox \"%s\""
 
-#: ../mail/mail-tools.c:214
+#: ../mail/mail-tools.c:215
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensagem encaminhada - %s"
 
-#: ../mail/mail-tools.c:216
+#: ../mail/mail-tools.c:217
 msgid "Forwarded message"
 msgstr "Mensagem encaminhada"
 
-#: ../mail/mail-vfolder.c:86
+#: ../mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Preparando pasta de pesquisa: %s"
 
-#: ../mail/mail-vfolder.c:235
-#, c-format
-msgid "Updating Search Folders for '%s:%s'"
-msgstr "Atualizando pastas de pesquisa para \"%s:%s\""
-
-#: ../mail/mail-vfolder.c:242
+#: ../mail/mail-vfolder.c:232
 #, c-format
-msgid "Updating Search Folders for '%s'"
-msgstr "Atualizando pastas de pesquisa para \"%s\""
+msgid "Updating Search Folders for '%s' : %s"
+msgstr "Atualizando pastas de pesquisa para \"%s\" : %s"
 
 #. Translators: The first %s is name of the affected
 #. * search folder(s), the second %s is the URI of the
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../mail/mail-vfolder.c:718
+#: ../mail/mail-vfolder.c:678
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -12444,11 +12362,11 @@ msgstr[1] ""
 "\"%s\" foram modificadas para a conta, para as pastas apagadas\n"
 "\"%s\"."
 
-#: ../mail/mail-vfolder.c:1297
+#: ../mail/mail-vfolder.c:1314
 msgid "Edit Search Folder"
 msgstr "Editar pasta de pesquisa"
 
-#: ../mail/mail-vfolder.c:1408
+#: ../mail/mail-vfolder.c:1423
 msgid "New Search Folder"
 msgstr "Nova pasta de pesquisa"
 
@@ -12659,7 +12577,6 @@ msgstr ""
 "diferenciam maiÃsculas de minÃsculas; sua tecla caps lock pode estar ligada."
 
 #: ../mail/mail.error.xml.h:43
-#| msgid "Close this window"
 msgid "Close message window."
 msgstr "Fecha a janela de mensagem."
 
@@ -12667,57 +12584,53 @@ msgstr "Fecha a janela de mensagem."
 msgid "Could not save signature file."
 msgstr "NÃo foi possÃvel salvar o arquivo de assinatura."
 
-#: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder \"{0}\"?"
-msgstr "Excluir mensagens na pasta de pesquisa \"{0}\"?"
-
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:46
 msgid "Do _Not Disable"
 msgstr "_NÃo desabilitar"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:47
 msgid "Do _Not Send"
 msgstr "_NÃo enviar"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:48
 msgid "Do _Not Synchronize"
 msgstr "_NÃo sincronizar"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:49
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr ""
 "Vocà deseja sincronizar localmente as pastas marcadas para uso desconectado?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Do you want to mark all messages as read?"
 msgstr "Marcar todas as mensagens como lidas?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
 msgid "Do you wish to save your changes?"
 msgstr "Vocà deseja salvar suas alteraÃÃes?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "Digite a senha."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "Erro ao carregar definiÃÃes de filtro."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "Error while performing operation."
 msgstr "Erro ao executar operaÃÃo."
 
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
 #. "Sending message" and others, mostly from mail-ops.c file.
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "Erro {0}."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:59
 msgid ""
 "Evolution's local mail format has changed from mbox to Maildir. Your local "
 "mail must be migrated to the new format before Evolution can proceed. Do you "
@@ -12736,34 +12649,63 @@ msgstr ""
 "seguranÃa. Por favor, tenha certeza que hà espaÃo em disco suficiente se "
 "vocà decidir migrar agora."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:62
 msgid "Evolution's local mail format has changed."
 msgstr "O formato de e-mail local do Evolution foi alterado."
 
+#: ../mail/mail.error.xml.h:63
+msgid "Failed to download messages for offline viewing."
+msgstr "Falha ao baixar mensagens para visualizaÃÃo desconectado."
+
 #: ../mail/mail.error.xml.h:64
-#| msgid "Unsubscribing from folder \"%s\""
+msgid "Failed to find duplicate messages."
+msgstr "Falha ao localizar mensagens duplicadas."
+
+#: ../mail/mail.error.xml.h:65
+msgid "Failed to open folder."
+msgstr "Falha ao abrir a pasta."
+
+#: ../mail/mail.error.xml.h:66
+msgid ""
+"Failed to query server for a list of supported authentication mechanisms."
+msgstr ""
+"Falha ao consultar servidor para obter uma lista de mecanismos de "
+"autenticaÃÃo aceitos."
+
+#: ../mail/mail.error.xml.h:67
+msgid "Failed to remove attachments from messages."
+msgstr "Falhou ao remover anexos das mensagens."
+
+#: ../mail/mail.error.xml.h:68
+msgid "Failed to retrieve messages."
+msgstr "Falha ao recuperar as mensagens."
+
+#: ../mail/mail.error.xml.h:69
+msgid "Failed to save messages to disk."
+msgstr "Falha ao salvar mensagens em disco."
+
+#: ../mail/mail.error.xml.h:70
 msgid "Failed to unsubscribe from folder."
 msgstr "Falhou ao cancelar a inscriÃÃo da pasta."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:71
 msgid "File exists but cannot overwrite it."
 msgstr "O arquivo existe, mas nÃo à possÃvel sobrescrevÃ-lo."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:72
 msgid "File exists but is not a regular file."
 msgstr "O arquivo existe, mas nÃo à um arquivo comum."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:68
-#| msgid "The attachment does not contain a valid calendar message"
+#: ../mail/mail.error.xml.h:74
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "A pasta \"{0}\" nÃo contÃm nenhuma mensagem duplicada."
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:75
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Se vocà continuar, vocà nÃo serà capaz de recuperar estas mensagens."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -12771,18 +12713,18 @@ msgstr ""
 "Se vocà excluir a pasta, todo o seu conteÃdo e o conteÃdo das suas subpastas "
 "serÃo excluÃdo permanentemente."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:77
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr ""
 "Se vocà excluir a pasta, todo o seu conteÃdo serà excluÃdo permanentemente."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:78
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr ""
 "Se vocà continuar as informaÃÃes da conta serÃo excluÃdas permanentemente."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:79
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -12791,12 +12733,12 @@ msgstr ""
 "todas as informaÃÃes do proxy serÃo excluÃdas\n"
 "permanentemente."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:81
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 "Se vocà continuar as informaÃÃes da conta serÃo excluÃdas permanentemente."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:82
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -12804,23 +12746,23 @@ msgstr ""
 "Se vocà sair, estas mensagens nÃo serÃo enviadas atà que o Evolution seja "
 "iniciado novamente."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:83
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:84
 msgid "Invalid authentication"
 msgstr "AutenticaÃÃo invÃlida"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:85
 msgid "Mail Deletion Failed"
 msgstr "ExclusÃo de E-mail falhou"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:86
 msgid "Mail filters automatically updated."
 msgstr "Filtros de correio atualizados automaticamente."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:87
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -12832,37 +12774,45 @@ msgstr ""
 "todos os destinatÃrios de sua mensagem. Para evitar isto, vocà deve "
 "adicionar pelo menos um destinatÃrio Para: ou Cc:."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:88
+msgid ""
+"Messages shown in Search Folders are not copies. Deleting them from a Search "
+"Folder will delete the actual messages from the folder or folders in which "
+"they physically reside. Do you really want to delete these messages?"
+msgstr ""
+"Mensagens mostradas nas pastas de pesquisa nÃo sÃo cÃpias. ExcluÃ-las de uma "
+"pasta de pesquisa excluirà as mensagens reais da pasta ou pastas onde "
+"residem fisicamente. Vocà realmente deseja excluir estas mensagens?"
+
+#: ../mail/mail.error.xml.h:89
 msgid "Missing folder."
 msgstr "Pasta faltando."
 
-#: ../mail/mail.error.xml.h:84
-#| msgid "Never"
+#: ../mail/mail.error.xml.h:91
 msgid "N_ever"
 msgstr "N_unca"
 
-#: ../mail/mail.error.xml.h:85
-#| msgid "Could not create message."
+#: ../mail/mail.error.xml.h:92
 msgid "No duplicate messages found."
 msgstr "Sem mensagens duplicadas encontradas."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:93
 msgid "No sources selected."
 msgstr "NÃo foram selecionadas fontes."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:94
 msgid "Opening too many messages at once may take a long time."
 msgstr "Abrir muitas mensagens ao mesmo tempo pode levar um longo tempo."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:95
 msgid "Please check your account settings and try again."
 msgstr "Por favor, verifique suas configuraÃÃes de conta e tente novamente."
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:96
 msgid "Please enable the account or send using another account."
 msgstr "Por favor, habilite a conta ou envie usando outra conta."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -12871,7 +12821,7 @@ msgstr ""
 "pesquisar endereÃos de e-mail clicando no botÃo Para: ao lado da caixa de "
 "entrada."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -12881,65 +12831,65 @@ msgstr ""
 "receber e-mail HTML:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:100
 msgid "Please provide an unique name to identify this signature."
 msgstr "Por favor, digite um nome Ãnico para identificar esta assinatura."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:101
 msgid "Please wait."
 msgstr "Por favor, aguarde."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:102
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problema ao migrar a pasta de correio antiga \"{0}\"."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:103
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Consultando servidor para obter a lista de mecanismos de autenticaÃÃo com "
 "suporte."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:104
 msgid "Read receipt requested."
 msgstr "Ler o recibo de leitura."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:105
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Realmente excluir a pasta \"{0}\" e todas as suas subpastas?"
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:106
 msgid "Really delete folder \"{0}\"?"
 msgstr "Realmente excluir a pasta \"{0}\"?"
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:107
 msgid "Remove duplicate messages?"
 msgstr "Remover mensagens duplicadas?"
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:108
 msgid "Reply _Privately"
 msgstr "Responder em _particular"
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:111
 msgid "Search Folders automatically updated."
 msgstr "Pastas de Pesquisa atualizadas automaticamente."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:112
 msgid "Send private reply?"
 msgstr "Enviar resposta privada?"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:113
 msgid "Send reply to all recipients?"
 msgstr "Enviar resposta para todos os recipientes?"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:114
 msgid "Signature Already Exists"
 msgstr "A assinatura jà existe"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:115
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Sincronizar pastas localmente para uso desconectado?"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -12947,7 +12897,7 @@ msgstr ""
 "Pastas de sistema sÃo necessÃrias para o Evolution funcionar corretamente e "
 "nÃo podem ser renomeadas, movidas ou excluÃdas."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:117
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -12964,29 +12914,33 @@ msgstr ""
 "todos os destinatÃrios de sua mensagem. Para evitar isto, vocà deve "
 "adicionar pelo menos um destinatÃrio Para: ou Cc:. "
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
 msgstr ""
-"Os seguintes destinatÃrios nÃo foram reconhecidos como um endereÃo de email "
+"Os seguintes destinatÃrios nÃo foram reconhecidos como um endereÃo de e-mail "
 "vÃlido:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
 msgstr ""
-"Os seguintes destinatÃrios nÃo foram reconhecidos como um endereÃo de email "
+"Os seguintes destinatÃrios nÃo foram reconhecidos como um endereÃo de e-mail "
 "vÃlido:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:125
 msgid "The script file must exist and be executable."
 msgstr "A arquivo de script deve existir e ser executÃvel."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:126
+msgid "These messages are not copies."
+msgstr "Essas mensagens nÃo sÃo cÃpias."
+
+#: ../mail/mail.error.xml.h:127
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -12995,7 +12949,7 @@ msgstr ""
 "và para o editor de Pasta de Pesquisa para adicionÃ-la explicitamente, caso "
 "seja requerido."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:129
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -13003,14 +12957,14 @@ msgstr ""
 "Esta mensagem nÃo pode ser enviada pois a conta que vocà escolheu para mandÃ-"
 "la nÃo està habilitada"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:130
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Esta mensagem nÃo pode ser enviada pois vocà nÃo especificou nenhum "
 "destinatÃrio"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:131
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -13018,26 +12972,26 @@ msgstr ""
 "Este servidor nÃo suporta este tipo de autenticaÃÃo e pode nÃo suportar a "
 "autenticaÃÃo de forma alguma."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:132
 msgid "This signature has been changed, but has not been saved."
 msgstr "Esta assinatura foi alterada, mas nÃo foi salva."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:133
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr ""
 "Marcar todas as mensagens como lidas na pasta selecionada e suas subpastas."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:134
 msgid "This will mark all messages as read in the selected folder."
 msgstr "Marcar todas as mensagens como lidas na pasta selecionada."
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:135
 msgid "Unable to connect to the GroupWise server."
 msgstr "NÃo foi possÃvel conectar ao servidor GroupWise."
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:136
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -13045,34 +12999,27 @@ msgstr ""
 "NÃo foi possÃvel abrir a pasta de rascunhos para esta conta. Usar a pasta de "
 "rascunhos do sistema?"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:137
 msgid "Unable to read license file."
 msgstr "NÃo foi possÃvel ler o arquivo de licenÃa."
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:138
+msgid "Unable to retrieve message."
+msgstr "NÃo à possÃvel recuperar a mensagem."
+
+#: ../mail/mail.error.xml.h:139
 msgid "Use _Default"
 msgstr "Usar _padrÃo"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:140
 msgid "Use default drafts folder?"
 msgstr "Usar pasta de rascunhos padrÃo?"
 
-#: ../mail/mail.error.xml.h:132
-msgid ""
-"Warning: Deleting messages from a Search Folder will delete the actual "
-"message from one of your local or remote folders.\n"
-"Do you really want to do this?"
-msgstr ""
-"Aviso: Excluindo uma mensagem de uma Pasta e Pesquisa vocà estarà excluindo "
-"essa mensagem da sua pasta local ou remota.\n"
-"Vocà tem certeza que deseja fazer isso?"
-
-#: ../mail/mail.error.xml.h:134
-#| msgid "Would you like to accept it?"
+#: ../mail/mail.error.xml.h:141
 msgid "Would you like to close the message window?"
 msgstr "Vocà gostaria de fechar a janela da mensagem?"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:142
 msgid ""
 "You are replying privately to a message which arrived via a mailing list, "
 "but the list is trying to redirect your reply to go back to the list. Are "
@@ -13082,7 +13029,7 @@ msgstr ""
 "de e-mail, e a lista està tentando redirecionar a sua resposta de volta para "
 "ela. Vocà tem certeza que deseja continuar?"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:143
 msgid ""
 "You are replying to a message which arrived via a mailing list, but you are "
 "replying privately to the sender; not to the list. Are you sure you want to "
@@ -13092,7 +13039,7 @@ msgstr ""
 "vocà està respondendo em privado para o remetente, e nÃo para a lista. Vocà "
 "tem certeza que deseja continuar?"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:144
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
@@ -13100,32 +13047,32 @@ msgstr ""
 "Vocà està respondendo uma mensagem que foi enviada para muitos "
 "destinatÃrios. Vocà tem certeza que deseja responder para TODOS eles?"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:145
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Vocà nÃo possui permissÃo para excluir esse e-mail."
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:146
 msgid "You have not filled in all of the required information."
 msgstr "Vocà nÃo preencheu todas as informaÃÃes necessÃrias."
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:147
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 "Vocà possui mensagens ainda nÃo enviadas. Vocà deseja sair mesmo assim?"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:148
 msgid "You may not create two accounts with the same name."
 msgstr "Vocà nÃo pode criar duas contas com o mesmo nome."
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:149
 msgid "You must name this Search Folder."
 msgstr "Vocà deve nomear esta Pasta de Pesquisa."
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:150
 msgid "You must specify a folder."
 msgstr "Vocà deve especificar uma pasta."
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:151
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13135,150 +13082,153 @@ msgstr ""
 "FaÃa isso selecionando as pastas individualmente e/ou selecionando todas as "
 "pastas locais, todas as pastas remotas ou ambas."
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:153
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "O seu login no seu servidor \"{0}\" como \"{0}\" falhou."
 
-#: ../mail/mail.error.xml.h:147
-#| msgid "Always"
+#: ../mail/mail.error.xml.h:154
 msgid "_Always"
 msgstr "Sem_pre"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:155
 msgid "_Append"
 msgstr "_Adicionar"
 
-#: ../mail/mail.error.xml.h:149
-#: ../plugins/groupwise-features/junk-settings.ui.h:5
-#: ../plugins/publish-calendar/publish-calendar.c:600
+#: ../mail/mail.error.xml.h:156
+#: ../plugins/publish-calendar/publish-calendar.c:619
 msgid "_Disable"
 msgstr "_Desabilitar"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:157
 msgid "_Discard changes"
 msgstr "_Descartar alteraÃÃes"
 
-#: ../mail/mail.error.xml.h:151
-#: ../modules/mail/e-mail-shell-view-actions.c:1071
+#: ../mail/mail.error.xml.h:158
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
 msgid "_Empty Trash"
 msgstr "Es_vaziar lixeira"
 
-#: ../mail/mail.error.xml.h:152
-#| msgid "Evolution"
+#: ../mail/mail.error.xml.h:159
 msgid "_Exit Evolution"
 msgstr "_Sair do Evolution"
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:160
 msgid "_Expunge"
 msgstr "_Excluir permanentemente"
 
-#: ../mail/mail.error.xml.h:154
-#| msgid "Migration"
+#: ../mail/mail.error.xml.h:161
 msgid "_Migrate Now"
 msgstr "_Migrar agora"
 
-#: ../mail/mail.error.xml.h:155
-#| msgid "No"
+#: ../mail/mail.error.xml.h:162
 msgid "_No"
 msgstr "_NÃo"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:163
 msgid "_Open Messages"
 msgstr "A_brir mensagens"
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:166
 msgid "_Send Receipt"
 msgstr "Enviar recibo_s de leitura"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:167
 msgid "_Synchronize"
 msgstr "_Sincronizar"
 
-#: ../mail/mail.error.xml.h:161
-#| msgid "Yes"
+#: ../mail/mail.error.xml.h:168
 msgid "_Yes"
 msgstr "S_im"
 
-#: ../mail/message-list.c:1215
+#: ../mail/mail.error.xml.h:169
+msgid "{0}"
+msgstr "{0}"
+
+#: ../mail/message-list.c:1261
 msgid "Unseen"
 msgstr "NÃo lida"
 
-#: ../mail/message-list.c:1216
+#: ../mail/message-list.c:1262
 msgid "Seen"
 msgstr "Lida"
 
-#: ../mail/message-list.c:1217
+#: ../mail/message-list.c:1263
 msgid "Answered"
 msgstr "Respondida"
 
-#: ../mail/message-list.c:1218
+#: ../mail/message-list.c:1264
 msgid "Forwarded"
 msgstr "Encaminhado"
 
-#: ../mail/message-list.c:1219
+#: ../mail/message-list.c:1265
 msgid "Multiple Unseen Messages"
 msgstr "VÃrias mensagens nÃo lidas"
 
-#: ../mail/message-list.c:1220
+#: ../mail/message-list.c:1266
 msgid "Multiple Messages"
 msgstr "VÃrias mensagens"
 
-#: ../mail/message-list.c:1224
+#: ../mail/message-list.c:1270
 msgid "Lowest"
 msgstr "MÃnima"
 
-#: ../mail/message-list.c:1225
+#: ../mail/message-list.c:1271
 msgid "Lower"
 msgstr "Menor"
 
-#: ../mail/message-list.c:1229
+#: ../mail/message-list.c:1275
 msgid "Higher"
 msgstr "Maior"
 
-#: ../mail/message-list.c:1230
+#: ../mail/message-list.c:1276
 msgid "Highest"
 msgstr "MÃxima"
 
-#: ../mail/message-list.c:1849 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1909 ../widgets/table/e-cell-date.c:51
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
-#. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1856 ../plugins/itip-formatter/itip-view.c:205
+#. * in 12-hour format, without seconds.
+#: ../mail/message-list.c:1916 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Hoje %k:%M"
 
-#: ../mail/message-list.c:1865
+#: ../mail/message-list.c:1925
 msgid "Yesterday %l:%M %p"
 msgstr "Ontem %k:%M"
 
-#: ../mail/message-list.c:1877
+#: ../mail/message-list.c:1937
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: ../mail/message-list.c:1885
+#: ../mail/message-list.c:1945
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %k:%M"
 
-#: ../mail/message-list.c:1887
+#: ../mail/message-list.c:1947
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2671
+#: ../mail/message-list.c:2752
 msgid "Select all visible messages"
 msgstr "Seleciona todas as mensagens visÃveis"
 
-#: ../mail/message-list.c:2829 ../mail/message-list.etspec.h:10
+#: ../mail/message-list.c:2912 ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Mensagens"
 
+#. default follow-up flag name to use when clicked in the message list column
+#: ../mail/message-list.c:4160
+msgid "Follow-up"
+msgstr "Lembrete"
+
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4497 ../mail/message-list.c:4921
+#: ../mail/message-list.c:4675 ../mail/message-list.c:5098
 msgid "Generating message list"
 msgstr "Gerando lista de mensagens"
 
-#: ../mail/message-list.c:4736
+#: ../mail/message-list.c:4912
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -13286,7 +13236,7 @@ msgstr ""
 "Nenhuma mensagem satisfaz o seu critÃrio de pesquisa. Limpe a pesquisa com o "
 "item de menu Pesquisar->Limpar ou altere-a."
 
-#: ../mail/message-list.c:4738
+#: ../mail/message-list.c:4914
 msgid "There are no messages in this folder."
 msgstr "NÃo hà mensagens nesta pasta."
 
@@ -13315,7 +13265,7 @@ msgid "Sent Messages"
 msgstr "Mensagens enviadas"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:566
+#: ../widgets/misc/e-attachment-tree-view.c:572
 msgid "Size"
 msgstr "Tamanho"
 
@@ -13324,27 +13274,27 @@ msgid "Subject - Trimmed"
 msgstr "Assunto - cortado"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1508
+#: ../modules/mail/e-mail-shell-view-actions.c:1562
 msgid "Body contains"
 msgstr "Corpo contÃm"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1515
+#: ../modules/mail/e-mail-shell-view-actions.c:1569
 msgid "Message contains"
 msgstr "Mensagem contÃm"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1522
+#: ../modules/mail/e-mail-shell-view-actions.c:1576
 msgid "Recipients contain"
 msgstr "DestinatÃrios contÃm"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1529
+#: ../modules/mail/e-mail-shell-view-actions.c:1583
 msgid "Sender contains"
 msgstr "Remetente contÃm"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1536
+#: ../modules/mail/e-mail-shell-view-actions.c:1590
 msgid "Subject contains"
 msgstr "Assunto contÃm"
 
@@ -13352,7 +13302,7 @@ msgstr "Assunto contÃm"
 msgid "Subject or Addresses contains"
 msgstr "Assunto ou endereÃos contÃm"
 
-#: ../modules/addressbook/addressbook-config.c:205
+#: ../modules/addressbook/addressbook-config.c:207
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -13360,7 +13310,7 @@ msgstr ""
 "A seleÃÃo desta opÃÃo significa que o Evolution apenas se conectarà ao seu "
 "servidor LDAP se este suportar SSL."
 
-#: ../modules/addressbook/addressbook-config.c:207
+#: ../modules/addressbook/addressbook-config.c:209
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -13368,7 +13318,7 @@ msgstr ""
 "A seleÃÃo desta opÃÃo significa que o Evolution apenas se conectarà ao seu "
 "servidor LDAP se este suportar TLS."
 
-#: ../modules/addressbook/addressbook-config.c:209
+#: ../modules/addressbook/addressbook-config.c:211
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
@@ -13378,16 +13328,16 @@ msgstr ""
 "TLS. Isto significa que a sua conexÃo serà insegura e que vocà estarà "
 "vulnerÃvel a falhas de seguranÃa."
 
-#: ../modules/addressbook/addressbook-config.c:608
+#: ../modules/addressbook/addressbook-config.c:641
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "U_sar no calendÃrio de aniversÃrios e bodas"
 
-#: ../modules/addressbook/addressbook-config.c:644
+#: ../modules/addressbook/addressbook-config.c:683
 msgid "Copy _book content locally for offline operation"
 msgstr ""
 "Copiar o conteÃdo do _catÃlogo localmente para funcionamento desconectado"
 
-#: ../modules/addressbook/addressbook-config.c:751
+#: ../modules/addressbook/addressbook-config.c:798
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -13397,7 +13347,7 @@ msgstr ""
 "lista de portas padrÃo foi fornecida. Pergunte ao seu administrador de "
 "sistemas qual porta vocà deve escolher."
 
-#: ../modules/addressbook/addressbook-config.c:825
+#: ../modules/addressbook/addressbook-config.c:879
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -13406,7 +13356,7 @@ msgstr ""
 "Este à o mÃtodo que o Evolution usarà para autenticÃ-lo.  Note que a opÃÃo "
 "\"EndereÃo de E-mail\" requer acesso anÃnimo ao seu servidor LDAP."
 
-#: ../modules/addressbook/addressbook-config.c:900
+#: ../modules/addressbook/addressbook-config.c:962
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -13419,29 +13369,29 @@ msgstr ""
 "pesquisa de \"um\" incluirà apenas as entradas que estÃo um nÃvel abaixo da "
 "sua base."
 
-#: ../modules/addressbook/addressbook-config.c:1016
+#: ../modules/addressbook/addressbook-config.c:1086
 msgid "Server Information"
 msgstr "InformaÃÃo do servidor"
 
-#: ../modules/addressbook/addressbook-config.c:1021
+#: ../modules/addressbook/addressbook-config.c:1091
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "Detalhes"
 
-#: ../modules/addressbook/addressbook-config.c:1022
-#: ../modules/mail/e-mail-shell-view.c:54
+#: ../modules/addressbook/addressbook-config.c:1092
+#: ../modules/mail/e-mail-shell-view.c:58
 msgid "Searching"
 msgstr "Pesquisando"
 
-#: ../modules/addressbook/addressbook-config.c:1024
+#: ../modules/addressbook/addressbook-config.c:1094
 msgid "Downloading"
 msgstr "Baixando"
 
-#: ../modules/addressbook/addressbook-config.c:1230
+#: ../modules/addressbook/addressbook-config.c:1309
 msgid "Address Book Properties"
 msgstr "Propriedades do catÃlogo de endereÃos"
 
-#: ../modules/addressbook/addressbook-config.c:1232
+#: ../modules/addressbook/addressbook-config.c:1311
 msgid "New Address Book"
 msgstr "Novo catÃlogo de endereÃos"
 
@@ -13482,7 +13432,6 @@ msgstr ""
 "verticalmente."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
-#| msgid "evolution address book"
 msgid "Primary address book"
 msgstr "CatÃlogo de endereÃos primÃrio"
 
@@ -13491,10 +13440,14 @@ msgid "Show autocompleted name with an address"
 msgstr "Mostrar o e-mail junto com o nome"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+msgid "Show maps"
+msgstr "Mostrar mapas"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
 msgid "Show preview pane"
 msgstr "Mostrar o painel de visualizaÃÃo"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
 msgid ""
 "The UID of the selected (or \"primary\") address book in the sidebar of the "
 "\"Contacts\" view."
@@ -13502,7 +13455,7 @@ msgstr ""
 "O UID do catÃlogo de endereÃos selecionado (ou \"primÃrio\") na barra "
 "lateral da visÃo de \"Contatos\"."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the contact list. \"0\" (Classic View) places the preview pane below the "
@@ -13514,7 +13467,7 @@ msgstr ""
 "de prà visualizaÃÃo da lista de contatos. \"1\" (visÃo vertical) lugares "
 "para prÃ-visualizar o painel para a prÃxima lista de contatos."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
@@ -13522,15 +13475,15 @@ msgstr ""
 "O nÃmero de caracteres que deve ser digitado antes que o Evolution tente "
 "completar automaticamente."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI para a Ãltima pasta a ser usada no diÃlogo selecionar nomes"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
 msgid "URI for the folder last used in the select names dialog."
 msgstr "URI para a Ãltima pasta usada no diÃlogo selecionar nomes."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
 msgid ""
 "Whether force showing the mail address with the name of the autocompleted "
 "contact in the entry."
@@ -13538,333 +13491,359 @@ msgstr ""
 "Se o e-mail deve ou nÃo ser mostrado junto com o nome no recurso de "
 "completamento automÃtico."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
+msgid "Whether to show maps in preview pane."
+msgstr "Se deseja mostrar mapas no painel de visualizaÃÃo."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
 msgid "Whether to show the preview pane."
 msgstr "Mostrar o painel de visualizaÃÃo."
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/addressbook/autocompletion-config.c:161
-#: ../modules/mail/em-mailer-prefs.c:1140
+#: ../modules/addressbook/autocompletion-config.c:194
+#: ../modules/mail/em-mailer-prefs.c:1049
 msgid "_Table column:"
 msgstr "Coluna da _tabela:"
 
-#: ../modules/addressbook/autocompletion-config.c:164
+#: ../modules/addressbook/autocompletion-config.c:197
 msgid "Autocompletion"
 msgstr "Completar automaticamente"
 
-#: ../modules/addressbook/autocompletion-config.c:167
+#: ../modules/addressbook/autocompletion-config.c:200
 msgid "Always _show address of the autocompleted contact"
 msgstr "_Sempre mostrar o e-mail do contato"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:94
-#: ../modules/addressbook/e-book-shell-migrate.c:153
+#: ../modules/addressbook/e-book-shell-backend.c:102
+#: ../modules/addressbook/e-book-shell-migrate.c:154
 msgid "On LDAP Servers"
 msgstr "Em servidores LDAP"
 
-#: ../modules/addressbook/e-book-shell-backend.c:276
+#: ../modules/addressbook/e-book-shell-backend.c:302
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Contato"
 
-#: ../modules/addressbook/e-book-shell-backend.c:278
-#: ../modules/addressbook/e-book-shell-view-actions.c:773
+#: ../modules/addressbook/e-book-shell-backend.c:304
+#: ../modules/addressbook/e-book-shell-view-actions.c:905
 msgid "Create a new contact"
 msgstr "Cria um novo contato"
 
-#: ../modules/addressbook/e-book-shell-backend.c:283
+#: ../modules/addressbook/e-book-shell-backend.c:309
 msgctxt "New"
 msgid "Contact _List"
 msgstr "_Lista de contatos"
 
-#: ../modules/addressbook/e-book-shell-backend.c:285
-#: ../modules/addressbook/e-book-shell-view-actions.c:780
+#: ../modules/addressbook/e-book-shell-backend.c:311
+#: ../modules/addressbook/e-book-shell-view-actions.c:912
 msgid "Create a new contact list"
 msgstr "Cria uma nova lista de contatos"
 
-#: ../modules/addressbook/e-book-shell-backend.c:293
+#: ../modules/addressbook/e-book-shell-backend.c:319
 msgctxt "New"
 msgid "Address _Book"
 msgstr "CatÃlogo de _endereÃos"
 
-#: ../modules/addressbook/e-book-shell-backend.c:295
-#: ../modules/addressbook/e-book-shell-view-actions.c:703
+#: ../modules/addressbook/e-book-shell-backend.c:321
+#: ../modules/addressbook/e-book-shell-view-actions.c:835
 msgid "Create a new address book"
 msgstr "Cria um novo catÃlogo de endereÃos"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:312
-#: ../modules/addressbook/e-book-shell-view.c:401
-#: ../modules/calendar/e-cal-shell-backend.c:105
-#: ../modules/calendar/e-cal-shell-migrate.c:59
+#: ../modules/addressbook/e-book-shell-backend.c:338
+#: ../modules/addressbook/e-book-shell-view.c:405
+#: ../modules/calendar/e-cal-shell-backend.c:115
+#: ../modules/calendar/e-cal-shell-migrate.c:63
+#: ../modules/online-accounts/e-online-accounts-google.c:366
 msgid "Contacts"
 msgstr "Contatos"
 
-#: ../modules/addressbook/e-book-shell-backend.c:321
+#: ../modules/addressbook/e-book-shell-backend.c:348
 msgid "Certificates"
 msgstr "Certificados"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:263
-#: ../modules/addressbook/e-book-shell-view-actions.c:549
+#: ../modules/addressbook/e-book-shell-view-actions.c:387
+#: ../modules/addressbook/e-book-shell-view-actions.c:683
 msgid "Save as vCard"
 msgstr "Salvar como vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:680
+#: ../modules/addressbook/e-book-shell-view-actions.c:812
 msgid "Co_py All Contacts To..."
 msgstr "Co_piar todos os contatos para..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:682
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Copia os contatos do catÃlogo de endereÃos para outro"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:687
+#: ../modules/addressbook/e-book-shell-view-actions.c:819
 msgid "D_elete Address Book"
 msgstr "Remov_er catÃlogo de endereÃos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:689
+#: ../modules/addressbook/e-book-shell-view-actions.c:821
 msgid "Delete the selected address book"
 msgstr "Exclui o catÃlogo de endereÃos selecionado"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:694
+#: ../modules/addressbook/e-book-shell-view-actions.c:826
 msgid "Mo_ve All Contacts To..."
 msgstr "Mo_ver Todos os contatos para..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:696
+#: ../modules/addressbook/e-book-shell-view-actions.c:828
 msgid "Move the contacts of the selected address book to another"
 msgstr "Move os contatos do catÃlogo de endereÃos para outro"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:701
+#: ../modules/addressbook/e-book-shell-view-actions.c:833
 msgid "_New Address Book"
 msgstr "_Novo catÃlogo de endereÃos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:708
+#: ../modules/addressbook/e-book-shell-view-actions.c:840
 msgid "Address _Book Properties"
 msgstr "Propriedades do _catÃlogo de endereÃos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:710
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Show properties of the selected address book"
 msgstr "Exibe as propriedades do catÃlogo de endereÃos selecionado"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:715
-#: ../modules/calendar/e-cal-shell-view-actions.c:1360
-#: ../modules/calendar/e-memo-shell-view-actions.c:626
-#: ../modules/calendar/e-task-shell-view-actions.c:750
-#: ../modules/mail/e-mail-shell-view-actions.c:1155
+#: ../modules/addressbook/e-book-shell-view-actions.c:847
+msgid "Address Book _Map"
+msgstr "_Mapa do catÃlogo de endereÃos"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:849
+msgid "Show map with all contacts from selected address book"
+msgstr ""
+"Mostrar mapa com todos os contatos do catÃlogo de endereÃos selecionados"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:854
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+#: ../modules/calendar/e-memo-shell-view-actions.c:640
+#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/mail/e-mail-shell-view-actions.c:1199
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:717
+#: ../modules/addressbook/e-book-shell-view-actions.c:856
 msgid "Rename the selected address book"
 msgstr "Renomeia o catÃlogo de endereÃos selecionado"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:722
-msgid "S_ave Address Book as vCard"
-msgstr "S_alvar o catÃlogo de endereÃos como vCard"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:724
-msgid "Save the contacts of the selected address book as a vCard"
-msgstr "Salva os contatos do catÃlogo de endereÃo selecionado como vCard"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:731
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
 msgid "Stop loading"
 msgstr "Parar o carregamento"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:736
+#: ../modules/addressbook/e-book-shell-view-actions.c:868
 msgid "_Copy Contact To..."
 msgstr "_Copiar contato para..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:738
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
 msgid "Copy selected contacts to another address book"
 msgstr "Copiar os contatos selecionados para outro catÃlogo de endereÃos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:743
+#: ../modules/addressbook/e-book-shell-view-actions.c:875
 msgid "_Delete Contact"
 msgstr "E_xcluir contato"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:750
+#: ../modules/addressbook/e-book-shell-view-actions.c:882
 msgid "_Find in Contact..."
 msgstr "_Localizar em contato..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:752
+#: ../modules/addressbook/e-book-shell-view-actions.c:884
 msgid "Search for text in the displayed contact"
 msgstr "Pesquisa texto no contato exibido"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:757
+#: ../modules/addressbook/e-book-shell-view-actions.c:889
 msgid "_Forward Contact..."
 msgstr "_Encaminhar contato..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:759
+#: ../modules/addressbook/e-book-shell-view-actions.c:891
 msgid "Send selected contacts to another person"
 msgstr "Envia os contatos selecionados para outra pessoa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:764
+#: ../modules/addressbook/e-book-shell-view-actions.c:896
 msgid "_Move Contact To..."
 msgstr "_Mover contato para..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:766
+#: ../modules/addressbook/e-book-shell-view-actions.c:898
 msgid "Move selected contacts to another address book"
 msgstr "Move os contatos selecionados para outro catÃlogo de endereÃos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:771
+#: ../modules/addressbook/e-book-shell-view-actions.c:903
 msgid "_New Contact..."
 msgstr "_Novo contato..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:778
+#: ../modules/addressbook/e-book-shell-view-actions.c:910
 msgid "New Contact _List..."
 msgstr "Nova _lista de contatos..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/addressbook/e-book-shell-view-actions.c:917
 msgid "_Open Contact"
 msgstr "_Abrir contato"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:787
+#: ../modules/addressbook/e-book-shell-view-actions.c:919
 msgid "View the current contact"
 msgstr "Ver o contato atual"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:924
 msgid "_Send Message to Contact..."
 msgstr "E_nviar mensagem ao contato..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:794
+#: ../modules/addressbook/e-book-shell-view-actions.c:926
 msgid "Send a message to the selected contacts"
 msgstr "Envia uma mensagem aos contatos selecionados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:801
-#: ../modules/calendar/e-cal-shell-view-actions.c:1502
-#: ../modules/calendar/e-task-shell-view-actions.c:808
+#: ../modules/addressbook/e-book-shell-view-actions.c:933
+#: ../modules/calendar/e-cal-shell-view-actions.c:1540
+#: ../modules/calendar/e-task-shell-view-actions.c:822
 msgid "_Actions"
 msgstr "AÃÃe_s"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:808
-#: ../modules/calendar/e-memo-shell-view-actions.c:663
-#: ../modules/calendar/e-task-shell-view-actions.c:815
-#: ../modules/mail/e-mail-shell-view-actions.c:1320
+#: ../modules/addressbook/e-book-shell-view-actions.c:940
+#: ../modules/calendar/e-memo-shell-view-actions.c:677
+#: ../modules/calendar/e-task-shell-view-actions.c:829
+#: ../modules/mail/e-mail-shell-view-actions.c:1357
 msgid "_Preview"
 msgstr "_VisualizaÃÃo"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:817
-#: ../modules/calendar/e-cal-shell-view-actions.c:1519
-#: ../modules/calendar/e-memo-shell-view-actions.c:676
-#: ../modules/calendar/e-task-shell-view-actions.c:828
+#: ../modules/addressbook/e-book-shell-view-actions.c:949
+#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-memo-shell-view-actions.c:690
+#: ../modules/calendar/e-task-shell-view-actions.c:842
 msgid "_Delete"
 msgstr "E_xcluir"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:821
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
 msgid "_Properties"
 msgstr "_Propriedades"
 
-#. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:830
-#: ../modules/addressbook/e-book-shell-view-actions.c:976
-msgid "_Save as vCard..."
-msgstr "_Salvar como vCard..."
+#: ../modules/addressbook/e-book-shell-view-actions.c:957
+msgid "Address Book Map"
+msgstr "Mapa do catÃlogo de endereÃos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:858
+#: ../modules/addressbook/e-book-shell-view-actions.c:989
 msgid "Contact _Preview"
 msgstr "_VisualizaÃÃo dos contatos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
+#: ../modules/addressbook/e-book-shell-view-actions.c:991
 msgid "Show contact preview window"
 msgstr "Mostra a janela de visualizaÃÃo de contatos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:879
-#: ../modules/calendar/e-memo-shell-view-actions.c:733
-#: ../modules/calendar/e-task-shell-view-actions.c:897
-#: ../modules/mail/e-mail-shell-view-actions.c:1418
+#: ../modules/addressbook/e-book-shell-view-actions.c:997
+msgid "Show _Maps"
+msgstr "Mostrar _mapas"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:999
+msgid "Show maps in contact preview window"
+msgstr "Mostrar mapas na janela de prÃ-visualizaÃÃo de contato"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1018
+#: ../modules/calendar/e-memo-shell-view-actions.c:747
+#: ../modules/calendar/e-task-shell-view-actions.c:911
+#: ../modules/mail/e-mail-shell-view-actions.c:1472
 msgid "_Classic View"
 msgstr "VisÃo _clÃssica"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:881
+#: ../modules/addressbook/e-book-shell-view-actions.c:1020
 msgid "Show contact preview below the contact list"
 msgstr "Exibe a prÃ-visualizaÃÃo de contato abaixo da lista de contatos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:886
-#: ../modules/calendar/e-memo-shell-view-actions.c:740
-#: ../modules/calendar/e-task-shell-view-actions.c:904
-#: ../modules/mail/e-mail-shell-view-actions.c:1425
+#: ../modules/addressbook/e-book-shell-view-actions.c:1025
+#: ../modules/calendar/e-memo-shell-view-actions.c:754
+#: ../modules/calendar/e-task-shell-view-actions.c:918
+#: ../modules/mail/e-mail-shell-view-actions.c:1479
 msgid "_Vertical View"
 msgstr "VisÃo _vertical"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:888
+#: ../modules/addressbook/e-book-shell-view-actions.c:1027
 msgid "Show contact preview alongside the contact list"
 msgstr "Exibe a prÃ-visualizaÃÃo de contato ao lado da lista de contatos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:896
-#: ../modules/calendar/e-cal-shell-view-actions.c:1662
-#: ../modules/calendar/e-memo-shell-view-actions.c:750
-#: ../modules/calendar/e-task-shell-view-actions.c:921
+#: ../modules/addressbook/e-book-shell-view-actions.c:1035
+#: ../modules/calendar/e-cal-shell-view-actions.c:1696
+#: ../modules/calendar/e-memo-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-view-actions.c:935
 msgid "Any Category"
 msgstr "Qualquer categoria"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:903
-#: ../modules/calendar/e-cal-shell-view-actions.c:1676
-#: ../modules/calendar/e-memo-shell-view-actions.c:757
-#: ../modules/calendar/e-task-shell-view-actions.c:956
+#: ../modules/addressbook/e-book-shell-view-actions.c:1042
+#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+#: ../modules/calendar/e-memo-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:970
 msgid "Unmatched"
 msgstr "NÃo combinadas"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:913
-#: ../modules/calendar/e-cal-shell-view-actions.c:1686
-#: ../modules/calendar/e-memo-shell-view-actions.c:767
-#: ../modules/calendar/e-task-shell-view-actions.c:966
-#: ../modules/mail/e-mail-shell-view-actions.c:1501
-#: ../shell/e-shell-content.c:633
+#: ../modules/addressbook/e-book-shell-view-actions.c:1052
+#: ../modules/calendar/e-cal-shell-view-actions.c:1720
+#: ../modules/calendar/e-memo-shell-view-actions.c:781
+#: ../modules/calendar/e-task-shell-view-actions.c:980
+#: ../modules/mail/e-mail-shell-view-actions.c:1555
+#: ../shell/e-shell-content.c:666
 msgid "Advanced Search"
 msgstr "Pesquisa avanÃada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:946
+#: ../modules/addressbook/e-book-shell-view-actions.c:1085
 msgid "Print all shown contacts"
 msgstr "Imprimir todos os contatos exibidos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:953
+#: ../modules/addressbook/e-book-shell-view-actions.c:1092
 msgid "Preview the contacts to be printed"
 msgstr "Visualiza os contatos a serem impressos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:960
+#: ../modules/addressbook/e-book-shell-view-actions.c:1099
 msgid "Print selected contacts"
 msgstr "Imprime os contatos selecionados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:978
+#: ../modules/addressbook/e-book-shell-view-actions.c:1114
+msgid "S_ave Address Book as vCard"
+msgstr "S_alvar o catÃlogo de endereÃos como vCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1116
+msgid "Save the contacts of the selected address book as a vCard"
+msgstr "Salva os contatos do catÃlogo de endereÃo selecionado como vCard"
+
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:1122
+#: ../modules/addressbook/e-book-shell-view-actions.c:1132
+msgid "_Save as vCard..."
+msgstr "_Salvar como vCard..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1124
 msgid "Save selected contacts as a vCard"
 msgstr "Salva os contatos selecionados como um vCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:345
+#: ../modules/addressbook/e-book-shell-view.c:349
 msgid "_Forward Contacts"
 msgstr "_Encaminhar contatos"
 
-#: ../modules/addressbook/e-book-shell-view.c:347
+#: ../modules/addressbook/e-book-shell-view.c:351
 msgid "_Forward Contact"
 msgstr "_Encaminhar contato"
 
-#: ../modules/addressbook/e-book-shell-view.c:378
+#: ../modules/addressbook/e-book-shell-view.c:382
 msgid "_Send Message to Contacts"
 msgstr "Enviar _mensagem aos contatos"
 
-#: ../modules/addressbook/e-book-shell-view.c:380
+#: ../modules/addressbook/e-book-shell-view.c:384
 msgid "_Send Message to List"
 msgstr "Enviar _mensagem à lista"
 
-#: ../modules/addressbook/e-book-shell-view.c:382
+#: ../modules/addressbook/e-book-shell-view.c:386
 msgid "_Send Message to Contact"
 msgstr "Enviar _mensagem ao contato"
 
-#: ../modules/addressbook/eab-composer-util.c:143
+#: ../modules/addressbook/eab-composer-util.c:149
 msgid "Multiple vCards"
 msgstr "VÃrios vCards"
 
-#: ../modules/addressbook/eab-composer-util.c:151
+#: ../modules/addressbook/eab-composer-util.c:157
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard para %s"
 
-#: ../modules/addressbook/eab-composer-util.c:163
-#: ../modules/addressbook/eab-composer-util.c:190
+#: ../modules/addressbook/eab-composer-util.c:169
+#: ../modules/addressbook/eab-composer-util.c:196
 #, c-format
 msgid "Contact information"
 msgstr "InformaÃÃes de contato"
 
-#: ../modules/addressbook/eab-composer-util.c:192
+#: ../modules/addressbook/eab-composer-util.c:198
 #, c-format
 msgid "Contact information for %s"
 msgstr "InformaÃÃes de contato para %s"
@@ -13946,10 +13925,6 @@ msgstr "Localizar bases de pesquisa _possÃveis"
 msgid "_Login method:"
 msgstr "Modo de au_tenticaÃÃo:"
 
-#: ../modules/addressbook/ldap-config.ui.h:27
-msgid "_Port:"
-msgstr "_Porta:"
-
 #: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
 msgstr "_Escopo da pesquisa:"
@@ -13958,14 +13933,47 @@ msgstr "_Escopo da pesquisa:"
 msgid "_Timeout:"
 msgstr "_Tempo limite:"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
-msgid "_Use secure connection:"
-msgstr "_Usar conexÃo segura:"
-
 #: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "cartÃes"
 
+#: ../modules/bogofilter/evolution-bogofilter.c:146
+#, c-format
+msgid "Failed to spawn Bogofilter (%s): "
+msgstr "Falhou ao gerar Bogofilter (%s):"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:164
+msgid "Failed to stream mail message content to Bogofilter: "
+msgstr "Falhou ao transmitir conteÃdo de correio para Bogofilter:"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:213
+msgid "Bogofilter either crashed or failed to process a mail message"
+msgstr "Bogofilter parou ou nÃo conseguiu processar uma mensagem de correio"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:312
+msgid "Bogofilter Options"
+msgstr "OpÃÃes do Bogofilter"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:321
+msgid "Convert message text to _Unicode"
+msgstr "Converter mensagem de texto para _Unicode"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:477
+msgid "Bogofilter"
+msgstr "Bogofilter"
+
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr "Converter mensagem para Unicode"
+
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+"Converter a mensagem de texto para Unicode UTF-8 para unificar os tokens "
+"spam/ham oriundos de diferentes conjuntos de caracteres."
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:2
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
@@ -13995,38 +14003,42 @@ msgstr "30 minutos"
 msgid "60 minutes"
 msgstr "60 minutos"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:10
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Alerts"
 msgstr "Alarmes"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:12
+#: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgid "Day _ends:"
 msgstr "O _dia termina Ãs:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:13
+#: ../modules/calendar/e-calendar-preferences.ui.h:12
 msgid "Days"
 msgstr "Dias"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:14
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
 msgid "Default Free/Busy Server"
 msgstr "Servidor padrÃo de disponibilidade"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:15
+#: ../modules/calendar/e-calendar-preferences.ui.h:14
 msgid "Display"
 msgstr "ExibiÃÃo"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:16
-msgid "Display alarms in _notification area only"
-msgstr "Mostrar alarmes somente _na Ãrea de notificaÃÃo"
+#: ../modules/calendar/e-calendar-preferences.ui.h:15
+msgid "Display reminders in _notification area only"
+msgstr "Exibir lembretes apenas na Ãrea de _notificaÃÃo"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:20
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgid "Hours"
 msgstr "Horas"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:21
+#: ../modules/calendar/e-calendar-preferences.ui.h:19
 msgid "Minutes"
 msgstr "Minutos"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
+msgid "Publishing Information"
+msgstr "InformaÃÃes de publicaÃÃo"
+
 #. Sunday
 #: ../modules/calendar/e-calendar-preferences.ui.h:25
 msgid "S_un"
@@ -14041,8 +14053,8 @@ msgid "Se_cond zone:"
 msgstr "Fuso se_cundÃrio:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:29
-msgid "Select the calendars for alarm notification"
-msgstr "Selecione as agendas para notificaÃÃo por alarme"
+msgid "Select the calendars for reminder notification"
+msgstr "Selecione os calendÃrios para notificaÃÃo de lembrete"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
 #: ../modules/calendar/e-calendar-preferences.ui.h:31
@@ -14073,256 +14085,249 @@ msgstr "T_arefas com prazo para hoje:"
 msgid "T_hu"
 msgstr "Qu_i"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:41
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "Template:"
 msgstr "Modelo:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
-#: ../widgets/misc/e-dateedit.c:591
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
+#: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "Hora:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Time format:"
 msgstr "Formato de hora:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "Use s_ystem time zone"
 msgstr "Usar fuso horÃrio do s_istema"
 
 #. A weekday like "Monday" follows
-#: ../modules/calendar/e-calendar-preferences.ui.h:50
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
 msgid "Wee_k starts on:"
 msgstr "A sema_na comeÃa na:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:51
-#: ../modules/calendar/e-cal-shell-view-actions.c:1645
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
 msgid "Work Week"
 msgstr "Semana Ãtil"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
 msgid "Work days:"
 msgstr "Dias Ãteis:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:53
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "_12 hour (AM/PM)"
 msgstr "_12 horas (AM/PM)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
 msgid "_24 hour"
 msgstr "_24 horas"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:55
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "Pedir confirm_aÃÃo ao excluir itens"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "_Compress weekends in month view"
 msgstr "_Comprimir finais de semana na exibiÃÃo de mÃs"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "_Day begins:"
 msgstr "_O dia comeÃa Ãs:"
 
 #. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "_Fri"
 msgstr "Se_x"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "E_sconder tarefas concluÃdas apÃs"
 
 #. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
 msgid "_Mon"
 msgstr "_Seg"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
 msgid "_Overdue tasks:"
 msgstr "Ta_refas atrasadas:"
 
 #. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
 msgid "_Sat"
 msgstr "SÃ_b"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:66
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
 msgid "_Show appointment end times in week and month view"
 msgstr "Mostrar _hora de tÃrmino de compromissos nas exibiÃÃes de semana e mÃs"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
 msgid "_Time divisions:"
 msgstr "_FraÃÃes de tempo:"
 
 #. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:69
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
 msgid "_Tue"
 msgstr "_Ter"
 
 #. Wednesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:71
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
 msgid "_Wed"
 msgstr "_Qua"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "antes de cada aniversÃrio"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:75
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
 msgid "before every appointment"
 msgstr "antes de cada compromisso"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
-msgid "Alarm programs"
-msgstr "Programas de alarme"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
 msgid "Ask for confirmation when deleting items"
 msgstr "Pedir confirmaÃÃo ao excluir itens"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "Cor de fundo das tarefas com prazo para hoje, no formato \"#rrggbb\"."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "Cor de fundo das tarefas atrasadas, no formato \"#rrggbb\"."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
-#| msgid "Birthdays & Anniversaries"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
 msgid "Birthday and anniversary reminder"
 msgstr "Lembrete de aniversÃrio e bodas"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
-#| msgid "Birthdays & Anniversaries"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
 msgid "Birthday and anniversary reminder units"
 msgstr "Unidades de lembrete de aniversÃrio e bodas"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
-#| msgid "Birthdays & Anniversaries"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
 msgid "Birthday and anniversary reminder value"
 msgstr "Valor do lembrete de aniversÃrio e bodas"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
-msgid "Calendars to run alarms for"
-msgstr "CalendÃrios para tocar alarme"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+msgid "Calendars to run reminders for"
+msgstr "CalendÃrios para executar lembretes para"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 "Cor utilizada para desenhar a linha Marcus Bains na barra de Tempo (vazia "
 "por padrÃo)."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Cor utilizada para desenhar a linha Marcus Bains na exibiÃÃo de dia."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
 msgid "Compress weekends in month view"
 msgstr "Comprimir finais de semana na exibiÃÃo de mÃs"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
 msgid "Confirm expunge"
 msgstr "Confirmar ao excluir permanentemente uma pasta"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr ""
 "Dias nos quais o inÃcio e fim das horas de trabalho devem ser indicados."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
 msgstr "Lembrete de compromisso padrÃo"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "Unidades de lembrete padrÃo"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "Valor de lembrete padrÃo"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
-msgid "Directory for saving alarm audio files"
-msgstr "DiretÃrio para salvar os arquivos de Ãudio do alarme"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+msgid "Directory for saving reminder audio files"
+msgstr "DiretÃrio para salvar arquivos de Ãudio de lembrete"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy server URLs"
 msgstr "URLs do servidor de disponibilidade"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
 msgid "Free/busy template URL"
 msgstr "Modelo de URL de disponibilidade"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
 msgid "Hide completed tasks"
 msgstr "Ocultar tarefas concluÃdas"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide task units"
 msgstr "Unidades para ocultar tarefas"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task value"
 msgstr "Valor para ocultar tarefas"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
 msgid "Horizontal pane position"
 msgstr "PosiÃÃo do painel horizontal"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "Hora em que o dia de trabalho termina, em formato de 24 horas, 0 a 23."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Hora em que o dia de trabalho comeÃa, em formato de 24 horas, 0 a 23."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
 msgid "If \"true\", show the memo preview pane in the main window."
 msgstr ""
 "Se \"verdadeiro\", exibe a prÃ-visualizaÃÃo do painel do memorando na janela "
 "principal."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr ""
 "Se \"verdadeiro\", exibe a prÃ-visualizaÃÃo do painel de tarefas na janela "
 "principal."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Intervalos mostrados nas exibiÃÃes de dia e semana Ãtil, em minutos."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
-msgid "Last alarm time"
-msgstr "Hora do Ãltimo alarme"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+msgid "Last reminder time"
+msgstr "Ãltima hora do lembrete"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
 msgid "List of recently used second time zones in a Day View."
 msgstr "Lista dos fuso horÃrios usados recentemente na VisÃo de Dia."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
 msgid "List of server URLs for free/busy publishing."
 msgstr "Lista de URLs de servidores para a publicaÃÃo de disponibilidade."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
 msgid "Marcus Bains Line"
 msgstr "Linha Marcus Bains"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Cor da linha Marcus Bains - exibiÃÃo de dia"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Cor da linha Marcus Bains - barra de tempo"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
@@ -14330,56 +14335,55 @@ msgstr ""
 "NÃmero mÃximo de fusos horÃrios a serem lembrados na lista \"day_second_zones"
 "\"."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
 msgid "Maximum number of recently used timezones to remember."
 msgstr "NÃmero mÃximo de fusos horÃrios usados recentemente a serem lembrados."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
 msgid "Memo layout style"
 msgstr "Estilo do disposiÃÃo do memorando"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
 msgid "Memo preview pane position (horizontal)"
 msgstr "PosiÃÃo do painel de prÃ-visualizaÃÃo de memorando (horizontal)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
 msgid "Memo preview pane position (vertical)"
 msgstr "PosiÃÃo do painel de prÃ-visualizaÃÃo de memorando (vertical)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minuto em que termina o dia de trabalho, 0 a 59."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minuto em que comeÃa o dia de trabalho, 0 a 59."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
 msgid "Month view horizontal pane position"
 msgstr "PosiÃÃo do painel horizontal na exibiÃÃo de mÃs"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
 msgid "Month view vertical pane position"
 msgstr "PosiÃÃo do painel vertical na exibiÃÃo de mÃs"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
-#| msgid "Number of units for determining a default reminder."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
 msgid "Number of units for determining a birthday or anniversary reminder."
 msgstr "NÃmero de unidades para determinar o lembrete de aniversÃrio e bodas."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
 msgid "Number of units for determining a default reminder."
 msgstr "NÃmero de unidades para determinar o lembrete padrÃo."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
 msgid "Number of units for determining when to hide tasks."
 msgstr "NÃmero de unidades para determinar quando ocultar tarefas."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
 msgid "Overdue tasks color"
 msgstr "Cor para tarefas atrasadas"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -14387,7 +14391,7 @@ msgstr ""
 "PosiÃÃo do painel horizontal, entre a agenda de navegaÃÃo de datas e a lista "
 "de tarefas quando nÃo estiver em modo de exibiÃÃo por mÃs, em pixels."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -14395,25 +14399,25 @@ msgstr ""
 "PosiÃÃo do painel horizontal, entre a exibiÃÃo e a agenda de navegaÃÃo de "
 "datas e a lista de tarefas em modo de exibiÃÃo de mÃs, em pixels."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
 msgid "Position of the memo preview pane when oriented vertically."
 msgstr ""
 "PosiÃÃo do painel de prÃ-visualizaÃÃo de memorando quando orientado "
 "verticalmente."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr ""
 "PosiÃÃo do painel de prÃ-visualizaÃÃo de tarefa quando orientado "
 "horizontalmente."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the task preview pane when oriented vertically."
 msgstr ""
 "PosiÃÃo do painel de prÃ-visualizaÃÃo de tarefa quando orientado "
 "verticalmente."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -14421,7 +14425,7 @@ msgstr ""
 "PosiÃÃo da divisÃo vertical, entre a lista de agenda e agenda de navegaÃÃo "
 "de datas."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -14429,7 +14433,7 @@ msgstr ""
 "PosiÃÃo do painel vertical, entre a exibiÃÃo e a agenda de navegaÃÃo de "
 "datas e a lista de tarefas no modo de exibiÃÃo de mÃs, em pixels."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -14438,34 +14442,37 @@ msgstr ""
 "datas e a lista de tarefas quando nÃo estiver em modo de exibiÃÃo de mÃs, em "
 "pixels."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
 msgid "Primary calendar"
 msgstr "CalendÃrio principal"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
 msgid "Primary memo list"
 msgstr "Lista de memorandos principal"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary task list"
 msgstr "Lista de tarefas principal"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
-msgid "Programs that are allowed to be run by alarms."
-msgstr "Programas que podem ser executados como parte de alarmes."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+msgid "Programs that are allowed to be run by reminders."
+msgstr "Programas que podem ser executados por lembretes."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
 msgid "Recently used second time zones in a Day View"
 msgstr "Fusos horÃrios secundÃrios recentemente usados na VisÃo de Dia"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
-#| msgid "Recurrence date is invalid"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
 msgid "Recurrent Events in Italic"
 msgstr "RecorrÃncia de eventos em itÃlico"
 
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+msgid "Reminder programs"
+msgstr "Programas de lembrete"
+
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
-msgid "Save directory for alarm audio"
-msgstr "Salvar diretÃrio para o Ãudio do alarme"
+msgid "Save directory for reminder audio"
+msgstr "Salvar o diretÃrio para Ãudio de lembrete"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
 msgid "Scroll Month View by a week"
@@ -14494,8 +14501,8 @@ msgstr ""
 "esquerda do calendÃrio."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
-msgid "Show display alarms in notification tray"
-msgstr "Mostrar alarmes na Ãrea de notificaÃÃo"
+msgid "Show display reminders in notification tray"
+msgstr "Mostrar lembretes exibidos na bandeja de notificaÃÃo"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
 msgid "Show status field in the event/task/meeting editor"
@@ -14552,16 +14559,16 @@ msgid ""
 "The UID of the selected (or \"primary\") calendar in the sidebar of the "
 "\"Calendar\" view."
 msgstr ""
-"O UID do calendÃrio selecionado (ou \"primÃrio\") na barra lateral da visÃo de "
-"\"CalendÃrio\"."
+"O UID do calendÃrio selecionado (ou \"primÃrio\") na barra lateral da visÃo "
+"de \"CalendÃrio\"."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
 msgid ""
 "The UID of the selected (or \"primary\") memo list in the sidebar of the "
 "\"Memos\" view."
 msgstr ""
-"O UID da lista de memorando selecionada (ou \"primÃria\") na barra lateral da "
-"visÃo de \"Memorando\"."
+"O UID da lista de memorando selecionada (ou \"primÃria\") na barra lateral "
+"da visÃo de \"Memorando\"."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
 msgid ""
@@ -14621,16 +14628,16 @@ msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
 msgstr ""
-"Isso admite trÃs valores possÃveis: \"0\" para erros, \"1\" para avisos. "
-"\"2\" para mensagens de depuraÃÃo."
+"Isso admite trÃs valores possÃveis: \"0\" para erros, \"1\" para avisos. \"2"
+"\" para mensagens de depuraÃÃo."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
 msgid "Time divisions"
 msgstr "FraÃÃes de tempo"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
-msgid "Time the last alarm ran, in time_t."
-msgstr "A Ãltima vez que o alarme disparou, em time_t."
+msgid "Time the last reminder ran, in time_t."
+msgstr "Hora que do Ãltimo lembrete decorreu, em time_t."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
 msgid "Timezone"
@@ -14641,7 +14648,6 @@ msgid "Twenty four hour time format"
 msgstr "Formato de hora em vinte e quatro horas"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
-#| msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgid ""
 "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
 "\"days\"."
@@ -14685,8 +14691,8 @@ msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Dia em que a semana comeÃa, de Domingo (0) a SÃbado (6)."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
-msgid "Whether or not to use the notification tray for display alarms."
-msgstr "Usar a Ãrea de notificaÃÃo para exibir alarmes."
+msgid "Whether or not to use the notification tray for display reminders."
+msgstr "Usar a Ãrea de notificaÃÃo para exibir lembretes."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to ask for confirmation when deleting an appointment or task."
@@ -14728,7 +14734,6 @@ msgid "Whether to set a default reminder for appointments."
 msgstr "Definir um lembrete padrÃo para compromissos."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
-#| msgid "Whether to set a default reminder for appointments."
 msgid "Whether to set a reminder for birthdays and anniversaries."
 msgstr "Definir um lembrete para aniversÃrios e bodas."
 
@@ -14785,114 +14790,125 @@ msgstr "Hora em que comeÃa o dia de trabalho"
 msgid "Workday start minute"
 msgstr "Minuto em que comeÃa o dia de trabalho"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:267
+#: ../modules/calendar/e-cal-attachment-handler.c:312
 #: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "I_mportar"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:348
+#: ../modules/calendar/e-cal-attachment-handler.c:393
 msgid "Select a Calendar"
 msgstr "Selecionar um calendÃrio"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:375
+#: ../modules/calendar/e-cal-attachment-handler.c:420
 msgid "Select a Task List"
 msgstr "Selecionar uma lista de tarefas"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:385
+#: ../modules/calendar/e-cal-attachment-handler.c:430
 msgid "I_mport to Calendar"
 msgstr "I_mportar para o calendÃrio"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:392
+#: ../modules/calendar/e-cal-attachment-handler.c:437
 msgid "I_mport to Tasks"
 msgstr "_Importar para as tarefas"
 
+#: ../modules/calendar/e-calendar-preferences.c:461
+msgid "Selected Calendars for Reminders"
+msgstr "CalendÃrios selecionados para lembretes"
+
+#: ../modules/calendar/e-calendar-preferences.c:863
+msgid "Ti_me and date:"
+msgstr "Ho_ra e data:"
+
+#: ../modules/calendar/e-calendar-preferences.c:864
+msgid "_Date only:"
+msgstr "Somente _data:"
+
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:107
-#: ../modules/calendar/e-cal-shell-migrate.c:194
-#: ../modules/calendar/e-memo-shell-backend.c:94
-#: ../modules/calendar/e-memo-shell-migrate.c:149
-#: ../modules/calendar/e-task-shell-backend.c:94
-#: ../modules/calendar/e-task-shell-migrate.c:160
+#: ../modules/calendar/e-cal-shell-backend.c:117
+#: ../modules/calendar/e-cal-shell-migrate.c:198
+#: ../modules/calendar/e-memo-shell-backend.c:104
+#: ../modules/calendar/e-memo-shell-migrate.c:152
+#: ../modules/calendar/e-task-shell-backend.c:104
+#: ../modules/calendar/e-task-shell-migrate.c:164
 msgid "On The Web"
 msgstr "Na Web"
 
-#: ../modules/calendar/e-cal-shell-backend.c:109
-#: ../plugins/calendar-weather/calendar-weather.c:121
+#: ../modules/calendar/e-cal-shell-backend.c:119
+#: ../plugins/calendar-weather/calendar-weather.c:127
 msgid "Weather"
 msgstr "Clima"
 
-#: ../modules/calendar/e-cal-shell-backend.c:196
-#: ../modules/calendar/e-cal-shell-migrate.c:62
+#: ../modules/calendar/e-cal-shell-backend.c:206
+#: ../modules/calendar/e-cal-shell-migrate.c:66
 msgid "Birthdays & Anniversaries"
 msgstr "AniversÃrios e bodas"
 
-#: ../modules/calendar/e-cal-shell-backend.c:421
+#: ../modules/calendar/e-cal-shell-backend.c:439
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Compromisso"
 
-#: ../modules/calendar/e-cal-shell-backend.c:423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1439
+#: ../modules/calendar/e-cal-shell-backend.c:441
+#: ../modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "Create a new appointment"
 msgstr "Cria um novo compromisso"
 
-#: ../modules/calendar/e-cal-shell-backend.c:428
+#: ../modules/calendar/e-cal-shell-backend.c:446
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Compromisso de _dia inteiro"
 
-#: ../modules/calendar/e-cal-shell-backend.c:430
+#: ../modules/calendar/e-cal-shell-backend.c:448
 msgid "Create a new all-day appointment"
 msgstr "Cria um novo compromisso de dia inteiro"
 
-#: ../modules/calendar/e-cal-shell-backend.c:435
+#: ../modules/calendar/e-cal-shell-backend.c:453
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_ReuniÃo"
 
-#: ../modules/calendar/e-cal-shell-backend.c:437
+#: ../modules/calendar/e-cal-shell-backend.c:455
 msgid "Create a new meeting request"
 msgstr "Cria um novo pedido de reuniÃo"
 
-#: ../modules/calendar/e-cal-shell-backend.c:445
+#: ../modules/calendar/e-cal-shell-backend.c:463
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Age_nda"
 
-#: ../modules/calendar/e-cal-shell-backend.c:447
-#: ../modules/calendar/e-cal-shell-view-actions.c:1334
+#: ../modules/calendar/e-cal-shell-backend.c:465
+#: ../modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "Create a new calendar"
 msgstr "Cria uma nova agenda"
 
-#: ../modules/calendar/e-cal-shell-backend.c:750
-#: ../plugins/itip-formatter/itip-formatter.c:2809
+#: ../modules/calendar/e-cal-shell-backend.c:788
 msgid "Calendar and Tasks"
 msgstr "Agenda e tarefas"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:221
+#: ../modules/calendar/e-cal-shell-sidebar.c:184
 msgid "Loading calendars"
 msgstr "Carregando calendÃrios"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:636
+#: ../modules/calendar/e-cal-shell-sidebar.c:755
 msgid "_New Calendar..."
 msgstr "_Novo calendÃrio..."
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:653
+#: ../modules/calendar/e-cal-shell-sidebar.c:772
 msgid "Calendar Selector"
 msgstr "Seletor de calendÃrio"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:995
+#: ../modules/calendar/e-cal-shell-sidebar.c:1123
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Abrindo calendÃrio em %s"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:218
-#: ../modules/calendar/e-cal-shell-view-actions.c:247
+#: ../modules/calendar/e-cal-shell-view-actions.c:232
+#: ../modules/calendar/e-cal-shell-view-actions.c:261
 msgid "Print"
 msgstr "Imprimir"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:306
+#: ../modules/calendar/e-cal-shell-view-actions.c:320
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -14904,306 +14920,309 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:323
+#: ../modules/calendar/e-cal-shell-view-actions.c:337
 msgid "Purge events older than"
 msgstr "Excluir permanentemente eventos com tempo superior a"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:534
+#: ../modules/calendar/e-cal-shell-view-actions.c:564
 msgid "Copying Items"
 msgstr "Copiando itens"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:804
+#: ../modules/calendar/e-cal-shell-view-actions.c:848
 msgid "Moving Items"
 msgstr "Movendo itens"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1131
+#: ../modules/calendar/e-cal-shell-view-actions.c:1175
 msgid "event"
 msgstr "Evento"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1133
-#: ../modules/calendar/e-cal-shell-view-memopad.c:216
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:510
-#: ../modules/calendar/e-task-shell-view-actions.c:627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1177
+#: ../modules/calendar/e-cal-shell-view-memopad.c:219
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:286
+#: ../modules/calendar/e-memo-shell-view-actions.c:524
+#: ../modules/calendar/e-task-shell-view-actions.c:641
 msgid "Save as iCalendar"
 msgstr "Salvar como iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1290
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1297
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
 msgid "D_elete Calendar"
 msgstr "_Excluir calendÃrio"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1299
+#: ../modules/calendar/e-cal-shell-view-actions.c:1344
 msgid "Delete the selected calendar"
 msgstr "Exclui o calendÃrio selecionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../modules/calendar/e-cal-shell-view-actions.c:1351
 msgid "Go Back"
 msgstr "Voltar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1313
+#: ../modules/calendar/e-cal-shell-view-actions.c:1358
 msgid "Go Forward"
 msgstr "AvanÃar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1320
+#: ../modules/calendar/e-cal-shell-view-actions.c:1365
 msgid "Select today"
 msgstr "Seleciona o dia de hoje"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1325
+#: ../modules/calendar/e-cal-shell-view-actions.c:1370
 msgid "Select _Date"
 msgstr "Selecionar _data"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1327
+#: ../modules/calendar/e-cal-shell-view-actions.c:1372
 msgid "Select a specific date"
 msgstr "Seleciona uma data especÃfica"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1332
+#: ../modules/calendar/e-cal-shell-view-actions.c:1377
 msgid "_New Calendar"
 msgstr "_Nova agenda"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1346
-#: ../modules/calendar/e-task-shell-view-actions.c:799
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-task-shell-view-actions.c:813
 msgid "Purg_e"
 msgstr "Excluir _permanentemente"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1348
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "Purge old appointments and meetings"
 msgstr "Exclui permanentemente compromissos e reuniÃes antigas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1353
-#: ../modules/calendar/e-memo-shell-view-actions.c:619
-#: ../modules/calendar/e-task-shell-view-actions.c:743
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-task-shell-view-actions.c:757
 msgid "Re_fresh"
 msgstr "Atuali_zar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1355
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
 msgid "Refresh the selected calendar"
 msgstr "Atualiza o calendÃrio selecionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1362
+#: ../modules/calendar/e-cal-shell-view-actions.c:1407
 msgid "Rename the selected calendar"
 msgstr "Renomeia o calendÃrio selecionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1367
+#: ../modules/calendar/e-cal-shell-view-actions.c:1412
 msgid "Show _Only This Calendar"
 msgstr "M_ostrar somente este calendÃrio"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1374
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "Cop_y to Calendar..."
 msgstr "Copiar para a A_genda..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1381
+#: ../modules/calendar/e-cal-shell-view-actions.c:1426
 msgid "_Delegate Meeting..."
 msgstr "_Delegar reuniÃo..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1388
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
 msgid "_Delete Appointment"
 msgstr "E_xcluir compromisso"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1390
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
 msgid "Delete selected appointments"
 msgstr "Exclui os compromissos selecionados"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1395
+#: ../modules/calendar/e-cal-shell-view-actions.c:1440
 msgid "Delete This _Occurrence"
 msgstr "Exc_luir esta ocorrÃncia"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1397
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
 msgid "Delete this occurrence"
 msgstr "Exclui esta ocorrÃncia"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1402
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
 msgid "Delete All Occ_urrences"
 msgstr "Excl_uir todas as ocorrÃncias"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1404
+#: ../modules/calendar/e-cal-shell-view-actions.c:1449
 msgid "Delete all occurrences"
 msgstr "Exclui todas as ocorrÃncias"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1409
+#: ../modules/calendar/e-cal-shell-view-actions.c:1454
 msgid "New All Day _Event..."
 msgstr "Novo _evento de dia inteiro..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1411
+#: ../modules/calendar/e-cal-shell-view-actions.c:1456
 msgid "Create a new all day event"
 msgstr "Cria um novo compromisso de dia inteiro"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1416
-#: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:323
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-cal-shell-view-actions.c:1461
+#: ../modules/calendar/e-cal-shell-view-memopad.c:253
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
+#: ../modules/calendar/e-memo-shell-view-actions.c:598
+#: ../modules/calendar/e-task-shell-view-actions.c:722
 msgid "_Forward as iCalendar..."
 msgstr "_Encaminhar como iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1423
+#: ../modules/calendar/e-cal-shell-view-actions.c:1468
 msgid "New _Meeting..."
 msgstr "Nova _reuniÃo..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1425
+#: ../modules/calendar/e-cal-shell-view-actions.c:1470
 msgid "Create a new meeting"
 msgstr "Cria uma nova reuniÃo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1430
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver para o calendÃrio..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1437
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
 msgid "New _Appointment..."
 msgstr "Novo _compromisso..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1444
+#: ../modules/calendar/e-cal-shell-view-actions.c:1489
 msgid "Make this Occurrence _Movable"
 msgstr "Tor_nar esta ocorrÃncia mÃvel"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1451
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
 msgid "_Open Appointment"
 msgstr "_Abrir compromisso"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1453
+#: ../modules/calendar/e-cal-shell-view-actions.c:1498
 msgid "View the current appointment"
 msgstr "Ver o compromisso atual"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1458
+#: ../modules/calendar/e-cal-shell-view-actions.c:1503
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1472
-#: ../modules/calendar/e-cal-shell-view-memopad.c:278
-msgid "Save as iCalendar..."
-msgstr "Salvar como iCalendar..."
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1479
+#: ../modules/calendar/e-cal-shell-view-actions.c:1517
 msgid "_Schedule Meeting..."
 msgstr "Agendar _reuniÃo..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1481
+#: ../modules/calendar/e-cal-shell-view-actions.c:1519
 msgid "Converts an appointment to a meeting"
 msgstr "Converte um compromisso em reuniÃo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1486
+#: ../modules/calendar/e-cal-shell-view-actions.c:1524
 msgid "Conv_ert to Appointment..."
 msgstr "Conv_erter em compromisso..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1488
+#: ../modules/calendar/e-cal-shell-view-actions.c:1526
 msgid "Converts a meeting to an appointment"
 msgstr "Converte um encontro em um compromisso"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1493
+#: ../modules/calendar/e-cal-shell-view-actions.c:1531
 msgid "Quit"
 msgstr "Sair"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1617
+#: ../modules/calendar/e-cal-shell-view-actions.c:1651
 msgid "Day"
 msgstr "Dia"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
 msgid "Show one day"
 msgstr "Mostrar um dia"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1624
+#: ../modules/calendar/e-cal-shell-view-actions.c:1658
 msgid "List"
 msgstr "Lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
 msgid "Show as list"
 msgstr "Mostrar como uma lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1631
+#: ../modules/calendar/e-cal-shell-view-actions.c:1665
 msgid "Month"
 msgstr "MÃs"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
 msgid "Show one month"
 msgstr "Mostrar um mÃs"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1638
+#: ../modules/calendar/e-cal-shell-view-actions.c:1672
 msgid "Week"
 msgstr "Semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../modules/calendar/e-cal-shell-view-actions.c:1674
 msgid "Show one week"
 msgstr "Mostrar uma semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1647
+#: ../modules/calendar/e-cal-shell-view-actions.c:1681
 msgid "Show one work week"
 msgstr "Mostrar uma semana de trabalho"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1655
+#: ../modules/calendar/e-cal-shell-view-actions.c:1689
 msgid "Active Appointments"
 msgstr "Compromissos ativos"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1669
+#: ../modules/calendar/e-cal-shell-view-actions.c:1703
 msgid "Next 7 Days' Appointments"
 msgstr "Compromissos dos prÃximos 7 dias"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1700
-#: ../modules/calendar/e-memo-shell-view-actions.c:781
-#: ../modules/calendar/e-task-shell-view-actions.c:980
+#: ../modules/calendar/e-cal-shell-view-actions.c:1734
+#: ../modules/calendar/e-memo-shell-view-actions.c:795
+#: ../modules/calendar/e-task-shell-view-actions.c:994
 msgid "Description contains"
 msgstr "DescriÃÃo contÃm"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1707
-#: ../modules/calendar/e-memo-shell-view-actions.c:788
-#: ../modules/calendar/e-task-shell-view-actions.c:987
+#: ../modules/calendar/e-cal-shell-view-actions.c:1741
+#: ../modules/calendar/e-memo-shell-view-actions.c:802
+#: ../modules/calendar/e-task-shell-view-actions.c:1001
 msgid "Summary contains"
 msgstr "Resumo contÃm"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1719
+#: ../modules/calendar/e-cal-shell-view-actions.c:1753
 msgid "Print this calendar"
 msgstr "Imprimir esta agenda"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1726
+#: ../modules/calendar/e-cal-shell-view-actions.c:1760
 msgid "Preview the calendar to be printed"
 msgstr "PrÃ-visualiza o calendÃrio a ser impresso"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1799
+#: ../modules/calendar/e-cal-shell-view-actions.c:1782
+#: ../modules/calendar/e-cal-shell-view-memopad.c:294
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:381
+#: ../modules/calendar/e-memo-shell-view-actions.c:843
+#: ../modules/calendar/e-task-shell-view-actions.c:1042
+msgid "_Save as iCalendar..."
+msgstr "_Salvar como iCalendar..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1859
 msgid "Go To"
 msgstr "Ir para"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:214
-#: ../modules/calendar/e-memo-shell-view-actions.c:508
+#: ../modules/calendar/e-cal-shell-view-memopad.c:217
+#: ../modules/calendar/e-memo-shell-view-actions.c:522
 msgid "memo"
 msgstr "Memorando"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:640
+#: ../modules/calendar/e-cal-shell-view-memopad.c:260
+#: ../modules/calendar/e-memo-shell-view-actions.c:654
 msgid "New _Memo"
 msgstr "Novo _memorando"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-backend.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:642
+#: ../modules/calendar/e-cal-shell-view-memopad.c:262
+#: ../modules/calendar/e-memo-shell-backend.c:300
+#: ../modules/calendar/e-memo-shell-view-actions.c:656
 msgid "Create a new memo"
 msgstr "Cria um novo memorando"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-cal-shell-view-memopad.c:267
+#: ../modules/calendar/e-memo-shell-view-actions.c:661
 msgid "_Open Memo"
 msgstr "A_brir Memorando"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:266
-#: ../modules/calendar/e-memo-shell-view-actions.c:649
+#: ../modules/calendar/e-cal-shell-view-memopad.c:269
+#: ../modules/calendar/e-memo-shell-view-actions.c:663
 msgid "View the selected memo"
 msgstr "Ver o memorando selecionado"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:358
-#: ../modules/calendar/e-memo-shell-view-actions.c:654
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/calendar/e-cal-shell-view-memopad.c:274
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
+#: ../modules/calendar/e-memo-shell-view-actions.c:668
+#: ../modules/calendar/e-task-shell-view-actions.c:806
 msgid "Open _Web Page"
 msgstr "Abrir pÃgina _Web"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:290
-#: ../modules/calendar/e-memo-shell-view-actions.c:814
+#: ../modules/calendar/e-cal-shell-view-memopad.c:286
+#: ../modules/calendar/e-memo-shell-view-actions.c:828
 msgid "Print the selected memo"
 msgstr "Imprime o memorando selecionado"
 
@@ -15211,247 +15230,229 @@ msgstr "Imprime o memorando selecionado"
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:281
-#: ../modules/calendar/e-task-shell-view-actions.c:625
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:284
+#: ../modules/calendar/e-task-shell-view-actions.c:639
 msgid "task"
 msgstr "Tarefa"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:316
-#: ../modules/calendar/e-task-shell-view-actions.c:687
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:319
+#: ../modules/calendar/e-task-shell-view-actions.c:701
 msgid "_Assign Task"
 msgstr "_Atribuir tarefa"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
-#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
+#: ../modules/calendar/e-task-shell-view-actions.c:778
 msgid "_Mark as Complete"
 msgstr "_Marcar como concluÃda"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:332
-#: ../modules/calendar/e-task-shell-view-actions.c:766
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:335
+#: ../modules/calendar/e-task-shell-view-actions.c:780
 msgid "Mark selected tasks as complete"
 msgstr "Marca as tarefas selecionadas como concluÃdas"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
 msgid "_Mark as Incomplete"
 msgstr "_Marcar como Incompleto"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:339
-#: ../modules/calendar/e-task-shell-view-actions.c:773
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:342
+#: ../modules/calendar/e-task-shell-view-actions.c:787
 msgid "Mark selected tasks as incomplete"
 msgstr "Marca as tarefas selecionadas como incompleta"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
-#: ../modules/calendar/e-task-shell-view-actions.c:778
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:792
 msgid "New _Task"
 msgstr "Nova _tarefa"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
-#: ../modules/calendar/e-task-shell-backend.c:282
-#: ../modules/calendar/e-task-shell-view-actions.c:780
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:349
+#: ../modules/calendar/e-task-shell-backend.c:299
+#: ../modules/calendar/e-task-shell-view-actions.c:794
 msgid "Create a new task"
 msgstr "Cria uma nova tarefa"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
+#: ../modules/calendar/e-task-shell-view-actions.c:799
 msgid "_Open Task"
 msgstr "_Abrir tarefa"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:353
-#: ../modules/calendar/e-task-shell-view-actions.c:787
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:356
+#: ../modules/calendar/e-task-shell-view-actions.c:801
 msgid "View the selected task"
 msgstr "VÃ a tarefa selecionada"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:365
-#: ../modules/calendar/e-memo-shell-view-actions.c:829
-#: ../modules/calendar/e-task-shell-view-actions.c:1028
-msgid "_Save as iCalendar..."
-msgstr "_Salvar como iCalendar..."
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:377
-#: ../modules/calendar/e-task-shell-view-actions.c:1013
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
+#: ../modules/calendar/e-task-shell-view-actions.c:1027
 msgid "Print the selected task"
 msgstr "Imprime a tarefa selecionada"
 
-#: ../modules/calendar/e-calendar-preferences.c:437
-msgid "Selected Calendars for Alarms"
-msgstr "Agendas que devem ter alarmes"
-
-#: ../modules/calendar/e-calendar-preferences.c:836
-msgid "Ti_me and date:"
-msgstr "Ho_ra e data:"
-
-#: ../modules/calendar/e-calendar-preferences.c:837
-msgid "_Date only:"
-msgstr "Somente _data:"
-
-#: ../modules/calendar/e-memo-shell-backend.c:281
+#: ../modules/calendar/e-memo-shell-backend.c:298
 msgctxt "New"
 msgid "Mem_o"
 msgstr "Mem_orando"
 
-#: ../modules/calendar/e-memo-shell-backend.c:288
+#: ../modules/calendar/e-memo-shell-backend.c:305
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Memorando compartilhado"
 
-#: ../modules/calendar/e-memo-shell-backend.c:290
+#: ../modules/calendar/e-memo-shell-backend.c:307
 msgid "Create a new shared memo"
 msgstr "Cria um novo memorando compartilhado"
 
-#: ../modules/calendar/e-memo-shell-backend.c:298
+#: ../modules/calendar/e-memo-shell-backend.c:315
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Li_sta de memorandos"
 
-#: ../modules/calendar/e-memo-shell-backend.c:300
-#: ../modules/calendar/e-memo-shell-view-actions.c:607
+#: ../modules/calendar/e-memo-shell-backend.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:621
 msgid "Create a new memo list"
 msgstr "Cria uma nova lista de memorandos"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:216
+#: ../modules/calendar/e-memo-shell-sidebar.c:179
 msgid "Loading memos"
 msgstr "Carregando memorandos"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:578
+#: ../modules/calendar/e-memo-shell-sidebar.c:696
 msgid "Memo List Selector"
 msgstr "Seletor de lista de memorando"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:882
+#: ../modules/calendar/e-memo-shell-sidebar.c:1009
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Abrindo memorandos em %s"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:233
+#: ../modules/calendar/e-memo-shell-view-actions.c:231
+#: ../modules/calendar/e-memo-shell-view-actions.c:246
 msgid "Print Memos"
 msgstr "Imprimir memorandos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:570
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
 msgid "_Delete Memo"
 msgstr "E_xcluir memorando"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:577
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
 msgid "_Find in Memo..."
 msgstr "_Localizar no memorando..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:579
+#: ../modules/calendar/e-memo-shell-view-actions.c:593
 msgid "Search for text in the displayed memo"
 msgstr "Pesquisa texto no memorando exibido"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:598
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
 msgid "D_elete Memo List"
 msgstr "_Excluir lista de memorandos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:600
+#: ../modules/calendar/e-memo-shell-view-actions.c:614
 msgid "Delete the selected memo list"
 msgstr "Exclui a lista de memorandos selecionada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-memo-shell-view-actions.c:619
 msgid "_New Memo List"
 msgstr "_Nova lista de memorandos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:621
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
 msgid "Refresh the selected memo list"
 msgstr "Atualiza a lista de memorandos selecionada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:628
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
 msgid "Rename the selected memo list"
 msgstr "Renomeia a lista de memorandos selecionada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
 msgid "Show _Only This Memo List"
 msgstr "M_ostrar somente esta lista de memorandos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:712
+#: ../modules/calendar/e-memo-shell-view-actions.c:726
 msgid "Memo _Preview"
 msgstr "_PrÃ-visualizaÃÃo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:714
+#: ../modules/calendar/e-memo-shell-view-actions.c:728
 msgid "Show memo preview pane"
 msgstr "Exibe o painel de prÃ-visualizaÃÃo de memorando"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:735
+#: ../modules/calendar/e-memo-shell-view-actions.c:749
 msgid "Show memo preview below the memo list"
 msgstr "Exibe a prÃ-visualizaÃÃo da lista de memorandos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:742
+#: ../modules/calendar/e-memo-shell-view-actions.c:756
 msgid "Show memo preview alongside the memo list"
 msgstr "Exibe a prÃ-visualizaÃÃo de memorando ao lado da lista de memorandos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:800
+#: ../modules/calendar/e-memo-shell-view-actions.c:814
 msgid "Print the list of memos"
 msgstr "Imprime a lista de memorandos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:807
+#: ../modules/calendar/e-memo-shell-view-actions.c:821
 msgid "Preview the list of memos to be printed"
 msgstr "Visualiza a lista de memorandos a ser impressa"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:420
+#: ../modules/calendar/e-memo-shell-view.c:227
+msgid "Delete Memos"
+msgstr "Excluir memorandos"
+
+#: ../modules/calendar/e-memo-shell-view.c:229
+msgid "Delete Memo"
+msgstr "Excluir memorando"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:424
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d memorando"
 msgstr[1] "%d memorandos"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:424
-#: ../modules/calendar/e-task-shell-view-private.c:575
+#: ../modules/calendar/e-memo-shell-view-private.c:428
+#: ../modules/calendar/e-task-shell-view-private.c:585
 #, c-format
 msgid "%d selected"
 msgstr "%d selecionada"
 
-#: ../modules/calendar/e-memo-shell-view.c:223
-msgid "Delete Memos"
-msgstr "Excluir memorandos"
-
-#: ../modules/calendar/e-memo-shell-view.c:225
-msgid "Delete Memo"
-msgstr "Excluir memorando"
-
-#: ../modules/calendar/e-task-shell-backend.c:280
+#: ../modules/calendar/e-task-shell-backend.c:297
 msgctxt "New"
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: ../modules/calendar/e-task-shell-backend.c:287
+#: ../modules/calendar/e-task-shell-backend.c:304
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tarefa _atribuÃda"
 
-#: ../modules/calendar/e-task-shell-backend.c:289
+#: ../modules/calendar/e-task-shell-backend.c:306
 msgid "Create a new assigned task"
 msgstr "Cria uma nova tarefa atribuÃda"
 
-#: ../modules/calendar/e-task-shell-backend.c:297
+#: ../modules/calendar/e-task-shell-backend.c:314
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Lis_ta de tarefas"
 
-#: ../modules/calendar/e-task-shell-backend.c:299
-#: ../modules/calendar/e-task-shell-view-actions.c:731
+#: ../modules/calendar/e-task-shell-backend.c:316
+#: ../modules/calendar/e-task-shell-view-actions.c:745
 msgid "Create a new task list"
 msgstr "Cria uma nova lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:216
+#: ../modules/calendar/e-task-shell-sidebar.c:179
 msgid "Loading tasks"
 msgstr "Carregando tarefas"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:578
+#: ../modules/calendar/e-task-shell-sidebar.c:696
 msgid "Task List Selector"
 msgstr "Seletor de lista de tarefas"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:882
+#: ../modules/calendar/e-task-shell-sidebar.c:1010
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrindo tarefas em %s"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:241
-#: ../modules/calendar/e-task-shell-view-actions.c:256
+#: ../modules/calendar/e-task-shell-view-actions.c:254
+#: ../modules/calendar/e-task-shell-view-actions.c:269
 msgid "Print Tasks"
 msgstr "Imprimir tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:569
+#: ../modules/calendar/e-task-shell-view-actions.c:583
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15464,626 +15465,585 @@ msgstr ""
 "\n"
 "Apagar estas tarefas mesmo assim?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:694
+#: ../modules/calendar/e-task-shell-view-actions.c:590
+msgid "Do not ask me again"
+msgstr "NÃo me pergunte novamente"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:708
 msgid "_Delete Task"
 msgstr "E_xcluir tarefa"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:701
+#: ../modules/calendar/e-task-shell-view-actions.c:715
 msgid "_Find in Task..."
 msgstr "_Localizar na tarefa..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:703
+#: ../modules/calendar/e-task-shell-view-actions.c:717
 msgid "Search for text in the displayed task"
 msgstr "Pesquisa texto no corpo da tarefa exibida"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-view-actions.c:729
 msgid "Copy..."
 msgstr "Copiar..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:722
+#: ../modules/calendar/e-task-shell-view-actions.c:736
 msgid "D_elete Task List"
 msgstr "_Excluir lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:724
+#: ../modules/calendar/e-task-shell-view-actions.c:738
 msgid "Delete the selected task list"
 msgstr "Exclui a lista de tarefas selecionada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:743
 msgid "_New Task List"
 msgstr "_Nova lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:745
+#: ../modules/calendar/e-task-shell-view-actions.c:759
 msgid "Refresh the selected task list"
 msgstr "Exclui a lista de tarefas selecionada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:752
+#: ../modules/calendar/e-task-shell-view-actions.c:766
 msgid "Rename the selected task list"
 msgstr "Renomeia a lista de tarefas selecionada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:771
 msgid "Show _Only This Task List"
 msgstr "M_ostrar somente esta lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:785
 msgid "Mar_k as Incomplete"
 msgstr "_Marcar como incompleto"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:801
+#: ../modules/calendar/e-task-shell-view-actions.c:815
 msgid "Delete completed tasks"
 msgstr "Exclui as tarefas concluÃdas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:876
+#: ../modules/calendar/e-task-shell-view-actions.c:890
 msgid "Task _Preview"
 msgstr "_Visualizar tarefa"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:878
+#: ../modules/calendar/e-task-shell-view-actions.c:892
 msgid "Show task preview pane"
 msgstr "Mostrar o painel de prÃ-visualizaÃÃo de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:899
+#: ../modules/calendar/e-task-shell-view-actions.c:913
 msgid "Show task preview below the task list"
 msgstr "Exibe a prÃ-visualizaÃÃo de tarefa abaixo da lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:906
+#: ../modules/calendar/e-task-shell-view-actions.c:920
 msgid "Show task preview alongside the task list"
 msgstr "Exibe a prÃ-visualizaÃÃo de tarefa ao lado da lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:914
+#: ../modules/calendar/e-task-shell-view-actions.c:928
 msgid "Active Tasks"
 msgstr "Tarefas ativas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:928
+#: ../modules/calendar/e-task-shell-view-actions.c:942
 msgid "Completed Tasks"
 msgstr "Tarefas completadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:935
+#: ../modules/calendar/e-task-shell-view-actions.c:949
 msgid "Next 7 Days' Tasks"
 msgstr "Tarefas dos prÃximos 7 dias"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:942
+#: ../modules/calendar/e-task-shell-view-actions.c:956
 msgid "Overdue Tasks"
 msgstr "Tarefas atrasadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:949
+#: ../modules/calendar/e-task-shell-view-actions.c:963
 msgid "Tasks with Attachments"
 msgstr "Tarefas com anexos"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:999
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
 msgid "Print the list of tasks"
 msgstr "Imprimi a lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1006
+#: ../modules/calendar/e-task-shell-view-actions.c:1020
 msgid "Preview the list of tasks to be printed"
 msgstr "Visualiza a lista de tarefas a serem impressas"
 
-#: ../modules/calendar/e-task-shell-view-private.c:468
+#: ../modules/calendar/e-task-shell-view.c:362
+msgid "Delete Tasks"
+msgstr "Tarefas apagadas"
+
+#: ../modules/calendar/e-task-shell-view.c:364
+msgid "Delete Task"
+msgstr "Apagar tarefa"
+
+#: ../modules/calendar/e-task-shell-view-private.c:472
 msgid "Expunging"
 msgstr "Excluindo permanentemente"
 
-#: ../modules/calendar/e-task-shell-view-private.c:571
+#: ../modules/calendar/e-task-shell-view-private.c:581
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tarefa"
 msgstr[1] "%d tarefas"
 
-#: ../modules/calendar/e-task-shell-view.c:358
-msgid "Delete Tasks"
-msgstr "Tarefas apagadas"
+#: ../modules/mail/em-account-prefs.c:219
+msgid "Evolution Account Assistant"
+msgstr "Assistente de contas do Evolution"
 
-#: ../modules/calendar/e-task-shell-view.c:360
-msgid "Delete Task"
-msgstr "Apagar tarefa"
+#: ../modules/mail/em-account-prefs.c:268
+msgid "Account Editor"
+msgstr "Editor de contas"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:376
+#: ../modules/mail/e-mail-attachment-handler.c:384
 #, c-format
 msgid "%d attached messages"
 msgstr "%d mensagens anexadas"
 
-#. Translators: "None" for a junk hook name,
-#. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:90
-msgctxt "mail-junk-hook"
-msgid "None"
-msgstr "Nenhum"
-
-#: ../modules/mail/e-mail-shell-backend.c:183
+#: ../modules/mail/e-mail-shell-backend.c:195
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mensagem de correio"
 
-#: ../modules/mail/e-mail-shell-backend.c:185
+#: ../modules/mail/e-mail-shell-backend.c:197
 msgid "Compose a new mail message"
 msgstr "Redige uma nova mensagem"
 
-#: ../modules/mail/e-mail-shell-backend.c:193
+#: ../modules/mail/e-mail-shell-backend.c:205
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Pasta de correio"
 
-#: ../modules/mail/e-mail-shell-backend.c:195
+#: ../modules/mail/e-mail-shell-backend.c:207
 msgid "Create a new mail folder"
 msgstr "Cria uma nova pasta de correio"
 
-#: ../modules/mail/e-mail-shell-backend.c:494
+#: ../modules/mail/e-mail-shell-backend.c:412
 msgid "Mail Accounts"
 msgstr "Contas de correio"
 
-#: ../modules/mail/e-mail-shell-backend.c:502
+#: ../modules/mail/e-mail-shell-backend.c:420
 msgid "Mail Preferences"
 msgstr "PreferÃncias de correio"
 
-#: ../modules/mail/e-mail-shell-backend.c:510
+#: ../modules/mail/e-mail-shell-backend.c:428
 msgid "Composer Preferences"
 msgstr "PreferÃncias do redator"
 
-#: ../modules/mail/e-mail-shell-backend.c:518
+#: ../modules/mail/e-mail-shell-backend.c:436
 msgid "Network Preferences"
 msgstr "PreferÃncias de rede"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1064
-#: ../modules/mail/e-mail-shell-view.c:953
+#: ../modules/mail/e-mail-shell-view-actions.c:1115
+#: ../modules/mail/e-mail-shell-view.c:960
 msgid "_Disable Account"
 msgstr "_Desabilitar conta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1066
+#: ../modules/mail/e-mail-shell-view-actions.c:1117
 msgid "Disable this account"
 msgstr "Desabilitar esta conta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1073
+#: ../modules/mail/e-mail-shell-view-actions.c:1124
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Remove permanentemente todas as mensagens excluÃdas em todas as pastas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1078
-msgid "C_reate Search Folder From Search..."
-msgstr "_Criar pasta de pesquisa a partir da pesquisa..."
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1085
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
 msgid "_Download Messages for Offline Usage"
 msgstr "Baixar mensagens para uso _desconectado"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1087
+#: ../modules/mail/e-mail-shell-view-actions.c:1131
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "Baixa mensagens das contas e pastas marcadas como desconectadas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1092
+#: ../modules/mail/e-mail-shell-view-actions.c:1136
 msgid "Fl_ush Outbox"
 msgstr "Limpar cai_xa de saÃda"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1099
+#: ../modules/mail/e-mail-shell-view-actions.c:1143
 msgid "_Copy Folder To..."
 msgstr "_Copiar a pasta para..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1101
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
 msgid "Copy the selected folder into another folder"
 msgstr "Copia a pasta selecionada em outra pasta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1108
+#: ../modules/mail/e-mail-shell-view-actions.c:1152
 msgid "Permanently remove this folder"
 msgstr "Remove permanentemente esta pasta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1113
+#: ../modules/mail/e-mail-shell-view-actions.c:1157
 msgid "E_xpunge"
 msgstr "Exc_luir permanentemente"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1115
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Remove permanentemente todas as mensagens excluÃdas nesta pasta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1120
+#: ../modules/mail/e-mail-shell-view-actions.c:1164
 msgid "Mar_k All Messages as Read"
 msgstr "Marcar mensagens como lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1122
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
 msgid "Mark all messages in the folder as read"
 msgstr "Marca todas as mensagens nesta pasta e como lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1127
+#: ../modules/mail/e-mail-shell-view-actions.c:1171
 msgid "_Move Folder To..."
 msgstr "_Mover a pasta para..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1129
+#: ../modules/mail/e-mail-shell-view-actions.c:1173
 msgid "Move the selected folder into another folder"
 msgstr "Move a pasta selecionada para outra pasta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1134
+#: ../modules/mail/e-mail-shell-view-actions.c:1178
 msgid "_New..."
 msgstr "_Nova..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1136
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
 msgid "Create a new folder for storing mail"
 msgstr "Cria uma nova pasta para armazenar mensagens"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1143
+#: ../modules/mail/e-mail-shell-view-actions.c:1187
 msgid "Change the properties of this folder"
 msgstr "Altera as propriedades desta pasta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1150
+#: ../modules/mail/e-mail-shell-view-actions.c:1194
 msgid "Refresh the folder"
 msgstr "Atualiza a pasta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1157
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
 msgid "Change the name of this folder"
 msgstr "Altera o nome desta pasta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1162
+#: ../modules/mail/e-mail-shell-view-actions.c:1206
 msgid "Select Message _Thread"
 msgstr "Selecionar a _discussÃo da mensagem"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1208
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 "Seleciona todas as mensagens no mesmo encadeamento que a mensagem selecionada"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1169
+#: ../modules/mail/e-mail-shell-view-actions.c:1213
 msgid "Select Message S_ubthread"
 msgstr "Selecionar a _subdiscussÃo da mensagem"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1171
+#: ../modules/mail/e-mail-shell-view-actions.c:1215
 msgid "Select all replies to the currently selected message"
 msgstr "Seleciona todas as respostas para a mensagem selecionada atualmente"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1183
+#: ../modules/mail/e-mail-shell-view-actions.c:1227
 msgid "Empty _Trash"
 msgstr "Esvaziar _lixeira"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1185
+#: ../modules/mail/e-mail-shell-view-actions.c:1229
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Remove permanentemente todas as mensagens excluÃdas em todas as pastas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1190
+#: ../modules/mail/e-mail-shell-view-actions.c:1234
 msgid "_New Label"
 msgstr "_novo RÃtulo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1199
+#: ../modules/mail/e-mail-shell-view-actions.c:1243
 msgid "N_one"
 msgstr "N_enhum"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1213
-#| msgid "_Subscriptions..."
+#: ../modules/mail/e-mail-shell-view-actions.c:1257
 msgid "_Manage Subscriptions"
 msgstr "Gerenciar i_nscriÃÃes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1215
-#: ../modules/mail/e-mail-shell-view-actions.c:1299
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Inscreve em ou cancela a inscriÃÃo de pastas em servidores remotos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1220
-#: ../modules/mail/e-mail-shell-view-actions.c:1241
+#: ../modules/mail/e-mail-shell-view-actions.c:1264
+#: ../modules/mail/e-mail-shell-view-actions.c:1285
 msgid "Send / _Receive"
 msgstr "Enviar/re_ceber"
 
 # "Recuperar" à a traduÃÃo padrÃo de "retrieve", mas à tÃcnico demais para a
 # maioria dos usuÃrios, e pode trazer a ambigÃidade com "desfazer exclusÃo".
-#: ../modules/mail/e-mail-shell-view-actions.c:1222
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
 msgid "Send queued items and retrieve new items"
 msgstr "Envia itens na fila de saÃda e obtÃm novos itens"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1227
-#| msgid "Received"
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
 msgid "R_eceive All"
 msgstr "R_eceber todas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1229
-#| msgid "Permanently remove all the deleted messages from all accounts"
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
 msgid "Receive new items from all accounts"
 msgstr "Receber novos itens de todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1234
-#| msgid "_Send"
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
 msgid "_Send All"
 msgstr "_Enviar todas"
 
 # "Recuperar" à a traduÃÃo padrÃo de "retrieve", mas à tÃcnico demais para a
 # maioria dos usuÃrios, e pode trazer a ambigÃidade com "desfazer exclusÃo".
-#: ../modules/mail/e-mail-shell-view-actions.c:1236
-#| msgid "Send queued items and retrieve new items"
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
 msgid "Send queued items in all accounts"
 msgstr "Envia itens na fila de todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1262
+#: ../modules/mail/e-mail-shell-view-actions.c:1306
 #: ../widgets/misc/e-activity-proxy.c:310
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1264
+#: ../modules/mail/e-mail-shell-view-actions.c:1308
 msgid "Cancel the current mail operation"
 msgstr "Cancela a operaÃÃo de correio atual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1269
+#: ../modules/mail/e-mail-shell-view-actions.c:1313
 msgid "Collapse All _Threads"
 msgstr "Agrupar _todas as discussÃes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#: ../modules/mail/e-mail-shell-view-actions.c:1315
 msgid "Collapse all message threads"
 msgstr "Agrupa todas as discussÃes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1276
+#: ../modules/mail/e-mail-shell-view-actions.c:1320
 msgid "E_xpand All Threads"
 msgstr "E_xpandir todas as discussÃes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1278
+#: ../modules/mail/e-mail-shell-view-actions.c:1322
 msgid "Expand all message threads"
 msgstr "Expande todas as discussÃes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1283
+#: ../modules/mail/e-mail-shell-view-actions.c:1327
 msgid "_Message Filters"
 msgstr "F_iltros de mensagens"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1329
 msgid "Create or edit rules for filtering new mail"
 msgstr "Cria ou edita as regras para filtragem de correio"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1290
-msgid "Search F_olders"
-msgstr "P_astas de pesquisa"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1292
-msgid "Create or edit search folder definitions"
-msgstr "Cria ou editar as definiÃÃes da pasta de pesquisa"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1297
+#: ../modules/mail/e-mail-shell-view-actions.c:1334
 msgid "_Subscriptions..."
 msgstr "In_scriÃÃes..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1306
+#: ../modules/mail/e-mail-shell-view-actions.c:1343
 msgid "F_older"
 msgstr "_Pasta"
 
 # Qualquer tecla de acesso vai colidir com outro item de menu
-#: ../modules/mail/e-mail-shell-view-actions.c:1313
+#: ../modules/mail/e-mail-shell-view-actions.c:1350
 msgid "_Label"
 msgstr "_RÃtulo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1353
+#: ../modules/mail/e-mail-shell-view-actions.c:1367
+msgid "C_reate Search Folder From Search..."
+msgstr "_Criar pasta de pesquisa a partir da pesquisa..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1374
+msgid "Search F_olders"
+msgstr "P_astas de pesquisa"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1376
+msgid "Create or edit search folder definitions"
+msgstr "Cria ou editar as definiÃÃes da pasta de pesquisa"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1407
 msgid "_New Folder..."
 msgstr "_Nova pasta..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1381
+#: ../modules/mail/e-mail-shell-view-actions.c:1435
 msgid "Show Message _Preview"
 msgstr "Visualizar _mensagem"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1383
+#: ../modules/mail/e-mail-shell-view-actions.c:1437
 msgid "Show message preview pane"
 msgstr "Exibe o painel de prÃ-visualizaÃÃo de mensagem"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1389
+#: ../modules/mail/e-mail-shell-view-actions.c:1443
 msgid "Show _Deleted Messages"
 msgstr "Mostrar mensagens e_xcluÃdas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1391
+#: ../modules/mail/e-mail-shell-view-actions.c:1445
 msgid "Show deleted messages with a line through them"
 msgstr "Mostra as mensagens excluÃdas com um risco sobre elas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1397
+#: ../modules/mail/e-mail-shell-view-actions.c:1451
 msgid "_Group By Threads"
 msgstr "Agrupar por _discussÃo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1399
+#: ../modules/mail/e-mail-shell-view-actions.c:1453
 msgid "Threaded message list"
 msgstr "Organiza a lista de mensagens por discussÃes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1420
+#: ../modules/mail/e-mail-shell-view-actions.c:1474
 msgid "Show message preview below the message list"
 msgstr "Visualiza a mensagem abaixo da lista de mensagens"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1427
+#: ../modules/mail/e-mail-shell-view-actions.c:1481
 msgid "Show message preview alongside the message list"
 msgstr "Exibe a prÃ-visualizaÃÃo de mensagem ao lado da lista de mensagens"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1435
+#: ../modules/mail/e-mail-shell-view-actions.c:1489
 msgid "All Messages"
 msgstr "Todas as mensagens"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1442
+#: ../modules/mail/e-mail-shell-view-actions.c:1496
 msgid "Important Messages"
 msgstr "Mensagens importantes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1449
+#: ../modules/mail/e-mail-shell-view-actions.c:1503
 msgid "Last 5 Days' Messages"
 msgstr "Mensagens dos Ãltimos cinco dias"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1456
+#: ../modules/mail/e-mail-shell-view-actions.c:1510
 msgid "Messages Not Junk"
 msgstr "Mensagens nÃo spam"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1463
+#: ../modules/mail/e-mail-shell-view-actions.c:1517
 msgid "Messages with Attachments"
 msgstr "Mensagens com anexo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1470
+#: ../modules/mail/e-mail-shell-view-actions.c:1524
 msgid "No Label"
 msgstr "Sem rÃtulo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1477
+#: ../modules/mail/e-mail-shell-view-actions.c:1531
 msgid "Read Messages"
 msgstr "Mensagens lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1484
+#: ../modules/mail/e-mail-shell-view-actions.c:1538
 msgid "Recent Messages"
 msgstr "Mensagens recentes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1491
+#: ../modules/mail/e-mail-shell-view-actions.c:1545
 msgid "Unread Messages"
 msgstr "Mensagem nÃo lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1543
+#: ../modules/mail/e-mail-shell-view-actions.c:1597
 msgid "Subject or Addresses contain"
 msgstr "Assunto ou endereÃos contÃm"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1553
+#: ../modules/mail/e-mail-shell-view-actions.c:1607
 msgid "All Accounts"
 msgstr "Todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1560
+#: ../modules/mail/e-mail-shell-view-actions.c:1614
 msgid "Current Account"
 msgstr "Conta atual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1567
+#: ../modules/mail/e-mail-shell-view-actions.c:1621
 msgid "Current Folder"
 msgstr "Pasta atual"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1049
+#: ../modules/mail/e-mail-shell-view.c:563
+msgid "All Account Search"
+msgstr "Pesquisa em todas as contas"
+
+#: ../modules/mail/e-mail-shell-view.c:736
+msgid "Account Search"
+msgstr "Pesquisa na conta"
+
+#: ../modules/mail/e-mail-shell-view.c:958
+msgid "Proxy _Logout"
+msgstr "_Logout de representante"
+
+#: ../modules/mail/e-mail-shell-view-private.c:997
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d selecionada, "
 msgstr[1] "%d selecionadas, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1060
+#: ../modules/mail/e-mail-shell-view-private.c:1008
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d excluÃda"
 msgstr[1] "%d excluÃdas"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1066
-#: ../modules/mail/e-mail-shell-view-private.c:1073
+#: ../modules/mail/e-mail-shell-view-private.c:1014
+#: ../modules/mail/e-mail-shell-view-private.c:1021
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d spam"
 msgstr[1] "%d spams"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1079
+#: ../modules/mail/e-mail-shell-view-private.c:1027
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d rascunho"
 msgstr[1] "%d rascunhos"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1085
+#: ../modules/mail/e-mail-shell-view-private.c:1033
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d nÃo enviada"
 msgstr[1] "%d nÃo enviadas"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1091
+#: ../modules/mail/e-mail-shell-view-private.c:1039
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d enviada"
 msgstr[1] "%d enviadas"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1103
+#: ../modules/mail/e-mail-shell-view-private.c:1051
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d nÃo lida, "
 msgstr[1] "%d nÃo lidas, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1106
+#: ../modules/mail/e-mail-shell-view-private.c:1054
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d total"
 msgstr[1] "%d total"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1126
-#| msgid "Task"
+#: ../modules/mail/e-mail-shell-view-private.c:1074
 msgid "Trash"
 msgstr "Lixeira"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1600
-#| msgid "Send / _Receive"
+#: ../modules/mail/e-mail-shell-view-private.c:1542
 msgid "Send / Receive"
 msgstr "Enviar/receber"
 
-#: ../modules/mail/e-mail-shell-view.c:563
-msgid "All Account Search"
-msgstr "Pesquisa em todas as contas"
-
-#: ../modules/mail/e-mail-shell-view.c:746
-msgid "Account Search"
-msgstr "Pesquisa na conta"
-
-#: ../modules/mail/e-mail-shell-view.c:951
-msgid "Proxy _Logout"
-msgstr "_Logout de representante"
-
-#: ../modules/mail/em-account-prefs.c:215
-msgid "Evolution Account Assistant"
-msgstr "Assistente de contas do Evolution"
-
-#: ../modules/mail/em-account-prefs.c:264
-msgid "Account Editor"
-msgstr "Editor de contas"
-
-#: ../modules/mail/em-composer-prefs.c:502
-#: ../modules/plugin-manager/evolution-plugin-manager.c:356
-#: ../plugins/publish-calendar/publish-calendar.c:831
-#: ../widgets/misc/e-account-tree-view.c:220
+#: ../modules/mail/em-composer-prefs.c:495
+#: ../modules/plugin-manager/evolution-plugin-manager.c:361
+#: ../plugins/publish-calendar/publish-calendar.c:857
+#: ../widgets/misc/e-account-tree-view.c:224
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: ../modules/mail/em-composer-prefs.c:506
+#: ../modules/mail/em-composer-prefs.c:499
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
-#: ../modules/mail/em-mailer-prefs.c:89
+#: ../modules/mail/em-mailer-prefs.c:91
 msgid "Every time"
 msgstr "Toda vez"
 
-#: ../modules/mail/em-mailer-prefs.c:90
+#: ../modules/mail/em-mailer-prefs.c:92
 msgid "Once per day"
 msgstr "Uma vez por dia"
 
-#: ../modules/mail/em-mailer-prefs.c:91
+#: ../modules/mail/em-mailer-prefs.c:93
 msgid "Once per week"
 msgstr "Uma vez por semana"
 
-#: ../modules/mail/em-mailer-prefs.c:92
+#: ../modules/mail/em-mailer-prefs.c:94
 msgid "Once per month"
 msgstr "Uma vez por mÃs"
 
-#: ../modules/mail/em-mailer-prefs.c:174
-msgid "Add Custom Junk Header"
-msgstr "Adicionar cabeÃalho personalizado de spam"
-
-#: ../modules/mail/em-mailer-prefs.c:182
-msgid "Header Name:"
-msgstr "Nome do cabeÃalho:"
-
-#: ../modules/mail/em-mailer-prefs.c:183
-msgid "Header Value Contains:"
-msgstr "Valor do cabeÃalho contÃm:"
-
-#: ../modules/mail/em-mailer-prefs.c:283
+#: ../modules/mail/em-mailer-prefs.c:293
 msgid "Header"
 msgstr "CabeÃalho"
 
-#: ../modules/mail/em-mailer-prefs.c:287
+#: ../modules/mail/em-mailer-prefs.c:297
 msgid "Contains Value"
 msgstr "ContÃm valor"
 
-#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:693 ../modules/mail/em-mailer-prefs.c:766
-#, c-format
-msgid "%s plugin is available and the binary is installed."
-msgstr "O plug-in %s està disponÃvel e o binÃrio està instalado."
-
-#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:701 ../modules/mail/em-mailer-prefs.c:775
-#, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
-msgstr ""
-"O plug-in %s nÃo esta disponÃvel. Por favor, verifique se o pacote esta "
-"instalado."
-
-#: ../modules/mail/em-mailer-prefs.c:739
-msgid "No junk plugin available"
-msgstr "NÃo hà plug-in de Spam disponÃvel"
-
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1142
+#: ../modules/mail/em-mailer-prefs.c:1051
 msgid "_Date header:"
 msgstr "_Data do cabeÃalho:"
 
-#: ../modules/mail/em-mailer-prefs.c:1143
+#: ../modules/mail/em-mailer-prefs.c:1052
 msgid "Show _original header value"
 msgstr "Mostrar o valor _original do cabeÃalho"
 
@@ -16098,7 +16058,7 @@ msgstr ""
 "Toda fez que o Evolution inicia, verificar se ele à o aplicativo de correio "
 "padrÃo."
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:143
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
 msgid "Do you want to make Evolution your default email client?"
 msgstr "Vocà deseja tornar o Evolution seu cliente padrÃo de e-mail?"
 
@@ -16107,19 +16067,16 @@ msgid "Click 'Work Online' to return to online mode."
 msgstr "Clique em \"Trabalhar desconectado\" para retornar ao modo online."
 
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
-#| msgid "Evolution is currently offline because the network is unavailable."
 msgid "Evolution is currently offline due to a network outage."
 msgstr ""
 "O Evolution està atualmente desconectado pelo fato da rede nÃo estar "
 "disponÃvel."
 
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
-#| msgid "Put Evolution into offline mode"
 msgid "Evolution is currently offline."
 msgstr "O Evolution està atualmente desconectado."
 
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
-#| msgid "Evolution is currently offline because the network is unavailable."
 msgid ""
 "Evolution will return to online mode once a network connection is "
 "established."
@@ -16127,35 +16084,62 @@ msgstr ""
 "O Evolution irà retornar para o modo online assim que a conexÃo da rede "
 "estiver estabelecida."
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:67
+#: ../modules/online-accounts/camel-sasl-xoauth.c:374
+msgid ""
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain an authentication token."
+msgstr ""
+"NÃo à possÃvel localizar uma conta correspondente ao serviÃo de org.gnome."
+"OnlineAccounts do qual deseja obter um token de autenticaÃÃo."
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:461
+msgid "OAuth"
+msgstr "OAuth"
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:463
+msgid ""
+"This option will connect to the server by way of the GNOME Online Accounts "
+"service"
+msgstr ""
+"Esta opÃÃo irà se conectar ao servidor do serviÃo de contas on-line do GNOME"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:70
 msgid "Author(s)"
 msgstr "Autor(es)"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:251
+#: ../modules/plugin-manager/evolution-plugin-manager.c:256
 msgid "Plugin Manager"
 msgstr "Gerenciador de plug-in"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:266
+#: ../modules/plugin-manager/evolution-plugin-manager.c:271
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Nota: Algumas mudanÃas somente terÃo efeito apÃs o prÃximo reinÃcio"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:295
+#: ../modules/plugin-manager/evolution-plugin-manager.c:300
 msgid "Overview"
 msgstr "VisÃo geral"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:364
-#: ../modules/plugin-manager/evolution-plugin-manager.c:447
+#: ../modules/plugin-manager/evolution-plugin-manager.c:369
+#: ../modules/plugin-manager/evolution-plugin-manager.c:452
 msgid "Plugin"
 msgstr "Plug-in"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:485
+#: ../modules/plugin-manager/evolution-plugin-manager.c:490
 msgid "_Plugins"
 msgstr "_Plug-ins"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:486
+#: ../modules/plugin-manager/evolution-plugin-manager.c:491
 msgid "Enable and disable plugins"
 msgstr "Habilita e desabilita plug-ins"
 
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Plug-in de teste Python"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Plug-in de teste para carregador Python EPlugin."
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Olà Python"
@@ -16164,47 +16148,96 @@ msgstr "Olà Python"
 msgid "Python Plugin Loader tests"
 msgstr "Testes de carregador de plug-in Python"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
-msgstr "Plug-in de teste Python"
+#: ../modules/spamassassin/evolution-spamassassin.c:191
+#, c-format
+msgid "Failed to spawn SpamAssassin (%s): "
+msgstr "NÃo conseguiu gerar SpamAssassin (%s):"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:214
+msgid "Failed to stream mail message content to SpamAssassin: "
+msgstr ""
+"NÃo conseguiu transmitir conteÃdo de mensagem de correio para SpamAssassin:"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:233
+#, c-format
+msgid "Failed to write '%s' to SpamAssassin: "
+msgstr "Falha ao gravar \"%s\" para o SpamAssassin:"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:261
+msgid "Failed to read output from SpamAssassin: "
+msgstr "Falha ao ler a saÃda do SpamAssassin:"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:316
+msgid "SpamAssassin either crashed or failed to process a mail message"
+msgstr ""
+"SpamAssassin, parou de funcionar ou nÃo conseguiu processar uma mensagem de "
+"correio"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:835
+msgid "SpamAssassin Options"
+msgstr "OpÃÃes do SpamAssassin"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:850
+msgid "I_nclude remote tests"
+msgstr "I_ncluir testes remotos"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:864
+msgid "This will make SpamAssassin more reliable, but slower."
+msgstr "Isto tornarà o SpamAssassin mais confiÃvel, mas mais lento."
+
+#: ../modules/spamassassin/evolution-spamassassin.c:1073
+msgid "SpamAssassin"
+msgstr "SpamAssassin"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
+msgid "Use SpamAssassin daemon and client"
+msgstr "Usar o daemon e cliente do SpamAssassin"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+msgstr "Usa o daemon e cliente do SpamAssassin (spamc/spamd)."
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
+msgid "Use only local spam tests."
+msgstr "Usar apenas testes de SPAM locais."
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
-msgstr "Plug-in de teste para carregador Python EPlugin."
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
+msgid "Use only the local spam tests (no DNS)."
+msgstr "Usa apenas os testes de SPAM locais (sem DNS)."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:277
-#: ../widgets/misc/e-import-assistant.c:392
+#: ../modules/startup-wizard/evolution-startup-wizard.c:280
+#: ../widgets/misc/e-import-assistant.c:396
 msgid "Please select the information that you would like to import:"
 msgstr "Por favor, selecione a informaÃÃo que vocà deseja importar:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:309
-#: ../widgets/misc/e-import-assistant.c:548
+#: ../modules/startup-wizard/evolution-startup-wizard.c:312
+#: ../widgets/misc/e-import-assistant.c:552
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:320
-#: ../modules/startup-wizard/evolution-startup-wizard.c:417
+#: ../modules/startup-wizard/evolution-startup-wizard.c:323
+#: ../modules/startup-wizard/evolution-startup-wizard.c:421
 msgid "Importing Files"
 msgstr "Importando arquivos"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:395
+#: ../modules/startup-wizard/evolution-startup-wizard.c:399
 msgid "Import cancelled. Click \"Forward\" to continue."
 msgstr "ImportaÃÃo cancelada. Clique em \"Encaminhar\" para continuar."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:413
+#: ../modules/startup-wizard/evolution-startup-wizard.c:417
 msgid "Import complete. Click \"Forward\" to continue."
 msgstr "ImportaÃÃo completa. Clique em \"Encaminhar\" para continuar."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:487
+#: ../modules/startup-wizard/evolution-startup-wizard.c:497
 msgid "Evolution Setup Assistant"
 msgstr "Assistente de configuraÃÃo do Evolution"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:493
+#: ../modules/startup-wizard/evolution-startup-wizard.c:503
 msgid "Welcome"
 msgstr "Bem-vindo"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:498
+#: ../modules/startup-wizard/evolution-startup-wizard.c:508
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -16216,6 +16249,10 @@ msgstr ""
 "\n"
 "Por favor, clique no botÃo \"AvanÃar\" para continuar. "
 
+#: ../modules/startup-wizard/evolution-startup-wizard.c:613
+msgid "Loading accounts..."
+msgstr "Carregando contas..."
+
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Add local address books to Evolution."
 msgstr "Adicionar catÃlogos de endereÃos locais ao Evolution."
@@ -16232,13 +16269,12 @@ msgstr ""
 "Lista de indÃcios para o plug-in de lembrete de anexo procurar no corpo da "
 "mensagem"
 
-#. Check buttons
-#: ../plugins/attachment-reminder/attachment-reminder.c:117
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "_NÃo mostrar esta mensagem novamente."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:451
-#: ../plugins/templates/templates.c:411
+#: ../plugins/attachment-reminder/attachment-reminder.c:464
+#: ../plugins/templates/templates.c:462
 msgid "Keywords"
 msgstr "Palavras-chave"
 
@@ -16255,7 +16291,7 @@ msgid "Message has no attachments"
 msgstr "Mensagem nÃo possui anexos"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
-msgid "_Add attachment..."
+msgid "_Add Attachment..."
 msgstr "_Adicionar anexo..."
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
@@ -16278,23 +16314,23 @@ msgstr "Ãudio embutido"
 msgid "Play audio attachments directly in mail messages."
 msgstr "Reproduz anexos de Ãudio diretamente nas mensagens de correiro."
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:192
 msgid "Select name of the Evolution backup file"
 msgstr "Selecione o nome do arquivo de backup do Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:216
+#: ../plugins/backup-restore/backup-restore.c:225
 msgid "_Restart Evolution after backup"
 msgstr "_Reiniciar o Evolution apÃs o backup"
 
-#: ../plugins/backup-restore/backup-restore.c:242
+#: ../plugins/backup-restore/backup-restore.c:251
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Selecione o nome do arquivo de backup do Evolution para restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:255
+#: ../plugins/backup-restore/backup-restore.c:264
 msgid "_Restart Evolution after restore"
 msgstr "_Reiniciar o Evolution apÃs a restauraÃÃo"
 
-#: ../plugins/backup-restore/backup-restore.c:323
+#: ../plugins/backup-restore/backup-restore.c:337
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
@@ -16305,159 +16341,149 @@ msgstr ""
 "serÃo restauradas todas as suas configuraÃÃes pessoais, filtros de e-mail, "
 "etc."
 
-#: ../plugins/backup-restore/backup-restore.c:330
+#: ../plugins/backup-restore/backup-restore.c:344
 msgid "_Restore Evolution from the backup file"
 msgstr "_Restaurar o Evolution a partir do arquivo de backup"
 
-#: ../plugins/backup-restore/backup-restore.c:337
+#: ../plugins/backup-restore/backup-restore.c:351
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Selecione o arquivo de backup do Evolution para restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:340
+#: ../plugins/backup-restore/backup-restore.c:354
 msgid "Choose a file to restore"
 msgstr "Escolher um arquivo para restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:348
+#: ../plugins/backup-restore/backup-restore.c:362
 msgid "Restore from backup"
 msgstr "Restaurar a partir do backup"
 
-#: ../plugins/backup-restore/backup-restore.c:386
-#| msgid "Backing up Evolution Data"
+#: ../plugins/backup-restore/backup-restore.c:402
 msgid "_Back up Evolution Data..."
 msgstr "Fazer _backup dos dados do Evolution..."
 
-#: ../plugins/backup-restore/backup-restore.c:388
-#| msgid "Backup Evolution data and settings to an archive file"
+#: ../plugins/backup-restore/backup-restore.c:404
 msgid "Back up Evolution data and settings to an archive file"
 msgstr "Faz backup dos dados e configuraÃÃes do Evolution para um arquivo"
 
-#: ../plugins/backup-restore/backup-restore.c:393
-#| msgid "Restoring Evolution Data"
+#: ../plugins/backup-restore/backup-restore.c:409
 msgid "R_estore Evolution Data..."
 msgstr "R_estaurar dados do Evolution..."
 
-#: ../plugins/backup-restore/backup-restore.c:395
+#: ../plugins/backup-restore/backup-restore.c:411
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Restaura os dados configuraÃÃes do Evolution de um arquivo"
 
-#: ../plugins/backup-restore/backup.c:79
-#| msgid "Backup Evolution directory"
+#: ../plugins/backup-restore/backup.c:77
 msgid "Back up Evolution directory"
 msgstr "DiretÃrio de backup do Evolution"
 
-#: ../plugins/backup-restore/backup.c:81
+#: ../plugins/backup-restore/backup.c:79
 msgid "Restore Evolution directory"
 msgstr "Restaurar diretÃrio do Evolution"
 
-#: ../plugins/backup-restore/backup.c:83
-#| msgid "Check Evolution Backup"
+#: ../plugins/backup-restore/backup.c:81
 msgid "Check Evolution Back up"
 msgstr "Verificar o backup do Evolution"
 
-#: ../plugins/backup-restore/backup.c:85
+#: ../plugins/backup-restore/backup.c:83
 msgid "Restart Evolution"
 msgstr "Reiniciar o Evolution"
 
-#: ../plugins/backup-restore/backup.c:87
+#: ../plugins/backup-restore/backup.c:85
 msgid "With Graphical User Interface"
 msgstr "Com a interface grÃfica"
 
-#: ../plugins/backup-restore/backup.c:289
-#: ../plugins/backup-restore/backup.c:399
+#. FIXME Will the versioned setting always work?
+#: ../plugins/backup-restore/backup.c:299
+#: ../plugins/backup-restore/backup.c:418
 msgid "Shutting down Evolution"
 msgstr "Desligando o Evolution"
 
-#: ../plugins/backup-restore/backup.c:296
+#: ../plugins/backup-restore/backup.c:308
 msgid "Backing Evolution accounts and settings"
 msgstr "Fazendo backup das contas e configuraÃÃes do Evolution"
 
-#: ../plugins/backup-restore/backup.c:304
+#: ../plugins/backup-restore/backup.c:318
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Fazendo backup dos dados do Evolution (Mensagens, Contatos, Agenda, Tarefas, "
 "Memorandos)"
 
-#: ../plugins/backup-restore/backup.c:317
-#| msgid "Backup complete"
+#: ../plugins/backup-restore/backup.c:331
 msgid "Back up complete"
 msgstr "Backup concluÃdo"
 
-#: ../plugins/backup-restore/backup.c:322
-#: ../plugins/backup-restore/backup.c:496
+#: ../plugins/backup-restore/backup.c:338
+#: ../plugins/backup-restore/backup.c:527
 msgid "Restarting Evolution"
 msgstr "Reiniciando o Evolution"
 
-#: ../plugins/backup-restore/backup.c:403
+#: ../plugins/backup-restore/backup.c:424
 msgid "Back up current Evolution data"
 msgstr "Fazer backup dos dados atuais do Evolution"
 
-#: ../plugins/backup-restore/backup.c:409
-#| msgid "Extracting files from backup"
+#: ../plugins/backup-restore/backup.c:432
 msgid "Extracting files from back up"
 msgstr "Extraindo arquivos a partir do backup"
 
-#: ../plugins/backup-restore/backup.c:466
+#: ../plugins/backup-restore/backup.c:491
 msgid "Loading Evolution settings"
 msgstr "Carregando configuraÃÃes do Evolution"
 
-#: ../plugins/backup-restore/backup.c:481
-#| msgid "Removing temporary backup files"
+#: ../plugins/backup-restore/backup.c:508
 msgid "Removing temporary back up files"
 msgstr "Removendo arquivos de backup temporÃrio"
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:520
 msgid "Ensuring local sources"
 msgstr "Assegurando fontes locais"
 
-#: ../plugins/backup-restore/backup.c:678
+#: ../plugins/backup-restore/backup.c:707
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Fazendo Backup da pasta %s"
 
-#: ../plugins/backup-restore/backup.c:683
+#: ../plugins/backup-restore/backup.c:712
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Restaurando a partir da pasta %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:705
-#| msgid "Evolution Backup"
+#: ../plugins/backup-restore/backup.c:736
 msgid "Evolution Back up"
 msgstr "Backup do Evolution"
 
-#: ../plugins/backup-restore/backup.c:705
+#: ../plugins/backup-restore/backup.c:736
 msgid "Evolution Restore"
 msgstr "Restaurador do Evolution"
 
-#: ../plugins/backup-restore/backup.c:743
+#: ../plugins/backup-restore/backup.c:774
 msgid "Backing up Evolution Data"
 msgstr "Fazendo backup dos dados do Evolution"
 
-#: ../plugins/backup-restore/backup.c:744
+#: ../plugins/backup-restore/backup.c:775
 msgid "Please wait while Evolution is backing up your data."
-msgstr "Por favor aguarde enquanto o Evolution faz o backup dos seus dados."
+msgstr "Por favor, aguarde enquanto o Evolution faz o backup dos seus dados."
 
-#: ../plugins/backup-restore/backup.c:746
+#: ../plugins/backup-restore/backup.c:777
 msgid "Restoring Evolution Data"
 msgstr "Recuperando dados do Evolution"
 
-#: ../plugins/backup-restore/backup.c:747
+#: ../plugins/backup-restore/backup.c:778
 msgid "Please wait while Evolution is restoring your data."
-msgstr "Por favor aguarde enquanto o Evolution restaura os seus dados."
+msgstr "Por favor, aguarde enquanto o Evolution restaura os seus dados."
 
-#: ../plugins/backup-restore/backup.c:765
+#: ../plugins/backup-restore/backup.c:796
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 "Isto pode levar algum tempo dependendo da quantidade de dados na sua conta."
 
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
-#| msgid "Backup and Restore"
 msgid "Back up and Restore"
 msgstr "Backup e restauraÃÃo"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-#| msgid "Backup and restore your Evolution data and settings."
 msgid "Back up and restore your Evolution data and settings."
 msgstr "Fazer backup e restaurar seus dados e configuraÃÃes do Evolution."
 
@@ -16466,8 +16492,6 @@ msgid "Are you sure you want to close Evolution?"
 msgstr "Vocà tem certeza de que deseja fechar o Evolution?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-#| msgid ""
-#| "Are you sure you want to restore Evolution from the selected backup file?"
 msgid ""
 "Are you sure you want to restore Evolution from the selected back up file?"
 msgstr ""
@@ -16475,7 +16499,6 @@ msgstr ""
 "selecionado?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-#| msgid "Close and Backup Evolution"
 msgid "Close and Back up Evolution"
 msgstr "Fechar e fazer backup do Evolution"
 
@@ -16488,12 +16511,10 @@ msgid "Insufficient Permissions"
 msgstr "PermissÃes insuficientes"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
-#| msgid "Invalid Evolution backup file"
 msgid "Invalid Evolution back up file"
 msgstr "Arquivo de backup do Evolution invÃlido"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-#| msgid "Please select a valid backup file to restore."
 msgid "Please select a valid back up file to restore."
 msgstr "Por favor, selecione um arquivo de backup vÃlido para ser restaurado."
 
@@ -16502,9 +16523,6 @@ msgid "The selected folder is not writable."
 msgstr "A pasta selecionada nÃo permite escrita."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
-#| msgid ""
-#| "To backup your data and settings, you must first close Evolution. Please "
-#| "make sure that you save any unsaved data before proceeding."
 msgid ""
 "To back up your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding."
@@ -16514,11 +16532,6 @@ msgstr ""
 "de continuar."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
-#| msgid ""
-#| "To restore your data and settings, you must first close Evolution. Please "
-#| "make sure that you save any unsaved data before proceeding. This will "
-#| "delete all your current Evolution data and settings and restore them from "
-#| "your backup."
 msgid ""
 "To restore your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding. This will delete "
@@ -16530,37 +16543,37 @@ msgstr ""
 "continuar. Isto irà apagar todos os dados e configuraÃÃes atuais do "
 "Evolution e restaurÃ-las do seu backup."
 
-#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
+#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Contatos automÃticos"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:709
+#: ../plugins/bbdb/bbdb.c:710
 msgid "Create _address book entries when sending mails"
 msgstr "Cri_ar entradas no catÃlogo de endereÃos ao enviar mensagens"
 
-#: ../plugins/bbdb/bbdb.c:715
+#: ../plugins/bbdb/bbdb.c:716
 msgid "Select Address book for Automatic Contacts"
 msgstr "Selecionar catÃlogo de endereÃos para contatos automÃticos"
 
-#: ../plugins/bbdb/bbdb.c:730
+#: ../plugins/bbdb/bbdb.c:731
 msgid "Instant Messaging Contacts"
 msgstr "Contatos de mensagem instantÃnea"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:745
+#: ../plugins/bbdb/bbdb.c:746
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 "_Sincronizar as informaÃÃes e as imagens dos contatos da lista de amigos do "
 "Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:751
+#: ../plugins/bbdb/bbdb.c:752
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Selecionar catÃlogo de endereÃos da lista de amigos do Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:762
+#: ../plugins/bbdb/bbdb.c:763
 msgid "Synchronize with _buddy list now"
 msgstr "Sincronizar com minha lista de ami_gos agora"
 
@@ -16582,69 +16595,15 @@ msgstr ""
 "e-mail quando vocà responde mensagens. TambÃm preenche informaÃÃes de "
 "contato de mensageiros instantÃneos a partir de suas listas de amigos."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:163
-#, c-format
-msgid "Bogofilter is not available. Please install it first."
-msgstr "O Bogofilter nÃo està disponÃvel. Por favor, instale-o primeiro."
-
-#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:167
-#, c-format
-msgid "Error occurred while spawning %s: %s."
-msgstr "Ocorreu um erro ao criar %s: %s."
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:196
-#, c-format
-msgid "Bogofilter child process does not respond, killing..."
-msgstr "Processo filho de Bogofilter nÃo responde, matando..."
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:198
-#, c-format
-msgid "Wait for Bogofilter child process interrupted, terminating..."
-msgstr "Espera pelo processo filho de Bogofilter interrompida, terminando..."
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:221
-#, c-format
-msgid "Pipe to Bogofilter failed, error code: %d."
-msgstr "O pipe para Bogofilter falhou, cÃdigo de erro: %d."
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:406
-msgid "Convert message text to _Unicode"
-msgstr "Converter mensagem de texto para _Unicode"
-
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
-msgid "Convert mail messages to Unicode"
-msgstr "Converter mensagem para Unicode"
-
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
-msgid ""
-"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
-"different character sets."
-msgstr ""
-"Converter a mensagem de texto para Unicode UTF-8 para unificar os tokens "
-"spam/ham oriundos de diferentes conjuntos de caracteres."
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-msgid "Bogofilter Junk Filter"
-msgstr "Filtro de spam Bogofilter"
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-msgid "Bogofilter Options"
-msgstr "OpÃÃes do Bogofilter"
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
-msgid "Filter junk messages using Bogofilter."
-msgstr "Filtra mensagens de spam usando o Bogofilter."
-
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:214
 msgid "Authentication failed. Server requires correct login."
 msgstr "A autenticaÃÃo falhou. O servidor solicitou o login correto."
 
-#: ../plugins/caldav/caldav-browse-server.c:206
+#: ../plugins/caldav/caldav-browse-server.c:216
 msgid "Given URL cannot be found."
 msgstr "A URL dada nÃo pÃde ser encontrada."
 
-#: ../plugins/caldav/caldav-browse-server.c:210
+#: ../plugins/caldav/caldav-browse-server.c:220
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -16653,119 +16612,119 @@ msgstr ""
 "O servidor retornou dados inesperados.\n"
 "%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:340
-#: ../plugins/caldav/caldav-browse-server.c:664
+#: ../plugins/caldav/caldav-browse-server.c:360
+#: ../plugins/caldav/caldav-browse-server.c:694
 msgid "Failed to parse server response."
 msgstr "Falha ao analisar a resposta do servidor."
 
-#: ../plugins/caldav/caldav-browse-server.c:434
+#: ../plugins/caldav/caldav-browse-server.c:454
 msgid "Events"
 msgstr "Eventos"
 
-#: ../plugins/caldav/caldav-browse-server.c:456
+#: ../plugins/caldav/caldav-browse-server.c:476
 msgid "User's calendars"
 msgstr "CalendÃrios do usuÃrio"
 
-#: ../plugins/caldav/caldav-browse-server.c:565
-#: ../plugins/caldav/caldav-browse-server.c:733
+#: ../plugins/caldav/caldav-browse-server.c:588
+#: ../plugins/caldav/caldav-browse-server.c:763
 msgid "Failed to get server URL."
 msgstr "Falha ao obter a URL do servidor."
 
-#: ../plugins/caldav/caldav-browse-server.c:731
-#: ../plugins/caldav/caldav-browse-server.c:772
-#: ../plugins/caldav/caldav-browse-server.c:1431
+#: ../plugins/caldav/caldav-browse-server.c:761
+#: ../plugins/caldav/caldav-browse-server.c:802
+#: ../plugins/caldav/caldav-browse-server.c:1493
 msgid "Searching for user's calendars..."
 msgstr "Pesquisando por calendÃrios do usuÃrio..."
 
-#: ../plugins/caldav/caldav-browse-server.c:770
+#: ../plugins/caldav/caldav-browse-server.c:800
 msgid "Could not find any user calendar."
 msgstr "NÃo à possÃvel localizar nenhum calendÃrio do usuÃrio"
 
-#: ../plugins/caldav/caldav-browse-server.c:902
+#: ../plugins/caldav/caldav-browse-server.c:938
 #, c-format
 msgid "Previous attempt failed: %s"
 msgstr "A tentativa anterior falhou: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:904
+#: ../plugins/caldav/caldav-browse-server.c:940
 #, c-format
 msgid "Previous attempt failed with code %d"
 msgstr "A tentativa anterior falhou com cÃdigo %d"
 
-#: ../plugins/caldav/caldav-browse-server.c:909
+#: ../plugins/caldav/caldav-browse-server.c:945
 #, c-format
 msgid "Enter password for user %s on server %s"
 msgstr "Digite a senha para o usuÃrio %s no servidor %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:968
+#: ../plugins/caldav/caldav-browse-server.c:1008
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr "NÃo à possÃvel criar conjunto de mensagens para URL \"%s\""
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1214
+#: ../plugins/caldav/caldav-browse-server.c:1266
 msgid "Searching folder content..."
 msgstr "Pesquisando conteÃdo da pasta..."
 
-#: ../plugins/caldav/caldav-browse-server.c:1263
-#: ../plugins/caldav/caldav-source.c:256
+#: ../plugins/caldav/caldav-browse-server.c:1325
+#: ../plugins/caldav/caldav-source.c:261
 msgid "Server _handles meeting invitations"
 msgstr "ManipulaÃÃo de con_vites de encontros do servidor"
 
-#: ../plugins/caldav/caldav-browse-server.c:1270
+#: ../plugins/caldav/caldav-browse-server.c:1332
 msgid "List of available calendars:"
 msgstr "Lista de calendÃrios disponÃveis"
 
-#: ../plugins/caldav/caldav-browse-server.c:1308
+#: ../plugins/caldav/caldav-browse-server.c:1370
 msgid "Supports"
 msgstr "Fornecedores"
 
-#: ../plugins/caldav/caldav-browse-server.c:1335
-#: ../plugins/caldav/caldav-source.c:254
-#| msgid "New email"
-msgid "User e-_mail:"
+#: ../plugins/caldav/caldav-browse-server.c:1397
+#: ../plugins/caldav/caldav-source.c:259
+msgid "User e_mail:"
 msgstr "E-mai_l do usuÃrio:"
 
-#: ../plugins/caldav/caldav-browse-server.c:1407
+#: ../plugins/caldav/caldav-browse-server.c:1469
 #, c-format
 msgid "Failed to create thread: %s"
 msgstr "Falha ao criar discussÃo: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1516
+#: ../plugins/caldav/caldav-browse-server.c:1585
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
 msgstr "A URL do servidor \"%s\" nÃo à uma URL vÃlida"
 
-#: ../plugins/caldav/caldav-browse-server.c:1522
+#: ../plugins/caldav/caldav-browse-server.c:1591
 msgid "Browse for a CalDAV calendar"
 msgstr "Navegar por um calendÃrio CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:235
-#: ../plugins/calendar-http/calendar-http.c:100
+#: ../plugins/caldav/caldav-source.c:240
+#: ../plugins/calendar-http/calendar-http.c:107
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:242
-#: ../plugins/google-account-setup/google-contacts-source.c:349
-msgid "Use _SSL"
-msgstr "Usar _SSL"
+#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/calendar-http/calendar-http.c:145
+#: ../plugins/google-account-setup/google-contacts-source.c:359
+msgid "Use _secure connection"
+msgstr "Usar conexÃo _segura"
 
-#: ../plugins/caldav/caldav-source.c:244
-#: ../plugins/google-account-setup/google-contacts-source.c:327
-#: ../plugins/google-account-setup/google-source.c:638
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:268
+#: ../plugins/caldav/caldav-source.c:249
+#: ../plugins/google-account-setup/google-contacts-source.c:337
+#: ../plugins/google-account-setup/google-source.c:669
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:269
 msgid "User_name:"
 msgstr "_Nome do usuÃrio:"
 
-#: ../plugins/caldav/caldav-source.c:259
+#: ../plugins/caldav/caldav-source.c:264
 msgid "Brows_e server for a calendar"
 msgstr "Navega_r no servidor por um calendÃrio"
 
-#: ../plugins/caldav/caldav-source.c:277
-#: ../plugins/calendar-file/calendar-file.c:191
-#: ../plugins/calendar-http/calendar-http.c:119
-#: ../plugins/calendar-weather/calendar-weather.c:399
-#: ../plugins/google-account-setup/google-contacts-source.c:367
-#: ../plugins/google-account-setup/google-source.c:645
+#: ../plugins/caldav/caldav-source.c:282
+#: ../plugins/calendar-file/calendar-file.c:204
+#: ../plugins/calendar-http/calendar-http.c:129
+#: ../plugins/calendar-weather/calendar-weather.c:421
+#: ../plugins/google-account-setup/google-contacts-source.c:377
+#: ../plugins/google-account-setup/google-source.c:675
 msgid "Re_fresh:"
 msgstr "Atuali_zar:"
 
@@ -16777,31 +16736,31 @@ msgstr "Adicionar suporte para CalDAV ao Evolution."
 msgid "CalDAV Support"
 msgstr "Suporte para CalDAV"
 
-#: ../plugins/calendar-file/calendar-file.c:125
+#: ../plugins/calendar-file/calendar-file.c:134
 msgid "_Customize options"
 msgstr "_Personalizar opÃÃes"
 
-#: ../plugins/calendar-file/calendar-file.c:144
+#: ../plugins/calendar-file/calendar-file.c:153
 msgid "File _name:"
 msgstr "_Nome do arquivo:"
 
-#: ../plugins/calendar-file/calendar-file.c:148
+#: ../plugins/calendar-file/calendar-file.c:157
 msgid "Choose calendar file"
 msgstr "Escolher um arquivo de calendÃrio"
 
-#: ../plugins/calendar-file/calendar-file.c:196
+#: ../plugins/calendar-file/calendar-file.c:209
 msgid "On open"
 msgstr "Ao abrir"
 
-#: ../plugins/calendar-file/calendar-file.c:197
+#: ../plugins/calendar-file/calendar-file.c:210
 msgid "On file change"
 msgstr "Quando o arquivo for modificado"
 
-#: ../plugins/calendar-file/calendar-file.c:198
+#: ../plugins/calendar-file/calendar-file.c:211
 msgid "Periodically"
 msgstr "Periodicamente"
 
-#: ../plugins/calendar-file/calendar-file.c:213
+#: ../plugins/calendar-file/calendar-file.c:228
 msgid "Force read _only"
 msgstr "F_orÃar somente leitura"
 
@@ -16813,11 +16772,7 @@ msgstr "Adicionar calendÃrios locais ao Evolution."
 msgid "Local Calendars"
 msgstr "Agendas locais"
 
-#: ../plugins/calendar-http/calendar-http.c:134
-msgid "_Secure connection"
-msgstr "ConexÃo _segura"
-
-#: ../plugins/calendar-http/calendar-http.c:194
+#: ../plugins/calendar-http/calendar-http.c:207
 msgid "Userna_me:"
 msgstr "No_me do usuÃrio:"
 
@@ -16829,62 +16784,62 @@ msgstr "Adicionar calendÃrios web ao Evolution."
 msgid "Web Calendars"
 msgstr "CalendÃrios web"
 
-#: ../plugins/calendar-weather/calendar-weather.c:60
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Fog"
 msgstr "Clima: neblina"
 
-#: ../plugins/calendar-weather/calendar-weather.c:61
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Cloudy"
 msgstr "Clima: nublado"
 
-#: ../plugins/calendar-weather/calendar-weather.c:62
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Cloudy Night"
 msgstr "Clima: noite nublada"
 
-#: ../plugins/calendar-weather/calendar-weather.c:63
+#: ../plugins/calendar-weather/calendar-weather.c:68
 msgid "Weather: Overcast"
 msgstr "Clima: muito escuro"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Showers"
 msgstr "Clima: pancadas de chuva"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:70
 msgid "Weather: Snow"
 msgstr "Clima: neve"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:71
 msgid "Weather: Sunny"
 msgstr "Clima: ensolarado"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:72
 msgid "Weather: Clear Night"
 msgstr "Clima: noite clara"
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
+#: ../plugins/calendar-weather/calendar-weather.c:73
 msgid "Weather: Thunderstorms"
 msgstr "Clima: trovoadas"
 
-#: ../plugins/calendar-weather/calendar-weather.c:226
+#: ../plugins/calendar-weather/calendar-weather.c:239
 msgid "Select a location"
 msgstr "Selecionar um local"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:332
-#: ../plugins/calendar-weather/calendar-weather.c:377
+#: ../plugins/calendar-weather/calendar-weather.c:350
+#: ../plugins/calendar-weather/calendar-weather.c:398
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "Nenhum"
 
-#: ../plugins/calendar-weather/calendar-weather.c:452
+#: ../plugins/calendar-weather/calendar-weather.c:477
 msgid "_Units:"
 msgstr "_Unidades:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:461
+#: ../plugins/calendar-weather/calendar-weather.c:486
 msgid "Metric (Celsius, cm, etc)"
 msgstr "MÃtrico (Celsius, cm, etc)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:464
+#: ../plugins/calendar-weather/calendar-weather.c:489
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imperial (Fahrenheit, polegadas, etc)"
 
@@ -16896,24 +16851,7 @@ msgstr "Adicionar calendÃrios metereolÃgicos ao Evolution."
 msgid "Weather Calendars"
 msgstr "Agendas de clima"
 
-#: ../plugins/contacts-map/contacts-map.c:55
-#: ../plugins/contacts-map/contacts-map.c:201
-msgid "Contacts map"
-msgstr "Mapa de contatos:"
-
-#: ../plugins/contacts-map/contacts-map.c:56
-msgid "Show a map of all the contacts"
-msgstr "Mostrar um mapa de todos os contatos"
-
-#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
-msgid "Add a map showing the location of contacts when possible."
-msgstr "Adiciona um mapa mostrando a localizaÃÃo dos contatos quando possÃvel"
-
-#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
-msgid "Map for contacts"
-msgstr "Mapa para contatos"
-
-#: ../plugins/dbx-import/dbx-importer.c:258
+#: ../plugins/dbx-import/dbx-importer.c:284
 msgid "Importing Outlook Express data"
 msgstr "Importando dados do Outlook Express"
 
@@ -16929,23 +16867,23 @@ msgstr "Importador de arquivos DBX do Outlook"
 msgid "Outlook Express 5/6 personal folders (.dbx)"
 msgstr "Pasta pessoal do Outlook Express 5/6 (.dbx)"
 
-#: ../plugins/default-source/default-source.c:83
+#: ../plugins/default-source/default-source.c:168
 msgid "Mark as _default address book"
 msgstr "Marcar como catÃlogo de endereÃos pa_drÃo"
 
-#: ../plugins/default-source/default-source.c:96
+#: ../plugins/default-source/default-source.c:182
 msgid "A_utocomplete with this address book"
 msgstr "Complet_ar automaticamente com este catÃlogo de endereÃos"
 
-#: ../plugins/default-source/default-source.c:105
+#: ../plugins/default-source/default-source.c:191
 msgid "Mark as _default calendar"
 msgstr "_Marcar como calendÃrio padrÃo"
 
-#: ../plugins/default-source/default-source.c:106
+#: ../plugins/default-source/default-source.c:192
 msgid "Mark as _default task list"
 msgstr "_Marcar como lista de tarefas padrÃo"
 
-#: ../plugins/default-source/default-source.c:107
+#: ../plugins/default-source/default-source.c:193
 msgid "Mark as _default memo list"
 msgstr "_Marcar como lista de memorandos padrÃo"
 
@@ -16972,59 +16910,52 @@ msgstr ""
 "valor de cabeÃalho Ã: Nome do cabeÃalho personalizado seguido por \"=\" e os "
 "valores separados por \";\""
 
-#: ../plugins/email-custom-header/email-custom-header.c:316
-#| msgid "Security:"
+#: ../plugins/email-custom-header/email-custom-header.c:322
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "SeguranÃa:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:320
-#| msgid "Personal"
+#: ../plugins/email-custom-header/email-custom-header.c:326
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "Pessoal"
 
-#: ../plugins/email-custom-header/email-custom-header.c:321
-#| msgid "Unclassified"
+#: ../plugins/email-custom-header/email-custom-header.c:327
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "Sem classificaÃÃo"
 
-#: ../plugins/email-custom-header/email-custom-header.c:322
-#| msgid "Protected"
+#: ../plugins/email-custom-header/email-custom-header.c:328
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "Protegido"
 
-#: ../plugins/email-custom-header/email-custom-header.c:323
-#| msgid "Confidential"
+#: ../plugins/email-custom-header/email-custom-header.c:329
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: ../plugins/email-custom-header/email-custom-header.c:324
-#| msgid "Secret"
+#: ../plugins/email-custom-header/email-custom-header.c:330
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "Secreto"
 
-#: ../plugins/email-custom-header/email-custom-header.c:325
-#| msgid "Top secret"
+#: ../plugins/email-custom-header/email-custom-header.c:331
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "Altamente secreto"
 
-#: ../plugins/email-custom-header/email-custom-header.c:382
+#: ../plugins/email-custom-header/email-custom-header.c:388
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "Nenhum"
 
-#: ../plugins/email-custom-header/email-custom-header.c:574
+#: ../plugins/email-custom-header/email-custom-header.c:584
 msgid "_Custom Header"
 msgstr "_CabeÃalho personalizado"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:833
+#: ../plugins/email-custom-header/email-custom-header.c:847
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -17033,12 +16964,12 @@ msgstr ""
 "Ã:\n"
 "O nome dos valores de chave de cabeÃalho personalizado separados por \";\"."
 
-#: ../plugins/email-custom-header/email-custom-header.c:887
+#: ../plugins/email-custom-header/email-custom-header.c:901
 msgid "Key"
 msgstr "Chave"
 
-#: ../plugins/email-custom-header/email-custom-header.c:903
-#: ../plugins/templates/templates.c:417
+#: ../plugins/email-custom-header/email-custom-header.c:917
+#: ../plugins/templates/templates.c:468
 msgid "Values"
 msgstr "Valores"
 
@@ -17062,7 +16993,7 @@ msgstr ""
 "compositor de mensagens"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:125
+#: ../plugins/external-editor/external-editor.c:132
 msgid "Automatically launch when a new mail is edited"
 msgstr "Iniciar automaticamente quando uma nova mensagem for editada"
 
@@ -17074,11 +17005,11 @@ msgstr "Editor externo padrÃo"
 msgid "The default command that must be used as the editor."
 msgstr "O comando padrÃo que deve ser usado como o editor."
 
-#: ../plugins/external-editor/external-editor.c:114
+#: ../plugins/external-editor/external-editor.c:121
 msgid "Command to be executed to launch the editor: "
 msgstr "Comando a ser executado para lanÃar o editor: "
 
-#: ../plugins/external-editor/external-editor.c:115
+#: ../plugins/external-editor/external-editor.c:122
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -17086,8 +17017,8 @@ msgstr ""
 "Para Emacs use \"xemacs\"\n"
 "Para VI use \"gvim -f\""
 
-#: ../plugins/external-editor/external-editor.c:381
-#: ../plugins/external-editor/external-editor.c:383
+#: ../plugins/external-editor/external-editor.c:402
+#: ../plugins/external-editor/external-editor.c:404
 msgid "Compose in External Editor"
 msgstr "Compor no editor externo"
 
@@ -17147,545 +17078,95 @@ msgstr ""
 "Inserir imagem da face para mensagens de saÃda por padrÃo. A foto deve ser "
 "definida antes de definir esta configuraÃÃo, ou entÃo nada irà acontecer."
 
-#: ../plugins/face/face.c:286
-#| msgid "Select a File"
+#: ../plugins/face/face.c:292
 msgid "Select a Face Picture"
 msgstr "Selecionar uma imagem de face"
 
-#: ../plugins/face/face.c:296
+#: ../plugins/face/face.c:302
 msgid "Image files"
 msgstr "Arquivos de imagem"
 
-#: ../plugins/face/face.c:352
+#: ../plugins/face/face.c:359
 msgid "_Insert Face picture by default"
-msgstr "Inserir imagem da face por padrÃo"
-
-#: ../plugins/face/face.c:363
-msgid "Load new _Face picture"
-msgstr "Carregar nova imagem da _face"
-
-#: ../plugins/face/face.c:420
-msgid "Include _Face"
-msgstr "Incluir _face"
-
-#: ../plugins/face/org-gnome-face.eplug.xml.h:1
-msgid "Attach a small picture of your face to outgoing messages."
-msgstr "Anexa uma pequena imagem da sua face nas mensagens de saÃda."
-
-#: ../plugins/face/org-gnome-face.error.xml.h:1
-msgid "Failed Read"
-msgstr "Falhou ao ler"
-
-#: ../plugins/face/org-gnome-face.error.xml.h:2
-msgid "Invalid Image Size"
-msgstr "Tamanho da imagem invÃlido"
-
-#: ../plugins/face/org-gnome-face.error.xml.h:3
-msgid "Not an image"
-msgstr "NÃo à uma imagem"
-
-#: ../plugins/face/org-gnome-face.error.xml.h:4
-msgid "Please select an image of size 48 * 48"
-msgstr "Por favor, selecione uma imagem do tamanho 48 * 48"
-
-#: ../plugins/face/org-gnome-face.error.xml.h:5
-msgid "The file cannot be read"
-msgstr "O arquivo nÃo pÃde ser lido"
-
-#: ../plugins/face/org-gnome-face.error.xml.h:6
-msgid "The file you selected does not look like a valid .png image. Error: {0}"
-msgstr "O arquivo selecionado nÃo parece ser uma imagem .png vÃlida. Erro: {0}"
-
-#: ../plugins/google-account-setup/google-contacts-source.c:315
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:244
-msgid "Server"
-msgstr "Servidor"
-
-#: ../plugins/google-account-setup/google-source.c:438
-#, c-format
-msgid "Enter password for user %s to access list of subscribed calendars."
-msgstr ""
-"Digite a senha do usuÃrio %s para acessar a lista de agendas assinadas."
-
-#: ../plugins/google-account-setup/google-source.c:549
-#, c-format
-msgid ""
-"Cannot read data from Google server.\n"
-"%s"
-msgstr ""
-"NÃo foi possÃvel ler dados do servidor Google.\n"
-"%s"
-
-#: ../plugins/google-account-setup/google-source.c:549
-#: ../plugins/mail-to-task/mail-to-task.c:736
-#: ../plugins/mail-to-task/mail-to-task.c:955
-msgid "Unknown error."
-msgstr "Erro desconhecido."
-
-#: ../plugins/google-account-setup/google-source.c:649
-msgid "Cal_endar:"
-msgstr "Agen_da:"
-
-#: ../plugins/google-account-setup/google-source.c:684
-msgid "Retrieve _List"
-msgstr "Recuperar _lista"
-
-#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "Add Google Calendars to Evolution."
-msgstr "Adicionar calendÃrios Google ao Evolution."
-
-#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
-msgid "Google Calendars"
-msgstr "CalendÃrios Google"
-
-#: ../plugins/groupwise-features/camel-gw-listener.c:447
-msgid "Checklist"
-msgstr "Lista de tarefas"
-
-#. Translators: First %s is the server name, second %s is user name
-#: ../plugins/groupwise-features/camel-gw-listener.c:507
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "Digite a senha para %s (usuÃrio %s)"
-
-#: ../plugins/groupwise-features/camel-gw-listener.c:527
-msgid "Failed to authenticate.\n"
-msgstr "Falha ao autenticar.\n"
-
-#: ../plugins/groupwise-features/gw-ui.c:112
-msgid "New _Shared Folder..."
-msgstr "_Nova pasta compartilhada..."
-
-#: ../plugins/groupwise-features/gw-ui.c:119
-msgid "_Proxy Login..."
-msgstr "Login de _representante..."
-
-#: ../plugins/groupwise-features/gw-ui.c:170
-msgid "Junk Mail Settings..."
-msgstr "ConfiguraÃÃes de spam..."
-
-#: ../plugins/groupwise-features/gw-ui.c:177
-msgid "Track Message Status..."
-msgstr "Rastrear status da mensagem..."
-
-#: ../plugins/groupwise-features/gw-ui.c:183
-msgid "Retract Mail"
-msgstr "Cancelar envio"
-
-#: ../plugins/groupwise-features/gw-ui.c:331
-msgid "Accept"
-msgstr "Aceitar"
-
-#: ../plugins/groupwise-features/gw-ui.c:338
-msgid "Accept Tentatively"
-msgstr "Aceitar peliminarmente"
-
-#: ../plugins/groupwise-features/gw-ui.c:345
-msgid "Decline"
-msgstr "Recusar"
-
-#: ../plugins/groupwise-features/gw-ui.c:352
-msgid "Rese_nd Meeting..."
-msgstr "E_nviar novamente reuniÃo..."
-
-#: ../plugins/groupwise-features/install-shared.c:178
-#: ../plugins/groupwise-features/share-folder-common.c:353
-msgid "Create folder"
-msgstr "Criar pasta"
-
-#: ../plugins/groupwise-features/install-shared.c:230
-#, c-format
-msgid ""
-"The user '%s' has shared a folder with you\n"
-"\n"
-"Message from '%s'\n"
-"\n"
-"\n"
-"%s\n"
-"\n"
-"\n"
-"Click 'Apply' to install the shared folder\n"
-"\n"
-msgstr ""
-"O usuÃrio \"%s\" compartilhou uma pasta com vocÃ\n"
-"\n"
-"Mensagem de \"%s\"\n"
-"\n"
-"\n"
-"%s\n"
-"\n"
-"\n"
-"Clique em \"Aplicar\" para instalar a pasta compartilhada\n"
-"\n"
-
-#: ../plugins/groupwise-features/install-shared.c:242
-msgid "Install the shared folder"
-msgstr "Renomear a pasta partilhada"
-
-#: ../plugins/groupwise-features/install-shared.c:246
-msgid "Shared Folder Installation"
-msgstr "InstalaÃÃo de pasta compartilhada"
-
-#: ../plugins/groupwise-features/junk-mail-settings.c:82
-msgid "Junk Settings"
-msgstr "ConfiguraÃÃes de spam"
-
-#: ../plugins/groupwise-features/junk-mail-settings.c:96
-#: ../plugins/groupwise-features/junk-settings.ui.h:3
-msgid "Junk Mail Settings"
-msgstr "ConfiguraÃÃes de spam"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:1
-msgid "Email:"
-msgstr "E-mail:"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:2
-msgid "Junk List:"
-msgstr "Lista de spams:"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:6
-msgid "_Enable"
-msgstr "_Habilitar"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:7
-msgid "_Junk List"
-msgstr "Lista de spa_ms"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:8
-#: ../plugins/groupwise-features/properties.ui.h:12
-#: ../widgets/table/e-table-config.ui.h:21
-msgid "_Remove"
-msgstr "_Remover"
-
-#: ../plugins/groupwise-features/mail-retract.c:81
-msgid "Message Retract"
-msgstr "Cancelar envio"
-
-#: ../plugins/groupwise-features/mail-retract.c:90
-msgid ""
-"Retracting a message may remove it from the recipient's mailbox. Are you "
-"sure you want to do this?"
-msgstr ""
-"Cancelar o envio de uma mensagem pode removÃ-la da caixa de correio do "
-"destinatÃrio. Vocà tem certeza que quer fazer isso?"
-
-#: ../plugins/groupwise-features/mail-retract.c:111
-msgid "Message retracted successfully"
-msgstr "Envio cancelado com sucesso"
-
-#: ../plugins/groupwise-features/mail-send-options.c:202
-msgid "Insert Send options"
-msgstr "Inserir opÃÃes de envio"
-
-#: ../plugins/groupwise-features/notification.ui.h:3
-#: ../plugins/groupwise-features/properties.ui.h:6
-msgid "The participants will receive the following notification.\n"
-msgstr "Os participantes receberÃo a seguinte notificaÃÃo.\n"
-
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
-msgid "Add Send Options to GroupWise messages"
-msgstr "Adicionar opÃÃes de envio para mensagens GroupWise"
-
-#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "Fine-tune your GroupWise accounts."
-msgstr "Ajustar suas contas GroupWise."
-
-#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-msgid "GroupWise Features"
-msgstr "Recursos do GroupWise"
-
-#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:1
-msgid "Message retract failed"
-msgstr "Falha ao retirar a mensagem"
-
-#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:2
-msgid "The server did not allow the selected message to be retracted."
-msgstr "O servidor nÃo permitiu que a mensagem selecionada fosse retirada."
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
-msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr ""
-"A conta &quot;{0}&quot; jà existe. Por favor verifique a sua Ãrvore de "
-"pastas."
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
-msgid "Account Already Exists"
-msgstr "A conta jà existe"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
-msgid "Invalid user"
-msgstr "UsuÃrio invÃlido"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
-msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
-"address and try again."
-msgstr ""
-"O login de representante como &quot;{0}&quot; nÃo foi bem-sucedido. Por "
-"favor verifique o seu endereÃo de e-mail e teste novamente."
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
-msgid "Proxy access cannot be given to user &quot;{0}&quot;"
-msgstr ""
-"NÃo à possÃvel conceder acesso de representante ao usuÃrio &quot;{0}&quot;."
-
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2
-msgid "Specify User"
-msgstr "Especificar usuÃrio"
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:6
-msgid "You have already given proxy permissions to this user."
-msgstr "Vocà jà concedeu as permissÃes de representante a este usuÃrio."
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:8
-msgid "You have to specify a valid user name to give proxy rights."
-msgstr ""
-"Vocà tem que especificar um nome de usuÃrio vÃlido para conceder direitos de "
-"representante."
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
-msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
-msgstr "Vocà nÃo pode compartilhar pasta com o usuÃrio &quot;{0}&quot;"
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
-msgid "You have to specify a user name which you want to add to the list"
-msgstr "Vocà tem que especificar um nome de usuÃrio que quer adicionar à lista"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
-msgid "Do you want to resend the meeting?"
-msgstr "Vocà deseja enviar esta reuniÃo novamente?"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
-msgid "Do you want to resend the recurring meeting?"
-msgstr "Vocà deseja enviar esta reuniÃo recorrente novamente?"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
-msgid "Do you want to retract the original item?"
-msgstr "Vocà cancelar o item original?"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
-msgid "The original will be removed from the recipient's mailbox."
-msgstr "O original serà removido da caixa de correio do destinatÃrio."
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:5
-msgid "This is a recurring meeting"
-msgstr "Este à um evento recorrente"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
-msgid "This will create a new meeting using the existing meeting details."
-msgstr "Isto vai criar uma nova reuniÃo usando os detalhes da reuniÃo atual."
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
-msgid ""
-"This will create a new meeting with the existing meeting details. The "
-"recurrence rule needs to be re-entered."
-msgstr ""
-"Isto vai criar uma nova reuniÃo com os detalhes da reuniÃo atual. Ã "
-"necessÃrio digitar novamente a regra de recorrÃncia."
-
-#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
-msgid "Would you like to accept it?"
-msgstr "Vocà gostaria de aceitÃ-la?"
-
-#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:11
-msgid "Would you like to decline it?"
-msgstr "Vocà gostaria de recusÃ-la?"
-
-#: ../plugins/groupwise-features/properties.ui.h:1
-msgid "C_ustomize notification message"
-msgstr "_Personalizar a mensagem de notificaÃÃo"
-
-#: ../plugins/groupwise-features/properties.ui.h:2
-msgid "Con_tacts..."
-msgstr "Con_tatos..."
-
-#: ../plugins/groupwise-features/properties.ui.h:4
-msgid "Shared Folder Notification"
-msgstr "NotificaÃÃo de pasta compartilhada"
-
-#: ../plugins/groupwise-features/properties.ui.h:8
-msgid "Users:"
-msgstr "UsuÃrios:"
-
-#: ../plugins/groupwise-features/properties.ui.h:11
-msgid "_Not Shared"
-msgstr "_NÃo compartilhada"
-
-#: ../plugins/groupwise-features/properties.ui.h:13
-msgid "_Shared With..."
-msgstr "_Compartilhada com..."
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
-msgid "Access Rights"
-msgstr "Direitos de acesso"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:2
-msgid "Add/Edit"
-msgstr "Adicionar/Editar"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:4
-msgid "Con_tacts"
-msgstr "Con_tatos"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:6
-msgid "Modify _folders/options/rules/"
-msgstr "Modificar _pastas/opÃÃes/regras/"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:8
-msgid "Read items marked _private"
-msgstr "Ler itens marcados _particular"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:9
-msgid "Reminder Notes"
-msgstr "Notas de lembrete"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:10
-msgid "Subscribe to my _alarms"
-msgstr "Assinar meus _alarmes"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:11
-msgid "Subscribe to my _notifications"
-msgstr "Assinar minhas _notificaÃÃes"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:13
-msgid "_Write"
-msgstr "_Escrever"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:14
-msgid "permission to read|_Read"
-msgstr "_Lida"
-
-#: ../plugins/groupwise-features/proxy-listing.ui.h:1
-msgid "Proxy"
-msgstr "Representante"
-
-#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-#: ../widgets/misc/e-account-tree-view.c:239
-msgid "Account Name"
-msgstr "Nome da conta"
-
-#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
-msgid "Proxy Login"
-msgstr "Login de representante"
-
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:251
-#: ../plugins/groupwise-features/proxy.c:494
-#: ../plugins/groupwise-features/send-options.c:84
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sDigite a senha para %s (usuÃrio %s)"
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
-msgid "The Proxy tab will be available only when the account is online."
-msgstr ""
-"A aba Representante estarà disponÃvel somente quando a conta estiver "
-"conectada."
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:704
-msgid "The Proxy tab will be available only when the account is enabled."
-msgstr ""
-"A aba Representante estarà disponÃvel somente quando a conta estiver "
-"habilitada."
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:709
-msgctxt "GW"
-msgid "Proxy"
-msgstr "Proxy"
-
-#: ../plugins/groupwise-features/proxy.c:935
-#: ../plugins/groupwise-features/share-folder.c:694
-msgid "Add User"
-msgstr "Adicionar usuÃrio"
-
-#: ../plugins/groupwise-features/send-options.c:214
-msgid "Advanced send options"
-msgstr "OpÃÃes avanÃadas de envio"
-
-#: ../plugins/groupwise-features/share-folder-common.c:316
-#: ../plugins/groupwise-features/share-folder.c:729
-msgid "Users"
-msgstr "UsuÃrios"
+msgstr "Inserir imagem da face por padrÃo"
 
-#: ../plugins/groupwise-features/share-folder-common.c:317
-msgid "Enter the users and set permissions"
-msgstr "Digite os usuÃrios e defina as permissÃes"
+#: ../plugins/face/face.c:370
+msgid "Load new _Face picture"
+msgstr "Carregar nova imagem da _face"
 
-#: ../plugins/groupwise-features/share-folder-common.c:418
-msgid "Sharing"
-msgstr "Compartilhamento"
+#: ../plugins/face/face.c:429
+msgid "Include _Face"
+msgstr "Incluir _face"
 
-#: ../plugins/groupwise-features/share-folder.c:532
-msgid "Custom Notification"
-msgstr "NotificaÃÃo personalizada"
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+msgid "Attach a small picture of your face to outgoing messages."
+msgstr "Anexa uma pequena imagem da sua face nas mensagens de saÃda."
 
-#: ../plugins/groupwise-features/share-folder.c:734
-msgid "Add   "
-msgstr "Adicionar   "
+#: ../plugins/face/org-gnome-face.error.xml.h:1
+msgid "Failed Read"
+msgstr "Falhou ao ler"
 
-#: ../plugins/groupwise-features/share-folder.c:740
-msgid "Modify"
-msgstr "Modificar"
+#: ../plugins/face/org-gnome-face.error.xml.h:2
+msgid "Invalid Image Size"
+msgstr "Tamanho da imagem invÃlido"
 
-#: ../plugins/groupwise-features/status-track.c:125
-msgid "Message Status"
-msgstr "Status da mensagem"
+#: ../plugins/face/org-gnome-face.error.xml.h:3
+msgid "Not an image"
+msgstr "NÃo à uma imagem"
 
-#. Subject
-#: ../plugins/groupwise-features/status-track.c:139
-msgid "Subject:"
-msgstr "Assunto:"
+#: ../plugins/face/org-gnome-face.error.xml.h:4
+msgid "Please select an image of size 48 * 48"
+msgstr "Por favor, selecione uma imagem do tamanho 48 * 48"
 
-#: ../plugins/groupwise-features/status-track.c:153
-msgid "From:"
-msgstr "De:"
+#: ../plugins/face/org-gnome-face.error.xml.h:5
+msgid "The file cannot be read"
+msgstr "O arquivo nÃo pÃde ser lido"
 
-#: ../plugins/groupwise-features/status-track.c:168
-msgid "Creation date:"
-msgstr "Data de criaÃÃo:"
+#: ../plugins/face/org-gnome-face.error.xml.h:6
+msgid "The file you selected does not look like a valid .png image. Error: {0}"
+msgstr "O arquivo selecionado nÃo parece ser uma imagem .png vÃlida. Erro: {0}"
 
-#: ../plugins/groupwise-features/status-track.c:208
-msgid "Recipient: "
-msgstr "DestinatÃrio: "
+#: ../plugins/google-account-setup/google-contacts-source.c:325
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
+msgid "Server"
+msgstr "Servidor"
 
-#: ../plugins/groupwise-features/status-track.c:215
-msgid "Delivered: "
-msgstr "Entregue: "
+#: ../plugins/google-account-setup/google-source.c:459
+#, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr ""
+"Digite a senha do usuÃrio %s para acessar a lista de agendas assinadas."
 
-#: ../plugins/groupwise-features/status-track.c:221
-msgid "Opened: "
-msgstr "Aberto: "
+#: ../plugins/google-account-setup/google-source.c:576
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+"NÃo foi possÃvel ler dados do servidor Google.\n"
+"%s"
 
-#: ../plugins/groupwise-features/status-track.c:226
-msgid "Accepted: "
-msgstr "Aceito: "
+#: ../plugins/google-account-setup/google-source.c:576
+#: ../plugins/mail-to-task/mail-to-task.c:813
+#: ../plugins/mail-to-task/mail-to-task.c:1077
+msgid "Unknown error."
+msgstr "Erro desconhecido."
 
-#: ../plugins/groupwise-features/status-track.c:231
-msgid "Deleted: "
-msgstr "ExcluÃda: "
+#: ../plugins/google-account-setup/google-source.c:679
+msgid "Cal_endar:"
+msgstr "Agen_da:"
 
-#: ../plugins/groupwise-features/status-track.c:236
-msgid "Declined: "
-msgstr "Recusado: "
+#: ../plugins/google-account-setup/google-source.c:714
+msgid "Retrieve _List"
+msgstr "Recuperar _lista"
 
-#: ../plugins/groupwise-features/status-track.c:241
-msgid "Completed: "
-msgstr "Completada: "
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
+msgid "Add Google Calendars to Evolution."
+msgstr "Adicionar calendÃrios Google ao Evolution."
 
-#: ../plugins/groupwise-features/status-track.c:246
-msgid "Undelivered: "
-msgstr "NÃo entregue: "
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
+msgid "Google Calendars"
+msgstr "CalendÃrios Google"
 
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
@@ -17695,12 +17176,12 @@ msgstr "Imagem embutida"
 msgid "View image attachments directly in mail messages."
 msgstr "Ver anexos de imagem diretamente nas mensagens de correiro."
 
-#: ../plugins/imap-features/imap-headers.c:329
+#: ../plugins/imap-features/imap-headers.c:337
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "CabeÃalhos personalizados"
 
-#: ../plugins/imap-features/imap-headers.c:342
+#: ../plugins/imap-features/imap-headers.c:349
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "CabeÃalhos IMAP"
@@ -17730,10 +17211,10 @@ msgstr ""
 
 #: ../plugins/imap-features/imap-headers.ui.h:8
 msgid ""
-"_Basic Headers - (Fastest) \n"
+"_Basic Headers (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
 msgstr ""
-"_CabeÃalhos BÃsicos (Mais RÃpido)\n"
+"_CabeÃalhos bÃsicos (mais rÃpido) \n"
 "Use isso se vocà nÃo tem filtros baseados em listas de discussÃo"
 
 #: ../plugins/imap-features/imap-headers.ui.h:10
@@ -17749,18 +17230,18 @@ msgid "IMAP Features"
 msgstr "Funcionalidade do IMAP"
 
 #. Translators: The first '%s' is replaced with a calendar name,
-#. the second '%s' with an error message
-#: ../plugins/itip-formatter/itip-formatter.c:485
+#. * the second '%s' with an error message
+#: ../plugins/itip-formatter/itip-formatter.c:499
 #, c-format
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "Falhou ao carregar o calendÃrio \"%s\" (%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:654
+#: ../plugins/itip-formatter/itip-formatter.c:659
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Um compromisso na agenda \"%s\" està em conflito com esta reuniÃo"
 
-#: ../plugins/itip-formatter/itip-formatter.c:690
+#: ../plugins/itip-formatter/itip-formatter.c:683
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Localizado o compromisso na agenda \"%s\""
@@ -17782,134 +17263,134 @@ msgid "Unable to find this memo in any memo list"
 msgstr ""
 "NÃo foi possÃvel localizar este memorando em nenhuma lista de memorandos"
 
-#: ../plugins/itip-formatter/itip-formatter.c:880
-msgid "Opening the calendar. Please wait.."
-msgstr "Abrindo o calendÃrio. Favor aguardar..."
+#: ../plugins/itip-formatter/itip-formatter.c:1082
+msgid "Opening the calendar. Please wait..."
+msgstr "Abrindo o calendÃrio. Aguarde..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:883
+#: ../plugins/itip-formatter/itip-formatter.c:1085
 msgid "Searching for an existing version of this appointment"
 msgstr "Pesquisando por uma versÃo existente deste compromisso"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1166
+#: ../plugins/itip-formatter/itip-formatter.c:1362
 msgid "Unable to parse item"
 msgstr "NÃo foi possÃvel analisar item"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1255
+#: ../plugins/itip-formatter/itip-formatter.c:1451
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "NÃo foi possÃvel enviar item para a agenda \"%s\". %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1267
+#: ../plugins/itip-formatter/itip-formatter.c:1463
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Enviado para agenda \"%s\" como aceito"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1467
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviado para a agenda \"%s\" como tentativa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1472
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviado para a agenda \"%s\" como recusado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1477
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Enviado para a agenda \"%s\" como cancelado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1579
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "O organizador removeu o representante %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1382
+#: ../plugins/itip-formatter/itip-formatter.c:1586
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Enviar uma notificaÃÃo de cancelamento para o representante"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1588
 msgid "Could not send the cancelation notice to the delegate"
 msgstr ""
 "NÃo foi possÃvel enviar a notificaÃÃo de cancelamento para o representante"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1495
+#: ../plugins/itip-formatter/itip-formatter.c:1700
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "NÃo foi possÃvel atualizar o status do participante porque o status à "
 "invÃlido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1524
+#: ../plugins/itip-formatter/itip-formatter.c:1729
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "NÃo à possÃvel atualizar participante. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1528
+#: ../plugins/itip-formatter/itip-formatter.c:1733
 msgid "Attendee status updated"
 msgstr "Status do participante atualizado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1532
+#: ../plugins/itip-formatter/itip-formatter.c:1737
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "NÃo foi possÃvel atualizar o status do participante porque o item nÃo existe "
 "mais"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1554
+#: ../plugins/itip-formatter/itip-formatter.c:1759
 msgid "Meeting information sent"
 msgstr "InformaÃÃo de reuniÃo enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1557
+#: ../plugins/itip-formatter/itip-formatter.c:1762
 msgid "Task information sent"
 msgstr "InformaÃÃo de tarefa enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1560
+#: ../plugins/itip-formatter/itip-formatter.c:1765
 msgid "Memo information sent"
 msgstr "InformaÃÃo do memorando enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1569
+#: ../plugins/itip-formatter/itip-formatter.c:1774
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "NÃo pode enviar a informaÃÃo de reuniÃo, essa reuniÃo nÃo existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1572
+#: ../plugins/itip-formatter/itip-formatter.c:1777
 msgid "Unable to send task information, the task does not exist"
 msgstr "NÃo foi possÃvel enviar esta tarefa, a tarefa nÃo existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1575
+#: ../plugins/itip-formatter/itip-formatter.c:1780
 msgid "Unable to send memo information, the memo does not exist"
 msgstr ""
 "NÃo foi possÃvel enviar a informaÃÃo do memorando, esse memorando nÃo existe"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1640
+#: ../plugins/itip-formatter/itip-formatter.c:1846
 msgid "calendar.ics"
 msgstr "calendario.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1645
+#: ../plugins/itip-formatter/itip-formatter.c:1851
 msgid "Save Calendar"
 msgstr "Salvar calendÃrio"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1703
-#: ../plugins/itip-formatter/itip-formatter.c:1714
+#: ../plugins/itip-formatter/itip-formatter.c:1914
+#: ../plugins/itip-formatter/itip-formatter.c:1925
 msgid "The calendar attached is not valid"
 msgstr "A agenda anexada nÃo à vÃlida"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1704
-#: ../plugins/itip-formatter/itip-formatter.c:1715
+#: ../plugins/itip-formatter/itip-formatter.c:1915
+#: ../plugins/itip-formatter/itip-formatter.c:1926
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr ""
 "A mensagem diz conter uma agenda, mas a agenda nÃo à um iCalendar vÃlido."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1755
-#: ../plugins/itip-formatter/itip-formatter.c:1783
-#: ../plugins/itip-formatter/itip-formatter.c:1892
+#: ../plugins/itip-formatter/itip-formatter.c:1966
+#: ../plugins/itip-formatter/itip-formatter.c:1994
+#: ../plugins/itip-formatter/itip-formatter.c:2103
 msgid "The item in the calendar is not valid"
 msgstr "O item na agenda nÃo à vÃlido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1756
-#: ../plugins/itip-formatter/itip-formatter.c:1784
-#: ../plugins/itip-formatter/itip-formatter.c:1893
+#: ../plugins/itip-formatter/itip-formatter.c:1967
+#: ../plugins/itip-formatter/itip-formatter.c:1995
+#: ../plugins/itip-formatter/itip-formatter.c:2104
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17917,11 +17398,11 @@ msgstr ""
 "A mensagem contÃm uma agenda, mas a agenda nÃo contÃm eventos, tarefas ou "
 "informaÃÃo de disponibilidade"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1797
+#: ../plugins/itip-formatter/itip-formatter.c:2008
 msgid "The calendar attached contains multiple items"
 msgstr "A agenda anexa contÃm mÃltiplos itens"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1798
+#: ../plugins/itip-formatter/itip-formatter.c:2009
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17929,81 +17410,85 @@ msgstr ""
 "Para processar todos estes itens, o arquivo deve ser salvo e a agenda "
 "importada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2460
+#: ../plugins/itip-formatter/itip-formatter.c:2672
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Nenhum"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2476
+#: ../plugins/itip-formatter/itip-formatter.c:2688
 msgid "Tentatively Accepted"
 msgstr "Aceito preliminarmente"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2594
+#: ../plugins/itip-formatter/itip-formatter.c:2806
 msgid "This meeting recurs"
 msgstr "Esta reuniÃo se repete"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2597
+#: ../plugins/itip-formatter/itip-formatter.c:2809
 msgid "This task recurs"
 msgstr "Esta tarefa se repete"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2600
+#: ../plugins/itip-formatter/itip-formatter.c:2812
 msgid "This memo recurs"
 msgstr "Este memorando se repete"
 
+#: ../plugins/itip-formatter/itip-formatter.c:3036
+msgid "Meeting Invitations"
+msgstr "Convites de reuniÃes"
+
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2834
+#: ../plugins/itip-formatter/itip-formatter.c:3061
 msgid "_Delete message after acting"
 msgstr "E_xcluir mensagem depois da aÃÃo"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2844
-#: ../plugins/itip-formatter/itip-formatter.c:2877
+#: ../plugins/itip-formatter/itip-formatter.c:3071
+#: ../plugins/itip-formatter/itip-formatter.c:3104
 msgid "Conflict Search"
 msgstr "Pesquisa de conflitos"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2859
+#: ../plugins/itip-formatter/itip-formatter.c:3086
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Selecione a agenda para pesquisar por conflitos de reuniÃo"
 
 #. strftime format of a time,
-#. in 24-hour format, without seconds.
+#. * in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "Hoje %H:%M"
 
 #. strftime format of a time,
-#. in 24-hour format.
+#. * in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "Hoje %H:%M:%S"
 
 #. strftime format of a time,
-#. in 12-hour format.
+#. * in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "Hoje %l:%M:%S"
 
 #. strftime format of a time,
-#. in 24-hour format, without seconds.
+#. * in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "Amanhà %H:%M"
 
 #. strftime format of a time,
-#. in 24-hour format.
+#. * in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "Amanhà %H:%M:%S"
 
 #. strftime format of a time,
-#. in 12-hour format, without seconds.
+#. * in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "Amanhà %l:%M"
 
 #. strftime format of a time,
-#. in 12-hour format.
+#. * in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Amanhà %l:%M:%S"
@@ -18015,56 +17500,56 @@ msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
-#. time, in 24-hour format, without seconds.
+#. * time, in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
-#. time, in 24-hour format.
+#. * time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
-#. time, in 12-hour format, without seconds.
+#. * time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M"
 
 #. strftime format of a weekday and a
-#. time, in 12-hour format.
+#. * time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S"
 
 #. strftime format of a weekday and a date
-#. without a year.
+#. * without a year.
 #: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A, %d de %B"
 
 #. strftime format of a weekday, a date
-#. without a year and a time,
-#. in 24-hour format, without seconds.
+#. * without a year and a time,
+#. * in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %d de %B, %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
-#. and a time, in 24-hour format.
+#. * and a time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %d de %B, %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
-#. and a time, in 12-hour format, without seconds.
+#. * and a time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %d de %B, %l:%M"
 
 #. strftime format of a weekday, a date without a year
-#. and a time, in 12-hour format.
+#. * and a time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %d de %B, %l:%M"
@@ -18075,87 +17560,87 @@ msgid "%A, %B %e, %Y"
 msgstr "%A, %d de %B de %Y"
 
 #. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
+#. * time, in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %d de %B de %Y, %H:%M"
 
 #. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
+#. * time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %d de %B de %Y, %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
+#. * time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %d de %B de %Y, %l:%M"
 
 #. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
+#. * time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %d de %B de %Y, %l:%M:%S"
 
-#: ../plugins/itip-formatter/itip-view.c:362
-#: ../plugins/itip-formatter/itip-view.c:363
-#: ../plugins/itip-formatter/itip-view.c:450
-#: ../plugins/itip-formatter/itip-view.c:451
-#: ../plugins/itip-formatter/itip-view.c:538
+#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:365
+#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:540
 msgid "An unknown person"
 msgstr "Uma pessoa desconhecida"
 
-#: ../plugins/itip-formatter/itip-view.c:367
-#: ../plugins/itip-formatter/itip-view.c:455
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Por favor, responda em nome de %s"
 
-#: ../plugins/itip-formatter/itip-view.c:369
-#: ../plugins/itip-formatter/itip-view.c:457
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:546
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Recebido em nome de %s"
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s publicou a seguinte informaÃÃo de reuniÃo atravÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s publicou a seguinte informaÃÃo de reuniÃo:"
 
-#: ../plugins/itip-formatter/itip-view.c:381
+#: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s delegou a seguinte reuniÃo para vocÃ:"
 
-#: ../plugins/itip-formatter/itip-view.c:384
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s solicita a sua presenÃa na seguinte reuniÃo atravÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s solicita a sua presenÃa na seguinte reuniÃo:"
 
-#: ../plugins/itip-formatter/itip-view.c:392
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s deseja adicionar a uma reuniÃo existente atravÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:396
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s deseja adicionar a uma reuniÃo existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -18164,87 +17649,87 @@ msgstr ""
 "%s deseja receber a informaÃÃo mais recente sobre a seguinte reuniÃo atravÃs "
 "de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:402
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s deseja receber a informaÃÃo mais recente sobre a seguinte reuniÃo:"
 
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s enviou a seguinte resposta de reuniÃo atravÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s enviou a seguinte resposta de reuniÃo:"
 
-#: ../plugins/itip-formatter/itip-view.c:410
+#: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
 msgid "%s through %s has canceled the following meeting:"
 msgstr "%s cancelou a seguinte reuniÃo atravÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:412
+#: ../plugins/itip-formatter/itip-view.c:414
 #, c-format
 msgid "%s has canceled the following meeting."
 msgstr "%s cancelou a seguinte reuniÃo."
 
-#: ../plugins/itip-formatter/itip-view.c:416
+#: ../plugins/itip-formatter/itip-view.c:418
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s propÃs as seguintes mudanÃas na reuniÃo atravÃs de %s."
 
-#: ../plugins/itip-formatter/itip-view.c:418
+#: ../plugins/itip-formatter/itip-view.c:420
 #, c-format
 msgid "%s has proposed the following meeting changes."
 msgstr "%s propÃs as seguintes mudanÃas na reuniÃo."
 
-#: ../plugins/itip-formatter/itip-view.c:422
+#: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s recusou as seguintes mudanÃas na reuniÃo atravÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:424
+#: ../plugins/itip-formatter/itip-view.c:426
 #, c-format
 msgid "%s has declined the following meeting changes."
 msgstr "%s recusou as seguintes mudanÃas na reuniÃo."
 
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s publicou a seguinte tarefa atravÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:466
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s publicou a seguinte tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:469
+#: ../plugins/itip-formatter/itip-view.c:471
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s solicita a atribuiÃÃo de %s para a seguinte tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:472
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s lhe atribuiu a tarefa atravÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s lhe atribuiu a tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:480
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s deseja adicionar a uma tarefa existente atravÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s deseja adicionar a uma tarefa existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -18253,197 +17738,197 @@ msgstr ""
 "%s deseja receber a informaÃÃo mais recente sobre a tarefa atribuÃda atravÃs "
 "de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
 msgstr "%s deseja receber a informaÃÃo mais recente sobre a tarefa atribuÃda:"
 
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr "%s atravÃs de %s enviou a seguinte resposta para tarefa atribuÃda:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:496
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s enviou a seguinte resposta para tarefa atribuÃda:"
 
-#: ../plugins/itip-formatter/itip-view.c:498
+#: ../plugins/itip-formatter/itip-view.c:500
 #, c-format
 msgid "%s through %s has canceled the following assigned task:"
 msgstr "%s cancelou a seguinte tarefa atribuÃda atravÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:500
+#: ../plugins/itip-formatter/itip-view.c:502
 #, c-format
 msgid "%s has canceled the following assigned task:"
 msgstr "%s cancelou a seguinte tarefa atribuÃda:"
 
-#: ../plugins/itip-formatter/itip-view.c:504
+#: ../plugins/itip-formatter/itip-view.c:506
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr ""
 "%s propÃs as seguintes mudanÃas de atribuiÃÃes de tarefas atravÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:506
+#: ../plugins/itip-formatter/itip-view.c:508
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s propÃs as seguintes mudanÃas de atribuiÃÃes de tarefas:"
 
-#: ../plugins/itip-formatter/itip-view.c:510
+#: ../plugins/itip-formatter/itip-view.c:512
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s recusou a seguinte tarefa atribuÃda atravÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:512
+#: ../plugins/itip-formatter/itip-view.c:514
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s recusou a seguinte tarefa atribuÃda:"
 
-#: ../plugins/itip-formatter/itip-view.c:549
+#: ../plugins/itip-formatter/itip-view.c:551
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s publicou o seguinte memorando atravÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:551
+#: ../plugins/itip-formatter/itip-view.c:553
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s publicou o seguinte memorando:"
 
-#: ../plugins/itip-formatter/itip-view.c:556
+#: ../plugins/itip-formatter/itip-view.c:558
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s deseja adicionar a um memorando existente atravÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:558
+#: ../plugins/itip-formatter/itip-view.c:560
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s deseja adicionar a um memorando existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:562
+#: ../plugins/itip-formatter/itip-view.c:564
 #, c-format
 msgid "%s through %s has canceled the following shared memo:"
 msgstr "%s cancelou o seguinte memorando compartilhado atravÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:564
+#: ../plugins/itip-formatter/itip-view.c:566
 #, c-format
 msgid "%s has canceled the following shared memo:"
 msgstr "%s cancelou a seguinte tarefa compartilhada"
 
-#: ../plugins/itip-formatter/itip-view.c:688
+#: ../plugins/itip-formatter/itip-view.c:690
 msgid "All day:"
 msgstr "Todo dia:"
 
-#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:700
 msgid "Start day:"
 msgstr "Dia de inÃcio:"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1054
+#: ../plugins/itip-formatter/itip-view.c:700
+#: ../plugins/itip-formatter/itip-view.c:1062
 msgid "Start time:"
 msgstr "Hora de inÃcio:"
 
-#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:712
 msgid "End day:"
 msgstr "Data final:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:710
-#: ../plugins/itip-formatter/itip-view.c:1065
+#: ../plugins/itip-formatter/itip-view.c:712
+#: ../plugins/itip-formatter/itip-view.c:1073
 msgid "End time:"
 msgstr "Hora de tÃrmino:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Open Calendar"
 msgstr "_Abrir agenda"
 
-#: ../plugins/itip-formatter/itip-view.c:849
-#: ../plugins/itip-formatter/itip-view.c:853
-#: ../plugins/itip-formatter/itip-view.c:859
-#: ../plugins/itip-formatter/itip-view.c:876
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:864
 #: ../plugins/itip-formatter/itip-view.c:881
+#: ../plugins/itip-formatter/itip-view.c:886
 msgid "_Decline"
 msgstr "_Recusar"
 
-#: ../plugins/itip-formatter/itip-view.c:850
 #: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:862
-#: ../plugins/itip-formatter/itip-view.c:878
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:867
 #: ../plugins/itip-formatter/itip-view.c:883
+#: ../plugins/itip-formatter/itip-view.c:888
 msgid "A_ccept"
 msgstr "A_ceitar"
 
-#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Decline all"
 msgstr "_Recusar tudo"
 
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Tentative all"
 msgstr "Tudo _preliminar"
 
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:860
-#: ../plugins/itip-formatter/itip-view.c:877
+#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:865
 #: ../plugins/itip-formatter/itip-view.c:882
+#: ../plugins/itip-formatter/itip-view.c:887
 msgid "_Tentative"
 msgstr "_Preliminar"
 
-#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:860
 msgid "A_ccept all"
 msgstr "A_ceitar tudo"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:866
+#: ../plugins/itip-formatter/itip-view.c:871
 msgid "_Send Information"
 msgstr "_Enviar informaÃÃo"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:875
 msgid "_Update Attendee Status"
 msgstr "_Atualizar status do participante"
 
-#: ../plugins/itip-formatter/itip-view.c:873
+#: ../plugins/itip-formatter/itip-view.c:878
 msgid "_Update"
 msgstr "_Atualizar"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1085
-#: ../plugins/itip-formatter/itip-view.c:1139
+#: ../plugins/itip-formatter/itip-view.c:1093
+#: ../plugins/itip-formatter/itip-view.c:1147
 msgid "Comment:"
 msgstr "ComentÃrio:"
 
-#: ../plugins/itip-formatter/itip-view.c:1124
+#: ../plugins/itip-formatter/itip-view.c:1132
 msgid "Send _reply to sender"
 msgstr "_Responder ao remetente"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "Send _updates to attendees"
 msgstr "Enviar atuali_zaÃÃes aos participantes"
 
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1171
 msgid "_Apply to all instances"
 msgstr "_Aplicar a todas as instÃncias"
 
-#: ../plugins/itip-formatter/itip-view.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1180
 msgid "Show time as _free"
 msgstr "Exi_bir hora como livre"
 
-#: ../plugins/itip-formatter/itip-view.c:1175
+#: ../plugins/itip-formatter/itip-view.c:1183
 msgid "_Preserve my reminder"
 msgstr "_Preservar meu lembrete"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1181
+#: ../plugins/itip-formatter/itip-view.c:1189
 msgid "_Inherit reminder"
 msgstr "_Herdar lembretes"
 
-#: ../plugins/itip-formatter/itip-view.c:1924
+#: ../plugins/itip-formatter/itip-view.c:1965
 msgid "_Tasks:"
 msgstr "_Tarefas:"
 
-#: ../plugins/itip-formatter/itip-view.c:1926
+#: ../plugins/itip-formatter/itip-view.c:1967
 msgid "_Memos:"
 msgstr "_Memorandos:"
 
@@ -18475,18 +17960,10 @@ msgid "Beep or play sound file."
 msgstr "Tocar um bip ou arquivo de som."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Enable D-Bus messages."
-msgstr "Habilitar mensagens D-Bus."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable icon in notification area."
 msgstr "Habilitar Ãcone na Ãrea de notificaÃÃo."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
-msgid "Generates a D-Bus message when new mail messages arrive."
-msgstr "Gera uma mensagem D-Bus quando uma nova mensagem chegar."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid ""
 "If \"true\", then beep, otherwise will play sound file when new messages "
 "arrive."
@@ -18494,57 +17971,49 @@ msgstr ""
 "Se \"true\", entÃo emitir alerta sonoro, do contrÃrio reproduzirà o arquivo "
 "de som quando novas mensagens chegarem."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
 msgid "Notify new messages for Inbox only."
 msgstr "Mensagem de notificaÃÃo apenas na Ca_ixa de Entrada."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
 msgid "Play sound when new messages arrive."
 msgstr "Tocar um som quando uma nova mensagem chegar."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
 msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr ""
 "Arquivo de som a ser tocado quando novas mensagens chegarem, do contrÃrio "
 "serà tocado um beep."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
-msgid "Popup message together with the icon."
-msgstr "Mensagem instantÃnea junto com Ãcone."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr ""
 "Mostrar uma Ãcone de novo e-mail na Ãrea de notificaÃÃo quando novas "
 "mensagens chegarem."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 msgid "Sound file name to be played."
 msgstr "Nome do arquivo de som a ser tocado."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr ""
 "Arquivo de som a ser tocado quando novas mensagens chegarem, do contrario "
 "serà tocado um beep."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Use sound theme"
 msgstr "Usar tema de som"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Whether play sound or beep when new messages arrive."
 msgstr "Tocar um som ou um beep quando novas mensagens chegarem."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
-msgid "Whether show message over the icon when new messages arrive."
-msgstr "Mostrar uma mensagem sobre o Ãcone quando uma nova mensagem chegar."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Para notificar novas mensagens apenas na caixa de entrada."
 
-#: ../plugins/mail-notification/mail-notification.c:390
+#: ../plugins/mail-notification/mail-notification.c:391
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18559,68 +18028,60 @@ msgstr[1] ""
 "Vocà recebeu %d novas mensagens\n"
 "em %s."
 
-#. Translators: "From:" is preceding a new mail
-#. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:402
-#, c-format
-msgid "From: %s"
-msgstr "De: %s"
-
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:415
+#: ../plugins/mail-notification/mail-notification.c:416
 #, c-format
 msgid "Subject: %s"
 msgstr "Assunto: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:425
+#: ../plugins/mail-notification/mail-notification.c:427
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Vocà recebeu %d nova mensagem."
 msgstr[1] "Vocà recebeu %d novas mensagens."
 
-#: ../plugins/mail-notification/mail-notification.c:438
-#: ../plugins/mail-notification/mail-notification.c:446
-#: ../plugins/mail-notification/mail-notification.c:449
+#: ../plugins/mail-notification/mail-notification.c:436
+#: ../plugins/mail-notification/mail-notification.c:444
+#: ../plugins/mail-notification/mail-notification.c:447
 msgid "New email"
 msgstr "Novo e-mail"
 
-#: ../plugins/mail-notification/mail-notification.c:498
-msgid "Show icon in _notification area"
-msgstr "Mostrar Ãcone na Ãrea de _notificaÃÃo"
-
-#: ../plugins/mail-notification/mail-notification.c:528
-msgid "Popup _message together with the icon"
-msgstr "_Mensagem flutuante junto com o Ãcone"
+#. Translators: The '%s' is a mail
+#. * folder name.  (e.g. "Show Inbox")
+#: ../plugins/mail-notification/mail-notification.c:468
+#, c-format
+msgid "Show %s"
+msgstr "Mostrar %s"
 
-#: ../plugins/mail-notification/mail-notification.c:715
-msgid "_Play sound when new messages arrive"
-msgstr "Tocar um arquivo de som quando uma nova mensa_gem chegar"
+#: ../plugins/mail-notification/mail-notification.c:673
+msgid "_Play sound when a new message arrives"
+msgstr "_Tocar som quando chegar uma nova mensagem"
 
-#: ../plugins/mail-notification/mail-notification.c:745
+#: ../plugins/mail-notification/mail-notification.c:703
 msgid "_Beep"
 msgstr "_Bip"
 
-#: ../plugins/mail-notification/mail-notification.c:758
+#: ../plugins/mail-notification/mail-notification.c:716
 msgid "Use sound _theme"
 msgstr "Usar _tema de som"
 
-#: ../plugins/mail-notification/mail-notification.c:777
+#: ../plugins/mail-notification/mail-notification.c:735
 msgid "Play _file:"
 msgstr "Reproduzir ar_quivo:"
 
-#: ../plugins/mail-notification/mail-notification.c:788
+#: ../plugins/mail-notification/mail-notification.c:744
 msgid "Select sound file"
 msgstr "Selecionar um arquivo de som"
 
-#: ../plugins/mail-notification/mail-notification.c:846
+#: ../plugins/mail-notification/mail-notification.c:801
 msgid "Notify new messages for _Inbox only"
 msgstr "Mensagem de notificaÃÃo apenas na Ca_ixa de Entrada"
 
-#: ../plugins/mail-notification/mail-notification.c:855
-msgid "Generate a _D-Bus message"
-msgstr "Gerar uma mensagem _D-Bus"
+#: ../plugins/mail-notification/mail-notification.c:811
+msgid "Show _notification when a new message arrives"
+msgstr "Mostrar _notificaÃÃo quando chegar uma nova mensagem"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
@@ -18631,12 +18092,12 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Notifica quando uma nova mensagem chega."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
-#: ../plugins/mail-to-task/mail-to-task.c:157
+#: ../plugins/mail-to-task/mail-to-task.c:238
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Criado por %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:489
+#: ../plugins/mail-to-task/mail-to-task.c:603
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -18645,7 +18106,7 @@ msgstr ""
 "O calendÃrio selecionado jà contÃm o evento \"%s\". Vocà gostaria de editÃ-"
 "lo?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:492
+#: ../plugins/mail-to-task/mail-to-task.c:606
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -18654,7 +18115,7 @@ msgstr ""
 "A lista de tarefas selecionada jà contÃm a tarefa \"%s\". Vocà gostaria de "
 "editÃ-la?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:495
+#: ../plugins/mail-to-task/mail-to-task.c:609
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18663,109 +18124,56 @@ msgstr ""
 "A lista de memorandos selecionada jà contÃm o memorando \"%s\". Vocà "
 "gostaria de editÃ-lo?"
 
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:515
+#: ../plugins/mail-to-task/mail-to-task.c:626
+#, c-format
 msgid ""
-"Selected calendar contains some events for the given mails already. Would "
-"you like to create new events anyway?"
+"You have selected %d mails to be converted to events. Do you really want to "
+"add them all?"
 msgstr ""
-"O calendÃrio selecionado jà contÃm alguns dos eventos desta mensagem. Vocà "
-"gostaria de criar novos eventos assim mesmo?"
+"Vocà selecionou %d e-mails a ser convertido em eventos. Vocà realmente "
+"deseja adicionÃ-los todos?"
 
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:521
+#: ../plugins/mail-to-task/mail-to-task.c:629
+#, c-format
 msgid ""
-"Selected task list contains some tasks for the given mails already. Would "
-"you like to create new tasks anyway?"
+"You have selected %d mails to be converted to tasks. Do you really want to "
+"add them all?"
 msgstr ""
-"A lista de tarefas selecionada jà contÃm algumas das tarefas desta mensagem. "
-"Vocà gostaria de criar novas tarefas assim mesmo?"
+"Vocà selecionou %d e-mails a serem convertidos em tarefas. Vocà realmente "
+"deseja adicionar todos eles?"
 
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:527
+#: ../plugins/mail-to-task/mail-to-task.c:632
+#, c-format
 msgid ""
-"Selected memo list contains some memos for the given mails already. Would "
-"you like to create new memos anyway?"
+"You have selected %d mails to be converted to memos. Do you really want to "
+"add them all?"
 msgstr ""
-"A lista de memorandos selecionada jà contÃm alguns dos memorandos desta "
-"mensagem. Vocà gostaria de criar novos memorandos assim mesmo?"
-
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:548
-msgid ""
-"Selected calendar contains an event for the given mail already. Would you "
-"like to create new event anyway?"
-msgid_plural ""
-"Selected calendar contains events for the given mails already. Would you "
-"like to create new events anyway?"
-msgstr[0] ""
-"O calendÃrio selecionado jà contÃm um evento desta mensagem. Vocà gostaria "
-"de criar um novo evento assim mesmo?"
-msgstr[1] ""
-"O calendÃrio selecionado jà contÃm eventos destas mensagens. Vocà gostaria "
-"de criar novos eventos assim mesmo?"
-
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:557
-msgid ""
-"Selected task list contains a task for the given mail already. Would you "
-"like to create new task anyway?"
-msgid_plural ""
-"Selected task list contains tasks for the given mails already. Would you "
-"like to create new tasks anyway?"
-msgstr[0] ""
-"A lista de tarefas selecionada jà contÃm uma tarefa desta mensagem. Vocà "
-"gostaria de criar uma nova tarefa assim mesmo?"
-msgstr[1] ""
-"A lista de tarefas selecionada jà contÃm tarefas destas mensagens. Vocà "
-"gostaria de criar novas tarefas assim mesmo?"
+"Vocà selecionou %d e-mails a serem convertidos em memorandos. Vocà realmente "
+"deseja adicionar todos eles?"
 
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:566
-msgid ""
-"Selected memo list contains a memo for the given mail already. Would you "
-"like to create new memo anyway?"
-msgid_plural ""
-"Selected memo list contains memos for the given mails already. Would you "
-"like to create new memos anyway?"
-msgstr[0] ""
-"A lista de memorandos selecionada jà contÃm um memorando desta mensagem. "
-"Vocà gostaria de criar um novo memorando assim mesmo?"
-msgstr[1] ""
-"A lista de memorandos selecionada jà contÃm memorandos destas mensagens. "
-"Vocà gostaria de criar novos memorandos assim mesmo?"
+#: ../plugins/mail-to-task/mail-to-task.c:651
+msgid "Do you wish to continue converting remaining mails?"
+msgstr "Deseja continuar a converter os e-mails restantes?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:726
 msgid "[No Summary]"
 msgstr "[Sem resumo]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:636
+#: ../plugins/mail-to-task/mail-to-task.c:738
 msgid "Invalid object returned from a server"
 msgstr "Objeto invÃlido retornado pelo servidor"
 
-#: ../plugins/mail-to-task/mail-to-task.c:707
+#: ../plugins/mail-to-task/mail-to-task.c:788
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Ocorreu um erro durante o processamento: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:736
+#: ../plugins/mail-to-task/mail-to-task.c:813
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "NÃo foi possÃvel abrir agenda. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:743
+#: ../plugins/mail-to-task/mail-to-task.c:820
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18773,7 +18181,7 @@ msgstr ""
 "A fonte selecionada à apenas de leitura, e por isso nÃo se pode criar uma "
 "tarefa nela. Por favor, selecione uma outra fonte."
 
-#: ../plugins/mail-to-task/mail-to-task.c:746
+#: ../plugins/mail-to-task/mail-to-task.c:823
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18781,7 +18189,7 @@ msgstr ""
 "A fonte selecionada à apenas de leitura, por isso nÃo se pode criar tarefas "
 "nela. Por favor, selecione outra fonte."
 
-#: ../plugins/mail-to-task/mail-to-task.c:749
+#: ../plugins/mail-to-task/mail-to-task.c:826
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18789,40 +18197,44 @@ msgstr ""
 "A fonte selecionada à apenas de leitura, e por isso nÃo se pode criar um "
 "memorando nela. Por favor, selecione uma outra fonte."
 
-#: ../plugins/mail-to-task/mail-to-task.c:955
+#: ../plugins/mail-to-task/mail-to-task.c:1077
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "NÃo foi possÃvel obter a lista da fonte. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1074
+#: ../plugins/mail-to-task/mail-to-task.c:1138
+msgid "No writable calendar is available."
+msgstr "Nenhum calendÃrio gravÃvel està disponÃvel."
+
+#: ../plugins/mail-to-task/mail-to-task.c:1230
 msgid "Create an _Event"
 msgstr "Criar um _evento"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1076
+#: ../plugins/mail-to-task/mail-to-task.c:1232
 msgid "Create a new event from the selected message"
 msgstr "Criar um novo envento a partir da mensagem selecionada"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1081
+#: ../plugins/mail-to-task/mail-to-task.c:1237
 msgid "Create a Mem_o"
 msgstr "Criar um mem_orando"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1083
+#: ../plugins/mail-to-task/mail-to-task.c:1239
 msgid "Create a new memo from the selected message"
 msgstr "Criar um novo memorando a partir da mensagem selecionada"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1088
+#: ../plugins/mail-to-task/mail-to-task.c:1244
 msgid "Create a _Task"
 msgstr "Criar uma _tarefa"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1090
+#: ../plugins/mail-to-task/mail-to-task.c:1246
 msgid "Create a new task from the selected message"
 msgstr "Criar uma nova tarefa a partir da mensagem selecionada"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1098
+#: ../plugins/mail-to-task/mail-to-task.c:1254
 msgid "Create a _Meeting"
 msgstr "Criar u_ma reuniÃo"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1100
+#: ../plugins/mail-to-task/mail-to-task.c:1256
 msgid "Create a new meeting from the selected message"
 msgstr "Criar uma nova reuniÃo a partir da mensagem selecionada"
 
@@ -18830,55 +18242,55 @@ msgstr "Criar uma nova reuniÃo a partir da mensagem selecionada"
 msgid "Convert a mail message to a task."
 msgstr "Converter uma mensagem para uma tarefa."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:294
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:346
 msgid "Get List _Archive"
 msgstr "Obter histÃrico da list_a"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:296
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:348
 msgid "Get an archive of the list this message belongs to"
 msgstr "ObtÃm um histÃrico da lista de discussÃo dessa mensagem"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:301
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:353
 msgid "Get List _Usage Information"
 msgstr "Obter informaÃÃo sobre a _utilizaÃÃo da lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:303
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:355
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "ObtÃm informaÃÃes sobre como usar a lista de discussÃo dessa mensagem"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:308
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:360
 msgid "Contact List _Owner"
 msgstr "Contatar o pr_oprietÃrio da lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:310
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:362
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "Contata o proprietÃrio da lista de mensagens dessa mensagem"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:315
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:367
 msgid "_Post Message to List"
 msgstr "Enviar mensagem _para a lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:317
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:369
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Envia uma mensagem para a lista de discussÃo dessa mensagem"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:322
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:374
 msgid "_Subscribe to List"
 msgstr "In_screver-se na lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:324
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:376
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Inscreve na lista de discussÃo dessa mensagem"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:329
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:381
 msgid "_Unsubscribe from List"
 msgstr "_Desinscrever-se da lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:331
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:383
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Cancela a inscriÃÃo na lista de discussÃo dessa mensagem"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:338
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:390
 msgid "Mailing _List"
 msgstr "_Lista de discussÃo"
 
@@ -18984,15 +18396,15 @@ msgstr ""
 "Vocà deseja marcar como lidas apenas as mensagens da pasta atual, ou tambÃm "
 "nas subpastas?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:193
+#: ../plugins/mark-all-read/mark-all-read.c:215
 msgid "In Current Folder and _Subfolders"
 msgstr "Na pasta atual e _subpastas"
 
-#: ../plugins/mark-all-read/mark-all-read.c:207
+#: ../plugins/mark-all-read/mark-all-read.c:229
 msgid "In Current _Folder Only"
 msgstr "Somente na _pasta atual"
 
-#: ../plugins/mark-all-read/mark-all-read.c:444
+#: ../plugins/mark-all-read/mark-all-read.c:575
 msgid "Mark Me_ssages as Read"
 msgstr "M_arcar mensagens como lidas"
 
@@ -19018,19 +18430,19 @@ msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr ""
 "Ver mensagens em texto simples, mesmo que elas contenham conteÃdo em HTML."
 
-#: ../plugins/prefer-plain/prefer-plain.c:225
+#: ../plugins/prefer-plain/prefer-plain.c:251
 msgid "Show HTML if present"
 msgstr "Mostrar HTML se presente"
 
-#: ../plugins/prefer-plain/prefer-plain.c:225
+#: ../plugins/prefer-plain/prefer-plain.c:252
 msgid "Let Evolution choose the best part to show."
 msgstr "Deixa o Evolution escolher a melhor parte para exibir."
 
-#: ../plugins/prefer-plain/prefer-plain.c:226
+#: ../plugins/prefer-plain/prefer-plain.c:255
 msgid "Show plain text if present"
 msgstr "Mostrar texto simples se presente"
 
-#: ../plugins/prefer-plain/prefer-plain.c:226
+#: ../plugins/prefer-plain/prefer-plain.c:256
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -19038,11 +18450,11 @@ msgstr ""
 "Exibir parte em texto simples, se presente, caso contrÃrio, deixar o "
 "Evolution escolher qual a melhor parte para mostrar."
 
-#: ../plugins/prefer-plain/prefer-plain.c:227
+#: ../plugins/prefer-plain/prefer-plain.c:260
 msgid "Only ever show plain text"
 msgstr "Somente mostrar texto simples"
 
-#: ../plugins/prefer-plain/prefer-plain.c:227
+#: ../plugins/prefer-plain/prefer-plain.c:261
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
@@ -19050,22 +18462,14 @@ msgstr ""
 "Sempre exibir parte em texto simples e preparar anexos de outras partes, se "
 "requisitado."
 
-#: ../plugins/prefer-plain/prefer-plain.c:274
+#: ../plugins/prefer-plain/prefer-plain.c:313
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Mostrar partes HTML s_uprimidas como anexos"
 
-#: ../plugins/prefer-plain/prefer-plain.c:294
+#: ../plugins/prefer-plain/prefer-plain.c:333
 msgid "HTML _Mode"
 msgstr "_Modo HTML"
 
-#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
-msgid "Evolution Profiler"
-msgstr "Controlador de perfil do Evolution"
-
-#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
-msgid "Profile data events in Evolution (for developers only)."
-msgstr "Analisar dados de eventos no Evolution (somente para desenvolvedores)."
-
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Import Outlook messages from PST file"
 msgstr "Importar mensagens do Outlook a partir de um arquivo PST"
@@ -19078,42 +18482,38 @@ msgstr "Importador de arquivos PST do Outlook"
 msgid "Outlook personal folders (.pst)"
 msgstr "Pasta pessoal do Outlook (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:311
+#: ../plugins/pst-import/pst-importer.c:450
 msgid "_Mail"
 msgstr "_Correio"
 
-#: ../plugins/pst-import/pst-importer.c:327
+#: ../plugins/pst-import/pst-importer.c:469
 msgid "Destination folder:"
 msgstr "Pasta destino:"
 
-#. Address book
-#: ../plugins/pst-import/pst-importer.c:333
+#: ../plugins/pst-import/pst-importer.c:475
 msgid "_Address Book"
 msgstr "_CatÃlogo de endereÃos"
 
-#. Appointments
-#: ../plugins/pst-import/pst-importer.c:340
+#: ../plugins/pst-import/pst-importer.c:476
 msgid "A_ppointments"
 msgstr "C_ompromissos"
 
-#. Tasks
-#: ../plugins/pst-import/pst-importer.c:346 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:477 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tarefas"
 
-#. Journal
-#: ../plugins/pst-import/pst-importer.c:352
+#: ../plugins/pst-import/pst-importer.c:478
 msgid "_Journal entries"
 msgstr "_DiÃrio"
 
-#: ../plugins/pst-import/pst-importer.c:367
+#: ../plugins/pst-import/pst-importer.c:585
 msgid "Importing Outlook data"
 msgstr "Importando dados do Outlook"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#: ../plugins/publish-calendar/publish-calendar.c:146
-#: ../plugins/publish-calendar/publish-calendar.c:154
-#: ../plugins/publish-calendar/publish-calendar.c:156
+#: ../plugins/publish-calendar/publish-calendar.c:147
+#: ../plugins/publish-calendar/publish-calendar.c:155
+#: ../plugins/publish-calendar/publish-calendar.c:157
 msgid "Calendar Publishing"
 msgstr "PublicaÃÃo de agendas"
 
@@ -19125,49 +18525,49 @@ msgstr "Locais"
 msgid "Publish calendars to the web."
 msgstr "Publicar calendÃrios na web."
 
-#: ../plugins/publish-calendar/publish-calendar.c:212
-#: ../plugins/publish-calendar/publish-calendar.c:453
+#: ../plugins/publish-calendar/publish-calendar.c:216
+#: ../plugins/publish-calendar/publish-calendar.c:471
 #, c-format
 msgid "Could not open %s:"
 msgstr "NÃo foi possÃvel abrir %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:214
+#: ../plugins/publish-calendar/publish-calendar.c:218
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "NÃo foi possÃvel abrir %s: Erro desconhecido"
 
-#: ../plugins/publish-calendar/publish-calendar.c:234
+#: ../plugins/publish-calendar/publish-calendar.c:238
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "Houve um erro ao publicar para %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:236
+#: ../plugins/publish-calendar/publish-calendar.c:240
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "Publicando para %s foi concluÃdo com sucesso."
 
-#: ../plugins/publish-calendar/publish-calendar.c:280
+#: ../plugins/publish-calendar/publish-calendar.c:288
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "Montagem de %s falhou:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:600
+#: ../plugins/publish-calendar/publish-calendar.c:619
 #: ../plugins/publish-calendar/publish-calendar.ui.h:4
 msgid "E_nable"
 msgstr "A_tivar"
 
-#: ../plugins/publish-calendar/publish-calendar.c:743
+#: ../plugins/publish-calendar/publish-calendar.c:767
 msgid "Are you sure you want to remove this location?"
 msgstr "Vocà tem certeza de que deseja excluir esta localizaÃÃo?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
-#. where the publishing should be done, fails. Basically, this shouldn't
-#. ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1055
+#. * where the publishing should be done, fails. Basically, this shouldn't
+#. * ever happen, and if so, then something is really wrong.
+#: ../plugins/publish-calendar/publish-calendar.c:1099
 msgid "Could not create publish thread."
 msgstr "NÃo foi possÃvel criar discussÃo pÃblica."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1063
+#: ../plugins/publish-calendar/publish-calendar.c:1107
 msgid "_Publish Calendar Information"
 msgstr "_Publicar informaÃÃo de agenda"
 
@@ -19259,162 +18659,104 @@ msgstr "Nome do _usuÃrio:"
 msgid "iCal"
 msgstr "iCal"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:69
-#: ../plugins/publish-calendar/publish-format-ical.c:82
+#: ../plugins/publish-calendar/publish-format-fb.c:95
+#: ../plugins/publish-calendar/publish-format-ical.c:92
 #, c-format
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr ""
 "NÃo foi possÃvel publicar o calendÃrio: o backend do calendÃrio nÃo existe "
 "mais"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:475
+#: ../plugins/publish-calendar/url-editor-dialog.c:518
 msgid "New Location"
 msgstr "Nova localizaÃÃo"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:477
+#: ../plugins/publish-calendar/url-editor-dialog.c:520
 msgid "Edit Location"
 msgstr "Editar localizaÃÃo"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
-#, c-format
-msgid "SpamAssassin not found, code: %d"
-msgstr "SpamAssassin nÃo localizado, cÃdigo: %d"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:144
-#, c-format
-msgid "Failed to create pipe: %s"
-msgstr "Falha ao criar o pipe: %s"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:183
-#, c-format
-msgid "Error after fork: %s"
-msgstr "Erro apÃs a bifurcaÃÃo: %s"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
-#, c-format
-msgid "SpamAssassin child process does not respond, killing..."
-msgstr "O processo filho de SpamAssassin nÃo responde, matando..."
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
-#, c-format
-msgid "Wait for SpamAssassin child process interrupted, terminating..."
-msgstr ""
-"A espera pelo processo filho de Spamassassin foi interrompida, terminando..."
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:252
-#, c-format
-msgid "Pipe to SpamAssassin failed, error code: %d"
-msgstr "O pipe para SpamAssassin falhou, cÃdigo de erro: %d"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:519
-#, c-format
-msgid "SpamAssassin is not available. Please install it first."
-msgstr "O SpamAssassin nÃo està disponÃvel. Por favor, instale-o  primeiro."
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
-msgid "This will make SpamAssassin more reliable, but slower"
-msgstr "Isto tornarà o SpamAssassin mais confiÃvel, porÃm mais lento"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:944
-msgid "I_nclude remote tests"
-msgstr "I_ncluir testes remotos"
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid "Filter junk messages using SpamAssassin."
-msgstr "Filtrar mensagens de spam usando SpamAssassin."
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin Junk Filter"
-msgstr "Filtro de spam SpamAssassin"
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "SpamAssassin Options"
-msgstr "OpÃÃes do SpamAssassin"
-
-#.
-#. * Translator: the %F %T is the thirth argument for a strftime function.
-#. * It lets you define the formatting of the date in the csv-file.
-#. *
-#: ../plugins/save-calendar/csv-format.c:161
+#. Translators: the %F %T is the third argument for a
+#. * strftime function.  It lets you define the formatting
+#. * of the date in the csv-file.
+#: ../plugins/save-calendar/csv-format.c:168
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "Description List"
 msgstr "Lista de descriÃÃo"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "Categories List"
 msgstr "Lista de categorias"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "Comment List"
 msgstr "Lista de comentÃrios"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:389
 msgid "Contact List"
 msgstr "Lista de contatos"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:390
 msgid "Start"
 msgstr "InÃcio"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:391
 msgid "End"
 msgstr "Fim"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:392
 msgid "Due"
 msgstr "Prazo"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:393
 msgid "percent Done"
 msgstr "porcentagem ConcluÃda"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:395
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:396
 msgid "Attendees List"
 msgstr "Lista de participantes"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:398
 msgid "Modified"
 msgstr "Modificado"
 
-#: ../plugins/save-calendar/csv-format.c:530
+#: ../plugins/save-calendar/csv-format.c:573
 msgid "A_dvanced options for the CSV format"
 msgstr "OpÃÃes avanÃa_das para o formato CSV"
 
-#: ../plugins/save-calendar/csv-format.c:537
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Prepend a _header"
 msgstr "Adicionar um cabeÃal_ho no inÃcio"
 
-#: ../plugins/save-calendar/csv-format.c:546
+#: ../plugins/save-calendar/csv-format.c:590
 msgid "_Value delimiter:"
 msgstr "_Valor delimitador:"
 
-#: ../plugins/save-calendar/csv-format.c:553
+#: ../plugins/save-calendar/csv-format.c:601
 msgid "_Record delimiter:"
 msgstr "_Registro delimitador:"
 
-#: ../plugins/save-calendar/csv-format.c:560
+#: ../plugins/save-calendar/csv-format.c:612
 msgid "_Encapsulate values with:"
 msgstr "_Encapsular valores com:"
 
-#: ../plugins/save-calendar/csv-format.c:582
-msgid "Comma separated value format (.csv)"
-msgstr "Formato de valores separados por vÃrgula (.csv)"
+#: ../plugins/save-calendar/csv-format.c:638
+msgid "Comma separated values (.csv)"
+msgstr "Valores separados por vÃrgula (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:162
-msgid "iCalendar format (.ics)"
-msgstr "Formato iCalendar (.ics)"
+#: ../plugins/save-calendar/ical-format.c:173 ../shell/e-shell-utils.c:225
+msgid "iCalendar (.ics)"
+msgstr "iCalendar (.ics)"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
@@ -19429,31 +18771,31 @@ msgstr "Salvar um calendÃrio ou lista de tarefas no disco."
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:147
+#: ../plugins/save-calendar/rdf-format.c:156
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:369
-msgid "RDF format (.rdf)"
-msgstr "Formato RDF (.rdf)"
+#: ../plugins/save-calendar/rdf-format.c:389
+msgid "RDF (.rdf)"
+msgstr "RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:120
+#: ../plugins/save-calendar/save-calendar.c:127
 msgid "_Format:"
 msgstr "_Formato:"
 
-#: ../plugins/save-calendar/save-calendar.c:181
+#: ../plugins/save-calendar/save-calendar.c:189
 msgid "Select destination file"
 msgstr "Selecionar arquivo de destino"
 
-#: ../plugins/save-calendar/save-calendar.c:334
+#: ../plugins/save-calendar/save-calendar.c:344
 msgid "Save the selected calendar to disk"
 msgstr "Salva o calendÃrio selecionado no disco"
 
-#: ../plugins/save-calendar/save-calendar.c:365
+#: ../plugins/save-calendar/save-calendar.c:375
 msgid "Save the selected memo list to disk"
 msgstr "Salva a lista de memorandos selecionada no disco"
 
-#: ../plugins/save-calendar/save-calendar.c:396
+#: ../plugins/save-calendar/save-calendar.c:406
 msgid "Save the selected task list to disk"
 msgstr "Salva a lista de tarefas selecionada no disco"
 
@@ -19466,18 +18808,24 @@ msgstr ""
 "corpo de uma mensagem."
 
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-msgid "Drafts based template plugin"
-msgstr "Plug-in de modelo baseado em rascunho"
+msgid ""
+"Drafts based template plugin. You can use variables like $ORIG[subject], "
+"$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
+"an email you are replying to."
+msgstr ""
+"Rascunho baseado em plugin de modelo. Vocà pode usar variÃveis como $ORIG"
+"[assunto], $ORIG[de], $ORIG[para] ou $ORIG[corpo], que serà substituÃdo por "
+"valores de um e-mail que vocà està respondendo."
 
-#: ../plugins/templates/templates.c:635
+#: ../plugins/templates/templates.c:1094
 msgid "No Title"
 msgstr "Sem tÃtulo"
 
-#: ../plugins/templates/templates.c:746
+#: ../plugins/templates/templates.c:1195
 msgid "Save as _Template"
 msgstr "Salvar como _modelo"
 
-#: ../plugins/templates/templates.c:748
+#: ../plugins/templates/templates.c:1197
 msgid "Save as Template"
 msgstr "Salva como modelo"
 
@@ -19497,27 +18845,27 @@ msgstr "vCards integrados"
 msgid "Show vCards directly in mail messages."
 msgstr "Mostrar vCards diretamente nas mensagens."
 
-#: ../plugins/vcard-inline/vcard-inline.c:198
-#: ../plugins/vcard-inline/vcard-inline.c:283
+#: ../plugins/vcard-inline/vcard-inline.c:207
+#: ../plugins/vcard-inline/vcard-inline.c:292
 msgid "Show Full vCard"
 msgstr "Mostrar vCard Completo"
 
-#: ../plugins/vcard-inline/vcard-inline.c:201
+#: ../plugins/vcard-inline/vcard-inline.c:210
 msgid "Show Compact vCard"
 msgstr "Mostrar vCard Compacto"
 
-#: ../plugins/vcard-inline/vcard-inline.c:262
+#: ../plugins/vcard-inline/vcard-inline.c:271
 msgid "There is one other contact."
 msgstr "Existe um outro contato."
 
-#: ../plugins/vcard-inline/vcard-inline.c:271
+#: ../plugins/vcard-inline/vcard-inline.c:280
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Existe %d outro contato."
 msgstr[1] "Existem %d outros contatos."
 
-#: ../plugins/vcard-inline/vcard-inline.c:292
+#: ../plugins/vcard-inline/vcard-inline.c:301
 msgid "Save in Address Book"
 msgstr "Salvar no catÃlogo de endereÃos"
 
@@ -19533,11 +18881,11 @@ msgstr "Contatos do WebDAV"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:256
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:282
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:283
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Evitar IfMatch (necessÃrio no apache <2.2.8)"
 
@@ -19702,7 +19050,7 @@ msgstr "A barra lateral està visÃvel"
 msgid "Skip development warning dialog"
 msgstr "Pular diÃlogo de alerta de desenvolvimento"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:371
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:314
 msgid "Start in offline mode"
 msgstr "Iniciar no modo desconectado"
 
@@ -19817,8 +19165,8 @@ msgid "Use HTTP proxy"
 msgstr "Usar proxy HTTP"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "User name to pass as authentication when doing HTTP proxying."
-msgstr "Nome de usuÃrio a fornecer como autenticaÃÃo ao usar o proxy HTTP."
+msgid "Username to pass as authentication when doing HTTP proxying."
+msgstr "Nome de usuÃrio para passar como autenticaÃÃo ao fazer proxy HTTP."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether Evolution will start up in offline mode instead of online mode."
@@ -19858,11 +19206,11 @@ msgstr "Estilo dos botÃes de janela"
 msgid "Window buttons are visible"
 msgstr "BotÃes de janela sÃo visÃveis"
 
-#: ../shell/e-shell-content.c:694 ../shell/e-shell-content.c:695
+#: ../shell/e-shell-content.c:729 ../shell/e-shell-content.c:730
 msgid "Searches"
 msgstr "Pesquisas"
 
-#: ../shell/e-shell-content.c:737
+#: ../shell/e-shell-content.c:773
 msgid "Save Search"
 msgstr "Salvar pesquisa"
 
@@ -19870,42 +19218,38 @@ msgstr "Salvar pesquisa"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:934
+#: ../shell/e-shell-searchbar.c:938
 msgid "Sho_w:"
 msgstr "M_ostrar: "
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:967
+#: ../shell/e-shell-searchbar.c:971
 msgid "Sear_ch:"
 msgstr "Pesquisa_r: "
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1030
+#: ../shell/e-shell-searchbar.c:1034
 msgid "i_n"
 msgstr " em "
 
-#: ../shell/e-shell-utils.c:255
+#: ../shell/e-shell-utils.c:223
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:257
-msgid "iCalendar (.ics)"
-msgstr "iCalendar (.ics)"
-
-#: ../shell/e-shell-utils.c:278
+#: ../shell/e-shell-utils.c:246
 msgid "All Files (*)"
 msgstr "Todos os arquivos"
 
-#: ../shell/e-shell-view.c:291
+#: ../shell/e-shell-view.c:296
 msgid "Saving user interface state"
 msgstr "Salvando estado da interface do usuÃrio"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:643
+#: ../shell/e-shell-window-actions.c:645
 msgid "translator-credits"
 msgstr ""
 "Gustavo Maciel Dias Vieira <gustavo sagui org>\n"
@@ -19918,270 +19262,274 @@ msgstr ""
 "Jonh Wendell <wendell bani com br>\n"
 "Djavan Fagundes <djavan comum org>"
 
-#: ../shell/e-shell-window-actions.c:654
+#: ../shell/e-shell-window-actions.c:656
 msgid "Evolution Website"
 msgstr "WebSite do Evolution"
 
-#: ../shell/e-shell-window-actions.c:1215
+#: ../shell/e-shell-window-actions.c:902
+msgid "Categories Editor"
+msgstr "Editor de categorias"
+
+#: ../shell/e-shell-window-actions.c:1237
 msgid "Bug Buddy is not installed."
 msgstr "A Ferramenta de RelatÃrio de Erros nÃo està instalada."
 
-#: ../shell/e-shell-window-actions.c:1217
+#: ../shell/e-shell-window-actions.c:1239
 msgid "Bug Buddy could not be run."
 msgstr "NÃo foi possÃvel executar a Ferramenta de RelatÃrio de Erros."
 
-#: ../shell/e-shell-window-actions.c:1398
+#: ../shell/e-shell-window-actions.c:1420
 msgid "Show information about Evolution"
 msgstr "Mostra informaÃÃes sobre o Evolution"
 
-#: ../shell/e-shell-window-actions.c:1403
-#: ../shell/e-shell-window-actions.c:1417
+#: ../shell/e-shell-window-actions.c:1425
+#: ../shell/e-shell-window-actions.c:1439
 msgid "_Close Window"
 msgstr "_Fechar esta janela"
 
-#: ../shell/e-shell-window-actions.c:1424
+#: ../shell/e-shell-window-actions.c:1446
 msgid "_Contents"
 msgstr "S_umÃrio"
 
-#: ../shell/e-shell-window-actions.c:1426
+#: ../shell/e-shell-window-actions.c:1448
 msgid "Open the Evolution User Guide"
 msgstr "Abrir o guia do usuÃrio do Evolution"
 
-#: ../shell/e-shell-window-actions.c:1452
-msgid "Evolution _FAQ"
-msgstr "_FAQ do Evolution"
-
-#: ../shell/e-shell-window-actions.c:1454
-msgid "Open the Frequently Asked Questions webpage"
-msgstr "Abre a pÃgina das perguntas freqÃentes (FAQ)"
-
-#: ../shell/e-shell-window-actions.c:1459
+#: ../shell/e-shell-window-actions.c:1474
 msgid "_Forget Passwords"
 msgstr "Es_quecer senhas"
 
-#: ../shell/e-shell-window-actions.c:1461
+#: ../shell/e-shell-window-actions.c:1476
 msgid "Forget all remembered passwords"
 msgstr "Esquece todas as senhas armazenadas"
 
-#: ../shell/e-shell-window-actions.c:1466
+#: ../shell/e-shell-window-actions.c:1481
 msgid "I_mport..."
 msgstr "_Importar..."
 
-#: ../shell/e-shell-window-actions.c:1468
+#: ../shell/e-shell-window-actions.c:1483
 msgid "Import data from other programs"
 msgstr "Importa dados de outros programas"
 
-#: ../shell/e-shell-window-actions.c:1473
+#: ../shell/e-shell-window-actions.c:1488
 msgid "New _Window"
 msgstr "Nova _janela"
 
-#: ../shell/e-shell-window-actions.c:1475
+#: ../shell/e-shell-window-actions.c:1490
 msgid "Create a new window displaying this view"
 msgstr "Criar uma nova janela exibindo esta visÃo"
 
-#: ../shell/e-shell-window-actions.c:1494
+#: ../shell/e-shell-window-actions.c:1502
+msgid "Available Cate_gories"
+msgstr "Cate_gorias disponÃveis"
+
+#: ../shell/e-shell-window-actions.c:1504
+msgid "Manage available categories"
+msgstr "Gerenciar categorias disponÃveis"
+
+#: ../shell/e-shell-window-actions.c:1516
 msgid "_Quick Reference"
 msgstr "_ReferÃncia rÃpida"
 
-#: ../shell/e-shell-window-actions.c:1496
+#: ../shell/e-shell-window-actions.c:1518
 msgid "Show Evolution's shortcut keys"
 msgstr "Mostrar os atalhos de teclado do Evolution"
 
-#: ../shell/e-shell-window-actions.c:1503
+#: ../shell/e-shell-window-actions.c:1525
 msgid "Exit the program"
 msgstr "Sai do programa"
 
-#: ../shell/e-shell-window-actions.c:1508
+#: ../shell/e-shell-window-actions.c:1530
 msgid "_Advanced Search..."
 msgstr "Pesquisa _avanÃada..."
 
-#: ../shell/e-shell-window-actions.c:1510
+#: ../shell/e-shell-window-actions.c:1532
 msgid "Construct a more advanced search"
 msgstr "Construir uma pesquisa mais avanÃada"
 
-#: ../shell/e-shell-window-actions.c:1517
+#: ../shell/e-shell-window-actions.c:1539
 msgid "Clear the current search parameters"
 msgstr "Limpar os parÃmetros de pesquisa atuais"
 
-#: ../shell/e-shell-window-actions.c:1522
+#: ../shell/e-shell-window-actions.c:1544
 msgid "_Edit Saved Searches..."
 msgstr "_Editar pesquisas salvas..."
 
-#: ../shell/e-shell-window-actions.c:1524
+#: ../shell/e-shell-window-actions.c:1546
 msgid "Manage your saved searches"
 msgstr "Gerenciar suas pesquisas salvas"
 
-#: ../shell/e-shell-window-actions.c:1531
+#: ../shell/e-shell-window-actions.c:1553
 msgid "Click here to change the search type"
 msgstr "Clicar aqui para alterar o tipo de pesquisa"
 
-#: ../shell/e-shell-window-actions.c:1536
+#: ../shell/e-shell-window-actions.c:1558
 msgid "_Find Now"
 msgstr "_Localizar agora"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1538
+#: ../shell/e-shell-window-actions.c:1560
 msgid "Execute the current search parameters"
 msgstr "Executar os parÃmetros de pesquisa atuais"
 
-#: ../shell/e-shell-window-actions.c:1543
+#: ../shell/e-shell-window-actions.c:1565
 msgid "_Save Search..."
 msgstr "_Salvar pesquisa..."
 
-#: ../shell/e-shell-window-actions.c:1545
+#: ../shell/e-shell-window-actions.c:1567
 msgid "Save the current search parameters"
 msgstr "Salvar os parÃmetros de pesquisa atuais"
 
-#: ../shell/e-shell-window-actions.c:1557
+#: ../shell/e-shell-window-actions.c:1579
 msgid "Submit _Bug Report..."
 msgstr "Enviar relatÃrio de _erro..."
 
-#: ../shell/e-shell-window-actions.c:1559
+#: ../shell/e-shell-window-actions.c:1581
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Envia um relatÃrio de erro usando a Ferramenta de RelatÃrio de Erros"
 
-#: ../shell/e-shell-window-actions.c:1564
+#: ../shell/e-shell-window-actions.c:1586
 msgid "_Work Offline"
 msgstr "_Trabalhar desconectado"
 
-#: ../shell/e-shell-window-actions.c:1566
+#: ../shell/e-shell-window-actions.c:1588
 msgid "Put Evolution into offline mode"
 msgstr "Altera para modo desconectado"
 
-#: ../shell/e-shell-window-actions.c:1571
+#: ../shell/e-shell-window-actions.c:1593
 msgid "_Work Online"
 msgstr "_Trabalhar conectado"
 
-#: ../shell/e-shell-window-actions.c:1573
+#: ../shell/e-shell-window-actions.c:1595
 msgid "Put Evolution into online mode"
 msgstr "Alterar para modo conectado"
 
-#: ../shell/e-shell-window-actions.c:1601
+#: ../shell/e-shell-window-actions.c:1623
 msgid "Lay_out"
 msgstr "DisposiÃÃo"
 
-#: ../shell/e-shell-window-actions.c:1608
+#: ../shell/e-shell-window-actions.c:1630
 msgid "_New"
 msgstr "_Novo"
 
-#: ../shell/e-shell-window-actions.c:1615
+#: ../shell/e-shell-window-actions.c:1637
 msgid "_Search"
 msgstr "_Pesquisar"
 
 # http://library.gnome.org/users/evolution/stable/apx-gloss.html
 # Correio | Contatos | Agendas | Tarefas | Memorandos
-#: ../shell/e-shell-window-actions.c:1622
+#: ../shell/e-shell-window-actions.c:1644
 msgid "_Switcher Appearance"
 msgstr "_AparÃncia do alternador"
 
-#: ../shell/e-shell-window-actions.c:1636
+#: ../shell/e-shell-window-actions.c:1658
 msgid "_Window"
 msgstr "_Janela"
 
-#: ../shell/e-shell-window-actions.c:1665
+#: ../shell/e-shell-window-actions.c:1687
 msgid "Show Side _Bar"
 msgstr "Mostrar _barra lateral"
 
-#: ../shell/e-shell-window-actions.c:1667
+#: ../shell/e-shell-window-actions.c:1689
 msgid "Show the side bar"
 msgstr "Mostrar _barra lateral"
 
-#: ../shell/e-shell-window-actions.c:1673
+#: ../shell/e-shell-window-actions.c:1695
 msgid "Show _Buttons"
 msgstr "Mostrar _botÃes"
 
-#: ../shell/e-shell-window-actions.c:1675
+#: ../shell/e-shell-window-actions.c:1697
 msgid "Show the switcher buttons"
 msgstr "Mostrar os botÃes de alternÃncia"
 
-#: ../shell/e-shell-window-actions.c:1681
+#: ../shell/e-shell-window-actions.c:1703
 msgid "Show _Status Bar"
 msgstr "Mostrar barra de _status"
 
-#: ../shell/e-shell-window-actions.c:1683
+#: ../shell/e-shell-window-actions.c:1705
 msgid "Show the status bar"
 msgstr "Mostra a barra de status"
 
-#: ../shell/e-shell-window-actions.c:1689
+#: ../shell/e-shell-window-actions.c:1711
 msgid "Show _Tool Bar"
 msgstr "Mostrar barra de _ferramentas"
 
-#: ../shell/e-shell-window-actions.c:1691
+#: ../shell/e-shell-window-actions.c:1713
 msgid "Show the tool bar"
 msgstr "Mostra a barra de ferramentas"
 
-#: ../shell/e-shell-window-actions.c:1713
+#: ../shell/e-shell-window-actions.c:1735
 msgid "_Icons Only"
 msgstr "_Somente Ãcones"
 
-#: ../shell/e-shell-window-actions.c:1715
+#: ../shell/e-shell-window-actions.c:1737
 msgid "Display window buttons with icons only"
 msgstr "Exibe os botÃes de janela usando Ãcones"
 
-#: ../shell/e-shell-window-actions.c:1720
+#: ../shell/e-shell-window-actions.c:1742
 msgid "_Text Only"
 msgstr "Somente _texto"
 
-#: ../shell/e-shell-window-actions.c:1722
+#: ../shell/e-shell-window-actions.c:1744
 msgid "Display window buttons with text only"
 msgstr "Exibe os botÃes de janela usando texto"
 
-#: ../shell/e-shell-window-actions.c:1727
+#: ../shell/e-shell-window-actions.c:1749
 msgid "Icons _and Text"
 msgstr "Ãcones _e texto"
 
-#: ../shell/e-shell-window-actions.c:1729
+#: ../shell/e-shell-window-actions.c:1751
 msgid "Display window buttons with icons and text"
 msgstr "Exibe os botÃes de janela usando Ãcones e texto"
 
-#: ../shell/e-shell-window-actions.c:1734
+#: ../shell/e-shell-window-actions.c:1756
 msgid "Tool_bar Style"
 msgstr "Estilo da _barra de ferramentas"
 
-#: ../shell/e-shell-window-actions.c:1736
+#: ../shell/e-shell-window-actions.c:1758
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 "Exibe os botÃes de janela usando as configuraÃÃes de barra de ferramentas do "
 "Ambiente de trabalho"
 
-#: ../shell/e-shell-window-actions.c:1744
+#: ../shell/e-shell-window-actions.c:1766
 msgid "Define Views..."
 msgstr "Definir visÃes..."
 
-#: ../shell/e-shell-window-actions.c:1746
+#: ../shell/e-shell-window-actions.c:1768
 msgid "Create or edit views"
 msgstr "Cria ou edita visÃes"
 
-#: ../shell/e-shell-window-actions.c:1751
+#: ../shell/e-shell-window-actions.c:1773
 msgid "Save Custom View..."
 msgstr "Salvar visÃo personalizada..."
 
-#: ../shell/e-shell-window-actions.c:1753
+#: ../shell/e-shell-window-actions.c:1775
 msgid "Save current custom view"
 msgstr "Salvar visÃo atual personalizada"
 
-#: ../shell/e-shell-window-actions.c:1760
+#: ../shell/e-shell-window-actions.c:1782
 msgid "C_urrent View"
 msgstr "VisÃo a_tual"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1792
 msgid "Custom View"
 msgstr "VisÃo personalizada"
 
-#: ../shell/e-shell-window-actions.c:1772
+#: ../shell/e-shell-window-actions.c:1794
 msgid "Current view is a customized view"
 msgstr "VisÃo atual à personalizada"
 
-#: ../shell/e-shell-window-actions.c:1782
+#: ../shell/e-shell-window-actions.c:1804
 msgid "Change the page settings for your current printer"
 msgstr "Alterar as configuraÃÃes de pÃgina para a sua impressora atual"
 
-#: ../shell/e-shell-window-actions.c:2167
+#: ../shell/e-shell-window-actions.c:2194
 #, c-format
 msgid "Switch to %s"
 msgstr "Alternar para %s"
 
-#: ../shell/e-shell-window-actions.c:2382
+#: ../shell/e-shell-window-actions.c:2414
 msgid "Execute these search parameters"
 msgstr "Executar estes parÃmetros de pesquisa"
 
@@ -20191,25 +19539,25 @@ msgstr "Executar estes parÃmetros de pesquisa"
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:434
+#: ../shell/e-shell-window.c:442
 msgid "New"
 msgstr "Novo"
 
-#: ../shell/e-shell.c:257
+#: ../shell/e-shell.c:361
 msgid "Preparing to go offline..."
 msgstr "Preparando para desconectar..."
 
-#: ../shell/e-shell.c:310
+#: ../shell/e-shell.c:414
 msgid "Preparing to go online..."
 msgstr "Preparando para conectar..."
 
-#: ../shell/e-shell.c:372
+#: ../shell/e-shell.c:476
 msgid "Preparing to quit..."
 msgstr "Preparando para sair..."
 
 # ajustei para ter o mesmo tamanho
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:188
+#: ../shell/main.c:195
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20244,7 +19592,7 @@ msgstr ""
 "NÃs esperamos que vocà aprecie os resultados do nosso trabalho\n"
 "duro, e estamos esperando ansiosamente as suas contribuiÃÃes!\n"
 
-#: ../shell/main.c:212
+#: ../shell/main.c:219
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20252,13 +19600,13 @@ msgstr ""
 "Obrigado\n"
 "A Equipe do Evolution\n"
 
-#: ../shell/main.c:219
+#: ../shell/main.c:226
 msgid "Do not tell me again"
 msgstr "NÃo me diga novamente"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:365
+#: ../shell/main.c:308
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -20266,57 +19614,54 @@ msgstr ""
 "Iniciar o Evolution mostrando o componente especificado. OpÃÃes disponÃveis "
 "sÃo: \"correio\", \"calendÃrio\", \"contatos\", \"tarefas\" e \"memorandos\""
 
-#: ../shell/main.c:369
+#: ../shell/main.c:312
 msgid "Apply the given geometry to the main window"
 msgstr "Aplica a geometria fornecida para a janela principal"
 
-#: ../shell/main.c:373
+#: ../shell/main.c:316
 msgid "Start in online mode"
 msgstr "Inicia no modo conectado"
 
-#: ../shell/main.c:375
+#: ../shell/main.c:318
 msgid "Ignore network availability"
 msgstr "Ignorar disponibilidade de rede"
 
-#: ../shell/main.c:377
+#: ../shell/main.c:320
 msgid "Start in \"express\" mode"
 msgstr "Inicia no modo \"expresso\""
 
-#: ../shell/main.c:380
+#: ../shell/main.c:323
 msgid "Forcibly shut down Evolution"
 msgstr "Desliga à forÃa o Evolution"
 
-#: ../shell/main.c:383
+#: ../shell/main.c:326
 msgid "Send the debugging output of all components to a file."
 msgstr "Envia a saÃda de depuraÃÃo de todos os componentes para um arquivo."
 
-#: ../shell/main.c:385
+#: ../shell/main.c:328
 msgid "Disable loading of any plugins."
 msgstr "Desabilita o carregamento de qualquer plug-ins."
 
-#: ../shell/main.c:387
+#: ../shell/main.c:330
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desabilita o painel de visualizaÃÃo do Correio, Contatos e Tarefas."
 
-#: ../shell/main.c:391
+#: ../shell/main.c:334
 msgid "Import URIs or file names given as rest of arguments."
 msgstr ""
 "Importa URIs ou nomes de arquivos fornecidos como argumentos faltantes."
 
-#: ../shell/main.c:393
+#: ../shell/main.c:336
 msgid "Request a running Evolution process to quit"
 msgstr "Requisitar que o processo do Evolution seja fechado"
 
 # DescriÃÃo obtida com "evolution --help"
-#: ../shell/main.c:557 ../shell/main.c:565
+#: ../shell/main.c:512 ../shell/main.c:520
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Cliente de e-mail e gerenciador de informaÃÃes pessoais (PIM)"
 
-#: ../shell/main.c:627
+#: ../shell/main.c:583
 #, c-format
-#| msgid ""
-#| "%s: --online and --offline cannot be used together.\n"
-#| "  Use %s --help for more information.\n"
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Run '%s --help' for more information.\n"
@@ -20324,11 +19669,8 @@ msgstr ""
 "%s: --online e --offline nÃo podem ser usados juntos.\n"
 "  Utilize \"%s --help\" para mais informaÃÃes.\n"
 
-#: ../shell/main.c:633
+#: ../shell/main.c:589
 #, c-format
-#| msgid ""
-#| "%s: --online and --offline cannot be used together.\n"
-#| "  Use %s --help for more information.\n"
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
 "  Run '%s --help' for more information.\n"
@@ -20408,72 +19750,72 @@ msgstr "Recurso de te_ste"
 msgid "Create a new test source"
 msgstr "Criar um novo recurso de teste"
 
-#: ../smclient/eggdesktopfile.c:165
+#: ../smclient/eggdesktopfile.c:166
 #, c-format
 msgid "File is not a valid .desktop file"
 msgstr "O arquivo nÃo à um arquivo .desktop vÃlido"
 
-#: ../smclient/eggdesktopfile.c:188
+#: ../smclient/eggdesktopfile.c:189
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "VersÃo \"%s\" do arquivo desktop nÃo reconhecida"
 
-#: ../smclient/eggdesktopfile.c:957
+#: ../smclient/eggdesktopfile.c:959
 #, c-format
 msgid "Starting %s"
 msgstr "Iniciando %s"
 
-#: ../smclient/eggdesktopfile.c:1098
+#: ../smclient/eggdesktopfile.c:1102
 #, c-format
 msgid "Application does not accept documents on command line"
 msgstr "O aplicativo nÃo aceita documentos na linha de comando"
 
-#: ../smclient/eggdesktopfile.c:1166
+#: ../smclient/eggdesktopfile.c:1170
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "OpÃÃo de lanÃamento nÃo reconhecida: %d"
 
-#: ../smclient/eggdesktopfile.c:1365
+#: ../smclient/eggdesktopfile.c:1370
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr ""
 "NÃo à possÃvel passar as URIs do documento para uma entrada desktop "
 "'Tipo=Link'"
 
-#: ../smclient/eggdesktopfile.c:1386
+#: ../smclient/eggdesktopfile.c:1391
 #, c-format
 msgid "Not a launchable item"
 msgstr "NÃo à um item lanÃÃvel"
 
-#: ../smclient/eggsmclient.c:223
+#: ../smclient/eggsmclient.c:226
 msgid "Disable connection to session manager"
 msgstr "Desabilitar conexÃo para gerenciar sessÃo"
 
-#: ../smclient/eggsmclient.c:226
+#: ../smclient/eggsmclient.c:229
 msgid "Specify file containing saved configuration"
 msgstr "Especifica o arquivo contendo a configuraÃÃo salva"
 
-#: ../smclient/eggsmclient.c:226
+#: ../smclient/eggsmclient.c:229
 msgid "FILE"
 msgstr "ARQUIVO"
 
-#: ../smclient/eggsmclient.c:229
+#: ../smclient/eggsmclient.c:232
 msgid "Specify session management ID"
 msgstr "Especifica o ID do gerenciamento da sessÃo"
 
-#: ../smclient/eggsmclient.c:229
+#: ../smclient/eggsmclient.c:232
 msgid "ID"
 msgstr "ID"
 
-#: ../smclient/eggsmclient.c:250
+#: ../smclient/eggsmclient.c:253
 msgid "Session management options:"
 msgstr "OpÃÃes de gerenciamento de sessÃo:"
 
-#: ../smclient/eggsmclient.c:251
+#: ../smclient/eggsmclient.c:254
 msgid "Show session management options"
 msgstr "Mostrar opÃÃes de gerenciamento de sessÃo"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:107
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20484,7 +19826,7 @@ msgstr ""
 "\n"
 "Editar configuraÃÃes de confianÃa:"
 
-#: ../smime/gui/cert-trust-dialog.c:144
+#: ../smime/gui/cert-trust-dialog.c:146
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -20494,7 +19836,7 @@ msgstr ""
 "entÃo vocà confia na autenticidade deste certificado a nÃo ser que aqui "
 "esteja indicado o contrÃrio"
 
-#: ../smime/gui/cert-trust-dialog.c:148
+#: ../smime/gui/cert-trust-dialog.c:150
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -20504,87 +19846,120 @@ msgstr ""
 "certificado, entÃo vocà nÃo confia na autenticidade deste certificado a nÃo "
 "ser que aqui esteja indicado o contrÃrio"
 
-#: ../smime/gui/certificate-manager.c:148
-#: ../smime/gui/certificate-manager.c:460
-#: ../smime/gui/certificate-manager.c:697
-msgid "Select a certificate to import..."
-msgstr "Selecionar um certificado para importar..."
-
-#: ../smime/gui/certificate-manager.c:157
-msgid "All PKCS12 files"
-msgstr "Todos os arquivos PKCS12"
+#: ../smime/gui/certificate-manager.c:73 ../smime/gui/certificate-manager.c:92
+#: ../smime/gui/certificate-manager.c:112
+msgid "Certificate Name"
+msgstr "Nome do certificado"
 
-#: ../smime/gui/certificate-manager.c:163
-#: ../smime/gui/certificate-manager.c:475
-#: ../smime/gui/certificate-manager.c:711
-msgid "All files"
-msgstr "Todos os arquivos"
+#: ../smime/gui/certificate-manager.c:74 ../smime/gui/certificate-manager.c:94
+msgid "Issued To Organization"
+msgstr "Emitido para organizaÃÃo"
 
-#: ../smime/gui/certificate-manager.c:182
-msgid "Failed to import user's certificate"
-msgstr "Falhou ao importar certificado do usuÃrio"
+#: ../smime/gui/certificate-manager.c:75 ../smime/gui/certificate-manager.c:95
+msgid "Issued To Organizational Unit"
+msgstr "Emitido para unidade organizacional"
 
-#: ../smime/gui/certificate-manager.c:352
-#: ../smime/gui/certificate-manager.c:574
-#: ../smime/gui/certificate-manager.c:808
-msgid "Certificate Name"
-msgstr "Nome do certificado"
+#: ../smime/gui/certificate-manager.c:76 ../smime/gui/certificate-manager.c:96
+#: ../smime/gui/certificate-manager.c:114 ../smime/gui/smime-ui.ui.h:32
+#: ../smime/lib/e-cert.c:569
+msgid "Serial Number"
+msgstr "NÃmero de sÃrie"
 
-#: ../smime/gui/certificate-manager.c:361
-#: ../smime/gui/certificate-manager.c:592
+#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:97
+#: ../smime/gui/certificate-manager.c:115
 msgid "Purposes"
 msgstr "PropÃsitos"
 
-#: ../smime/gui/certificate-manager.c:370 ../smime/gui/smime-ui.ui.h:32
-#: ../smime/lib/e-cert.c:566
-msgid "Serial Number"
-msgstr "NÃmero de sÃrie"
+#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
+#: ../smime/gui/certificate-manager.c:116 ../smime/gui/smime-ui.ui.h:23
+msgid "Issued By"
+msgstr "Emitido por"
+
+#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
+#: ../smime/gui/certificate-manager.c:117
+msgid "Issued By Organization"
+msgstr "Emitido pela organizaÃÃo"
+
+#: ../smime/gui/certificate-manager.c:80
+#: ../smime/gui/certificate-manager.c:100
+#: ../smime/gui/certificate-manager.c:118
+msgid "Issued By Organizational Unit"
+msgstr "Emitido pela unidade organizacional"
+
+#: ../smime/gui/certificate-manager.c:81
+#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:119
+msgid "Issued"
+msgstr "Emitido"
+
+#: ../smime/gui/certificate-manager.c:82
+#: ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:120
+msgid "Expires"
+msgstr "VÃlido atÃ"
+
+#: ../smime/gui/certificate-manager.c:83
+#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:121 ../smime/gui/smime-ui.ui.h:29
+msgid "SHA1 Fingerprint"
+msgstr "ImpressÃo digital SHA1"
+
+#: ../smime/gui/certificate-manager.c:84
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:122 ../smime/gui/smime-ui.ui.h:26
+msgid "MD5 Fingerprint"
+msgstr "ImpressÃo digital MD5"
+
+#: ../smime/gui/certificate-manager.c:93
+#: ../smime/gui/certificate-manager.c:113
+msgid "Email Address"
+msgstr "EndereÃo de e-mail:"
+
+#: ../smime/gui/certificate-manager.c:575
+msgid "Select a certificate to import..."
+msgstr "Selecionar um certificado para importar..."
+
+#: ../smime/gui/certificate-manager.c:588
+msgid "All files"
+msgstr "Todos os arquivos"
+
+#: ../smime/gui/certificate-manager.c:623
+msgid "Failed to import certificate"
+msgstr "Falha ao importar o certificado"
 
-#: ../smime/gui/certificate-manager.c:378
-msgid "Expires"
-msgstr "VÃlido atÃ"
+#: ../smime/gui/certificate-manager.c:991
+msgid "All PKCS12 files"
+msgstr "Todos os arquivos PKCS12"
 
-#: ../smime/gui/certificate-manager.c:469
+#: ../smime/gui/certificate-manager.c:1009
 msgid "All email certificate files"
 msgstr "Todos os arquivos de certificados de e-mail"
 
-#: ../smime/gui/certificate-manager.c:502
-msgid "Failed to import contact's certificate"
-msgstr "Falhou ao importar certificado do contato"
-
-#: ../smime/gui/certificate-manager.c:583
-msgid "E-Mail Address"
-msgstr "EndereÃo de e-mail"
-
-#: ../smime/gui/certificate-manager.c:706
+#: ../smime/gui/certificate-manager.c:1027
 msgid "All CA certificate files"
 msgstr "Todos os arquivos de certificados CA"
 
-#: ../smime/gui/certificate-manager.c:737
-msgid "Failed to import certificate authority's certificate"
-msgstr "Fallhou ao importar o certificado de autoridade"
-
-#: ../smime/gui/certificate-viewer.c:338
+#: ../smime/gui/certificate-viewer.c:345
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Visualizador de certificado: %s"
 
-#: ../smime/gui/component.c:46
+#: ../smime/gui/component.c:50
 #, c-format
 msgid "Enter the password for '%s'"
 msgstr "Digite a senha para \"%s\""
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:69
+#: ../smime/gui/component.c:76
 msgid "Enter new password for certificate database"
 msgstr "Digite a nova senha para o banco de dados de certificados"
 
-#: ../smime/gui/component.c:71
+#: ../smime/gui/component.c:78
 msgid "Enter new password"
 msgstr "Digite a nova senha"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:116
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -20593,7 +19968,7 @@ msgstr ""
 "Emitido para:\n"
 "     Assunto: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:117
+#: ../smime/gui/e-cert-selector.c:119
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -20602,7 +19977,7 @@ msgstr ""
 "Emitido por:\n"
 "    Assunto: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:169
+#: ../smime/gui/e-cert-selector.c:172
 msgid "Select certificate"
 msgstr "Selecionar certificado"
 
@@ -20626,7 +20001,7 @@ msgstr ""
 "Antes de confiar neste CA para qualquer propÃsito vocà deve examinar o seu "
 "certificado e as suas polÃticas e procedimentos (se disponÃveis)."
 
-#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1086
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1097
 msgid "Certificate"
 msgstr "Certificado"
 
@@ -20686,10 +20061,6 @@ msgstr "Valor do campo"
 msgid "Fingerprints"
 msgstr "ImpressÃo digital"
 
-#: ../smime/gui/smime-ui.ui.h:23
-msgid "Issued By"
-msgstr "Emitido por"
-
 #: ../smime/gui/smime-ui.ui.h:24
 msgid "Issued On"
 msgstr "Emitido em"
@@ -20698,10 +20069,6 @@ msgstr "Emitido em"
 msgid "Issued To"
 msgstr "Emitido para"
 
-#: ../smime/gui/smime-ui.ui.h:26
-msgid "MD5 Fingerprint"
-msgstr "ImpressÃo digital MD5"
-
 #: ../smime/gui/smime-ui.ui.h:27
 msgid "Organization (O)"
 msgstr "OrganizaÃÃo (O)"
@@ -20710,15 +20077,11 @@ msgstr "OrganizaÃÃo (O)"
 msgid "Organizational Unit (OU)"
 msgstr "Unidade organizacional (OU)"
 
-#: ../smime/gui/smime-ui.ui.h:29
-msgid "SHA1 Fingerprint"
-msgstr "ImpressÃo digital SHA1"
-
-#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:824
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:829
 msgid "SSL Client Certificate"
 msgstr "Certificado do cliente SSL"
 
-#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:828
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:833
 msgid "SSL Server Certificate"
 msgstr "Certificado do servidor SSL"
 
@@ -20774,7 +20137,7 @@ msgstr "_Backup"
 msgid "_Edit CA Trust"
 msgstr "_Editar confianÃa da CA"
 
-#: ../smime/lib/e-cert-db.c:906
+#: ../smime/lib/e-cert-db.c:912
 msgid "Certificate already exists"
 msgstr "O certificado jà existe"
 
@@ -20783,191 +20146,193 @@ msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:414
+#: ../smime/lib/e-cert.c:417
 msgid "Sign"
 msgstr "Assinar"
 
-#: ../smime/lib/e-cert.c:415
+#: ../smime/lib/e-cert.c:418
 msgid "Encrypt"
 msgstr "Criptografar"
 
-#: ../smime/lib/e-cert.c:527
+#: ../smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "VersÃo"
 
-#: ../smime/lib/e-cert.c:542
+#: ../smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "VersÃo 1"
 
-#: ../smime/lib/e-cert.c:545
+#: ../smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "VersÃo 2"
 
-#: ../smime/lib/e-cert.c:548
+#: ../smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "VersÃo 3"
 
-#: ../smime/lib/e-cert.c:630
+#: ../smime/lib/e-cert.c:634
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 com criptografia RSA"
 
-#: ../smime/lib/e-cert.c:633
+#: ../smime/lib/e-cert.c:637
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 com criptografia RSA"
 
-#: ../smime/lib/e-cert.c:636
+#: ../smime/lib/e-cert.c:640
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 com criptografia RSA"
 
-#: ../smime/lib/e-cert.c:639
+#: ../smime/lib/e-cert.c:643
 msgid "PKCS #1 SHA-256 With RSA Encryption"
 msgstr "PKCS #1 SHA-256 com criptografia RSA"
 
-#: ../smime/lib/e-cert.c:642
+#: ../smime/lib/e-cert.c:646
 msgid "PKCS #1 SHA-384 With RSA Encryption"
 msgstr "PKCS #1 SHA-384 com criptografia RSA"
 
-#: ../smime/lib/e-cert.c:645
+#: ../smime/lib/e-cert.c:649
 msgid "PKCS #1 SHA-512 With RSA Encryption"
 msgstr "PKCS #1 SHA-512 com criptografia RSA"
 
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:676
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 criptografia RSA"
 
-#: ../smime/lib/e-cert.c:675
+#: ../smime/lib/e-cert.c:679
 msgid "Certificate Key Usage"
 msgstr "UtilizaÃÃo da chave do certificado"
 
-#: ../smime/lib/e-cert.c:678
+#: ../smime/lib/e-cert.c:682
 msgid "Netscape Certificate Type"
 msgstr "Tipo de certificado Netscape"
 
-#: ../smime/lib/e-cert.c:681
+#: ../smime/lib/e-cert.c:685
 msgid "Certificate Authority Key Identifier"
 msgstr "Identificador da chave da autoridade certificadora"
 
-#: ../smime/lib/e-cert.c:693
+#: ../smime/lib/e-cert.c:697
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identificador de objeto (%s)"
 
-#: ../smime/lib/e-cert.c:744
+#: ../smime/lib/e-cert.c:749
 msgid "Algorithm Identifier"
 msgstr "Identificador do algoritmo"
 
-#: ../smime/lib/e-cert.c:752
+#: ../smime/lib/e-cert.c:757
 msgid "Algorithm Parameters"
 msgstr "ParÃmetros do algoritmo"
 
-#: ../smime/lib/e-cert.c:774
+#: ../smime/lib/e-cert.c:779
 msgid "Subject Public Key Info"
 msgstr "InformaÃÃo da chave pÃblica do sujeito"
 
-#: ../smime/lib/e-cert.c:779
+#: ../smime/lib/e-cert.c:784
 msgid "Subject Public Key Algorithm"
 msgstr "Algoritmo da chave pÃblica do sujeito"
 
-#: ../smime/lib/e-cert.c:794
+#: ../smime/lib/e-cert.c:799
 msgid "Subject's Public Key"
 msgstr "Chave pÃblica do sujeito"
 
-#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:864
+#: ../smime/lib/e-cert.c:820 ../smime/lib/e-cert.c:870
 msgid "Error: Unable to process extension"
 msgstr "Erro: NÃo à possÃvel processar extensÃo"
 
-#: ../smime/lib/e-cert.c:836 ../smime/lib/e-cert.c:848
+#: ../smime/lib/e-cert.c:841 ../smime/lib/e-cert.c:853
 msgid "Object Signer"
 msgstr "Autor da assinatura do objeto"
 
-#: ../smime/lib/e-cert.c:840
+#: ../smime/lib/e-cert.c:845
 msgid "SSL Certificate Authority"
 msgstr "Autoridade certificadora SSL"
 
-#: ../smime/lib/e-cert.c:844
+#: ../smime/lib/e-cert.c:849
 msgid "Email Certificate Authority"
 msgstr "Autoridade certificadora do e-mail"
 
-#: ../smime/lib/e-cert.c:872
+#: ../smime/lib/e-cert.c:878
 msgid "Signing"
 msgstr "Assinando"
 
-#: ../smime/lib/e-cert.c:876
+#: ../smime/lib/e-cert.c:882
 msgid "Non-repudiation"
 msgstr "NÃo-repÃdio"
 
-#: ../smime/lib/e-cert.c:880
+#: ../smime/lib/e-cert.c:886
 msgid "Key Encipherment"
 msgstr "Criptografia da chave"
 
-#: ../smime/lib/e-cert.c:884
+#: ../smime/lib/e-cert.c:890
 msgid "Data Encipherment"
 msgstr "Criptografia de dados"
 
-#: ../smime/lib/e-cert.c:888
+#: ../smime/lib/e-cert.c:894
 msgid "Key Agreement"
 msgstr "Acordo de chave"
 
-#: ../smime/lib/e-cert.c:892
+#: ../smime/lib/e-cert.c:898
 msgid "Certificate Signer"
 msgstr "Autor da assinatura do certificado"
 
-#: ../smime/lib/e-cert.c:896
+#: ../smime/lib/e-cert.c:902
 msgid "CRL Signer"
 msgstr "Autor da assinatura CRL"
 
-#: ../smime/lib/e-cert.c:944
+#: ../smime/lib/e-cert.c:951
 msgid "Critical"
 msgstr "CrÃtico"
 
-#: ../smime/lib/e-cert.c:946 ../smime/lib/e-cert.c:949
+#: ../smime/lib/e-cert.c:953 ../smime/lib/e-cert.c:956
 msgid "Not Critical"
 msgstr "NÃo crÃtico"
 
-#: ../smime/lib/e-cert.c:970
+#: ../smime/lib/e-cert.c:977
 msgid "Extensions"
 msgstr "ExtensÃes"
 
-#. Translators: This string is used in Certificate details for fields like Issuer
-#. or Subject, which shows the field name on the left and its respective value
-#. on the right, both as stored in the certificate itself. You probably do not
-#. need to change this string, unless changing the order of name and value.
-#. As a result example: "OU = VeriSign Trust Network"
-#.
-#: ../smime/lib/e-cert.c:1045
+#. Translators: This string is used in Certificate
+#. * details for fields like Issuer or Subject, which
+#. * shows the field name on the left and its respective
+#. * value on the right, both as stored in the
+#. * certificate itself.  You probably do not need to
+#. * change this string, unless changing the order of
+#. * name and value.  As a result example:
+#. * "OU = VeriSign Trust Network"
+#: ../smime/lib/e-cert.c:1055
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1100 ../smime/lib/e-cert.c:1223
+#: ../smime/lib/e-cert.c:1111 ../smime/lib/e-cert.c:1234
 msgid "Certificate Signature Algorithm"
 msgstr "Algoritmo da assinatura do certificado"
 
-#: ../smime/lib/e-cert.c:1109
+#: ../smime/lib/e-cert.c:1120
 msgid "Issuer"
 msgstr "Emissor"
 
-#: ../smime/lib/e-cert.c:1164
+#: ../smime/lib/e-cert.c:1175
 msgid "Issuer Unique ID"
 msgstr "ID Ãnico do emissor"
 
-#: ../smime/lib/e-cert.c:1183
+#: ../smime/lib/e-cert.c:1194
 msgid "Subject Unique ID"
 msgstr "ID Ãnico do assunto"
 
-#: ../smime/lib/e-cert.c:1229
+#: ../smime/lib/e-cert.c:1240
 msgid "Certificate Signature Value"
 msgstr "Valor da assinatura do certificado"
 
-#: ../smime/lib/e-pkcs12.c:250
+#: ../smime/lib/e-pkcs12.c:256
 msgid "PKCS12 File Password"
 msgstr "Senha de arquivo PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:251
+#: ../smime/lib/e-pkcs12.c:257
 msgid "Enter password for PKCS12 file:"
 msgstr "Digite a senha para o arquivo PKCS12:"
 
-#: ../smime/lib/e-pkcs12.c:353
+#: ../smime/lib/e-pkcs12.c:363
 msgid "Imported Certificate"
 msgstr "Certificado importado"
 
@@ -21048,7 +20413,7 @@ msgstr "Com _status"
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:789
 msgid "UTC"
 msgstr "UTC"
 
@@ -21078,14 +20443,14 @@ msgstr ""
 msgid "_Selection"
 msgstr "_SeleÃÃo"
 
-#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-define-views-dialog.c:359
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Definir visÃes para %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:354
-#: ../widgets/menus/gal-define-views-dialog.c:356
+#: ../widgets/menus/gal-define-views-dialog.c:367
+#: ../widgets/menus/gal-define-views-dialog.c:369
 msgid "Define Views"
 msgstr "Definir visÃes"
 
@@ -21094,11 +20459,11 @@ msgstr "Definir visÃes"
 msgid "Define Views for \"%s\""
 msgstr "Definir visÃes para \"%s\""
 
-#: ../widgets/menus/gal-view-factory-etable.c:109
+#: ../widgets/menus/gal-view-factory-etable.c:111
 msgid "Table"
 msgstr "Tabela"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:273
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "Salvar a visÃo atual"
 
@@ -21110,7 +20475,7 @@ msgstr "_Criar uma nova visÃo"
 msgid "_Replace existing view"
 msgstr "Substitui_r a visÃo existente"
 
-#: ../widgets/menus/gal-view-new-dialog.c:106
+#: ../widgets/menus/gal-view-new-dialog.c:108
 msgid "Define New View"
 msgstr "Definir nova visÃo"
 
@@ -21126,122 +20491,130 @@ msgstr "Tipo de visÃo"
 msgid "Type of view:"
 msgstr "Tipo de visÃo:"
 
-#: ../widgets/misc/e-account-manager.c:348
+#: ../widgets/misc/e-account-manager.c:353
 msgid "De_fault"
 msgstr "_PadrÃo"
 
-#: ../widgets/misc/e-account-tree-view.c:270
+#: ../widgets/misc/e-account-tree-view.c:243
+msgid "Account Name"
+msgstr "Nome da conta"
+
+#: ../widgets/misc/e-account-tree-view.c:274
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../widgets/misc/e-attachment-dialog.c:303
+#: ../widgets/misc/e-attachment-dialog.c:308
 msgid "Attachment Properties"
 msgstr "Propriedades do anexo"
 
-#: ../widgets/misc/e-attachment-dialog.c:325
+#: ../widgets/misc/e-attachment-dialog.c:330
 msgid "_Filename:"
 msgstr "_Nome do arquivo:"
 
-#: ../widgets/misc/e-attachment-dialog.c:360
+#: ../widgets/misc/e-attachment-dialog.c:365
 msgid "MIME Type:"
 msgstr "Tipo MIME:"
 
-#: ../widgets/misc/e-attachment-dialog.c:368
-#: ../widgets/misc/e-attachment-store.c:529
+#: ../widgets/misc/e-attachment-dialog.c:373
+#: ../widgets/misc/e-attachment-store.c:559
 msgid "_Suggest automatic display of attachment"
 msgstr "_Sugerir exibiÃÃo automÃtica do anexo"
 
-#: ../widgets/misc/e-attachment-handler-image.c:96
+#: ../widgets/misc/e-attachment-handler-image.c:95
 msgid "Could not set as background"
 msgstr "NÃo foi possÃvel definir como imagem de fundo"
 
-#: ../widgets/misc/e-attachment-handler-image.c:148
+#: ../widgets/misc/e-attachment-handler-image.c:145
 msgid "Set as _Background"
 msgstr "Usar como Imagem de _Fundo"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:90
+#: ../widgets/misc/e-attachment-handler-sendto.c:93
 msgid "Could not send attachment"
 msgid_plural "Could not send attachments"
 msgstr[0] "NÃo foi possÃvel enviar o anexo"
 msgstr[1] "NÃo foi possÃvel enviar os anexos"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:132
+#: ../widgets/misc/e-attachment-handler-sendto.c:135
 msgid "_Send To..."
 msgstr "_Enviar para..."
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:134
+#: ../widgets/misc/e-attachment-handler-sendto.c:137
 msgid "Send the selected attachments somewhere"
 msgstr "Enviar os anexos selecionados para algum lugar"
 
-#: ../widgets/misc/e-attachment-icon-view.c:158
-#: ../widgets/misc/e-attachment-tree-view.c:541
+#: ../widgets/misc/e-attachment-icon-view.c:162
+#: ../widgets/misc/e-attachment-tree-view.c:547
 msgid "Loading"
 msgstr "Carregando"
 
-#: ../widgets/misc/e-attachment-icon-view.c:170
-#: ../widgets/misc/e-attachment-tree-view.c:553
+#: ../widgets/misc/e-attachment-icon-view.c:174
+#: ../widgets/misc/e-attachment-tree-view.c:559
 msgid "Saving"
 msgstr "Salvando"
 
-#: ../widgets/misc/e-attachment-paned.c:93
+#: ../widgets/misc/e-attachment-paned.c:97
 msgid "Hide Attachment _Bar"
 msgstr "Ocultar _barra de anexos"
 
-#: ../widgets/misc/e-attachment-paned.c:95
-#: ../widgets/misc/e-attachment-paned.c:633
+#: ../widgets/misc/e-attachment-paned.c:99
+#: ../widgets/misc/e-attachment-paned.c:639
 msgid "Show Attachment _Bar"
 msgstr "Mostrar _barra de anexos"
 
-#: ../widgets/misc/e-attachment-store.c:517
+#: ../widgets/misc/e-attachment-store.c:547
 msgid "Add Attachment"
 msgstr "Adicionar um anexo"
 
-#: ../widgets/misc/e-attachment-store.c:520
+#: ../widgets/misc/e-attachment-store.c:550
 msgid "A_ttach"
 msgstr "Ane_xar"
 
-#: ../widgets/misc/e-attachment-store.c:583
+#: ../widgets/misc/e-attachment-store.c:613
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Salvar anexo"
 msgstr[1] "Salvar anexos"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:612
-#: ../widgets/misc/e-attachment.c:1805 ../widgets/misc/e-attachment.c:2347
+#: ../widgets/misc/e-attachment-store.c:642
+#: ../widgets/misc/e-attachment.c:1810 ../widgets/misc/e-attachment.c:2352
 msgid "attachment.dat"
 msgstr "anexo.dat"
 
-#: ../widgets/misc/e-attachment-view.c:349
+#: ../widgets/misc/e-attachment-view.c:404
+msgid "Open With Other Application..."
+msgstr "Abrir com outro aplicativo..."
+
+#: ../widgets/misc/e-attachment-view.c:411
 msgid "S_ave All"
 msgstr "Salvar _tudo"
 
-#: ../widgets/misc/e-attachment-view.c:375
+#: ../widgets/misc/e-attachment-view.c:437
 msgid "A_dd Attachment..."
 msgstr "A_dicionar anexo..."
 
-#: ../widgets/misc/e-attachment-view.c:399
+#: ../widgets/misc/e-attachment-view.c:461
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: ../widgets/misc/e-attachment-view.c:406
+#: ../widgets/misc/e-attachment-view.c:468
 msgid "Hid_e All"
 msgstr "Oculta_r tudo"
 
-#: ../widgets/misc/e-attachment-view.c:413
+#: ../widgets/misc/e-attachment-view.c:475
 msgid "_View Inline"
 msgstr "_Ver embutido"
 
-#: ../widgets/misc/e-attachment-view.c:420
+#: ../widgets/misc/e-attachment-view.c:482
 msgid "Vie_w All Inline"
 msgstr "Ver tudo e_mbutido"
 
-#: ../widgets/misc/e-attachment-view.c:738
+#: ../widgets/misc/e-attachment-view.c:803
 #, c-format
-msgid "Open with \"%s\""
+msgid "Open With \"%s\""
 msgstr "Abrir com \"%s\""
 
-#: ../widgets/misc/e-attachment-view.c:741
+#: ../widgets/misc/e-attachment-view.c:806
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Abrir este anexo em %s"
@@ -21250,124 +20623,128 @@ msgstr "Abrir este anexo em %s"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:993
+#: ../widgets/misc/e-attachment.c:998
 msgid "Attached message"
 msgstr "Mensagem anexada"
 
-#: ../widgets/misc/e-attachment.c:1848 ../widgets/misc/e-attachment.c:2649
+#: ../widgets/misc/e-attachment.c:1853 ../widgets/misc/e-attachment.c:2654
 msgid "A load operation is already in progress"
 msgstr "Um processo de carregamento jà està em progresso"
 
-#: ../widgets/misc/e-attachment.c:1856 ../widgets/misc/e-attachment.c:2657
+#: ../widgets/misc/e-attachment.c:1861 ../widgets/misc/e-attachment.c:2662
 msgid "A save operation is already in progress"
 msgstr "Uma operaÃÃo de salvar jà està em progresso"
 
-#: ../widgets/misc/e-attachment.c:1948
+#: ../widgets/misc/e-attachment.c:1953
 #, c-format
 msgid "Could not load '%s'"
 msgstr "NÃo foi possÃvel carregar \"%s\""
 
-#: ../widgets/misc/e-attachment.c:1951
+#: ../widgets/misc/e-attachment.c:1956
 #, c-format
 msgid "Could not load the attachment"
 msgstr "NÃo foi possÃvel carregar o anexo"
 
-#: ../widgets/misc/e-attachment.c:2227
+#: ../widgets/misc/e-attachment.c:2232
 #, c-format
 msgid "Could not open '%s'"
 msgstr "NÃo foi possÃvel abrir \"%s\""
 
-#: ../widgets/misc/e-attachment.c:2230
+#: ../widgets/misc/e-attachment.c:2235
 #, c-format
 msgid "Could not open the attachment"
 msgstr "NÃo foi possÃvel abrir o anexo"
 
-#: ../widgets/misc/e-attachment.c:2665
+#: ../widgets/misc/e-attachment.c:2670
 msgid "Attachment contents not loaded"
 msgstr "NÃo foi possÃvel carregar o conteÃdo do anexo"
 
-#: ../widgets/misc/e-attachment.c:2741
+#: ../widgets/misc/e-attachment.c:2746
 #, c-format
 msgid "Could not save '%s'"
 msgstr "NÃo foi possÃvel salvar \"%s\""
 
-#: ../widgets/misc/e-attachment.c:2744
+#: ../widgets/misc/e-attachment.c:2749
 #, c-format
 msgid "Could not save the attachment"
 msgstr "NÃo foi possÃvel salvar o anexo"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../widgets/misc/e-buffer-tagger.c:359
+#: ../widgets/misc/e-buffer-tagger.c:387
 msgid "Ctrl-click to open a link"
 msgstr "Clique pressionando o Ctrl para abrir um atalho"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1229
+#: ../widgets/misc/e-calendar-item.c:1249
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:225
+#: ../widgets/misc/e-calendar.c:226
 msgid "Month Calendar"
 msgstr "Agenda mensal"
 
-#: ../widgets/misc/e-charset-combo-box.c:92
+#: ../widgets/misc/e-charset-combo-box.c:96
 msgid "Character Encoding"
 msgstr "CodificaÃÃo de caracteres"
 
-#: ../widgets/misc/e-charset-combo-box.c:115
+#: ../widgets/misc/e-charset-combo-box.c:119
 msgid "Enter the character set to use"
 msgstr "Digite o conjunto de caracteres a ser usado"
 
-#: ../widgets/misc/e-charset-combo-box.c:334
+#: ../widgets/misc/e-charset-combo-box.c:339
 msgid "Other..."
 msgstr "Outro..."
 
-#: ../widgets/misc/e-dateedit.c:500
+#: ../widgets/misc/e-contact-map-window.c:355
+msgid "Contacts Map"
+msgstr "Mapa de contatos"
+
+#: ../widgets/misc/e-dateedit.c:501
 msgid "Date and Time"
 msgstr "Data e hora"
 
-#: ../widgets/misc/e-dateedit.c:521
+#: ../widgets/misc/e-dateedit.c:522
 msgid "Text entry to input date"
 msgstr "Entrada de texto para digitar data"
 
-#: ../widgets/misc/e-dateedit.c:543
+#: ../widgets/misc/e-dateedit.c:544
 msgid "Click this button to show a calendar"
 msgstr "Clique neste botÃo para mostrar uma agenda"
 
-#: ../widgets/misc/e-dateedit.c:590
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "Caixa desdobrÃvel de seleÃÃo para selecionar o horÃrio"
 
-#: ../widgets/misc/e-dateedit.c:662
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "Agora"
 
-#: ../widgets/misc/e-dateedit.c:668
+#: ../widgets/misc/e-dateedit.c:669
 msgid "_Today"
 msgstr "Hoje"
 
 #. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: ../widgets/misc/e-dateedit.c:676
+#. * is not permitted.
+#: ../widgets/misc/e-dateedit.c:677
 msgid "_None"
 msgstr "_Nenhum"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1685 ../widgets/misc/e-dateedit.c:1917
+#: ../widgets/misc/e-dateedit.c:1688 ../widgets/misc/e-dateedit.c:1921
 msgctxt "date"
 msgid "None"
 msgstr "Nenhum"
 
-#: ../widgets/misc/e-dateedit.c:1812
+#: ../widgets/misc/e-dateedit.c:1815
 msgid "Invalid Date Value"
 msgstr "Data invÃlida"
 
-#: ../widgets/misc/e-dateedit.c:1856
+#: ../widgets/misc/e-dateedit.c:1859
 msgid "Invalid Time Value"
 msgstr "Hora invÃlida"
 
-#: ../widgets/misc/e-import-assistant.c:245
+#: ../widgets/misc/e-import-assistant.c:249
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -21375,37 +20752,37 @@ msgstr ""
 "Escolha o arquivo que vocà deseja importar para o Evolution e selecione o "
 "tipo de arquivo na lista."
 
-#: ../widgets/misc/e-import-assistant.c:262
+#: ../widgets/misc/e-import-assistant.c:266
 msgid "F_ilename:"
 msgstr "_Nome do arquivo:"
 
-#: ../widgets/misc/e-import-assistant.c:272
+#: ../widgets/misc/e-import-assistant.c:276
 msgid "Select a file"
 msgstr "Selecionar um arquivo"
 
-#: ../widgets/misc/e-import-assistant.c:286
-#: ../widgets/misc/e-import-assistant.c:461
+#: ../widgets/misc/e-import-assistant.c:290
+#: ../widgets/misc/e-import-assistant.c:465
 msgid "File _type:"
 msgstr "_Tipo do arquivo:"
 
-#: ../widgets/misc/e-import-assistant.c:329
-#: ../widgets/misc/e-import-assistant.c:905
+#: ../widgets/misc/e-import-assistant.c:333
+#: ../widgets/misc/e-import-assistant.c:913
 msgid "Choose the destination for this import"
 msgstr "Escolher o destino para esta importaÃÃo"
 
-#: ../widgets/misc/e-import-assistant.c:354
+#: ../widgets/misc/e-import-assistant.c:358
 msgid "Choose the type of importer to run:"
 msgstr "Escolha o tipo de importador a executar:"
 
-#: ../widgets/misc/e-import-assistant.c:362
+#: ../widgets/misc/e-import-assistant.c:366
 msgid "Import data and settings from _older programs"
 msgstr "Importar _dados e configuraÃÃes de programas antigos"
 
-#: ../widgets/misc/e-import-assistant.c:370
+#: ../widgets/misc/e-import-assistant.c:374
 msgid "Import a _single file"
 msgstr "Importar _um Ãnico arquivo"
 
-#: ../widgets/misc/e-import-assistant.c:522
+#: ../widgets/misc/e-import-assistant.c:526
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -21417,37 +20794,37 @@ msgstr ""
 "favor clique no botÃo \"Voltar\"."
 
 #. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:762
+#: ../widgets/misc/e-import-assistant.c:768
 msgid "_Cancel Import"
 msgstr "_Cancelar importaÃÃo"
 
-#: ../widgets/misc/e-import-assistant.c:904
+#: ../widgets/misc/e-import-assistant.c:912
 msgid "Preview data to be imported"
 msgstr "PrÃ-visualizar os dados a serem importados"
 
-#: ../widgets/misc/e-import-assistant.c:910
-#: ../widgets/misc/e-import-assistant.c:923
-#: ../widgets/misc/e-import-assistant.c:1270
-#: ../widgets/misc/e-import-assistant.c:1336
-#: ../widgets/misc/e-import-assistant.c:1345
+#: ../widgets/misc/e-import-assistant.c:918
+#: ../widgets/misc/e-import-assistant.c:931
+#: ../widgets/misc/e-import-assistant.c:1276
+#: ../widgets/misc/e-import-assistant.c:1352
+#: ../widgets/misc/e-import-assistant.c:1361
 msgid "Import Data"
 msgstr "Importar data"
 
-#: ../widgets/misc/e-import-assistant.c:918
+#: ../widgets/misc/e-import-assistant.c:926
 msgid "Select what type of file you want to import from the list."
 msgstr "Selecione da lista qual o tipo de arquivo vocà deseja importar."
 
-#: ../widgets/misc/e-import-assistant.c:1260
-#: ../widgets/misc/e-import-assistant.c:1294
+#: ../widgets/misc/e-import-assistant.c:1266
+#: ../widgets/misc/e-import-assistant.c:1301
 msgid "Evolution Import Assistant"
 msgstr "Assistente de importaÃÃo do Evolution"
 
-#: ../widgets/misc/e-import-assistant.c:1277
-#: ../widgets/misc/e-import-assistant.c:1324
+#: ../widgets/misc/e-import-assistant.c:1283
+#: ../widgets/misc/e-import-assistant.c:1339
 msgid "Import Location"
 msgstr "Importar local"
 
-#: ../widgets/misc/e-import-assistant.c:1288
+#: ../widgets/misc/e-import-assistant.c:1294
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -21457,28 +20834,28 @@ msgstr ""
 "Este assistente irà guiÃ-lo atravÃs do processo de importaÃÃo de arquivos "
 "externos para o Evolution."
 
-#: ../widgets/misc/e-import-assistant.c:1302
+#: ../widgets/misc/e-import-assistant.c:1311
 msgid "Importer Type"
 msgstr "Importar tipo"
 
-#: ../widgets/misc/e-import-assistant.c:1310
+#: ../widgets/misc/e-import-assistant.c:1321
 msgid "Select Information to Import"
 msgstr "Escolha qual informaÃÃo importar"
 
-#: ../widgets/misc/e-import-assistant.c:1317
+#: ../widgets/misc/e-import-assistant.c:1330
 msgid "Select a File"
 msgstr "Selecionar um arquivo"
 
-#: ../widgets/misc/e-import-assistant.c:1331
+#: ../widgets/misc/e-import-assistant.c:1347
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr ""
 "Clique em \"Aplicar\" para comeÃar a importar o arquivo para o Evolution. "
 
-#: ../widgets/misc/e-map.c:866
+#: ../widgets/misc/e-map.c:883
 msgid "World Map"
 msgstr "Mapa-MÃndi"
 
-#: ../widgets/misc/e-map.c:869
+#: ../widgets/misc/e-map.c:886
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21487,74 +20864,74 @@ msgstr ""
 "usuÃrios de teclado devem selecionar o fuso horÃrio usando a caixa "
 "desdobrÃvel de seleÃÃo abaixo."
 
-#: ../widgets/misc/e-online-button.c:23
+#: ../widgets/misc/e-online-button.c:27
 msgid "Evolution is currently online.  Click this button to work offline."
 msgstr ""
 "O Evolution està atualmente conectado.  Clique neste botÃo para trabalhar "
 "desconectado."
 
-#: ../widgets/misc/e-online-button.c:26
+#: ../widgets/misc/e-online-button.c:30
 msgid "Evolution is currently offline.  Click this button to work online."
 msgstr ""
 "O Evolution està atualmente desconectado.  Clique neste botÃo para trabalhar "
 "conectado."
 
-#: ../widgets/misc/e-online-button.c:29
+#: ../widgets/misc/e-online-button.c:33
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr ""
 "O Evolution està atualmente desconectado pelo fato da rede nÃo estar "
 "disponÃvel."
 
-#: ../widgets/misc/e-preferences-window.c:274
+#: ../widgets/misc/e-preferences-window.c:279
 msgid "Evolution Preferences"
 msgstr "PreferÃncias do Evolution"
 
-#: ../widgets/misc/e-search-bar.c:75
+#: ../widgets/misc/e-search-bar.c:81
 #, c-format
 msgid "Matches: %d"
 msgstr "OcorrÃncias: %d"
 
-#: ../widgets/misc/e-search-bar.c:556
+#: ../widgets/misc/e-search-bar.c:563
 msgid "Close the find bar"
 msgstr "Fechar a barra de pesquisa"
 
-#: ../widgets/misc/e-search-bar.c:564
+#: ../widgets/misc/e-search-bar.c:571
 msgid "Fin_d:"
 msgstr "Locali_zar:"
 
-#: ../widgets/misc/e-search-bar.c:576
+#: ../widgets/misc/e-search-bar.c:583
 msgid "Clear the search"
 msgstr "Fechar a pesquisa"
 
-#: ../widgets/misc/e-search-bar.c:600
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Previous"
 msgstr "Anterio_r"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:613
 msgid "Find the previous occurrence of the phrase"
 msgstr "Localizar a ocorrÃncia anterior da frase"
 
-#: ../widgets/misc/e-search-bar.c:619
+#: ../widgets/misc/e-search-bar.c:626
 msgid "_Next"
 msgstr "PrÃxi_ma"
 
-#: ../widgets/misc/e-search-bar.c:625
+#: ../widgets/misc/e-search-bar.c:632
 msgid "Find the next occurrence of the phrase"
 msgstr "Localizar a prÃxima ocorrÃncia da frase"
 
-#: ../widgets/misc/e-search-bar.c:638
+#: ../widgets/misc/e-search-bar.c:645
 msgid "Mat_ch case"
 msgstr "Diferen_ciar maiÃsculas de minÃsculas"
 
-#: ../widgets/misc/e-search-bar.c:666
+#: ../widgets/misc/e-search-bar.c:673
 msgid "Reached bottom of page, continued from top"
 msgstr "AlcanÃado o final da pÃgina, continuando do comeÃo"
 
-#: ../widgets/misc/e-search-bar.c:688
+#: ../widgets/misc/e-search-bar.c:695
 msgid "Reached top of page, continued from bottom"
 msgstr "AlcanÃado o comeÃo da pÃgina, continuando do final"
 
-#: ../widgets/misc/e-send-options.c:543
+#: ../widgets/misc/e-send-options.c:552
 msgid "When de_leted:"
 msgstr "Quando exc_luÃda:"
 
@@ -21689,38 +21066,38 @@ msgctxt "send-options"
 msgid "None"
 msgstr "Nenhum"
 
-#: ../widgets/misc/e-signature-editor.c:134
-#: ../widgets/misc/e-signature-editor.c:559
-#: ../widgets/misc/e-signature-manager.c:348
-#: ../widgets/misc/e-signature-script-dialog.c:215
+#: ../widgets/misc/e-signature-editor.c:138
+#: ../widgets/misc/e-signature-editor.c:564
+#: ../widgets/misc/e-signature-manager.c:372
+#: ../widgets/misc/e-signature-script-dialog.c:219
 msgid "Unnamed"
 msgstr "Sem nome"
 
-#: ../widgets/misc/e-signature-editor.c:210
+#: ../widgets/misc/e-signature-editor.c:214
 msgid "_Save and Close"
 msgstr "_Salvar e fechar"
 
-#: ../widgets/misc/e-signature-editor.c:426
+#: ../widgets/misc/e-signature-editor.c:431
 msgid "Edit Signature"
 msgstr "Editar assinatura"
 
-#: ../widgets/misc/e-signature-editor.c:441
+#: ../widgets/misc/e-signature-editor.c:446
 msgid "_Signature Name:"
 msgstr "Nome da a_ssinatura:"
 
-#: ../widgets/misc/e-signature-manager.c:293
+#: ../widgets/misc/e-signature-manager.c:317
 msgid "Add Signature Script"
 msgstr "Adicionar script de assinatura"
 
-#: ../widgets/misc/e-signature-manager.c:358
+#: ../widgets/misc/e-signature-manager.c:382
 msgid "Edit Signature Script"
 msgstr "Editar script de assinatura"
 
-#: ../widgets/misc/e-signature-manager.c:576
+#: ../widgets/misc/e-signature-manager.c:602
 msgid "Add _Script"
 msgstr "Adicionar _script"
 
-#: ../widgets/misc/e-signature-script-dialog.c:262
+#: ../widgets/misc/e-signature-script-dialog.c:268
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -21730,11 +21107,11 @@ msgstr ""
 "assinatura. O nome que vocà especificar serÃ\n"
 "usado apenas com o propÃsito de exibiÃÃo."
 
-#: ../widgets/misc/e-signature-script-dialog.c:307
+#: ../widgets/misc/e-signature-script-dialog.c:313
 msgid "S_cript:"
 msgstr "S_cript:"
 
-#: ../widgets/misc/e-signature-script-dialog.c:338
+#: ../widgets/misc/e-signature-script-dialog.c:344
 msgid "Script file must be executable."
 msgstr "O arquivo de script deve ser executÃvel."
 
@@ -21742,114 +21119,122 @@ msgstr "O arquivo de script deve ser executÃvel."
 msgid "Click here to go to URL"
 msgstr "Clicar aqui para ir para URL"
 
-#: ../widgets/misc/e-web-view.c:369
+#: ../widgets/misc/e-web-view.c:410
 msgid "_Copy Link Location"
 msgstr "Copiar local do _link"
 
-#: ../widgets/misc/e-web-view.c:371
+#: ../widgets/misc/e-web-view.c:412
 msgid "Copy the link to the clipboard"
 msgstr "Copia coisas para a Ãrea de transferÃncia"
 
-#: ../widgets/misc/e-web-view.c:379
+#: ../widgets/misc/e-web-view.c:420
 msgid "_Open Link in Browser"
 msgstr "Abrir atalho n_o navegador"
 
-#: ../widgets/misc/e-web-view.c:381
+#: ../widgets/misc/e-web-view.c:422
 msgid "Open the link in a web browser"
 msgstr "Abrir o atalho em um navegador"
 
-#: ../widgets/misc/e-web-view.c:389
+#: ../widgets/misc/e-web-view.c:430
 msgid "_Copy Email Address"
 msgstr "_Copiar endereÃo de e-mail"
 
-#: ../widgets/misc/e-web-view.c:418 ../widgets/misc/e-web-view.c:1073
+#: ../widgets/misc/e-web-view.c:447
+msgid "_Copy Image"
+msgstr "_Copiar imagem"
+
+#: ../widgets/misc/e-web-view.c:449
+msgid "Copy the image to the clipboard"
+msgstr "Copiar a imagem para a Ãrea de transferÃncia"
+
+#: ../widgets/misc/e-web-view.c:469 ../widgets/misc/e-web-view.c:1318
 msgid "Select all text and images"
 msgstr "Seleciona todo o texto e imagens"
 
-#: ../widgets/misc/e-web-view.c:850 ../widgets/misc/e-web-view.c:852
-#: ../widgets/misc/e-web-view.c:854
+#: ../widgets/misc/e-web-view.c:982 ../widgets/misc/e-web-view.c:984
+#: ../widgets/misc/e-web-view.c:986
 #, c-format
 msgid "Click to call %s"
 msgstr "Clique para chamar %s"
 
-#: ../widgets/misc/e-web-view.c:856
+#: ../widgets/misc/e-web-view.c:988
 msgid "Click to hide/unhide addresses"
 msgstr "Clique para ocultar/mostrar endereÃos"
 
-#: ../widgets/misc/e-web-view.c:858
+#: ../widgets/misc/e-web-view.c:990
 #, c-format
 msgid "Click to open %s"
 msgstr "Clique para abrir %s"
 
-#: ../widgets/misc/ea-calendar-item.c:299
-#: ../widgets/misc/ea-calendar-item.c:308
+#: ../widgets/misc/ea-calendar-item.c:306
+#: ../widgets/misc/ea-calendar-item.c:315
 msgid "%d %B %Y"
 msgstr "%d de %B de %Y"
 
-#: ../widgets/misc/ea-calendar-item.c:311
+#: ../widgets/misc/ea-calendar-item.c:318
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Agenda: de %s a %s"
 
-#: ../widgets/misc/ea-calendar-item.c:347
+#: ../widgets/misc/ea-calendar-item.c:354
 msgid "evolution calendar item"
 msgstr "item de agenda do Evolution"
 
-#: ../widgets/table/e-cell-combo.c:174
+#: ../widgets/table/e-cell-combo.c:187
 msgid "popup list"
 msgstr "lista suspensa"
 
-#: ../widgets/table/e-cell-date-edit.c:300
+#: ../widgets/table/e-cell-date-edit.c:299
 msgid "Now"
 msgstr "Agora"
 
 #. Translators: "None" as a label of a button to unset date in a date table cell
-#: ../widgets/table/e-cell-date-edit.c:317
+#: ../widgets/table/e-cell-date-edit.c:316
 msgctxt "table-date"
 msgid "None"
 msgstr "Nenhum"
 
-#: ../widgets/table/e-cell-date-edit.c:325
+#: ../widgets/table/e-cell-date-edit.c:324
 msgid "OK"
 msgstr "OK"
 
-#: ../widgets/table/e-cell-date-edit.c:869
+#: ../widgets/table/e-cell-date-edit.c:868
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "A hora deve estar no formato: %s"
 
-#: ../widgets/table/e-cell-percent.c:76
+#: ../widgets/table/e-cell-percent.c:80
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "O valor percentual deve estar entre 0 e 100, inclusive"
 
-#: ../widgets/table/e-table-click-to-add.c:592
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
+#: ../widgets/table/e-table-click-to-add.c:607
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:62
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:143
 msgid "click to add"
 msgstr "clique para adicionar"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
 msgid "(Ascending)"
 msgstr "(Crescente)"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
 msgid "(Descending)"
 msgstr "(Decrescente)"
 
-#: ../widgets/table/e-table-config.c:392
+#: ../widgets/table/e-table-config.c:400
 msgid "Not sorted"
 msgstr "NÃo ordenado"
 
-#: ../widgets/table/e-table-config.c:433
+#: ../widgets/table/e-table-config.c:441
 msgid "No grouping"
 msgstr "Sem agrupamento"
 
-#: ../widgets/table/e-table-config.c:654
+#: ../widgets/table/e-table-config.c:666
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "Mostrar campos"
 
-#: ../widgets/table/e-table-config.c:674
+#: ../widgets/table/e-table-config.c:686
 msgid "Available Fields"
 msgstr "Campos disponÃveis"
 
@@ -21858,7 +21243,7 @@ msgid "A_vailable Fields:"
 msgstr "Campos DisponÃ_veis:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1660
+#: ../widgets/table/e-table-header-item.c:1717
 msgid "Ascending"
 msgstr "Crescente"
 
@@ -21871,7 +21256,7 @@ msgid "Clear _All"
 msgstr "Limpar _tudo"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1660
+#: ../widgets/table/e-table-header-item.c:1717
 msgid "Descending"
 msgstr "Decrescente"
 
@@ -21919,6 +21304,10 @@ msgstr "_Campos mostrados..."
 msgid "_Group By..."
 msgstr "A_grupar por..."
 
+#: ../widgets/table/e-table-config.ui.h:21
+msgid "_Remove"
+msgstr "_Remover"
+
 #: ../widgets/table/e-table-config.ui.h:22
 msgid "_Show field in View"
 msgstr "Mo_strar o campo na VisÃo"
@@ -21931,12 +21320,12 @@ msgstr "_Mostrar estes campos na ordem:"
 msgid "_Sort..."
 msgstr "_Ordenar..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:117
+#: ../widgets/table/e-table-field-chooser-dialog.c:119
 msgid "Add a Column"
 msgstr "Adicionar uma coluna"
 
 # ajustei para ter o mesmo nÃmero de linhas
-#: ../widgets/table/e-table-field-chooser.c:151
+#: ../widgets/table/e-table-field-chooser.c:153
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -21945,13 +21334,13 @@ msgstr ""
 "arraste-a para o local onde deve aparecer."
 
 #. Translators: This text is used as a special row when an ETable
-#. has turned on grouping on a column, which has set a title.
-#. The first %s is replaced with a column title.
-#. The second %s is replaced with an actual  group value.
-#. Finally the %d is replaced with count of items in this group.
-#. Example: "Family name: Smith (13 items)"
+#. * has turned on grouping on a column, which has set a title.
+#. * The first %s is replaced with a column title.
+#. * The second %s is replaced with an actual  group value.
+#. * Finally the %d is replaced with count of items in this group.
+#. * Example: "Family name: Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:361
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
@@ -21959,115 +21348,736 @@ msgstr[0] "%s: %s (%d item)"
 msgstr[1] "%s: %s (%d itens)"
 
 #. Translators: This text is used as a special row when an ETable
-#. has turned on grouping on a column, which doesn't have set a title.
-#. The %s is replaced with an actual group value.
-#. The %d is replaced with count of items in this group.
-#. Example: "Smith (13 items)"
+#. * has turned on grouping on a column, which doesn't have set a title.
+#. * The %s is replaced with an actual group value.
+#. * The %d is replaced with count of items in this group.
+#. * Example: "Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:363
+#: ../widgets/table/e-table-group-container.c:373
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d item)"
 msgstr[1] "%s (%d itens)"
 
-#: ../widgets/table/e-table-header-item.c:1504
+#: ../widgets/table/e-table-header-item.c:1557
 msgid "Customize Current View"
 msgstr "Personalizar visÃo atual"
 
-#: ../widgets/table/e-table-header-item.c:1525
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Sort _Ascending"
 msgstr "Ordem _crescente"
 
-#: ../widgets/table/e-table-header-item.c:1528
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Sort _Descending"
 msgstr "Ordem _decrescente"
 
-#: ../widgets/table/e-table-header-item.c:1531
+#: ../widgets/table/e-table-header-item.c:1585
 msgid "_Unsort"
 msgstr "NÃo _ordenar"
 
-#: ../widgets/table/e-table-header-item.c:1534
+#: ../widgets/table/e-table-header-item.c:1588
 msgid "Group By This _Field"
 msgstr "Agrupar por este _campo"
 
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1591
 msgid "Group By _Box"
 msgstr "Agrupar por c_aixa"
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1595
 msgid "Remove This _Column"
 msgstr "Remover esta _coluna"
 
-#: ../widgets/table/e-table-header-item.c:1544
+#: ../widgets/table/e-table-header-item.c:1598
 msgid "Add a C_olumn..."
 msgstr "Adicionar uma c_oluna..."
 
-#: ../widgets/table/e-table-header-item.c:1548
+#: ../widgets/table/e-table-header-item.c:1602
 msgid "A_lignment"
 msgstr "A_linhamento"
 
-#: ../widgets/table/e-table-header-item.c:1551
+#: ../widgets/table/e-table-header-item.c:1605
 msgid "B_est Fit"
 msgstr "M_elhor ajuste"
 
-#: ../widgets/table/e-table-header-item.c:1554
+#: ../widgets/table/e-table-header-item.c:1608
 msgid "Format Column_s..."
 msgstr "Formatar coluna_s..."
 
-#: ../widgets/table/e-table-header-item.c:1558
+#: ../widgets/table/e-table-header-item.c:1612
 msgid "Custo_mize Current View..."
 msgstr "Perso_nalizar visÃo atual..."
 
-#: ../widgets/table/e-table-header-item.c:1617
+#: ../widgets/table/e-table-header-item.c:1674
 msgid "_Sort By"
 msgstr "_Ordenar por"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1635
+#: ../widgets/table/e-table-header-item.c:1692
 msgid "_Custom"
 msgstr "_Personalizar"
 
 #. Translators: description of a "popup" action
-#: ../widgets/table/gal-a11y-e-cell-popup.c:123
+#: ../widgets/table/gal-a11y-e-cell-popup.c:125
 msgid "popup a child"
 msgstr "popup um filho"
 
 #. Translators: description of a "toggle" action
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:178
 msgid "toggle the cell"
 msgstr "alternar esta cÃlula"
 
 #. Translators: description of an "expand" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:212
+#: ../widgets/table/gal-a11y-e-cell-tree.c:214
 msgid "expands the row in the ETree containing this cell"
 msgstr "expandir a linha na ETree contendo esta cÃlula"
 
 #. Translators: description of a "collapse" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:219
+#: ../widgets/table/gal-a11y-e-cell-tree.c:221
 msgid "collapses the row in the ETree containing this cell"
 msgstr "recolhe a linha na ETree contendo esta cÃlula"
 
-#: ../widgets/table/gal-a11y-e-cell.c:119
+#: ../widgets/table/gal-a11y-e-cell.c:123
 msgid "Table Cell"
 msgstr "CÃlula de tabela"
 
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:67
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:72
 msgid "click"
 msgstr "clicar"
 
-#: ../widgets/table/gal-a11y-e-table-column-header.c:154
+#: ../widgets/table/gal-a11y-e-table-column-header.c:158
 msgid "sort"
 msgstr "ordenar"
 
-#: ../widgets/text/e-text.c:2283
+#: ../widgets/text/e-text.c:2327
 msgid "Select All"
 msgstr "Selecionar tudo"
 
-#: ../widgets/text/e-text.c:2295
+#: ../widgets/text/e-text.c:2339
 msgid "Input Methods"
 msgstr "MÃtodos de entrada"
 
+#~ msgid "Edit Alarm"
+#~ msgstr "Editar alarme"
+
+#~ msgid "Add Alarm"
+#~ msgstr "Adicionar alarme"
+
+#~ msgid "Alarm"
+#~ msgstr "Alarme"
+
+#~ msgid "Alarms"
+#~ msgstr "Alarmes"
+
+#~ msgid "Click here to close the current window"
+#~ msgstr "Clicar aqui para fechar a janela atual"
+
+#~ msgid "Click here to view help available"
+#~ msgstr "Clicar aqui para ver a ajuda disponÃvel"
+
+#~ msgid "Click here to save the current window"
+#~ msgstr "Clicar aqui para salvar a janela atual"
+
+#~ msgid "Click here to attach a file"
+#~ msgstr "Clicar aqui para anexar um arquivo"
+
+#~ msgid "_Alarms"
+#~ msgstr "Alarmes"
+
+#~ msgctxt "cal-alarms"
+#~ msgid "None"
+#~ msgstr "Nenhum"
+
+#~ msgid "Custom Alarm:"
+#~ msgstr "Som de alarme personalizado"
+
+#~ msgid "_Alarm"
+#~ msgstr "_Alarme"
+
+#~ msgid "_Group:"
+#~ msgstr "_Grupo:"
+
+#~ msgid "It has alarms."
+#~ msgstr "Tem alarmes."
+
+#~ msgctxt "iCalImp"
+#~ msgid "has alarms"
+#~ msgstr "tem alarmes"
+
+#~ msgid "Please select a folder from the current account."
+#~ msgstr "Por favor, selecione uma pasta para a conta atual."
+
+#~ msgid "_Default junk plugin:"
+#~ msgstr "Plug-in pa_drÃo de spam"
+
+#~ msgid "_Use Secure Connection:"
+#~ msgstr "_Usar conexÃo segura:"
+
+#~ msgid "Local Folders"
+#~ msgstr "Pastas locais"
+
+#~ msgid "Alarm programs"
+#~ msgstr "Programas de alarme"
+
+#~ msgid "Save as iCalendar..."
+#~ msgstr "Salvar como iCalendar..."
+
+#~ msgctxt "mail-junk-hook"
+#~ msgid "None"
+#~ msgstr "Nenhum"
+
+#~ msgid "%s plugin is available and the binary is installed."
+#~ msgstr "O plug-in %s està disponÃvel e o binÃrio està instalado."
+
+#~ msgid ""
+#~ "%s plugin is not available. Please check whether the package is installed."
+#~ msgstr ""
+#~ "O plug-in %s nÃo esta disponÃvel. Por favor, verifique se o pacote esta "
+#~ "instalado."
+
+#~ msgid "No junk plugin available"
+#~ msgstr "NÃo hà plug-in de Spam disponÃvel"
+
+#~ msgid "Bogofilter is not available. Please install it first."
+#~ msgstr "O Bogofilter nÃo està disponÃvel. Por favor, instale-o primeiro."
+
+#~ msgid "Error occurred while spawning %s: %s."
+#~ msgstr "Ocorreu um erro ao criar %s: %s."
+
+#~ msgid "Bogofilter child process does not respond, killing..."
+#~ msgstr "Processo filho de Bogofilter nÃo responde, matando..."
+
+#~ msgid "Wait for Bogofilter child process interrupted, terminating..."
+#~ msgstr ""
+#~ "Espera pelo processo filho de Bogofilter interrompida, terminando..."
+
+#~ msgid "Pipe to Bogofilter failed, error code: %d."
+#~ msgstr "O pipe para Bogofilter falhou, cÃdigo de erro: %d."
+
+#~ msgid "Bogofilter Junk Filter"
+#~ msgstr "Filtro de spam Bogofilter"
+
+#~ msgid "Filter junk messages using Bogofilter."
+#~ msgstr "Filtra mensagens de spam usando o Bogofilter."
+
+#~ msgid "Use _SSL"
+#~ msgstr "Usar _SSL"
+
+#~ msgid "_Secure connection"
+#~ msgstr "ConexÃo _segura"
+
+#~ msgid "Enable D-Bus messages."
+#~ msgstr "Habilitar mensagens D-Bus."
+
+#~ msgid "Generates a D-Bus message when new mail messages arrive."
+#~ msgstr "Gera uma mensagem D-Bus quando uma nova mensagem chegar."
+
+#~ msgid "Popup message together with the icon."
+#~ msgstr "Mensagem instantÃnea junto com Ãcone."
+
+#~ msgid "Whether show message over the icon when new messages arrive."
+#~ msgstr "Mostrar uma mensagem sobre o Ãcone quando uma nova mensagem chegar."
+
+#~ msgid "Show icon in _notification area"
+#~ msgstr "Mostrar Ãcone na Ãrea de _notificaÃÃo"
+
+#~ msgid "Popup _message together with the icon"
+#~ msgstr "_Mensagem flutuante junto com o Ãcone"
+
+#~ msgid "Generate a _D-Bus message"
+#~ msgstr "Gerar uma mensagem _D-Bus"
+
+#~ msgid ""
+#~ "Selected calendar contains some events for the given mails already. Would "
+#~ "you like to create new events anyway?"
+#~ msgstr ""
+#~ "O calendÃrio selecionado jà contÃm alguns dos eventos desta mensagem. "
+#~ "Vocà gostaria de criar novos eventos assim mesmo?"
+
+#~ msgid ""
+#~ "Selected task list contains some tasks for the given mails already. Would "
+#~ "you like to create new tasks anyway?"
+#~ msgstr ""
+#~ "A lista de tarefas selecionada jà contÃm algumas das tarefas desta "
+#~ "mensagem. Vocà gostaria de criar novas tarefas assim mesmo?"
+
+#~ msgid ""
+#~ "Selected memo list contains some memos for the given mails already. Would "
+#~ "you like to create new memos anyway?"
+#~ msgstr ""
+#~ "A lista de memorandos selecionada jà contÃm alguns dos memorandos desta "
+#~ "mensagem. Vocà gostaria de criar novos memorandos assim mesmo?"
+
+#~ msgid ""
+#~ "Selected calendar contains an event for the given mail already. Would you "
+#~ "like to create new event anyway?"
+#~ msgid_plural ""
+#~ "Selected calendar contains events for the given mails already. Would you "
+#~ "like to create new events anyway?"
+#~ msgstr[0] ""
+#~ "O calendÃrio selecionado jà contÃm um evento desta mensagem. Vocà "
+#~ "gostaria de criar um novo evento assim mesmo?"
+#~ msgstr[1] ""
+#~ "O calendÃrio selecionado jà contÃm eventos destas mensagens. Vocà "
+#~ "gostaria de criar novos eventos assim mesmo?"
+
+#~ msgid ""
+#~ "Selected task list contains a task for the given mail already. Would you "
+#~ "like to create new task anyway?"
+#~ msgid_plural ""
+#~ "Selected task list contains tasks for the given mails already. Would you "
+#~ "like to create new tasks anyway?"
+#~ msgstr[0] ""
+#~ "A lista de tarefas selecionada jà contÃm uma tarefa desta mensagem. Vocà "
+#~ "gostaria de criar uma nova tarefa assim mesmo?"
+#~ msgstr[1] ""
+#~ "A lista de tarefas selecionada jà contÃm tarefas destas mensagens. Vocà "
+#~ "gostaria de criar novas tarefas assim mesmo?"
+
+#~ msgid ""
+#~ "Selected memo list contains a memo for the given mail already. Would you "
+#~ "like to create new memo anyway?"
+#~ msgid_plural ""
+#~ "Selected memo list contains memos for the given mails already. Would you "
+#~ "like to create new memos anyway?"
+#~ msgstr[0] ""
+#~ "A lista de memorandos selecionada jà contÃm um memorando desta mensagem. "
+#~ "Vocà gostaria de criar um novo memorando assim mesmo?"
+#~ msgstr[1] ""
+#~ "A lista de memorandos selecionada jà contÃm memorandos destas mensagens. "
+#~ "Vocà gostaria de criar novos memorandos assim mesmo?"
+
+#~ msgid "SpamAssassin not found, code: %d"
+#~ msgstr "SpamAssassin nÃo localizado, cÃdigo: %d"
+
+#~ msgid "Failed to create pipe: %s"
+#~ msgstr "Falha ao criar o pipe: %s"
+
+#~ msgid "Error after fork: %s"
+#~ msgstr "Erro apÃs a bifurcaÃÃo: %s"
+
+#~ msgid "SpamAssassin child process does not respond, killing..."
+#~ msgstr "O processo filho de SpamAssassin nÃo responde, matando..."
+
+#~ msgid "Wait for SpamAssassin child process interrupted, terminating..."
+#~ msgstr ""
+#~ "A espera pelo processo filho de Spamassassin foi interrompida, "
+#~ "terminando..."
+
+#~ msgid "Pipe to SpamAssassin failed, error code: %d"
+#~ msgstr "O pipe para SpamAssassin falhou, cÃdigo de erro: %d"
+
+#~ msgid "SpamAssassin is not available. Please install it first."
+#~ msgstr "O SpamAssassin nÃo està disponÃvel. Por favor, instale-o  primeiro."
+
+#~ msgid "SpamAssassin Junk Filter"
+#~ msgstr "Filtro de spam SpamAssassin"
+
+#~ msgid "iCalendar format (.ics)"
+#~ msgstr "Formato iCalendar (.ics)"
+
+#~ msgid "Evolution _FAQ"
+#~ msgstr "_FAQ do Evolution"
+
+#~ msgid "Open the Frequently Asked Questions webpage"
+#~ msgstr "Abre a pÃgina das perguntas freqÃentes (FAQ)"
+
+#~ msgid "E-Mail Address"
+#~ msgstr "EndereÃo de e-mail"
+
+#~ msgid "Invalid object"
+#~ msgstr "Objeto invÃlido"
+
+#~ msgid "The organizer selected no longer has an account."
+#~ msgstr "O organizador selecionado nÃo possui mais uma conta."
+
+#~ msgid "Run Anjal in a window"
+#~ msgstr "Executar Anjal em uma janela"
+
+#~ msgid "Make Anjal the default email client"
+#~ msgstr "Definir o Anjal como cliente de e-mail padrÃo"
+
+#~ msgid "Anjal email client"
+#~ msgstr "Cliente de e-mail Anjal"
+
+#~ msgid "Opening folder '%s'"
+#~ msgstr "Abrindo pasta \"%s\""
+
+#~ msgid "Scanning folders in \"%s\""
+#~ msgstr "Varrendo pastas em \"%s\""
+
+#~ msgid "Creating folder '%s'"
+#~ msgstr "Criando pasta \"%s\""
+
+#~ msgid "Scanning folders in '%s'"
+#~ msgstr "Varrendo pastas em \"%s\""
+
+#~ msgid "Retrieving quota information for folder '%s'"
+#~ msgstr "Recuperando informaÃÃes de cota da pasta \"%s\""
+
+#~ msgid "Opening store '%s'"
+#~ msgstr "Abrindo repositÃrio \"%s\""
+
+#~ msgid "Error saving messages to: %s:\n"
+#~ msgstr "Erro ao salvar mensagens para: %s:\n"
+
+#~ msgid "Checking Service"
+#~ msgstr "Verificando serviÃo"
+
+#~ msgid "Updating Search Folders for '%s'"
+#~ msgstr "Atualizando pastas de pesquisa para \"%s\""
+
+#~ msgid "Delete messages in Search Folder \"{0}\"?"
+#~ msgstr "Excluir mensagens na pasta de pesquisa \"{0}\"?"
+
+#~ msgid "Header Value Contains:"
+#~ msgstr "Valor do cabeÃalho contÃm:"
+
+#~ msgid "Show a map of all the contacts"
+#~ msgstr "Mostrar um mapa de todos os contatos"
+
+#~ msgid "Add a map showing the location of contacts when possible."
+#~ msgstr ""
+#~ "Adiciona um mapa mostrando a localizaÃÃo dos contatos quando possÃvel"
+
+#~ msgid "Map for contacts"
+#~ msgstr "Mapa para contatos"
+
+#~ msgid "Checklist"
+#~ msgstr "Lista de tarefas"
+
+#~ msgid "Enter password for %s (user %s)"
+#~ msgstr "Digite a senha para %s (usuÃrio %s)"
+
+#~ msgid "Failed to authenticate.\n"
+#~ msgstr "Falha ao autenticar.\n"
+
+#~ msgid "New _Shared Folder..."
+#~ msgstr "_Nova pasta compartilhada..."
+
+#~ msgid "_Proxy Login..."
+#~ msgstr "Login de _representante..."
+
+#~ msgid "Junk Mail Settings..."
+#~ msgstr "ConfiguraÃÃes de spam..."
+
+#~ msgid "Track Message Status..."
+#~ msgstr "Rastrear status da mensagem..."
+
+#~ msgid "Retract Mail"
+#~ msgstr "Cancelar envio"
+
+#~ msgid "Accept"
+#~ msgstr "Aceitar"
+
+#~ msgid "Accept Tentatively"
+#~ msgstr "Aceitar peliminarmente"
+
+#~ msgid "Decline"
+#~ msgstr "Recusar"
+
+#~ msgid "Rese_nd Meeting..."
+#~ msgstr "E_nviar novamente reuniÃo..."
+
+#~ msgid "Create folder"
+#~ msgstr "Criar pasta"
+
+#~ msgid ""
+#~ "The user '%s' has shared a folder with you\n"
+#~ "\n"
+#~ "Message from '%s'\n"
+#~ "\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "\n"
+#~ "Click 'Apply' to install the shared folder\n"
+#~ "\n"
+#~ msgstr ""
+#~ "O usuÃrio \"%s\" compartilhou uma pasta com vocÃ\n"
+#~ "\n"
+#~ "Mensagem de \"%s\"\n"
+#~ "\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "\n"
+#~ "Clique em \"Aplicar\" para instalar a pasta compartilhada\n"
+#~ "\n"
+
+#~ msgid "Install the shared folder"
+#~ msgstr "Renomear a pasta partilhada"
+
+#~ msgid "Shared Folder Installation"
+#~ msgstr "InstalaÃÃo de pasta compartilhada"
+
+#~ msgid "Junk Settings"
+#~ msgstr "ConfiguraÃÃes de spam"
+
+#~ msgid "Junk Mail Settings"
+#~ msgstr "ConfiguraÃÃes de spam"
+
+#~ msgid "Email:"
+#~ msgstr "E-mail:"
+
+#~ msgid "Junk List:"
+#~ msgstr "Lista de spams:"
+
+#~ msgid "_Enable"
+#~ msgstr "_Habilitar"
+
+#~ msgid "_Junk List"
+#~ msgstr "Lista de spa_ms"
+
+#~ msgid "Message Retract"
+#~ msgstr "Cancelar envio"
+
+#~ msgid ""
+#~ "Retracting a message may remove it from the recipient's mailbox. Are you "
+#~ "sure you want to do this?"
+#~ msgstr ""
+#~ "Cancelar o envio de uma mensagem pode removÃ-la da caixa de correio do "
+#~ "destinatÃrio. Vocà tem certeza que quer fazer isso?"
+
+#~ msgid "Message retracted successfully"
+#~ msgstr "Envio cancelado com sucesso"
+
+#~ msgid "Insert Send options"
+#~ msgstr "Inserir opÃÃes de envio"
+
+#~ msgid "The participants will receive the following notification.\n"
+#~ msgstr "Os participantes receberÃo a seguinte notificaÃÃo.\n"
+
+#~ msgid "Add Send Options to GroupWise messages"
+#~ msgstr "Adicionar opÃÃes de envio para mensagens GroupWise"
+
+#~ msgid "Fine-tune your GroupWise accounts."
+#~ msgstr "Ajustar suas contas GroupWise."
+
+#~ msgid "GroupWise Features"
+#~ msgstr "Recursos do GroupWise"
+
+#~ msgid "Message retract failed"
+#~ msgstr "Falha ao retirar a mensagem"
+
+#~ msgid "The server did not allow the selected message to be retracted."
+#~ msgstr "O servidor nÃo permitiu que a mensagem selecionada fosse retirada."
+
+#~ msgid ""
+#~ "Account &quot;{0}&quot; already exists. Please check your folder tree."
+#~ msgstr ""
+#~ "A conta &quot;{0}&quot; jà existe. Por favor verifique a sua Ãrvore de "
+#~ "pastas."
+
+#~ msgid "Account Already Exists"
+#~ msgstr "A conta jà existe"
+
+#~ msgid "Invalid user"
+#~ msgstr "UsuÃrio invÃlido"
+
+#~ msgid ""
+#~ "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+#~ "address and try again."
+#~ msgstr ""
+#~ "O login de representante como &quot;{0}&quot; nÃo foi bem-sucedido. Por "
+#~ "favor verifique o seu endereÃo de e-mail e teste novamente."
+
+#~ msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+#~ msgstr ""
+#~ "NÃo à possÃvel conceder acesso de representante ao usuÃrio &quot;{0}"
+#~ "&quot;."
+
+#~ msgid "Specify User"
+#~ msgstr "Especificar usuÃrio"
+
+#~ msgid "You have already given proxy permissions to this user."
+#~ msgstr "Vocà jà concedeu as permissÃes de representante a este usuÃrio."
+
+#~ msgid "You have to specify a valid user name to give proxy rights."
+#~ msgstr ""
+#~ "Vocà tem que especificar um nome de usuÃrio vÃlido para conceder direitos "
+#~ "de representante."
+
+#~ msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+#~ msgstr "Vocà nÃo pode compartilhar pasta com o usuÃrio &quot;{0}&quot;"
+
+#~ msgid "You have to specify a user name which you want to add to the list"
+#~ msgstr ""
+#~ "Vocà tem que especificar um nome de usuÃrio que quer adicionar à lista"
+
+#~ msgid "Do you want to resend the meeting?"
+#~ msgstr "Vocà deseja enviar esta reuniÃo novamente?"
+
+#~ msgid "Do you want to resend the recurring meeting?"
+#~ msgstr "Vocà deseja enviar esta reuniÃo recorrente novamente?"
+
+#~ msgid "Do you want to retract the original item?"
+#~ msgstr "Vocà cancelar o item original?"
+
+#~ msgid "The original will be removed from the recipient's mailbox."
+#~ msgstr "O original serà removido da caixa de correio do destinatÃrio."
+
+#~ msgid "This is a recurring meeting"
+#~ msgstr "Este à um evento recorrente"
+
+#~ msgid "This will create a new meeting using the existing meeting details."
+#~ msgstr ""
+#~ "Isto vai criar uma nova reuniÃo usando os detalhes da reuniÃo atual."
+
+#~ msgid ""
+#~ "This will create a new meeting with the existing meeting details. The "
+#~ "recurrence rule needs to be re-entered."
+#~ msgstr ""
+#~ "Isto vai criar uma nova reuniÃo com os detalhes da reuniÃo atual. Ã "
+#~ "necessÃrio digitar novamente a regra de recorrÃncia."
+
+#~ msgid "Would you like to accept it?"
+#~ msgstr "Vocà gostaria de aceitÃ-la?"
+
+#~ msgid "Would you like to decline it?"
+#~ msgstr "Vocà gostaria de recusÃ-la?"
+
+#~ msgid "C_ustomize notification message"
+#~ msgstr "_Personalizar a mensagem de notificaÃÃo"
+
+#~ msgid "Con_tacts..."
+#~ msgstr "Con_tatos..."
+
+#~ msgid "Users:"
+#~ msgstr "UsuÃrios:"
+
+#~ msgid "_Not Shared"
+#~ msgstr "_NÃo compartilhada"
+
+#~ msgid "_Shared With..."
+#~ msgstr "_Compartilhada com..."
+
+#~ msgid "Access Rights"
+#~ msgstr "Direitos de acesso"
+
+#~ msgid "Add/Edit"
+#~ msgstr "Adicionar/Editar"
+
+#~ msgid "Con_tacts"
+#~ msgstr "Con_tatos"
+
+#~ msgid "Modify _folders/options/rules/"
+#~ msgstr "Modificar _pastas/opÃÃes/regras/"
+
+#~ msgid "Read items marked _private"
+#~ msgstr "Ler itens marcados _particular"
+
+#~ msgid "Subscribe to my _alarms"
+#~ msgstr "Assinar meus _alarmes"
+
+#~ msgid "Subscribe to my _notifications"
+#~ msgstr "Assinar minhas _notificaÃÃes"
+
+#~ msgid "_Write"
+#~ msgstr "_Escrever"
+
+#~ msgid "permission to read|_Read"
+#~ msgstr "_Lida"
+
+#~ msgid "Proxy"
+#~ msgstr "Representante"
+
+#~ msgid "Proxy Login"
+#~ msgstr "Login de representante"
+
+#~ msgid "%sEnter password for %s (user %s)"
+#~ msgstr "%sDigite a senha para %s (usuÃrio %s)"
+
+#~ msgid "The Proxy tab will be available only when the account is online."
+#~ msgstr ""
+#~ "A aba Representante estarà disponÃvel somente quando a conta estiver "
+#~ "conectada."
+
+#~ msgid "The Proxy tab will be available only when the account is enabled."
+#~ msgstr ""
+#~ "A aba Representante estarà disponÃvel somente quando a conta estiver "
+#~ "habilitada."
+
+#~ msgctxt "GW"
+#~ msgid "Proxy"
+#~ msgstr "Proxy"
+
+#~ msgid "Add User"
+#~ msgstr "Adicionar usuÃrio"
+
+#~ msgid "Advanced send options"
+#~ msgstr "OpÃÃes avanÃadas de envio"
+
+#~ msgid "Users"
+#~ msgstr "UsuÃrios"
+
+#~ msgid "Enter the users and set permissions"
+#~ msgstr "Digite os usuÃrios e defina as permissÃes"
+
+#~ msgid "Sharing"
+#~ msgstr "Compartilhamento"
+
+#~ msgid "Custom Notification"
+#~ msgstr "NotificaÃÃo personalizada"
+
+#~ msgid "Add   "
+#~ msgstr "Adicionar   "
+
+#~ msgid "Modify"
+#~ msgstr "Modificar"
+
+#~ msgid "Message Status"
+#~ msgstr "Status da mensagem"
+
+#~ msgid "Subject:"
+#~ msgstr "Assunto:"
+
+#~ msgid "From:"
+#~ msgstr "De:"
+
+#~ msgid "Creation date:"
+#~ msgstr "Data de criaÃÃo:"
+
+#~ msgid "Recipient: "
+#~ msgstr "DestinatÃrio: "
+
+#~ msgid "Delivered: "
+#~ msgstr "Entregue: "
+
+#~ msgid "Opened: "
+#~ msgstr "Aberto: "
+
+#~ msgid "Accepted: "
+#~ msgstr "Aceito: "
+
+#~ msgid "Deleted: "
+#~ msgstr "ExcluÃda: "
+
+#~ msgid "Declined: "
+#~ msgstr "Recusado: "
+
+#~ msgid "Completed: "
+#~ msgstr "Completada: "
+
+#~ msgid "Undelivered: "
+#~ msgstr "NÃo entregue: "
+
+#~ msgid "Evolution Profiler"
+#~ msgstr "Controlador de perfil do Evolution"
+
+#~ msgid "Profile data events in Evolution (for developers only)."
+#~ msgstr ""
+#~ "Analisar dados de eventos no Evolution (somente para desenvolvedores)."
+
+#~ msgid "Drafts based template plugin"
+#~ msgstr "Plug-in de modelo baseado em rascunho"
+
+#~ msgid "Failed to import contact's certificate"
+#~ msgstr "Falhou ao importar certificado do contato"
+
+#~ msgid "Failed to import certificate authority's certificate"
+#~ msgstr "Fallhou ao importar o certificado de autoridade"
+
 #~ msgid "(map)"
 #~ msgstr "(mapa)"
 
@@ -22193,9 +22203,6 @@ msgstr "MÃtodos de entrada"
 #~ msgid "%s has published meeting information."
 #~ msgstr "%s publicou informaÃÃes sobre a reuniÃo."
 
-#~ msgid "Meeting Information"
-#~ msgstr "InformaÃÃes de reuniÃo"
-
 #~ msgid "%s requests the presence of %s at a meeting."
 #~ msgstr "%s solicita a presenÃa de %s em uma reuniÃo."
 



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