[evolution] Updated Portuguese translation

From: Duarte Loreto <dnloreto src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution] Updated Portuguese translation
Date: Mon, 20 Sep 2010 00:48:38 +0000 (UTC)
commit 8dd861ca3277f62ac83159dc2bbd5e6155fd78b1
Author: Duarte Loreto <happyguy_pt hotmail com>
Date:   Mon Sep 20 01:48:31 2010 +0100

    Updated Portuguese translation

 po/pt.po |12097 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 6268 insertions(+), 5829 deletions(-)
---
diff --git a/po/pt.po b/po/pt.po
index 9bc1f33..1f90a14 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -4,13 +4,13 @@
 # Duarte Loreto <happyguy_pt hotmail com>, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010.
 # Tiago AntÃ£o <tiagoantao bigfoot com>, 2000.
 #
-#: ../shell/main.c:479
+#: ../shell/main.c:559
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.30\n"
+"Project-Id-Version: 2.32\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-18 01:08+0000\n"
-"PO-Revision-Date: 2010-03-18 01:10+0000\n"
+"POT-Creation-Date: 2010-09-20 01:48+0100\n"
+"PO-Revision-Date: 2010-09-18 14:00+0000\n"
 "Last-Translator: Duarte Loreto <happyguy_pt hotmail com>\n"
 "Language-Team: Portuguese <gnome_pt yahoogroups com>\n"
 "MIME-Version: 1.0\n"
@@ -85,45 +85,50 @@ msgid "Delete address book '{0}'?"
 msgstr "Apagar o livro de endereÃ§os '{0}'?"
 
 #: ../addressbook/addressbook.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
+msgid "Do _Not Delete"
+msgstr "_NÃ£o Apagar"
+
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Erro ao gravar {0} para {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "Failed to authenticate with LDAP server."
 msgstr "Falha ao autenticar-se no servidor LDAP."
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:15
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1265
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Failed to delete contact"
 msgstr "Falha ao apagar o contacto"
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "GroupWise Address book creation:"
 msgstr "CriaÃ§Ã£o de Livro de EndereÃ§os Groupwise:"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
 msgstr "O servidor LDAP nÃ£o respondeu com informaÃ§Ã£o de esquema vÃ¡lida."
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "Some features may not work properly with your current server"
 msgstr ""
 "Algumas funcionalidades poderÃ£o nÃ£o funcionar correctamente com a versÃ£o "
 "actual do servidor"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "O livro de endereÃ§os do Evolution terminou inesperadamente."
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:21
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "A imagem que seleccionou Ã© demasiado grande. Deseja redimensionÃ¡-la e "
 "armazenÃ¡-la?"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:22
 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 "
@@ -133,17 +138,17 @@ msgstr ""
 "suporta esta funcionalidade, ou estar mal configurado. PeÃ§a ao administrador "
 "do servidor por suporte para bases de procura."
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "This address book could not be opened."
 msgstr "Incapaz de abrir este livro de endereÃ§os."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "This address book server does not have any suggested search bases."
 msgstr ""
 "Este servidor de livros de endereÃ§os nÃ£o possui nenhuma base de procura "
 "sugerida."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:25
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -151,31 +156,31 @@ msgstr ""
 "Este servidor de livro de endereÃ§os pode estar indisponÃvel, o nome do "
 "servidor mal escrito ou a sua ligaÃ§Ã£o Ã  rede em baixo."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This address book will be removed permanently."
 msgstr "Este livro de endereÃ§os serÃ¡ definitivamente removido."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Este servidor nÃ£o suporta esquema de informaÃ§Ã£o LDAPv3."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "Unable to open address book"
 msgstr "Incapaz de abrir o livro de endereÃ§os"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to perform search."
 msgstr "Incapaz de efectuar a procura."
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to save {0}."
 msgstr "Incapaz de gravar {0}."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Would you like to save your changes?"
 msgstr "Deseja gravar as suas alteraÃ§Ãµes?"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:32
 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?"
@@ -183,7 +188,7 @@ msgstr ""
 "EstÃ¡ a tentar mover um contacto de um livro de endereÃ§os para outro mas este "
 "nÃ£o pode ser removido da origem. Deseja antes gravar uma cÃ³pia?"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:33
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -193,73 +198,49 @@ msgstr ""
 "problemas na utilizaÃ§Ã£o do Evolution. Para melhores resultados o servidor "
 "deverÃ¡ ser actualizado para uma versÃ£o suportada"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "NÃ£o possui permissÃµes para apagar contactos neste livro de endereÃ§os."
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:35
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "Efectuou alteraÃ§Ãµes a este contacto. Deseja gravar estas alteraÃ§Ãµes?"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Os seus contactos para {0} nÃ£o estarÃ£o disponÃveis atÃ© que o Evolution seja "
 "reiniciado."
 
-#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
+#: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:525
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
-#: ../plugins/groupwise-features/properties.ui.h:10
+#: ../plugins/groupwise-features/properties.ui.h:9
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "_Adicionar"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Do not save"
 msgstr "_NÃ£o gravar"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Resize"
 msgstr "_Redimensionar"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:41
 msgid "_Use as it is"
 msgstr "_Utilizar tal como estÃ¡"
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:145
-msgid "{0}"
-msgstr "{0}"
-
-#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:44
-msgid "{1}"
-msgstr "{1}"
-
-#: ../addressbook/conduit/address-conduit.c:597
-msgid "Default Sync Address:"
-msgstr "EndereÃ§o de SincronizaÃ§Ã£o Por OmissÃ£o:"
-
-#: ../addressbook/conduit/address-conduit.c:1631
-#: ../addressbook/conduit/address-conduit.c:1632
-msgid "Could not load address book"
-msgstr "Incapaz de ler o livro de endereÃ§os"
-
-#: ../addressbook/conduit/address-conduit.c:1709
-#: ../addressbook/conduit/address-conduit.c:1712
-msgid "Could not read pilot's Address application block"
-msgstr "Incapaz de ler o bloco da aplicaÃ§Ã£o de EndereÃ§os da pilot"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:1987
+#: ../calendar/gui/e-calendar-view.c:2023
 msgid "Anniversary"
 msgstr "AniversÃ¡rio"
 
@@ -270,352 +251,303 @@ msgstr "AniversÃ¡rio"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1986 ../capplet/anjal-settings-main.c:119
-#: ../shell/main.c:112
+#: ../calendar/gui/e-calendar-view.c:2022 ../capplet/anjal-settings-main.c:123
+#: ../shell/main.c:128
 msgid "Birthday"
 msgstr "Data de Nascimento"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
-#: ../calendar/gui/dialogs/event-page.ui.h:7
+#. Translators: an accessibility name
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+msgid "Blog:"
+msgstr "Blog:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tegorias..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 msgid "Calendar:"
 msgstr "CalendÃ¡rio:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1247
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../addressbook/importers/evolution-vcard-importer.c:934
 msgid "Contact"
 msgstr "Contacto"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:590
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2498
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:589
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:604
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2583
 msgid "Contact Editor"
 msgstr "Editor de Contactos"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/merging/eab-contact-merging.c:295
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:517
 #: ../addressbook/gui/widgets/eab-contact-display.c:525
 #: ../addressbook/gui/widgets/eab-contact-display.c:811
-#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:823
+#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "Email"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Free/Busy:"
 msgstr "Livre/Ocupado:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
 msgid "Full _Name..."
 msgstr "_Nome Completo..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../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:70
 msgid "Home"
 msgstr "Casa"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
 msgid "Home Page:"
 msgstr "PÃ¡gina Pessoal:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "Image"
 msgstr "Imagem"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Instant Messaging"
 msgstr "Mensagens InstantÃ¢neas"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "Job"
 msgstr "Emprego"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Mailing Address"
 msgstr "EndereÃ§o de Correio"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 #: ../calendar/gui/dialogs/task-details-page.ui.h:11
 msgid "Miscellaneous"
 msgstr "VÃ¡rios"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
 msgid "Nic_kname:"
 msgstr "Al_cunha:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 #: ../modules/calendar/e-memo-shell-migrate.c:250
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:447
-#: ../plugins/groupwise-features/camel-gw-listener.c:562
+#: ../plugins/groupwise-features/camel-gw-listener.c:423
+#: ../plugins/groupwise-features/camel-gw-listener.c:448
+#: ../plugins/groupwise-features/camel-gw-listener.c:563
 msgid "Notes"
 msgstr "Notas"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../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:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1728
 msgid "Other"
 msgstr "Outro"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "Personal Information"
 msgstr "InformaÃ§Ã£o Pessoal"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
 msgid "Telephone"
 msgstr "Telefone"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "Video Chat:"
 msgstr "DiÃ¡logo VÃdeo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web Addresses"
 msgstr "EndereÃ§os Web"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Web Log:"
-msgstr "DiÃ¡rio na Web:"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+msgid "Web addresses"
+msgstr "EndereÃ§os web"
 
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../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:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
-#: ../mail/e-mail-migrate.c:961
 msgid "Work"
 msgstr "Emprego"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Address:"
 msgstr "_EndereÃ§o:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Anniversary:"
 msgstr "_AniversÃ¡rio:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 msgid "_Assistant:"
 msgstr "_Assistente:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_Birthday:"
 msgstr "_Data de Nascimento:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
-#: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../plugins/itip-formatter/itip-view.c:1913
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+msgid "_Blog:"
+msgstr "_Blog:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../calendar/gui/dialogs/event-page.c:885
+#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../plugins/itip-formatter/itip-view.c:1921
 msgid "_Calendar:"
 msgstr "_CalendÃ¡rio:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_City:"
 msgstr "_Cidade:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_Company:"
 msgstr "_Empresa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Country:"
 msgstr "_PaÃs:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_Department:"
 msgstr "_Departamento:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_File under:"
 msgstr "_Arquivar sob:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Free/Busy:"
 msgstr "_Livre/Ocupado:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_Home Page:"
 msgstr "_PÃ¡gina Pessoal:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Manager:"
 msgstr "_Gestor:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_Office:"
 msgstr "_EscritÃ³rio:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_PO Box:"
 msgstr "_Apartado:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Profession:"
 msgstr "_ProfissÃ£o:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_Spouse:"
 msgstr "_CÃ´njuge:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 msgid "_State/Province:"
 msgstr "E_stado/ProvÃncia:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 #: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "_TÃtulo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "_Video Chat:"
 msgstr "DiÃ¡logo _VÃdeo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 msgid "_Wants to receive HTML mail"
 msgstr "Deseja receber mensagens em _HTML"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-msgid "_Web Log:"
-msgstr "DiÃ¡rio na _Web:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "_Onde:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
 msgid "_Zip/Postal Code:"
 msgstr "CÃ³digo _Postal:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
-#: ../e-util/e-logger.c:174 ../mail/e-mail-label-tree-view.c:96
-#: ../plugins/caldav/caldav-browse-server.c:1159
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:315
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:60
-msgid "Name"
-msgstr "Nome"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
-#: ../addressbook/gui/widgets/e-addressbook-model.c:522
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
-#: ../addressbook/gui/widgets/e-minicard-view.c:548
-#: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1659 ../widgets/text/e-text.c:3441
-#: ../widgets/text/e-text.c:3442
-msgid "Editable"
-msgstr "EditÃ¡vel"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:167
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
 #: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
 #: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
 #: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
 #: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
 #: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
 #: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:546
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:352
 msgid "Error adding contact"
 msgstr "Erro ao adicionar o contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:222
 msgid "Error modifying contact"
 msgstr "Erro ao alterar o contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:236
 msgid "Error removing contact"
 msgstr "Erro ao remover o contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
-msgid "Source Book"
-msgstr "Livro de Origem"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
-msgid "Target Book"
-msgstr "Livro de Destino"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
-msgid "Is New Contact"
-msgstr "Ã? um Novo Contacto"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
-msgid "Writable Fields"
-msgstr "Campos EditÃ¡veis"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
-msgid "Required Fields"
-msgstr "Campos Requeridos"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
-msgid "Changed"
-msgstr "Alterado"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:599
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2578
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de Contactos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3001
 msgid "Please select an image for this contact"
 msgstr "Seleccione uma imagem para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2891
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3002
 msgid "_No image"
 msgstr "_Nenhuma imagem"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3164
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3275
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -623,56 +555,46 @@ msgstr ""
 "Os dados do contacto sÃ£o invÃ¡lidos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3279
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' possui um formato invÃ¡lido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3286
 #, 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:3190
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3312
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' estÃ¡ vazio"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3215
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3326
 msgid "Invalid contact."
 msgstr "Contacto invÃ¡lido."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:355
 msgid "Contact Quick-Add"
 msgstr "AdiÃ§Ã£o RÃ¡pida de Contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
 msgid "_Edit Full"
 msgstr "_EdiÃ§Ã£o Completa"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
 msgid "_Full name"
 msgstr "Nome comp_leto"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:444
 msgid "E_mail"
 msgstr "E_mail"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 msgid "_Select Address Book"
 msgstr "_Seleccione o Livro de EndereÃ§os"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:678
-msgid "Shell"
-msgstr "Consola"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:679
-msgid "The EShell singleton"
-msgstr "O singleton EShell"
-
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Dr."
 msgstr "Dr."
@@ -739,7 +661,7 @@ msgid "_Suffix:"
 msgstr "_Sufixo:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:672
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:659
 msgid "Contact List Editor"
 msgstr "Editor de Lista de Contactos"
 
@@ -765,39 +687,27 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "In_troduza um endereÃ§o de email ou arraste um contacto para a lista abaixo:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:765
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:753
 msgid "Contact List Members"
 msgstr "Membros da Lista de Contacto"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:913
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:907
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1322
 msgid "_Members"
 msgstr "_Membros"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1165
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1160
 msgid "Error adding list"
 msgstr "Erro ao adicionar a lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1174
 msgid "Error modifying list"
 msgstr "Erro ao alterar a lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1188
 msgid "Error removing list"
 msgstr "Erro ao remover a lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-#: ../addressbook/gui/widgets/e-addressbook-model.c:512
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: ../addressbook/gui/widgets/e-minicard-view.c:534
-msgid "Book"
-msgstr "Livro"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
-msgid "Is New List"
-msgstr "Ã? uma Nova Lista"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "Contacto Alterado:"
@@ -836,134 +746,111 @@ msgstr ""
 "pasta.  Ainda assim deseja adicionÃ¡-lo?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:231
+#: ../addressbook/gui/merging/eab-contact-merging.c:241
 msgid "_Merge"
 msgstr "_Agregar"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:216
+#: ../addressbook/gui/merging/eab-contact-merging.c:166
+#: ../addressbook/util/addressbook.c:245 ../calendar/gui/tasktypes.xml.h:7
+#, c-format
+msgid "Cancelled"
+msgstr "Cancelada"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:224
 msgid "Merge Contact"
 msgstr "Agregar Contacto"
 
 #: ../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:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/addressbook/e-book-shell-view-actions.c:920
+#: ../modules/calendar/e-cal-shell-view-actions.c:1687
+#: ../modules/calendar/e-memo-shell-view-actions.c:768
+#: ../modules/calendar/e-task-shell-view-actions.c:967
 msgid "Any field contains"
 msgstr "Qualquer campo contÃ©m"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/addressbook/e-book-shell-view-actions.c:927
 msgid "Email begins with"
 msgstr "Email comeÃ§a por"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:934
 msgid "Name contains"
 msgstr "Nome contÃ©m"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:142
+#: ../addressbook/gui/widgets/e-addressbook-model.c:143
 msgid "No contacts"
 msgstr "Nenhum contacto"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:146
+#: ../addressbook/gui/widgets/e-addressbook-model.c:147
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d contacto"
 msgstr[1] "%d contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:307
+#: ../addressbook/gui/widgets/e-addressbook-model.c:317
 msgid "Error getting book view"
 msgstr "Erro ao obter a vista de livro"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:532
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:420
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
-#: ../addressbook/gui/widgets/e-minicard-view.c:541
-msgid "Query"
-msgstr "Consulta"
-
-#: ../addressbook/gui/widgets/e-addressbook-model.c:706
+#: ../addressbook/gui/widgets/e-addressbook-model.c:716
 msgid "Search Interrupted"
 msgstr "Procura Interrompida"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
-#: ../addressbook/gui/widgets/e-addressbook-view.c:758
-#: ../calendar/gui/e-memo-table.c:1053 ../calendar/gui/e-task-table.c:1352
-#: ../modules/calendar/e-memo-shell-content.c:607
-#: ../modules/calendar/e-task-shell-content.c:629
-#: ../widgets/table/e-table-click-to-add.c:511
-#: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3367
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3308
-#: ../widgets/text/e-text.c:3309
-msgid "Model"
-msgstr "Modelo"
-
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "Erro ao alterar o cartÃ£o"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+#: ../addressbook/gui/widgets/e-addressbook-view.c:626
 msgid "Cut selected contacts to the clipboard"
 msgstr "Cortar os contactos seleccionados para a Ã¡rea de transferÃªncia"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+#: ../addressbook/gui/widgets/e-addressbook-view.c:632
 msgid "Copy selected contacts to the clipboard"
 msgstr "Copiar os contactos seleccionados para a Ã¡rea de transferÃªncia"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+#: ../addressbook/gui/widgets/e-addressbook-view.c:638
 msgid "Paste contacts from the clipboard"
 msgstr "Colar contactos da Ã¡rea de transferÃªncia"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
-#: ../modules/addressbook/e-book-shell-view-actions.c:727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:644
+#: ../modules/addressbook/e-book-shell-view-actions.c:745
 msgid "Delete selected contacts"
 msgstr "Apagar os contactos seleccionados"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:650
 msgid "Select all visible contacts"
 msgstr "Seleccionar todos os contactos visÃveis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:774
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-task-table.c:1369
-msgid "Shell View"
-msgstr "Vista de Consola"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:785
-msgid "Source"
-msgstr "Origem"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1283
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1296
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Tem a certeza de que deseja apagar estas listas de contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1287
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1300
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Tem a certeza de que deseja apagar esta lista de contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1304
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Tem a certeza de que deseja apagar esta lista de contactos (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1297
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1310
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Tem a certeza de que deseja apagar estes contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1301
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1314
 msgid "Are you sure you want to delete this contact?"
 msgstr "Tem a certeza de que deseja apagar este contacto?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1318
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Tem a certeza de que deseja apagar este contacto (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1460
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1473
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -972,11 +859,11 @@ msgstr ""
 "Abrir %d contactos irÃ¡ abrir tambÃ©m %d novas janelas.\n"
 "Deseja mesmo visualizar todos estes contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1465
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1478
 msgid "_Don't Display"
 msgstr "_NÃ£o Apresentar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1466
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1479
 msgid "Display _All Contacts"
 msgstr "Apresentar _Todos os Contactos"
 
@@ -1010,7 +897,7 @@ msgid "Car Phone"
 msgstr "Telefone do Carro"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:5
 #: ../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
@@ -1111,7 +998,7 @@ msgid "Radio"
 msgstr "RÃ¡dio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:578
+#: ../calendar/gui/e-meeting-list-view.c:569
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Cargo"
@@ -1136,7 +1023,6 @@ msgid "Telex"
 msgstr "Telex"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:819
 msgid "Title"
 msgstr "TÃtulo"
 
@@ -1148,59 +1034,7 @@ msgstr "Unidade"
 msgid "Web Site"
 msgstr "PÃ¡gina Web"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/table/e-table-click-to-add.c:525
-#: ../widgets/table/e-table-col.c:121
-#: ../widgets/table/e-table-group-container.c:1002
-#: ../widgets/table/e-table-group-container.c:1003
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:2891 ../widgets/table/e-table-item.c:2892
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
-msgid "Width"
-msgstr "Largura"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/table/e-table-click-to-add.c:532
-#: ../widgets/table/e-table-group-container.c:995
-#: ../widgets/table/e-table-group-container.c:996
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:2897 ../widgets/table/e-table-item.c:2898
-#: ../widgets/text/e-text.c:3490 ../widgets/text/e-text.c:3491
-msgid "Height"
-msgstr "Altura"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
-msgid "Has Focus"
-msgstr "Tem Foco"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "Campo"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "Nome do Campo"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "Modelo de Texto"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "Comprimento mÃ¡x. do nome do campo"
-
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
-msgid "Column Width"
-msgstr "Largura da Coluna"
-
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1210,7 +1044,7 @@ msgstr ""
 "\n"
 "A procurar pelos Contactos..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1224,7 +1058,7 @@ msgstr ""
 "\n"
 "ou faÃ§a clique-duplo aqui para criar um novo Contacto."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:192
 msgid ""
 "\n"
 "\n"
@@ -1238,7 +1072,7 @@ msgstr ""
 "\n"
 "FaÃ§a clique-duplo aqui para criar um novo Contacto."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../addressbook/gui/widgets/e-minicard-view.c:196
 msgid ""
 "\n"
 "\n"
@@ -1248,7 +1082,7 @@ msgstr ""
 "\n"
 "Procure o Contacto."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1258,34 +1092,22 @@ msgstr ""
 "\n"
 "NÃ£o existem itens a apresentar nesta vista."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:527
-msgid "Adapter"
-msgstr "Adaptador"
-
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:102
 msgid "Work Email"
 msgstr "Email Profissional"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:103
 msgid "Home Email"
 msgstr "Email Pessoal"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:797
+#: ../addressbook/gui/widgets/e-minicard.c:104
+#: ../addressbook/gui/widgets/e-minicard.c:810
 msgid "Other Email"
 msgstr "Outro Email"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
-msgid "Selected"
-msgstr "Seleccionado"
-
-#: ../addressbook/gui/widgets/e-minicard.c:184
-msgid "Has Cursor"
-msgstr "Tem Cursor"
-
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:95
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:104
-#: ../addressbook/gui/widgets/ea-minicard-view.c:178
+#: ../addressbook/gui/widgets/ea-minicard-view.c:184
 msgid "evolution address book"
 msgstr "livro de endereÃ§os do evolution"
 
@@ -1297,7 +1119,7 @@ msgstr "Novo Contacto"
 msgid "New Contact List"
 msgstr "Nova Lista de Contactos"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:161
+#: ../addressbook/gui/widgets/ea-minicard-view.c:167
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -1325,17 +1147,17 @@ msgid "Copy _Email Address"
 msgstr "Copiar EndereÃ§o de _Email"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:370
+#: ../widgets/misc/e-web-view.c:396
 msgid "Copy the email address to the clipboard"
 msgstr "Copiar o endereÃ§o de email para a Ã¡rea de transferÃªncia"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:401
 msgid "_Send New Message To..."
 msgstr "_Enviar uma Nova Mensagem Para..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:403
 msgid "Send a mail message to this address"
 msgstr "Enviar uma mensagem de email para este endereÃ§o"
 
@@ -1371,22 +1193,22 @@ msgid "Video Chat"
 msgstr "DiÃ¡logo VÃdeo"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../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:465
-#: ../plugins/groupwise-features/camel-gw-listener.c:420
-#: ../plugins/groupwise-features/camel-gw-listener.c:445
-#: ../plugins/groupwise-features/camel-gw-listener.c:560
-#: ../plugins/hula-account-setup/camel-hula-listener.c:371
-#: ../plugins/hula-account-setup/camel-hula-listener.c:399
+#: ../modules/calendar/e-cal-shell-view.c:488
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../widgets/misc/e-send-options.c:499
 msgid "Calendar"
 msgstr "CalendÃ¡rio"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:563
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
-#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:128
+#: ../calendar/gui/dialogs/event-editor.c:355
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "Livre/Ocupado"
@@ -1414,21 +1236,19 @@ msgid "Web Log"
 msgstr "DiÃ¡rio na Web"
 
 #. Create the default Person addressbook
-#. orange
-#. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:461 ../mail/e-mail-migrate.c:962
-#: ../modules/addressbook/e-book-shell-backend.c:175
-#: ../modules/addressbook/e-book-shell-migrate.c:507
-#: ../modules/calendar/e-cal-shell-backend.c:171
-#: ../modules/calendar/e-cal-shell-migrate.c:574
-#: ../modules/calendar/e-memo-shell-backend.c:154
+#: ../capplet/settings/mail-capplet-shell.c:353
+#: ../modules/addressbook/e-book-shell-backend.c:116
+#: ../modules/addressbook/e-book-shell-migrate.c:138
+#: ../modules/calendar/e-cal-shell-backend.c:127
+#: ../modules/calendar/e-cal-shell-migrate.c:156
+#: ../modules/calendar/e-memo-shell-backend.c:112
 #: ../modules/calendar/e-memo-shell-migrate.c:112
-#: ../modules/calendar/e-task-shell-backend.c:158
-#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../modules/calendar/e-task-shell-backend.c:112
+#: ../modules/calendar/e-task-shell-migrate.c:121
 #: ../plugins/email-custom-header/email-custom-header.c:320
 msgid "Personal"
 msgstr "Pessoal"
@@ -1445,119 +1265,13 @@ msgstr "PÃ¡gina pessoal"
 msgid "Blog"
 msgstr "Blog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1031
-#: ../widgets/misc/e-web-view.c:750
+#: ../addressbook/gui/widgets/eab-contact-display.c:1011
+#: ../widgets/misc/e-web-view.c:853
 #, c-format
 msgid "Click to mail %s"
 msgstr "Clicar para enviar mensagem a %s"
 
-#. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
-msgid "Success"
-msgstr "Sucesso"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
-msgid "Backend busy"
-msgstr "MÃ³dulo de suporte ocupado"
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Repository offline"
-msgstr "RepositÃ³rio desligado"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Address Book does not exist"
-msgstr "Livro de EndereÃ§os nÃ£o existe"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
-msgid "No Self Contact defined"
-msgstr "Nenhum Contacto PrÃ³prio definido"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
-msgid "Permission denied"
-msgstr "AutorizaÃ§Ã£o negada"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Contact not found"
-msgstr "Contacto nÃ£o foi encontrado"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Contact ID already exists"
-msgstr "ID de contacto jÃ¡ existe"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Protocol not supported"
-msgstr "Protocolo nÃ£o Ã© suportado"
-
-#. E_BOOK_ERROR_CANCELLED
-#. To Translators: This is task status
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:584
-#: ../calendar/gui/print.c:2651
-msgid "Canceled"
-msgstr "Cancelado"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
-msgid "Could not cancel"
-msgstr "Incapaz de cancelar"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Authentication Failed"
-msgstr "AutenticaÃ§Ã£o Falhou"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Authentication Required"
-msgstr "AutenticaÃ§Ã£o Requerida"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
-msgid "TLS not Available"
-msgstr "TLS IndisponÃvel"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
 #: ../addressbook/gui/widgets/eab-gui-util.c:71
-msgid "No such source"
-msgstr "Origem inexistente"
-
-#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
-msgid "Not available in offline mode"
-msgstr "IndisponÃvel em modo desligado"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
-msgid "Other error"
-msgstr "Outro erro"
-
-#. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
-msgid "Invalid server version"
-msgstr "VersÃ£o do servidor invÃ¡lida"
-
-#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
-msgid "Unsupported authentication method"
-msgstr "MÃ©todo de autenticaÃ§Ã£o nÃ£o suportado"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:107
 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 "
@@ -1568,7 +1282,7 @@ msgstr ""
 "o seu download. Leia o livro de endereÃ§os uma vez quando ligado para "
 "efectuar o download do seu conteÃºdo."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:116
+#: ../addressbook/gui/widgets/eab-gui-util.c:80
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1577,7 +1291,7 @@ msgstr ""
 "Incapaz de abrir este livro de endereÃ§os.  Certifique-se de que o caminho %s "
 "existe e de que possui permissÃµes para lhe aceder."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:128
+#: ../addressbook/gui/widgets/eab-gui-util.c:92
 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."
@@ -1586,7 +1300,7 @@ msgstr ""
 "utilizar LDAP no Evolution terÃ¡ de instalar um pacote do Evolution com o "
 "LDAP activo."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:137
+#: ../addressbook/gui/widgets/eab-gui-util.c:101
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1594,11 +1308,11 @@ msgstr ""
 "Incapaz de abrir este livro de endereÃ§os.  Isto significa que ou introduziu "
 "um URI incorrecto, ou que o servidor estÃ¡ inacessÃvel."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:145
+#: ../addressbook/gui/widgets/eab-gui-util.c:109
 msgid "Detailed error message:"
 msgstr "Mensagem de erro detalhada:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:168
+#: ../addressbook/gui/widgets/eab-gui-util.c:133
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1610,7 +1324,7 @@ msgstr ""
 "forma mais especÃfica ou aumente o limite de resultados nas preferÃªncias\n"
 "do servidor de directÃ³rio para este livro de endereÃ§os."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:174
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
 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"
@@ -1622,46 +1336,54 @@ msgstr ""
 "forma mais especÃfica ou aumente o limite de tempo nas preferÃªncias do\n"
 "servidor de directÃ³rio deste livro de endereÃ§os."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:180
-msgid "The backend for this address book was unable to parse this query."
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#, c-format
+msgid "The backend for this address book was unable to parse this query. %s"
 msgstr ""
-"O suporte para este livro de endereÃ§os foi incapaz de processar a consulta."
+"O suporte para este livro de endereÃ§os foi incapaz de processar a consulta. %"
+"s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
-msgid "The backend for this address book refused to perform this query."
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
+#, c-format
+msgid "The backend for this address book refused to perform this query. %s"
 msgstr ""
-"O suporte para este livro de endereÃ§os recusou-se a efectuar esta consulta."
+"O suporte para este livro de endereÃ§os recusou-se a efectuar esta consulta. %"
+"s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
-msgid "This query did not complete successfully."
-msgstr "Esta consulta nÃ£o terminou com sucesso."
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#, c-format
+msgid "This query did not complete successfully. %s"
+msgstr "Esta consulta nÃ£o terminou com sucesso. %s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
 msgid "card.vcf"
 msgstr "cartao.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:247
+#: ../addressbook/gui/widgets/eab-gui-util.c:223
 msgid "Select Address Book"
 msgstr "Seleccionar o Livro de EndereÃ§os"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:310
+#: ../addressbook/gui/widgets/eab-gui-util.c:286
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:437
+#: ../addressbook/gui/widgets/eab-gui-util.c:425
 msgid "Move contact to"
 msgstr "Mover contacto para"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:439
+#: ../addressbook/gui/widgets/eab-gui-util.c:427
 msgid "Copy contact to"
 msgstr "Copiar contacto para"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:442
+#: ../addressbook/gui/widgets/eab-gui-util.c:430
 msgid "Move contacts to"
 msgstr "Mover contactos para"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:444
+#: ../addressbook/gui/widgets/eab-gui-util.c:432
 msgid "Copy contacts to"
 msgstr "Copiar contactos para"
 
@@ -1669,54 +1391,61 @@ msgstr "Copiar contactos para"
 msgid "Card View"
 msgstr "Vista de CartÃ£o"
 
-#: ../addressbook/importers/evolution-csv-importer.c:654
+#: ../addressbook/importers/evolution-csv-importer.c:720
 #: ../addressbook/importers/evolution-ldif-importer.c:516
-#: ../addressbook/importers/evolution-vcard-importer.c:253
-#: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
+#: ../addressbook/importers/evolution-vcard-importer.c:264
+#: ../calendar/importers/icalendar-importer.c:325
+#: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "A Importar..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:858
+#: ../addressbook/importers/evolution-csv-importer.c:1008
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "CSV ou Tab do Outlook (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:859
+#: ../addressbook/importers/evolution-csv-importer.c:1009
 msgid "Outlook CSV and Tab Importer"
 msgstr "Importador de CSV e Tabs do Outlook"
 
-#: ../addressbook/importers/evolution-csv-importer.c:867
+#: ../addressbook/importers/evolution-csv-importer.c:1017
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "CSV ou Tab do Mozilla (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:868
+#: ../addressbook/importers/evolution-csv-importer.c:1018
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Importador de CSV e Tabs do Mozilla"
 
-#: ../addressbook/importers/evolution-csv-importer.c:876
+#: ../addressbook/importers/evolution-csv-importer.c:1026
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "CSV ou Tab do Evolution (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:877
+#: ../addressbook/importers/evolution-csv-importer.c:1027
 msgid "Evolution CSV and Tab Importer"
 msgstr "Importador de CSV e Tabs do Evolution"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:689
+#: ../addressbook/importers/evolution-ldif-importer.c:742
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Formato de IntercÃ¢mbio de Dados LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:690
+#: ../addressbook/importers/evolution-ldif-importer.c:743
 msgid "Evolution LDIF importer"
 msgstr "Importador LDIF do Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:556
+#: ../addressbook/importers/evolution-vcard-importer.c:623
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:557
+#: ../addressbook/importers/evolution-vcard-importer.c:624
 msgid "Evolution vCard Importer"
 msgstr "Importador de 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:746
+#, 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
@@ -1731,31 +1460,31 @@ msgstr "Incapaz de obter a lista de livros de endereÃ§os"
 msgid "failed to open book"
 msgstr "falha ao abrir o livro"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:45
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Specify the output file instead of standard output"
 msgstr "Especificar o ficheiro de saÃda em vez da consola"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:46
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "OUTPUTFILE"
 msgstr "FICHEIROSAÃ?DA"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "List local address book folders"
 msgstr "Listar as pastas locais de livros de endereÃ§os"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:52
+#: ../addressbook/tools/evolution-addressbook-export.c:66
 msgid "Show cards as vcard or csv file"
 msgstr "Apresentar cartÃµes como vcards ou ficheiros csv"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:53
+#: ../addressbook/tools/evolution-addressbook-export.c:67
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:70
 msgid "Export in asynchronous mode"
 msgstr "Exportar em modo assÃncrono"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:73
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
@@ -1763,30 +1492,30 @@ msgstr ""
 "O nÃºmero de cartÃµes num ficheiro de saÃda em modo assÃncrono, o tamanho por "
 "omissÃ£o Ã© 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:75
 msgid "NUMBER"
 msgstr "NÃ?MERO"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:101
+#: ../addressbook/tools/evolution-addressbook-export.c:137
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Erro de argumentos de linha de comando, utilize --help para consultar a "
 "ajuda."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:115
+#: ../addressbook/tools/evolution-addressbook-export.c:151
 msgid "Only support csv or vcard format."
 msgstr "Apenas suporta os formatos csv ou vcard."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:124
+#: ../addressbook/tools/evolution-addressbook-export.c:160
 msgid "In async mode, output must be file."
 msgstr "Em modo assÃncrono, a saÃda tem de ser para ficheiro."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:132
+#: ../addressbook/tools/evolution-addressbook-export.c:168
 msgid "In normal mode, there is no need for the size option."
 msgstr "Em modo normal, nÃ£o Ã© necessÃ¡ria a opÃ§Ã£o de tamanho."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:163
+#: ../addressbook/tools/evolution-addressbook-export.c:199
 msgid "Unhandled error"
 msgstr "Erro nÃ£o manipulado"
 
@@ -1794,21 +1523,21 @@ msgstr "Erro nÃ£o manipulado"
 msgid "Accessing LDAP Server anonymously"
 msgstr "A aceder anonimamente ao Servidor LDAP"
 
-#: ../addressbook/util/addressbook.c:210
-#: ../plugins/groupwise-features/camel-gw-listener.c:525
+#: ../addressbook/util/addressbook.c:215
+#: ../plugins/groupwise-features/camel-gw-listener.c:526
 msgid "Failed to authenticate.\n"
 msgstr "Falha ao autenticar-se.\n"
 
-#: ../addressbook/util/addressbook.c:217
-#: ../plugins/groupwise-features/camel-gw-listener.c:505
+#: ../addressbook/util/addressbook.c:222
+#: ../plugins/groupwise-features/camel-gw-listener.c:506
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Introduza a senha para %s (utilizador %s)"
 
-#: ../addressbook/util/addressbook.c:225
-#: ../calendar/common/authentication.c:51
-#: ../plugins/caldav/caldav-browse-server.c:809
-#: ../plugins/google-account-setup/google-source.c:440
+#: ../addressbook/util/addressbook.c:230
+#: ../calendar/common/authentication.c:53
+#: ../plugins/caldav/caldav-browse-server.c:813
+#: ../plugins/google-account-setup/google-source.c:438
 #: ../plugins/publish-calendar/publish-calendar.c:328
 #: ../smime/gui/component.c:49
 msgid "Enter password"
@@ -1834,19 +1563,19 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
-"Adding a meaningful summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
+"Adding a meaningful summary to your appointment will give you an idea of "
+"what your appointment is about."
 msgstr ""
-"Adicionar um resumo coerente ao seu compromisso darÃ¡ aos seus receptores uma "
-"ideia sobre o teor do mesmo."
+"Adicionar um resumo coerente ao seu compromisso dar-lhe-Ã¡ uma ideia sobre o "
+"teor do mesmo."
 
 #: ../calendar/calendar.error.xml.h:6
 msgid ""
-"Adding a meaningful summary to your task will give your recipients an idea "
-"of what your task is about."
+"Adding a meaningful summary to your task will give you an idea of what your "
+"task is about."
 msgstr ""
-"Adicionar um resumo coerente Ã  sua tarefa darÃ¡ aos seus receptores uma ideia "
-"sobre o teor da mesma."
+"Adicionar um resumo coerente Ã  sua tarefa dar-lhe-Ã¡ uma ideia sobre o teor "
+"da mesma."
 
 #: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
@@ -1946,38 +1675,34 @@ msgid "Are you sure you want to delete this task?"
 msgstr "Tem a certeza de que deseja apagar esta tarefa?"
 
 #: ../calendar/calendar.error.xml.h:26
-msgid "Are you sure you want to save the memo without a summary?"
-msgstr "Tem a certeza de que deseja gravar o memo sem um resumo?"
+msgid "Are you sure you want to save the appointment without a summary?"
+msgstr "Tem a certeza de que deseja gravar o compromisso sem um resumo?"
 
 #: ../calendar/calendar.error.xml.h:27
-msgid "Are you sure you want to send the appointment without a summary?"
-msgstr "Tem a certeza de que deseja enviar o compromisso sem um resumo?"
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "Tem a certeza de que deseja gravar o memo sem um resumo?"
 
 #: ../calendar/calendar.error.xml.h:28
-msgid "Are you sure you want to send the task without a summary?"
-msgstr "Tem a certeza de que deseja enviar a tarefa sem um resumo?"
+msgid "Are you sure you want to save the task without a summary?"
+msgstr "Tem a certeza de que deseja gravar a tarefa sem um resumo?"
 
 #: ../calendar/calendar.error.xml.h:29
-msgid "Calendar repository is offline."
-msgstr "RepositÃ³rio de calendÃ¡rio estÃ¡ desligado."
-
-#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot create a new event"
 msgstr "Incapaz de criar um novo evento"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr "Incapaz de gravar o evento"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "Apagar o calendÃ¡rio '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "Apagar a lista de memos '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "Apagar a lista de tarefas '{0}'?"
 
@@ -2024,12 +1749,7 @@ msgstr "Erro ao ler a lista de memos"
 msgid "Error loading task list"
 msgstr "Erro ao ler a lista de tarefas"
 
-#. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:45
-msgid "Error on '{0}'"
-msgstr "Erro em '{0}'"
-
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -2037,7 +1757,7 @@ msgstr ""
 "Se nÃ£o enviar uma notificaÃ§Ã£o de cancelamento, os outros participantes "
 "poderÃ£o nÃ£o tomar conhecimento de que a reuniÃ£o foi cancelada."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -2045,7 +1765,7 @@ msgstr ""
 "Se nÃ£o enviar uma notificaÃ§Ã£o de cancelamento, os outros participantes "
 "poderÃ£o nÃ£o tomar conhecimento de que o memo foi apagado."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -2053,11 +1773,7 @@ msgstr ""
 "Se nÃ£o enviar uma notificaÃ§Ã£o de cancelamento, os outros participantes "
 "poderÃ£o nÃ£o tomar conhecimento de que a tarefa foi apagada."
 
-#: ../calendar/calendar.error.xml.h:49
-msgid "No response from the server."
-msgstr "Nenhuma resposta do servidor."
-
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -2065,7 +1781,7 @@ msgstr ""
 "Enviar informaÃ§Ã£o actualizada permite aos outros participantes manter os "
 "seus calendÃ¡rios actualizados."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -2073,7 +1789,7 @@ msgstr ""
 "Enviar informaÃ§Ã£o actualizada permite aos outros participantes manter as "
 "suas listas de tarefas actualizadas."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -2081,7 +1797,7 @@ msgstr ""
 "EstÃ¡ a ser efectuado o download de alguns anexos. Gravar o compromisso irÃ¡ "
 "resultar na perca destes anexos."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:50
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -2089,98 +1805,94 @@ msgstr ""
 "EstÃ¡ a ser efectuado o download de alguns anexos. Gravar a tarefa irÃ¡ "
 "resultar na perca destes anexos."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:51
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "Algumas funcionalidades poderÃ£o nÃ£o funcionar correctamente com o seu "
 "servidor actual."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "O calendÃ¡rio Evolution terminou inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:53
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Os calendÃ¡rios Evolution terminaram inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "O memo Evolution terminou inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "As tarefas Evolution terminaram inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:56
 msgid "The calendar is not marked for offline usage."
 msgstr "O calendÃ¡rio nÃ£o estÃ¡ marcado para utilizaÃ§Ã£o quando desligado."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:57
 msgid "The memo list is not marked for offline usage."
 msgstr "A lista de memos nÃ£o estÃ¡ marcada para utilizaÃ§Ã£o quando desligado."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:58
 msgid "The task list is not marked for offline usage."
 msgstr "A lista de tarefas nÃ£o estÃ¡ marcada para utilizaÃ§Ã£o quando desligado."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:59
 msgid "This calendar will be removed permanently."
 msgstr "Este calendÃ¡rio serÃ¡ definitivamente removido."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:60
 msgid "This memo list will be removed permanently."
 msgstr "Esta lista de memos serÃ¡ definitivamente removida."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:61
 msgid "This task list will be removed permanently."
 msgstr "Esta lista de tarefas serÃ¡ definitivamente removida."
 
-#: ../calendar/calendar.error.xml.h:65
-msgid "Unable to load the calendar"
-msgstr "Incapaz de ler o calendÃ¡rio"
-
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Deseja gravar as alteraÃ§Ãµes efectuadas a este compromisso?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this meeting?"
 msgstr "Deseja gravar as alteraÃ§Ãµes efectuadas a esta reuniÃ£o?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this memo?"
 msgstr "Deseja gravar as alteraÃ§Ãµes efectuadas a este memo?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to save your changes to this task?"
 msgstr "Deseja gravar as alteraÃ§Ãµes efectuadas a esta tarefa?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Deseja enviar uma notificaÃ§Ã£o de cancelamento deste memo?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr ""
 "Deseja enviar uma notificaÃ§Ã£o de cancelamento a todos os participantes?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Deseja enviar aos convocados convites de participaÃ§Ã£o?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send this task to participants?"
 msgstr "Deseja enviar esta tarefa a participantes?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Deseja enviar informaÃ§Ã£o actualizada da reuniÃ£o aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send updated task information to participants?"
 msgstr "Deseja enviar informaÃ§Ã£o actualizada da tarefa aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:72
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -2190,107 +1902,61 @@ msgstr ""
 "problemas na utilizaÃ§Ã£o do Evolution. Para melhores resultados o servidor "
 "deverÃ¡ ser actualizado para uma versÃ£o suportada."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:73
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Efectuou alteraÃ§Ãµes a este compromisso, mas ainda nÃ£o as gravou."
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "Efectuou alteraÃ§Ãµes a esta reuniÃ£o, mas ainda nÃ£o as gravou."
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have changed this task, but not yet saved it."
 msgstr "Efectuou alteraÃ§Ãµes a esta tarefa, mas ainda nÃ£o as gravou."
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:76
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Efectuou alteraÃ§Ãµes a este memo, mas ainda nÃ£o as gravou."
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Os seus calendÃ¡rios nÃ£o estarÃ£o disponÃveis atÃ© que o Evolution seja "
 "reiniciado."
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr ""
 "Os seus memos nÃ£o estarÃ£o disponÃveis atÃ© que o Evolution seja reiniciado."
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:79
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 "As suas tarefas nÃ£o estarÃ£o disponÃveis atÃ© que o Evolution seja reiniciado."
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:80
 #: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "_Descartar as AlteraÃ§Ãµes"
 
-#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:307
+#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:271
 msgid "_Save"
 msgstr "_Gravar"
 
-#: ../calendar/calendar.error.xml.h:86
+#: ../calendar/calendar.error.xml.h:82
 msgid "_Save Changes"
 msgstr "_Gravar as AlteraÃ§Ãµes"
 
-#: ../calendar/calendar.error.xml.h:87
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:144
+#: ../calendar/calendar.error.xml.h:83
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:141
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../calendar/calendar.error.xml.h:88
+#: ../calendar/calendar.error.xml.h:84
 msgid "_Send Notice"
 msgstr "_Enviar NotificaÃ§Ã£o"
 
-#: ../calendar/calendar.error.xml.h:89
-msgid "{0}."
-msgstr "{0}."
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:252
-msgid "Split Multi-Day Events:"
-msgstr "Dividir Eventos Multi-Dias:"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:1532
-#: ../calendar/conduits/calendar/calendar-conduit.c:1533
-#: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/memo/memo-conduit.c:822
-#: ../calendar/conduits/todo/todo-conduit.c:1022
-#: ../calendar/conduits/todo/todo-conduit.c:1023
-msgid "Could not start evolution-data-server"
-msgstr "Incapaz de iniciar o evolution-data-server"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:1640
-#: ../calendar/conduits/calendar/calendar-conduit.c:1643
-msgid "Could not read pilot's Calendar application block"
-msgstr "Incapaz de ler o bloco da aplicaÃ§Ã£o de CalendÃ¡rio da pilot"
-
-#: ../calendar/conduits/memo/memo-conduit.c:915
-#: ../calendar/conduits/memo/memo-conduit.c:918
-msgid "Could not read pilot's Memo application block"
-msgstr "Incapaz de ler o bloco da aplicaÃ§Ã£o de Memos da pilot"
-
-#: ../calendar/conduits/memo/memo-conduit.c:962
-#: ../calendar/conduits/memo/memo-conduit.c:965
-msgid "Could not write pilot's Memo application block"
-msgstr "Incapaz de escrever o bloco da aplicaÃ§Ã£o de Memos da pilot"
-
-#: ../calendar/conduits/todo/todo-conduit.c:231
-msgid "Default Priority:"
-msgstr "Prioridade por OmissÃ£o:"
-
-#: ../calendar/conduits/todo/todo-conduit.c:1106
-#: ../calendar/conduits/todo/todo-conduit.c:1109
-msgid "Could not read pilot's ToDo application block"
-msgstr "Incapaz de ler o bloco da aplicaÃ§Ã£o de A Fazer da pilot"
-
-#: ../calendar/conduits/todo/todo-conduit.c:1151
-#: ../calendar/conduits/todo/todo-conduit.c:1154
-msgid "Could not write pilot's ToDo application block"
-msgstr "Incapaz de escrever o bloco da aplicaÃ§Ã£o de A Fazer da pilot"
-
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
 msgid_plural "minutes"
@@ -2303,7 +1969,7 @@ msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
 msgid "Start time"
 msgstr "Hora de inÃcio"
 
@@ -2318,10 +1984,10 @@ msgstr "Dispensar _Todas"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1573
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
-#: ../calendar/gui/e-itip-control.c:1162
-#: ../plugins/itip-formatter/itip-view.c:1035
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1604
+#: ../calendar/gui/e-itip-control.c:1175
+#: ../plugins/itip-formatter/itip-view.c:1043
 msgid "Location:"
 msgstr "LocalizaÃ§Ã£o:"
 
@@ -2334,65 +2000,56 @@ msgid "_Dismiss"
 msgstr "_Dispensar"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1016
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:152
-#: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1621
-#: ../widgets/menus/gal-define-views.ui.h:5
-msgid "_Edit"
-msgstr "_Editar"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 msgid "_Snooze"
 msgstr "_Adiar"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:424
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:332
+#: ../plugins/google-account-setup/google-contacts-source.c:335
 msgid "hours"
 msgstr "horas"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
 msgid "location of appointment"
 msgstr "localizaÃ§Ã£o do compromisso"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:422
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:423
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../plugins/google-account-setup/google-contacts-source.c:334
 msgid "minutes"
 msgstr "minutos"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1434
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1556
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1581
 msgid "No summary available."
 msgstr "Nenhum resumo disponÃvel."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1443
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "Nenhuma descriÃ§Ã£o disponÃvel."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "Nenhuma informaÃ§Ã£o de local disponÃvel."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1496
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1519
 #, c-format
 msgid "You have %d alarms"
 msgstr "Possui %d alertas"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1668
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1694
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
 #: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2404,7 +2061,7 @@ msgstr ""
 "configurado para enviar um email.  O Evolution\n"
 "irÃ¡ apresentar um diÃ¡logo de lembrete normal."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1733
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2421,7 +2078,7 @@ msgstr ""
 "\n"
 "Tem a certeza que deseja executar esta aplicaÃ§Ã£o?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1748
 msgid "Do not ask me about this program again."
 msgstr "NÃ£o perguntar novamente sobre esta aplicaÃ§Ã£o."
 
@@ -2463,7 +2120,7 @@ msgid "Alarm programs"
 msgstr "AplicaÃ§Ãµes de alarme"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr ""
 "Quantidade de tempo, em segundos, que o erro deverÃ¡ ser visÃvel na barra de "
@@ -2488,151 +2145,147 @@ msgid "Calendars to run alarms for"
 msgstr "CalendÃ¡rios para os quais executar alarmes"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
-msgid "Check this to use system timezone in Evolution."
-msgstr "Seleccione aqui para utilizar o fuso-horÃ¡rio de sistema no Evolution."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 "Cor com que desenhar a linha de Marcus Bains na barra Temporal (vazio por "
 "omissÃ£o)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Cor com que desenhar a linha de Marcus Bains na Vista de Dia."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Compress weekends in month view"
 msgstr "Comprimir os fins-de-semana na vista de mÃªs"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
 msgstr "Confirmar ao expurgar"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Count of default recurrence for a new event. -1 means forever."
 msgstr "RecorrÃªncias por omissÃ£o para um novo evento. -1 significa eterno."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr ""
 "Dias nos quais deverÃ£o ser indicadas as horas de inÃcio e final de "
 "expediente."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default appointment reminder"
 msgstr "Lembrete por omissÃ£o de compromisso"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default recurrence count"
 msgstr "NÃºmero de recorrÃªncias por omissÃ£o"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "Unidades do lembrete por omissÃ£o"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "Valor do lembrete por omissÃ£o"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Directory for saving alarm audio files"
 msgstr "DirectÃ³rio onde gravar ficheiros audio de alarme"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Event Gradient"
 msgstr "Gradiente do evento"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Transparency"
 msgstr "TransparÃªncia do Evento"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Free/busy server URLs"
 msgstr "URLs de servidor de livre/ocupado"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy template URL"
 msgstr "URL de modelo de livre/ocupado"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Gradient of the events in calendar views."
 msgstr "Gradiente dos eventos na vista de calendÃ¡rio."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide completed tasks"
 msgstr "Esconder as tarefas terminadas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide task units"
 msgstr "Esconder as unidades da tarefa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task value"
 msgstr "Esconder o valor da tarefa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Horizontal pane position"
 msgstr "PosiÃ§Ã£o horizontal do painel"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr ""
 "Hora a que termina o expediente, no formato vinte-e-quatro horas, de 0 a 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr ""
 "Hora a que se inicia o expediente, no formato vinte-e-quatro horas, de 0 a "
 "23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "If \"true\", show the memo preview pane in the main window."
 msgstr ""
 "Se \"true\", apresentar o painel de antevisÃ£o de memo na janela principal."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr ""
 "Se \"true\", apresentar o painel de antevisÃ£o de tarefa na janela principal."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr ""
 "Intervalos apresentados nas vistas de Dia e Semana de Trabalho, em minutos."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Last alarm time"
 msgstr "Hora do Ãºltimo alarme"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Level beyond which the message should be logged."
 msgstr "NÃvel a partir do qual a mensagem deverÃ¡ ser registada."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "List of recently used second time zones in a Day View."
 msgstr ""
 "Lista de segundos fusos-horÃ¡rios recentemente utilizados numa Vista de Dia."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "List of server URLs for free/busy publishing."
 msgstr "Lista de URLs de servidores onde publicar informaÃ§Ã£o de livre/ocupado."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line"
 msgstr "Linha de Marcus Bains"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Cor da Linha de Marcus Bains - Vista de Dia"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Cor da Linha de Marcus Bains - Barra Temporal"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
@@ -2640,51 +2293,51 @@ msgstr ""
 "NÃºmero mÃ¡ximo de fusos-horÃ¡rios recentemente utilizados a recordar numa "
 "lista 'day_second_zones'."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Maximum number of recently used timezones to remember."
 msgstr "NÃºmero mÃ¡ximo de fusos-horÃ¡rios recentemente utilizados a recordar."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Memo layout style"
 msgstr "Estilo de disposiÃ§Ã£o do memo"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Memo preview pane position (horizontal)"
 msgstr "PosiÃ§Ã£o do painel de antevisÃ£o do memo (horizontal)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Memo preview pane position (vertical)"
 msgstr "PosiÃ§Ã£o do painel de antevisÃ£o do memo (vertical)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minuto a que termina o expediente, de 0 a 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minuto a que se inicia o expediente, de 0 a 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Month view horizontal pane position"
 msgstr "PosiÃ§Ã£o horizontal do painel de vista de mÃªs"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view vertical pane position"
 msgstr "PosiÃ§Ã£o vertical do painel de vista de mÃªs"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Number of units for determining a default reminder."
 msgstr "NÃºmero de unidades para determinar um lembrete por omissÃ£o."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Number of units for determining when to hide tasks."
 msgstr "NÃºmero de unidades para determinar quando esconder as tarefas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Overdue tasks color"
 msgstr "Cor das tarefas atrasadas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -2692,7 +2345,7 @@ msgstr ""
 "PosiÃ§Ã£o do painel horizontal, entre o calendÃ¡rio do navegador de datas e a "
 "lista de tarefas quando nÃ£o em vista de mÃªs, em pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -2700,21 +2353,21 @@ msgstr ""
 "PosiÃ§Ã£o do painel horizontal, entre a vista e o calendÃ¡rio do navegador de "
 "datas e a lista de tarefas quando em vista de mÃªs, em pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the memo preview pane when oriented vertically."
 msgstr "PosiÃ§Ã£o do painel de antevisÃ£o de memo quando orientado verticalmente."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr ""
 "PosiÃ§Ã£o do painel de antevisÃ£o de memo quando orientado horizontalmente."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Position of the task preview pane when oriented vertically."
 msgstr ""
 "PosiÃ§Ã£o do painel de antevisÃ£o de tarefa quando orientado verticalmente."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -2722,7 +2375,7 @@ msgstr ""
 "PosiÃ§Ã£o do painel vertical, entre a vista de calendÃ¡rio e o calendÃ¡rio de "
 "navegaÃ§Ã£o de datas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -2730,7 +2383,7 @@ msgstr ""
 "PosiÃ§Ã£o do painel vertical, entre a vista e o calendÃ¡rio do navegador de "
 "datas e lista de tarefas na vista de mÃªs, em pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 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."
@@ -2738,87 +2391,84 @@ msgstr ""
 "PosiÃ§Ã£o do painel vertical, entre a vista e o calendÃ¡rio do navegador de "
 "datas e lista de tarefas quando nÃ£o em vista de mÃªs, em pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary calendar"
 msgstr "CalendÃ¡rio principal"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Primary memo list"
 msgstr "Lista de memos principal"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Primary task list"
 msgstr "Lista de tarefas principal"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Programs that are allowed to be run by alarms."
 msgstr "AplicaÃ§Ãµes que podem ser executadas pelos alarmes."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Recently used second time zones in a Day View"
 msgstr "Segundos fusos-horÃ¡rios recentemente utilizados numa Vista de Dia"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Save directory for alarm audio"
 msgstr "DirectÃ³rio de gravaÃ§Ã£o para alarmes audio"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Scroll Month View by a week"
 msgstr "Rolar a Vista de MÃªs por uma semana"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Apresentar o campo Responder SFF no editor de eventos/tarefas/compromissos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Apresentar o campo de papel no editor de eventos/tarefas/compromissos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show appointment end times in week and month views"
 msgstr ""
 "Apresentar as horas de tÃ©rmino de compromissos nas vistas de mÃªs e semana"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show categories field in the event/meeting/task editor"
 msgstr ""
 "Apresentar o campo de categorias no editor de eventos/tarefas/compromissos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show display alarms in notification tray"
 msgstr "Apresentar os alarmes visÃveis na Ã¡rea de notificaÃ§Ã£o"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Apresentar o campo de estado no editor de eventos/tarefas/compromissos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Show the memo preview pane"
 msgstr "Apresentar o painel de antevisÃ£o de memo"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Show the task preview pane"
 msgstr "Apresentar o painel de antevisÃ£o de tarefa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Apresentar o campo de fuso-horÃ¡rio no editor de eventos/compromissos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Apresentar o campo tipo no editor de eventos/tarefas/compromissos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
-msgid "Show week number in Day and Work Week View"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr ""
-"Apresentar os nÃºmeros das semanas nas Vistas de Dia e Semana de Trabalho"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
-msgid "Show week numbers in date navigator"
-msgstr "Apresentar os nÃºmeros das semanas no navegador de datas"
+"Apresentar os nÃºmeros das semanas nas Vistas de Dia, Semana de Trabalho e "
+"Navegador de Datas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
@@ -2826,23 +2476,23 @@ msgstr ""
 "Apresenta o segundo fuso-horÃ¡rio na Vista de Dia, se definido. O valor Ã© "
 "semelgante ao utilizado na chave 'timezone'."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Task layout style"
 msgstr "Estilo de disposiÃ§Ã£o de tarefa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Task preview pane position (horizontal)"
 msgstr "PosiÃ§Ã£o do painel de antevisÃ£o de tarefa (horizontal)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Task preview pane position (vertical)"
 msgstr "PosiÃ§Ã£o do painel de antevisÃ£o de tarefa (vertical)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Tasks due today color"
 msgstr "Cor das tarefas cuja data limite Ã© hoje"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -2852,7 +2502,7 @@ msgstr ""
 "substituÃdo pela parte de utilizador do endereÃ§o de email e %d Ã© substituÃdo "
 "pelo domÃnio."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -2861,7 +2511,7 @@ msgstr ""
 "uma localizaÃ§Ã£o nÃ£o traduzida da base de dados de zonas horÃ¡rias Olsen, tal "
 "como \"America/New York\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the memo list. \"0\" (Classic View) places the preview pane below the memo "
@@ -2872,7 +2522,7 @@ msgstr ""
 "antevisÃ£o por baixo da lista de memos. \"1\" (Vista Vertical) coloca o "
 "painel de antevisÃ£o ao lado da lista de memos."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. \"0\" (Classic View) places the preview pane below the task "
@@ -2883,11 +2533,11 @@ msgstr ""
 "antevisÃ£o por baixo da lista de tarefas. \"1\" (Vista Vertical) coloca o "
 "painel de antevisÃ£o ao lado da lista de tarefas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "The second timezone for a Day View"
 msgstr "O segundo fuso-horÃ¡rio para a Vista de Dia"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
@@ -2895,19 +2545,19 @@ msgstr ""
 "Esta opÃ§Ã£o pode ter trÃªs valores. 0 para erros. 1 para avisos. 2 para "
 "mensagens de depuraÃ§Ã£o."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Time divisions"
 msgstr "DivisÃµes temporais"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Time the last alarm ran, in time_t."
 msgstr "Quando foi executado o Ãºltimo alarme, em time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Timezone"
 msgstr "Zona HorÃ¡ria"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -2915,68 +2565,68 @@ msgstr ""
 "TransparÃªncia dos eventos nas vistas de calendÃ¡rio, um valor entre 0 "
 "(transparente) e 1 (opaco)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Twenty four hour time format"
 msgstr "Formato de vinte-e-quatro horas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "URI of the highlighted (\"primary\") calendar"
 msgstr "URI do calendÃ¡rio realÃ§ado (\"principal\")"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "URI of the highlighted (\"primary\") memo list"
 msgstr "URI da lista de memos realÃ§ada (\"principal\")"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "URI of the highlighted (\"primary\") task list"
 msgstr "URI da lista de tarefas realÃ§ada (\"principal\")"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unidades para um lembrete por omissÃ£o, \"minutes\", \"hours\" ou \"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unidades para determinar quando esconder tarefas, \"minutes\", \"hours\" ou "
 "\"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Use system timezone"
 msgstr "Utilizar o fuso-horÃ¡rio do sistema"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Use the system timezone instead of the timezone selected in Evolution."
 msgstr ""
 "Utilizar o fuso-horÃ¡rio do sistema em vez do seleccionado no Evolution."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Vertical pane position"
 msgstr "PosiÃ§Ã£o vertical do painel"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Week start"
 msgstr "InÃcio da semana"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Dia da semana em que se inicia a semana, de Domingo (0) a SÃ¡bado (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Se utilizar ou nÃ£o a Ã¡rea de notificaÃ§Ã£o para apresentar alarmes."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Se pedir ou nÃ£o confirmaÃ§Ã£o ao apagar um compromisso ou tarefa."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Se pedir confirmaÃ§Ã£o ao expurgar compromissos e tarefas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -2984,98 +2634,93 @@ msgstr ""
 "Se comprimir ou nÃ£o os fins-de-semana na vista de mÃªs, o que coloca o SÃ¡bado "
 "e o Domingo no espaÃ§o de um dia de semana."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Se apresentar ou nÃ£o as horas de tÃ©rmino de compromissos nas vistas de mÃªs e "
 "semana."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Se desenhar ou nÃ£o a Linha de Marcus Bains (linha na hora actual) no "
 "calendÃ¡rio."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Se esconder ou nÃ£o as tarefas terminadas na vista de tarefas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to scroll a Month View by a week, not by a month."
 msgstr "Se rolar a Vista de MÃªs Ã  semana em vez de ao mÃªs."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to set a default reminder for appointments."
 msgstr "Se definir ou nÃ£o um lembrete por omissÃ£o para os eventos."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Se apresentar ou nÃ£o o campo Responder SFF no editor de eventos/tarefas/"
 "compromissos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr ""
 "Se apresentar ou nÃ£o o campo decategorias no editor de eventos/compromissos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr ""
 "Se apresentar ou nÃ£o o campo de papel no editor de eventos/tarefas/"
 "compromissos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr ""
 "Se apresentar ou nÃ£o o campo de estado no editor de eventos/tarefas/"
 "compromissos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Se apresentar ou nÃ£o as horas no formato 24h em vez de utilizar am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr ""
 "Se apresentar ou nÃ£o o campo de fuso-horÃ¡rio no editor de eventos/"
 "compromissos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr ""
 "Se apresentar ou nÃ£o o campo de tipo no editor de eventos/tarefas/"
 "compromissos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
-msgid "Whether to show week number in the Day and Work Week View."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+msgid "Whether to show week numbers in various places in the Calendar."
 msgstr ""
-"Se apresentar ou nÃ£o os nÃºmeros das semanas nas Vistas de Dia e Semana de "
-"Trabalho."
+"Se apresentar ou nÃ£o os nÃºmeros das semanas em vÃ¡rios locais no CalendÃ¡rio."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
-msgid "Whether to show week numbers in the date navigator."
-msgstr "Se apresentar ou nÃ£o os nÃºmeros das semanas no navegador de datas."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 msgid "Work days"
 msgstr "Dias Ãºteis"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 msgid "Workday end hour"
 msgstr "Hora a que termina o expediente"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Workday end minute"
 msgstr "Minuto a que termina o expediente"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Workday start hour"
 msgstr "Hora a que se inicia o expediente"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:128
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday start minute"
 msgstr "Minuto a que se inicia o expediente"
 
@@ -3125,17 +2770,17 @@ msgid "Classification"
 msgstr "ClassificaÃ§Ã£o"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-task-table.c:488
+#: ../calendar/gui/e-cal-model.c:525 ../calendar/gui/e-task-table.c:490
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
-#: ../calendar/gui/tasktypes.xml.h:10
-#: ../plugins/plugin-manager/plugin-manager.c:60
-#: ../widgets/misc/e-attachment-tree-view.c:496
+#: ../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:524
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "DescriÃ§Ã£o"
@@ -3156,7 +2801,7 @@ msgid "Exist"
 msgstr "Existe"
 
 #: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
+#: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:831
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 #: ../plugins/save-calendar/csv-format.c:377
@@ -3169,25 +2814,26 @@ msgid "Organizer"
 msgstr "Organizador"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:558 ../calendar/gui/e-task-table.c:487
+#: ../calendar/gui/e-cal-model.c:523 ../calendar/gui/e-task-table.c:489
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privado"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:549 ../calendar/gui/e-cal-model.c:556
-#: ../calendar/gui/e-task-table.c:486 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:514 ../calendar/gui/e-cal-model.c:521
+#: ../calendar/gui/e-task-table.c:488 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "PÃºblico"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/event-editor.c:322
+#: ../calendar/gui/dialogs/event-editor.c:343
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "RecorrÃªncia"
 
 #: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-cal-list-view.etspec.h:8
 #: ../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
@@ -3249,6 +2895,7 @@ msgid "Add Alarm"
 msgstr "Adicionar Alarme"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
+#: ../calendar/gui/dialogs/event-editor.c:360
 msgid "Alarm"
 msgstr "Alarme"
 
@@ -3264,7 +2911,7 @@ msgstr "Som de alarme personalizado"
 msgid "Mes_sage:"
 msgstr "Men_sagem:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:70
 msgid "Options"
 msgstr "OpÃ§Ãµes"
 
@@ -3305,17 +2952,15 @@ msgid "before"
 msgstr "antes de"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:7
 msgid "day(s)"
 msgstr "dia(s)"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:424
+#: ../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:333
+#: ../plugins/google-account-setup/google-contacts-source.c:336
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:39
 msgid "days"
 msgstr "dias"
 
@@ -3323,19 +2968,20 @@ msgstr "dias"
 msgid "end of appointment"
 msgstr "fim do compromisso"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "tempos extra a cada"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
 msgid "minute(s)"
 msgstr "minuto(s)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
 msgid "start of appointment"
 msgstr "inÃcio do compromisso"
 
@@ -3349,35 +2995,36 @@ msgstr "A_dicionar"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:9
-#: ../calendar/gui/dialogs/event-page.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:1
 msgid "Alarms"
 msgstr "Alarmes"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:108
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:157
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:75
 #: ../calendar/gui/e-day-view-time-item.c:797
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Nenhum"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:184
 #: ../calendar/gui/e-day-view-time-item.c:824
-#: ../calendar/gui/e-timezone-entry.c:343
+#: ../calendar/gui/e-timezone-entry.c:319
 msgid "Select..."
 msgstr "Seleccionar..."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:496
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:504
 msgid "Selected Calendars for Alarms"
 msgstr "CalendÃ¡rios Seleccionados para Alarmes"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
-msgid "Time and date:"
-msgstr "Data e hora:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
+msgid "Ti_me and date:"
+msgstr "Data e _hora:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
-msgid "Date only:"
-msgstr "Apenas data:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
+msgid "_Date only:"
+msgstr "Apenas _data:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
 #, no-c-format
@@ -3409,13 +3056,13 @@ msgstr "30 minutos"
 msgid "60 minutes"
 msgstr "60 minutos"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10
 msgid "Alerts"
 msgstr "Alertas"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
 #: ../mail/mail-config.ui.h:28
-#: ../modules/addressbook/autocompletion-config.c:153
+#: ../modules/addressbook/autocompletion-config.c:156
 msgid "Date/Time Format"
 msgstr "Formato de Data/Hora"
 
@@ -3440,20 +3087,20 @@ msgid "Display alarms in _notification area only"
 msgstr "Apresentar os alarmes apenas na Ã¡rea de _notificaÃ§Ã£o"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Sexta-Feira"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
-#: ../modules/addressbook/addressbook-config.c:985
-#: ../plugins/itip-formatter/itip-formatter.c:2666
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:49
+#: ../modules/addressbook/addressbook-config.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:2678
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
-#: ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "Geral"
 
@@ -3466,30 +3113,23 @@ msgid "Minutes"
 msgstr "Minutos"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Segunda-Feira"
 
-#. Translators: "None" for not including threads;
-#. * part of "Include threads: None"
-#. Translators: Used in send options dialog
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
-#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:12
-msgid "None"
-msgstr "Nenhum(a)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:74
 msgid "Pick a color"
 msgstr "Seleccione uma cor"
 
+#. Sunday
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
 msgid "S_un"
 msgstr "_Dom"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "SÃ¡bado"
@@ -3506,158 +3146,164 @@ msgstr "Se_gundo fuso:"
 msgid "Select the calendars for alarm notification"
 msgstr "Seleccione os calendÃ¡rios para alarmes de notificaÃ§Ã£o"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
 msgid "Sh_ow a reminder"
 msgstr "Apresentar um _lembrete"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
 msgid "Show a _reminder"
 msgstr "Apresentar um _lembrete"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
-msgid "Show week _numbers in date navigator"
-msgstr "Apresentar os _nÃºmeros das semanas no navegador de datas"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
-msgid "Show week n_umber in Day and Work Week View"
-msgstr ""
-"Apresentar os _nÃºmeros das semanas nas Vistas de Dia e Semana de Trabalho"
-
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
+msgid "Show week _numbers"
+msgstr "Apresentar os _nÃºmeros das semanas"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Domingo"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "T_asks due today:"
 msgstr "T_arefas cuja data limite Ã© hoje:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "T_hu"
 msgstr "Q_ui"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Task List"
 msgstr "Lista de Tarefas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
 msgid "Template:"
 msgstr "Modelo:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Quinta-Feira"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:613
+#: ../widgets/misc/e-dateedit.c:598
 msgid "Time"
 msgstr "Hora"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/event-page.ui.h:9
 msgid "Time _zone:"
 msgstr "Fuso-_horÃ¡rio:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
 msgid "Time format:"
 msgstr "Formato de hora:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "TerÃ§a-Feira"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Use s_ystem time zone"
 msgstr "Utili_zar o fuso-horÃ¡rio do sistema"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Quarta-Feira"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
 msgid "Wee_k starts on:"
 msgstr "S_emana comeÃ§a Ã :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Work Week"
 msgstr "Semana de Trabalho"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "Work days:"
 msgstr "Dias Ãºteis:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
 msgid "_12 hour (AM/PM)"
 msgstr "_12 horas (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "_24 hour"
 msgstr "_24 horas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_Ask for confirmation when deleting items"
 msgstr "Pedir confirmaÃ§Ã£o ao _apagar itens"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_Compress weekends in month view"
 msgstr "_Comprimir os fins-de-semana na vista de mÃªs"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Day begins:"
 msgstr "_Dia comeÃ§a:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Fri"
 msgstr "Se_x"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
 msgid "_Hide completed tasks after"
 msgstr "_Esconder as tarefas terminadas apÃ³s"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Mon"
 msgstr "_Seg"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
 msgid "_Overdue tasks:"
 msgstr "Tare_fas atrasadas:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "_Sat"
 msgstr "SÃ¡_b"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:65
 msgid "_Show appointment end times in week and month view"
 msgstr ""
 "Apre_sentar as horas de tÃ©rmino de compromissos nas vistas de mÃªs e semana"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Time divisions:"
 msgstr "DivisÃµes _temporais:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:68
 msgid "_Tue"
 msgstr "T_er"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:70
 msgid "_Wed"
 msgstr "_Qua"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:72
 msgid "before every anniversary/birthday"
 msgstr "antes de todos os aniversÃ¡rios"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:74
 msgid "before every appointment"
 msgstr "antes de todos os compromissos"
 
@@ -3666,15 +3312,15 @@ msgid "Type:"
 msgstr "Tipo:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:500
+#: ../modules/addressbook/addressbook-config.c:510
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
-#: ../modules/addressbook/ldap-config.ui.h:27
-#: ../plugins/groupwise-features/properties.ui.h:11
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:147
+#: ../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:282
+#: ../widgets/misc/e-signature-script-dialog.c:286
 msgid "_Name:"
 msgstr "_Nome:"
 
@@ -3695,35 +3341,35 @@ msgstr ""
 "Cop_iar o conteÃºdo da lista de memos localmente para trabalhar em modo "
 "desligado"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:346
 msgid "Colo_r:"
 msgstr "Co_res:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memo List"
 msgstr "Lista de Memos"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "Calendar Properties"
 msgstr "Propriedades do CalendÃ¡rio"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "New Calendar"
 msgstr "Novo CalendÃ¡rio"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "Task List Properties"
 msgstr "Propriedades da Lista de Tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "New Task List"
 msgstr "Nova Lista de Tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "Memo List Properties"
 msgstr "Propriedades da Lista de Memos"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "New Memo List"
 msgstr "Nova Lista de Memos"
 
@@ -3777,266 +3423,251 @@ msgstr "%s  NÃ£o efectuou quaisquer alteraÃ§Ãµes, actualizar o editor?"
 msgid "Validation error: %s"
 msgstr "Erro de validaÃ§Ã£o: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2418
-msgid " to "
-msgstr " para "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2422
-msgid " (Completed "
-msgstr " (Terminada "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2424
-msgid "Completed "
-msgstr "Terminada "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2429
-msgid " (Due "
-msgstr " (Limite "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2431
-msgid "Due "
-msgstr "Limite "
-
-#: ../calendar/gui/dialogs/comp-editor.c:247
+#: ../calendar/gui/dialogs/comp-editor.c:249
 msgid "Could not save attachments"
 msgstr "Incapaz de gravar os anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:510
+#: ../calendar/gui/dialogs/comp-editor.c:525
 msgid "Could not update object"
 msgstr "Incapaz de actualizar o objecto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:605
+#: ../calendar/gui/dialogs/comp-editor.c:640
 msgid "Edit Appointment"
 msgstr "Editar Compromisso"
 
-#: ../calendar/gui/dialogs/comp-editor.c:612
+#: ../calendar/gui/dialogs/comp-editor.c:647
 #, c-format
 msgid "Meeting - %s"
 msgstr "ReuniÃ£o - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:614
+#: ../calendar/gui/dialogs/comp-editor.c:649
 #, c-format
 msgid "Appointment - %s"
 msgstr "Compromisso - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:620
+#: ../calendar/gui/dialogs/comp-editor.c:655
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tarefa AtribuÃda - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:622
+#: ../calendar/gui/dialogs/comp-editor.c:657
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:627
+#: ../calendar/gui/dialogs/comp-editor.c:662
 #, c-format
 msgid "Memo - %s"
 msgstr "Memo - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:643
+#: ../calendar/gui/dialogs/comp-editor.c:678
 msgid "No Summary"
 msgstr "Sem Resumo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:752
+#: ../calendar/gui/dialogs/comp-editor.c:789
 msgid "Keep original item?"
 msgstr "Manter o item original?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:939
+#: ../calendar/gui/dialogs/comp-editor.c:986
 msgid "Click here to close the current window"
 msgstr "Clique aqui para fechar a janela actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:946 ../mail/e-mail-browser.c:117
-#: ../shell/e-shell-window-actions.c:1460
-#: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:387 ../widgets/misc/e-web-view.c:965
+#: ../calendar/gui/dialogs/comp-editor.c:993 ../mail/e-mail-browser.c:120
+#: ../shell/e-shell-window-actions.c:1454
+#: ../widgets/misc/e-focus-tracker.c:118 ../widgets/misc/e-focus-tracker.c:552
+#: ../widgets/misc/e-web-view.c:413 ../widgets/misc/e-web-view.c:1066
 msgid "Copy the selection"
 msgstr "Copiar a selecÃ§Ã£o"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953 ../mail/e-mail-browser.c:124
-#: ../shell/e-shell-window-actions.c:1467
-#: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:959
+#: ../calendar/gui/dialogs/comp-editor.c:1000 ../mail/e-mail-browser.c:127
+#: ../shell/e-shell-window-actions.c:1461
+#: ../widgets/misc/e-focus-tracker.c:111 ../widgets/misc/e-focus-tracker.c:547
+#: ../widgets/misc/e-web-view.c:1060
 msgid "Cut the selection"
 msgstr "Cortar a selecÃ§Ã£o"
 
-#: ../calendar/gui/dialogs/comp-editor.c:960
-#: ../shell/e-shell-window-actions.c:1474
-#: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
+#: ../calendar/gui/dialogs/comp-editor.c:1007
+#: ../shell/e-shell-window-actions.c:1468
+#: ../widgets/misc/e-focus-tracker.c:132 ../widgets/misc/e-focus-tracker.c:562
 msgid "Delete the selection"
 msgstr "Apagar a selecÃ§Ã£o"
 
-#: ../calendar/gui/dialogs/comp-editor.c:967
+#: ../calendar/gui/dialogs/comp-editor.c:1014
 msgid "Click here to view help available"
 msgstr "Clique aqui para consultar a ajuda disponÃvel"
 
-#: ../calendar/gui/dialogs/comp-editor.c:974 ../mail/e-mail-browser.c:131
-#: ../shell/e-shell-window-actions.c:1509
-#: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:971
+#: ../calendar/gui/dialogs/comp-editor.c:1021 ../mail/e-mail-browser.c:134
+#: ../shell/e-shell-window-actions.c:1503
+#: ../widgets/misc/e-focus-tracker.c:125 ../widgets/misc/e-focus-tracker.c:557
+#: ../widgets/misc/e-web-view.c:1072
 msgid "Paste the clipboard"
 msgstr "Colar da Ã¡rea de transferÃªncia"
 
-#: ../calendar/gui/dialogs/comp-editor.c:995
+#: ../calendar/gui/dialogs/comp-editor.c:1042
 msgid "Click here to save the current window"
 msgstr "Clique aqui para gravar a janela actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1002 ../mail/e-mail-browser.c:138
-#: ../shell/e-shell-window-actions.c:1579
-#: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
+#: ../calendar/gui/dialogs/comp-editor.c:1049 ../mail/e-mail-browser.c:141
+#: ../shell/e-shell-window-actions.c:1573
+#: ../widgets/misc/e-focus-tracker.c:139 ../widgets/misc/e-focus-tracker.c:567
 msgid "Select all text"
 msgstr "Seleccionar todo o texto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1009
+#: ../calendar/gui/dialogs/comp-editor.c:1056
 msgid "_Classification"
 msgstr "_ClassificaÃ§Ã£o"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1023 ../mail/e-mail-browser.c:145
-#: ../shell/e-shell-window-actions.c:1628
-#: ../widgets/misc/e-signature-editor.c:217
+#: ../calendar/gui/dialogs/comp-editor.c:1063
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
+#: ../mail/e-mail-browser.c:155
+#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../shell/e-shell-window-actions.c:1608
+#: ../widgets/menus/gal-define-views.ui.h:5
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1070 ../mail/e-mail-browser.c:148
+#: ../shell/e-shell-window-actions.c:1615
+#: ../widgets/misc/e-signature-editor.c:220
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1030
-#: ../shell/e-shell-window-actions.c:1635
+#: ../calendar/gui/dialogs/comp-editor.c:1077
+#: ../shell/e-shell-window-actions.c:1622
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1037
+#: ../calendar/gui/dialogs/comp-editor.c:1084
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1044
-#: ../composer/e-composer-actions.c:351
+#: ../calendar/gui/dialogs/comp-editor.c:1091
+#: ../composer/e-composer-actions.c:315
 msgid "_Options"
 msgstr "_OpÃ§Ãµes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1051 ../mail/e-mail-browser.c:159
-#: ../shell/e-shell-window-actions.c:1670
+#: ../calendar/gui/dialogs/comp-editor.c:1098 ../mail/e-mail-browser.c:162
+#: ../shell/e-shell-window-actions.c:1657 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "_Ver"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1061
-#: ../composer/e-composer-actions.c:279
+#: ../calendar/gui/dialogs/comp-editor.c:1108
+#: ../composer/e-composer-actions.c:243
 msgid "_Attachment..."
 msgstr "_Anexo..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1063
+#: ../calendar/gui/dialogs/comp-editor.c:1110
 msgid "Click here to attach a file"
 msgstr "Clique aqui para anexar um ficheiro"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1071
+#: ../calendar/gui/dialogs/comp-editor.c:1118
 msgid "_Categories"
 msgstr "_Categorias"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1073
+#: ../calendar/gui/dialogs/comp-editor.c:1120
 msgid "Toggles whether to display categories"
 msgstr "Alterna se apresentar ou nÃ£o as categorias"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1079
+#: ../calendar/gui/dialogs/comp-editor.c:1126
 msgid "Time _Zone"
 msgstr "Fuso-_HorÃ¡rio"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1081
+#: ../calendar/gui/dialogs/comp-editor.c:1128
 msgid "Toggles whether the time zone is displayed"
 msgstr "Alterna se o fuso horÃ¡rio Ã© ou nÃ£o apresentado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "Pu_blic"
 msgstr "PÃº_blico"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1092
+#: ../calendar/gui/dialogs/comp-editor.c:1139
 msgid "Classify as public"
 msgstr "Classificar como pÃºblico"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1097
+#: ../calendar/gui/dialogs/comp-editor.c:1144
 msgid "_Private"
 msgstr "_Privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
+#: ../calendar/gui/dialogs/comp-editor.c:1146
 msgid "Classify as private"
 msgstr "Classificar como privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1104
+#: ../calendar/gui/dialogs/comp-editor.c:1151
 msgid "_Confidential"
 msgstr "_Confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1106
+#: ../calendar/gui/dialogs/comp-editor.c:1153
 msgid "Classify as confidential"
 msgstr "Classificar como confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1114
+#: ../calendar/gui/dialogs/comp-editor.c:1161
 msgid "R_ole Field"
 msgstr "Campo de _Papel"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1116
+#: ../calendar/gui/dialogs/comp-editor.c:1163
 msgid "Toggles whether the Role field is displayed"
 msgstr "Alterna se o campo de Papel Ã© ou nÃ£o apresentado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1122
+#: ../calendar/gui/dialogs/comp-editor.c:1169
 msgid "_RSVP"
 msgstr "_Responder SFF"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1124
+#: ../calendar/gui/dialogs/comp-editor.c:1171
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Alterna se o campo Responder SFF Ã© ou nÃ£o apresentado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1130
+#: ../calendar/gui/dialogs/comp-editor.c:1177
 msgid "_Status Field"
 msgstr "Campo de E_stado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132
+#: ../calendar/gui/dialogs/comp-editor.c:1179
 msgid "Toggles whether the Status field is displayed"
 msgstr "Alterna se o campo de Estado Ã© ou nÃ£o apresentado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1138
+#: ../calendar/gui/dialogs/comp-editor.c:1185
 msgid "_Type Field"
 msgstr "Campo _Tipo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1140
+#: ../calendar/gui/dialogs/comp-editor.c:1187
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Alterna se o Tipo de Participante Ã© ou nÃ£o apresentado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1164
+#: ../calendar/gui/dialogs/comp-editor.c:1211
 #: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "_Documentos Recentes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1684
-#: ../composer/e-composer-actions.c:475
+#: ../calendar/gui/dialogs/comp-editor.c:1746
+#: ../composer/e-composer-actions.c:431
 msgid "Attach"
 msgstr "Anexar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1739
-msgid "Save"
-msgstr "Gravar"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2016
-#: ../calendar/gui/dialogs/comp-editor.c:2065
-#: ../calendar/gui/dialogs/comp-editor.c:2956
+#: ../calendar/gui/dialogs/comp-editor.c:2075
+#: ../calendar/gui/dialogs/comp-editor.c:2124
+#: ../calendar/gui/dialogs/comp-editor.c:3089
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "AlteraÃ§Ãµes efectuadas a este item poderÃ£o ser descartadas se chegarem "
 "actualizaÃ§Ãµes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2924
-#: ../plugins/prefer-plain/prefer-plain.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:3053
+#: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "anexo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2986
+#: ../calendar/gui/dialogs/comp-editor.c:3121
 msgid "Unable to use current version!"
 msgstr "Incapaz de utilizar a versÃ£o actual!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:91
+#: ../calendar/gui/dialogs/copy-source-dialog.c:92
 msgid "Could not open source"
 msgstr "Incapaz de abrir a origem"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:99
+#: ../calendar/gui/dialogs/copy-source-dialog.c:100
 msgid "Could not open destination"
 msgstr "Incapaz de abrir o destino"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:108
+#: ../calendar/gui/dialogs/copy-source-dialog.c:109
 msgid "Destination is read only"
 msgstr "O destino Ã© apenas de leitura"
 
@@ -4045,53 +3676,73 @@ msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 "_Apagar este item da caixa de correio de todos os outros destinatÃ¡rios?"
 
-#: ../calendar/gui/dialogs/delete-error.c:55
-msgid "The event could not be deleted due to a corba error"
-msgstr "O evento nÃ£o pode ser apagado devido a um erro corba"
+#: ../calendar/gui/dialogs/delete-comp.c:217
+msgid "_Retract comment"
+msgstr "_Retractar comentÃ¡rio"
 
-#: ../calendar/gui/dialogs/delete-error.c:58
-msgid "The task could not be deleted due to a corba error"
-msgstr "A tarefa nÃ£o pode ser apagada devido a um erro corba"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:56
+#, c-format
+msgid "The event could not be deleted due to a dbus error: %s"
+msgstr "O evento nÃ£o pode ser apagado devido a um erro dbus: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:61
-msgid "The memo could not be deleted due to a corba error"
-msgstr "O memo nÃ£o pode ser apagado devido a um erro corba"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:60
+#, c-format
+msgid "The task could not be deleted due to a dbus error: %s"
+msgstr "A tarefa nÃ£o pode ser apagada devido a um erro dbus: %s"
 
+#. Translators: The '%s' is replaced with a detailed error message
 #: ../calendar/gui/dialogs/delete-error.c:64
-msgid "The item could not be deleted due to a corba error"
-msgstr "O item nÃ£o pode ser apagado devido a um erro corba"
+#, c-format
+msgid "The memo could not be deleted due to a dbus error: %s"
+msgstr "O memo nÃ£o pode ser apagado devido a um erro dbus: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:71
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:68
+#, c-format
+msgid "The item could not be deleted due to a dbus error: %s"
+msgstr "O item nÃ£o pode ser apagado devido a um erro dbus: %s"
+
+#: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The event could not be deleted because permission was denied"
 msgstr "O evento nÃ£o pode ser apagado pois a autorizaÃ§Ã£o foi negada"
 
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:78
 msgid "The task could not be deleted because permission was denied"
 msgstr "A tarefa nÃ£o pode ser apagada pois a autorizaÃ§Ã£o foi negada"
 
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:81
 msgid "The memo could not be deleted because permission was denied"
 msgstr "O memo nÃ£o pode ser apagado pois a autorizaÃ§Ã£o foi negada"
 
-#: ../calendar/gui/dialogs/delete-error.c:80
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The item could not be deleted because permission was denied"
 msgstr "O item nÃ£o pode ser apagado pois a autorizaÃ§Ã£o foi negada"
 
-#: ../calendar/gui/dialogs/delete-error.c:87
-msgid "The event could not be deleted due to an error"
-msgstr "O evento nÃ£o pode ser apagado devido a um erro"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:92
+#, c-format
+msgid "The event could not be deleted due to an error: %s"
+msgstr "O evento nÃ£o pode ser apagado devido a um erro: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:90
-msgid "The task could not be deleted due to an error"
-msgstr "A tarefa nÃ£o pode ser apagada devido a um erro"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:96
+#, c-format
+msgid "The task could not be deleted due to an error: %s"
+msgstr "A tarefa nÃ£o pode ser apagada devido a um erro %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:93
-msgid "The memo could not be deleted due to an error"
-msgstr "O memo nÃ£o pode ser apagado devido a um erro"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:100
+#, c-format
+msgid "The memo could not be deleted due to an error: %s"
+msgstr "O memo nÃ£o pode ser apagado devido a um erro: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:96
-msgid "The item could not be deleted due to an error"
-msgstr "O item nÃ£o pode ser apagado devido a um erro"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:104
+#, c-format
+msgid "The item could not be deleted due to an error: %s"
+msgstr "O item nÃ£o pode ser apagado devido a um erro: %s"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Contacts..."
@@ -4105,135 +3756,149 @@ msgstr "Delegar A:"
 msgid "Enter Delegate"
 msgstr "Introduzir Delegado"
 
-#: ../calendar/gui/dialogs/event-editor.c:201
+#: ../calendar/gui/dialogs/event-editor.c:217
 msgid "_Alarms"
 msgstr "_Alarmes"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:219
 msgid "Click here to set or unset alarms for this event"
 msgstr "Clique aqui para definir ou remover alarmes para este evento"
 
-#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../calendar/gui/dialogs/event-editor.c:227
+msgid "Show Time as _Busy"
+msgstr "Apresentar Horas como _Ocupadas"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr "Alterna se apresentar ou nÃ£o o tempo como ocupado"
+
+#: ../calendar/gui/dialogs/event-editor.c:238
 msgid "_Recurrence"
 msgstr "_RecorrÃªncia"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/event-editor.c:240
 msgid "Make this a recurring event"
 msgstr "Tornar este evento como recorrente"
 
-#: ../calendar/gui/dialogs/event-editor.c:215
+#: ../calendar/gui/dialogs/event-editor.c:245
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:211
-#: ../widgets/misc/e-send-options.ui.h:19
+#: ../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:217
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/event-editor.c:247
+#: ../calendar/gui/dialogs/task-editor.c:129
 msgid "Insert advanced send options"
 msgstr "Inserir opÃ§Ãµes avanÃ§adas de envio"
 
-#: ../calendar/gui/dialogs/event-editor.c:225
+#: ../calendar/gui/dialogs/event-editor.c:255
 msgid "All _Day Event"
 msgstr "Evento de _Dia Completo"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:257
 msgid "Toggles whether to have All Day Event"
 msgstr "Alterna se ter ou nÃ£o apresentado Eventos de Dia Completo"
 
-#: ../calendar/gui/dialogs/event-editor.c:233
-msgid "Show Time as _Busy"
-msgstr "Apresentar Horas como _Ocupadas"
-
-#: ../calendar/gui/dialogs/event-editor.c:235
-msgid "Toggles whether to show time as busy"
-msgstr "Alterna se apresentar ou nÃ£o o tempo como ocupado"
-
-#: ../calendar/gui/dialogs/event-editor.c:244
+#: ../calendar/gui/dialogs/event-editor.c:266
 msgid "_Free/Busy"
 msgstr "_Livre/Ocupado"
 
-#: ../calendar/gui/dialogs/event-editor.c:246
+#: ../calendar/gui/dialogs/event-editor.c:268
 msgid "Query free / busy information for the attendees"
 msgstr "Consultar a informaÃ§Ã£o de livre/ocupado dos participantes"
 
-#: ../calendar/gui/dialogs/event-editor.c:291
-msgid "Appoint_ment"
-msgstr "Compro_misso"
+#: ../calendar/gui/dialogs/event-editor.c:319 ../calendar/gui/print.c:2610
+msgid "Appointment"
+msgstr "Compromisso"
+
+#: ../calendar/gui/dialogs/event-editor.c:385
+#: ../calendar/gui/dialogs/event-page.ui.h:3
+#: ../calendar/gui/e-meeting-list-view.c:148
+msgid "Attendees"
+msgstr "Participantes"
+
+#: ../calendar/gui/dialogs/event-editor.c:578
+msgid "Print this event"
+msgstr "Imprimir este evento"
+
+#: ../calendar/gui/dialogs/event-page.c:769
+msgid "Event's start time is in the past"
+msgstr "A data de inÃcio do evento Ã© no passado"
 
-#: ../calendar/gui/dialogs/event-page.c:751
+#: ../calendar/gui/dialogs/event-page.c:810
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr ""
 "NÃ£o Ã© possÃvel editar o evento pois o calendÃ¡rio seleccionado Ã© apenas de "
 "leitura"
 
-#: ../calendar/gui/dialogs/event-page.c:755
+#: ../calendar/gui/dialogs/event-page.c:814
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "NÃ£o Ã© possÃvel editar completamente o evento pois nÃ£o Ã© o organizador"
 
-#: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2722
+#: ../calendar/gui/dialogs/event-page.c:826
+#: ../calendar/gui/dialogs/event-page.c:2778
 msgid "This event has alarms"
 msgstr "Este evento possui alertas"
 
-#: ../calendar/gui/dialogs/event-page.c:830
-#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/event-page.c:893
+#: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganizador:"
 
-#: ../calendar/gui/dialogs/event-page.c:877
+#: ../calendar/gui/dialogs/event-page.c:940
 msgid "_Delegatees"
 msgstr "_Delegados"
 
-#: ../calendar/gui/dialogs/event-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:942
 msgid "Atte_ndees"
 msgstr "Participa_ntes"
 
-#: ../calendar/gui/dialogs/event-page.c:1094
+#: ../calendar/gui/dialogs/event-page.c:1157
 msgid "Event with no start date"
 msgstr "Evento sem data de inÃcio"
 
-#: ../calendar/gui/dialogs/event-page.c:1097
+#: ../calendar/gui/dialogs/event-page.c:1160
 msgid "Event with no end date"
 msgstr "Evento sem data de finalizaÃ§Ã£o"
 
-#: ../calendar/gui/dialogs/event-page.c:1268
-#: ../calendar/gui/dialogs/memo-page.c:655
-#: ../calendar/gui/dialogs/task-page.c:861
+#: ../calendar/gui/dialogs/event-page.c:1331
+#: ../calendar/gui/dialogs/memo-page.c:686
+#: ../calendar/gui/dialogs/task-page.c:910
 msgid "Start date is wrong"
 msgstr "Data de inÃcio incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1278
+#: ../calendar/gui/dialogs/event-page.c:1341
 msgid "End date is wrong"
 msgstr "Data de finalizaÃ§Ã£o incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1301
+#: ../calendar/gui/dialogs/event-page.c:1364
 msgid "Start time is wrong"
 msgstr "Hora de inÃcio incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1308
+#: ../calendar/gui/dialogs/event-page.c:1371
 msgid "End time is wrong"
 msgstr "Hora de finalizaÃ§Ã£o incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1470
-#: ../calendar/gui/dialogs/memo-page.c:696
-#: ../calendar/gui/dialogs/task-page.c:921
+#: ../calendar/gui/dialogs/event-page.c:1533
+#: ../calendar/gui/dialogs/memo-page.c:727
+#: ../calendar/gui/dialogs/task-page.c:970
 msgid "The organizer selected no longer has an account."
 msgstr "O organizador seleccionado jÃ¡ nÃ£o possui uma conta."
 
-#: ../calendar/gui/dialogs/event-page.c:1476
-#: ../calendar/gui/dialogs/memo-page.c:702
-#: ../calendar/gui/dialogs/task-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:1539
+#: ../calendar/gui/dialogs/memo-page.c:733
+#: ../calendar/gui/dialogs/task-page.c:976
 msgid "An organizer is required."
 msgstr "Ã? necessÃ¡rio um organizador."
 
-#: ../calendar/gui/dialogs/event-page.c:1501
-#: ../calendar/gui/dialogs/task-page.c:951
+#: ../calendar/gui/dialogs/event-page.c:1564
+#: ../calendar/gui/dialogs/task-page.c:1000
 msgid "At least one attendee is required."
 msgstr "Ã? necessÃ¡rio pelo menos um participante."
 
-#: ../calendar/gui/dialogs/event-page.c:2595
+#: ../calendar/gui/dialogs/event-page.c:2652
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Incapaz de abrir o calendÃ¡rio '%s'."
@@ -4244,132 +3909,143 @@ msgstr "Incapaz de abrir o calendÃ¡rio '%s'."
 #. 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:2639
-#: ../calendar/gui/dialogs/memo-page.c:914
-#: ../calendar/gui/dialogs/task-page.c:1743
+#: ../calendar/gui/dialogs/event-page.c:2696
+#: ../calendar/gui/dialogs/memo-page.c:946
+#: ../calendar/gui/dialogs/task-page.c:1790
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "EstÃ¡ a agir em nome de %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2941
+#: ../calendar/gui/dialogs/event-page.c:2997
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dia antes do compromisso"
 msgstr[1] "%d dias antes do compromisso"
 
-#: ../calendar/gui/dialogs/event-page.c:2947
+#: ../calendar/gui/dialogs/event-page.c:3003
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hora antes do compromisso"
 msgstr[1] "%d horas antes do compromisso"
 
-#: ../calendar/gui/dialogs/event-page.c:2953
+#: ../calendar/gui/dialogs/event-page.c:3009
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuto antes do compromisso"
 msgstr[1] "%d minutos antes do compromisso"
 
-#: ../calendar/gui/dialogs/event-page.c:2966
+#: ../calendar/gui/dialogs/event-page.c:3022
 msgid "Customize"
 msgstr "Personalizar"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2968
+#: ../calendar/gui/dialogs/event-page.c:3024
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "Nenhum"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:1
-msgid "1 day before appointment"
-msgstr "1 dia antes do compromisso"
-
 #: ../calendar/gui/dialogs/event-page.ui.h:2
-msgid "1 hour before appointment"
-msgstr "1 hora antes do compromisso"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:3
-msgid "15 minutes before appointment"
-msgstr "15 minutos antes do compromisso"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:5
-msgid "Attendee_s..."
-msgstr "Participante_s..."
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/e-meeting-time-sel.c:578
+msgid "Atte_ndees..."
+msgstr "Participa_ntes..."
 
 #: ../calendar/gui/dialogs/event-page.ui.h:6
-#: ../calendar/gui/e-meeting-list-view.c:148
-msgid "Attendees"
-msgstr "Participantes"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:9
 msgid "Custom Alarm:"
 msgstr "Alarme Personalizado:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:10
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 msgid "Event Description"
 msgstr "DescriÃ§Ã£o do Evento"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Su_mmary:"
-msgstr "Resu_mo:"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 msgid "_Alarm"
 msgstr "_Alarme"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../widgets/misc/e-attachment-dialog.c:345
+#: ../widgets/misc/e-attachment-dialog.c:349
 msgid "_Description:"
 msgstr "_DescriÃ§Ã£o:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:356
+#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../plugins/calendar-weather/calendar-weather.c:358
 msgid "_Location:"
 msgstr "_LocalizaÃ§Ã£o:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:18
+#: ../calendar/gui/dialogs/event-page.ui.h:14
+msgid "_Summary:"
+msgstr "_Resumo:"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:15
 msgid "_Time:"
 msgstr "_Tempo:"
 
+#. TRANSLATORS: Predefined alarm'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
 #: ../calendar/gui/dialogs/event-page.ui.h:19
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+msgctxt "eventpage"
+msgid "1 hour before appointment"
+msgstr "1 hora antes do compromisso"
+
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:21
+msgctxt "eventpage"
+msgid "15 minutes before appointment"
+msgstr "15 minutos antes do compromisso"
+
+#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
+#: ../calendar/gui/dialogs/event-page.ui.h:23
+msgctxt "eventpage"
 msgid "for"
-msgstr "para"
+msgstr "durante"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:11
+#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
+#: ../calendar/gui/dialogs/event-page.ui.h:25
+msgctxt "eventpage"
 msgid "until"
-msgstr "atÃ©"
+msgstr "atÃ© Ã s"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2614
 msgid "Memo"
 msgstr "Memo"
 
-#: ../calendar/gui/dialogs/memo-page.c:350
+#: ../calendar/gui/dialogs/memo-editor.c:156
+msgid "Print this memo"
+msgstr "Imprimir este memo"
+
+#: ../calendar/gui/dialogs/memo-page.c:338
+msgid "Memo's start date is in the past"
+msgstr "A data de inÃcio do memo Ã© no passado"
+
+#: ../calendar/gui/dialogs/memo-page.c:376
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr ""
 "NÃ£o Ã© possÃvel editar o memo pois a lista de memos seleccionada Ã© apenas de "
 "leitura"
 
-#: ../calendar/gui/dialogs/memo-page.c:354
+#: ../calendar/gui/dialogs/memo-page.c:380
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "NÃ£o Ã© possÃvel editar completamente o memo pois nÃ£o Ã© o organizador"
 
-#: ../calendar/gui/dialogs/memo-page.c:875
+#: ../calendar/gui/dialogs/memo-page.c:907
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Incapaz de abrir os memos em '%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2241
-#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2343
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
+#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:270
+#: ../em-format/em-format.c:1040 ../mail/em-format-html.c:2289
+#: ../mail/em-format-html.c:2348 ../mail/em-format-html.c:2372
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
 msgstr "Para"
 
@@ -4378,67 +4054,72 @@ msgstr "Para"
 msgid "Sta_rt date:"
 msgstr "_Data de inÃcio:"
 
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
+msgid "Su_mmary:"
+msgstr "Resu_mo:"
+
 #: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "P_ara:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:380
+#: ../calendar/gui/dialogs/task-page.c:429
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "_Grupo:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:53
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "EstÃ¡ a alterar um evento recorrente. O que deseja alterar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "EstÃ¡ a delegar um evento recorrente. O que deseja delegar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "EstÃ¡ a alterar uma tarefa recorrente. O que deseja alterar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:63
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "EstÃ¡ a alterar um memo recorrente. O que deseja alterar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
 msgstr "Apenas Esta InstÃ¢ncia"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:94
 msgid "This and Prior Instances"
 msgstr "Esta InstÃ¢ncia e Anteriores"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "This and Future Instances"
 msgstr "Esta InstÃ¢ncia e Futuras"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:105
 msgid "All Instances"
 msgstr "Todas as InstÃ¢ncias"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:558
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Este compromisso contÃ©m recorrÃªncias que o Evolution nÃ£o pode editar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:889
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "Data de recorrÃªncia Ã© invÃ¡lida"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:933
+#: ../calendar/gui/dialogs/recurrence-page.c:932
 msgid "End time of the recurrence was before event's start"
 msgstr "Hora de fim da recorrÃªncia era anterior ao 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:962
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "a"
 
@@ -4446,7 +4127,7 @@ msgstr "a"
 #. * (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:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "primeiro"
 
@@ -4455,7 +4136,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:1025
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "segundo"
 
@@ -4463,7 +4144,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:1030
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "terceiro"
 
@@ -4471,7 +4152,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:1035
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "quarto"
 
@@ -4479,7 +4160,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:1040
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "fifth"
 msgstr "quinto"
 
@@ -4487,13 +4168,13 @@ msgstr "quinto"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 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:1069
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "Outra Data"
 
@@ -4501,7 +4182,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:1075
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "1Âº ao 10Âº"
 
@@ -4509,7 +4190,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:1081
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "11Âº ao 20Âº"
 
@@ -4517,45 +4198,45 @@ 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:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 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
+#. (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:1112
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 msgstr "dia"
 
 #. 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:1241
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "no"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1416
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
 msgstr "ocorrÃªncias"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2121
+#: ../calendar/gui/dialogs/recurrence-page.c:2119
 msgid "Add exception"
 msgstr "Adicionar excepÃ§Ã£o"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2162
+#: ../calendar/gui/dialogs/recurrence-page.c:2160
 msgid "Could not get a selection to modify."
 msgstr "Incapaz de obter uma selecÃ§Ã£o para alterar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2168
+#: ../calendar/gui/dialogs/recurrence-page.c:2166
 msgid "Modify exception"
 msgstr "Alterar a excepÃ§Ã£o"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2212
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Could not get a selection to delete."
 msgstr "Incapaz de obter uma selecÃ§Ã£o para apagar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2351
+#: ../calendar/gui/dialogs/recurrence-page.c:2337
 msgid "Date/Time"
 msgstr "Data/Hora"
 
@@ -4567,7 +4248,7 @@ msgstr "A Cada"
 msgid "Exceptions"
 msgstr "ExcepÃ§Ãµes"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:77
 msgid "Preview"
 msgstr "Antever"
 
@@ -4575,48 +4256,86 @@ msgstr "Antever"
 msgid "This appointment rec_urs"
 msgstr "Este compromisso _repete-se"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:9
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+msgctxt "recurrpage"
+msgid "day(s)"
+msgstr "dia(s)"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+msgctxt "recurrpage"
+msgid "for"
+msgstr "por"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+msgctxt "recurrpage"
 msgid "forever"
 msgstr "para sempre"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:14
+msgctxt "recurrpage"
 msgid "month(s)"
 msgstr "mes(es)"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
+msgctxt "recurrpage"
+msgid "until"
+msgstr "atÃ©"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:18
+msgctxt "recurrpage"
 msgid "week(s)"
 msgstr "semana(s)"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:13
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
+msgctxt "recurrpage"
 msgid "year(s)"
 msgstr "ano(s)"
 
-#: ../calendar/gui/dialogs/send-comp.c:160
+#: ../calendar/gui/dialogs/send-comp.c:162
 msgid "Send my alarms with this event"
 msgstr "Enviar os meus alarmes com este evento"
 
-#: ../calendar/gui/dialogs/send-comp.c:162
+#: ../calendar/gui/dialogs/send-comp.c:164
 msgid "Notify new attendees _only"
 msgstr "Apenas notificar os novos c_onvocados"
 
-#: ../calendar/gui/dialogs/task-details-page.c:379
-#: ../calendar/gui/dialogs/task-details-page.c:399
+#: ../calendar/gui/dialogs/task-details-page.c:350
+#: ../calendar/gui/dialogs/task-details-page.c:372
 msgid "Completed date is wrong"
 msgstr "Data de finalizaÃ§Ã£o incorrecta"
 
-#: ../calendar/gui/dialogs/task-details-page.c:485
+#: ../calendar/gui/dialogs/task-details-page.c:483
 msgid "Web Page"
 msgstr "PÃ¡gina Web"
 
 #. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:2
+#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:588
+#: ../calendar/gui/print.c:2697 ../mail/em-sync-stream.c:151
+#: ../mail/em-sync-stream.c:178 ../mail/em-sync-stream.c:199
+#, c-format
+msgid "Canceled"
+msgstr "Cancelado"
+
+#. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
 #: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:463
-#: ../calendar/gui/e-cal-model-tasks.c:737
-#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:583
-#: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/e-cal-model-tasks.c:441
+#: ../calendar/gui/e-cal-model-tasks.c:715
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:587
+#: ../calendar/gui/print.c:2694 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "Terminada"
@@ -4624,46 +4343,46 @@ msgstr "Terminada"
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-task-table.c:508 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1135 ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1185 ../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:289
-#: ../calendar/gui/e-cal-model-tasks.c:461
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:211
-#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:582
-#: ../calendar/gui/print.c:2645
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:586
+#: ../calendar/gui/print.c:2691
 msgid "In Progress"
 msgstr "Em Curso"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1133 ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1183 ../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:316
-#: ../calendar/gui/e-cal-model.c:1304 ../calendar/gui/e-task-table.c:509
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1134
-#: ../widgets/misc/e-send-options.ui.h:13
+#: ../calendar/gui/e-cal-model.c:1269 ../calendar/gui/e-task-table.c:512
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1184
+#: ../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:299
-#: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:581
-#: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:585
+#: ../calendar/gui/print.c:2688 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Por Iniciar"
 
@@ -4679,8 +4398,8 @@ msgstr "Esta_do:"
 #. 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:1743
-#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../calendar/gui/e-calendar-view.c:1776
+#: ../calendar/gui/e-meeting-list-view.c:594
 #: ../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
@@ -4689,8 +4408,8 @@ msgstr "Estado"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:24
-#: ../widgets/misc/e-send-options.ui.h:24
+#: ../calendar/gui/e-task-table.c:514 ../calendar/gui/tasktypes.xml.h:24
+#: ../widgets/misc/e-send-options.ui.h:27
 msgid "Undefined"
 msgstr "Indefinida"
 
@@ -4699,7 +4418,7 @@ msgid "_Date completed:"
 msgstr "_Data de finalizaÃ§Ã£o:"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Priority:"
 msgstr "_Prioridade:"
 
@@ -4707,55 +4426,64 @@ msgstr "_Prioridade:"
 msgid "_Web Page:"
 msgstr "PÃ¡gina _Web:"
 
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:117
 msgid "_Status Details"
 msgstr "Detalhes de _Estado"
 
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../calendar/gui/dialogs/task-editor.c:119
 msgid "Click to change or view the status details of the task"
 msgstr "Clique para alterar ou visualizar os detalhes de estado da tarefa"
 
-#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../calendar/gui/dialogs/task-editor.c:127
 #: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "_OpÃ§Ãµes de Envio"
 
-#: ../calendar/gui/dialogs/task-editor.c:334
-msgid "_Task"
-msgstr "_Tarefa"
+#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:2612
+#: ../widgets/misc/e-send-options.c:503
+msgid "Task"
+msgstr "Tarefa"
 
-#: ../calendar/gui/dialogs/task-editor.c:337
+#: ../calendar/gui/dialogs/task-editor.c:331
 msgid "Task Details"
 msgstr "Detalhes da Tarefa"
 
-#: ../calendar/gui/dialogs/task-page.c:336
+#: ../calendar/gui/dialogs/task-editor.c:373
+msgid "Print this task"
+msgstr "Imprimir esta tarefa"
+
+#: ../calendar/gui/dialogs/task-page.c:346
+msgid "Task's start date is in the past"
+msgstr "A data de inÃcio da tarefa Ã© no passado"
+
+#: ../calendar/gui/dialogs/task-page.c:347
+msgid "Task's due date is in the past"
+msgstr "A data limite da tarefa Ã© no passado"
+
+#: ../calendar/gui/dialogs/task-page.c:382
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr ""
 "NÃ£o Ã© possÃvel editar a tarefa pois a lista de tarefas seleccionada Ã© apenas "
 "de leitura"
 
-#: ../calendar/gui/dialogs/task-page.c:340
+#: ../calendar/gui/dialogs/task-page.c:386
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "NÃ£o Ã© possÃvel editar completamente a tarefa pois nÃ£o Ã© o organizador"
 
-#: ../calendar/gui/dialogs/task-page.c:388
+#: ../calendar/gui/dialogs/task-page.c:437
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "Organi_zador:"
 
-#: ../calendar/gui/dialogs/task-page.c:834
+#: ../calendar/gui/dialogs/task-page.c:883
 msgid "Due date is wrong"
 msgstr "Data limite Ã© invÃ¡lida"
 
-#: ../calendar/gui/dialogs/task-page.c:1700
+#: ../calendar/gui/dialogs/task-page.c:1747
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Incapaz de abrir as tarefas em '%s'."
 
-#: ../calendar/gui/dialogs/task-page.ui.h:1
-msgid "Atte_ndees..."
-msgstr "Participa_ntes..."
-
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "Categor_ias..."
@@ -4844,7 +4572,7 @@ msgstr "%s em %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s para um tipo despoletado desconhecido"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:668
 msgid "Untitled"
 msgstr "Sem tÃtulo"
 
@@ -4853,7 +4581,7 @@ msgid "Categories:"
 msgstr "Categorias:"
 
 #: ../calendar/gui/e-cal-component-preview.c:237
-#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
+#: ../calendar/gui/e-itip-control.c:1164 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "Resumo:"
 
@@ -4868,8 +4596,8 @@ msgstr "Data Limite:"
 
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1176
-#: ../plugins/itip-formatter/itip-view.c:1066
+#: ../calendar/gui/e-itip-control.c:1189
+#: ../plugins/itip-formatter/itip-view.c:1074
 msgid "Status:"
 msgstr "Estado:"
 
@@ -4878,7 +4606,7 @@ msgid "Priority:"
 msgstr "Prioridade:"
 
 #: ../calendar/gui/e-cal-component-preview.c:337
-#: ../calendar/gui/e-itip-control.c:1214 ../calendar/gui/e-itip-control.ui.h:4
+#: ../calendar/gui/e-itip-control.c:1227 ../calendar/gui/e-itip-control.ui.h:4
 #: ../mail/mail-config.ui.h:34
 msgid "Description:"
 msgstr "DescriÃ§Ã£o:"
@@ -4894,32 +4622,32 @@ msgstr "PÃ¡gina Web:"
 msgid "Created"
 msgstr "Criada"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
 msgid "End Date"
 msgstr "Data de FinalizaÃ§Ã£o"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:9
 #: ../calendar/gui/e-memo-table.etspec.h:4
 msgid "Last modified"
 msgstr "Ã?ltima alteraÃ§Ã£o"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "Data de InÃcio"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/e-task-table.c:563
 msgid "Free"
 msgstr "Livre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:564
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:659
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4930,63 +4658,47 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-cal-model-tasks.c:709
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "Nenhum"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
 #: ../calendar/gui/e-meeting-store.c:856
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Sim"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:174
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+#: ../calendar/gui/e-meeting-store.c:181
 msgid "No"
 msgstr "NÃ£o"
 
-#: ../calendar/gui/e-cal-model.c:377
-msgid "Default Client"
-msgstr "Cliente por OmissÃ£o"
-
-#: ../calendar/gui/e-cal-model.c:387 ../calendar/gui/gnome-cal.c:518
-#: ../shell/e-shell.c:867
-msgid "Shell Settings"
-msgstr "DefiniÃ§Ãµes de Consola"
-
-#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:519
-#: ../shell/e-shell.c:868
-msgid "Application-wide settings"
-msgstr "DefiniÃ§Ãµes globais da aplicaÃ§Ã£o"
-
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:562 ../calendar/gui/e-itip-control.c:1197
-#: ../calendar/gui/e-itip-control.c:1336
+#: ../calendar/gui/e-cal-model.c:527 ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.c:1349
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:930
-#: ../plugins/itip-formatter/itip-formatter.c:461
-#: ../plugins/itip-formatter/itip-formatter.c:2338
-#: ../plugins/plugin-manager/plugin-manager.c:89
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:967
+#: ../modules/plugin-manager/evolution-plugin-manager.c:98
+#: ../plugins/itip-formatter/itip-formatter.c:457
+#: ../plugins/itip-formatter/itip-formatter.c:2345
 msgid "Unknown"
 msgstr "Desconhecida"
 
-#: ../calendar/gui/e-cal-model.c:1306
+#: ../calendar/gui/e-cal-model.c:1271
 msgid "Recurring"
 msgstr "Recorrente"
 
-#: ../calendar/gui/e-cal-model.c:1308
+#: ../calendar/gui/e-cal-model.c:1273
 msgid "Assigned"
 msgstr "AtribuÃda"
 
-#: ../calendar/gui/e-cal-model.c:2210
+#: ../calendar/gui/e-cal-model.c:2175
 #, c-format
 msgid "Opening %s"
 msgstr "A abrir %s"
@@ -5023,97 +4735,97 @@ msgid "Start date"
 msgstr "Data de inÃcio"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:566
+#: ../calendar/gui/e-meeting-list-view.c:557
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:554
+#: ../widgets/misc/e-attachment-tree-view.c:582
 msgid "Type"
 msgstr "Tipo"
 
-#: ../calendar/gui/e-calendar-view.c:392
+#: ../calendar/gui/e-calendar-view.c:410
 msgid "Cut selected events to the clipboard"
 msgstr "Cortar os eventos seleccionados para a Ã¡rea de transferÃªncia"
 
-#: ../calendar/gui/e-calendar-view.c:398
+#: ../calendar/gui/e-calendar-view.c:416
 msgid "Copy selected events to the clipboard"
 msgstr "Copiar os eventos seleccionados para a Ã¡rea de transferÃªncia"
 
-#: ../calendar/gui/e-calendar-view.c:404
+#: ../calendar/gui/e-calendar-view.c:422
 msgid "Paste events from the clipboard"
 msgstr "Colar eventos da Ã¡rea de transferÃªncia"
 
-#: ../calendar/gui/e-calendar-view.c:410
+#: ../calendar/gui/e-calendar-view.c:428
 msgid "Delete selected events"
 msgstr "Apagar os eventos seleccionados"
 
-#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:187
-#: ../calendar/gui/e-task-table.c:265
+#: ../calendar/gui/e-calendar-view.c:447 ../calendar/gui/e-memo-table.c:188
+#: ../calendar/gui/e-task-table.c:266
 msgid "Deleting selected objects"
 msgstr "A apagar os objectos seleccionados"
 
-#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:842
-#: ../calendar/gui/e-task-table.c:1063
+#: ../calendar/gui/e-calendar-view.c:641 ../calendar/gui/e-memo-table.c:847
+#: ../calendar/gui/e-task-table.c:1070
 msgid "Updating objects"
 msgstr "A actualizar os objectos"
 
-#: ../calendar/gui/e-calendar-view.c:1690
-#: ../calendar/gui/e-itip-control.c:1182
+#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-itip-control.c:1195
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../plugins/itip-formatter/itip-formatter.c:2326
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../plugins/itip-formatter/itip-formatter.c:2333
 msgid "Accepted"
 msgstr "Aceite"
 
-#: ../calendar/gui/e-calendar-view.c:1691
-#: ../calendar/gui/e-itip-control.c:1192
+#: ../calendar/gui/e-calendar-view.c:1724
+#: ../calendar/gui/e-itip-control.c:1205
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../plugins/itip-formatter/itip-formatter.c:2332
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../plugins/itip-formatter/itip-formatter.c:2339
 msgid "Declined"
 msgstr "Recusada"
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1725
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "Tentative"
 msgstr "Tentativa"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1726
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../plugins/itip-formatter/itip-formatter.c:2342
 msgid "Delegated"
 msgstr "Delegada"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1727
 msgid "Needs action"
 msgstr "Requer acÃ§Ã£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:1835 ../calendar/gui/e-memo-table.c:527
-#: ../calendar/gui/e-task-table.c:738
+#: ../calendar/gui/e-calendar-view.c:1871 ../calendar/gui/e-memo-table.c:530
+#: ../calendar/gui/e-task-table.c:745
 #, 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:1839 ../calendar/gui/e-memo-table.c:532
-#: ../calendar/gui/e-task-table.c:741
+#: ../calendar/gui/e-calendar-view.c:1875 ../calendar/gui/e-memo-table.c:535
+#: ../calendar/gui/e-task-table.c:748
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizador: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2600
+#: ../calendar/gui/e-calendar-view.c:1891 ../calendar/gui/print.c:2646
 #, c-format
 msgid "Location: %s"
 msgstr "LocalizaÃ§Ã£o: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1886
+#: ../calendar/gui/e-calendar-view.c:1922
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
@@ -5156,8 +4868,8 @@ msgstr "Apresentar o segundo fuso-horÃ¡rio"
 #. 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:864 ../calendar/gui/e-day-view.c:1884
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1735
+#: ../calendar/gui/e-day-view-top-item.c:897 ../calendar/gui/e-day-view.c:1881
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1744
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5167,10 +4879,10 @@ msgstr "%A %d %B"
 #. %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:868 ../calendar/gui/e-day-view.c:1901
-#: ../calendar/gui/e-week-view-main-item.c:231
-#: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:901
+#: ../calendar/gui/e-day-view-top-item.c:901 ../calendar/gui/e-day-view.c:1898
+#: ../calendar/gui/e-week-view-main-item.c:227
+#: ../calendar/gui/ea-gnome-calendar.c:203
+#: ../modules/calendar/e-cal-shell-view-private.c:1015
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -5179,31 +4891,35 @@ msgstr "%a %d %b"
 #. 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:872 ../calendar/gui/e-day-view.c:1917
-#: ../calendar/gui/e-week-view-main-item.c:245
-#: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:937
+#: ../calendar/gui/e-day-view-top-item.c:905 ../calendar/gui/e-day-view.c:1914
+#: ../calendar/gui/e-week-view-main-item.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:233
+#: ../modules/calendar/e-cal-shell-view-private.c:1051
 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:1115 ../calendar/gui/e-week-view.c:749
+#: ../calendar/gui/e-day-view.c:1080 ../calendar/gui/e-week-view.c:752
 #: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1118 ../calendar/gui/e-week-view.c:752
+#: ../calendar/gui/e-day-view.c:1083 ../calendar/gui/e-week-view.c:755
 #: ../calendar/gui/print.c:821
 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:2614
+#: ../calendar/gui/e-day-view.c:2649
 #, c-format
 msgid "Week %d"
 msgstr "Semana %d"
 
+#: ../calendar/gui/e-itip-control.c:761
+msgid "Recurring:"
+msgstr "Recorrente:"
+
 #: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "Sim. (RecorrÃªncia Complexa)"
@@ -5285,7 +5001,7 @@ msgstr "Termina"
 msgid "Due"
 msgstr "Limite"
 
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1047
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1059
 msgid "iCalendar Information"
 msgstr "InformaÃ§Ã£o de iCalendar"
 
@@ -5294,312 +5010,311 @@ msgstr "InformaÃ§Ã£o de iCalendar"
 msgid "iCalendar Error"
 msgstr "Erro de iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1080 ../calendar/gui/e-itip-control.c:1096
-#: ../calendar/gui/e-itip-control.c:1107 ../calendar/gui/e-itip-control.c:1124
-#: ../plugins/itip-formatter/itip-view.c:350
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../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
 msgid "An unknown person"
 msgstr "Uma pessoa desconhecida"
 
-#: ../calendar/gui/e-itip-control.c:1132
+#: ../calendar/gui/e-itip-control.c:1145
 msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
+"Please review the following information, and then select an action from the "
+"menu below."
 msgstr ""
-"<br> Reveja a informaÃ§Ã£o seguinte e depois seleccione uma acÃ§Ã£o do menu "
-"abaixo."
+"Reveja a informaÃ§Ã£o seguinte e depois seleccione uma acÃ§Ã£o do menu abaixo."
 
 #. Translators: "None" used as a default value for events without Summary received by mail
-#: ../calendar/gui/e-itip-control.c:1147
-#: ../plugins/itip-formatter/itip-formatter.c:2313
+#: ../calendar/gui/e-itip-control.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:2320
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Nenhum"
 
-#: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2329
+#: ../calendar/gui/e-itip-control.c:1200
+#: ../plugins/itip-formatter/itip-formatter.c:2336
 msgid "Tentatively Accepted"
 msgstr "Aceite Tentativamente"
 
-#: ../calendar/gui/e-itip-control.c:1277
+#: ../calendar/gui/e-itip-control.c:1290
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr ""
 "A reuniÃ£o foi cancelada, no entanto nÃ£o foi encontrada nos seus calendÃ¡rios"
 
-#: ../calendar/gui/e-itip-control.c:1279
+#: ../calendar/gui/e-itip-control.c:1292
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "A tarefa foi cancelada, no entanto nÃ£o foi encontrada nas suas listas de "
 "tarefas"
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1369
 #, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> publicou informaÃ§Ã£o de reuniÃ£o."
+msgid "%s has published meeting information."
+msgstr "%s publicou informaÃ§Ã£o de reuniÃ£o."
 
-#: ../calendar/gui/e-itip-control.c:1357
+#: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Information"
 msgstr "InformaÃ§Ã£o de ReuniÃ£o"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1376
 #, c-format
-msgid "<b>%s</b> requests the presence of %s at a meeting."
-msgstr "<b>%s</b> pede a presenÃ§a de %s na reuniÃ£o."
+msgid "%s requests the presence of %s at a meeting."
+msgstr "%s pede a presenÃ§a de %s na reuniÃ£o."
 
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1378
 #, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr "<b>%s</b> pede a sua presenÃ§a na reuniÃ£o."
+msgid "%s requests your presence at a meeting."
+msgstr "%s pede a sua presenÃ§a na reuniÃ£o."
 
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1379
 msgid "Meeting Proposal"
 msgstr "Proposta de ReuniÃ£o"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1372
+#: ../calendar/gui/e-itip-control.c:1385
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing meeting."
-msgstr "<b>%s</b> deseja ser adicionado a uma reuniÃ£o existente."
+msgid "%s wishes to be added to an existing meeting."
+msgstr "%s deseja ser convocado para uma reuniÃ£o existente."
 
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Meeting Update"
 msgstr "ActualizaÃ§Ã£o de ReuniÃ£o"
 
-#: ../calendar/gui/e-itip-control.c:1377
+#: ../calendar/gui/e-itip-control.c:1390
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "<b>%s</b> deseja receber a mais recente informaÃ§Ã£o de reuniÃ£o."
+msgid "%s wishes to receive the latest meeting information."
+msgstr "%s deseja receber a mais recente informaÃ§Ã£o de reuniÃ£o."
 
-#: ../calendar/gui/e-itip-control.c:1378
+#: ../calendar/gui/e-itip-control.c:1391
 msgid "Meeting Update Request"
 msgstr "Pedido de ActualizaÃ§Ã£o de ReuniÃ£o"
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1398
 #, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr "<b>%s</b> respondeu a um pedido de reuniÃ£o."
+msgid "%s has replied to a meeting request."
+msgstr "%s respondeu a um pedido de reuniÃ£o."
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1399
 msgid "Meeting Reply"
 msgstr "Resposta de ReuniÃ£o"
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1406
 #, c-format
-msgid "<b>%s</b> has canceled a meeting."
-msgstr "<b>%s</b> cancelou uma reuniÃ£o."
+msgid "%s has canceled a meeting."
+msgstr "%s cancelou uma reuniÃ£o."
 
-#: ../calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1407
 msgid "Meeting Cancelation"
 msgstr "Cancelamento de ReuniÃ£o"
 
-#: ../calendar/gui/e-itip-control.c:1404 ../calendar/gui/e-itip-control.c:1481
-#: ../calendar/gui/e-itip-control.c:1521
+#: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
+#: ../calendar/gui/e-itip-control.c:1534
 #, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr "<b>%s</b> enviou uma mensagem imperceptÃvel."
+msgid "%s has sent an unintelligible message."
+msgstr "%s enviou uma mensagem imperceptÃvel."
 
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1418
 msgid "Bad Meeting Message"
 msgstr "Mensagem de ReuniÃ£o InvÃ¡lida"
 
-#: ../calendar/gui/e-itip-control.c:1432
+#: ../calendar/gui/e-itip-control.c:1445
 #, c-format
-msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b> publicou informaÃ§Ã£o de tarefa."
+msgid "%s has published task information."
+msgstr "%s publicou informaÃ§Ã£o de tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1446
 msgid "Task Information"
 msgstr "InformaÃ§Ã£o de Tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1453
 #, c-format
-msgid "<b>%s</b> requests %s to perform a task."
-msgstr "<b>%s</b> requer que %s execute uma tarefa."
+msgid "%s requests %s to perform a task."
+msgstr "%s requer que %s execute uma tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1455
 #, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr "<b>%s</b> requer que uma tarefa seja executada por si."
+msgid "%s requests you perform a task."
+msgstr "%s requer que uma tarefa seja executada por si."
 
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1456
 msgid "Task Proposal"
 msgstr "Proposta de Tarefa"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1449
+#: ../calendar/gui/e-itip-control.c:1462
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing task."
-msgstr "<b>%s</b> deseja ser adicionado a uma tarefa existente."
+msgid "%s wishes to be added to an existing task."
+msgstr "%s deseja ser adicionado a uma tarefa existente."
 
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Task Update"
 msgstr "ActualizaÃ§Ã£o de Tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1454
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "<b>%s</b> deseja receber a mais recente informaÃ§Ã£o de tarefa."
+msgid "%s wishes to receive the latest task information."
+msgstr "%s deseja receber a mais recente informaÃ§Ã£o de tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Task Update Request"
 msgstr "Pedido de ActualizaÃ§Ã£o de Tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1475
 #, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr "<b>%s</b> respondeu a uma atribuiÃ§Ã£o de tarefa."
+msgid "%s has replied to a task assignment."
+msgstr "%s respondeu a uma atribuiÃ§Ã£o de tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1476
 msgid "Task Reply"
 msgstr "Resposta a Tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1483
 #, c-format
-msgid "<b>%s</b> has canceled a task."
-msgstr "<b>%s</b> cancelou uma tarefa."
+msgid "%s has canceled a task."
+msgstr "%s cancelou uma tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1484
 msgid "Task Cancelation"
 msgstr "Cancelamento de Tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1482
+#: ../calendar/gui/e-itip-control.c:1495
 msgid "Bad Task Message"
 msgstr "Mensagem de Tarefa InvÃ¡lida"
 
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1519
 #, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b> publicou informaÃ§Ã£o de livre/ocupado."
+msgid "%s has published free/busy information."
+msgstr "%s publicou informaÃ§Ã£o de livre/ocupado."
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1520
 msgid "Free/Busy Information"
 msgstr "InformaÃ§Ã£o de Livre/Ocupado"
 
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1524
 #, c-format
-msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b> pede a sua informaÃ§Ã£o de livre/ocupado."
+msgid "%s requests your free/busy information."
+msgstr "%s estÃ¡ a pedir a sua informaÃ§Ã£o de livre/ocupado."
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1525
 msgid "Free/Busy Request"
 msgstr "Pedido de Livre/Ocupado"
 
-#: ../calendar/gui/e-itip-control.c:1516
+#: ../calendar/gui/e-itip-control.c:1529
 #, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> respondeu a um pedido de livre/ocupado."
+msgid "%s has replied to a free/busy request."
+msgstr "%s respondeu a um pedido de livre/ocupado."
 
-#: ../calendar/gui/e-itip-control.c:1517
+#: ../calendar/gui/e-itip-control.c:1530
 msgid "Free/Busy Reply"
 msgstr "Resposta de Livre/Ocupado"
 
-#: ../calendar/gui/e-itip-control.c:1522
+#: ../calendar/gui/e-itip-control.c:1535
 msgid "Bad Free/Busy Message"
 msgstr "Mensagem de Livre/Ocupado InvÃ¡lida"
 
-#: ../calendar/gui/e-itip-control.c:1598
+#: ../calendar/gui/e-itip-control.c:1611
 msgid "The message does not appear to be properly formed"
 msgstr "A mensagem nÃ£o parece estar correctamente criada"
 
-#: ../calendar/gui/e-itip-control.c:1657
+#: ../calendar/gui/e-itip-control.c:1670
 msgid "The message contains only unsupported requests."
 msgstr "A mensagem apenas contÃ©m pedidos nÃ£o suportados."
 
-#: ../calendar/gui/e-itip-control.c:1690
+#: ../calendar/gui/e-itip-control.c:1703
 msgid "The attachment does not contain a valid calendar message"
 msgstr "O anexo nÃ£o contÃ©m uma mensagem de calendÃ¡rio vÃ¡lida"
 
-#: ../calendar/gui/e-itip-control.c:1728
+#: ../calendar/gui/e-itip-control.c:1741
 msgid "The attachment has no viewable calendar items"
 msgstr "O anexo nÃ£o contÃ©m itens de calendÃ¡rio visÃveis"
 
-#: ../calendar/gui/e-itip-control.c:1970
+#: ../calendar/gui/e-itip-control.c:1983
 msgid "Update complete\n"
 msgstr "ActualizaÃ§Ã£o terminada\n"
 
-#: ../calendar/gui/e-itip-control.c:2004
+#: ../calendar/gui/e-itip-control.c:2017
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objecto Ã© invÃ¡lido e nÃ£o pode ser actualizado\n"
 
-#: ../calendar/gui/e-itip-control.c:2022
+#: ../calendar/gui/e-itip-control.c:2035
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Esta resposta nÃ£o Ã© de um participante actual.  Adicionar como participante?"
 
-#: ../calendar/gui/e-itip-control.c:2040
+#: ../calendar/gui/e-itip-control.c:2053
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Estado de participante nÃ£o pode ser actualizado devido a um estado "
 "invÃ¡lido!\n"
 
-#: ../calendar/gui/e-itip-control.c:2064
+#: ../calendar/gui/e-itip-control.c:2077
 msgid "Attendee status updated\n"
 msgstr "Estado de participante actualizado\n"
 
-#: ../calendar/gui/e-itip-control.c:2071
+#: ../calendar/gui/e-itip-control.c:2084
 #: ../plugins/itip-formatter/itip-formatter.c:1421
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Estado de participante nÃ£o pode ser actualizado pois o item jÃ¡ nÃ£o existe"
 
-#: ../calendar/gui/e-itip-control.c:2102 ../calendar/gui/e-itip-control.c:2159
+#: ../calendar/gui/e-itip-control.c:2115 ../calendar/gui/e-itip-control.c:2172
 msgid "Item sent!\n"
 msgstr "Item enviado!\n"
 
-#: ../calendar/gui/e-itip-control.c:2108 ../calendar/gui/e-itip-control.c:2167
+#: ../calendar/gui/e-itip-control.c:2121 ../calendar/gui/e-itip-control.c:2180
 msgid "The item could not be sent!\n"
 msgstr "O item nÃ£o pode ser enviado!\n"
 
-#: ../calendar/gui/e-itip-control.c:2260
+#: ../calendar/gui/e-itip-control.c:2273
 msgid "Choose an action:"
 msgstr "Seleccione uma acÃ§Ã£o:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2289
-#: ../calendar/gui/e-meeting-list-view.c:591
+#: ../calendar/gui/e-itip-control.c:2302
+#: ../calendar/gui/e-meeting-list-view.c:582
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Responder SFF"
 
-#: ../calendar/gui/e-itip-control.c:2329
+#: ../calendar/gui/e-itip-control.c:2342
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../calendar/gui/e-itip-control.c:2353
+#: ../calendar/gui/e-itip-control.c:2366
 #: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "Aceitar"
 
-#: ../calendar/gui/e-itip-control.c:2354
+#: ../calendar/gui/e-itip-control.c:2367
 msgid "Tentatively accept"
 msgstr "Aceitar tentativamente"
 
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2368
 #: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "Recusar"
 
-#: ../calendar/gui/e-itip-control.c:2380
+#: ../calendar/gui/e-itip-control.c:2393
 msgid "Send Free/Busy Information"
 msgstr "Enviar InformaÃ§Ã£o de Livre/Ocupado"
 
-#: ../calendar/gui/e-itip-control.c:2404
+#: ../calendar/gui/e-itip-control.c:2417
 msgid "Update respondent status"
 msgstr "Actualizar o estado das respostas"
 
-#: ../calendar/gui/e-itip-control.c:2428
+#: ../calendar/gui/e-itip-control.c:2441
 msgid "Send Latest Information"
 msgstr "Enviar a Mais Recente InformaÃ§Ã£o"
 
-#: ../calendar/gui/e-itip-control.c:2452
-#: ../modules/mail/e-mail-shell-view-actions.c:1032
-#: ../widgets/misc/e-activity-proxy.c:299
+#: ../calendar/gui/e-itip-control.c:2465
+#: ../modules/mail/e-mail-shell-view-actions.c:1036
+#: ../widgets/misc/e-activity-proxy.c:315
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -5648,72 +5363,72 @@ msgid "Resources"
 msgstr "Recursos"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 #: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "Individual"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 #: ../calendar/gui/print.c:969 ../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:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 #: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "Recurso"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
 #: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "Sala"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 #: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "Coordenador"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 #: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "Participante Requerido"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 #: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "Participante Opcional"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
 #: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "NÃ£o-Participante"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/e-meeting-store.c:863
 msgid "Needs Action"
 msgstr "Requer AcÃ§Ã£o"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:546
+#: ../calendar/gui/e-meeting-list-view.c:537
 msgid "Attendee                          "
 msgstr "Participante                      "
 
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 msgid "In Process"
 msgstr "Em Curso"
 
 #. 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:458
-#: ../calendar/gui/e-meeting-time-sel.c:2300
+#: ../calendar/gui/e-meeting-time-sel.c:2376
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
@@ -5722,7 +5437,7 @@ msgstr "%A, %d %B, %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2331
+#: ../calendar/gui/e-meeting-time-sel.c:2407
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -5732,67 +5447,63 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "Out of Office"
 msgstr "Fora do EscritÃ³rio"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "No Information"
 msgstr "Nenhuma InformaÃ§Ã£o"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
-msgid "A_ttendees..."
-msgstr "Par_ticipantes..."
-
-#: ../calendar/gui/e-meeting-time-sel.c:581
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "O_ptions"
 msgstr "O_pÃ§Ãµes"
 
-#: ../calendar/gui/e-meeting-time-sel.c:598
+#: ../calendar/gui/e-meeting-time-sel.c:617
 msgid "Show _only working hours"
 msgstr "Apenas apresentar as h_oras Ãºteis"
 
-#: ../calendar/gui/e-meeting-time-sel.c:608
+#: ../calendar/gui/e-meeting-time-sel.c:628
 msgid "Show _zoomed out"
 msgstr "Apresentar com _zoom reduzido"
 
-#: ../calendar/gui/e-meeting-time-sel.c:623
+#: ../calendar/gui/e-meeting-time-sel.c:644
 msgid "_Update free/busy"
 msgstr "Act_ualizar livre/ocupado"
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:659
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:677
 msgid "_Autopick"
 msgstr "_AutoselecÃ§Ã£o"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:692
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:688
+#: ../calendar/gui/e-meeting-time-sel.c:710
 msgid "_All people and resources"
 msgstr "Tod_as as pessoas e recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:697
+#: ../calendar/gui/e-meeting-time-sel.c:720
 msgid "All _people and one resource"
 msgstr "Todas as _pessoas e um recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:730
 msgid "_Required people"
 msgstr "Pessoas _requeridas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:739
 msgid "Required people and _one resource"
 msgstr "Pessoas requeridas e _um recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:760
+#: ../calendar/gui/e-meeting-time-sel.c:785
 msgid "_Start time:"
 msgstr "Hora de _inÃcio:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:797
+#: ../calendar/gui/e-meeting-time-sel.c:822
 msgid "_End time:"
 msgstr "_Hora de finalizaÃ§Ã£o:"
 
@@ -5820,45 +5531,47 @@ msgstr "Idioma"
 msgid "Member"
 msgstr "Membro"
 
-#: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:397
+#: ../calendar/gui/e-memo-table.c:414
+#: ../modules/calendar/e-cal-shell-content.c:473
 #: ../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:432
+#: ../plugins/caldav/caldav-browse-server.c:431
 msgid "Memos"
 msgstr "Memos"
 
-#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:702
+#: ../calendar/gui/e-memo-table.c:492 ../calendar/gui/e-task-table.c:709
 msgid "* No Summary *"
 msgstr "* Sem Resumo *"
 
-#: ../calendar/gui/e-memo-table.c:573 ../calendar/gui/e-task-table.c:782
+#. Translators: This is followed by an event's start date/time
+#: ../calendar/gui/e-memo-table.c:577 ../calendar/gui/e-task-table.c:789
 msgid "Start: "
 msgstr "InÃcio: "
 
-#: ../calendar/gui/e-memo-table.c:591 ../calendar/gui/e-task-table.c:800
+#. Translators: This is followed by an event's due date/time
+#: ../calendar/gui/e-memo-table.c:596 ../calendar/gui/e-task-table.c:807
 msgid "Due: "
 msgstr "Limite: "
 
-#: ../calendar/gui/e-memo-table.c:707
+#: ../calendar/gui/e-memo-table.c:712
 msgid "Cut selected memos to the clipboard"
 msgstr "Cortar os memos seleccionados para a Ã¡rea de transferÃªncia"
 
-#: ../calendar/gui/e-memo-table.c:713
+#: ../calendar/gui/e-memo-table.c:718
 msgid "Copy selected memos to the clipboard"
 msgstr "Copiar os memos seleccionados para a Ã¡rea de transferÃªncia"
 
-#: ../calendar/gui/e-memo-table.c:719
+#: ../calendar/gui/e-memo-table.c:724
 msgid "Paste memos from the clipboard"
 msgstr "Colar memos da Ã¡rea de transferÃªncia"
 
-#: ../calendar/gui/e-memo-table.c:725
-#: ../modules/calendar/e-memo-shell-view-actions.c:556
+#: ../calendar/gui/e-memo-table.c:730
+#: ../modules/calendar/e-memo-shell-view-actions.c:566
 msgid "Delete selected memos"
 msgstr "Apagar os memos seleccionados"
 
-#: ../calendar/gui/e-memo-table.c:731
+#: ../calendar/gui/e-memo-table.c:736
 msgid "Select all visible memos"
 msgstr "Seleccionar todos os memos visÃveis"
 
@@ -5866,142 +5579,107 @@ msgstr "Seleccionar todos os memos visÃveis"
 msgid "Click to add a memo"
 msgstr "Clicar para adicionar um memo"
 
-#: ../calendar/gui/e-task-table.c:530
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-task-table.c:531
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-task-table.c:532
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-task-table.c:533
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-task-table.c:534
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-task-table.c:535
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-task-table.c:536
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-task-table.c:537
-msgid "70%"
-msgstr "70%"
-
-#: ../calendar/gui/e-task-table.c:538
-msgid "80%"
-msgstr "80%"
-
+#. 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%
+#.
 #: ../calendar/gui/e-task-table.c:539
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-task-table.c:540
-msgid "100%"
-msgstr "100%"
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:357
+#: ../calendar/gui/e-task-table.c:631 ../calendar/gui/print.c:2072
+#: ../calendar/importers/icalendar-importer.c:81
+#: ../calendar/importers/icalendar-importer.c:828
+#: ../modules/calendar/e-cal-shell-content.c:434
 #: ../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:437
-#: ../plugins/caldav/caldav-browse-server.c:430
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/caldav/caldav-browse-server.c:429
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
 msgid "Tasks"
 msgstr "Tarefas"
 
-#: ../calendar/gui/e-task-table.c:928
+#: ../calendar/gui/e-task-table.c:935
 msgid "Cut selected tasks to the clipboard"
 msgstr "Cortar as tarefas seleccionadas para a Ã¡rea de transferÃªncia"
 
-#: ../calendar/gui/e-task-table.c:934
+#: ../calendar/gui/e-task-table.c:941
 msgid "Copy selected tasks to the clipboard"
 msgstr "Copiar as tarefas seleccionadas para a Ã¡rea de transferÃªncia"
 
-#: ../calendar/gui/e-task-table.c:940
+#: ../calendar/gui/e-task-table.c:947
 msgid "Paste tasks from the clipboard"
 msgstr "Colar as tarefas da Ã¡rea de transferÃªncia"
 
-#: ../calendar/gui/e-task-table.c:946
-#: ../modules/calendar/e-task-shell-view-actions.c:680
+#: ../calendar/gui/e-task-table.c:953
+#: ../modules/calendar/e-task-shell-view-actions.c:690
 msgid "Delete selected tasks"
 msgstr "Apagar a tarefa seleccionada"
 
-#: ../calendar/gui/e-task-table.c:952
+#: ../calendar/gui/e-task-table.c:959
 msgid "Select all visible tasks"
 msgstr "Seleccionar todas as tarefas visÃveis"
 
-#: ../calendar/gui/e-timezone-entry.c:354
+#: ../calendar/gui/e-timezone-entry.c:330
 msgid "Select Timezone"
 msgstr "Seleccione o 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:239 ../calendar/gui/print.c:1716
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1725
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/ea-cal-view-event.c:276
+#: ../calendar/gui/ea-cal-view-event.c:286
 msgid "It has alarms."
 msgstr "Possui alertas."
 
-#: ../calendar/gui/ea-cal-view-event.c:279
+#: ../calendar/gui/ea-cal-view-event.c:289
 msgid "It has recurrences."
 msgstr "Possui recorrÃªncia."
 
-#: ../calendar/gui/ea-cal-view-event.c:282
+#: ../calendar/gui/ea-cal-view-event.c:292
 msgid "It is a meeting."
 msgstr "Ã? uma reuniÃ£o."
 
-#: ../calendar/gui/ea-cal-view-event.c:288
+#: ../calendar/gui/ea-cal-view-event.c:298
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Evento de CalendÃ¡rio: O resumo Ã© %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:290
+#: ../calendar/gui/ea-cal-view-event.c:300
 msgid "Calendar Event: It has no summary."
 msgstr "Evento de CalendÃ¡rio: NÃ£o possui resumo."
 
-#: ../calendar/gui/ea-cal-view-event.c:312
+#: ../calendar/gui/ea-cal-view-event.c:322
 msgid "calendar view event"
 msgstr "evento de vista de calendÃ¡rio"
 
-#: ../calendar/gui/ea-cal-view-event.c:540
+#: ../calendar/gui/ea-cal-view-event.c:551
 msgid "Grab Focus"
 msgstr "Obter o Foco"
 
-#: ../calendar/gui/ea-cal-view.c:300
+#: ../calendar/gui/ea-cal-view.c:305
 msgid "New Appointment"
 msgstr "Novo Compromisso"
 
-#: ../calendar/gui/ea-cal-view.c:301
+#: ../calendar/gui/ea-cal-view.c:306
 msgid "New All Day Event"
 msgstr "Novo Evento de Dia Completo"
 
-#: ../calendar/gui/ea-cal-view.c:302
+#: ../calendar/gui/ea-cal-view.c:307
 msgid "New Meeting"
 msgstr "Nova ReuniÃ£o"
 
-#: ../calendar/gui/ea-cal-view.c:303
+#: ../calendar/gui/ea-cal-view.c:308
 msgid "Go to Today"
 msgstr "Ir para Hoje"
 
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:309
 msgid "Go to Date"
 msgstr "Ir para uma Data"
 
@@ -6010,7 +5688,7 @@ msgstr "Ir para uma Data"
 msgid "a table to view and select the current time range"
 msgstr "uma tabela onde visualizar e seleccionar o intervalo de datas actual"
 
-#: ../calendar/gui/ea-day-view.c:152 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -6019,14 +5697,14 @@ msgstr[1] "Possui %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:157 ../calendar/gui/ea-week-view.c:152
+#: ../calendar/gui/ea-day-view.c:156 ../calendar/gui/ea-week-view.c:153
 msgid "It has no events."
 msgstr "NÃ£o possui qualquer evento."
 
 #. 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:164
+#: ../calendar/gui/ea-day-view.c:163
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Vista de Semana de Trabalho: %s. %s"
@@ -6034,47 +5712,47 @@ msgstr "Vista de Semana de Trabalho: %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:170
+#: ../calendar/gui/ea-day-view.c:169
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Vista de Dia: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:201
+#: ../calendar/gui/ea-day-view.c:203
 msgid "calendar view for a work week"
 msgstr "vista de calendÃ¡rio para uma semana de trabalho"
 
-#: ../calendar/gui/ea-day-view.c:203
+#: ../calendar/gui/ea-day-view.c:205
 msgid "calendar view for one or more days"
 msgstr "vista de calendÃ¡rio para um ou mais dias"
 
-#: ../calendar/gui/ea-gnome-calendar.c:46
-#: ../calendar/gui/ea-gnome-calendar.c:54
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/gui/ea-gnome-calendar.c:49
+#: ../calendar/gui/ea-gnome-calendar.c:57
+#: ../calendar/importers/icalendar-importer.c:860
 msgid "Gnome Calendar"
 msgstr "CalendÃ¡rio Gnome"
 
-#: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:897
+#: ../calendar/gui/ea-gnome-calendar.c:200
+#: ../modules/calendar/e-cal-shell-view-private.c:1011
 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:904
-#: ../modules/calendar/e-cal-shell-view-private.c:910
-#: ../modules/calendar/e-cal-shell-view-private.c:913
+#: ../calendar/gui/ea-gnome-calendar.c:205
+#: ../calendar/gui/ea-gnome-calendar.c:210
+#: ../calendar/gui/ea-gnome-calendar.c:212
+#: ../modules/calendar/e-cal-shell-view-private.c:1018
+#: ../modules/calendar/e-cal-shell-view-private.c:1024
+#: ../modules/calendar/e-cal-shell-view-private.c:1027
 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:930
-#: ../modules/calendar/e-cal-shell-view-private.c:941
-#: ../modules/calendar/e-cal-shell-view-private.c:948
-#: ../modules/calendar/e-cal-shell-view-private.c:951
+#: ../calendar/gui/ea-gnome-calendar.c:229
+#: ../calendar/gui/ea-gnome-calendar.c:235
+#: ../calendar/gui/ea-gnome-calendar.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:243
+#: ../modules/calendar/e-cal-shell-view-private.c:1044
+#: ../modules/calendar/e-cal-shell-view-private.c:1055
+#: ../modules/calendar/e-cal-shell-view-private.c:1062
+#: ../modules/calendar/e-cal-shell-view-private.c:1065
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -6086,25 +5764,25 @@ msgstr "BotÃ£o de ir para"
 msgid "Click here, you can find more events."
 msgstr "Clique aqui, pode encontrar mais eventos."
 
-#: ../calendar/gui/ea-week-view.c:157
+#: ../calendar/gui/ea-week-view.c:158
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Vista de MÃªs: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:161
+#: ../calendar/gui/ea-week-view.c:162
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Vista de Semana: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:192
+#: ../calendar/gui/ea-week-view.c:196
 msgid "calendar view for a month"
 msgstr "vista de calendÃ¡rio para um mÃªs"
 
-#: ../calendar/gui/ea-week-view.c:194
+#: ../calendar/gui/ea-week-view.c:198
 msgid "calendar view for one or more weeks"
 msgstr "vista de calendÃ¡rio para uma ou mais semanas"
 
-#: ../calendar/gui/gnome-cal.c:2167
+#: ../calendar/gui/gnome-cal.c:2314
 msgid "Purging"
 msgstr "A expurgar"
 
@@ -6157,39 +5835,40 @@ msgid "Select Date"
 msgstr "Seleccionar a Data"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
-msgid "September"
-msgstr "Setembro"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
+msgid "Select _Today"
+msgstr "Seleccionar _Hoje"
 
 #: ../calendar/gui/goto-dialog.ui.h:14
-msgid "_Select Today"
-msgstr "_Seleccionar Hoje"
+msgid "September"
+msgstr "Setembro"
 
-#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
-#: ../calendar/gui/itip-utils.c:552
+#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
+#: ../calendar/gui/itip-utils.c:551
 msgid "An organizer must be set."
 msgstr "Tem de ser definido um organizador."
 
-#: ../calendar/gui/itip-utils.c:452
+#: ../calendar/gui/itip-utils.c:451
 msgid "At least one attendee is necessary"
 msgstr "Ã? necessÃ¡rio pelo menos um participante"
 
-#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:783
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "InformaÃ§Ã£o do evento"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:786
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "InformaÃ§Ã£o da tarefa"
 
-#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:789
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
 msgstr "InformaÃ§Ã£o do memo"
 
-#: ../calendar/gui/itip-utils.c:642 ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "InformaÃ§Ã£o de livre/ocupado"
 
-#: ../calendar/gui/itip-utils.c:645
+#: ../calendar/gui/itip-utils.c:644
 msgid "Calendar information"
 msgstr "InformaÃ§Ã£o de calendÃ¡rio"
 
@@ -6197,7 +5876,7 @@ msgstr "InformaÃ§Ã£o de calendÃ¡rio"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:679
+#: ../calendar/gui/itip-utils.c:678
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Aceite"
@@ -6206,7 +5885,7 @@ msgstr "Aceite"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:686
+#: ../calendar/gui/itip-utils.c:685
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Aceite Tentativamente"
@@ -6218,7 +5897,7 @@ msgstr "Aceite Tentativamente"
 #. 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:693 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:740
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Recusada"
@@ -6227,7 +5906,7 @@ msgstr "Recusada"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:700
+#: ../calendar/gui/itip-utils.c:699
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegada"
@@ -6235,7 +5914,7 @@ msgstr "Delegada"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:713
+#: ../calendar/gui/itip-utils.c:712
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Actualizada"
@@ -6243,7 +5922,7 @@ msgstr "Actualizada"
 #. 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:720
+#: ../calendar/gui/itip-utils.c:719
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Cancelada"
@@ -6251,7 +5930,7 @@ msgstr "Cancelada"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:727
+#: ../calendar/gui/itip-utils.c:726
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Revista"
@@ -6259,29 +5938,29 @@ msgstr "Revista"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:734
+#: ../calendar/gui/itip-utils.c:733
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Contra-proposta"
 
-#: ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:803
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "InformaÃ§Ã£o de livre/ocupado (%s para %s)"
 
-#: ../calendar/gui/itip-utils.c:812
+#: ../calendar/gui/itip-utils.c:811
 msgid "iCalendar information"
 msgstr "InformaÃ§Ã£o de iCalendar"
 
-#: ../calendar/gui/itip-utils.c:832
+#: ../calendar/gui/itip-utils.c:831
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "Incapaz de reservar um recurso, o novo evento colide com outro."
 
-#: ../calendar/gui/itip-utils.c:834
+#: ../calendar/gui/itip-utils.c:833
 msgid "Unable to book a resource, error: "
 msgstr "Incapaz de reservar um recurso, erro: "
 
-#: ../calendar/gui/itip-utils.c:987
+#: ../calendar/gui/itip-utils.c:986
 msgid "You must be an attendee of the event."
 msgstr "Tem de ser um participante do evento."
 
@@ -6437,49 +6116,73 @@ msgstr "Sx"
 msgid "Sa"
 msgstr "SÃ¡"
 
-#: ../calendar/gui/print.c:2564
-msgid "Appointment"
-msgstr "Compromisso"
+#. Translators: This is part of "START to END" text,
+#. * where START and END are date/times.
+#: ../calendar/gui/print.c:2449
+msgid " to "
+msgstr " para "
 
-#: ../calendar/gui/print.c:2566
-msgid "Task"
-msgstr "Tarefa"
+#. Translators: This is part of "START to END
+#. * (Completed COMPLETED)", where COMPLETED is a
+#. * completed date/time.
+#: ../calendar/gui/print.c:2457
+msgid " (Completed "
+msgstr " (Terminada "
+
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
+#: ../calendar/gui/print.c:2461
+msgid "Completed "
+msgstr "Terminada "
+
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
+#: ../calendar/gui/print.c:2469
+msgid " (Due "
+msgstr " (Limite "
 
-#: ../calendar/gui/print.c:2591
+#. Translators: This is part of "Due DUE",
+#. * where DUE is a date/time due the event
+#. * should be finished.
+#: ../calendar/gui/print.c:2474
+msgid "Due "
+msgstr "Limite "
+
+#: ../calendar/gui/print.c:2637
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumo: %s"
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2661
 msgid "Attendees: "
 msgstr "Participantes: "
 
-#: ../calendar/gui/print.c:2658
+#: ../calendar/gui/print.c:2704
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2719
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridade: %s"
 
-#: ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2737
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Percentagem Terminada: %i"
 
-#: ../calendar/gui/print.c:2702
+#: ../calendar/gui/print.c:2748
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2715
+#: ../calendar/gui/print.c:2761
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorias: %s"
 
-#: ../calendar/gui/print.c:2726
+#: ../calendar/gui/print.c:2772
 msgid "Contacts: "
 msgstr "Contactos: "
 
@@ -6488,10 +6191,6 @@ msgstr "Contactos: "
 msgid "% Completed"
 msgstr "% Terminada"
 
-#: ../calendar/gui/tasktypes.xml.h:7
-msgid "Cancelled"
-msgstr "Cancelada"
-
 #: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
 msgstr "Em curso"
@@ -6504,44 +6203,189 @@ msgstr "Ã© maior do que"
 msgid "is less than"
 msgstr "Ã© menor do que"
 
-#: ../calendar/importers/icalendar-importer.c:75
+#: ../calendar/importers/icalendar-importer.c:80
 msgid "Appointments and Meetings"
 msgstr "Compromissos e ReuniÃµes"
 
-#: ../calendar/importers/icalendar-importer.c:335
-#: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1833
+#: ../calendar/importers/icalendar-importer.c:350
+#: ../calendar/importers/icalendar-importer.c:707
+#: ../plugins/itip-formatter/itip-formatter.c:1835
 msgid "Opening calendar"
 msgstr "A abrir o calendÃ¡rio"
 
-#: ../calendar/importers/icalendar-importer.c:442
+#: ../calendar/importers/icalendar-importer.c:493
 msgid "iCalendar files (.ics)"
 msgstr "Ficheiros iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:443
+#: ../calendar/importers/icalendar-importer.c:494
 msgid "Evolution iCalendar importer"
 msgstr "Importador de iCalendar Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:531
+#: ../calendar/importers/icalendar-importer.c:582
 msgid "Reminder!"
 msgstr "Lembrete!"
 
-#: ../calendar/importers/icalendar-importer.c:583
-msgid "vCalendar files (.vcf)"
-msgstr "Ficheiros vCalendar (.vcf)"
+#: ../calendar/importers/icalendar-importer.c:662
+msgid "vCalendar files (.vcs)"
+msgstr "Ficheiros vCalendar (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:584
+#: ../calendar/importers/icalendar-importer.c:663
 msgid "Evolution vCalendar importer"
 msgstr "Importador de vCalendar Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:823
 msgid "Calendar Events"
 msgstr "Eventos do CalendÃ¡rio"
 
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:861
 msgid "Evolution Calendar intelligent importer"
 msgstr "Importador inteligente de CalendÃ¡rio Evolution"
 
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1243
+msgctxt "iCalImp"
+msgid "Meeting"
+msgstr "ReuniÃ£o"
+
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1243
+msgctxt "iCalImp"
+msgid "Event"
+msgstr "Evento"
+
+#: ../calendar/importers/icalendar-importer.c:929
+#: ../calendar/importers/icalendar-importer.c:1244
+msgctxt "iCalImp"
+msgid "Task"
+msgstr "Tarefa"
+
+#: ../calendar/importers/icalendar-importer.c:932
+#: ../calendar/importers/icalendar-importer.c:1245
+msgctxt "iCalImp"
+msgid "Memo"
+msgstr "Memo"
+
+#: ../calendar/importers/icalendar-importer.c:941
+msgctxt "iCalImp"
+msgid "has recurrences"
+msgstr "possui recorrÃªncias"
+
+#: ../calendar/importers/icalendar-importer.c:946
+msgctxt "iCalImp"
+msgid "is an instance"
+msgstr "Ã© uma instÃ¢ncia"
+
+#: ../calendar/importers/icalendar-importer.c:951
+msgctxt "iCalImp"
+msgid "has alarms"
+msgstr "possui alertas"
+
+#: ../calendar/importers/icalendar-importer.c:956
+msgctxt "iCalImp"
+msgid "has attachments"
+msgstr "possui anexos"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:969
+msgctxt "iCalImp"
+msgid "Public"
+msgstr "PÃºblico"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:972
+msgctxt "iCalImp"
+msgid "Private"
+msgstr "Privado"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:975
+msgctxt "iCalImp"
+msgid "Confidential"
+msgstr "Confidencial"
+
+#. Translators: Appointment's classification section name
+#: ../calendar/importers/icalendar-importer.c:979
+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
+msgctxt "iCalImp"
+msgid "Summary"
+msgstr "Resumo"
+
+#. Translators: Appointment's location
+#: ../calendar/importers/icalendar-importer.c:990
+msgctxt "iCalImp"
+msgid "Location"
+msgstr "LocalizaÃ§Ã£o"
+
+#. 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
+msgctxt "iCalImp"
+msgid "Start"
+msgstr "InÃcio"
+
+#. Translators: 'Due' like the time due a task should be finished
+#: ../calendar/importers/icalendar-importer.c:1009
+msgctxt "iCalImp"
+msgid "Due"
+msgstr "Limite"
+
+#. Translators: Appointment's end time
+#: ../calendar/importers/icalendar-importer.c:1021
+msgctxt "iCalImp"
+msgid "End"
+msgstr "Fim"
+
+#. Translators: Appointment's categories
+#: ../calendar/importers/icalendar-importer.c:1031
+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
+msgctxt "iCalImp"
+msgid "Completed"
+msgstr "Terminado"
+
+#. Translators: Appointment's URL
+#: ../calendar/importers/icalendar-importer.c:1063
+msgctxt "iCalImp"
+msgid "URL"
+msgstr "URL"
+
+#. Translators: Appointment's organizer
+#: ../calendar/importers/icalendar-importer.c:1074
+#: ../calendar/importers/icalendar-importer.c:1077
+msgctxt "iCalImp"
+msgid "Organizer"
+msgstr "Organizador"
+
+#. Translators: Appointment's attendees
+#: ../calendar/importers/icalendar-importer.c:1097
+#: ../calendar/importers/icalendar-importer.c:1100
+msgctxt "iCalImp"
+msgid "Attendees"
+msgstr "Participantes"
+
+#: ../calendar/importers/icalendar-importer.c:1114
+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
+msgctxt "iCalImp"
+msgid "Type"
+msgstr "Tipo"
+
 #.
 #. *
 #. * This program is free software; you can redistribute it and/or
@@ -8091,177 +7935,157 @@ msgstr "PacÃfico/Wallis"
 msgid "Pacific/Yap"
 msgstr "PacÃfico/Yap"
 
-#: ../composer/e-composer-actions.c:79
-msgid "Untitled Message"
-msgstr "Mensagem sem TÃtulo"
-
-#: ../composer/e-composer-actions.c:202
+#: ../composer/e-composer-actions.c:163
 msgid "Save as..."
 msgstr "Gravar como..."
 
-#: ../composer/e-composer-actions.c:281
-#: ../widgets/misc/e-attachment-view.c:328
+#: ../composer/e-composer-actions.c:245
+#: ../widgets/misc/e-attachment-view.c:381
 msgid "Attach a file"
 msgstr "Anexar um ficheiro"
 
-#: ../composer/e-composer-actions.c:286
-#: ../widgets/misc/e-signature-editor.c:203
+#: ../composer/e-composer-actions.c:250
+#: ../widgets/misc/e-signature-editor.c:206
 msgid "_Close"
 msgstr "_Fechar"
 
-#: ../composer/e-composer-actions.c:288
+#: ../composer/e-composer-actions.c:252
 msgid "Close the current file"
 msgstr "Fechar o ficheiro actual"
 
-#: ../composer/e-composer-actions.c:293
+#: ../composer/e-composer-actions.c:257
 msgid "_Print..."
 msgstr "Im_primir..."
 
-#: ../composer/e-composer-actions.c:300
+#: ../composer/e-composer-actions.c:264
 msgid "Print Pre_view"
 msgstr "Ante_ver a ImpressÃ£o"
 
-#: ../composer/e-composer-actions.c:309
+#: ../composer/e-composer-actions.c:273
 msgid "Save the current file"
 msgstr "Gravar o ficheiro actual"
 
-#: ../composer/e-composer-actions.c:314
+#: ../composer/e-composer-actions.c:278
 msgid "Save _As..."
 msgstr "Gravar _Como..."
 
-#: ../composer/e-composer-actions.c:316
+#: ../composer/e-composer-actions.c:280
 msgid "Save the current file with a different name"
 msgstr "Gravar o ficheiro actual com outro nome"
 
-#: ../composer/e-composer-actions.c:321
+#: ../composer/e-composer-actions.c:285
 msgid "Save as _Draft"
 msgstr "Gravar como _Rascunho"
 
-#: ../composer/e-composer-actions.c:323
+#: ../composer/e-composer-actions.c:287
 msgid "Save as draft"
 msgstr "Gravar como rascunho"
 
-#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:281
+#: ../composer/e-composer-actions.c:292 ../composer/e-composer-private.c:297
 msgid "S_end"
 msgstr "_Enviar"
 
-#: ../composer/e-composer-actions.c:330
+#: ../composer/e-composer-actions.c:294
 msgid "Send this message"
 msgstr "Enviar esta mensagem"
 
-#: ../composer/e-composer-actions.c:335
+#: ../composer/e-composer-actions.c:299
 msgid "New _Message"
 msgstr "Nova _Mensagem"
 
-#: ../composer/e-composer-actions.c:337
+#: ../composer/e-composer-actions.c:301
 msgid "Open New Message window"
 msgstr "Abrir a janela de Nova Mensagem"
 
-#: ../composer/e-composer-actions.c:344
+#: ../composer/e-composer-actions.c:308
 msgid "Character _Encoding"
 msgstr "CodificaÃ§Ã£o de Caract_eres"
 
-#: ../composer/e-composer-actions.c:361
+#: ../composer/e-composer-actions.c:325
 msgid "PGP _Encrypt"
 msgstr "_EncriptaÃ§Ã£o PGP"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:327
 msgid "Encrypt this message with PGP"
 msgstr "Encriptar esta mensagem com PGP"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:333
 msgid "PGP _Sign"
 msgstr "A_ssinatura PGP"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:335
 msgid "Sign this message with your PGP key"
 msgstr "Assinar esta mensagem com a sua chave PGP"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:341
 msgid "_Prioritize Message"
 msgstr "_Prioritizar a Mensagem"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:343
 msgid "Set the message priority to high"
 msgstr "Definir a prioridade da mensagem como elevada"
 
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:349
 msgid "Re_quest Read Receipt"
 msgstr "P_edir Recibo de Leitura"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:351
 msgid "Get delivery notification when your message is read"
 msgstr "Obter notificaÃ§Ã£o de entrega quando a mensagem for lida"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:357
 msgid "S/MIME En_crypt"
 msgstr "En_cripaÃ§Ã£o S/MIME"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:359
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Encriptar esta mensagem com o seu Certificado de EncriptaÃ§Ã£o S/MIME"
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:365
 msgid "S/MIME Sig_n"
 msgstr "Assi_natura S/MIME"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:367
 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:409
+#: ../composer/e-composer-actions.c:373
 msgid "_Bcc Field"
 msgstr "Campo _Bcc"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:375
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Alterna se o campo BCC Ã© ou nÃ£o apresentado"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:381
 msgid "_Cc Field"
 msgstr "Campo _Cc"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:383
 msgid "Toggles whether the CC field is displayed"
 msgstr "Alterna se o campo CC Ã© ou nÃ£o apresentado"
 
-#: ../composer/e-composer-actions.c:425
-msgid "_From Field"
-msgstr "Campo _De"
-
-#: ../composer/e-composer-actions.c:427
-msgid "Toggles whether the From chooser is displayed"
-msgstr "Alterna se o selector De Ã© ou nÃ£o apresentado"
-
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:389
 msgid "_Reply-To Field"
 msgstr "Campo _Responder-A"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:391
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Alterna se o campo Responder-A Ã© ou nÃ£o apresentado"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:434
 msgid "Save Draft"
 msgstr "Gravar o Rascunho"
 
-#: ../composer/e-composer-header.c:129
-msgid "Show"
-msgstr "Apresentar"
-
-#: ../composer/e-composer-header.c:137
-msgid "Hide"
-msgstr "Esconder"
-
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatÃ¡rios da mensagem"
 
-#: ../composer/e-composer-header-table.c:44
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Introduza os endereÃ§os que irÃ£o receber uma cÃ³pia da mensagem"
 
-#: ../composer/e-composer-header-table.c:47
+#: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -8269,95 +8093,82 @@ msgstr ""
 "Introduza os endereÃ§os que irÃ£o receber uma cÃ³pia da mensagem sem que sejam "
 "visÃveis na lista de destinatÃ¡rios da mensagem"
 
-#: ../composer/e-composer-header-table.c:959
+#: ../composer/e-composer-header-table.c:1005
 msgid "Fr_om:"
 msgstr "_De:"
 
-#: ../composer/e-composer-header-table.c:959
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:958
-#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:77
-msgid "From"
-msgstr "De"
-
-#: ../composer/e-composer-header-table.c:968
+#: ../composer/e-composer-header-table.c:1014
 msgid "_Reply-To:"
 msgstr "_Responder-A:"
 
-#: ../composer/e-composer-header-table.c:973
+#: ../composer/e-composer-header-table.c:1018
 msgid "_To:"
 msgstr "_Para:"
 
-#: ../composer/e-composer-header-table.c:979
+#: ../composer/e-composer-header-table.c:1023
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:979 ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "CC"
-
-#: ../composer/e-composer-header-table.c:985
+#: ../composer/e-composer-header-table.c:1028
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "BCC"
-
-#: ../composer/e-composer-header-table.c:990
+#: ../composer/e-composer-header-table.c:1033
 msgid "_Post To:"
 msgstr "Afi_xar Em:"
 
-#: ../composer/e-composer-header-table.c:994
+#: ../composer/e-composer-header-table.c:1037
 msgid "S_ubject:"
 msgstr "Ass_unto:"
 
-#: ../composer/e-composer-header-table.c:1003
+#: ../composer/e-composer-header-table.c:1046
 msgid "Si_gnature:"
 msgstr "A_ssinatura:"
 
-#: ../composer/e-composer-name-header.c:134
+#: ../composer/e-composer-name-header.c:141
 msgid "Click here for the address book"
 msgstr "Clique aqui para o livro de endereÃ§os"
 
-#: ../composer/e-composer-post-header.c:116
+#: ../composer/e-composer-post-header.c:131
 msgid "Click here to select folders to post to"
 msgstr "Clique aqui para seleccionar as pastas onde afixar"
 
-#: ../composer/e-composer-private.c:199
+#: ../composer/e-composer-private.c:215
 msgid "Undo the last action"
 msgstr "Desfazer a Ãºltima acÃ§Ã£o"
 
-#: ../composer/e-composer-private.c:203
+#: ../composer/e-composer-private.c:219
 msgid "Redo the last undone action"
 msgstr "Refazer a Ãºltima acÃ§Ã£o desfeita"
 
-#: ../composer/e-composer-private.c:207
+#: ../composer/e-composer-private.c:223
 msgid "Search for text"
 msgstr "Procurar por texto"
 
-#: ../composer/e-composer-private.c:211
+#: ../composer/e-composer-private.c:227
 msgid "Search for and replace text"
 msgstr "Procurar e substituir texto"
 
-#: ../composer/e-composer-private.c:301
+#: ../composer/e-composer-private.c:317
 msgid "Save draft"
 msgstr "Gravar o rascunho"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:149
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../composer/e-msg-composer.c:200
+#: ../plugins/attachment-reminder/attachment-reminder.c:117
 msgid "_Do not show this message again."
 msgstr "_NÃ£o apresentar esta mensagem novamente."
 
-#: ../composer/e-msg-composer.c:983
+#: ../composer/e-msg-composer.c:1033
+#, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Incapaz de assinar a mensagem a enviar: Nenhum certificado de assinatura "
 "para esta conta"
 
-#: ../composer/e-msg-composer.c:990
+#: ../composer/e-msg-composer.c:1045
+#, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -8365,21 +8176,19 @@ msgstr ""
 "Incapaz de encriptar a mensagem a enviar: Nenhum certificado de encriptaÃ§Ã£o "
 "para esta conta"
 
-#: ../composer/e-msg-composer.c:1379
-msgid "Unable to reconstruct message from autosave file"
-msgstr "Incapaz de recuperar a mensagem a partir do ficheiro de salvaguarda"
-
-#: ../composer/e-msg-composer.c:1445 ../composer/e-msg-composer.c:1641
+#: ../composer/e-msg-composer.c:1469 ../composer/e-msg-composer.c:1814
 msgid "Compose Message"
 msgstr "Escrever uma Mensagem"
 
-#: ../composer/e-msg-composer.c:3310
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)</"
-"b>"
+#: ../composer/e-msg-composer.c:3480
+msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
-"<b>(O compositor contÃ©m um corpo de mensagem que nÃ£o Ã© texto, pelo que nÃ£o "
-"pode ser editado.)</b>"
+"O compositor contÃ©m um corpo de mensagem que nÃ£o Ã© texto, pelo que nÃ£o pode "
+"ser editado."
+
+#: ../composer/e-msg-composer.c:4088
+msgid "Untitled Message"
+msgstr "Mensagem sem TÃtulo"
 
 #: ../composer/mail-composer.error.xml.h:1
 msgid ""
@@ -8462,9 +8271,9 @@ msgstr ""
 "Recuperar a mensagem irÃ¡ permitir-lhe continuar onde estava."
 
 #: ../composer/mail-composer.error.xml.h:16
-msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
-"O ficheiro `{0}' nÃ£o Ã© um ficheiro normal e nÃ£o pode ser enviado numa "
+"O ficheiro '{0}' nÃ£o Ã© um ficheiro normal e nÃ£o pode ser enviado numa "
 "mensagem."
 
 #: ../composer/mail-composer.error.xml.h:17
@@ -8484,8 +8293,8 @@ msgid "Unable to activate the address selector control."
 msgstr "Incapaz de activar o controlo de selecÃ§Ã£o de endereÃ§os."
 
 #: ../composer/mail-composer.error.xml.h:21
-msgid "You cannot attach the file `{0}' to this message."
-msgstr "NÃ£o Ã© possÃvel anexar o ficheiro `{0}' a esta mensagem."
+msgid "You cannot attach the file &quot;{0}&quot; to this message."
+msgstr "NÃ£o Ã© possÃvel anexar o ficheiro &quot;{0}&quot; a esta mensagem."
 
 #: ../composer/mail-composer.error.xml.h:22
 msgid "You need to configure an account before you can compose mail."
@@ -8507,89 +8316,100 @@ msgstr "_Recuperar"
 msgid "_Save Draft"
 msgstr "_Gravar Rascunho"
 
-#: ../capplet/anjal-settings-main.c:202
+#: ../capplet/anjal-settings-main.c:223
 msgid "Run Anjal in a window"
 msgstr "Executar o Anjal numa janela"
 
-#: ../capplet/anjal-settings-main.c:203
+#: ../capplet/anjal-settings-main.c:224
 msgid "Make Anjal the default email client"
 msgstr "Tornar o Anjal no cliente de email por omissÃ£o"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:210
+#: ../capplet/anjal-settings-main.c:231
 msgid "ID of the socket to embed in"
 msgstr "ID do socket no qual se embutir"
 
-#: ../capplet/anjal-settings-main.c:211
+#: ../capplet/anjal-settings-main.c:232
 msgid "socket"
 msgstr "socket"
 
-#: ../capplet/anjal-settings-main.c:225
+#: ../capplet/anjal-settings-main.c:245
 msgid "Anjal email client"
 msgstr "Cliente de correio Anjal"
 
-#: ../capplet/settings/mail-view.c:244
-msgid "New Tab"
-msgstr "Novo Separador"
-
-#: ../capplet/settings/mail-account-view.c:56
+#: ../capplet/settings/mail-account-view.c:74
 msgid "Please enter your full name."
 msgstr "Introduza o seu nome completo."
 
-#: ../capplet/settings/mail-account-view.c:57
+#: ../capplet/settings/mail-account-view.c:75
 msgid "Please enter your email address."
 msgstr "Introduza o seu endereÃ§o de email."
 
-#: ../capplet/settings/mail-account-view.c:58
+#: ../capplet/settings/mail-account-view.c:76
 msgid "The email address you have entered is invalid."
 msgstr "O endereÃ§o de email introduzido Ã© invÃ¡lido."
 
-#: ../capplet/settings/mail-account-view.c:224
-msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Detalhes pessoais:</span>"
+#: ../capplet/settings/mail-account-view.c:77
+msgid "Please enter your password."
+msgstr "Introduza a sua senha."
 
-#: ../capplet/settings/mail-account-view.c:229
+#: ../capplet/settings/mail-account-view.c:256
+#: ../plugins/caldav/caldav-source.c:66
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../capplet/settings/mail-account-view.c:360
+#: ../plugins/google-account-setup/google-contacts-source.c:53
+#: ../plugins/google-account-setup/google-source.c:81
+msgid "Google"
+msgstr "Google"
+
+#: ../capplet/settings/mail-account-view.c:464
+msgid "Personal details:"
+msgstr "Detalhes pessoais:"
+
+#: ../capplet/settings/mail-account-view.c:471
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../capplet/settings/mail-account-view.c:238
+#: ../capplet/settings/mail-account-view.c:480
 msgid "Email address:"
 msgstr "EndereÃ§o de email:"
 
-#: ../capplet/settings/mail-account-view.c:248
-msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Detalhes da recepÃ§Ã£o:</span>"
+#: ../capplet/settings/mail-account-view.c:490
+msgid "Details:"
+msgstr "Detalhes:"
+
+#: ../capplet/settings/mail-account-view.c:498
+msgid "Receiving"
+msgstr "A receber"
 
-#: ../capplet/settings/mail-account-view.c:253
-#: ../capplet/settings/mail-account-view.c:303
+#: ../capplet/settings/mail-account-view.c:505
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
-#: ../capplet/settings/mail-account-view.c:262
-#: ../capplet/settings/mail-account-view.c:312
+#: ../capplet/settings/mail-account-view.c:514
 msgid "Server address:"
 msgstr "EndereÃ§o do servidor:"
 
-#: ../capplet/settings/mail-account-view.c:272
-#: ../capplet/settings/mail-account-view.c:322
+#: ../capplet/settings/mail-account-view.c:523
 msgid "Username:"
 msgstr "Utilizador:"
 
-#: ../capplet/settings/mail-account-view.c:281
-#: ../capplet/settings/mail-account-view.c:331
+#: ../capplet/settings/mail-account-view.c:532
 msgid "Use encryption:"
 msgstr "Utilizar encriptaÃ§Ã£o:"
 
-#: ../capplet/settings/mail-account-view.c:286
-#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:537
+#: ../capplet/settings/mail-account-view.c:572
 msgid "never"
 msgstr "nunca"
 
-#: ../capplet/settings/mail-account-view.c:298
-msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">A enviar detalhes:</span>"
+#: ../capplet/settings/mail-account-view.c:549
+msgid "Sending"
+msgstr "A enviar"
 
-#: ../capplet/settings/mail-account-view.c:355
+#: ../capplet/settings/mail-account-view.c:591
 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. "
@@ -8600,7 +8420,7 @@ msgstr ""
 "definiÃ§Ãµes. Caso nÃ£o seja capaz, terÃ¡ de indicar tambÃ©m  os detalhes de "
 "servidor."
 
-#: ../capplet/settings/mail-account-view.c:357
+#: ../capplet/settings/mail-account-view.c:593
 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 "
@@ -8611,11 +8431,11 @@ msgstr ""
 "uma tentativa de preenchimento com os detalhes que introduziu mas poderÃ¡ ter "
 "de os alterar."
 
-#: ../capplet/settings/mail-account-view.c:359
+#: ../capplet/settings/mail-account-view.c:595
 msgid "You can specify more options to configure the account."
 msgstr "Pode especificar mais opÃ§Ãµes para configurar a conta."
 
-#: ../capplet/settings/mail-account-view.c:361
+#: ../capplet/settings/mail-account-view.c:597
 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."
@@ -8623,11 +8443,11 @@ msgstr ""
 "Agora sÃ£o necessÃ¡rias as suas definiÃ§Ãµes para enviar email. Tentou-se "
 "inferir alguns valores mas deverÃ¡ verificÃ¡-los para os validar."
 
-#: ../capplet/settings/mail-account-view.c:362
+#: ../capplet/settings/mail-account-view.c:598
 msgid "You can specify your default settings for your account."
 msgstr "Pode especificar as definiÃ§Ãµes por omissÃ£o para a sua conta."
 
-#: ../capplet/settings/mail-account-view.c:363
+#: ../capplet/settings/mail-account-view.c:599
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
@@ -8635,134 +8455,166 @@ msgstr ""
 "DeverÃ¡ agora verificar todas as definiÃ§Ãµes antes de ser realizada a primeira "
 "ligaÃ§Ã£o ao servidor e obtido o seu correio."
 
-#: ../capplet/settings/mail-account-view.c:378
-#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2196
-#: ../mail/mail-config.ui.h:58
+#: ../capplet/settings/mail-account-view.c:614
+#: ../mail/em-account-editor.c:2146 ../mail/em-account-editor.c:2267
 msgid "Identity"
 msgstr "Identidade"
 
-#: ../capplet/settings/mail-account-view.c:378
+#: ../capplet/settings/mail-account-view.c:614
 msgid "Next - Receiving mail"
 msgstr "Seguinte - Receber mensagens"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Receiving mail"
 msgstr "Receber mensagens"
 
-#: ../capplet/settings/mail-account-view.c:379
-#: ../capplet/settings/mail-account-view.c:380
+#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:616
 msgid "Next - Sending mail"
 msgstr "Seguinte - Enviar mensagens"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Back - Identity"
 msgstr "Retroceder - Identidade"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Next - Receiving options"
 msgstr "Seguinte - OpÃ§Ãµes de recepÃ§Ã£o"
 
-#: ../capplet/settings/mail-account-view.c:380
+#: ../capplet/settings/mail-account-view.c:616
 msgid "Receiving options"
 msgstr "OpÃ§Ãµes de recepÃ§Ã£o"
 
-#: ../capplet/settings/mail-account-view.c:380
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:616
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Back - Receiving mail"
 msgstr "Retroceder - Receber mensagens"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Sending mail"
 msgstr "Enviar mensagens"
 
-#: ../capplet/settings/mail-account-view.c:382
-#: ../capplet/settings/mail-account-view.c:383
+#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:619
 msgid "Next - Review account"
 msgstr "Seguinte - Rever a conta"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Next - Defaults"
 msgstr "Seguinte - OmissÃµes"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Back - Receiving options"
 msgstr "Retroceder - OpÃ§Ãµes de recepÃ§Ã£o"
 
-#: ../capplet/settings/mail-account-view.c:383
-#: ../mail/em-account-editor.c:2774 ../mail/mail-config.ui.h:31
+#: ../capplet/settings/mail-account-view.c:619
+#: ../mail/em-account-editor.c:3055
 msgid "Defaults"
 msgstr "OmissÃµes"
 
-#: ../capplet/settings/mail-account-view.c:383
+#: ../capplet/settings/mail-account-view.c:619
 msgid "Back - Sending mail"
 msgstr "Retroceder - Enviar mensagens"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:621
 msgid "Review account"
 msgstr "Rever a conta"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:621
 msgid "Finish"
 msgstr "Terminar"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:621
 msgid "Back - Sending"
 msgstr "Retroceder - Enviar"
 
-#: ../capplet/settings/mail-account-view.c:719
-#: ../capplet/settings/mail-settings-view.c:266
+#: ../capplet/settings/mail-account-view.c:726
+msgid "Setup Google contacts with Evolution"
+msgstr "Configurar os contactos Google com o Evolution"
+
+#: ../capplet/settings/mail-account-view.c:727
+msgid "Setup Google calendar with Evolution"
+msgstr "Configurar o calendÃ¡rio Google com o Evolution"
+
+#: ../capplet/settings/mail-account-view.c:732
+msgid "You may need to enable IMAP access."
+msgstr "PoderÃ¡ ter de activar o acesso IMAP."
+
+#: ../capplet/settings/mail-account-view.c:740
+msgid "Google account settings:"
+msgstr "DefiniÃ§Ãµes de conta Google:"
+
+#: ../capplet/settings/mail-account-view.c:767
+msgid "Setup Yahoo calendar with Evolution"
+msgstr "Configurar o calendÃ¡rio Yahoo com o Evolution"
+
+#: ../capplet/settings/mail-account-view.c:771
+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 ""
+"Os calendÃ¡rios Yahoo designam-se por primeironome_Ãºltimonome. Foi feita uma "
+"tentativa de construir o nome do calendÃ¡rio. Confirme e altere o nome caso "
+"nÃ£o esteja correcto."
+
+#: ../capplet/settings/mail-account-view.c:778
+msgid "Yahoo account settings:"
+msgstr "DefiniÃ§Ãµes de conta Yahoo:"
+
+#: ../capplet/settings/mail-account-view.c:792
+msgid "Yahoo Calendar name:"
+msgstr "Nome do CalendÃ¡rio Yahoo:"
+
+#: ../capplet/settings/mail-account-view.c:1061
+msgid "Password:"
+msgstr "Senha:"
+
+#: ../capplet/settings/mail-account-view.c:1129
+#: ../capplet/settings/mail-settings-view.c:267
 msgid "Close Tab"
 msgstr "Fechar o Separador"
 
-#: ../capplet/settings/mail-account-view.c:729
+#: ../capplet/settings/mail-account-view.c:1139
 msgid "Account Wizard"
 msgstr "Assistente de Contas"
 
-#: ../capplet/settings/mail-capplet-shell.c:284
+#: ../capplet/settings/mail-capplet-shell.c:211
 msgid "Evolution account assistant"
 msgstr "Assistente de contas do Evolution"
 
-#: ../capplet/settings/mail-capplet-shell.c:320
-#: ../data/evolution-settings.desktop.in.in.h:2
-msgid "Email Settings"
-msgstr "DefiniÃ§Ãµes de Email"
-
-#: ../capplet/settings/mail-capplet-shell.c:334
-msgid "Quit"
-msgstr "Sair"
-
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:453 ../mail/e-mail-migrate.c:2949
-#: ../mail/e-mail-store.c:229 ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:153 ../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:215
-#: ../mail/message-list.c:1617
-#: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
-#: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:564
-#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../capplet/settings/mail-capplet-shell.c:345 ../mail/e-mail-migrate.c:664
+#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:148
+#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
+#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:163
+#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:207
+#: ../mail/message-list.c:1668
+#: ../modules/addressbook/e-book-shell-backend.c:96
+#: ../modules/addressbook/e-book-shell-migrate.c:130
+#: ../modules/calendar/e-cal-shell-backend.c:102
+#: ../modules/calendar/e-cal-shell-migrate.c:146
+#: ../modules/calendar/e-memo-shell-backend.c:92
 #: ../modules/calendar/e-memo-shell-migrate.c:102
-#: ../modules/calendar/e-task-shell-backend.c:111
-#: ../modules/calendar/e-task-shell-migrate.c:501
+#: ../modules/calendar/e-task-shell-backend.c:92
+#: ../modules/calendar/e-task-shell-migrate.c:111
 msgid "On This Computer"
 msgstr "Neste Computador"
 
-#: ../capplet/settings/mail-settings-view.c:148
-#: ../plugins/groupwise-features/share-folder.c:747
-msgid "Modify"
-msgstr "Alterar"
+#: ../capplet/settings/mail-settings-view.c:146
+#, c-format
+msgid "Modify %s..."
+msgstr "Alterar %s..."
 
-#: ../capplet/settings/mail-settings-view.c:150
+#: ../capplet/settings/mail-settings-view.c:148
 msgid "Add a new account"
 msgstr "Adicionar uma nova conta"
 
-#: ../capplet/settings/mail-settings-view.c:185
-msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
-msgstr "<span size=\"large\" weight=\"bold\">GestÃ£o de conta</span>"
+#: ../capplet/settings/mail-settings-view.c:184
+msgid "Account management"
+msgstr "GestÃ£o de contas"
 
-#: ../capplet/settings/mail-settings-view.c:276
+#: ../capplet/settings/mail-settings-view.c:277
 msgid "Settings"
 msgstr "DefiniÃ§Ãµes"
 
@@ -8774,8 +8626,8 @@ msgstr "NotificaÃ§Ãµes de eventos do calendÃ¡rio"
 msgid "Evolution Alarm Notify"
 msgstr "NotificaÃ§Ã£o de Alarmes do Evolution"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:800
-#: ../shell/e-shell-window-private.c:251
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:848
+#: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -8795,47 +8647,43 @@ msgstr "Para gerir o seu email, contactos e compromissos"
 msgid "Configure email accounts"
 msgstr "Configurar as contas de email"
 
-#: ../data/evolution.keys.in.in.h:1
-msgid "address card"
-msgstr "cartÃ£o de visita"
-
-#: ../data/evolution.keys.in.in.h:2
-msgid "calendar information"
-msgstr "informaÃ§Ã£o de calendÃ¡rio"
+#: ../data/evolution-settings.desktop.in.in.h:2
+msgid "Email Settings"
+msgstr "DefiniÃ§Ãµes de Email"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:224
+#: ../e-util/e-activity.c:265
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (cancelada)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:227
+#: ../e-util/e-activity.c:268
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (terminada)"
 
 #. Translators: This is an activity whose percent
 #. * complete is unknown.
-#: ../e-util/e-activity.c:231
+#: ../e-util/e-activity.c:272
 #, c-format
 msgid "%s..."
 msgstr "%s..."
 
-#: ../e-util/e-activity.c:236
+#: ../e-util/e-activity.c:277
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% terminada)"
 
-#: ../e-util/e-alert.c:72 ../e-util/e-alert.c:73
+#: ../e-util/e-alert.c:73 ../e-util/e-alert.c:76
 msgid "Evolution Error"
 msgstr "Erro Evolution"
 
-#: ../e-util/e-alert.c:74 ../e-util/e-alert.c:75
+#: ../e-util/e-alert.c:79 ../e-util/e-alert.c:82
 msgid "Evolution Warning"
 msgstr "Aviso Evolution"
 
-#: ../e-util/e-alert.c:634
+#: ../e-util/e-alert.c:659
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Erro interno, pedido o erro desconhecido '%s'"
@@ -8896,56 +8744,66 @@ msgstr "Europeu Ocidental"
 msgid "Western European, New"
 msgstr "Europeu Ocidental, Novo"
 
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+#. Translators: Character set "Chinese, Traditional"
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
 msgid "Traditional"
 msgstr "Tradicional"
 
-#: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
-#: ../e-util/e-charset.c:91
+#. Translators: Character set "Chinese, Simplified"
+#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:97
 msgid "Simplified"
 msgstr "Simplificado"
 
-#: ../e-util/e-charset.c:94
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
 msgid "Ukrainian"
 msgstr "Ucraniano"
 
-#: ../e-util/e-charset.c:97
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
 msgid "Visual"
 msgstr "Visual"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../e-util/e-datetime-format.c:196
+#: ../modules/calendar/e-cal-shell-view-actions.c:1790
+#: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "Hoje"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:223
+#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "AmanhÃ£"
 
-#: ../e-util/e-datetime-format.c:204
+#: ../e-util/e-datetime-format.c:207
 msgid "Yesterday"
 msgstr "Ontem"
 
-#: ../e-util/e-datetime-format.c:207
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:211
 #, c-format
-msgid "%d days from now"
-msgstr "daqui a %d dias"
+msgid "%d day from now"
+msgid_plural "%d days from now"
+msgstr[0] "daqui a %d dia"
+msgstr[1] "daqui a %d dias"
 
-#: ../e-util/e-datetime-format.c:209
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:214
 #, c-format
-msgid "%d days ago"
-msgstr "hÃ¡ %d dias atrÃ¡s"
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "hÃ¡ %d dia atrÃ¡s"
+msgstr[1] "hÃ¡ %d dias atrÃ¡s"
 
-#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
-#: ../e-util/e-datetime-format.c:302
+#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
+#: ../e-util/e-datetime-format.c:308
 msgid "Use locale default"
 msgstr "Utilizar omissÃ£o da configuraÃ§Ã£o regional"
 
-#: ../e-util/e-datetime-format.c:496
+#: ../e-util/e-datetime-format.c:502
 msgid "Format:"
 msgstr "Formato:"
 
@@ -8966,18 +8824,6 @@ msgstr "A gravar em \"%s\""
 msgid "Writing \"%s\" to %s"
 msgstr "A gravar \"%s\" em %s"
 
-#: ../e-util/e-logger.c:175
-msgid "Name of the logger"
-msgstr "Nome do registo"
-
-#: ../e-util/e-module.c:188
-msgid "Filename"
-msgstr "Ficheiro"
-
-#: ../e-util/e-module.c:189
-msgid "The filename of the module"
-msgstr "O nome do ficheiro do mÃ³dulo"
-
 #: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
 msgstr "Registos de DepuraÃ§Ã£o"
@@ -9000,13 +8846,15 @@ msgstr "Mensagens de Registo:"
 msgid "Log Level"
 msgstr "NÃvel de Registo"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2696
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2759
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Mensagens"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
-#: ../shell/e-shell-window-actions.c:1446
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:113
+#: ../shell/e-shell-window-actions.c:1426
+#: ../shell/e-shell-window-actions.c:1433
+#: ../shell/e-shell-window-actions.c:1440
 msgid "Close this window"
 msgstr "Fechar esta janela"
 
@@ -9030,43 +8878,32 @@ msgstr "DepuraÃ§Ã£o"
 msgid "Error, Warnings and Debug messages"
 msgstr "Mensagens de Erro, Avisos e DepuraÃ§Ã£o"
 
-#: ../e-util/e-plugin.c:295 ../modules/mail/em-composer-prefs.c:469
-#: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:205
-msgid "Enabled"
-msgstr "Activo"
-
-#: ../e-util/e-plugin.c:296
-msgid "Whether the plugin is enabled"
-msgstr "Se o plugin estÃ¡ ou nÃ£o activo"
-
-#: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:334
+#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:337
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "semanas"
 
-#: ../e-util/e-print.c:160
+#: ../e-util/e-print.c:161
 msgid "An error occurred while printing"
 msgstr "Ocorreu um erro ao imprimir"
 
-#: ../e-util/e-print.c:167
+#: ../e-util/e-print.c:168
 msgid "The printing system reported the following details about the error:"
 msgstr "O sistema de impressÃ£o reportou os seguintes detalhes sobre o erro:"
 
-#: ../e-util/e-print.c:173
+#: ../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 quaisquer detalhes adicionais sobre o "
 "erro."
 
-#: ../e-util/e-signature.c:701
+#: ../e-util/e-signature.c:707
 msgid "Autogenerated"
 msgstr "Gerada automaticamente"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
+#: ../e-util/e-system.error.xml.h:1
 msgid "Because \"{1}\"."
 msgstr "Devido a \"{1}\"."
 
@@ -9086,15 +8923,15 @@ msgstr "Deseja sobrepo-lo?"
 msgid "File exists \"{0}\"."
 msgstr "JÃ¡ existe o ficheiro \"{0}\"."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:143
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:140
 msgid "_Overwrite"
 msgstr "_Sobrepor"
 
-#: ../e-util/e-util.c:140
+#: ../e-util/e-util.c:146
 msgid "Could not open the link."
 msgstr "Incapaz de abrir o link."
 
-#: ../e-util/e-util.c:190
+#: ../e-util/e-util.c:193
 msgid "Could not display help for Evolution."
 msgstr "Incapaz de apresentar a ajuda do Evolution."
 
@@ -9107,279 +8944,294 @@ msgstr "Erro GConf: %s"
 msgid "All further errors shown only on terminal."
 msgstr "Todos os demais erros apresentados apenas numa consola."
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:959
-#: ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1038
+#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:72
+msgid "From"
+msgstr "De"
+
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1039
+#: ../modules/mail/em-mailer-prefs.c:73
 msgid "Reply-To"
 msgstr "Responder-A"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
-#: ../mail/em-format-html.c:2242 ../mail/em-format-html.c:2313
-#: ../mail/em-format-html.c:2350 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1041
+#: ../mail/em-format-html.c:2290 ../mail/em-format-html.c:2352
+#: ../mail/em-format-html.c:2375 ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2324
-#: ../mail/em-format-html.c:2357 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1042
+#: ../mail/em-format-html.c:2291 ../mail/em-format-html.c:2356
+#: ../mail/em-format-html.c:2378 ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
+#: ../em-format/em-format-quote.c:410 ../em-format/em-format.c:1043
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
-#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:77
+#: ../plugins/groupwise-features/notification.ui.h:2
+#: ../plugins/groupwise-features/properties.ui.h:5 ../smime/lib/e-cert.c:1140
 msgid "Subject"
 msgstr "Assunto"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2455
-#: ../modules/mail/em-mailer-prefs.c:1130
+#: ../em-format/em-format-quote.c:421 ../mail/em-format-html.c:2472
+#: ../modules/mail/em-mailer-prefs.c:1040
 msgid "Mailer"
 msgstr "AplicaÃ§Ã£o de Email"
 
-#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
+#: ../em-format/em-format-quote.c:500 ../mail/em-composer-utils.c:1296
 msgid "-------- Forwarded Message --------"
 msgstr "------ Mensagem Reencaminhada ------"
 
-#: ../em-format/em-format.c:964 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:545
-#: ../widgets/misc/e-dateedit.c:567
+#: ../em-format/em-format.c:1044 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:530
+#: ../widgets/misc/e-dateedit.c:552
 msgid "Date"
 msgstr "Data"
 
-#: ../em-format/em-format.c:965 ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:1045 ../modules/mail/em-mailer-prefs.c:79
 msgid "Newsgroups"
 msgstr "Grupo de notÃcias"
 
-#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:1046 ../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:1319
+#: ../em-format/em-format.c:1431
 #, c-format
 msgid "%s attachment"
 msgstr "anexo %s"
 
-#: ../em-format/em-format.c:1374
+#: ../em-format/em-format.c:1503
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Incapaz de processar a mensagem S/MIME: Erro desconhecido"
 
-#: ../em-format/em-format.c:1512 ../em-format/em-format.c:1674
+#: ../em-format/em-format.c:1662 ../em-format/em-format.c:1846
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Incapaz de processar a mensagem MIME. A apresentar como cÃ³digo."
 
-#: ../em-format/em-format.c:1520
+#: ../em-format/em-format.c:1672
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tipo de encriptaÃ§Ã£o nÃ£o suportada para multipartes/encriptada"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1688
 msgid "Could not parse PGP/MIME message"
 msgstr "Incapaz de processar a mensagem PGP/MIME"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1689
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Incapaz de processar a mensagem PGP/MIME: Erro desconhecido"
 
-#: ../em-format/em-format.c:1698
+#: ../em-format/em-format.c:1871
 msgid "Unsupported signature format"
 msgstr "Formato de assinatura nÃ£o suportado"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1881 ../em-format/em-format.c:2041
 msgid "Error verifying signature"
 msgstr "Erro ao verificar a assinatura"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1836
-#: ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1882 ../em-format/em-format.c:2029
+#: ../em-format/em-format.c:2042
 msgid "Unknown error verifying signature"
 msgstr "Erro desconhecido ao verificar a assinatura"
 
-#: ../em-format/em-format.c:1924
-msgid "Could not parse PGP message"
-msgstr "Incapaz de processar a mensagem PGP."
+#: ../em-format/em-format.c:2129
+msgid "Could not parse PGP message: "
+msgstr "Incapaz de processar a mensagem PGP: "
 
-#: ../em-format/em-format.c:1924
-msgid "Could not parse PGP message: Unknown error"
-msgstr "Incapaz de processar a mensagem PGP: Erro desconhecido"
+#: ../em-format/em-format.c:2135 ../plugins/caldav/caldav-browse-server.c:203
+#: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
+#: ../smime/gui/certificate-manager.c:100
+msgid "Unknown error"
+msgstr "Erro desconhecido"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "hÃ¡ 1 segundo atrÃ¡s"
 msgstr[1] "hÃ¡ %d segundos atrÃ¡s"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 segundo no futuro"
 msgstr[1] "%d segundos no futuro"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "hÃ¡ 1 minuto atrÃ¡s"
 msgstr[1] "hÃ¡ %d minutos atrÃ¡s"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "1 minuto no futuro"
 msgstr[1] "%d minutos no futuro"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "hÃ¡ 1 hora atrÃ¡s"
 msgstr[1] "hÃ¡ %d horas atrÃ¡s"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "1 hora no futuro"
 msgstr[1] "%d horas no futuro"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "ontem"
 msgstr[1] "hÃ¡ %d dias atrÃ¡s"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "1 dia no futuro"
 msgstr[1] "%d dias no futuro"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "a semana passada"
 msgstr[1] "hÃ¡ %d semanas atrÃ¡s"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 semana no futuro"
 msgstr[1] "%d semanas no futuro"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "o mÃªs passado"
 msgstr[1] "hÃ¡ %d meses atrÃ¡s"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "1 mÃªs no futuro"
 msgstr[1] "%d meses no futuro"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "o ano passado"
 msgstr[1] "hÃ¡ %d anos atrÃ¡s"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "1 ano no futuro"
 msgstr[1] "%d anos no futuro"
 
-#: ../filter/e-filter-datespec.c:116
+#: ../filter/e-filter-datespec.c:122
 msgid "<click here to select a date>"
 msgstr "<clique aqui para seleccionar uma data>"
 
-#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
-#: ../filter/e-filter-datespec.c:141
+#: ../filter/e-filter-datespec.c:125 ../filter/e-filter-datespec.c:136
+#: ../filter/e-filter-datespec.c:147
 msgid "now"
 msgstr "agora"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:126
+#: ../filter/e-filter-datespec.c:132
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/e-filter-datespec.c:269
+#: ../filter/e-filter-datespec.c:275
 msgid "Select a time to compare against"
 msgstr "Seleccione uma data com a qual comparar"
 
-#: ../filter/e-filter-file.c:184
+#: ../filter/e-filter-file.c:188
 msgid "Choose a File"
 msgstr "Seleccione um Ficheiro"
 
-#: ../filter/e-filter-rule.c:659
+#: ../filter/e-filter-rule.c:663
 msgid "R_ule name:"
 msgstr "Nome da re_gra:"
 
-#: ../filter/e-filter-rule.c:689
+#: ../filter/e-filter-rule.c:693
 msgid "Find items that meet the following conditions"
 msgstr "Procurar itens que respeitem as seguintes condiÃ§Ãµes"
 
-#: ../filter/e-filter-rule.c:723
-msgid "A_dd Condition"
-msgstr "A_dicionar CondiÃ§Ã£o"
-
-#: ../filter/e-filter-rule.c:732
+#: ../filter/e-filter-rule.c:718
 msgid "If all conditions are met"
 msgstr "Se todas as condiÃ§Ãµes forem cumpridas"
 
-#: ../filter/e-filter-rule.c:733
+#: ../filter/e-filter-rule.c:719
 msgid "If any conditions are met"
 msgstr "Se qualquer condiÃ§Ã£o for cumprida"
 
-#: ../filter/e-filter-rule.c:736
+#: ../filter/e-filter-rule.c:722
 msgid "_Find items:"
 msgstr "_Procurar itens:"
 
-#: ../filter/e-filter-rule.c:760
+#. Translators: "None" for not including threads;
+#. * part of "Include threads: None"
+#: ../filter/e-filter-rule.c:749
+msgid "None"
+msgstr "Nenhum(a)"
+
+#: ../filter/e-filter-rule.c:750
 msgid "All related"
 msgstr "Todas as relacionadas"
 
-#: ../filter/e-filter-rule.c:761 ../widgets/misc/e-send-options.ui.h:16
+#: ../filter/e-filter-rule.c:751 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "Respostas"
 
-#: ../filter/e-filter-rule.c:762
+#: ../filter/e-filter-rule.c:752
 msgid "Replies and parents"
 msgstr "Respostas e pais"
 
-#: ../filter/e-filter-rule.c:763
+#: ../filter/e-filter-rule.c:753
 msgid "No reply or parent"
 msgstr "Nenhuma resposta ou pai"
 
-#: ../filter/e-filter-rule.c:766
+#: ../filter/e-filter-rule.c:756
 msgid "I_nclude threads"
 msgstr "I_ncluir Ã¡rvores"
 
-#: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:300
+#: ../filter/e-filter-rule.c:779
+msgid "A_dd Condition"
+msgstr "A_dicionar CondiÃ§Ã£o"
+
+#: ../filter/e-filter-rule.c:1126 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:304
 msgid "Incoming"
 msgstr "Recebidas"
 
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:301
+#: ../filter/e-filter-rule.c:1126 ../mail/em-utils.c:305
 msgid "Outgoing"
 msgstr "Caixa de SaÃda"
 
-#: ../filter/e-rule-editor.c:265
+#: ../filter/e-rule-editor.c:270
 msgid "Add Rule"
 msgstr "Adicionar a Regra"
 
-#: ../filter/e-rule-editor.c:352
+#: ../filter/e-rule-editor.c:359
 msgid "Edit Rule"
 msgstr "Editar a Regra"
 
@@ -9403,7 +9255,7 @@ msgstr "Data inexistente."
 msgid "Missing file name."
 msgstr "Nome de ficheiro inexistente."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:73
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "Nome inexistente."
 
@@ -9459,7 +9311,7 @@ msgstr ""
 "A data da mensagem serÃ¡ comparada com a data\n"
 "do momento em que a filtragem ocorrer."
 
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:185
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:189
 msgid "_Filter Rules"
 msgstr "Regras de _Filtro"
 
@@ -9480,7 +9332,7 @@ msgstr "no futuro"
 msgid "months"
 msgstr "meses"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
+#: ../filter/filter.ui.h:19
 msgid "seconds"
 msgstr "segundos"
 
@@ -9496,44 +9348,28 @@ msgstr "a data especificada"
 msgid "years"
 msgstr "anos"
 
-#: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
-#: ../mail/em-format-html-display.c:1029 ../mail/mail-config.ui.h:13
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
-#: ../widgets/misc/e-attachment-paned.c:153
+#: ../mail/e-mail-attachment-bar.c:91 ../mail/e-mail-attachment-bar.c:96
+#: ../mail/em-format-html-display.c:1024 ../mail/mail-config.ui.h:13
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:129
+#: ../widgets/misc/e-attachment-paned.c:134
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Anexo"
 msgstr[1] "Anexos"
 
-#: ../mail/e-mail-attachment-bar.c:621
-#: ../widgets/misc/e-attachment-paned.c:612
+#: ../mail/e-mail-attachment-bar.c:611
+#: ../widgets/misc/e-attachment-paned.c:599
 msgid "Icon View"
 msgstr "Vista de Ã?cones"
 
-#: ../mail/e-mail-attachment-bar.c:622
-#: ../widgets/misc/e-attachment-paned.c:613
+#: ../mail/e-mail-attachment-bar.c:612
+#: ../widgets/misc/e-attachment-paned.c:600
 msgid "List View"
 msgstr "Vista em Lista"
 
-#: ../mail/e-mail-browser.c:732 ../shell/e-shell-window.c:631
-msgid "Focus Tracker"
-msgstr "Controlador de Foco"
-
-#: ../mail/e-mail-browser.c:742
-msgid "Shell Module"
-msgstr "MÃ³dulo de Consola"
-
-#: ../mail/e-mail-browser.c:743 ../mail/message-list.c:2589
-msgid "The mail shell backend"
-msgstr "O motor de consola de email"
-
-#: ../mail/e-mail-browser.c:753
-msgid "Show Deleted"
-msgstr "Apresentar Apagadas"
-
-#: ../mail/e-mail-browser.c:754
-msgid "Show deleted messages"
-msgstr "Apresentar as mensagens apagadas"
+#: ../mail/e-mail-browser.c:268
+msgid "(No Subject)"
+msgstr "(Sem Assunto)"
 
 #: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
@@ -9551,7 +9387,7 @@ msgstr "_Deste EndereÃ§o"
 msgid "Create Search _Folder"
 msgstr "Criar uma Pasta de _Procura"
 
-#: ../mail/e-mail-label-dialog.c:220
+#: ../mail/e-mail-label-dialog.c:222
 msgid "_Label name:"
 msgstr "_Nome da etiqueta:"
 
@@ -9580,7 +9416,7 @@ msgid "_Later"
 msgstr "Mais _Tarde"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:515
+#: ../modules/mail/e-mail-shell-view-actions.c:505
 msgid "Add Label"
 msgstr "Adicionar Etiqueta"
 
@@ -9600,116 +9436,57 @@ msgstr ""
 msgid "Color"
 msgstr "Cor"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:680 ../mail/em-folder-tree.c:2582
-#: ../modules/mail/e-mail-shell-view-private.c:963
+#: ../mail/e-mail-label-tree-view.c:96
+#: ../modules/plugin-manager/evolution-plugin-manager.c:66
+#: ../plugins/caldav/caldav-browse-server.c:1163
+#: ../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
+msgid "Name"
+msgstr "Nome"
+
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
+#: ../mail/em-folder-tree-model.c:696 ../mail/em-folder-tree.c:2842
+#: ../modules/mail/e-mail-shell-view-private.c:1062
 msgid "Inbox"
 msgstr "Caixa de Entrada"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:673
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:688
 msgid "Drafts"
 msgstr "Rascunhos"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:683
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:700
 msgid "Outbox"
 msgstr "Caixa de SaÃda"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:685
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:702
 msgid "Sent"
 msgstr "Enviadas"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:676
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:691
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:574
+#: ../plugins/templates/templates.c:578
 msgid "Templates"
 msgstr "Modelos"
 
-#: ../mail/e-mail-migrate.c:960 ../mail/em-filter-i18n.h:30
-msgid "Important"
-msgstr "Importante"
-
-#. green
-#: ../mail/e-mail-migrate.c:963
-msgid "To Do"
-msgstr "A Fazer"
-
-#. blue
-#: ../mail/e-mail-migrate.c:964
-msgid "Later"
-msgstr "Mais Tarde"
-
-#: ../mail/e-mail-migrate.c:1110
-#: ../modules/addressbook/e-book-shell-migrate.c:76
-#: ../modules/calendar/e-cal-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-migrate.c:90
+#: ../mail/e-mail-migrate.c:131
 msgid "Migrating..."
 msgstr "A migrar..."
 
-#: ../mail/e-mail-migrate.c:1143
+#: ../mail/e-mail-migrate.c:164
 msgid "Migration"
 msgstr "MigraÃ§Ã£o"
 
-#: ../mail/e-mail-migrate.c:1183
-#: ../modules/addressbook/e-book-shell-migrate.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../mail/e-mail-migrate.c:204
 #, c-format
 msgid "Migrating '%s':"
 msgstr "A migrar '%s':"
 
-#: ../mail/e-mail-migrate.c:1594
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "Incapaz de criar a nova pasta `%s': %s"
-
-#: ../mail/e-mail-migrate.c:1622
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "Incapaz de copiar a pasta `%s' para `%s': %s"
-
-#: ../mail/e-mail-migrate.c:1817
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "Incapaz de analisar caixas de correio existentes em `%s': %s"
-
-#: ../mail/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2933
+#: ../mail/e-mail-migrate.c:649
 msgid "Migrating Folders"
 msgstr "A Migrar as Pastas"
 
-#: ../mail/e-mail-migrate.c:1824
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"A localizaÃ§Ã£o e hierarquia das pastas de email Evolution foram alteradas "
-"desde o Evolution 1.x.\n"
-"\n"
-"Aguarde enquanto o Evolution migra as suas pastas..."
-
-#: ../mail/e-mail-migrate.c:2027
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "Incapaz de abir dados antigos POP manter-no-servidor `%s': %s"
-
-#: ../mail/e-mail-migrate.c:2043
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr ""
-"Incapaz de criar o directÃ³rio de dados POP3 manter-no-servidor `%s': %s"
-
-#: ../mail/e-mail-migrate.c:2075
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "Incapaz de copiar os dados POP3 manter-no-servidor `%s': %s"
-
-#: ../mail/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "Falha ao criar o armazenamento local de mensagens `%s': %s"
-
-#: ../mail/e-mail-migrate.c:2934
+#: ../mail/e-mail-migrate.c:650
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9721,45 +9498,50 @@ msgstr ""
 "\n"
 "Aguarde enquanto o Evolution migra as suas pastas..."
 
-#: ../mail/e-mail-migrate.c:3031
+#: ../mail/e-mail-migrate.c:796
 #, c-format
-msgid "Unable to create local mail folders at `%s': %s"
-msgstr "Incapaz de criar as pastas locais de mensagens em `%s': %s"
+msgid "Unable to create local mail folders at '%s': %s"
+msgstr "Incapaz de criar as pastas locais de mensagens em '%s': %s"
 
-#: ../mail/e-mail-migrate.c:3049
-#, c-format
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"Incapaz de ler as definiÃ§Ãµes da instalaÃ§Ã£o anterior do Evolution, `evolution/"
-"config.xmldb' nÃ£o existe ou estÃ¡ corrompido."
+#: ../mail/e-mail-notebook-view.c:563
+msgid "Please select a folder"
+msgstr "Seleccione 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:105
-#: ../modules/calendar/e-task-shell-view-actions.c:559
+#: ../mail/e-mail-reader-utils.c:109
+#: ../modules/calendar/e-task-shell-view-actions.c:570
 msgid "Do not ask me again"
 msgstr "NÃ£o perguntar novamente"
 
-#: ../mail/e-mail-reader.c:264 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:279 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Copiar para a Pasta"
 
-#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:279 ../mail/em-folder-utils.c:402
 msgid "C_opy"
 msgstr "C_opiar"
 
-#: ../mail/e-mail-reader.c:638 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:692 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Mover para a Pasta"
 
-#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:692 ../mail/em-folder-utils.c:402
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../mail/e-mail-reader.c:864
+#. Check buttons
+#: ../mail/e-mail-reader.c:957 ../mail/e-mail-reader.c:1073
+#: ../mail/e-mail-reader.c:1114
+msgid "_Do not ask me again."
+msgstr "_NÃ£o perguntar novamente."
+
+#: ../mail/e-mail-reader.c:1119
+msgid "_Always ignore Reply-To: for mailing lists."
+msgstr "Ignorar _sempre Responder-A: para listas de distribuiÃ§Ã£o."
+
+#: ../mail/e-mail-reader.c:1209
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Gravar a Mensagem"
@@ -9771,579 +9553,628 @@ msgstr[1] "Gravar as Mensagens"
 #. * 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:885 ../plugins/groupwise-features/properties.ui.h:5
-#: ../widgets/table/e-table-click-to-add.c:518
+#: ../mail/e-mail-reader.c:1230
+#: ../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:1143
+#: ../mail/e-mail-reader.c:1495
 msgid "A_dd Sender to Address Book"
 msgstr "A_dicionar o Remetente ao Livro de EndereÃ§os"
 
-#: ../mail/e-mail-reader.c:1145
+#: ../mail/e-mail-reader.c:1497
 msgid "Add sender to address book"
 msgstr "Adicionar o remetente ao livro de endereÃ§os"
 
-#: ../mail/e-mail-reader.c:1150
+#: ../mail/e-mail-reader.c:1502
 msgid "Check for _Junk"
 msgstr "Verificar se Existe Correio _NÃ£o Solicitado"
 
-#: ../mail/e-mail-reader.c:1152
+#: ../mail/e-mail-reader.c:1504
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrar as mensagens seleccionadas pelo estado de nÃ£o solicitado"
 
-#: ../mail/e-mail-reader.c:1157
+#: ../mail/e-mail-reader.c:1509
 msgid "_Copy to Folder..."
 msgstr "_Copiar para a Pasta..."
 
-#: ../mail/e-mail-reader.c:1159
+#: ../mail/e-mail-reader.c:1511
 msgid "Copy selected messages to another folder"
 msgstr "Copiar as mensagens seleccionadas para outra pasta"
 
-#: ../mail/e-mail-reader.c:1164
+#: ../mail/e-mail-reader.c:1516
 msgid "_Delete Message"
 msgstr "_Apagar a Mensagem"
 
-#: ../mail/e-mail-reader.c:1166
+#: ../mail/e-mail-reader.c:1518
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar a(s) mensagem(ns) seleccionada(s) para serem apagadas"
 
-#: ../mail/e-mail-reader.c:1171
+#: ../mail/e-mail-reader.c:1523
 msgid "Filter on Mailing _List..."
 msgstr "Filtrar pela _Lista de DistribuiÃ§Ã£o..."
 
-#: ../mail/e-mail-reader.c:1173
+#: ../mail/e-mail-reader.c:1525
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Criar uma regra para filtrar mensagens para esta lista de distribuiÃ§Ã£o"
 
-#: ../mail/e-mail-reader.c:1178
+#: ../mail/e-mail-reader.c:1530
 msgid "Filter on _Recipients..."
 msgstr "Filtrar pelo _DestinatÃ¡rios..."
 
-#: ../mail/e-mail-reader.c:1180
+#: ../mail/e-mail-reader.c:1532
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Criar uma regra para filtrar mensagens para estes destinatÃ¡rios"
 
-#: ../mail/e-mail-reader.c:1185
+#: ../mail/e-mail-reader.c:1537
 msgid "Filter on Se_nder..."
 msgstr "Filtrar pelo Remete_nte..."
 
-#: ../mail/e-mail-reader.c:1187
+#: ../mail/e-mail-reader.c:1539
 msgid "Create a rule to filter messages from this sender"
 msgstr "Criar uma regra para filtrar mensagens deste remetente"
 
-#: ../mail/e-mail-reader.c:1192
+#: ../mail/e-mail-reader.c:1544
 msgid "Filter on _Subject..."
 msgstr "Filtrar pelo _Assunto..."
 
-#: ../mail/e-mail-reader.c:1194
+#: ../mail/e-mail-reader.c:1546
 msgid "Create a rule to filter messages with this subject"
 msgstr "Criar uma regra para filtrar mensagens com este assunto"
 
-#: ../mail/e-mail-reader.c:1199
+#: ../mail/e-mail-reader.c:1551
 msgid "A_pply Filters"
 msgstr "A_plicar os Filtros"
 
-#: ../mail/e-mail-reader.c:1201
+#: ../mail/e-mail-reader.c:1553
 msgid "Apply filter rules to the selected messages"
 msgstr "Aplicar as regras de filtros Ã s mensagens seleccionadas"
 
-#: ../mail/e-mail-reader.c:1206
+#: ../mail/e-mail-reader.c:1558
 msgid "_Find in Message..."
 msgstr "_Procurar na Mensagem..."
 
-#: ../mail/e-mail-reader.c:1208
+#: ../mail/e-mail-reader.c:1560
 msgid "Search for text in the body of the displayed message"
 msgstr "Procurar texto no corpo da mensagem apresentada"
 
-#: ../mail/e-mail-reader.c:1213
+#: ../mail/e-mail-reader.c:1565
 msgid "_Clear Flag"
 msgstr "L_impar a Marca"
 
-#: ../mail/e-mail-reader.c:1215
+#: ../mail/e-mail-reader.c:1567
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Remover a marca de \"dar seguimento\" das mensagens seleccionadas"
 
-#: ../mail/e-mail-reader.c:1220
+#: ../mail/e-mail-reader.c:1572
 msgid "_Flag Completed"
 msgstr "Marcar como _Terminada"
 
-#: ../mail/e-mail-reader.c:1222
+#: ../mail/e-mail-reader.c:1574
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr ""
 "Definir a marca de \"dar seguimento\" como \"terminada\" em todas as "
 "mensagens seleccionadas"
 
-#: ../mail/e-mail-reader.c:1227
+#: ../mail/e-mail-reader.c:1579
 msgid "Follow _Up..."
 msgstr "Dar Seg_uimento..."
 
-#: ../mail/e-mail-reader.c:1229
+#: ../mail/e-mail-reader.c:1581
 msgid "Flag the selected messages for follow-up"
 msgstr "Marcar as mensagens seleccionadas para dar seguimento"
 
-#: ../mail/e-mail-reader.c:1234
+#: ../mail/e-mail-reader.c:1586
 msgid "_Attached"
 msgstr "_Anexado"
 
-#: ../mail/e-mail-reader.c:1236 ../mail/e-mail-reader.c:1243
+#: ../mail/e-mail-reader.c:1588 ../mail/e-mail-reader.c:1595
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Reencaminhar a mensagem seleccionada como anexo para alguÃ©m"
 
-#: ../mail/e-mail-reader.c:1241
+#: ../mail/e-mail-reader.c:1593
 msgid "Forward As _Attached"
 msgstr "Reencaminhar Como _Anexo"
 
-#: ../mail/e-mail-reader.c:1248
+#: ../mail/e-mail-reader.c:1600
 msgid "_Inline"
 msgstr "_Embutida"
 
-#: ../mail/e-mail-reader.c:1250 ../mail/e-mail-reader.c:1257
+#: ../mail/e-mail-reader.c:1602 ../mail/e-mail-reader.c:1609
 msgid "Forward the selected message in the body of a new message"
 msgstr "Reencaminhar a mensagem seleccionada no corpo de uma nova mensagem"
 
-#: ../mail/e-mail-reader.c:1255
+#: ../mail/e-mail-reader.c:1607
 msgid "Forward As _Inline"
 msgstr "Reencaminhar Como _Embutida"
 
-#: ../mail/e-mail-reader.c:1262
+#: ../mail/e-mail-reader.c:1614
 msgid "_Quoted"
 msgstr "_Citada"
 
-#: ../mail/e-mail-reader.c:1264 ../mail/e-mail-reader.c:1271
+#: ../mail/e-mail-reader.c:1616 ../mail/e-mail-reader.c:1623
 msgid "Forward the selected message quoted like a reply"
 msgstr "Reencaminhar a mensagem seleccionada citada como uma resposta"
 
-#: ../mail/e-mail-reader.c:1269
+#: ../mail/e-mail-reader.c:1621
 msgid "Forward As _Quoted"
 msgstr "Reencaminhar Como _Citada"
 
-#: ../mail/e-mail-reader.c:1276
+#: ../mail/e-mail-reader.c:1628
 msgid "_Load Images"
 msgstr "_Ler as Imagens"
 
-#: ../mail/e-mail-reader.c:1278
+#: ../mail/e-mail-reader.c:1630
 msgid "Force images in HTML mail to be loaded"
 msgstr "ForÃ§ar as imagens na mensagem HTML a serem lidas"
 
-#: ../mail/e-mail-reader.c:1283
+#: ../mail/e-mail-reader.c:1635
 msgid "_Important"
 msgstr "_Importante"
 
-#: ../mail/e-mail-reader.c:1285
+#: ../mail/e-mail-reader.c:1637
 msgid "Mark the selected messages as important"
 msgstr "Marcar as mensagens seleccionadas como importantes"
 
-#: ../mail/e-mail-reader.c:1290
+#: ../mail/e-mail-reader.c:1642
 msgid "_Junk"
 msgstr "NÃ£o _Solicitada"
 
-#: ../mail/e-mail-reader.c:1292
+#: ../mail/e-mail-reader.c:1644
 msgid "Mark the selected messages as junk"
 msgstr "Marcar as mensagens seleccionadas como nÃ£o solicitadas"
 
-#: ../mail/e-mail-reader.c:1297
+#: ../mail/e-mail-reader.c:1649
 msgid "_Not Junk"
 msgstr "_NÃ£o Ã© NÃ£o Solicitado"
 
-#: ../mail/e-mail-reader.c:1299
+#: ../mail/e-mail-reader.c:1651
 msgid "Mark the selected messages as not being junk"
 msgstr "Marcar as mensagens seleccionadas como nÃ£o sendo nÃ£o solicitadas"
 
-#: ../mail/e-mail-reader.c:1304
+#: ../mail/e-mail-reader.c:1656
 msgid "_Read"
 msgstr "_Ler"
 
-#: ../mail/e-mail-reader.c:1306
+#: ../mail/e-mail-reader.c:1658
 msgid "Mark the selected messages as having been read"
 msgstr "Marcar as mensagens seleccionadas como lidas"
 
-#: ../mail/e-mail-reader.c:1311
+#: ../mail/e-mail-reader.c:1663
 msgid "Uni_mportant"
 msgstr "_NÃ£o Importante"
 
-#: ../mail/e-mail-reader.c:1313
+#: ../mail/e-mail-reader.c:1665
 msgid "Mark the selected messages as unimportant"
 msgstr "Marcar as mensagens seleccionadas como nÃ£o sendo importantes"
 
-#: ../mail/e-mail-reader.c:1318
+#: ../mail/e-mail-reader.c:1670
 msgid "_Unread"
 msgstr "Marcar _por Ler"
 
-#: ../mail/e-mail-reader.c:1320
+#: ../mail/e-mail-reader.c:1672
 msgid "Mark the selected messages as not having been read"
 msgstr "Marcar as mensagens seleccionadas como por ler"
 
-#: ../mail/e-mail-reader.c:1325
+#: ../mail/e-mail-reader.c:1677
 msgid "_Edit as New Message..."
 msgstr "_Editar como uma Nova Mensagem..."
 
-#: ../mail/e-mail-reader.c:1327
+#: ../mail/e-mail-reader.c:1679
 msgid "Open the selected messages in the composer for editing"
 msgstr "Abrir as mensagens seleccionadas no compositor para serem editadas"
 
-#: ../mail/e-mail-reader.c:1332
+#: ../mail/e-mail-reader.c:1684
 msgid "Compose _New Message"
 msgstr "Compor uma _Nova Mensagem"
 
-#: ../mail/e-mail-reader.c:1334
+#: ../mail/e-mail-reader.c:1686
 msgid "Open a window for composing a mail message"
 msgstr "Abrir uma janela para compor uma mensagem de email"
 
-#: ../mail/e-mail-reader.c:1339
+#: ../mail/e-mail-reader.c:1691
 msgid "_Open in New Window"
 msgstr "Abrir numa Nova _Janela"
 
-#: ../mail/e-mail-reader.c:1341
+#: ../mail/e-mail-reader.c:1693
 msgid "Open the selected messages in a new window"
 msgstr "Abrir as mensagens seleccionadas numa nova janela"
 
-#: ../mail/e-mail-reader.c:1346
+#: ../mail/e-mail-reader.c:1698
 msgid "_Move to Folder..."
 msgstr "_Mover para a Pasta..."
 
-#: ../mail/e-mail-reader.c:1348
+#: ../mail/e-mail-reader.c:1700
 msgid "Move selected messages to another folder"
 msgstr "Mover as mensages seleccionadas para outra pasta"
 
-#: ../mail/e-mail-reader.c:1353
+#: ../mail/e-mail-reader.c:1705
+msgid "_Switch to Folder"
+msgstr "_Alternar para a Pasta"
+
+#: ../mail/e-mail-reader.c:1707
+msgid "Display the parent folder"
+msgstr "Apresentar a pasta pai"
+
+#: ../mail/e-mail-reader.c:1712
+msgid "Switch to _next tab"
+msgstr "Alternar para o separador _seguinte"
+
+#: ../mail/e-mail-reader.c:1714
+msgid "Switch to the next tab"
+msgstr "Alternar para o separador seguinte"
+
+#: ../mail/e-mail-reader.c:1719
+msgid "Switch to _previous tab"
+msgstr "Alternar para o separador _anterior"
+
+#: ../mail/e-mail-reader.c:1721
+msgid "Switch to the previous tab"
+msgstr "Alternar para o separador anterior"
+
+#: ../mail/e-mail-reader.c:1726
+msgid "Cl_ose current tab"
+msgstr "F_echar o separador actual"
+
+#: ../mail/e-mail-reader.c:1728
+msgid "Close current tab"
+msgstr "Fechar o separador actual"
+
+#: ../mail/e-mail-reader.c:1733
 msgid "_Next Message"
 msgstr "Mensagem Segui_nte"
 
-#: ../mail/e-mail-reader.c:1355
+#: ../mail/e-mail-reader.c:1735
 msgid "Display the next message"
 msgstr "Apresentar a mensagem seguinte"
 
-#: ../mail/e-mail-reader.c:1360
+#: ../mail/e-mail-reader.c:1740
 msgid "Next _Important Message"
 msgstr "Mensagem _Importante Seguinte"
 
-#: ../mail/e-mail-reader.c:1362
+#: ../mail/e-mail-reader.c:1742
 msgid "Display the next important message"
 msgstr "Apresentar a mensagem importante seguinte"
 
-#: ../mail/e-mail-reader.c:1367
+#: ../mail/e-mail-reader.c:1747
 msgid "Next _Thread"
 msgstr "Ã?rvore Seguin_te"
 
-#: ../mail/e-mail-reader.c:1369
+#: ../mail/e-mail-reader.c:1749
 msgid "Display the next thread"
 msgstr "Apresentar a Ã¡rvore seguinte"
 
-#: ../mail/e-mail-reader.c:1374
+#: ../mail/e-mail-reader.c:1754
 msgid "Next _Unread Message"
 msgstr "Mensagem Por Ler Seg_uinte"
 
-#: ../mail/e-mail-reader.c:1376
+#: ../mail/e-mail-reader.c:1756
 msgid "Display the next unread message"
 msgstr "Apresentar a mensagem por ler seguinte"
 
-#: ../mail/e-mail-reader.c:1381
+#: ../mail/e-mail-reader.c:1761
 msgid "_Previous Message"
 msgstr "Mensagem _Anterior"
 
-#: ../mail/e-mail-reader.c:1383
+#: ../mail/e-mail-reader.c:1763
 msgid "Display the previous message"
 msgstr "Apresentar a mensagem anterior"
 
-#: ../mail/e-mail-reader.c:1388
+#: ../mail/e-mail-reader.c:1768
 msgid "Pr_evious Important Message"
 msgstr "Mensagem Importante Ant_erior"
 
-#: ../mail/e-mail-reader.c:1390
+#: ../mail/e-mail-reader.c:1770
 msgid "Display the previous important message"
 msgstr "Apresentar a mensagem importante anterior"
 
-#: ../mail/e-mail-reader.c:1395
+#: ../mail/e-mail-reader.c:1775
 msgid "P_revious Unread Message"
 msgstr "Mensagem Por Ler Ante_rior"
 
-#: ../mail/e-mail-reader.c:1397
+#: ../mail/e-mail-reader.c:1777
 msgid "Display the previous unread message"
 msgstr "Apresentar a mensagem anterior por ler"
 
-#: ../mail/e-mail-reader.c:1404
+#: ../mail/e-mail-reader.c:1784
 msgid "Print this message"
 msgstr "Imprimir esta mensagem"
 
-#: ../mail/e-mail-reader.c:1411
+#: ../mail/e-mail-reader.c:1791
 msgid "Preview the message to be printed"
 msgstr "Antever a mensagem a ser impressa"
 
-#: ../mail/e-mail-reader.c:1416
+#: ../mail/e-mail-reader.c:1796
 msgid "Re_direct"
 msgstr "Re_direccionar"
 
-#: ../mail/e-mail-reader.c:1418
+#: ../mail/e-mail-reader.c:1798
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redireccionar a mensagem seleccionada para alguÃ©m"
 
-#: ../mail/e-mail-reader.c:1423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
-#: ../modules/mail/e-mail-attachment-handler.c:141
+#: ../mail/e-mail-reader.c:1803 ../mail/mail.error.xml.h:91
+#: ../modules/calendar/e-cal-shell-view-actions.c:1459
+#: ../modules/mail/e-mail-attachment-handler.c:151
 msgid "Reply to _All"
 msgstr "Responder _a Todos"
 
-#: ../mail/e-mail-reader.c:1425
+#: ../mail/e-mail-reader.c:1805
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr ""
 "Compor uma resposta para todos os destinatÃ¡rios da mensagem seleccionada"
 
-#: ../mail/e-mail-reader.c:1430
+#: ../mail/e-mail-reader.c:1810 ../mail/mail.error.xml.h:92
 msgid "Reply to _List"
 msgstr "Responder para a _Lista"
 
-#: ../mail/e-mail-reader.c:1432
+#: ../mail/e-mail-reader.c:1812
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 "Compor uma resposta para a lista de distribuiÃ§Ã£o da mensagem seleccionada"
 
-#: ../mail/e-mail-reader.c:1437
-#: ../modules/mail/e-mail-attachment-handler.c:148
+#: ../mail/e-mail-reader.c:1817
+#: ../modules/mail/e-mail-attachment-handler.c:158
 msgid "_Reply to Sender"
 msgstr "_Responder ao Remetente"
 
-#: ../mail/e-mail-reader.c:1439
+#: ../mail/e-mail-reader.c:1819
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Compor uma resposta para o remetente da mensagem seleccionada"
 
-#: ../mail/e-mail-reader.c:1444
+#: ../mail/e-mail-reader.c:1824
 msgid "_Save as mbox..."
 msgstr "_Gravar como mbox..."
 
-#: ../mail/e-mail-reader.c:1446
+#: ../mail/e-mail-reader.c:1826
 msgid "Save selected messages as an mbox file"
 msgstr "Gravar as mensagens seleccionadas como um ficheiro mbox"
 
-#: ../mail/e-mail-reader.c:1451
+#: ../mail/e-mail-reader.c:1831
 msgid "Search Folder from Mailing _List..."
 msgstr "Pasta de Procura com base na _Lista de DistribuiÃ§Ã£o..."
 
-#: ../mail/e-mail-reader.c:1453
+#: ../mail/e-mail-reader.c:1833
 msgid "Create a search folder for this mailing list"
 msgstr "Criar uma pasta de procura para esta lista de distribuiÃ§Ã£o"
 
-#: ../mail/e-mail-reader.c:1458
+#: ../mail/e-mail-reader.c:1838
 msgid "Search Folder from Recipien_ts..."
 msgstr "Pasta de Procura com base nos Des_tinatÃ¡rios..."
 
-#: ../mail/e-mail-reader.c:1460
+#: ../mail/e-mail-reader.c:1840
 msgid "Create a search folder for these recipients"
 msgstr "Criar uma pasta de procura para estes destinatÃ¡rios"
 
-#: ../mail/e-mail-reader.c:1465
+#: ../mail/e-mail-reader.c:1845
 msgid "Search Folder from Sen_der..."
 msgstr "Pasta de Procura com base no Remete_nte..."
 
-#: ../mail/e-mail-reader.c:1467
+#: ../mail/e-mail-reader.c:1847
 msgid "Create a search folder for this sender"
 msgstr "Criar uma pasta de procura para este remetente"
 
-#: ../mail/e-mail-reader.c:1472
+#: ../mail/e-mail-reader.c:1852
 msgid "Search Folder from S_ubject..."
 msgstr "Pasta de Procura com base no A_ssunto..."
 
-#: ../mail/e-mail-reader.c:1474
+#: ../mail/e-mail-reader.c:1854
 msgid "Create a search folder for this subject"
 msgstr "Criar uma pasta de procura para este assunto"
 
-#: ../mail/e-mail-reader.c:1479
+#: ../mail/e-mail-reader.c:1859
 msgid "_Message Source"
 msgstr "_CÃ³digo Fonte da Mensagem"
 
-#: ../mail/e-mail-reader.c:1481
+#: ../mail/e-mail-reader.c:1861
 msgid "Show the raw email source of the message"
 msgstr "Apresentar o cÃ³digo fonte da mensagem"
 
-#: ../mail/e-mail-reader.c:1493
+#: ../mail/e-mail-reader.c:1873
 msgid "_Undelete Message"
 msgstr "Rec_uperar a Mensagem Apagada"
 
-#: ../mail/e-mail-reader.c:1495
+#: ../mail/e-mail-reader.c:1875
 msgid "Undelete the selected messages"
 msgstr "Recuperar as mensagens apagadas seleccionadas"
 
-#: ../mail/e-mail-reader.c:1500
+#: ../mail/e-mail-reader.c:1880
 msgid "_Normal Size"
 msgstr "Tamanho _Normal"
 
-#: ../mail/e-mail-reader.c:1502
+#: ../mail/e-mail-reader.c:1882
 msgid "Reset the text to its original size"
 msgstr "Repor o texto no seu tamanho original"
 
-#: ../mail/e-mail-reader.c:1507
+#: ../mail/e-mail-reader.c:1887
 msgid "_Zoom In"
 msgstr "Aumentar _Zoom"
 
-#: ../mail/e-mail-reader.c:1509
+#: ../mail/e-mail-reader.c:1889
 msgid "Increase the text size"
 msgstr "Aumentar o tamanho do texto"
 
-#: ../mail/e-mail-reader.c:1514
+#: ../mail/e-mail-reader.c:1894
 msgid "Zoom _Out"
 msgstr "_Afastar Zoom"
 
-#: ../mail/e-mail-reader.c:1516
+#: ../mail/e-mail-reader.c:1896
 msgid "Decrease the text size"
 msgstr "Diminuir o tamanho do texto"
 
-#: ../mail/e-mail-reader.c:1523
+#: ../mail/e-mail-reader.c:1903
 msgid "Create R_ule"
 msgstr "Criar uma _Regra"
 
-#: ../mail/e-mail-reader.c:1530
+#: ../mail/e-mail-reader.c:1910
 msgid "Ch_aracter Encoding"
 msgstr "CodificaÃ§Ã£o de C_aracteres"
 
-#: ../mail/e-mail-reader.c:1537
+#: ../mail/e-mail-reader.c:1917
 msgid "F_orward As"
 msgstr "_Reencaminhar Como"
 
-#: ../mail/e-mail-reader.c:1544
+#: ../mail/e-mail-reader.c:1924
+msgid "_Group Reply"
+msgstr "Responder ao _Grupo"
+
+#: ../mail/e-mail-reader.c:1931
 msgid "_Go To"
 msgstr "_Ir Para"
 
-#: ../mail/e-mail-reader.c:1551
+#: ../mail/e-mail-reader.c:1938
 msgid "Mar_k As"
 msgstr "_Marcar Como"
 
-#: ../mail/e-mail-reader.c:1558
+#: ../mail/e-mail-reader.c:1945
 msgid "_Message"
 msgstr "_Mensagem"
 
-#: ../mail/e-mail-reader.c:1565
+#: ../mail/e-mail-reader.c:1952
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../mail/e-mail-reader.c:1590
+#: ../mail/e-mail-reader.c:1977
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar para Dar Se_guimento..."
 
-#: ../mail/e-mail-reader.c:1598
+#: ../mail/e-mail-reader.c:1985
 msgid "Mark as _Important"
 msgstr "Marcar como _Importante"
 
-#: ../mail/e-mail-reader.c:1602
+#: ../mail/e-mail-reader.c:1989
 msgid "Mark as _Junk"
 msgstr "Marcar como _NÃ£o Solicitada"
 
-#: ../mail/e-mail-reader.c:1606
+#: ../mail/e-mail-reader.c:1993
 msgid "Mark as _Not Junk"
 msgstr "Marcar como _Solicitada"
 
-#: ../mail/e-mail-reader.c:1610
+#: ../mail/e-mail-reader.c:1997
 msgid "Mar_k as Read"
 msgstr "_Marcar como Lida"
 
-#: ../mail/e-mail-reader.c:1614
+#: ../mail/e-mail-reader.c:2001
 msgid "Mark as Uni_mportant"
 msgstr "Remover a MarcaÃ§Ã£o de I_mportante"
 
-#: ../mail/e-mail-reader.c:1618
+#: ../mail/e-mail-reader.c:2005
 msgid "Mark as _Unread"
 msgstr "Marcar _Por Ler"
 
-#: ../mail/e-mail-reader.c:1654
+#: ../mail/e-mail-reader.c:2041
 msgid "_Caret Mode"
 msgstr "Modo de _Cursor"
 
-#: ../mail/e-mail-reader.c:1656
+#: ../mail/e-mail-reader.c:2043
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Apresentar um cursor intermitente no corpo da mensagem apresentada"
 
-#: ../mail/e-mail-reader.c:1662
+#: ../mail/e-mail-reader.c:2049
 msgid "All Message _Headers"
 msgstr "_CabeÃ§alhos de Todas as Mensagens"
 
-#: ../mail/e-mail-reader.c:1664
+#: ../mail/e-mail-reader.c:2051
 msgid "Show messages with all email headers"
 msgstr "Apresentar as mensagens com todos os cabeÃ§alhos de email"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:2272
 msgid "Unable to retrieve message"
 msgstr "Incapaz de obter a mensagem"
 
-#: ../mail/e-mail-reader.c:1900 ../mail/e-mail-reader.c:1957
-#: ../mail/mail-ops.c:1849
+#: ../mail/e-mail-reader.c:2332 ../mail/mail-ops.c:1881
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "A obter a mensagem '%s'"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2467
-#: ../plugins/google-account-setup/google-source.c:304
-#: ../plugins/google-account-setup/google-source.c:534
-#: ../plugins/google-account-setup/google-source.c:656
-#: ../widgets/misc/e-account-tree-view.c:234
+#: ../mail/e-mail-reader.c:2896 ../mail/mail-config.ui.h:29
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:537
+#: ../plugins/google-account-setup/google-source.c:659
+#: ../widgets/misc/e-account-tree-view.c:240
 msgid "Default"
 msgstr "Por OmissÃ£o"
 
-#: ../mail/e-mail-reader.c:2588
-#: ../modules/mail/e-mail-attachment-handler.c:134
+#: ../mail/e-mail-reader.c:3044
+#: ../modules/mail/e-mail-attachment-handler.c:144
 msgid "_Forward"
 msgstr "R_eencaminhar"
 
-#: ../mail/e-mail-reader.c:2589
+#: ../mail/e-mail-reader.c:3045
 msgid "Forward the selected message to someone"
 msgstr "Reencaminhar a mensagem seleccionada para alguÃ©m"
 
-#: ../mail/e-mail-reader.c:2633 ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:753
+#: ../mail/e-mail-reader.c:3064
+msgid "Group Reply"
+msgstr "Responder ao Grupo"
+
+#: ../mail/e-mail-reader.c:3065
+msgid "Reply to the mailing list, or to all recipients"
+msgstr "Responder para a lista de distribuiÃ§Ã£o ou para todos os destinatÃ¡rios"
+
+#: ../mail/e-mail-reader.c:3110 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:743
 msgid "Delete"
 msgstr "Apagar"
 
-#: ../mail/e-mail-reader.c:2637
-#: ../modules/calendar/e-cal-shell-view-actions.c:1251
-#: ../widgets/misc/e-calendar.c:193
+#: ../mail/e-mail-reader.c:3143
+#: ../modules/calendar/e-cal-shell-view-actions.c:1305
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "Seguinte"
 
-#: ../mail/e-mail-reader.c:2641
-#: ../modules/calendar/e-cal-shell-view-actions.c:1244
-#: ../widgets/misc/e-calendar.c:169
+#: ../mail/e-mail-reader.c:3147
+#: ../modules/calendar/e-cal-shell-view-actions.c:1298
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../mail/e-mail-reader.c:2645 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:3157 ../mail/mail-dialogs.ui.h:19
 msgid "Reply"
 msgstr "Responder"
 
+#: ../mail/e-mail-reader.c:3725
+#, c-format
+msgid "Folder '%s'"
+msgstr "Pasta '%s'"
+
 #: ../mail/e-mail-tag-editor.c:292
 msgid "Flag to Follow Up"
 msgstr "Marcar para Dar Seguimento"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:72
-#: ../modules/addressbook/ldap-config.ui.h:10
+#: ../mail/em-account-editor.c:510 ../mail/mail-config.ui.h:67
+#: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "Sem encriptaÃ§Ã£o"
 
 #. 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:503 ../mail/mail-config.ui.h:120
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../mail/em-account-editor.c:514 ../mail/mail-config.ui.h:121
+#: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "EncriptaÃ§Ã£o TLS"
 
 #. 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:507 ../mail/mail-config.ui.h:93
-#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../mail/em-account-editor.c:518 ../mail/mail-config.ui.h:89
+#: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "EncriptaÃ§Ã£o SSL"
 
-#: ../mail/em-account-editor.c:594
+#: ../mail/em-account-editor.c:605
 #, c-format
 msgid "%s License Agreement"
 msgstr "Acordo de LicenÃ§a de %s"
 
-#: ../mail/em-account-editor.c:601
+#: ../mail/em-account-editor.c:612
 #, c-format
 msgid ""
 "\n"
@@ -10357,34 +10188,34 @@ msgstr ""
 "e marque a caixa de selecÃ§Ã£o para a aceitar\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:881 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:899 ../widgets/misc/e-signature-combo-box.c:79
 msgctxt "mail-signature"
 msgid "None"
 msgstr "Nenhuma"
 
-#: ../mail/em-account-editor.c:965
+#: ../mail/em-account-editor.c:983
 msgid "Never"
 msgstr "Nunca"
 
-#: ../mail/em-account-editor.c:966
+#: ../mail/em-account-editor.c:984
 msgid "Always"
 msgstr "Sempre"
 
-#: ../mail/em-account-editor.c:967
+#: ../mail/em-account-editor.c:985
 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:1704 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1768 ../widgets/misc/e-account-tree-view.c:128
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "Nenhuma"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2143
 msgid "Mail Configuration"
 msgstr "ConfiguraÃ§Ã£o de Email"
 
-#: ../mail/em-account-editor.c:2062
+#: ../mail/em-account-editor.c:2144
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10394,7 +10225,7 @@ msgstr ""
 "\n"
 "Prima \"AvanÃ§ar\" para comeÃ§ar."
 
-#: ../mail/em-account-editor.c:2065
+#: ../mail/em-account-editor.c:2147
 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 "
@@ -10404,20 +10235,19 @@ msgstr ""
 "abaixo nÃ£o tÃªm de ser preenchidos, excepto se desejar incluir essa "
 "informaÃ§Ã£o nas mensagens que enviar."
 
-#: ../mail/em-account-editor.c:2067 ../mail/em-account-editor.c:2233
-#: ../mail/mail-config.ui.h:90
+#: ../mail/em-account-editor.c:2149 ../mail/em-account-editor.c:2311
 msgid "Receiving Email"
 msgstr "A Receber Mensagens"
 
-#: ../mail/em-account-editor.c:2068
+#: ../mail/em-account-editor.c:2150
 msgid "Please configure the following account settings."
 msgstr "Configure as seguintes definiÃ§Ãµes de conta."
 
-#: ../mail/em-account-editor.c:2070 ../mail/em-account-editor.c:2710
+#: ../mail/em-account-editor.c:2152 ../mail/em-account-editor.c:2799
 msgid "Sending Email"
 msgstr "A Enviar Mensagens"
 
-#: ../mail/em-account-editor.c:2071
+#: ../mail/em-account-editor.c:2153
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10426,11 +10256,11 @@ msgstr ""
 "certeza, pergunte ao seu administrador de sistemas ou Fornecedor de ServiÃ§o "
 "de Internet."
 
-#: ../mail/em-account-editor.c:2073
+#: ../mail/em-account-editor.c:2155
 msgid "Account Management"
 msgstr "GestÃ£o de Contas"
 
-#: ../mail/em-account-editor.c:2074
+#: ../mail/em-account-editor.c:2156
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10438,11 +10268,11 @@ msgstr ""
 "Introduza no espaÃ§o abaixo um nome descritivo para esta conta.\n"
 "Este nome serÃ¡ utilizado apenas para apresentaÃ§Ã£o."
 
-#: ../mail/em-account-editor.c:2078
+#: ../mail/em-account-editor.c:2160
 msgid "Done"
 msgstr "Terminado"
 
-#: ../mail/em-account-editor.c:2079
+#: ../mail/em-account-editor.c:2161
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10456,56 +10286,52 @@ msgstr ""
 "\n"
 "Prima \"Aplicar\" para gravar as suas configuraÃ§Ãµes."
 
-#: ../mail/em-account-editor.c:2520
+#: ../mail/em-account-editor.c:2613
 msgid "Check for _new messages every"
 msgstr "Verificar se existem _novas mensagens a cada"
 
-#: ../mail/em-account-editor.c:2528
+#: ../mail/em-account-editor.c:2621
 msgid "minu_tes"
 msgstr "minu_tos"
 
-#: ../mail/em-account-editor.c:2836 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2903
+msgid "Please select a folder from the current account."
+msgstr "Seleccione uma pasta da conta actual."
+
+#: ../mail/em-account-editor.c:3183 ../mail/mail-config.ui.h:96
 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:2881 ../mail/em-account-editor.c:2949
+#: ../mail/em-account-editor.c:3228 ../mail/em-account-editor.c:3296
 msgid "Receiving Options"
 msgstr "OpÃ§Ãµes de RecepÃ§Ã£o"
 
-#: ../mail/em-account-editor.c:2882 ../mail/em-account-editor.c:2950
+#: ../mail/em-account-editor.c:3229 ../mail/em-account-editor.c:3297
 msgid "Checking for New Messages"
 msgstr "A Verificar a ExistÃªncia de Novas Mensagens"
 
-#: ../mail/em-account-editor.c:3418
-msgid "Account Editor"
-msgstr "Editor de Contas"
-
-#: ../mail/em-account-editor.c:3418
-msgid "Evolution Account Assistant"
-msgstr "Assistente de Contas Evolution"
-
 #. 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:1578
+#: ../mail/em-composer-utils.c:1729
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "A sua mensagem enviada a %s sobre \"%s\", a %s, foi lida."
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1626
+#: ../mail/em-composer-utils.c:1777
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "NotificaÃ§Ã£o de Entrega para: \"%s\""
 
-#: ../mail/em-composer-utils.c:1950
+#: ../mail/em-composer-utils.c:2186
 msgid "an unknown sender"
 msgstr "um remetente desconhecido"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1997
+#: ../mail/em-composer-utils.c:2233
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10513,19 +10339,19 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Year}-${Month}-${Day} Ã s ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escreveu:"
 
-#: ../mail/em-composer-utils.c:2141
+#: ../mail/em-composer-utils.c:2377
 msgid "-----Original Message-----"
 msgstr "----- Mensagem Original-----"
 
-#: ../mail/em-composer-utils.c:2322
+#: ../mail/em-composer-utils.c:2589
 msgid "Posting destination"
 msgstr "Destino da afixagem"
 
-#: ../mail/em-composer-utils.c:2323
+#: ../mail/em-composer-utils.c:2590
 msgid "Choose folders to post the message to."
 msgstr "Seleccione as pastas onde anexar a mensagem."
 
-#: ../mail/em-filter-folder-element.c:258
+#: ../mail/em-filter-folder-element.c:260
 msgid "Select Folder"
 msgstr "Seleccionar Pasta"
 
@@ -10542,10 +10368,18 @@ msgstr "Atribuir uma Cor"
 msgid "Assign Score"
 msgstr "Atribuir uma PontuaÃ§Ã£o"
 
+#: ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "BCC"
+
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "Beep"
 
+#: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "CC"
+
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "Terminada A"
@@ -10606,6 +10440,10 @@ msgstr "Seguimento"
 msgid "Forward to"
 msgstr "Reencaminhar para"
 
+#: ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "Importante"
+
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "Ã© posterior a"
@@ -10630,7 +10468,7 @@ msgstr "nÃ£o estÃ¡ definida"
 msgid "is set"
 msgstr "estÃ¡ definida"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:58
 msgid "Junk"
 msgstr "NÃ£o Solicitado"
 
@@ -10679,7 +10517,7 @@ msgid "Play Sound"
 msgstr "Reproduzir o Som"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:18
 msgid "Read"
 msgstr "Ler"
 
@@ -10760,16 +10598,16 @@ msgid "Unset Status"
 msgstr "Retirar o Estado"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:530
+#: ../mail/em-filter-rule.c:533
 msgid "Then"
 msgstr "Depois"
 
-#: ../mail/em-filter-rule.c:561
+#: ../mail/em-filter-rule.c:564
 msgid "Add Ac_tion"
 msgstr "Adicio_nar AcÃ§Ã£o"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:174
+#: ../mail/em-folder-properties.c:126
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Mensagens por ler:"
@@ -10777,24 +10615,23 @@ msgstr[1] "Mensagens por ler:"
 
 #. 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:178
+#: ../mail/em-folder-properties.c:130
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Total de mensagens:"
 msgstr[1] "Total de mensagens:"
 
-#: ../mail/em-folder-properties.c:196
+#: ../mail/em-folder-properties.c:148
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "UtilizaÃ§Ã£o de quota (%s):"
 
-#: ../mail/em-folder-properties.c:198
+#: ../mail/em-folder-properties.c:150
 #, c-format
 msgid "Quota usage"
 msgstr "UtilizaÃ§Ã£o de quota"
 
-#: ../mail/em-folder-properties.c:399
-#: ../plugins/groupwise-features/properties.ui.h:4
+#: ../mail/em-folder-properties.c:288
 msgid "Folder Properties"
 msgstr "Propriedades da Pasta"
 
@@ -10802,127 +10639,110 @@ msgstr "Propriedades da Pasta"
 msgid "<click here to select a folder>"
 msgstr "<clique aqui para seleccionar uma pasta>"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:264
 msgid "C_reate"
 msgstr "C_riar"
 
-#: ../mail/em-folder-selector.c:270
+#: ../mail/em-folder-selector.c:268
 msgid "Folder _name:"
 msgstr "_Nome da pasta:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:160 ../mail/em-folder-tree-model.c:162
-#: ../mail/em-folder-tree-model.c:169 ../mail/em-folder-tree-model.c:171
-#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
+#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
+#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:167 ../mail/em-folder-tree-model.c:169
+#: ../mail/mail-vfolder.c:1067 ../mail/mail-vfolder.c:1132
 msgid "Search Folders"
 msgstr "Pastas de Procura"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
+#: ../mail/em-folder-tree-model.c:174 ../mail/em-folder-tree-model.c:176
 msgid "UNMATCHED"
 msgstr "SEMEQUIVALÃ?NCIA"
 
-#: ../mail/em-folder-tree-model.c:748 ../mail/em-folder-tree-model.c:1085
+#: ../mail/em-folder-tree-model.c:766 ../mail/em-folder-tree-model.c:1113
 msgid "Loading..."
 msgstr "A Ler..."
 
-#: ../mail/em-folder-tree.c:188
+#: ../mail/em-folder-tree.c:193
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "A analisar as pastas em \"%s\""
 
-#: ../mail/em-folder-tree.c:601
+#: ../mail/em-folder-tree.c:613
 msgid "Folder names cannot contain '/'"
 msgstr "Nomes de pastas nÃ£o podem conter '/'"
 
-#. Translators: This is the string used for displaying the
-#. * folder names in folder trees. The first "%s" will be
-#. * replaced by the folder's name and "%u" will be replaced
-#. * with the number of unread messages in the folder. The
-#. * second %s will be replaced with a "+" letter for collapsed
-#. * folders with unread messages in some subfolder too,
-#. * or with an empty string for other cases.
-#. *
-#. * Most languages should translate this as "%s (%u%s)". The
-#. * languages that use localized digits (like Persian) may
-#. * need to replace "%u" with "%Iu". Right-to-left languages
-#. * (like Arabic and Hebrew) may need to add bidirectional
-#. * formatting codes to take care of the cases the folder
-#. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
-#.
-#: ../mail/em-folder-tree.c:1083
+#: ../mail/em-folder-tree.c:1102
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1289
+#: ../mail/em-folder-tree.c:1341
 msgid "Mail Folder Tree"
 msgstr "Ã?rvore de Pastas de Mensagens"
 
-#: ../mail/em-folder-tree.c:1489 ../mail/em-folder-utils.c:99
+#: ../mail/em-folder-tree.c:1658 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Moving folder %s"
 msgstr "A mover a pasta %s"
 
-#: ../mail/em-folder-tree.c:1491 ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-tree.c:1662 ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
 msgstr "A copiar a pasta %s"
 
-#: ../mail/em-folder-tree.c:1498 ../mail/message-list.c:2103
+#: ../mail/em-folder-tree.c:1671 ../mail/message-list.c:2166
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "A mover as mensagens para a pasta %s"
 
-#: ../mail/em-folder-tree.c:1500 ../mail/message-list.c:2105
+#: ../mail/em-folder-tree.c:1675 ../mail/message-list.c:2168
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "A copiar as mensagens para a pasta %s"
 
-#: ../mail/em-folder-tree.c:1515
+#: ../mail/em-folder-tree.c:1692
+#, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 "Incapaz de largar a(s) mensagem(ns) para o nÃvel de topo do armazenamento"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:403
 msgid "Move Folder To"
 msgstr "Mover a Pasta Para"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:403
 msgid "Copy Folder To"
 msgstr "Copiar a Pasta Para"
 
-#: ../mail/em-folder-utils.c:507
-#: ../plugins/groupwise-features/share-folder-common.c:141
+#: ../mail/em-folder-utils.c:533
+#: ../plugins/groupwise-features/share-folder-common.c:137
 #, c-format
-msgid "Creating folder `%s'"
-msgstr "A criar a pasta `%s'"
+msgid "Creating folder '%s'"
+msgstr "A criar a pasta '%s'"
 
-#: ../mail/em-folder-utils.c:670
+#: ../mail/em-folder-utils.c:693
 msgid "Create Folder"
 msgstr "Criar uma Pasta"
 
-#: ../mail/em-folder-utils.c:671
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../mail/em-folder-utils.c:694
+#: ../plugins/groupwise-features/install-shared.c:165
+#: ../plugins/groupwise-features/share-folder-common.c:342
 msgid "Specify where to create the folder:"
 msgstr "Especificar onde criar a pasta:"
 
-#: ../mail/em-folder-utils.c:687
+#: ../mail/em-folder-utils.c:714
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Remover a subscriÃ§Ã£o da pasta \"%s\""
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1535
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1576
 msgid "Unsigned"
 msgstr "NÃ£o assinada"
 
-#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -10930,11 +10750,11 @@ msgstr ""
 "Esta mensagem nÃ£o estÃ¡ assinada. NÃ£o existe nenhuma garantia de que seja "
 "autÃªntica."
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1536
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1577
 msgid "Valid signature"
 msgstr "Assinatura vÃ¡lida"
 
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -10942,11 +10762,11 @@ msgstr ""
 "Esta mensagem estÃ¡ assinada e Ã© vÃ¡lida o que significa que muito "
 "provavelmente Ã© autÃªntica."
 
-#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1537
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1578
 msgid "Invalid signature"
 msgstr "Assinatura invÃ¡lida"
 
-#: ../mail/em-format-html-display.c:105
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -10954,11 +10774,11 @@ msgstr ""
 "A assinatura nesta mensagem nÃ£o pode ser verificada, o que significa que "
 "pode ter sido alterada durante o percurso."
 
-#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1538
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1579
 msgid "Valid signature, but cannot verify sender"
 msgstr "Assinatura vÃ¡lida, mas incapaz de verificar o remetente"
 
-#: ../mail/em-format-html-display.c:106
+#: ../mail/em-format-html-display.c:93
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -10966,11 +10786,11 @@ msgstr ""
 "Esta mensagem estÃ¡ assinada com uma assinatura vÃ¡lida mas nÃ£o Ã© possÃvel "
 "verificar o remetente da mesma."
 
-#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1539
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1580
 msgid "Signature exists, but need public key"
 msgstr "Assinatura existe, mas Ã© necessÃ¡ria a chave pÃºblica"
 
-#: ../mail/em-format-html-display.c:107
+#: ../mail/em-format-html-display.c:94
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -10978,11 +10798,11 @@ msgstr ""
 "Esta mensagem estÃ¡ assinada com uma assinatura, mas nÃ£o existe uma chave "
 "pÃºblica correspondente."
 
-#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1545
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1586
 msgid "Unencrypted"
 msgstr "Sem encriptaÃ§Ã£o"
 
-#: ../mail/em-format-html-display.c:114
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -10990,11 +10810,11 @@ msgstr ""
 "Esta mensagem nÃ£o estÃ¡ encriptada. O seu conteÃºdo pode ser visualizado "
 "durante o seu percurso pela Internet."
 
-#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1546
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1587
 msgid "Encrypted, weak"
 msgstr "Encriptada com cifra fraca"
 
-#: ../mail/em-format-html-display.c:115
+#: ../mail/em-format-html-display.c:102
 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 "
@@ -11004,11 +10824,11 @@ msgstr ""
 "Seria difÃcil, mas nÃ£o impossÃvel, que um terceiro conseguisse visualizar o "
 "conteÃºdo da mensagem dentro de um perÃodo de tempo Ãºtil."
 
-#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1547
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1588
 msgid "Encrypted"
 msgstr "Encriptada"
 
-#: ../mail/em-format-html-display.c:116
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11016,11 +10836,11 @@ msgstr ""
 "Esta mensagem estÃ¡ encriptada.  Seria difÃcil que um terceiro conseguisse "
 "visualizar o seu conteÃºdo."
 
-#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1548
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1589
 msgid "Encrypted, strong"
 msgstr "Encriptada com cifra forte"
 
-#: ../mail/em-format-html-display.c:117
+#: ../mail/em-format-html-display.c:104
 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 "
@@ -11030,15 +10850,15 @@ msgstr ""
 "muito difÃcil que um terceiro conseguisse visualizar o seu conteÃºdo dentro "
 "de um perÃodo de tempo Ãºtil."
 
-#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "_Visualizar o Certificado"
 
-#: ../mail/em-format-html-display.c:261
+#: ../mail/em-format-html-display.c:248
 msgid "This certificate is not viewable"
 msgstr "Este certificado nÃ£o Ã© visualizÃ¡vel"
 
-#: ../mail/em-format-html-display.c:509
+#: ../mail/em-format-html-display.c:497
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -11047,117 +10867,137 @@ msgstr ""
 "ser processado. PoderÃ¡ vÃª-lo sem formataÃ§Ã£o ou atravÃ©s de um editor de texto "
 "externo."
 
-#: ../mail/em-format-html-display.c:738
+#: ../mail/em-format-html-display.c:725
 msgid "Completed on"
 msgstr "Terminada a"
 
-#: ../mail/em-format-html-display.c:746
+#: ../mail/em-format-html-display.c:733
 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:750
+#: ../mail/em-format-html-display.c:737
 msgid "by"
 msgstr "atÃ©"
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html-display.c:1001
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html-display.c:996
 msgid "View _Unformatted"
 msgstr "Ver Sem _FormataÃ§Ã£o"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:951
 msgid "Hide _Unformatted"
 msgstr "Esconder Sem _FormataÃ§Ã£o"
 
-#: ../mail/em-format-html-display.c:1021
+#: ../mail/em-format-html-display.c:1016
 msgid "O_pen With"
 msgstr "A_brir Com"
 
-#: ../mail/em-format-html-print.c:163
+#: ../mail/em-format-html-print.c:176
 #, c-format
 msgid "Page %d of %d"
 msgstr "PÃ¡gina %d de %d"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:153
 msgid "Formatting message"
 msgstr "A formatar a mensagem"
 
-#: ../mail/em-format-html.c:356
+#: ../mail/em-format-html.c:352
 msgid "Formatting Message..."
 msgstr "A Formatar a Mensagem..."
 
-#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
+#: ../mail/em-format-html.c:1421 ../mail/em-format-html.c:1430
 #, c-format
-msgid "Retrieving `%s'"
-msgstr "A obter `%s'"
+msgid "Retrieving '%s'"
+msgstr "A obter '%s'"
 
-#: ../mail/em-format-html.c:1854
+#: ../mail/em-format-html.c:1901
 msgid "Unknown external-body part."
 msgstr "Parte do corpo-externo desconhecida."
 
-#: ../mail/em-format-html.c:1862
+#: ../mail/em-format-html.c:1909
 msgid "Malformed external-body part."
 msgstr "Parte do corpo-externo mal formada."
 
-#: ../mail/em-format-html.c:1892
+#: ../mail/em-format-html.c:1939
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Ponteiro para o servidor FTP (%s)"
 
-#: ../mail/em-format-html.c:1903
+#: ../mail/em-format-html.c:1950
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Ponteiro para o ficheiro local (%s) vÃ¡lido no servidor \"%s\""
 
-#: ../mail/em-format-html.c:1905
+#: ../mail/em-format-html.c:1952
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Ponteiro para o ficheiro local (%s)"
 
-#: ../mail/em-format-html.c:1926
+#: ../mail/em-format-html.c:1973
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Ponteiro para dados remotos (%s)"
 
-#: ../mail/em-format-html.c:1937
+#: ../mail/em-format-html.c:1984
 #, 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:2628
+#: ../mail/em-format-html.c:2647
 #, c-format
-msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
-msgstr "Esta mensagem foi enviada por <b>%s</b> em nome de <b>%s</b>"
+msgid "This message was sent by %s on behalf of %s"
+msgstr "Esta mensagem foi enviada por %s em nome de %s"
 
-#: ../mail/em-subscribe-editor.c:586
+#: ../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 "Nenhum fluxo HTML disponÃvel"
+
+#: ../mail/em-subscribe-editor.c:677
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Este armazenamento nÃ£o suporta subscriÃ§Ãµes ou estas nÃ£o estÃ£o activas."
 
-#: ../mail/em-subscribe-editor.c:619
+#: ../mail/em-subscribe-editor.c:728
 msgid "Subscribed"
 msgstr "Subscrito"
 
-#: ../mail/em-subscribe-editor.c:623
+#: ../mail/em-subscribe-editor.c:732
 msgid "Folder"
 msgstr "Pasta"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:1120
 msgid "Please select a server."
 msgstr "Seleccione um servidor."
 
-#: ../mail/em-subscribe-editor.c:871
+#: ../mail/em-subscribe-editor.c:1166
 msgid "No server has been selected"
 msgstr "NÃ£o seleccionou nenhum servidor"
 
-#: ../mail/em-utils.c:310
+#. Translators: This message is shown only for ten or more
+#. * 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:106
+#, 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] "Tem a certeza de que deseja abrir %d mensagem simultaneamente?"
+msgstr[1] "Tem a certeza de que deseja abrir %d mensagens simultaneamente?"
+
+#: ../mail/em-utils.c:152
+#: ../modules/mailto-handler/evolution-mailto-handler.c:148
+msgid "_Do not show this message again"
+msgstr "_NÃ£o apresentar esta mensagem novamente"
+
+#: ../mail/em-utils.c:314
 msgid "Message Filters"
 msgstr "Filtros de Mensagens"
 
-#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:814
+#: ../mail/em-utils.c:848
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensagens de %s"
@@ -11166,7 +11006,7 @@ msgstr "Mensagens de %s"
 msgid "Search _Folders"
 msgstr "_Pastas de Procura"
 
-#: ../mail/em-vfolder-rule.c:522
+#: ../mail/em-vfolder-rule.c:525
 msgid "Add Folder"
 msgstr "Adicionar uma Pasta"
 
@@ -11207,50 +11047,46 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "Largura da janela \"Enviar e Receber Mensagens\""
 
 #: ../mail/evolution-mail.schemas.in.h:10
-msgid "Allows Evolution to display text part of limited size"
-msgstr "Permite ao Evolution apresentar parte de tamanho limitado do texto"
-
-#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Always request read receipt"
 msgstr "Pedir sempre um recibo de leitura"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Automatic emoticon recognition"
 msgstr "Reconhecimento automÃ¡tico de risonhos"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic link recognition"
 msgstr "Reconhecimento automÃ¡tico de links"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Check incoming mail being junk"
 msgstr "Verificar se mensagens recebidas sÃ£o nÃ£o solicitadas"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Citation highlight color"
 msgstr "Cor de realce de citaÃ§Ã£o"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color."
 msgstr "Cor de realce de citaÃ§Ã£o."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Composer Window default height"
 msgstr "Altura por omissÃ£o da Janela de ComposiÃ§Ã£o"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default width"
 msgstr "Largura por omissÃ£o da Janela de ComposiÃ§Ã£o"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer load/attach directory"
 msgstr "DirectÃ³rio de onde o compositor deverÃ¡ ler/anexar"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Comprimir a apresentaÃ§Ã£o dos endereÃ§os em Para/Cc/Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -11258,7 +11094,7 @@ msgstr ""
 "Comprimir a apresentaÃ§Ã£o dos endereÃ§os em Para/Cc/Bcc atÃ© ao nÃºmero "
 "especificado em address_count."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -11266,12 +11102,12 @@ msgstr ""
 "Controla quÃ£o frequentemente as alteraÃ§Ãµes locais sÃ£o sincronizadas com o "
 "servidor de correio. O intervalo tem de ser pelo menos de 30 segundos."
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Custom headers to use while checking for junk."
 msgstr ""
 "CabeÃ§alhos personalizados a utilizar ao verificar por correio nÃ£o solicitado."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -11280,63 +11116,63 @@ msgstr ""
 "solicitado. Os elementos da lista sÃ£o expressÃµes no formato "
 "\"nomedecabeÃ§alho=valor\"."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default charset in which to compose messages"
 msgstr "Conjunto de caracteres por omissÃ£o com que compor as mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages."
 msgstr "Conjunto de caracteres por omissÃ£o com que compor as mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to display messages"
 msgstr "Conjunto de caracteres por omissÃ£o em que apresentar as mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages."
 msgstr "Conjunto de caracteres por omissÃ£o em que apresentar as mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default forward style"
 msgstr "Estilo de reencaminhamento por omissÃ£o"
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default height of the Composer Window."
 msgstr "Altura por omissÃ£o da Janela de ComposiÃ§Ã£o."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default height of the mail browser window."
 msgstr "Altura por omissÃ£o da janela de navegaÃ§Ã£o de mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default height of the subscribe dialog."
 msgstr "Altura por omissÃ£o do diÃ¡logo de subscriÃ§Ã£o."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default maximized state of the mail browser window."
 msgstr "Estado de maximizaÃ§Ã£o por omissÃ£o da janela de navegaÃ§Ã£o de mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default reply style"
 msgstr "Estilo por omissÃ£o de resposta"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default value for thread expand state"
 msgstr "Valor por omissÃ£o para o estado de expansÃ£o de Ã¡rvores"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default width of the Composer Window."
 msgstr "Largura por omissÃ£o da Janela de ComposiÃ§Ã£o."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default width of the mail browser window."
 msgstr "Largura por omissÃ£o da janela de navegaÃ§Ã£o de mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default width of the subscribe dialog."
 msgstr "Largura por omissÃ£o do diÃ¡logo de subscriÃ§Ã£o."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -11344,12 +11180,12 @@ msgstr ""
 "Determina se procurar ou nÃ£o apenas no livro de endereÃ§os local por "
 "endereÃ§os, ao filtrar por correio nÃ£o solicitado"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 "Determina se procurar ou nÃ£o no livro de endereÃ§os o email do remetente"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:41
 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 "
@@ -11362,13 +11198,13 @@ msgstr ""
 "marcados livros de endereÃ§os remotos (como LDAP) para completar "
 "automaticamente."
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Determina se utilizar ou nÃ£o cabeÃ§alhos personalizados para procurar por "
 "correio nÃ£o solicitado"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:43
 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 "
@@ -11379,7 +11215,7 @@ msgstr ""
 "mencionados, irÃ¡ melhorar a velocidade de verificaÃ§Ã£o por correio nÃ£o "
 "solicitado."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -11387,19 +11223,24 @@ msgstr ""
 "Determina se utilizar ou nÃ£o as mesmas fontes para ambas as linhas \"De\" e "
 "\"Assunto\" na coluna \"Mensagens\" na vista vertical."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Directory for loading/attaching files to composer."
 msgstr "DirectÃ³rio de onde ler/anexar ficheiros no compositor."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for saving mail component files."
 msgstr "DirectÃ³rio onde gravar ficheiros componentes do email."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr ""
 "Desactivar ou activar as reticÃªncias nos nomes das pastas na barra lateral"
 
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid "Display only message texts not exceeding certain size"
+msgstr ""
+"Apresentar apenas o texto de mensagens que nÃ£o excedam um determinado tamanho"
+
 #: ../mail/evolution-mail.schemas.in.h:49
 msgid "Do not add signature delimiter"
 msgstr "NÃ£o adicionar o delimitador de assinatura"
@@ -11477,19 +11318,34 @@ msgstr ""
 "de mensagem, lista de mensagens e pastas."
 
 #: ../mail/evolution-mail.schemas.in.h:64
-msgid "Enable to render message text part of limited size."
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
 msgstr ""
-"Activar para apresentar uma parte com tamanho limitado do texto da mensagem."
+"Activar para apresentar textos de mensagens sem exceder o tamanho definido "
+"na chave 'message_text_part_limit'."
 
 #: ../mail/evolution-mail.schemas.in.h:65
+msgid "Enable to use a similar message list view settings for all folders"
+msgstr ""
+"Activar para utilizar definiÃ§Ãµes de vista de lista de mensagens semelhantes "
+"para todas as pastas"
+
+#: ../mail/evolution-mail.schemas.in.h:66
+msgid "Enable to use a similar message list view settings for all folders."
+msgstr ""
+"Activar para utilizar definiÃ§Ãµes semelhantes de vista de lista de mensagens "
+"para todas as pastas."
+
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Enable/disable caret mode"
 msgstr "Activar/desactivar o modo de cursor"
 
-#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
+#: ../mail/evolution-mail.schemas.in.h:68 ../mail/mail-config.ui.h:42
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Codificar os nomes de ficheiros na forma Outlook/GMail"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:69
 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, "
@@ -11501,19 +11357,27 @@ msgstr ""
 "ficheiros com caracteres UTF-8 enviados pelo Evolution, visto eles nÃ£o "
 "seguirem o RFC 2231 mas implementarem o incorrecto padrÃ£o RFC 2047."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:70
+msgid "Flush Outbox after filtering"
+msgstr "Esvaziar a Caixa de SaÃda apÃ³s filtrar"
+
+#: ../mail/evolution-mail.schemas.in.h:71
+msgid "Group Reply replies to list"
+msgstr "Responder ao Grupo responde para a lista"
+
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Height of the message-list pane"
 msgstr "Altura do painel de lista de mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Height of the message-list pane."
 msgstr "Altura do painel de lista de mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Esconde a antevisÃ£o por-pasta e remove a selecÃ§Ã£o"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -11521,7 +11385,7 @@ msgstr ""
 "Se um utilizador tentar abrir 10 ou mais mensagens de uma vez, perguntar se "
 "ele o deseja mesmo fazer."
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:76
 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 "
@@ -11532,7 +11396,11 @@ msgstr ""
 "componente Bonobo de visualizaÃ§Ã£o na base de dados de tipos MIME do GNOME "
 "serÃ£o apresentados por esse componente."
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:77
+msgid "Ignore list Reply-To:"
+msgstr "Ignorar o Responder-A: da lista"
+
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
@@ -11540,7 +11408,7 @@ msgstr ""
 "A altura inicial da janela de \"Editor de Filtro\". O valor Ã© actualizado "
 "quando o utilizador redimensiona verticalmente a janela."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
@@ -11548,7 +11416,7 @@ msgstr ""
 "A altura inicial da janela de \"Editor de Pasta de Procura\". O valor Ã© "
 "actualizado quando o utilizador redimensiona verticalmente a janela."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -11556,7 +11424,7 @@ msgstr ""
 "A altura inicial da janela de \"Enviar e Receber Mensagens\". O valor Ã© "
 "actualizado quando o utilizador redimensiona verticalmente a janela."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
@@ -11569,7 +11437,7 @@ msgstr ""
 "\"Editor de Filtro\" nÃ£o pode ser maximizada. Esta chave existe apenas como "
 "um detalhe de implementaÃ§Ã£o."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11582,7 +11450,7 @@ msgstr ""
 "\"Editor de Pasta de Procura\" nÃ£o pode ser maximizada. Esta chave existe "
 "apenas como um detalhe de implementaÃ§Ã£o."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11596,7 +11464,7 @@ msgstr ""
 "\"Enviar e Receber Mensagens\" nÃ£o pode ser maximizada. Esta chave existe "
 "apenas como um detalhe de implementaÃ§Ã£o."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
@@ -11604,7 +11472,7 @@ msgstr ""
 "A largura inicial da janela de \"Editor de Filtro\". O valor Ã© actualizado "
 "quando o utilizador redimensiona horizontalmente a janela."
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -11612,7 +11480,7 @@ msgstr ""
 "A largura inicial da janela de \"Editor de Pasta de Procura\". O valor Ã© "
 "actualizado quando o utilizador redimensiona horizontalmente a janela."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -11620,7 +11488,19 @@ msgstr ""
 "A largura inicial da janela de \"Enviar e Receber Mensagens\". O valor Ã© "
 "actualizado quando o utilizador redimensiona horizontalmente a janela."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:87
+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 "
+"which you happened to receive the copy of the message to which you're "
+"replying."
+msgstr ""
+"Em vez do comportamento normal do \"Responder a Todos\", esta opÃ§Ã£o irÃ¡ "
+"fazer o botÃ£o da barra de ferramentas 'Responder ao Grupo' responder apenas "
+"para a lista de distribuiÃ§Ã£o atravÃ©s da qual foi recebida a cÃ³pia da "
+"mensagem Ã  qual estÃ¡ a responder."
+
+#: ../mail/evolution-mail.schemas.in.h:88
 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 "
@@ -11630,36 +11510,63 @@ msgstr ""
 "de procura as apaga permanentemente, nÃ£o as remove apenas dos resultados da "
 "procura."
 
-#: ../mail/evolution-mail.schemas.in.h:83
-msgid "Last time empty junk was run"
-msgstr "A Ãºltima vez em que foi esvaziada a pasta de correio NÃ£o Solicitado"
+#: ../mail/evolution-mail.schemas.in.h:89
+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."
+msgstr ""
+"Desactiva/activa os avisos consecutivos de que estÃ¡ a enviar uma resposta em "
+"privado a uma mensagem que recebeu atravÃ©s de uma lista de distribuiÃ§Ã£o."
 
-#: ../mail/evolution-mail.schemas.in.h:84
-msgid "Last time empty trash was run"
-msgstr "A Ãºltima vez em que foi esvaziado o lixo"
+#: ../mail/evolution-mail.schemas.in.h:90
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"reply to many people."
+msgstr ""
+"Desactiva/activa os avisos consecutivos de que estÃ¡ a enviar uma resposta "
+"para vÃ¡rias pessoas."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:91
+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 "
+"sets a Reply-To: header which redirects your reply back to the list"
+msgstr ""
+"Desactiva/activa os avisos consecutivos de que estÃ¡ a enviar uma resposta em "
+"privado a uma mensagem que recebeu atravÃ©s de uma lista de distribuiÃ§Ã£o mas "
+"a lista define um cabeÃ§alho Responder-A: que redirecciona a resposta de "
+"volta para a lista"
+
+#: ../mail/evolution-mail.schemas.in.h:92
+msgid "Last time Empty Junk was run"
+msgstr "A Ãºltima vez em que foi executado Esvaziar Correio NÃ£o Solicitado"
+
+#: ../mail/evolution-mail.schemas.in.h:93
+msgid "Last time Empty Trash was run"
+msgstr "A Ãºltima vez em que foi executado Esvaziar o Lixo"
+
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Layout style"
 msgstr "Estilo da disposiÃ§Ã£o"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "List of Labels and their associated colors"
 msgstr "Lista de Etiquetas e as suas cores associadas"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr ""
 "Lista de tipos MIME para os quais procurar componentes Bonobo de visualizaÃ§Ã£o"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "List of accepted licenses"
 msgstr "Lista de licenÃ§as aceites"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "List of accounts"
 msgstr "Lista de contas"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -11668,17 +11575,17 @@ msgstr ""
 "contÃ©m expressÃµes que denominam subdirectÃ³rios relativos a /apps/evolution/"
 "mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista de cabeÃ§alhos personalizados e se estes estÃ£o activos."
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 "Lista de cÃ³digos de dicionÃ¡rios de idiomas utilizados para a verificaÃ§Ã£o "
 "ortogrÃ¡fica."
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:103
 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."
@@ -11687,15 +11594,15 @@ msgstr ""
 "lista contÃ©m expressÃµes do tipo nome:cor em que cor utiliza a codificaÃ§Ã£o "
 "hexadecimal HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lista de nomes de protocolos cuja licenÃ§a foi aceite."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Load images for HTML messages over HTTP"
 msgstr "Ler imagens de mensagens HTML atravÃ©s de HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:106
 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 "
@@ -11705,107 +11612,123 @@ msgstr ""
 "\" - Nunca ler imagens da net. \"1\" - Ler as imagens de mensagens enviadas "
 "por contactos. \"2\" - Ler sempre as imagens da net."
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Log filter actions"
 msgstr "Registar as acÃ§Ãµes do filtro"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Log filter actions to the specified log file."
 msgstr "Registar as acÃ§Ãµes do filtro no ficheiro de registo especificado."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Logfile to log filter actions"
 msgstr "Ficheiro de registo onde registar as acÃ§Ãµes do filtro"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Logfile to log filter actions."
 msgstr "Ficheiro de registo onde registar as acÃ§Ãµes do filtro."
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Mail browser height"
 msgstr "Altura do navegador de mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Mail browser maximized"
 msgstr "Estado de maximizaÃ§Ã£o do navegador de mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Mail browser width"
 msgstr "Largura do navegador de mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Mark as Seen after specified timeout"
 msgstr "Marcar como Lida apÃ³s um perÃodo de tempo especifico"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcar como Lida apÃ³s um perÃodo de tempo especifico."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marcar as citaÃ§Ãµes na \"AntevisÃ£o\" de mensagem"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcar as citaÃ§Ãµes na \"AntevisÃ£o\" de mensagem."
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Message text limit for display"
+msgstr "Limite do texto da mensagem para apresentaÃ§Ã£o"
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Estilo de apresentaÃ§Ã£o de mensagem (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Minimum days between emptying the junk on exit"
 msgstr "NÃºmero mÃnimo de dias antes de esvaziar o NÃ£o Solicitado ao sair"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Minimum days between emptying the trash on exit"
 msgstr "NÃºmero mÃnimo de dias antes de esvaziar o lixo ao sair"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Tempo mÃnimo entre esvaziar o NÃ£o Solicitado ao sair, em dias."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Tempo mÃnimo entre esvaziar o lixo ao sair, em dias."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "NÃºmero de endereÃ§os a apresentar em Para/Cc/Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt on empty subject"
 msgstr "Questionar quando o assunto for vazio"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Questionar o utilizador quando este tentar expurgar uma pasta."
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Questionar o utilizador quando este tentar enviar uma mensagem sem Assunto."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Prompt when deleting messages in search folder"
 msgstr "Avisar ao apagar mensagens na pasta de procura"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Prompt when mailing list hijacks private replies"
+msgstr "Questionar quando a lista de distribuiÃ§Ã£o 'rouba' respostas privadas"
+
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Prompt when replying privately to list messages"
+msgstr "Questionar ao responder em privado a mensagens de listas"
+
+#: ../mail/evolution-mail.schemas.in.h:131
+msgid "Prompt when replying to many recipients"
+msgstr "Questionar ao responder a vÃ¡rios destinatÃ¡rios"
+
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Prompt when user expunges"
 msgstr "Questionar quando o utilizador expurgar"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Prompt when user only fills Bcc"
 msgstr "Questionar quando o utilizador apenas preencher o Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Questionar quando o utilizador tentar abrir 10 ou mais mensagens de uma vez"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -11813,65 +11736,65 @@ msgstr ""
 "Questionar o utilizador quando este tentar enviar mensagens em HTML para "
 "destinatÃ¡rios que poderÃ£o nÃ£o desejar receber mensagens em HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Questionar o utilizador quando este tentar enviar uma mensagem sem indicar "
 "destinatÃ¡rios em Para ou Cc."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Questionar o utilizador quando este tentar enviar HTML indesejado"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Prompt while marking multiple messages"
 msgstr "Questionar ao marcar mÃºltiplas mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Put personalized signatures at the top of replies"
 msgstr "Colocar as assinaturas personalizadas no topo ao responder"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Put the cursor at the bottom of replies"
 msgstr "Colocar o cursor no fundo ao responder"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Reconhecer risonhos no texto e substituÃ-los por imagens."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Recognize links in text and replace them."
 msgstr "Reconhecer links no texto e substituÃ-los."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Run junk test on incoming mail."
 msgstr "Executar teste de nÃ£o solicitado sobre as mensagens recebidas."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Save directory"
 msgstr "Gravar o directÃ³rio"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Search for the sender photo in local address books"
 msgstr "Procurar a foto do remetente no livro de endereÃ§os local"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Send HTML mail by default"
 msgstr "Por omissÃ£o, enviar as mensagens em HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Send HTML mail by default."
 msgstr "Por omissÃ£o, enviar as mensagens em HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Sender email-address column in the message list"
 msgstr "Coluna de email do remetente na lista de mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Server synchronization interval"
 msgstr "Intervalo de sincronizaÃ§Ã£o com o servidor"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -11879,67 +11802,63 @@ msgstr ""
 "Definir como VERDADEIRO caso nÃ£o queira adicionar um delimitador de "
 "assinatura antes da sua assinatura, ao compor uma mensagem."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Apresentar o campo \"Bcc\" ao enviar uma mensagem de email"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Apresentar o campo \"Cc\" ao enviar uma mensagem de email"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Apresentar o campo \"De\" ao afixar uma notÃcia num grupo"
 
-#: ../mail/evolution-mail.schemas.in.h:141
-msgid "Show \"From\" field when sending a mail message"
-msgstr "Apresentar o campo \"De\" ao enviar uma mensagem de email"
-
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "Apresentar o campo \"Responder A\" ao afixar uma notÃcia num grupo"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Apresentar o campo \"Responder A\" ao enviar uma mensagem de email"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Show Animations"
 msgstr "Apresentar as AnimaÃ§Ãµes"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Show all message headers"
 msgstr "Apresentar todos os cabeÃ§alhos da mensagem"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Show all the headers when viewing a messages."
 msgstr "Apresentar todos os cabeÃ§alhos ao visualizar as mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Show animated images as animations."
 msgstr "Apresentar as imagens animadas como animaÃ§Ãµes."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Apresentar as mensagens apagadas (riscadas) na lista de mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Show deleted messages in the message-list"
 msgstr "Apresentar as mensagens apagadas na lista de mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Show image animations"
 msgstr "Apresentar as animaÃ§Ãµes de imagens"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Show original \"Date\" header value."
 msgstr "Apresentar o valor original do cabeÃ§alho \"Data\"."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Show photo of the sender"
 msgstr "Apresentar a foto do remetente"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11947,7 +11866,7 @@ msgstr ""
 "Apresentar o campo \"Bcc\" ao enviar uma mensagem de email. Esta chave Ã© "
 "controlada pelo menu Ver quando Ã© seleccionada uma conta de email."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11955,7 +11874,7 @@ msgstr ""
 "Apresentar o campo \"Cc\" ao enviar uma mensagem de email. Esta chave Ã© "
 "controlada pelo menu Ver quando Ã© seleccionada uma conta de email."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -11963,15 +11882,7 @@ msgstr ""
 "Apresentar o campo \"De\" ao afixar uma notÃcia num grupo. Esta chave Ã© "
 "controlada pelo menu Ver quando Ã© seleccionada uma conta de notÃcias."
 
-#: ../mail/evolution-mail.schemas.in.h:156
-msgid ""
-"Show the \"From\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-msgstr ""
-"Apresentar o campo \"De\" ao enviar uma mensagem de email. Esta chave Ã© "
-"controlada pelo menu Ver quando Ã© seleccionada uma conta de email."
-
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -11979,7 +11890,7 @@ msgstr ""
 "Apresentar o campo \"Responder A\" ao afixar uma notÃcia num grupo. Esta "
 "chave Ã© controlada pelo menu Ver quando Ã© seleccionada uma conta de notÃcias."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -11987,14 +11898,14 @@ msgstr ""
 "Apresentar o campo \"Responder A\" ao enviar uma mensagem de email. Esta "
 "chave Ã© controlada pelo menu Ver quando Ã© seleccionada uma conta de email."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr ""
 "Apresentar o email do remetente numa coluna separada na lista de mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:171
 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 "
@@ -12004,52 +11915,72 @@ msgstr ""
 "diferente). Caso contrÃ¡rio apresentar sempre o valor do cabeÃ§alho \"Data\" "
 "no formato e fuso-horÃ¡rio preferido do utilizador."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Apresentar a foto do remetente no painel de leitura da mensagem."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:173
+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. "
+"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
+"so that Evolution will do as you ask it. If you use the private reply "
+"action, it will reply privately, while if you use the 'Reply to List' action "
+"it will do that. It works by comparing the Reply-To: header with a List-"
+"Post: header, if there is one."
+msgstr ""
+"Algumas listas de distribuiÃ§Ã£o definem um cabeÃ§alho Responder-A: para "
+"induzir os utilizadores a responder para a lista, mesmo quando estes pedem "
+"ao Evolution para enviar uma resposta em privado. Definir esta opÃ§Ã£o como "
+"VERDADEIRA irÃ¡ tentar ignorar tais cabeÃ§alhos Responder-A:, pelo que o "
+"Evolution irÃ¡ fazer o que lhe pedir. Se utilizar a acÃ§Ã£o de responder em "
+"privado, irÃ¡ enviar a mensagem em privado, se utilizar a acÃ§Ã£o 'Responder "
+"para a Lista' irÃ¡ fazÃª-lo. Funciona comparando os cabeÃ§alhos Responder-A: "
+"com o cabeÃ§alho Afixar-Lista:, se existir algum."
+
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Spell check inline"
 msgstr "VerificaÃ§Ã£o ortogrÃ¡fica instantÃ¢nea"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Spell checking color"
 msgstr "Cor da verificaÃ§Ã£o ortogrÃ¡fica"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Spell checking languages"
 msgstr "Idiomas da verificaÃ§Ã£o ortogrÃ¡fica"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Subscribe dialog default height"
 msgstr "Altura por omissÃ£o do diÃ¡logo de subscriÃ§Ã£o"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Subscribe dialog default width"
 msgstr "Largura por omissÃ£o do diÃ¡logo de subscriÃ§Ã£o"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Terminal font"
 msgstr "Fonte de consola"
 
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Text message part limit"
-msgstr "Limite da parte de texto da mensagem"
-
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "The default plugin for Junk hook"
 msgstr "O plugin por omissÃ£o para a ligaÃ§Ã£o ao NÃ£o Solicitado"
 
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid "The last time empty junk was run, in days since the epoch."
+#: ../mail/evolution-mail.schemas.in.h:181
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
-"A Ãºltima vez em que o NÃ£o Solicitado foi esvaziado, em dias desde a epoch."
+"A Ãºltima vez em que a pasta de NÃ£o Solicitado foi esvaziada, em dias desde 1 "
+"de Janeiro de 1970 (Epoch)."
 
-#: ../mail/evolution-mail.schemas.in.h:171
-msgid "The last time empty trash was run, in days since the epoch."
-msgstr "A Ãºltima vez em que o lixo foi esvaziado, em dias desde a epoch."
+#: ../mail/evolution-mail.schemas.in.h:182
+msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+msgstr ""
+"A Ãºltima vez em que o Lixo foi esvaziado, em dias desde 1 de Janeiro de 1970 "
+"(Epoch)."
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:183
 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 "
@@ -12061,15 +11992,15 @@ msgstr ""
 "antevisÃ£o por baixo da lista de mensagens. \"1\" (Vista Vertical) coloca-o "
 "ao lado da lista de mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid "The terminal font for mail display."
 msgstr "A fonte de largura fixa para apresentaÃ§Ã£o de mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "The variable width font for mail display."
 msgstr "A fonte de largura variÃ¡vel para apresentaÃ§Ã£o de mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -12077,15 +12008,17 @@ msgstr ""
 "Esta opÃ§Ã£o pode ter trÃªs valores distintos. \"0\" para erros. \"1\" para "
 "avisos. \"2\" para mensagens de depuraÃ§Ã£o."
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid ""
-"This decides the max size of the text part that can be formatted under "
-"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+"This decides the max size of the message text that will be displayed under "
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
+"is used only when 'force_message_limit' key is activated."
 msgstr ""
-"Decide o tamanho mÃ¡ximo da parte de texto que poder ser formatada no "
-"Evolution. Por omissÃ£o sÃ£o 4MB / 4096 KB e Ã© especificado em termos de KB."
+"Decide o tamanho mÃ¡ximo do texto da mensagem que serÃ¡ apresentada no "
+"Evolution, em KB. Por omissÃ£o sÃ£o 4096 (4MB). Este valor apenas Ã© utilizado "
+"quando a chave 'force_message_limit' estÃ¡ activa."
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -12095,7 +12028,7 @@ msgstr ""
 "vÃ¡rios plugins. Se o plugin listado por omissÃ£o estiver desactivado, nÃ£o irÃ¡ "
 "recorrer aos outros plugins disponÃveis."
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:189
 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."
@@ -12103,7 +12036,7 @@ msgstr ""
 "Esta chave Ã© lida apenas uma vez e reposta a \"false\" apÃ³s ser lida. Remove "
 "a selecÃ§Ã£o do email da lista e remove a antevisÃ£o dessa pasta."
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:190
 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;"
@@ -12115,7 +12048,7 @@ msgstr ""
 "estrutura XML Ã© &lt;header enabled&gt; - definir \"enabled\" para que os "
 "cabeÃ§alhos sejam apresentados na vista de mensagem."
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:191
 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 "
@@ -12126,11 +12059,11 @@ msgstr ""
 "contactos conhecidos da filtragem por correio nÃ£o solicitado deverÃ¡ ou nÃ£o "
 "ser feita apenas no livro de endereÃ§os local."
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "This option would help in improving the speed of fetching."
 msgstr "Esta opÃ§Ã£o tornaria mais rÃ¡pida a obtenÃ§Ã£o de correio."
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -12138,7 +12071,7 @@ msgstr ""
 "Esta opÃ§Ã£o define o nÃºmero de endereÃ§os a apresentar na vista de lista de "
 "mensagens por omissÃ£o, para lÃ¡ do qual Ã© apresentado '...'."
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -12147,7 +12080,7 @@ msgstr ""
 "expandido ou recolhido. O Evolution necessita de ser reiniciado apÃ³s "
 "alteraÃ§Ã£o."
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:195
 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 "
@@ -12157,56 +12090,56 @@ msgstr ""
 "Ãºltima mensagem em cada Ã¡rvore, em vez de por data da mensagem. O Evolution "
 "necessita de ser reiniciado apÃ³s alteraÃ§Ã£o."
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid "Thread the message-list based on Subject"
 msgstr "Apresentar a lista de mensagens em Ã¡rvore por Assunto"
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid "Timeout for marking message as seen"
 msgstr "Tempo de espera para marcar a mensagem como lida"
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "Timeout for marking message as seen."
 msgstr "Tempo de espera para marcar a mensagem como lida."
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid "UID string of the default account."
 msgstr "ExpressÃ£o UID da conta por omissÃ£o."
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
 "Cor para sublinhar palavras incorrectas ao utilizar verificaÃ§Ã£o ortogrÃ¡fica "
 "automÃ¡tica."
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid "Use SpamAssassin daemon and client"
 msgstr "Utilizar o daemon e cliente do SpamAssassin"
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Utilizar o daemon e cliente do SpamAssassin (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "Use custom fonts"
 msgstr "Utilizar fontes personalizadas"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "Use custom fonts for displaying mail."
 msgstr "Utilizar fontes personalizadas para apresentar as mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid "Use only local spam tests."
 msgstr ""
 "Utilizar apenas os testes locais de detecÃ§Ã£o de mensagens nÃ£o solicitadas."
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 "Utilizar apenas os testes locais de detecÃ§Ã£o de mensagens nÃ£o solicitadas "
 "(sem DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:207
 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 "
@@ -12216,7 +12149,7 @@ msgstr ""
 "responder a uma mensagem. Esta chave determina se o cursor Ã© colocado no "
 "topo ou no fundo da mensagem."
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:208
 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 "
@@ -12226,23 +12159,23 @@ msgstr ""
 "responder a uma mensagem. Esta chave determina se a assinatura Ã© colocada no "
 "topo ou no fundo da mensagem."
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid "Variable width font"
 msgstr "Fonte de largura variÃ¡vel"
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
 "Se Ã© ou nÃ£o adicionado por omissÃ£o a cada mensagem um pedido de recibo de "
 "leitura."
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:211
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr ""
 "Se desactivar ou nÃ£o a funcionalidade de reticÃªncias nos nomes das pastas na "
 "barra lateral."
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:212
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12250,73 +12183,96 @@ msgstr ""
 "Se recorrer ou nÃ£o a Ã¡rvores por assunto quando as mensagens nÃ£o contÃªm "
 "cabeÃ§alhos Em-Resposta-A ou ReferÃªncias."
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Se ordenar ou nÃ£o as Ã¡rvores com base na Ãºltima mensagem nessa Ã¡rvore"
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:214
+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 "
+"one minute after the last action invocation."
+msgstr ""
+"Se esvaziar ou nÃ£o a Caixa de SaÃda depois de realizar a filtragem. A Caixa "
+"de SaÃda apenas serÃ¡ esvaziada quando tiver sido utilizada uma qualquer "
+"acÃ§Ã£o de filtro 'Reencaminhar para' mais de um minuto apÃ³s a Ãºltima acÃ§Ã£o."
+
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "Width of the message-list pane"
 msgstr "Largura do painel de lista de mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:216
 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:176
 msgid "Importing Elm data"
 msgstr "A Importar os dados do Elm"
 
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
-#: ../modules/mail/e-mail-shell-view.c:952
+#: ../mail/importers/elm-importer.c:324 ../mail/importers/pine-importer.c:399
+#: ../modules/mail/e-mail-shell-view.c:964
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+#: ../widgets/misc/e-send-options.c:500
 msgid "Mail"
 msgstr "Email"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:365
 msgid "Evolution Elm importer"
 msgstr "Importador de Elm do Evolution"
 
-#: ../mail/importers/elm-importer.c:368
+#: ../mail/importers/elm-importer.c:366
 msgid "Import mail from Elm."
 msgstr "Importar correio do Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:115
-#: ../plugins/pst-import/pst-importer.c:311
-msgid "Destination folder:"
-msgstr "Pasta de destino:"
+#: ../mail/importers/evolution-mbox-importer.c:116
+#: ../plugins/dbx-import/dbx-importer.c:226
+msgid "_Destination folder:"
+msgstr "Pasta de _destino:"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/dbx-import/dbx-importer.c:232
+#: ../plugins/pst-import/pst-importer.c:300
 msgid "Select folder"
 msgstr "Seleccionar a pasta"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/pst-import/pst-importer.c:300
 msgid "Select folder to import into"
 msgstr "Seleccionar a pasta para onde importar"
 
-#: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:243
+#: ../mail/importers/evolution-mbox-importer.c:381
+msgctxt "mboxImp"
+msgid "Subject"
+msgstr "Assunto"
+
+#: ../mail/importers/evolution-mbox-importer.c:386
+msgctxt "mboxImp"
+msgid "From"
+msgstr "De"
+
+#: ../mail/importers/evolution-mbox-importer.c:430
+#: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Caixa de Correio Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:261
+#: ../mail/importers/evolution-mbox-importer.c:431
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Pastas do importador do formato Caixa de Correio Berkeley"
 
-#: ../mail/importers/mail-importer.c:71
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "A Importar caixa de correio"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:155
-#: ../plugins/pst-import/pst-importer.c:456
-#: ../plugins/pst-import/pst-importer.c:562
+#: ../mail/importers/mail-importer.c:150
+#: ../plugins/dbx-import/dbx-importer.c:554
+#: ../plugins/pst-import/pst-importer.c:452
+#: ../plugins/pst-import/pst-importer.c:558
 #, c-format
-msgid "Importing `%s'"
-msgstr "A Importar `%s'"
+msgid "Importing '%s'"
+msgstr "A Importar '%s'"
 
-#: ../mail/importers/mail-importer.c:298
+#: ../mail/importers/mail-importer.c:291
 #, c-format
 msgid "Scanning %s"
 msgstr "A analizar %s"
@@ -12325,88 +12281,115 @@ msgstr "A analizar %s"
 msgid "Importing Pine data"
 msgstr "A Importar os dados do Pine"
 
-#: ../mail/importers/pine-importer.c:379
-#: ../modules/addressbook/addressbook-config.c:986
+#: ../mail/importers/pine-importer.c:404
+#: ../modules/addressbook/addressbook-config.c:1006
 msgid "Address Book"
 msgstr "Livro de EndereÃ§os"
 
-#: ../mail/importers/pine-importer.c:420
+#: ../mail/importers/pine-importer.c:446
 msgid "Evolution Pine importer"
 msgstr "Importador de Pine do Evolution"
 
-#: ../mail/importers/pine-importer.c:421
+#: ../mail/importers/pine-importer.c:447
 msgid "Import mail from Pine."
 msgstr "Importar correio do Pine."
 
-#: ../mail/mail-autofilter.c:73
+#: ../mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "Mensagem para %s"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
 #, c-format
 msgid "Mail from %s"
 msgstr "Mensagem de %s"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:256
 #, c-format
 msgid "Subject is %s"
 msgstr "Assunto Ã© %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:291
 #, c-format
 msgid "%s mailing list"
 msgstr "lista de distribuiÃ§Ã£o %s"
 
-#: ../mail/mail-autofilter.c:366
+#: ../mail/mail-autofilter.c:363
 msgid "Add Filter Rule"
 msgstr "Adicionar Regra de Filtro"
 
-#: ../mail/mail-config.ui.h:1
-msgid "(Note: Requires restart of the application)"
-msgstr "(Nota: Necessita de reiniciar a aplicaÃ§Ã£o)"
-
-#: ../mail/mail-config.ui.h:2
-msgid "<b>Top Posting Option</b> (Not Recommended)"
-msgstr "<b>OpÃ§Ã£o de Resposta no InÃcio</b> (NÃ£o Ã© Recomendada)"
+#. Translators: The first %s is name of the affected
+#. * filter rule(s), the second %s is URI of the removed
+#. * 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:451
+#, c-format
+msgid ""
+"The filter rule \"%s\" has been modified to account for the deleted folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following filter rules\n"
+"%s have been modified to account for the deleted folder\n"
+"\"%s\"."
+msgstr[0] ""
+"A regra de filtro \"%s\" foi alterada para considerar a pasta apagada\n"
+"\"%s\"."
+msgstr[1] ""
+"As regras de filtro seguintes\n"
+"%s foram alteradas para considerar a pasta apagada\n"
+"\"%s\"."
 
-#: ../mail/mail-config.ui.h:3
+#: ../mail/mail-config.ui.h:1
 msgid "Account Information"
 msgstr "InformaÃ§Ã£o de Conta"
 
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:2
 msgid "Add Ne_w Signature..."
 msgstr "A_dicionar uma Nova Assinatura..."
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:3
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "_Assinar sempre as mensagens enviadas ao utilizar esta conta"
 
-#: ../mail/mail-config.ui.h:7
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:5
+#, fuzzy
+msgid "Allowing a _mailing list to redirect a private reply to the list"
+msgstr ""
+"Questionar quando a lista de distribuiÃ§Ã£o redirecciona respostas privadas "
+"para a lista"
+
+#: ../mail/mail-config.ui.h:6
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "_Encriptar tambÃ©m para o prÃ³prio ao enviar mensagens encriptadas"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:7
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Enviar _sempre cÃ³pia (cc) para:"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:8
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Enviar sempre cÃ³pia _escondida (bcc) para:"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:9
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Confiar sempre nas chaves do meu chaveiro ao encrip_tar"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:10
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Encriptar se_mpre para o prÃ³prio ao enviar mensagens encriptadas"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:11
 msgid "Always request rea_d receipt"
 msgstr "Pedir sempre um reci_bo de leitura"
 
-#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+#: ../mail/mail-config.ui.h:12
+msgid "Apply the same _view settings to all folders"
+msgstr "Aplicar as mesmas definiÃ§Ãµes de _vista a todas as pastas"
+
+#: ../mail/mail-config.ui.h:14
+#: ../modules/addressbook/addressbook-config.c:1013
 msgid "Authentication"
 msgstr "AutenticaÃ§Ã£o"
 
@@ -12435,38 +12418,40 @@ msgid "Check spelling while I _type"
 msgstr "Verificar a ortografia _enquando escrevo"
 
 #: ../mail/mail-config.ui.h:21
-msgid "Checks incoming mail messages to be Junk"
-msgstr "Verificar nas mensagens recebidas se sÃ£o NÃ£o Solicitadas"
-
-#: ../mail/mail-config.ui.h:22
 msgid "Cle_ar"
 msgstr "_Limpar"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:22
 msgid "Clea_r"
 msgstr "_Limpar"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:23
 msgid "Color for _misspelled words:"
 msgstr "Cor para as palavras _incorrectas:"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:24
 msgid "Composing Messages"
 msgstr "Compor Mensagens"
 
-#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:25
+#: ../modules/plugin-manager/evolution-plugin-manager.c:157
 msgid "Configuration"
 msgstr "ConfiguraÃ§Ã£o"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:26
 msgid "Confirm _when expunging a folder"
 msgstr "Confirmar ao e_xpurgar uma pasta"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:27
+#, fuzzy
+msgid "Confirmations"
+msgstr "ConfiguraÃ§Ã£o"
+
+#: ../mail/mail-config.ui.h:30
 msgid "Default Behavior"
 msgstr "Comportamento por OmissÃ£o:"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:31
 msgid "Default character e_ncoding:"
 msgstr "CodificaÃ§Ã£o de caract_eres por omissÃ£o:"
 
@@ -12483,311 +12468,318 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Assinar digitalmente as mensagens _enviadas (por omissÃ£o)"
 
 #: ../mail/mail-config.ui.h:36
-msgid "Displayed Message _Headers"
-msgstr "_CabeÃ§alhos de Mensagens Apresentados"
+msgid "Displayed Message Headers"
+msgstr "CabeÃ§alhos de Mensagens Apresentados"
 
 #: ../mail/mail-config.ui.h:37
-msgid "Do not format messages when text si_ze exceeds"
-msgstr "NÃ£o formatar mensagens se o taman_ho do texto exceder"
-
-#: ../mail/mail-config.ui.h:38
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 "NÃ£o _marcar as mensagens como nÃ£o solicitadas se o remetente constar do meu "
 "livro de endereÃ§os"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:38
 msgid "Do not quote"
 msgstr "NÃ£o citar"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:39
 msgid "Drafts _Folder:"
 msgstr "_Pasta de Rascunhos:"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:40
 msgid "Email _Address:"
 msgstr "EndereÃ§o de Em_ail:"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:41
 msgid "Empty trash folders on e_xit"
 msgstr "Esva_ziar as pastas de lixo ao sair"
 
 #: ../mail/mail-config.ui.h:43
-msgid "Enable Magic S_pacebar"
-msgstr "Activar a Barra de Es_paÃ§os MÃ¡gica"
-
-#: ../mail/mail-config.ui.h:44
-msgid "Enable Sea_rch Folders"
-msgstr "Activatar as Pastas de Procu_ra"
-
-#: ../mail/mail-config.ui.h:46
 msgid "Encry_ption certificate:"
 msgstr "Certificado de encri_ptaÃ§Ã£o:"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:44
 msgid "Encrypt out_going messages (by default)"
 msgstr "_Encriptar as mensagens enviadas (por omissÃ£o)"
 
-#: ../mail/mail-config.ui.h:48
-msgid "Fi_xed-width:"
-msgstr "Largura fi_xa:"
+#: ../mail/mail-config.ui.h:45
+msgid "F_all back to threading messages by subject"
+msgstr "Recorrer a organizar as mensagens em Ã¡r_vore por assunto"
 
-#: ../mail/mail-config.ui.h:49
-msgid "Fix_ed width Font:"
+#: ../mail/mail-config.ui.h:46
+#, fuzzy
+msgid "Fix_ed Width Font:"
 msgstr "Font_e de Largura Fixa:"
 
-#: ../mail/mail-config.ui.h:50
-msgid "Font Properties"
-msgstr "Propriedades da Fonte"
-
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:47
 msgid "Format messages in _HTML"
 msgstr "Formatar mensagens em _HTML"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:48
 msgid "Full Nam_e:"
 msgstr "Nom_e Completo:"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:50
+msgid "Group Reply goes only to mailing list, if possible"
+msgstr ""
+"Responder ao Grupo apenas vai para a lista de distribuiÃ§Ã£o, se possÃvel"
+
+#: ../mail/mail-config.ui.h:51
 msgid "HTML Messages"
 msgstr "Mensagens HTML"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:52
 msgid "H_TTP Proxy:"
 msgstr "Proxy H_TTP:"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:53
 msgid "Headers"
 msgstr "CabeÃ§alhos"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:54
 msgid "Highlight _quotations with"
 msgstr "_RealÃ§ar as citaÃ§Ãµes com"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:55
+msgid "Ignore Reply-To: for mailing lists"
+msgstr "Ignorar Responder-A: para listas de distibuiÃ§Ã£o"
+
+#: ../mail/mail-config.ui.h:56
 msgid "Inline"
 msgstr "Embutida"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:57
 msgid "Inline (Outlook style)"
 msgstr "Embutida (estilo Outlook)"
 
-#: ../mail/mail-config.ui.h:62
-msgid "KB"
-msgstr "KB"
-
-#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:59 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Etiquetas"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:60
 msgid "Languages Table"
 msgstr "Tabela de Idiomas"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:61
 msgid "Loading Images"
 msgstr "A Ler as Imagens"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:62
 msgid "Mail Headers Table"
 msgstr "Tabela de CabeÃ§alhos de Mensagens"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:63
 msgid "Mailbox location"
 msgstr "LocalizaÃ§Ã£o da caixa de correio"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:64
 msgid "Message Display"
 msgstr "ApresentaÃ§Ã£o de Mensagens"
 
-#: ../mail/mail-config.ui.h:69
-msgid "Message Fonts"
-msgstr "Fontes das Mensagens"
-
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:65
 msgid "Message Receipts"
 msgstr "Recibos das Mensagens"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:66
 msgid "No _Proxy for:"
 msgstr "Nenhuma _Proxy para:"
 
-#: ../mail/mail-config.ui.h:73
-msgid ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
-msgstr ""
-"Nota: nÃ£o lhe serÃ¡ pedida nenhuma senha atÃ© que se ligue pela primeira vez"
-
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:68
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "Esta opÃ§Ã£o serÃ¡ ignorada se for encontrada uma equivalÃªncia para cabeÃ§alhos "
 "de mensagens nÃ£o solicitadas."
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:69
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "InformaÃ§Ã£o Opcional"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:71
 msgid "Or_ganization:"
 msgstr "Or_ganizaÃ§Ã£o:"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:72
 msgid "PGP/GPG _Key ID:"
 msgstr "ID de C_have PGP/GPG:"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:73
 msgid "Pass_word:"
 msgstr "Sen_ha:"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:75
 msgid "Port:"
 msgstr "Porto:"
 
-#: ../mail/mail-config.ui.h:82
-msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr "Avisar _quando enviar mensagens apenas com destinatÃ¡rios em Bcc"
-
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:76
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:85
-msgid "Printed Fonts"
-msgstr "Fontes de ImpressÃ£o"
-
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:78
 msgid "Proxy Settings"
 msgstr "DefiniÃ§Ãµes de Proxy"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:79
 msgid "Quoted"
 msgstr "Citada"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:80
 msgid "Re_member password"
 msgstr "Recordar a sen_ha"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:81
 msgid "Re_ply-To:"
 msgstr "Res_ponder-A:"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:82
 msgid "Remember _password"
 msgstr "Recordar a sen_ha"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:83
+#, fuzzy
+msgid "Replies and Forwards"
+msgstr "Respostas e pais"
+
+#: ../mail/mail-config.ui.h:84
 msgid "Required Information"
 msgstr "InformaÃ§Ã£o Requerida"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:85
+msgid "SHA1"
+msgstr "SHA1"
+
+#: ../mail/mail-config.ui.h:86
+msgid "SHA256"
+msgstr "SHA256"
+
+#: ../mail/mail-config.ui.h:87
+msgid "SHA384"
+msgstr "SHA384"
+
+#: ../mail/mail-config.ui.h:88
+msgid "SHA512"
+msgstr "SHA512"
+
+#: ../mail/mail-config.ui.h:90
 msgid "SSL is not supported in this build of Evolution"
 msgstr "SSL nÃ£o Ã© suportado nesta compilaÃ§Ã£o do Evolution"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:91
 msgid "S_earch for sender photograph only in local address books"
 msgstr ""
 "Procurar p_ela fotografia do remetente apenas no livro de endereÃ§os local"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:92
 msgid "S_elect..."
 msgstr "S_eleccionar..."
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:93
 msgid "S_end message receipts:"
 msgstr "_Enviar recibos de mensagem:"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:94
 msgid "S_tandard Font:"
 msgstr "Fonte _Base:"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:95
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:101
-msgid "Select Drafts Folder"
-msgstr "Seleccionar a Pasta de Rascunhos"
-
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:97
 msgid "Select HTML fixed width font"
 msgstr "Seleccionar a fonte HTML de largura fixa"
 
-#: ../mail/mail-config.ui.h:103
-msgid "Select HTML fixed width font for printing"
-msgstr "Seleccionar a fonte HTML de largura fixa para impressÃ£o"
-
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:98
 msgid "Select HTML variable width font"
 msgstr "Seleccionar a fonte HTML de largura variÃ¡vel"
 
-#: ../mail/mail-config.ui.h:105
-msgid "Select HTML variable width font for printing"
-msgstr "Seleccionar a fonte HTML de largura variÃ¡vel para impressÃ£o"
+#: ../mail/mail-config.ui.h:99
+msgid "Sender Photograph"
+msgstr "Fotografia do Remetente"
 
-#: ../mail/mail-config.ui.h:106
-msgid "Select Sent Folder"
-msgstr "Seleccionar a Pasta de Enviado"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:101
+#, fuzzy
+msgid "Sending a _private reply to a mailing list message"
+msgstr ""
+"Questionar ao enviar respostas privadas a mensagens de _listas de "
+"distribuiÃ§Ã£o"
 
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:103
+#, fuzzy
+msgid "Sending a message with an _empty subject line"
+msgstr "_Avisar ao enviar mensagens sem linha de assunto definida"
+
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:105
+#, fuzzy
+msgid "Sending a message with only _Bcc recipients defined"
+msgstr "Avisar _quando enviar mensagens apenas com destinatÃ¡rios em Bcc"
+
+#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:107
-msgid "Sender Photograph"
-msgstr "Fotografia do Remetente"
+#, fuzzy
+msgid "Sending a reply to a large _number of recipients"
+msgstr "Enviar resposta a todos os destinatÃ¡rios?"
 
 #: ../mail/mail-config.ui.h:108
-msgid "Sending Mail"
-msgstr "A Enviar Mensagens"
-
-#: ../mail/mail-config.ui.h:109
 msgid "Sent _Messages Folder:"
 msgstr "Pasta de _Mensagens Enviadas:"
 
-#: ../mail/mail-config.ui.h:110
-msgid "Sent and Draft Messages"
-msgstr "Mensagens Enviadas e Rascunhos"
-
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:109
 msgid "Ser_ver requires authentication"
 msgstr "Ser_vidor requer autenticaÃ§Ã£o"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:110
 msgid "Server Configuration"
 msgstr "ConfiguraÃ§Ã£o do Servidor"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:111
 msgid "Server _Type:"
 msgstr "_Tipo de Servidor:"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:112
+msgid "Si_gning algorithm:"
+msgstr "Algoritmo de assi_natura:"
+
+#: ../mail/mail-config.ui.h:113
 msgid "Sig_natures"
 msgstr "Assi_naturas"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:114
 msgid "Sig_ning certificate:"
 msgstr "Certificado de assi_natura:"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:115
 msgid "Signat_ure:"
 msgstr "Assinat_ura:"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:116
 msgid "Signatures"
 msgstr "Assinaturas"
 
+#: ../mail/mail-config.ui.h:117
+msgid "Signing _algorithm:"
+msgstr "_Algoritmo de assinatura:"
+
 #: ../mail/mail-config.ui.h:118
+#, fuzzy
+msgid "Special Folders"
+msgstr "Pastas Locais"
+
+#: ../mail/mail-config.ui.h:119
 msgid "Spell Checking"
 msgstr "Verificar a Ortografia"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:120
 msgid "Start _typing at the bottom on replying"
 msgstr "ComeÃ§ar a escrever no _fundo ao responder"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:122
 msgid "T_ype:"
 msgstr "T_ipo:"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:123
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -12795,7 +12787,7 @@ msgstr ""
 "Esta listagem de idiomas reflecte apenas aqueles para os quais possui um "
 "dicionÃ¡rio instalado."
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:124
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12805,7 +12797,13 @@ msgstr ""
 "assinatura. O nome que especificar serÃ¡ utilizado\n"
 "apenas para visualizaÃ§Ã£o. "
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:127
+msgid ""
+"To help avoid email accidents and embarrassments, ask for confirmation "
+"before taking the following checkmarked actions:"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:128
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12813,98 +12811,90 @@ msgstr ""
 "Indique o nome pelo qual deseja referir-se a esta conta.\n"
 "Por exemplo: \"Trabalho\" ou \"Pessoal\""
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:130
 msgid "Us_ername:"
 msgstr "Utili_zador:"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:131
 msgid "Use Authe_ntication"
 msgstr "Utilizar Aute_nticaÃ§Ã£o"
 
-#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
-#: ../plugins/google-account-setup/google-contacts-source.c:283
-#: ../plugins/google-account-setup/google-source.c:620
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
-msgid "User_name:"
+#: ../mail/mail-config.ui.h:132
+#, fuzzy
+msgid "User _Name:"
 msgstr "_Nome de utilizador:"
 
-#: ../mail/mail-config.ui.h:131
-msgid "V_ariable-width:"
-msgstr "Largura v_ariÃ¡vel:"
-
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:133
 msgid "_Add Signature"
 msgstr "_Adicionar Assinatura"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:134
 msgid "_Always load images from the Internet"
 msgstr "_Ler sempre as imagens da Internet"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:135
 msgid "_Authentication Type"
 msgstr "Tipo de _AutenticaÃ§Ã£o"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:136
 msgid "_Default junk plugin:"
 msgstr "Plugin de correio _nÃ£o solicitado por omissÃ£o:"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:137
 msgid "_Direct connection to the Internet"
 msgstr "LigaÃ§Ã£o _directa Ã  Internet"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:138
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr ""
 "_NÃ£o assinar os pedidos de reuniÃ£o (para compatibilidade com o Outlook)"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:139
 msgid "_Forward style:"
 msgstr "_Estilo de reencaminhamento:"
 
-#: ../mail/mail-config.ui.h:139
-msgid "_Keep Signature above the original message on replying"
+#: ../mail/mail-config.ui.h:140
+msgid "_Junk Folder:"
+msgstr "Pasta de NÃ£o _Solicitado:"
+
+#: ../mail/mail-config.ui.h:141
+#, fuzzy
+msgid "_Keep signature above the original message on replying"
 msgstr "_Manter a Assinatura acima da mensagem original nas respostas"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:142
 msgid "_Languages"
 msgstr "_Idiomas"
 
-#: ../mail/mail-config.ui.h:141
-msgid "_Load images in messages from contacts"
+#: ../mail/mail-config.ui.h:143
+#, fuzzy
+msgid "_Load images only in messages from contacts"
 msgstr "_Ler imagens em mensagens de contactos"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:144
 msgid "_Lookup in local address book only"
 msgstr "_Procurar apenas no livro de endereÃ§os local"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:145
 msgid "_Make this my default account"
 msgstr "_Tornar esta na minha conta por omissÃ£o"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:146
 msgid "_Manual proxy configuration:"
 msgstr "ConfiguraÃ§Ã£o _manual de proxy:"
 
-#: ../mail/mail-config.ui.h:145
-msgid "_Mark messages as read after"
-msgstr "_Marcar as mensagens como lidas apÃ³s"
-
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:148
 msgid "_Never load images from the Internet"
 msgstr "_Nunca ler as imagens da Internet"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:149
 msgid "_Path:"
 msgstr "_Caminho"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:150
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Questionar ao enviar mensagens HTML para contactos que nÃ£o as desejam"
 
-#: ../mail/mail-config.ui.h:150
-msgid "_Prompt when sending messages with an empty subject line"
-msgstr "_Avisar ao enviar mensagens sem linha de assunto definida"
-
 #: ../mail/mail-config.ui.h:151
 msgid "_Reply style:"
 msgstr "Estilo de _resposta:"
@@ -12917,23 +12907,23 @@ msgstr "_Script:"
 msgid "_Secure HTTP Proxy:"
 msgstr "Proxy HTTP _Seguro"
 
-#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
+#: ../mail/mail-config.ui.h:155 ../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:157
-msgid "_Show image animations"
-msgstr "Apresentar as animaÃ§Ãµes de imagen_s"
+msgid "_Show animated images"
+msgstr "Apre_sentar as imagens animadas"
 
 #: ../mail/mail-config.ui.h:158
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Apresentar a fotografia do remetente na antevisÃ£o da mensagem"
 
 #: ../mail/mail-config.ui.h:159
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "_Encurtar os cabeÃ§alhos Para / Cc / Bcc para "
+msgid "_Trash Folder:"
+msgstr "_Pasta de Lixo:"
 
 #: ../mail/mail-config.ui.h:160
 msgid "_Use Secure Connection:"
@@ -12951,46 +12941,42 @@ msgstr "_Utilizar a mesma fonte que as outras aplicaÃ§Ãµes"
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:164
-msgid "addresses"
-msgstr "endereÃ§os"
-
-#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:164 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:165
 msgid "color"
 msgstr "cor"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:166
 msgid "description"
 msgstr "descriÃ§Ã£o"
 
 #: ../mail/mail-dialogs.ui.h:1
-msgid "    "
-msgstr "    "
-
-#: ../mail/mail-dialogs.ui.h:2
 msgid "All active remote folders"
 msgstr "Todas as pastas remotas activas"
 
-#: ../mail/mail-dialogs.ui.h:3
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All local and active remote folders"
 msgstr "Todas as pastas locais e as remotas activas"
 
-#: ../mail/mail-dialogs.ui.h:4
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local folders"
 msgstr "Todas as pastas locais"
 
-#: ../mail/mail-dialogs.ui.h:5
+#: ../mail/mail-dialogs.ui.h:4
 msgid "Call"
 msgstr "Chamar"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:5
 msgid "Co_mpleted"
 msgstr "Ter_minada"
 
+#: ../mail/mail-dialogs.ui.h:6
+msgid "Collapse _all"
+msgstr "Recolher _todas"
+
 #: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "Assinatura Digital"
@@ -13000,58 +12986,66 @@ msgid "Do Not Forward"
 msgstr "NÃ£o Reencaminhar"
 
 #: ../mail/mail-dialogs.ui.h:9
+msgid "E_xpand all"
+msgstr "E_xpandir todas"
+
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Encryption"
 msgstr "EncriptaÃ§Ã£o"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Folder Subscriptions"
 msgstr "SubscriÃ§Ãµes de Pasta"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Follow-Up"
 msgstr "Dar Seguimento"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "For Your Information"
 msgstr "Para Sua InformaÃ§Ã£o"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:14
 msgid "Forward"
 msgstr "Reencaminhar"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:15
 msgid "License Agreement"
 msgstr "Acordo de LicenÃ§a"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:16
 msgid "No Response Necessary"
 msgstr "Nenhuma Resposta NecessÃ¡ria"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Reply to All"
 msgstr "Responder a Todos"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Review"
 msgstr "Rever"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:22
 msgid "S_erver:"
 msgstr "S_ervidor:"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:23
+msgid "S_how only items containing:"
+msgstr "Apenas apresentar itens que conten_ham:"
+
+#: ../mail/mail-dialogs.ui.h:24
 msgid "Search Folder Sources"
 msgstr "Alvos das Pastas de Procura"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:25
 msgid "Security Information"
 msgstr "InformaÃ§Ã£o de SeguranÃ§a"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:26
 msgid "Specific folders"
 msgstr "Pastas especÃficas"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:27
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13059,183 +13053,178 @@ msgstr ""
 "As mensagens que seleccionou para dar seguimento estÃ£o listadas abaixo.\n"
 "Seleccione uma acÃ§Ã£o de dar seguimento no menu \"Marcar\"."
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Accept License"
 msgstr "_Aceitar a LicenÃ§a"
 
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:30
 msgid "_Due By:"
 msgstr "_Data Limite A:"
 
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:31
 msgid "_Flag:"
 msgstr "_Marca:"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:32
 msgid "_Tick this to accept the license agreement"
 msgstr "_Marque aqui para aceitar a licenÃ§a de utilizaÃ§Ã£o"
 
-#: ../mail/mail-folder-cache.c:893
+#: ../mail/mail-folder-cache.c:783
 #, c-format
 msgid "Pinging %s"
 msgstr "A pingar %s"
 
-#: ../mail/mail-ops.c:95
+#: ../mail/mail-ops.c:84
 msgid "Filtering Selected Messages"
 msgstr "A Filtrar as Mensagens Seleccionadas"
 
-#: ../mail/mail-ops.c:254
+#: ../mail/mail-ops.c:243
 msgid "Fetching Mail"
 msgstr "A Obter as Mensagens"
 
-#. sending mail, filtering failed
-#: ../mail/mail-ops.c:585
+#: ../mail/mail-ops.c:588
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Falha ao aplicar os filtros de envio: %s"
 
-#: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:604 ../mail/mail-ops.c:631
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+"Appending to local 'Sent' folder instead."
 msgstr ""
 "Falha ao acrescentar a %s: %s\n"
-"Acrescentado Ã  pasta `Enviadas'."
+"A acrescentar Ã  pasta 'Enviadas'."
 
-#: ../mail/mail-ops.c:641
+#: ../mail/mail-ops.c:650
 #, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr "Falha ao acrescentar Ã  pasta local `Enviadas': %s"
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "Falha ao acrescentar Ã  pasta local 'Enviadas': %s"
 
-#: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
+#: ../mail/mail-ops.c:770 ../mail/mail-ops.c:859
 msgid "Sending message"
 msgstr "A enviar a mensagem"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:778
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "A enviar a mensagem %d de %d"
 
-#: ../mail/mail-ops.c:789
+#: ../mail/mail-ops.c:822
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Falha ao enviar %d de %d mensagens."
 
-#: ../mail/mail-ops.c:791 ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:824 ../mail/mail-send-recv.c:782
 msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../mail/mail-ops.c:793 ../mail/mail-send-recv.c:762
+#: ../mail/mail-ops.c:826 ../mail/mail-send-recv.c:784
 msgid "Complete."
 msgstr "Terminado."
 
-#: ../mail/mail-ops.c:905
+#: ../mail/mail-ops.c:930
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "A gravar a mensagem na pasta '%s'"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:1010
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "A mover as mensagens para '%s'"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:1010
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "A copiar as mensagens para '%s'"
 
-#: ../mail/mail-ops.c:1091
+#: ../mail/mail-ops.c:1119
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "A analisar as pastas em '%s'"
 
-#: ../mail/mail-ops.c:1199
+#: ../mail/mail-ops.c:1226
 msgid "Forwarded messages"
 msgstr "Mensagens reencaminhadas"
 
-#: ../mail/mail-ops.c:1240
+#: ../mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "A abrir a pasta '%s'"
 
-#: ../mail/mail-ops.c:1306
+#: ../mail/mail-ops.c:1333
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "A obter a informaÃ§Ã£o de quota da pasta '%s'"
 
-#: ../mail/mail-ops.c:1378
+#: ../mail/mail-ops.c:1405
 #, c-format
 msgid "Opening store '%s'"
 msgstr "A abrir o armazenamento '%s'"
 
-#: ../mail/mail-ops.c:1449
+#: ../mail/mail-ops.c:1475
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "A remover a pasta '%s'"
 
-#: ../mail/mail-ops.c:1567
+#: ../mail/mail-ops.c:1599
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "A armazenar a pasta '%s'"
 
-#: ../mail/mail-ops.c:1630
+#: ../mail/mail-ops.c:1662
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "A expurgar e armazenar a conta '%s'"
 
-#: ../mail/mail-ops.c:1631
+#: ../mail/mail-ops.c:1663
 #, c-format
 msgid "Storing account '%s'"
 msgstr "A armazenar a conta '%s'"
 
-#: ../mail/mail-ops.c:1685
+#: ../mail/mail-ops.c:1717
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "A actualizar a pasta '%s'"
 
-#: ../mail/mail-ops.c:1725
+#: ../mail/mail-ops.c:1757
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "A expurgar a pasta '%s'"
 
-#: ../mail/mail-ops.c:1770
+#: ../mail/mail-ops.c:1802
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "A esvaziar o lixo em '%s'"
 
-#: ../mail/mail-ops.c:1771
+#: ../mail/mail-ops.c:1803
 msgid "Local Folders"
 msgstr "Pastas Locais"
 
-#: ../mail/mail-ops.c:1967
+#: ../mail/mail-ops.c:2006
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "A obter %d mensagem"
 msgstr[1] "A obter %d mensagens"
 
-#: ../mail/mail-ops.c:2056
+#: ../mail/mail-ops.c:2095
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "A gravar %d mensagem"
 msgstr[1] "A gravar %d mensagens"
 
-#: ../mail/mail-ops.c:2136
+#: ../mail/mail-ops.c:2182
 #, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-"Erro ao gravar as mensagens em: %s:\n"
-" %s"
+msgid "Error saving messages to: %s:\n"
+msgstr "Erro ao gravar mensagens em: %s:\n"
 
-#: ../mail/mail-ops.c:2208
+#: ../mail/mail-ops.c:2255
 msgid "Saving attachment"
 msgstr "A gravar o anexo"
 
-#: ../mail/mail-ops.c:2226 ../mail/mail-ops.c:2234
+#: ../mail/mail-ops.c:2275 ../mail/mail-ops.c:2285
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13244,31 +13233,30 @@ msgstr ""
 "Incapaz de criar o ficheiro de resultado: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2249
-#, c-format
-msgid "Could not write data: %s"
-msgstr "Incapaz de escrever dados: %s"
+#: ../mail/mail-ops.c:2300
+msgid "Could not write data: "
+msgstr "Incapaz de escrever dados: "
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2444
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "A desligar-se de '%s'"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2444
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "A estabelecer nova ligaÃ§Ã£o a '%s'"
 
-#: ../mail/mail-ops.c:2490
+#: ../mail/mail-ops.c:2540
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "A preparar a conta '%s' para o modo desligado"
 
-#: ../mail/mail-ops.c:2576
+#: ../mail/mail-ops.c:2626
 msgid "Checking Service"
 msgstr "A Verificar o ServiÃ§o"
 
-#: ../mail/mail-send-recv.c:189
+#: ../mail/mail-send-recv.c:188
 msgid "Canceling..."
 msgstr "A Cancelar..."
 
@@ -13276,114 +13264,152 @@ msgstr "A Cancelar..."
 msgid "Send & Receive Mail"
 msgstr "Enviar & Receber Mensagens"
 
-#: ../mail/mail-send-recv.c:444
+#: ../mail/mail-send-recv.c:448
 msgid "Cancel _All"
 msgstr "Cancelar _Tudo"
 
-#: ../mail/mail-send-recv.c:553
+#: ../mail/mail-send-recv.c:564
 msgid "Updating..."
 msgstr "A Actualizar..."
 
-#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
+#: ../mail/mail-send-recv.c:564 ../mail/mail-send-recv.c:648
 msgid "Waiting..."
 msgstr "A Aguardar..."
 
-#: ../mail/mail-send-recv.c:873
+#: ../mail/mail-send-recv.c:895
 #, c-format
 msgid "Checking for new mail"
 msgstr "A verificar a existÃªncia de novas mensagens"
 
-#: ../mail/mail-session.c:220
+#: ../mail/mail-session.c:225
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Introduza a Senha para %s"
 
-#: ../mail/mail-session.c:222
+#: ../mail/mail-session.c:227
 msgid "Enter Passphrase"
 msgstr "Introduza a Senha"
 
-#: ../mail/mail-session.c:225
+#: ../mail/mail-session.c:230
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduza a Senha para %s"
 
-#: ../mail/mail-session.c:227
+#: ../mail/mail-session.c:232
 msgid "Enter Password"
 msgstr "Introduza a Senha"
 
-#: ../mail/mail-session.c:269
+#: ../mail/mail-session.c:277
+#, c-format
 msgid "User canceled operation."
 msgstr "Utilizador cancelou a operaÃ§Ã£o."
 
-#: ../mail/mail-session.c:663
+#: ../mail/mail-session.c:721
+#, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr ""
 "NÃ£o foi indicado nenhum endereÃ§o de destino, o reencaminhar da mensagem foi "
 "cancelado."
 
-#: ../mail/mail-session.c:669
+#: ../mail/mail-session.c:730
+#, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr ""
 "NÃ£o foi encontrada nenhuma conta a utilizar, o reencaminhar da mensagem foi "
 "cancelado."
 
-#: ../mail/mail-tools.c:123
+#: ../mail/mail-tools.c:128
 #, c-format
-msgid "Could not create spool directory `%s': %s"
-msgstr "Incapaz de criar o directÃ³rio de spool `%s': %s"
+msgid "Could not create spool directory '%s': %s"
+msgstr "Incapaz de criar o directÃ³rio de spool '%s': %s"
 
-#: ../mail/mail-tools.c:153
+#: ../mail/mail-tools.c:161
 #, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
-msgstr "A tentar efectuar o movemail sobre a origem `%s' que nÃ£o Ã© mbox"
+msgid "Trying to movemail a non-mbox source '%s'"
+msgstr "A tentar efectuar o movemail sobre uma origem '%s' que nÃ£o Ã© mbox"
 
-#: ../mail/mail-tools.c:259
+#: ../mail/mail-tools.c:273
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensagem reencaminhada - %s"
 
-#: ../mail/mail-tools.c:261
+#: ../mail/mail-tools.c:275
 msgid "Forwarded message"
 msgstr "Mensagem reencaminhada"
 
-#: ../mail/mail-tools.c:301
+#: ../mail/mail-tools.c:318
 #, c-format
-msgid "Invalid folder: `%s'"
-msgstr "Pasta invÃ¡lida: `%s'"
+msgid "Invalid folder: '%s'"
+msgstr "Pasta invÃ¡lida: '%s'"
 
-#: ../mail/mail-vfolder.c:87
+#: ../mail/mail-vfolder.c:85
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "A configurar uma Pasta de Procura: %s"
 
-#: ../mail/mail-vfolder.c:232
+#: ../mail/mail-vfolder.c:224
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "A actualizar as Pastas de Procura para '%s:%s'"
 
-#: ../mail/mail-vfolder.c:239
+#: ../mail/mail-vfolder.c:231
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "A actualizar as Pastas de Procura para '%s'"
 
-#: ../mail/mail-vfolder.c:1172
+#. 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:675
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been modified to account for the deleted "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been modified to account for the deleted folder\n"
+"\"%s\"."
+msgstr[0] ""
+"A Pasta de Procura \"%s\" foi alterada para considerar a pasta removida\n"
+"\"%s\"."
+msgstr[1] ""
+"As seguintes Pastas de Procura\n"
+"%s foram alteradas para considerar a pasta removida\n"
+"\"%s\"."
+
+#: ../mail/mail-vfolder.c:1185
 msgid "Edit Search Folder"
 msgstr "Editar a Pasta de Procura"
 
-#: ../mail/mail-vfolder.c:1274
+#: ../mail/mail-vfolder.c:1290
 msgid "New Search Folder"
 msgstr "Nova Pasta de Procura"
 
 #: ../mail/mail.error.xml.h:1
+msgid "\"Check Junk\" Failed"
+msgstr "Falha ao \"Verificar por Correio NÃ£o Solicitado\""
+
+#: ../mail/mail.error.xml.h:2
+msgid "\"Report Junk\" Failed"
+msgstr "Falha ao \"Relatar como Correio NÃ£o Solicitado\""
+
+#: ../mail/mail.error.xml.h:3
+msgid "\"Report Not Junk\" Failed"
+msgstr "Falha ao \"Relatar como Correio Solicitado\""
+
+#: ../mail/mail.error.xml.h:4
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "JÃ¡ existe uma pasta denominada \"{0}\". Utilize um nome diferente."
 
-#: ../mail/mail.error.xml.h:2
+#: ../mail/mail.error.xml.h:5
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "JÃ¡ existe uma pasta denominada \"{1}\". Utilize um nome diferente."
 
-#: ../mail/mail.error.xml.h:3
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -13394,7 +13420,7 @@ msgstr ""
 "\n"
 "Pode ignorar esta pasta, sobrepo-la ou acrescentar ao seu conteÃºdo, ou sair."
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:9
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
@@ -13402,14 +13428,14 @@ msgstr ""
 "Foi pedido um recibo de notificaÃ§Ã£o de leitura para \"{1}\". Enviar o recibo "
 "de notificaÃ§Ã£o para {0}?"
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:10
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
 msgstr ""
 "JÃ¡ existe uma assinatura denominada \"{0}\". Utilize um nome diferente."
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:11
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -13417,26 +13443,22 @@ msgstr ""
 "Adicionar uma linha de Assunto com sentido Ã s suas mensagens irÃ¡ dar uma "
 "ideia aos seus destinatÃ¡rios sobre o conteÃºdo destas."
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Tem a certeza de que deseja apagar esta conta e todas as suas proxies?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:13
 msgid "Are you sure you want to delete this account?"
 msgstr "Tem a certeza que quer apagar esta conta?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 "Tem a certeza de que deseja desactivar esta conta e apagar todas as suas "
 "proxies?"
 
-#: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "Tem a certeza de que deseja abrir {0} mensagens simultaneamente?"
-
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:15
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -13444,7 +13466,7 @@ msgstr ""
 "Deseja mesmo remover definitivamente todas as mensagens apagadas em todas as "
 "pastas?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:16
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
@@ -13452,87 +13474,79 @@ msgstr ""
 "Deseja mesmo remover definitivamente todas as mensagens apagadas na pasta "
 "\"{0}\"?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Deseja mesmo enviar uma mensagem no formato HTML?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:18
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr "Deseja mesmo enviar uma mensagem com um endereÃ§o invÃ¡lido?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr "Deseja mesmo enviar uma mensagem com endereÃ§os invÃ¡lidos?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Deseja mesmo enviar uma mensagem apenas com destinatÃ¡rios em BCC?"
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:21
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Deseja mesmo enviar uma mensagem sem assunto?"
 
-#: ../mail/mail.error.xml.h:20
-msgid "Because \"{0}\"."
-msgstr "Devido a \"{0}\"."
-
 #: ../mail/mail.error.xml.h:22
-msgid "Because \"{2}\"."
-msgstr "Devido a \"{2}\"."
-
-#: ../mail/mail.error.xml.h:23
 msgid "Blank Signature"
 msgstr "Assinatura em Branco"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Incapaz de adicionar a Pasta de Procura \"{0}\"."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Incapaz de copiar a pasta \"{0}\" para \"{1}\"."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create folder \"{0}\"."
 msgstr "Incapaz de criar a pasta \"{0}\"."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create temporary save directory."
 msgstr "Incapaz de criar o directÃ³rio temporÃ¡rio de gravaÃ§Ã£o."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Incapaz de criar o directÃ³rio de gravaÃ§Ã£o devido a \"{1}\""
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Incapaz de apagar a pasta \"{0}\"."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Incapaz de apagar a pasta de sistema \"{0}\"."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "Incapaz de editar a Pasta de Procura \"{0}\" pois esta nÃ£o existe."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Incapaz de mover a pasta \"{0}\" para \"{1}\"."
 
-#: ../mail/mail.error.xml.h:33
-msgid "Cannot open source \"{1}\""
-msgstr "Incapaz de abrir a origem \"{1}\""
+#: ../mail/mail.error.xml.h:32
+msgid "Cannot open source \"{1}\"."
+msgstr "Incapaz de abrir a origem \"{1}\"."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{2}\"."
 msgstr "Incapaz de abrir a origem \"{2}\"."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open target \"{2}\"."
 msgstr "Incapaz de abrir o destino \"{2}\"."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:35
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -13541,35 +13555,31 @@ msgstr ""
 "instalaÃ§Ã£o. NÃ£o serÃ¡ possÃvel utilizar este fornecedor atÃ© que possa aceitar "
 "a sua licenÃ§a."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Incapaz de renomear \"{0}\" para \"{1}\"."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Incapaz de renomear ou mover a pasta de sistema \"{0}\"."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save changes to account."
 msgstr "Incapaz de gravar as alteraÃ§Ãµes Ã  conta."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Incapaz de gravar no directÃ³rio \"{0}\"."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to file \"{0}\"."
 msgstr "Incapaz de gravar para o ficheiro \"{0}\"."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot set signature script \"{0}\"."
 msgstr "Incapaz de definir o script de assinatura \"{0}\"."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Check Junk Failed"
-msgstr "Falha na VerificaÃ§Ã£o por Correio NÃ£o Solicitado"
-
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -13578,27 +13588,27 @@ msgstr ""
 "que muitas senhas sÃ£o sensÃveis Ã  capitalizaÃ§Ã£o; o caps lock poderÃ¡ estar "
 "activo."
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "Incapaz de gravar o ficheiro de assinatura."
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "Apagar as mensagens na Pasta de Procura \"{0}\"?"
 
+#: ../mail/mail.error.xml.h:46
+msgid "Do _Not Disable"
+msgstr "_NÃ£o Desactivar"
+
 #: ../mail/mail.error.xml.h:47
-msgid "Do not d_elete"
-msgstr "NÃ£o _apagar"
+msgid "Do _Not Send"
+msgstr "_NÃ£o Enviar"
 
 #: ../mail/mail.error.xml.h:48
-msgid "Do not delete"
-msgstr "NÃ£o apagar"
+msgid "Do _Not Synchronize"
+msgstr "_NÃ£o Sincronizar"
 
 #: ../mail/mail.error.xml.h:49
-msgid "Do not disable"
-msgstr "NÃ£o desactivar"
-
-#: ../mail/mail.error.xml.h:50
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -13606,60 +13616,63 @@ msgstr ""
 "Deseja sincronizar localmente as pastas que estÃ£o marcadas para utilizaÃ§Ã£o "
 "em modo desligado?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Do you want to mark all messages as read?"
 msgstr "Deseja 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 "Deseja gravar as suas alteraÃ§Ãµes?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "Introduza a senha."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "Erro ao ler as definiÃ§Ãµes de filtro."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "Error while performing operation."
 msgstr "Erro durante execuÃ§Ã£o da operaÃ§Ã£o."
 
-#: ../mail/mail.error.xml.h:56
+#. 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:58
 msgid "Error while {0}."
 msgstr "Erro durante {0}."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but cannot overwrite it."
 msgstr "Ficheiro jÃ¡ existe mas nÃ£o Ã© possÃvel sobrepo-lo."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:60
 msgid "File exists but is not a regular file."
 msgstr "O ficheiro jÃ¡ existe mas nÃ£o Ã© um ficheiro normal."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:61
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Se continuar, nÃ£o lhe serÃ¡ possÃvel recuperar estas mensagens."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:62
 msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
+"If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr ""
-"Se apagar a pasta, todo o seu conteÃºdo e das suas subpastas serÃ¡ "
+"Se apagar a pasta, todo o seu conteÃºdo e o das suas subpastas serÃ¡ "
 "definitivamente apagado."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:63
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "Se apagar a pasta, todo o seu conteÃºdo serÃ¡ definitivamente apagado."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:64
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Se prosseguir, todas as contas de proxy serÃ£o definitivamente apagada."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:65
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13667,11 +13680,11 @@ msgstr ""
 "Se prosseguir, a informaÃ§Ã£o de conta e toda a\n"
 "informaÃ§Ã£o de proxy serÃ¡ definitivamente apagada."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:67
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Se prosseguir, a informaÃ§Ã£o de conta serÃ¡ definitivamente apagada."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:68
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13679,23 +13692,23 @@ msgstr ""
 "Se sair, estas mensagens nÃ£o serÃ£o enviadas atÃ© que o Evolution seja "
 "novamente iniciado."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:69
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:70
 msgid "Invalid authentication"
 msgstr "AutenticaÃ§Ã£o invÃ¡lida"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:71
 msgid "Mail Deletion Failed"
 msgstr "Falha ao Apagar Correio"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:72
 msgid "Mail filters automatically updated."
 msgstr "Filtros de mensagens actualizados automaticamente."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:73
 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 "
@@ -13707,28 +13720,28 @@ msgstr ""
 "adicionado, irÃ¡ listar todos os destinatÃ¡rios da sua mensagem. Para o "
 "evitar, deverÃ¡ adicionar pelo menos um destinatÃ¡rio em Para: ou CC:."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:74
 msgid "Missing folder."
 msgstr "Pasta inexistente."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "Nenhuma origem seleccionada."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr ""
 "Abrir demasiadas mensagens simultaneamente poderÃ¡ demorar bastante tempo."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "Verifique as definiÃ§Ãµes da sua conta e tente novamente."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr "Active a conta ou envie utilizando outra conta."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:80
 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."
@@ -13736,7 +13749,7 @@ msgstr ""
 "Introduza um endereÃ§o de email vÃ¡lido no campo Para:. Pode procurar "
 "endereÃ§os de email premindo o botÃ£o Para: junto Ã  caixa de introduÃ§Ã£o."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13746,65 +13759,61 @@ msgstr ""
 "receber mensagens em HTML:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "Introduza um nome Ãºnico para identificar esta assinatura."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "Aguarde por favor."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:85
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problemas ao migrar a pasta de mensagens antiga \"{0}\"."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "A consultar o servidor para obter a lista de mecanismos de autenticaÃ§Ã£o "
 "suportados."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:87
 msgid "Read receipt requested."
 msgstr "Foi pedido um recibo de leitura."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:88
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Realmente apagar a pasta \"{0}\" e todas as suas subpastas?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:89
 msgid "Really delete folder \"{0}\"?"
 msgstr "Realmente apagar a pasta \"{0}\"?"
 
-#: ../mail/mail.error.xml.h:88
-msgid "Report Junk Failed"
-msgstr "Falha no Relato de Correio NÃ£o Solicitado"
-
-#: ../mail/mail.error.xml.h:89
-msgid "Report Not Junk Failed"
-msgstr "Falha no Relato da InexistÃªncia de Correio NÃ£o Solicitado"
-
 #: ../mail/mail.error.xml.h:90
+msgid "Reply _Privately"
+msgstr "Responder em _Privado"
+
+#: ../mail/mail.error.xml.h:93
 msgid "Search Folders automatically updated."
 msgstr "Pastas de Procura automaticamente actualizadas."
 
-#: ../mail/mail.error.xml.h:91
-msgid "Send Receipt"
-msgstr "Enviar Recibo"
+#: ../mail/mail.error.xml.h:94
+msgid "Send private reply?"
+msgstr "Enviar resposta privada?"
+
+#: ../mail/mail.error.xml.h:95
+msgid "Send reply to all recipients?"
+msgstr "Enviar resposta a todos os destinatÃ¡rios?"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:96
 msgid "Signature Already Exists"
 msgstr "Assinatura JÃ¡ Existe"
 
-#: ../mail/mail.error.xml.h:93
-msgid "Synchronize"
-msgstr "Sincronizar"
-
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:97
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Sincronizar as pastas localmente para utilizaÃ§Ã£o quando desligado?"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -13812,7 +13821,7 @@ msgstr ""
 "As pastas de sistema sÃ£o necessÃ¡rias para que o Evolution funcione "
 "correctamente pelo que nÃ£o podem ser renomeadas, movidas ou apagadas."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13829,35 +13838,7 @@ msgstr ""
 "adicionado, irÃ¡ listar todos os destinatÃ¡rios da sua mensagem. Para o "
 "evitar, deverÃ¡ adicionar pelo menos um destinatÃ¡rio em Para: ou CC:."
 
-#: ../mail/mail.error.xml.h:99
-msgid ""
-"The following Search Folder(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"A(s) seguinte(s) Pasta(s) de Procura:\n"
-"{0}\n"
-"Utilizavam a pasta agora removida:\n"
-"    \"{1}\"\n"
-"E foram actualizadas."
-
-#: ../mail/mail.error.xml.h:104
-msgid ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"A(s) seguinte(s) regra(s) de filtro:\n"
-"{0}\n"
-"Utilizavam a pasta agora removida:\n"
-"    \"{1}\"\n"
-"E foram actualizadas."
-
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:102
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -13865,7 +13846,7 @@ msgstr ""
 "O seguinte destinatÃ¡rio nÃ£o foi reconhecido como endereÃ§o de email vÃ¡lido:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -13874,11 +13855,11 @@ msgstr ""
 "vÃ¡lidos:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:106
 msgid "The script file must exist and be executable."
 msgstr "O ficheiro de script tem de existir e ser executÃ¡vel."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13886,7 +13867,7 @@ msgstr ""
 "Esta pasta poderÃ¡ ter sido adicionada implicitamente, utilize o editor\n"
 "de Pastas de Procura para a adicionar explicitamente, se necessÃ¡rio."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -13894,13 +13875,13 @@ msgstr ""
 "Esta mensagem nÃ£o pode ser enviada pois a conta seleccionada para a enviar "
 "nÃ£o estÃ¡ activa"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Esta mensagem nÃ£o pode ser enviada pois nÃ£o especificou nenhum destinatÃ¡rio"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -13908,11 +13889,11 @@ msgstr ""
 "Este servidor nÃ£o suporta este tipo de autenticaÃ§Ã£o e poderÃ¡ nÃ£o suportar "
 "autenticaÃ§Ã£o de todo."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:112
 msgid "This signature has been changed, but has not been saved."
 msgstr "Esta assinatura foi alterada, mas nÃ£o foi gravada."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -13920,11 +13901,15 @@ msgstr ""
 "Esta operaÃ§Ã£o irÃ¡ marcar todas as mensagens como lidas na pasta seleccionada "
 "e suas subpastas."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:114
+msgid "This will mark all messages as read in the selected folder."
+msgstr "IrÃ¡ marcar como lidas todas as mensagens na pasta seleccionada."
+
+#: ../mail/mail.error.xml.h:115
 msgid "Unable to connect to the GroupWise server."
 msgstr "Incapaz de se ligar ao servidor GroupWise."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -13932,19 +13917,19 @@ msgstr ""
 "Incapaz de abrir a pasta de rascunhos desta conta. Deseja utilizar a pasta "
 "de rascunhos do sistema?"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:117
 msgid "Unable to read license file."
 msgstr "Incapaz de ler o ficheiro de licenÃ§a."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:118
 msgid "Use _Default"
 msgstr "Utilizar Por _OmissÃ£o"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:119
 msgid "Use default drafts folder?"
 msgstr "Utilizar a pasta por omissÃ£o de rascunhos"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -13954,31 +13939,59 @@ msgstr ""
 "de uma das suas pastas locais ou remotas.\n"
 "Deseja mesmo fazÃª-lo?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:122
+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 "
+"you sure you want to proceed?"
+msgstr ""
+"EstÃ¡ a responder em privado a uma mensagem que recebeu atravÃ©s de uma lista "
+"de distribuiÃ§Ã£o, mas a lista estÃ¡ a tentar redireccionar a sua resposta para "
+"que seja distribuida. Tem a certeza de que deseja prosseguir?"
+
+#: ../mail/mail.error.xml.h:123
+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 "
+"proceed?"
+msgstr ""
+"EstÃ¡ a responder a uma mensagem que recebeu atravÃ©s de uma lista de "
+"distribuiÃ§Ã£o, mas estÃ¡ a responder em privado ao remetente, nÃ£o Ã  lista. Tem "
+"a certeza de que deseja prosseguir?"
+
+#: ../mail/mail.error.xml.h:124
+msgid ""
+"You are replying to a message which was sent to many recipients. Are you "
+"sure you want to reply to ALL of them?"
+msgstr ""
+"EstÃ¡ a responder a uma mensagem que foi enviada para vÃ¡rios destinatÃ¡rios. "
+"Tem a certeza de que deseja responder para TODOS?"
+
+#: ../mail/mail.error.xml.h:125
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "NÃ£o possui permissÃµes suficientes para apagar este correio."
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:126
 msgid "You have not filled in all of the required information."
 msgstr "NÃ£o preencheu toda a informaÃ§Ã£o necessÃ¡ria."
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:127
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Tem mensagens por enviar, ainda assim deseja sair?"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:128
 msgid "You may not create two accounts with the same name."
 msgstr "NÃ£o pode criar duas contas com o mesmo nome."
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:129
 msgid "You must name this Search Folder."
 msgstr "Tem de indicar um nome para esta Pasta de Procura."
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:130
 msgid "You must specify a folder."
 msgstr "Tem de especificar uma pasta."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:131
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13988,115 +14001,121 @@ msgstr ""
 "Pode seleccionar as pastas individualmente e/ou seleccionar todas as pastas "
 "locais, todas as remotas ou ambas."
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:133
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Falha ao iniciar sessÃ£o no servidor \"{0}\" como \"{0}\"."
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:134
 msgid "_Append"
 msgstr "_Acrescentar"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:135
+#: ../plugins/groupwise-features/junk-settings.ui.h:5
+#: ../plugins/publish-calendar/publish-calendar.c:596
+msgid "_Disable"
+msgstr "_Desactivar"
+
+#: ../mail/mail.error.xml.h:136
 msgid "_Discard changes"
 msgstr "_Descartar as alteraÃ§Ãµes"
 
-#: ../mail/mail.error.xml.h:139
-msgid "_Do not Synchronize"
-msgstr "_NÃ£o Sincronizar"
-
-#: ../mail/mail.error.xml.h:140
-#: ../modules/mail/e-mail-shell-view-actions.c:862
+#: ../mail/mail.error.xml.h:137
+#: ../modules/mail/e-mail-shell-view-actions.c:887
 msgid "_Empty Trash"
 msgstr "_Esvaziar o Lixo"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:138
 msgid "_Expunge"
 msgstr "_Expurgar"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:139
 msgid "_Open Messages"
 msgstr "_Abrir as Mensagens"
 
-#: ../mail/message-list.c:1122
+#: ../mail/mail.error.xml.h:142
+msgid "_Send Receipt"
+msgstr "_Enviar Recibo"
+
+#: ../mail/mail.error.xml.h:143
+msgid "_Synchronize"
+msgstr "_Sincronizar"
+
+#: ../mail/message-list.c:1172
 msgid "Unseen"
 msgstr "Por Ler"
 
-#: ../mail/message-list.c:1123
+#: ../mail/message-list.c:1173
 msgid "Seen"
 msgstr "Lida"
 
-#: ../mail/message-list.c:1124
+#: ../mail/message-list.c:1174
 msgid "Answered"
 msgstr "Respondida"
 
-#: ../mail/message-list.c:1125
+#: ../mail/message-list.c:1175
 msgid "Forwarded"
 msgstr "Reencaminhada"
 
-#: ../mail/message-list.c:1126
+#: ../mail/message-list.c:1176
 msgid "Multiple Unseen Messages"
 msgstr "MÃºltiplas Mensagens Por Ler"
 
-#: ../mail/message-list.c:1127
+#: ../mail/message-list.c:1177
 msgid "Multiple Messages"
 msgstr "MÃºltiplas Mensagens"
 
-#: ../mail/message-list.c:1131
+#: ../mail/message-list.c:1181
 msgid "Lowest"
 msgstr "Mais Baixo"
 
-#: ../mail/message-list.c:1132
+#: ../mail/message-list.c:1182
 msgid "Lower"
 msgstr "Baixo"
 
-#: ../mail/message-list.c:1136
+#: ../mail/message-list.c:1186
 msgid "Higher"
 msgstr "Alto"
 
-#: ../mail/message-list.c:1137
+#: ../mail/message-list.c:1187
 msgid "Highest"
 msgstr "Mais Alto"
 
-#: ../mail/message-list.c:1747 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1797 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1754 ../plugins/itip-formatter/itip-view.c:209
+#: ../mail/message-list.c:1804 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Hoje %l:%M %p"
 
-#: ../mail/message-list.c:1763
+#: ../mail/message-list.c:1813
 msgid "Yesterday %l:%M %p"
 msgstr "Ontem %l:%M %p"
 
-#: ../mail/message-list.c:1775
+#: ../mail/message-list.c:1825
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1783
+#: ../mail/message-list.c:1833
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1785
+#: ../mail/message-list.c:1835
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2537
+#: ../mail/message-list.c:2600
 msgid "Select all visible messages"
 msgstr "Seleccionar todas as mensagens visÃveis"
 
-#: ../mail/message-list.c:2588 ../shell/e-shell-view.c:723
-msgid "Shell Backend"
-msgstr "Motor de Consola"
-
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4399 ../mail/message-list.c:4895
+#: ../mail/message-list.c:4414 ../mail/message-list.c:4822
 msgid "Generating message list"
 msgstr "A gerar a lista de mensagens"
 
-#: ../mail/message-list.c:4726
+#: ../mail/message-list.c:4645
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -14104,15 +14123,7 @@ msgstr ""
 "Nenhuma mensagem satisfaz os seus critÃ©rios de pesquisa. Limpe a procura no "
 "item de menu Procurar->Limpar ou altere-a."
 
-#: ../mail/message-list.c:4728
-msgid ""
-"There are only hidden messages in this folder. Use View->Show Hidden "
-"Messages to show them."
-msgstr ""
-"Apenas existem mensagens escondidas nesta pasta. Utilize Ver->Apresentar "
-"Mensagens Escondidas para as ver."
-
-#: ../mail/message-list.c:4730
+#: ../mail/message-list.c:4647
 msgid "There are no messages in this folder."
 msgstr "NÃ£o existem mensagens nesta pasta."
 
@@ -14141,7 +14152,7 @@ msgid "Sent Messages"
 msgstr "Mensagens Enviadas"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:542
+#: ../widgets/misc/e-attachment-tree-view.c:570
 msgid "Size"
 msgstr "Tamanho"
 
@@ -14150,27 +14161,27 @@ msgid "Subject - Trimmed"
 msgstr "Assunto - EspaÃ§os Extra Expurgados"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
 msgid "Body contains"
 msgstr "Corpo contÃ©m"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1282
+#: ../modules/mail/e-mail-shell-view-actions.c:1285
 msgid "Message contains"
 msgstr "Mensagem contÃ©m"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1289
+#: ../modules/mail/e-mail-shell-view-actions.c:1292
 msgid "Recipients contain"
 msgstr "DestinatÃ¡rios contÃªm"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../modules/mail/e-mail-shell-view-actions.c:1299
 msgid "Sender contains"
 msgstr "Remetente contÃ©m"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1303
+#: ../modules/mail/e-mail-shell-view-actions.c:1306
 msgid "Subject contains"
 msgstr "Assunto contÃ©m"
 
@@ -14204,16 +14215,16 @@ msgstr ""
 "TLS. Isto significa que a sua ligaÃ§Ã£o serÃ¡ insegura e que estarÃ¡ vulnerÃ¡vel "
 "a abusos de seguranÃ§a."
 
-#: ../modules/addressbook/addressbook-config.c:592
-msgid "Use in _Birthday & Anniversaries calendar"
+#: ../modules/addressbook/addressbook-config.c:602
+msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "Utilizar no calendÃ¡rio de _Datas de Nascimento & AniversÃ¡rios"
 
-#: ../modules/addressbook/addressbook-config.c:628
+#: ../modules/addressbook/addressbook-config.c:638
 msgid "Copy _book content locally for offline operation"
 msgstr ""
 "Copiar o conteÃºdo do _livro localmente para trabalhar em modo desligado"
 
-#: ../modules/addressbook/addressbook-config.c:736
+#: ../modules/addressbook/addressbook-config.c:746
 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 "
@@ -14223,7 +14234,7 @@ msgstr ""
 "apresentada uma lista de portos standard. Pergunte ao administrador do seu "
 "sistema que porto deverÃ¡ seleccionar."
 
-#: ../modules/addressbook/addressbook-config.c:810
+#: ../modules/addressbook/addressbook-config.c:820
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -14233,7 +14244,7 @@ msgstr ""
 "configurar este parÃ¢metro para \"EndereÃ§o de Email\" requer acesso anÃ³nimo "
 "ao seu servidor LDAP."
 
-#: ../modules/addressbook/addressbook-config.c:885
+#: ../modules/addressbook/addressbook-config.c:895
 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 "
@@ -14245,29 +14256,29 @@ msgstr ""
 "abaixo da sua base de procura. Um Ã¢mbito de procura \"um\" incluirÃ¡ apenas "
 "as entradas um nÃvel abaixo da sua base."
 
-#: ../modules/addressbook/addressbook-config.c:991
+#: ../modules/addressbook/addressbook-config.c:1011
 msgid "Server Information"
 msgstr "InformaÃ§Ã£o de Servidor"
 
-#: ../modules/addressbook/addressbook-config.c:996
-#: ../smime/gui/smime-ui.ui.h:14
+#: ../modules/addressbook/addressbook-config.c:1016
+#: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "Detalhes"
 
-#: ../modules/addressbook/addressbook-config.c:997
+#: ../modules/addressbook/addressbook-config.c:1017
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "A procurar"
 
-#: ../modules/addressbook/addressbook-config.c:999
+#: ../modules/addressbook/addressbook-config.c:1019
 msgid "Downloading"
 msgstr "A Efectuar Download"
 
-#: ../modules/addressbook/addressbook-config.c:1205
+#: ../modules/addressbook/addressbook-config.c:1225
 msgid "Address Book Properties"
 msgstr "Propriedades do Livro de EndereÃ§os"
 
-#: ../modules/addressbook/addressbook-config.c:1207
+#: ../modules/addressbook/addressbook-config.c:1227
 msgid "New Address Book"
 msgstr "Novo Livro de EndereÃ§os"
 
@@ -14353,482 +14364,374 @@ msgstr ""
 msgid "Whether to show the preview pane."
 msgstr "Se apresentar ou nÃ£o o painel de antevisÃ£o."
 
-#: ../modules/addressbook/autocompletion-config.c:159
-msgid "Table column:"
-msgstr "Coluna da tabela:"
-
+#. 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:162
+#: ../modules/mail/em-mailer-prefs.c:1061
+msgid "_Table column:"
+msgstr "Coluna da _tabela:"
+
+#: ../modules/addressbook/autocompletion-config.c:165
 msgid "Autocompletion"
 msgstr "Completar Automaticamente"
 
-#: ../modules/addressbook/autocompletion-config.c:165
+#: ../modules/addressbook/autocompletion-config.c:168
 msgid "Always _show address of the autocompleted contact"
 msgstr "Apresentar _sempre o endereÃ§o de contactos auto-completados"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:190
-#: ../modules/addressbook/e-book-shell-migrate.c:517
+#: ../modules/addressbook/e-book-shell-backend.c:98
+#: ../modules/addressbook/e-book-shell-migrate.c:148
 msgid "On LDAP Servers"
 msgstr "Em Servidores LDAP"
 
-#: ../modules/addressbook/e-book-shell-backend.c:340
+#: ../modules/addressbook/e-book-shell-backend.c:280
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:755
+#: ../modules/addressbook/e-book-shell-backend.c:282
+#: ../modules/addressbook/e-book-shell-view-actions.c:773
 msgid "Create a new contact"
 msgstr "Criar um novo contacto"
 
-#: ../modules/addressbook/e-book-shell-backend.c:347
+#: ../modules/addressbook/e-book-shell-backend.c:287
 msgctxt "New"
 msgid "Contact _List"
 msgstr "_Lista de Contactos"
 
-#: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:762
+#: ../modules/addressbook/e-book-shell-backend.c:289
+#: ../modules/addressbook/e-book-shell-view-actions.c:780
 msgid "Create a new contact list"
 msgstr "Criar uma nova lista de contactos"
 
-#: ../modules/addressbook/e-book-shell-backend.c:357
+#: ../modules/addressbook/e-book-shell-backend.c:297
 msgctxt "New"
 msgid "Address _Book"
 msgstr "Livro de _EndereÃ§os"
 
-#: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:685
+#: ../modules/addressbook/e-book-shell-backend.c:299
+#: ../modules/addressbook/e-book-shell-view-actions.c:703
 msgid "Create a new address book"
 msgstr "Criar um novo livro de endereÃ§os"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:376
-#: ../modules/addressbook/e-book-shell-view.c:394
-#: ../modules/calendar/e-cal-shell-backend.c:123
-#: ../modules/calendar/e-cal-shell-migrate.c:480
+#: ../modules/addressbook/e-book-shell-backend.c:316
+#: ../modules/addressbook/e-book-shell-view.c:401
+#: ../modules/calendar/e-cal-shell-backend.c:104
+#: ../modules/calendar/e-cal-shell-migrate.c:57
 msgid "Contacts"
 msgstr "Contactos"
 
-#: ../modules/addressbook/e-book-shell-backend.c:596
-#: ../modules/calendar/e-cal-shell-backend.c:777
-#: ../modules/calendar/e-memo-shell-backend.c:587
-#: ../modules/calendar/e-task-shell-backend.c:597
-msgid "Source List"
-msgstr "Lista de Origem"
-
-#: ../modules/addressbook/e-book-shell-backend.c:597
-msgid "The registry of address books"
-msgstr "O registo de livros de endereÃ§os"
-
-#: ../modules/addressbook/e-book-shell-content.c:364
-msgid "Current View"
-msgstr "Vista Actual"
-
-#: ../modules/addressbook/e-book-shell-content.c:365
-msgid "The currently selected address book view"
-msgstr "A vista de livros de endereÃ§os actualmente seleccionada"
-
-#: ../modules/addressbook/e-book-shell-content.c:374
-msgid "Previewed Contact"
-msgstr "Contacto em AntevisÃ£o"
-
-#: ../modules/addressbook/e-book-shell-content.c:375
-msgid "The contact being shown in the preview pane"
-msgstr "O contacto que estÃ¡ a ser apresentado no painel de antevisÃ£o"
-
-#: ../modules/addressbook/e-book-shell-content.c:384
-#: ../modules/calendar/e-memo-shell-content.c:617
-#: ../modules/calendar/e-task-shell-content.c:639
-#: ../modules/mail/e-mail-shell-content.c:689
-msgid "Preview is Visible"
-msgstr "AntevisÃ£o estÃ¡ VisÃvel"
-
-#: ../modules/addressbook/e-book-shell-content.c:385
-#: ../modules/calendar/e-memo-shell-content.c:618
-#: ../modules/calendar/e-task-shell-content.c:640
-#: ../modules/mail/e-mail-shell-content.c:690
-msgid "Whether the preview pane is visible"
-msgstr "Se o painel de antevisÃ£o estÃ¡ ou nÃ£o visÃvel"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:645
-msgid "LDAP Servers"
-msgstr "Servidores LDAP"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:765
-msgid "Autocompletion Settings"
-msgstr "DefiniÃ§Ãµes de Completar Automaticamente"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1152
-msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"A localizaÃ§Ã£o e hierarquia das pastas de contactos Evolution foi alterada "
-"desde o Evolution 1.x.\n"
-"\n"
-"Aguarde enquanto o Evolution migra as suas pastas..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1166
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"O formato dos contactos de lista de distribuiÃ§Ã£o foi alterado.\n"
-"\n"
-"Aguarde enquanto o Evolution migra as suas pastas..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1175
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"A forma como o evolution armazena alguns nÃºmeros de telefone foi alterada.\n"
-"\n"
-"Aguarde enquanto o Evolution migra as suas pastas..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1185
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"O registo de alteraÃ§Ãµes Palm Sync e ficheiros de mapeamento do Evolution "
-"foram alterados.\n"
-"\n"
-"Aguarde enquanto o Evolution migra os seus dados Pilot Sync..."
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:181
-#: ../modules/calendar/e-cal-shell-sidebar.c:761
-#: ../modules/calendar/e-memo-shell-sidebar.c:687
-#: ../modules/calendar/e-task-shell-sidebar.c:687
-msgid "Source Selector Widget"
-msgstr "Widget de SelecÃ§Ã£o de Origem"
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:182
-msgid "This widget displays groups of address books"
-msgstr "Este widget apresenta grupos de livros de endereÃ§os"
+#: ../modules/addressbook/e-book-shell-backend.c:325
+msgid "Certificates"
+msgstr "Certificados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:262
-#: ../modules/addressbook/e-book-shell-view-actions.c:539
+#. 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
 msgid "Save as vCard"
 msgstr "Gravar como um vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:662
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
 msgid "Co_py All Contacts To..."
 msgstr "Co_piar Todos os Contactos Para..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:682
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Copiar os contactos do livro de endereÃ§os seleccionado para outro"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:669
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
 msgid "D_elete Address Book"
 msgstr "Apa_gar o Livro de EndereÃ§os"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:671
+#: ../modules/addressbook/e-book-shell-view-actions.c:689
 msgid "Delete the selected address book"
 msgstr "Apagar o livro de endereÃ§os seleccionado"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:676
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
 msgid "Mo_ve All Contacts To..."
 msgstr "Mo_ver Todos os Contactos Para..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:678
+#: ../modules/addressbook/e-book-shell-view-actions.c:696
 msgid "Move the contacts of the selected address book to another"
 msgstr "Mover os contactos do livro de endereÃ§os seleccionado para outro"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:683
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
 msgid "_New Address Book"
 msgstr "_Novo Livro de EndereÃ§os"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:690
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
 msgid "Address _Book Properties"
 msgstr "Propriedades do Livro de _EndereÃ§os"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:692
+#: ../modules/addressbook/e-book-shell-view-actions.c:710
 msgid "Show properties of the selected address book"
 msgstr "Apresentar as propriedades do livro de endereÃ§os seleccionado"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:697
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
-#: ../modules/calendar/e-memo-shell-view-actions.c:610
-#: ../modules/calendar/e-task-shell-view-actions.c:734
-#: ../modules/mail/e-mail-shell-view-actions.c:946
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
+#: ../modules/calendar/e-cal-shell-view-actions.c:1354
+#: ../modules/calendar/e-memo-shell-view-actions.c:620
+#: ../modules/calendar/e-task-shell-view-actions.c:744
+#: ../modules/mail/e-mail-shell-view-actions.c:971
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/addressbook/e-book-shell-view-actions.c:717
 msgid "Rename the selected address book"
 msgstr "Renomear o livro de endereÃ§os seleccionado"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:704
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
 msgid "S_ave Address Book as vCard"
 msgstr "Gr_avar o Livro de EndereÃ§os como vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:706
+#: ../modules/addressbook/e-book-shell-view-actions.c:724
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "Gravar os contactos do livro de endereÃ§os seleccionado como um vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:713
+#: ../modules/addressbook/e-book-shell-view-actions.c:731
 msgid "Stop loading"
 msgstr "Parar a leitura"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:718
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
 msgid "_Copy Contact To..."
 msgstr "_Copiar Contacto Para..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#: ../modules/addressbook/e-book-shell-view-actions.c:738
 msgid "Copy selected contacts to another address book"
 msgstr "Copiar os contactos seleccionados para outro livro de endereÃ§os"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:725
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
 msgid "_Delete Contact"
 msgstr "_Apagar Contacto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:732
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
 msgid "_Find in Contact..."
 msgstr "_Procurar no Contacto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#: ../modules/addressbook/e-book-shell-view-actions.c:752
 msgid "Search for text in the displayed contact"
 msgstr "Procurar texto no contacto apresentado"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:739
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
 msgid "_Forward Contact..."
 msgstr "_Reencaminhar o Contacto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:741
+#: ../modules/addressbook/e-book-shell-view-actions.c:759
 msgid "Send selected contacts to another person"
 msgstr "Enviar os contactos seleccionados a outra pessoa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:746
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
 msgid "_Move Contact To..."
 msgstr "_Mover o Contacto Para..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:748
+#: ../modules/addressbook/e-book-shell-view-actions.c:766
 msgid "Move selected contacts to another address book"
 msgstr "Mover os contactos seleccionados para outro livro de endereÃ§os"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:753
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "_New Contact..."
 msgstr "_Novo Contacto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:760
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
 msgid "New Contact _List..."
 msgstr "Nova _Lista de Contactos..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:767
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
 msgid "_Open Contact"
 msgstr "_Abrir o Contacto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:769
+#: ../modules/addressbook/e-book-shell-view-actions.c:787
 msgid "View the current contact"
 msgstr "Ver o contacto actual"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:774
+#: ../modules/addressbook/e-book-shell-view-actions.c:792
 msgid "_Send Message to Contact..."
 msgstr "_Enviar Mensagem a Contacto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:776
+#: ../modules/addressbook/e-book-shell-view-actions.c:794
 msgid "Send a message to the selected contacts"
 msgstr "Enviar uma mensagem aos contactos seleccionados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:783
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "_Actions"
 msgstr "_AcÃ§Ãµes"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:790
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
-#: ../modules/calendar/e-task-shell-view-actions.c:799
-#: ../modules/mail/e-mail-shell-view-actions.c:1090
+#: ../modules/addressbook/e-book-shell-view-actions.c:808
+#: ../modules/calendar/e-memo-shell-view-actions.c:657
+#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../modules/mail/e-mail-shell-view-actions.c:1094
 msgid "_Preview"
 msgstr "_Antever"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
-#: ../modules/calendar/e-memo-shell-view-actions.c:660
-#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../modules/addressbook/e-book-shell-view-actions.c:817
+#: ../modules/calendar/e-cal-shell-view-actions.c:1513
+#: ../modules/calendar/e-memo-shell-view-actions.c:670
+#: ../modules/calendar/e-task-shell-view-actions.c:822
 msgid "_Delete"
 msgstr "Apa_gar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:803
+#: ../modules/addressbook/e-book-shell-view-actions.c:821
 msgid "_Properties"
 msgstr "_Propriedades"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
+#. 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 "_Gravar como vCard..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../modules/addressbook/e-book-shell-view-actions.c:858
 msgid "Contact _Preview"
 msgstr "_AntevisÃ£o de Contacto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:841
+#: ../modules/addressbook/e-book-shell-view-actions.c:860
 msgid "Show contact preview window"
 msgstr "Apresentar a janela de antevisÃ£o de contacto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
-#: ../modules/calendar/e-memo-shell-view-actions.c:717
-#: ../modules/calendar/e-task-shell-view-actions.c:881
-#: ../modules/mail/e-mail-shell-view-actions.c:1185
+#: ../modules/addressbook/e-book-shell-view-actions.c:879
+#: ../modules/calendar/e-memo-shell-view-actions.c:727
+#: ../modules/calendar/e-task-shell-view-actions.c:891
+#: ../modules/mail/e-mail-shell-view-actions.c:1188
 msgid "_Classic View"
 msgstr "Vista _ClÃ¡ssica"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:862
+#: ../modules/addressbook/e-book-shell-view-actions.c:881
 msgid "Show contact preview below the contact list"
 msgstr "Apresentar a antevisÃ£o de contactos abaixo da lista de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
-#: ../modules/calendar/e-memo-shell-view-actions.c:724
-#: ../modules/calendar/e-task-shell-view-actions.c:888
-#: ../modules/mail/e-mail-shell-view-actions.c:1192
+#: ../modules/addressbook/e-book-shell-view-actions.c:886
+#: ../modules/calendar/e-memo-shell-view-actions.c:734
+#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/mail/e-mail-shell-view-actions.c:1195
 msgid "_Vertical View"
 msgstr "Vista _Vertical"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#: ../modules/addressbook/e-book-shell-view-actions.c:888
 msgid "Show contact preview alongside the contact list"
 msgstr "Apresentar a antevisÃ£o de contactos ao lado da lista de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
-#: ../modules/calendar/e-memo-shell-view-actions.c:734
-#: ../modules/calendar/e-task-shell-view-actions.c:905
+#: ../modules/addressbook/e-book-shell-view-actions.c:896
+#: ../modules/calendar/e-cal-shell-view-actions.c:1656
+#: ../modules/calendar/e-memo-shell-view-actions.c:744
+#: ../modules/calendar/e-task-shell-view-actions.c:915
 msgid "Any Category"
 msgstr "Qualquer Categoria"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
-#: ../modules/calendar/e-memo-shell-view-actions.c:741
-#: ../modules/calendar/e-task-shell-view-actions.c:940
+#: ../modules/addressbook/e-book-shell-view-actions.c:903
+#: ../modules/calendar/e-cal-shell-view-actions.c:1670
+#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-task-shell-view-actions.c:950
 msgid "Unmatched"
 msgstr "Sem equivalÃªncia"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:950
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
-#: ../shell/e-shell-content.c:516
+#: ../modules/addressbook/e-book-shell-view-actions.c:913
+#: ../modules/calendar/e-cal-shell-view-actions.c:1680
+#: ../modules/calendar/e-memo-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#: ../shell/e-shell-content.c:467
 msgid "Advanced Search"
 msgstr "Procura AvanÃ§ada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:946
 msgid "Print all shown contacts"
 msgstr "Imprimir todos os contactos apresentados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
 msgid "Preview the contacts to be printed"
 msgstr "Antever os contactos a serem impressos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "Print selected contacts"
 msgstr "Imprimir os contactos seleccionados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
-msgid "Save as vCard..."
-msgstr "Gravar como um vCard..."
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:958
+#: ../modules/addressbook/e-book-shell-view-actions.c:978
 msgid "Save selected contacts as a vCard"
 msgstr "Gravar os contactos seleccionados como um vCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:338
+#: ../modules/addressbook/e-book-shell-view.c:345
 msgid "_Forward Contacts"
 msgstr "_Reenviar Contactos"
 
-#: ../modules/addressbook/e-book-shell-view.c:340
+#: ../modules/addressbook/e-book-shell-view.c:347
 msgid "_Forward Contact"
 msgstr "_Reenviar Contacto"
 
-#: ../modules/addressbook/e-book-shell-view.c:371
+#: ../modules/addressbook/e-book-shell-view.c:378
 msgid "_Send Message to Contacts"
 msgstr "_Enviar Mensagem para os Contactos"
 
-#: ../modules/addressbook/e-book-shell-view.c:373
+#: ../modules/addressbook/e-book-shell-view.c:380
 msgid "_Send Message to List"
 msgstr "_Enviar Mensagem para a Lista"
 
-#: ../modules/addressbook/e-book-shell-view.c:375
+#: ../modules/addressbook/e-book-shell-view.c:382
 msgid "_Send Message to Contact"
 msgstr "_Enviar Mensagem para o Contacto"
 
-#: ../modules/addressbook/eab-composer-util.c:137
+#: ../modules/addressbook/eab-composer-util.c:143
 msgid "Multiple vCards"
 msgstr "MÃºltiplos vCards"
 
-#: ../modules/addressbook/eab-composer-util.c:145
+#: ../modules/addressbook/eab-composer-util.c:151
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard de %s"
 
-#: ../modules/addressbook/eab-composer-util.c:157
-#: ../modules/addressbook/eab-composer-util.c:184
+#: ../modules/addressbook/eab-composer-util.c:163
+#: ../modules/addressbook/eab-composer-util.c:190
 #, c-format
 msgid "Contact information"
 msgstr "InformaÃ§Ã£o de contacto"
 
-#: ../modules/addressbook/eab-composer-util.c:186
+#: ../modules/addressbook/eab-composer-util.c:192
 #, c-format
 msgid "Contact information for %s"
 msgstr "InformaÃ§Ã£o de contacto para %s"
 
-#: ../modules/addressbook/ldap-config.ui.h:1
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:2
 msgid "1"
 msgstr "1"
 
-#: ../modules/addressbook/ldap-config.ui.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../modules/addressbook/ldap-config.ui.h:3
-msgid "389"
-msgstr "389"
-
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:4
 msgid "5"
 msgstr "5"
 
 #: ../modules/addressbook/ldap-config.ui.h:5
-msgid "636"
-msgstr "636"
-
-#: ../modules/addressbook/ldap-config.ui.h:6
 msgid "Anonymously"
 msgstr "Anonimamente"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:8
+#: ../modules/addressbook/ldap-config.ui.h:7
 msgid "B_rowse this book until limit reached"
 msgstr "Navega_r neste livro atÃ© atingir o limite"
 
-#: ../modules/addressbook/ldap-config.ui.h:9
+#: ../modules/addressbook/ldap-config.ui.h:8
 msgid "Lo_gin:"
 msgstr "_SessÃ£o:"
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:12
+#: ../modules/addressbook/ldap-config.ui.h:11
 msgid "One"
 msgstr "Um"
 
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "Search Filter"
 msgstr "Filtro de Procura"
 
-#: ../modules/addressbook/ldap-config.ui.h:15
+#: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search _base:"
 msgstr "_Base da procura:"
 
-#: ../modules/addressbook/ldap-config.ui.h:16
+#: ../modules/addressbook/ldap-config.ui.h:15
 msgid "Search _filter:"
 msgstr "_Filtro de procura:"
 
-#: ../modules/addressbook/ldap-config.ui.h:17
+#: ../modules/addressbook/ldap-config.ui.h:16
 msgid ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on the type \"person\"."
@@ -14837,207 +14740,161 @@ msgstr ""
 "omissÃ£o a procura serÃ¡ realizada sobre o tipo \"person\" (pessoa)."
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:19
+#: ../modules/addressbook/ldap-config.ui.h:18
 msgid "Sub"
 msgstr "Sub"
 
-#: ../modules/addressbook/ldap-config.ui.h:20
+#: ../modules/addressbook/ldap-config.ui.h:19
 msgid "Supported Search Bases"
 msgstr "Bases de Procura Suportadas"
 
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/addressbook/ldap-config.ui.h:21
 msgid "Using distinguished name (DN)"
 msgstr "Utilizando o nome distinto (DN)"
 
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../modules/addressbook/ldap-config.ui.h:22
 msgid "Using email address"
 msgstr "Utilizar o endereÃ§o de email"
 
-#: ../modules/addressbook/ldap-config.ui.h:24
+#: ../modules/addressbook/ldap-config.ui.h:23
 msgid "_Download limit:"
 msgstr "Limite de _download:"
 
-#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../modules/addressbook/ldap-config.ui.h:24
 msgid "_Find Possible Search Bases"
 msgstr "Procurar PossÃveis _Bases de Procura"
 
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../modules/addressbook/ldap-config.ui.h:25
 msgid "_Login method:"
 msgstr "_MÃ©todo de autenticaÃ§Ã£o:"
 
-#: ../modules/addressbook/ldap-config.ui.h:28
+#: ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "_Porto:"
 
-#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
 msgstr "Ã?_mbito da procura:"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
+#: ../modules/addressbook/ldap-config.ui.h:30
 msgid "_Timeout:"
 msgstr "Limite de e_xpiraÃ§Ã£o:"
 
-#: ../modules/addressbook/ldap-config.ui.h:32
+#: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Use secure connection:"
 msgstr "_Utilizar uma ligaÃ§Ã£o segura:"
 
-#: ../modules/addressbook/ldap-config.ui.h:33
+#: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "cartÃµes"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:259
+#: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "I_mportar"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:341
+#: ../modules/calendar/e-cal-attachment-handler.c:343
 msgid "Select a Calendar"
 msgstr "Seleccionar um CalendÃ¡rio"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:368
+#: ../modules/calendar/e-cal-attachment-handler.c:370
 msgid "Select a Task List"
 msgstr "Seleccionar uma Lista de Tarefas"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:378
+#: ../modules/calendar/e-cal-attachment-handler.c:380
 msgid "I_mport to Calendar"
 msgstr "I_mportar para o CalendÃ¡rio"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:385
+#: ../modules/calendar/e-cal-attachment-handler.c:387
 msgid "I_mport to Tasks"
 msgstr "I_mportar para as Tarefas"
 
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:125
-#: ../modules/calendar/e-cal-shell-migrate.c:599
-#: ../modules/calendar/e-memo-shell-backend.c:110
+#: ../modules/calendar/e-cal-shell-backend.c:106
+#: ../modules/calendar/e-cal-shell-migrate.c:181
+#: ../modules/calendar/e-memo-shell-backend.c:94
 #: ../modules/calendar/e-memo-shell-migrate.c:136
-#: ../modules/calendar/e-task-shell-backend.c:113
-#: ../modules/calendar/e-task-shell-migrate.c:535
+#: ../modules/calendar/e-task-shell-backend.c:94
+#: ../modules/calendar/e-task-shell-migrate.c:145
 msgid "On The Web"
 msgstr "Na Web"
 
-#: ../modules/calendar/e-cal-shell-backend.c:127
+#: ../modules/calendar/e-cal-shell-backend.c:108
 #: ../plugins/calendar-weather/calendar-weather.c:117
 msgid "Weather"
 msgstr "O Tempo"
 
-#: ../modules/calendar/e-cal-shell-backend.c:242
-#: ../modules/calendar/e-cal-shell-migrate.c:483
+#: ../modules/calendar/e-cal-shell-backend.c:193
+#: ../modules/calendar/e-cal-shell-migrate.c:60
 msgid "Birthdays & Anniversaries"
 msgstr "Datas de Nascimento & AniversÃ¡rios"
 
-#: ../modules/calendar/e-cal-shell-backend.c:446
+#: ../modules/calendar/e-cal-shell-backend.c:406
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Compromisso"
 
-#: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-backend.c:408
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
 msgid "Create a new appointment"
 msgstr "Criar um novo compromisso"
 
-#: ../modules/calendar/e-cal-shell-backend.c:453
+#: ../modules/calendar/e-cal-shell-backend.c:413
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Com_promisso de Dia Completo"
 
-#: ../modules/calendar/e-cal-shell-backend.c:455
+#: ../modules/calendar/e-cal-shell-backend.c:415
 msgid "Create a new all-day appointment"
 msgstr "Criar um novo compromisso de dia completo"
 
-#: ../modules/calendar/e-cal-shell-backend.c:460
+#: ../modules/calendar/e-cal-shell-backend.c:420
 msgctxt "New"
 msgid "M_eeting"
 msgstr "R_euniÃ£o"
 
-#: ../modules/calendar/e-cal-shell-backend.c:462
+#: ../modules/calendar/e-cal-shell-backend.c:422
 msgid "Create a new meeting request"
 msgstr "Criar uma nova convocatÃ³ria de reuniÃ£o"
 
-#: ../modules/calendar/e-cal-shell-backend.c:470
+#: ../modules/calendar/e-cal-shell-backend.c:430
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Cale_ndÃ¡rio"
 
-#: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+#: ../modules/calendar/e-cal-shell-backend.c:432
+#: ../modules/calendar/e-cal-shell-view-actions.c:1328
 msgid "Create a new calendar"
 msgstr "Criar um novo calendÃ¡rio"
 
-#: ../modules/calendar/e-cal-shell-backend.c:507
-#: ../plugins/itip-formatter/itip-formatter.c:2657
+#: ../modules/calendar/e-cal-shell-backend.c:717
+#: ../plugins/itip-formatter/itip-formatter.c:2669
 msgid "Calendar and Tasks"
 msgstr "CalendÃ¡rio e Tarefas"
 
-#: ../modules/calendar/e-cal-shell-backend.c:778
-msgid "The registry of calendars"
-msgstr "O registo de calendÃ¡rios"
-
-#: ../modules/calendar/e-cal-shell-migrate.c:131
-msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"A localizaÃ§Ã£o e hierarquia da pasta de calendÃ¡rios do Evolution foi alterada "
-"desde o Evolution 1.x.\n"
-"\n"
-"Aguarde enquanto o Evolution migra as suas pastas..."
-
-#. FIXME: set proper domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:664
-#: ../modules/calendar/e-task-shell-migrate.c:591
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "Incapaz de migrar as configuraÃ§Ãµes antigas de evolution/config.xmldb"
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:693
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "Incapaz de migrar o calendÃ¡rio `%s'"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:167
-#: ../modules/calendar/e-memo-shell-sidebar.c:162
-#: ../modules/calendar/e-task-shell-sidebar.c:162
-#, c-format
+#: ../modules/calendar/e-cal-shell-sidebar.c:172
+#, fuzzy, c-format
 msgid ""
-"Error on %s\n"
+"Error on %s: %s\n"
 "%s"
 msgstr ""
 "Erro em %s\n"
 " %s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:226
+#: ../modules/calendar/e-cal-shell-sidebar.c:239
 msgid "Loading calendars"
 msgstr "A Ler os calendÃ¡rios"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:615
+#: ../modules/calendar/e-cal-shell-sidebar.c:674
+msgid "_New Calendar..."
+msgstr "_Novo CalendÃ¡rio..."
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:691
 msgid "Calendar Selector"
 msgstr "Selector de CalendÃ¡rios"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:741
-msgid "Date Navigator Widget"
-msgstr "Widget de NavegaÃ§Ã£o de Datas"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:742
-msgid "This widget displays a miniature calendar"
-msgstr "Este widget apresenta um calendÃ¡rio em miniatura"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:751
-msgid "Default Calendar Client"
-msgstr "Cliente de CalendÃ¡rio por OmissÃ£o"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:752
-msgid "Default client for calendar operations"
-msgstr "Cliente por omissÃ£o para operaÃ§Ãµes de calendÃ¡rio"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:762
-msgid "This widget displays groups of calendars"
-msgstr "Este widget apresenta grupos de calendÃ¡rios"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:950
+#: ../modules/calendar/e-cal-shell-sidebar.c:1032
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "A abrir o calendÃ¡rio em %s"
@@ -15067,298 +14924,298 @@ msgstr "Expurgar eventos mais antigos do que"
 msgid "Copying Items"
 msgstr "A Copiar Itens"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:796
+#: ../modules/calendar/e-cal-shell-view-actions.c:804
 msgid "Moving Items"
 msgstr "A Mover 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:1098
+#: ../modules/calendar/e-cal-shell-view-actions.c:1126
 msgid "event"
 msgstr "evento"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1100
-#: ../modules/calendar/e-cal-shell-view-memopad.c:209
+#: ../modules/calendar/e-cal-shell-view-actions.c:1128
+#: ../modules/calendar/e-cal-shell-view-memopad.c:210
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:277
-#: ../modules/calendar/e-memo-shell-view-actions.c:494
-#: ../modules/calendar/e-task-shell-view-actions.c:611
+#: ../modules/calendar/e-memo-shell-view-actions.c:504
+#: ../modules/calendar/e-task-shell-view-actions.c:621
 msgid "Save as iCalendar"
 msgstr "Gravar como iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1230
-#: ../modules/calendar/e-memo-shell-view-actions.c:575
+#: ../modules/calendar/e-cal-shell-view-actions.c:1284
+#: ../modules/calendar/e-memo-shell-view-actions.c:585
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-cal-shell-view-actions.c:1291
 msgid "D_elete Calendar"
 msgstr "Apagar Cal_endÃ¡rio"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1239
+#: ../modules/calendar/e-cal-shell-view-actions.c:1293
 msgid "Delete the selected calendar"
 msgstr "Renomear o calendÃ¡rio seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#: ../modules/calendar/e-cal-shell-view-actions.c:1300
 msgid "Go Back"
 msgstr "Retroceder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+#: ../modules/calendar/e-cal-shell-view-actions.c:1307
 msgid "Go Forward"
 msgstr "AvanÃ§ar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
-msgid "Select _Today"
-msgstr "Seleccionar _Hoje"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+#: ../modules/calendar/e-cal-shell-view-actions.c:1314
 msgid "Select today"
 msgstr "Seleccionar hoje"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Select _Date"
 msgstr "Seleccionar a _Data"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+#: ../modules/calendar/e-cal-shell-view-actions.c:1321
 msgid "Select a specific date"
 msgstr "Seleccionar uma data especÃfica"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "_New Calendar"
 msgstr "_Novo CalendÃ¡rio"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1286
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-actions.c:1340
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "Purg_e"
 msgstr "_Expurgar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
 msgid "Purge old appointments and meetings"
 msgstr "Expurgar os compromissos e eventos antigos"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
-#: ../modules/calendar/e-memo-shell-view-actions.c:603
-#: ../modules/calendar/e-task-shell-view-actions.c:727
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
+#: ../modules/calendar/e-memo-shell-view-actions.c:613
+#: ../modules/calendar/e-task-shell-view-actions.c:737
 msgid "Re_fresh"
 msgstr "Act_ualizar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
 msgid "Refresh the selected calendar"
 msgstr "Actualizar o calendÃ¡rio seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
 msgid "Rename the selected calendar"
 msgstr "Renomear o calendÃ¡rio seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1361
 msgid "Show _Only This Calendar"
 msgstr "_Apresentar Apenas Este CalendÃ¡rio"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1368
 msgid "Cop_y to Calendar..."
 msgstr "Cop_iar para o CalendÃ¡rio..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "_Delegate Meeting..."
 msgstr "_Delegar ReuniÃ£o..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-view-actions.c:1382
 msgid "_Delete Appointment"
 msgstr "_Apagar o Compromisso"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1384
 msgid "Delete selected appointments"
 msgstr "Apagar os compromissos seleccionados"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-cal-shell-view-actions.c:1389
 msgid "Delete This _Occurrence"
 msgstr "Apagar Esta _OcorrÃªncia"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
 msgid "Delete this occurrence"
 msgstr "Apagar esta ocorrÃªncia"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Delete All Occ_urrences"
 msgstr "Apagar _Todas as OcorrÃªncias"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
 msgid "Delete all occurrences"
 msgstr "Apagar todas as ocorrÃªncias"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "New All Day _Event..."
 msgstr "Novo _Evento de Dia Completo..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
 msgid "Create a new all day event"
 msgstr "Criar um novo compromisso de dia completo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
-#: ../modules/calendar/e-cal-shell-view-memopad.c:243
+#: ../modules/calendar/e-cal-shell-view-actions.c:1410
+#: ../modules/calendar/e-cal-shell-view-memopad.c:244
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:568
-#: ../modules/calendar/e-task-shell-view-actions.c:692
+#: ../modules/calendar/e-memo-shell-view-actions.c:578
+#: ../modules/calendar/e-task-shell-view-actions.c:702
 msgid "_Forward as iCalendar..."
 msgstr "_Reenviar como iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
 msgid "New _Meeting..."
 msgstr "Nova _ReuniÃ£o..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "Create a new meeting"
 msgstr "Criar uma nova reuniÃ£o"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1424
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver para o CalendÃ¡rio..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1431
 msgid "New _Appointment..."
 msgstr "Novo _Compromisso..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1438
 msgid "Make this Occurrence _Movable"
 msgstr "Tornar esta OcorrÃªncia _MÃ³vel"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1445
 msgid "_Open Appointment"
 msgstr "_Abrir o Compromisso"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
 msgid "View the current appointment"
 msgstr "Ver o compromisso actual"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1452
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+#: ../modules/calendar/e-cal-shell-view-actions.c:1466
+#: ../modules/calendar/e-cal-shell-view-memopad.c:272
 msgid "Save as iCalendar..."
 msgstr "Gravar como iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1473
 msgid "_Schedule Meeting..."
 msgstr "A_gendar ReuniÃ£o..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
 msgid "Converts an appointment to a meeting"
 msgstr "Converte um compromisso numa reuniÃ£o"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1480
 msgid "Conv_ert to Appointment..."
 msgstr "Conv_erter em Compromisso..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
 msgid "Converts a meeting to an appointment"
 msgstr "Converte uma reuniÃ£o num compromisso"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1487
+msgid "Quit"
+msgstr "Sair"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
 msgid "Day"
 msgstr "Dia"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/calendar/e-cal-shell-view-actions.c:1613
 msgid "Show one day"
 msgstr "Apresentar um dia"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
 msgid "List"
 msgstr "Lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1620
 msgid "Show as list"
 msgstr "Apresentar como lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
 msgid "Month"
 msgstr "MÃªs"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1627
 msgid "Show one month"
 msgstr "Apresentar um mÃªs"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1632
 msgid "Week"
 msgstr "Semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-cal-shell-view-actions.c:1634
 msgid "Show one week"
 msgstr "Apresentar uma semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1641
 msgid "Show one work week"
 msgstr "Apresentar uma semana de trabalho"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1649
 msgid "Active Appointments"
 msgstr "Compromissos Activos"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-cal-shell-view-actions.c:1663
 msgid "Next 7 Days' Appointments"
 msgstr "Compromissos dos PrÃ³ximos 7 Dias"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
-#: ../modules/calendar/e-memo-shell-view-actions.c:765
-#: ../modules/calendar/e-task-shell-view-actions.c:964
+#: ../modules/calendar/e-cal-shell-view-actions.c:1694
+#: ../modules/calendar/e-memo-shell-view-actions.c:775
+#: ../modules/calendar/e-task-shell-view-actions.c:974
 msgid "Description contains"
 msgstr "DescriÃ§Ã£o contÃ©m"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
-#: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/calendar/e-cal-shell-view-actions.c:1701
+#: ../modules/calendar/e-memo-shell-view-actions.c:782
+#: ../modules/calendar/e-task-shell-view-actions.c:981
 msgid "Summary contains"
 msgstr "Resumo contÃ©m"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1652
+#: ../modules/calendar/e-cal-shell-view-actions.c:1713
 msgid "Print this calendar"
 msgstr "Imprimir este calendÃ¡rio"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1720
 msgid "Preview the calendar to be printed"
 msgstr "Antever o calendÃ¡rio a ser impresso"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1793
 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:207
-#: ../modules/calendar/e-memo-shell-view-actions.c:492
+#: ../modules/calendar/e-cal-shell-view-memopad.c:208
+#: ../modules/calendar/e-memo-shell-view-actions.c:502
 msgid "memo"
 msgstr "memo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-memo-shell-view-actions.c:624
+#: ../modules/calendar/e-cal-shell-view-memopad.c:251
+#: ../modules/calendar/e-memo-shell-view-actions.c:634
 msgid "New _Memo"
 msgstr "Novo _Memo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:252
-#: ../modules/calendar/e-memo-shell-backend.c:320
-#: ../modules/calendar/e-memo-shell-view-actions.c:626
+#: ../modules/calendar/e-cal-shell-view-memopad.c:253
+#: ../modules/calendar/e-memo-shell-backend.c:281
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
 msgid "Create a new memo"
 msgstr "Criar um novo memo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:631
+#: ../modules/calendar/e-cal-shell-view-memopad.c:258
+#: ../modules/calendar/e-memo-shell-view-actions.c:641
 msgid "_Open Memo"
 msgstr "_Abrir o Memo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-cal-shell-view-memopad.c:260
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
 msgid "View the selected memo"
 msgstr "Ver o memo seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-memopad.c:265
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:352
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
-#: ../modules/calendar/e-task-shell-view-actions.c:776
+#: ../modules/calendar/e-memo-shell-view-actions.c:648
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "Open _Web Page"
 msgstr "Abrir PÃ¡gina _Web"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#: ../modules/calendar/e-cal-shell-view-memopad.c:284
+#: ../modules/calendar/e-memo-shell-view-actions.c:808
 msgid "Print the selected memo"
 msgstr "Imprimir o memo seleccionado"
 
@@ -15367,22 +15224,22 @@ msgstr "Imprimir o memo seleccionado"
 #. 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:275
-#: ../modules/calendar/e-task-shell-view-actions.c:609
+#: ../modules/calendar/e-task-shell-view-actions.c:619
 msgid "task"
 msgstr "tarefa"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:671
+#: ../modules/calendar/e-task-shell-view-actions.c:681
 msgid "_Assign Task"
 msgstr "_Atribuir a Tarefa"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 msgid "_Mark as Complete"
 msgstr "_Marcar como Terminada"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:760
 msgid "Mark selected tasks as complete"
 msgstr "Marcar as Tarefas Seleccionadas como Terminadas"
 
@@ -15391,96 +15248,86 @@ msgid "_Mark as Incomplete"
 msgstr "_Marcar como Incompleta"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:767
 msgid "Mark selected tasks as incomplete"
 msgstr "Marcar as tarefas seleccionadas como incompletas"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 msgid "New _Task"
 msgstr "Nova _Tarefa"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
-#: ../modules/calendar/e-task-shell-backend.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-backend.c:280
+#: ../modules/calendar/e-task-shell-view-actions.c:774
 msgid "Create a new task"
 msgstr "Criar uma nova tarefa"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:779
 msgid "_Open Task"
 msgstr "_Abrir a Tarefa"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "View the selected task"
 msgstr "Ver a tarefa seleccionada"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1012
+#: ../modules/calendar/e-memo-shell-view-actions.c:823
+#: ../modules/calendar/e-task-shell-view-actions.c:1022
 msgid "_Save as iCalendar..."
 msgstr "_Gravar como iCalendar..."
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:997
+#: ../modules/calendar/e-task-shell-view-actions.c:1007
 msgid "Print the selected task"
 msgstr "Imprimir a tarefa seleccionada"
 
-#: ../modules/calendar/e-memo-shell-backend.c:318
+#: ../modules/calendar/e-memo-shell-backend.c:279
 msgctxt "New"
 msgid "Mem_o"
 msgstr "Mem_o"
 
-#: ../modules/calendar/e-memo-shell-backend.c:325
+#: ../modules/calendar/e-memo-shell-backend.c:286
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "Memo Partil_hado"
 
-#: ../modules/calendar/e-memo-shell-backend.c:327
+#: ../modules/calendar/e-memo-shell-backend.c:288
 msgid "Create a new shared memo"
 msgstr "Criar um novo memo partilhado"
 
-#: ../modules/calendar/e-memo-shell-backend.c:335
+#: ../modules/calendar/e-memo-shell-backend.c:296
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Li_sta de Memos"
 
-#: ../modules/calendar/e-memo-shell-backend.c:337
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-memo-shell-backend.c:298
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
 msgid "Create a new memo list"
 msgstr "Criar uma nova lista de memos"
 
-#: ../modules/calendar/e-memo-shell-backend.c:588
-msgid "The registry of memo lists"
-msgstr "O registo de listas de memos"
-
-#: ../modules/calendar/e-memo-shell-content.c:608
-msgid "The memo table model"
-msgstr "O modelo da tabela de memos"
+#: ../modules/calendar/e-memo-shell-sidebar.c:165
+#: ../modules/calendar/e-task-shell-sidebar.c:165
+#, c-format
+msgid ""
+"Error on %s\n"
+"%s"
+msgstr ""
+"Erro em %s\n"
+" %s"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:221
+#: ../modules/calendar/e-memo-shell-sidebar.c:233
 msgid "Loading memos"
 msgstr "A ler os memos"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:569
+#: ../modules/calendar/e-memo-shell-sidebar.c:613
 msgid "Memo List Selector"
 msgstr "Selector de Lista de Memos"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:677
-msgid "Default Memo Client"
-msgstr "Cliente de Memos por OmissÃ£o"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:678
-msgid "Default client for memo operations"
-msgstr "Cliente por omissÃ£o para operaÃ§Ãµes sobre memos"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:688
-msgid "This widget displays groups of memo lists"
-msgstr "Este widget apresenta grupos de listas de memos"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:868
+#: ../modules/calendar/e-memo-shell-sidebar.c:918
 #, c-format
 msgid "Opening memos at %s"
 msgstr "A abrir os memos em %s"
@@ -15490,75 +15337,75 @@ msgstr "A abrir os memos em %s"
 msgid "Print Memos"
 msgstr "Imprimir Memos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:554
+#: ../modules/calendar/e-memo-shell-view-actions.c:564
 msgid "_Delete Memo"
 msgstr "_Apagar o Memo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:561
+#: ../modules/calendar/e-memo-shell-view-actions.c:571
 msgid "_Find in Memo..."
 msgstr "_Procurar no Memo..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:563
+#: ../modules/calendar/e-memo-shell-view-actions.c:573
 msgid "Search for text in the displayed memo"
 msgstr "Procurar texto no memo apresentado"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:582
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
 msgid "D_elete Memo List"
 msgstr "_Apagar a Lista de Memos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#: ../modules/calendar/e-memo-shell-view-actions.c:594
 msgid "Delete the selected memo list"
 msgstr "Apagar a lista de memos seleccionada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:589
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
 msgid "_New Memo List"
 msgstr "_Nova Lista de Memos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
 msgid "Refresh the selected memo list"
 msgstr "Actualizar a lista de memos seleccionada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
 msgid "Rename the selected memo list"
 msgstr "Renomear a lista de memos seleccionada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#: ../modules/calendar/e-memo-shell-view-actions.c:627
 msgid "Show _Only This Memo List"
 msgstr "_Apresentar Apenas Esta Lista de Memos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:696
+#: ../modules/calendar/e-memo-shell-view-actions.c:706
 msgid "Memo _Preview"
 msgstr "_Antever Memo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:698
+#: ../modules/calendar/e-memo-shell-view-actions.c:708
 msgid "Show memo preview pane"
 msgstr "Apresentar o painel de antevisÃ£o de memo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:719
+#: ../modules/calendar/e-memo-shell-view-actions.c:729
 msgid "Show memo preview below the memo list"
 msgstr "Apresentar a antevisÃ£o de memos por baixo da lista de memos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-memo-shell-view-actions.c:736
 msgid "Show memo preview alongside the memo list"
 msgstr "Apresentar a antevisÃ£o de memos ao lado da lista de memos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:784
+#: ../modules/calendar/e-memo-shell-view-actions.c:794
 msgid "Print the list of memos"
 msgstr "Imprime a lista de memos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#: ../modules/calendar/e-memo-shell-view-actions.c:801
 msgid "Preview the list of memos to be printed"
 msgstr "Antever a lista de memos a serem impressos"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:416
+#: ../modules/calendar/e-memo-shell-view-private.c:417
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d memo"
 msgstr[1] "%d memos"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:420
-#: ../modules/calendar/e-task-shell-view-private.c:569
+#: ../modules/calendar/e-memo-shell-view-private.c:421
+#: ../modules/calendar/e-task-shell-view-private.c:570
 #, c-format
 msgid "%d selected"
 msgstr "%d seleccionado"
@@ -15571,78 +15418,40 @@ msgstr "Apagar Memos"
 msgid "Delete Memo"
 msgstr "Apagar o Memo"
 
-#: ../modules/calendar/e-task-shell-backend.c:322
+#: ../modules/calendar/e-task-shell-backend.c:278
 msgctxt "New"
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: ../modules/calendar/e-task-shell-backend.c:329
+#: ../modules/calendar/e-task-shell-backend.c:285
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tarefa AtribuÃ_da"
 
-#: ../modules/calendar/e-task-shell-backend.c:331
+#: ../modules/calendar/e-task-shell-backend.c:287
 msgid "Create a new assigned task"
 msgstr "Criar uma nova tarefa atribuÃda"
 
-#: ../modules/calendar/e-task-shell-backend.c:339
+#: ../modules/calendar/e-task-shell-backend.c:295
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Lista de _Tarefas"
 
-#: ../modules/calendar/e-task-shell-backend.c:341
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-backend.c:297
+#: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "Create a new task list"
 msgstr "Criar uma nova lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-backend.c:598
-msgid "The registry of task lists"
-msgstr "O registo de listas de tarefas"
-
-#: ../modules/calendar/e-task-shell-content.c:630
-msgid "The task table model"
-msgstr "O modelo da tabela de tarefas"
-
-#: ../modules/calendar/e-task-shell-migrate.c:98
-msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"A localizaÃ§Ã£o e hierarquia da pasta de tarefas do Evolution foi alterada "
-"desde o Evolution 1.x.\n"
-"\n"
-"Aguarde enquanto o Evolution migra as suas pastas..."
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-task-shell-migrate.c:620
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "Incapaz de migrar as tarefas `%s'"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:221
+#: ../modules/calendar/e-task-shell-sidebar.c:233
 msgid "Loading tasks"
 msgstr "A ler as tarefas"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:569
+#: ../modules/calendar/e-task-shell-sidebar.c:613
 msgid "Task List Selector"
 msgstr "Selector de Lista de Tarefas"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:677
-msgid "Default Task Client"
-msgstr "Cliente de Tarefas por OmissÃ£o"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:678
-msgid "Default client for task operations"
-msgstr "Cliente por omissÃ£o para operaÃ§Ãµes sobre tarefas"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:688
-msgid "This widget displays groups of task lists"
-msgstr "Este widget apresenta grupos de listas de tarefas"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:868
+#: ../modules/calendar/e-task-shell-sidebar.c:918
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "A abrir tarefas em %s"
@@ -15652,7 +15461,7 @@ msgstr "A abrir tarefas em %s"
 msgid "Print Tasks"
 msgstr "Imprimir as Tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:553
+#: ../modules/calendar/e-task-shell-view-actions.c:563
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15664,97 +15473,97 @@ msgstr ""
 "\n"
 "Apagar mesmo estas tarefas?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:678
+#: ../modules/calendar/e-task-shell-view-actions.c:688
 msgid "_Delete Task"
 msgstr "_Apagar Tarefa"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:685
+#: ../modules/calendar/e-task-shell-view-actions.c:695
 msgid "_Find in Task..."
 msgstr "_Procurar na Tarefa..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:687
+#: ../modules/calendar/e-task-shell-view-actions.c:697
 msgid "Search for text in the displayed task"
 msgstr "Procurar texto na tarefa apresentada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:699
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 msgid "Copy..."
 msgstr "Copiar..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:706
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 msgid "D_elete Task List"
 msgstr "A_pagar a Lista de Tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-task-shell-view-actions.c:718
 msgid "Delete the selected task list"
 msgstr "Apagar a lista de tarefas seleccionada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:713
+#: ../modules/calendar/e-task-shell-view-actions.c:723
 msgid "_New Task List"
 msgstr "_Nova Lista de Tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "Refresh the selected task list"
 msgstr "Actualizar a lista de tarefas seleccionada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:736
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "Rename the selected task list"
 msgstr "Renomear a lista de tarefas seleccionada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:751
 msgid "Show _Only This Task List"
 msgstr "_Apresentar Apenas Esta Lista de Tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:765
 msgid "Mar_k as Incomplete"
 msgstr "Mar_car como Incompleta"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "Delete completed tasks"
 msgstr "Apagar as tarefas terminadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:860
+#: ../modules/calendar/e-task-shell-view-actions.c:870
 msgid "Task _Preview"
 msgstr "_AntevisÃ£o de Tarefa"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:862
+#: ../modules/calendar/e-task-shell-view-actions.c:872
 msgid "Show task preview pane"
 msgstr "Apresentar o painel de antevisÃ£o de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:883
+#: ../modules/calendar/e-task-shell-view-actions.c:893
 msgid "Show task preview below the task list"
 msgstr ""
 "Apresentar o painel de antevisÃ£o de tarefas por baixo da lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:890
+#: ../modules/calendar/e-task-shell-view-actions.c:900
 msgid "Show task preview alongside the task list"
 msgstr ""
 "Apresentar o painel de antevisÃ£o de tarefas ao lado da lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/calendar/e-task-shell-view-actions.c:908
 msgid "Active Tasks"
 msgstr "Tarefas Activas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:912
+#: ../modules/calendar/e-task-shell-view-actions.c:922
 msgid "Completed Tasks"
 msgstr "Tarefas Terminadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:919
+#: ../modules/calendar/e-task-shell-view-actions.c:929
 msgid "Next 7 Days' Tasks"
 msgstr "Tarefas dos PrÃ³ximos 7 Dias"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../modules/calendar/e-task-shell-view-actions.c:936
 msgid "Overdue Tasks"
 msgstr "Tarefas Atrasadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:933
+#: ../modules/calendar/e-task-shell-view-actions.c:943
 msgid "Tasks with Attachments"
 msgstr "Tarefas com Anexos"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:983
+#: ../modules/calendar/e-task-shell-view-actions.c:993
 msgid "Print the list of tasks"
 msgstr "Imprimir a lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:990
+#: ../modules/calendar/e-task-shell-view-actions.c:1000
 msgid "Preview the list of tasks to be printed"
 msgstr "Antever a lista de tarefas a ser impressa"
 
@@ -15762,7 +15571,7 @@ msgstr "Antever a lista de tarefas a ser impressa"
 msgid "Expunging"
 msgstr "A expurgar"
 
-#: ../modules/calendar/e-task-shell-view-private.c:565
+#: ../modules/calendar/e-task-shell-view-private.c:566
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -15778,494 +15587,513 @@ msgid "Delete Task"
 msgstr "Apagar a Tarefa"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:335
+#: ../modules/mail/e-mail-attachment-handler.c:345
 #, c-format
 msgid "%d attached messages"
 msgstr "%d mensagens anexas"
 
 #. Translators: "None" for a junk hook name,
 #. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:90
+#: ../modules/mail/e-mail-junk-hook.c:89
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "Nenhum"
 
-#: ../modules/mail/e-mail-shell-backend.c:168
+#: ../modules/mail/e-mail-shell-backend.c:171
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mensagem de Email"
 
-#: ../modules/mail/e-mail-shell-backend.c:170
+#: ../modules/mail/e-mail-shell-backend.c:173
 msgid "Compose a new mail message"
 msgstr "Compor uma nova mensagem de email"
 
-#: ../modules/mail/e-mail-shell-backend.c:178
+#: ../modules/mail/e-mail-shell-backend.c:181
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Pasta de Mensagens"
 
-#: ../modules/mail/e-mail-shell-backend.c:180
+#: ../modules/mail/e-mail-shell-backend.c:183
 msgid "Create a new mail folder"
 msgstr "Criar uma nova pasta de mensagens"
 
-#: ../modules/mail/e-mail-shell-backend.c:199
+#: ../modules/mail/e-mail-shell-backend.c:481
 msgid "Mail Accounts"
 msgstr "Contas de Email"
 
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:489
 msgid "Mail Preferences"
 msgstr "PreferÃªncias do Email"
 
-#: ../modules/mail/e-mail-shell-backend.c:215
+#: ../modules/mail/e-mail-shell-backend.c:497
 msgid "Composer Preferences"
 msgstr "PreferÃªncias do Compositor"
 
-#: ../modules/mail/e-mail-shell-backend.c:223
+#: ../modules/mail/e-mail-shell-backend.c:505
 msgid "Network Preferences"
 msgstr "PreferÃªncias de Rede"
 
-#: ../modules/mail/e-mail-shell-content.c:679
-msgid "Group by Threads"
-msgstr "Agrupar Por Ã?rvores"
-
-#: ../modules/mail/e-mail-shell-content.c:680
-msgid "Whether to group messages by threads"
-msgstr "Se agrupar ou nÃ£o as mensagens por Ã¡rvores"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:855
-#: ../modules/mail/e-mail-shell-view.c:875
+#: ../modules/mail/e-mail-shell-view-actions.c:880
+#: ../modules/mail/e-mail-shell-view.c:883
 msgid "_Disable Account"
 msgstr "_Desactivar a Conta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:857
+#: ../modules/mail/e-mail-shell-view-actions.c:882
 msgid "Disable this account"
 msgstr "Desactivar esta conta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:864
+#: ../modules/mail/e-mail-shell-view-actions.c:889
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Remover definitivamente todas as mensagens apagadas de todas as pastas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:869
+#: ../modules/mail/e-mail-shell-view-actions.c:894
 msgid "C_reate Search Folder From Search..."
 msgstr "C_riar uma Pasta Baseada na Procura..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:876
+#: ../modules/mail/e-mail-shell-view-actions.c:901
 msgid "_Download Messages for Offline Usage"
 msgstr "_Obter Mensagens para o Modo Desligado"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:878
+#: ../modules/mail/e-mail-shell-view-actions.c:903
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "Obter as mensagens das contas e pastas marcadas para modo desligado"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:883
+#: ../modules/mail/e-mail-shell-view-actions.c:908
 msgid "Fl_ush Outbox"
 msgstr "Esva_ziar a Caixa de SaÃda"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:890
+#: ../modules/mail/e-mail-shell-view-actions.c:915
 msgid "_Copy Folder To..."
 msgstr "_Copiar a Pasta Para..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:892
+#: ../modules/mail/e-mail-shell-view-actions.c:917
 msgid "Copy the selected folder into another folder"
 msgstr "Copiar a pasta seleccionada para outra pasta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:899
+#: ../modules/mail/e-mail-shell-view-actions.c:924
 msgid "Permanently remove this folder"
 msgstr "Remover definitivamente esta pasta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:904
+#: ../modules/mail/e-mail-shell-view-actions.c:929
 msgid "E_xpunge"
 msgstr "E_xpurgar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:906
+#: ../modules/mail/e-mail-shell-view-actions.c:931
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Remover definitivamente todas as mensagens apagadas desta pasta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:911
+#: ../modules/mail/e-mail-shell-view-actions.c:936
 msgid "Mar_k All Messages as Read"
 msgstr "_Marcar Todas as Mensagens como Lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:913
+#: ../modules/mail/e-mail-shell-view-actions.c:938
 msgid "Mark all messages in the folder as read"
 msgstr "Marcar todas as mensagens nesta pasta como lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:918
+#: ../modules/mail/e-mail-shell-view-actions.c:943
 msgid "_Move Folder To..."
 msgstr "_Mover a Pasta Para..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:920
+#: ../modules/mail/e-mail-shell-view-actions.c:945
 msgid "Move the selected folder into another folder"
 msgstr "Mover a pasta seleccionada para dentro de outra pasta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:925
+#: ../modules/mail/e-mail-shell-view-actions.c:950
 msgid "_New..."
 msgstr "_Novo..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:927
+#: ../modules/mail/e-mail-shell-view-actions.c:952
 msgid "Create a new folder for storing mail"
 msgstr "Criar uma nova pasta para armazenar correio"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:934
+#: ../modules/mail/e-mail-shell-view-actions.c:959
 msgid "Change the properties of this folder"
 msgstr "Alterar as propriedades desta pasta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:941
+#: ../modules/mail/e-mail-shell-view-actions.c:966
 msgid "Refresh the folder"
 msgstr "Actualizar a pasta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:948
+#: ../modules/mail/e-mail-shell-view-actions.c:973
 msgid "Change the name of this folder"
 msgstr "Alterar o nome desta pasta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:953
+#: ../modules/mail/e-mail-shell-view-actions.c:978
 msgid "Select Message _Thread"
 msgstr "Seleccionar a Ã?r_vore de Mensagens"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:955
+#: ../modules/mail/e-mail-shell-view-actions.c:980
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 "Seleccionar todas as mensagens na mesma Ã¡rvore que a mensagem seleccionada"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:985
 msgid "Select Message S_ubthread"
 msgstr "Seleccionar a S_ub-Ã?rvore da Mensagem"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:962
+#: ../modules/mail/e-mail-shell-view-actions.c:987
 msgid "Select all replies to the currently selected message"
 msgstr "Seleccionar todas as respostas Ã  mensagem seleccionada"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:967
+#: ../modules/mail/e-mail-shell-view-actions.c:992
 msgid "_Unsubscribe"
 msgstr "_Remover a SubscriÃ§Ã£o"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:969
+#: ../modules/mail/e-mail-shell-view-actions.c:994
 msgid "Unsubscribe from the selected folder"
 msgstr "Remover a subscriÃ§Ã£o sobre a pasta seleccionada"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:974
+#: ../modules/mail/e-mail-shell-view-actions.c:999
 msgid "Empty _Trash"
 msgstr "Esvaziar o Li_xo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:976
+#: ../modules/mail/e-mail-shell-view-actions.c:1001
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Remover definitivamente todas as mensagens apagadas de todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:981
+#: ../modules/mail/e-mail-shell-view-actions.c:1006
 msgid "_New Label"
 msgstr "_Nova Etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:990
+#: ../modules/mail/e-mail-shell-view-actions.c:1015
 msgid "N_one"
 msgstr "N_enhuma"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:997
-msgid "Hide _Read Messages"
-msgstr "Esconder as Mensagens _Lidas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:999
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Esconder temporariamente todas as mensagens que jÃ¡ foram lidas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1004
-msgid "Hide S_elected Messages"
-msgstr "Esconder as Mensagens S_eleccionadas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1006
-msgid "Temporarily hide the selected messages"
-msgstr "Esconder temporariamente as mensagens seleccionadas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1011
-msgid "Show Hidde_n Messages"
-msgstr "Apresentar as Mensagens _Escondidas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1013
-msgid "Show messages that have been temporarily hidden"
-msgstr "Apresentar as mensagens que foram temporariamente escondidas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1034
+#: ../modules/mail/e-mail-shell-view-actions.c:1038
 msgid "Cancel the current mail operation"
 msgstr "Cancelar a operaÃ§Ã£o de email actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1039
+#: ../modules/mail/e-mail-shell-view-actions.c:1043
 msgid "Collapse All _Threads"
 msgstr "Recolher Todas as Ã?r_vores"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1041
+#: ../modules/mail/e-mail-shell-view-actions.c:1045
 msgid "Collapse all message threads"
 msgstr "Recolher todas as Ã¡rvores de mensagens"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1046
+#: ../modules/mail/e-mail-shell-view-actions.c:1050
 msgid "E_xpand All Threads"
 msgstr "E_xpandir Todas as Ã?rvores"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1048
+#: ../modules/mail/e-mail-shell-view-actions.c:1052
 msgid "Expand all message threads"
 msgstr "Expandir todas as Ã¡rvores de mensagens"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1053
+#: ../modules/mail/e-mail-shell-view-actions.c:1057
 msgid "_Message Filters"
 msgstr "Filtros de _Mensagens"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1055
+#: ../modules/mail/e-mail-shell-view-actions.c:1059
 msgid "Create or edit rules for filtering new mail"
 msgstr "Criar ou editar as regras para filtrar novas mensagens"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1060
+#: ../modules/mail/e-mail-shell-view-actions.c:1064
 msgid "Search F_olders"
 msgstr "Pastas de Pr_ocura"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1062
+#: ../modules/mail/e-mail-shell-view-actions.c:1066
 msgid "Create or edit search folder definitions"
 msgstr "Criar ou editar os alvos das pastas de procura"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1067
+#: ../modules/mail/e-mail-shell-view-actions.c:1071
 msgid "_Subscriptions..."
 msgstr "_SubscriÃ§Ãµes..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1069
+#: ../modules/mail/e-mail-shell-view-actions.c:1073
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Subscrever ou remover a subscriÃ§Ã£o de pastas em servidores remotos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1076
+#: ../modules/mail/e-mail-shell-view-actions.c:1080
 msgid "F_older"
 msgstr "P_asta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1083
+#: ../modules/mail/e-mail-shell-view-actions.c:1087
 msgid "_Label"
 msgstr "_Etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1123
+#: ../modules/mail/e-mail-shell-view-actions.c:1127
 msgid "_New Folder..."
 msgstr "_Nova Pasta..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
-msgid "Hide _Deleted Messages"
-msgstr "Esconder as Mensagens _Apagadas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1149
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr "Esconder as mensagens apagadas em vez de as apresentar riscadas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1156
+#: ../modules/mail/e-mail-shell-view-actions.c:1151
 msgid "Show Message _Preview"
 msgstr "Apresentar a _AntevisÃ£o de Mensagens"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1158
+#: ../modules/mail/e-mail-shell-view-actions.c:1153
 msgid "Show message preview pane"
 msgstr "Apresentar a janela de antevisÃ£o de mensagens"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
+msgid "Show _Deleted Messages"
+msgstr "Apresentar as Mensagens _Apagadas"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1161
+msgid "Show deleted messages with a line through them"
+msgstr "Apresentar as mensagens apagadas riscadas"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1167
 msgid "_Group By Threads"
 msgstr "Agrupar Por Ã?r_vores"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1169
 msgid "Threaded message list"
 msgstr "Lista de mensagem em Ã¡rvore"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1190
 msgid "Show message preview below the message list"
 msgstr "Apresentar a antevisÃ£o de mensagens por baixo da lista de mensagens"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/mail/e-mail-shell-view-actions.c:1197
 msgid "Show message preview alongside the message list"
 msgstr "Apresentar a antevisÃ£o de mensagens ao lado da lista de mensagens"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1202
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
 msgid "All Messages"
 msgstr "Todas as Mensagens"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1209
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
 msgid "Important Messages"
 msgstr "Mensagens Importantes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1216
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
 msgid "Last 5 Days' Messages"
 msgstr "Mensagens dos  Ã?ltimos 5 Dias"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1223
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
 msgid "Messages Not Junk"
 msgstr "Mensagens que nÃ£o sÃ£o \"NÃ£o Solicitadas\""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1230
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 msgid "Messages with Attachments"
 msgstr "Mensagens com Anexos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1237
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
 msgid "No Label"
 msgstr "Nenhuma Etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1244
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 msgid "Read Messages"
 msgstr "Mensagens Lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1251
+#: ../modules/mail/e-mail-shell-view-actions.c:1254
 msgid "Recent Messages"
 msgstr "Mensagens Recentes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1258
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
 msgid "Unread Messages"
 msgstr "Mensagens por Ler"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1310
+#: ../modules/mail/e-mail-shell-view-actions.c:1313
 msgid "Subject or Addresses contain"
 msgstr "Assunto ou EndereÃ§os contÃªm"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1320
+#: ../modules/mail/e-mail-shell-view-actions.c:1323
 msgid "All Accounts"
 msgstr "Todas as Contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1327
+#: ../modules/mail/e-mail-shell-view-actions.c:1330
 msgid "Current Account"
 msgstr "Conta Actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1334
+#: ../modules/mail/e-mail-shell-view-actions.c:1337
 msgid "Current Folder"
 msgstr "Pasta Actual"
 
-#: ../modules/mail/e-mail-shell-view-private.c:891
+#: ../modules/mail/e-mail-shell-view-private.c:990
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d seleccionada, "
 msgstr[1] "%d seleccionadas, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:902
+#: ../modules/mail/e-mail-shell-view-private.c:1001
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d apagada"
 msgstr[1] "%d apagadas"
 
-#: ../modules/mail/e-mail-shell-view-private.c:908
-#: ../modules/mail/e-mail-shell-view-private.c:915
+#: ../modules/mail/e-mail-shell-view-private.c:1007
+#: ../modules/mail/e-mail-shell-view-private.c:1014
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d nÃ£o solicitado"
 msgstr[1] "%d nÃ£o solicitados"
 
-#: ../modules/mail/e-mail-shell-view-private.c:921
+#: ../modules/mail/e-mail-shell-view-private.c:1020
 #, 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:927
+#: ../modules/mail/e-mail-shell-view-private.c:1026
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d por enviar"
 msgstr[1] "%d por enviar"
 
-#: ../modules/mail/e-mail-shell-view-private.c:933
+#: ../modules/mail/e-mail-shell-view-private.c:1032
 #, 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:945
+#: ../modules/mail/e-mail-shell-view-private.c:1044
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d por ler, "
 msgstr[1] "%d por ler, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:948
+#: ../modules/mail/e-mail-shell-view-private.c:1047
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d no total"
 msgstr[1] "%d no total"
 
-#: ../modules/mail/e-mail-shell-view.c:548
+#: ../modules/mail/e-mail-shell-view.c:559
 msgid "All Account Search"
 msgstr "Procura em Todas as Contas"
 
-#: ../modules/mail/e-mail-shell-view.c:685
+#: ../modules/mail/e-mail-shell-view.c:686
 msgid "Account Search"
 msgstr "Procurar Conta"
 
-#: ../modules/mail/e-mail-shell-view.c:873
+#: ../modules/mail/e-mail-shell-view.c:881
 msgid "Proxy _Logout"
 msgstr "_Terminar SessÃ£o de Proxy"
 
-#: ../modules/mail/em-composer-prefs.c:473
+#: ../modules/mail/em-account-prefs.c:133
+msgid "Evolution Account Assistant"
+msgstr "Assistente de Contas Evolution"
+
+#: ../modules/mail/em-account-prefs.c:182
+msgid "Account Editor"
+msgstr "Editor de Contas"
+
+#: ../modules/mail/em-composer-prefs.c:500
+#: ../modules/plugin-manager/evolution-plugin-manager.c:357
+#: ../plugins/publish-calendar/publish-calendar.c:827
+#: ../widgets/misc/e-account-tree-view.c:211
+msgid "Enabled"
+msgstr "Activo"
+
+#: ../modules/mail/em-composer-prefs.c:504
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
-#: ../modules/mail/em-mailer-prefs.c:96
+#: ../modules/mail/em-mailer-prefs.c:91
 msgid "Every time"
 msgstr "Sempre"
 
-#: ../modules/mail/em-mailer-prefs.c:97
+#: ../modules/mail/em-mailer-prefs.c:92
 msgid "Once per day"
 msgstr "Uma vez por dia"
 
-#: ../modules/mail/em-mailer-prefs.c:98
+#: ../modules/mail/em-mailer-prefs.c:93
 msgid "Once per week"
 msgstr "Uma vez por semana"
 
-#: ../modules/mail/em-mailer-prefs.c:99
+#: ../modules/mail/em-mailer-prefs.c:94
 msgid "Once per month"
 msgstr "Uma vez por mÃªs"
 
-#: ../modules/mail/em-mailer-prefs.c:221
+#: ../modules/mail/em-mailer-prefs.c:173
 msgid "Add Custom Junk Header"
 msgstr "Adicionar CabeÃ§alho Personalizado de NÃ£o Solicitado"
 
-#: ../modules/mail/em-mailer-prefs.c:225
+#: ../modules/mail/em-mailer-prefs.c:181
 msgid "Header Name:"
 msgstr "Nome do CabeÃ§alho:"
 
-#: ../modules/mail/em-mailer-prefs.c:226
+#: ../modules/mail/em-mailer-prefs.c:182
 msgid "Header Value Contains:"
 msgstr "Valor do CabeÃ§alho ContÃ©m:"
 
-#: ../modules/mail/em-mailer-prefs.c:325
-#: ../widgets/table/e-table-click-to-add.c:504
-#: ../widgets/table/e-table-selection-model.c:309
+#: ../modules/mail/em-mailer-prefs.c:282
 msgid "Header"
 msgstr "CabeÃ§alho"
 
-#: ../modules/mail/em-mailer-prefs.c:329
+#: ../modules/mail/em-mailer-prefs.c:286
 msgid "Contains Value"
 msgstr "ContÃ©m o Valor"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:722 ../modules/mail/em-mailer-prefs.c:793
+#: ../modules/mail/em-mailer-prefs.c:677 ../modules/mail/em-mailer-prefs.c:748
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "O plugin %s encontra-se disponÃvel e o binÃ¡rio estÃ¡ instalado."
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:730 ../modules/mail/em-mailer-prefs.c:802
+#: ../modules/mail/em-mailer-prefs.c:685 ../modules/mail/em-mailer-prefs.c:757
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 "O plugin %s nÃ£o se encontra disponÃvel. Verifique se o pacote estÃ¡ instalado."
 
-#: ../modules/mail/em-mailer-prefs.c:766
+#: ../modules/mail/em-mailer-prefs.c:721
 msgid "No junk plugin available"
 msgstr "Nenhum plugin de nÃ£o solicitado disponÃvel"
 
-#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/mail/em-mailer-prefs.c:1151
-msgid "_Table column:"
-msgstr "Coluna da _tabela:"
-
 #. 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:1153
+#: ../modules/mail/em-mailer-prefs.c:1063
 msgid "_Date header:"
 msgstr "CabeÃ§alho de _data:"
 
-#: ../modules/mail/em-mailer-prefs.c:1154
+#: ../modules/mail/em-mailer-prefs.c:1064
 msgid "Show _original header value"
 msgstr "Apresentar o valor _original do cabeÃ§alho"
 
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr "Verificar se o Evolution Ã© a aplicaÃ§Ã£o de correio por omissÃ£o"
+
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr ""
+"Sempre que o Evolution for iniciado, verificar se Ã© a aplicaÃ§Ã£o de correio "
+"por omissÃ£o."
+
+#: ../modules/mailto-handler/evolution-mailto-handler.c:140
+msgid "Do you want to make Evolution your default email client?"
+msgstr "Deseja tornar o Evolution no seu cliente de email por omissÃ£o?"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:67
+msgid "Author(s)"
+msgstr "Autor(es)"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:251
+msgid "Plugin Manager"
+msgstr "Gestor de Plugins"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:267
+msgid "Note: Some changes will not take effect until restart"
+msgstr "Nota: Algumas alteraÃ§Ãµes nÃ£o terÃ£o efeito atÃ© que reinicie"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:296
+msgid "Overview"
+msgstr "Resumo"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:365
+#: ../modules/plugin-manager/evolution-plugin-manager.c:448
+msgid "Plugin"
+msgstr "Plugin"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:486
+msgid "_Plugins"
+msgstr "_Plugins"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:487
+msgid "Enable and disable plugins"
+msgstr "Activar e desactivar plugins"
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "OlÃ¡ Python"
@@ -16282,6 +16110,50 @@ msgstr "Plugin de Teste Python"
 msgid "Test Plugin for Python EPlugin loader."
 msgstr "Plugin de Teste para o leitor de EPlugins Python."
 
+#: ../modules/startup-wizard/evolution-startup-wizard.c:275
+#: ../widgets/misc/e-import-assistant.c:399
+msgid "Please select the information that you would like to import:"
+msgstr "Seleccione a informaÃ§Ã£o que deseja importar:"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:307
+#: ../widgets/misc/e-import-assistant.c:555
+#, c-format
+msgid "From %s:"
+msgstr "De %s:"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:318
+#: ../modules/startup-wizard/evolution-startup-wizard.c:415
+msgid "Importing Files"
+msgstr "A Importar Ficheiros"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:393
+msgid "Import cancelled. Click \"Forward\" to continue."
+msgstr "ImportaÃ§Ã£o cancelada. Clique \"AvanÃ§ar\" para prosseguir."
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:411
+msgid "Import complete. Click \"Forward\" to continue."
+msgstr "ImportaÃ§Ã£o terminada. Clique \"AvanÃ§ar\" para prosseguir."
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:471
+msgid "Evolution Setup Assistant"
+msgstr "Assistente de ConfiguraÃ§Ã£o do Evolution"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:477
+msgid "Welcome"
+msgstr "Bem Vindo"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:482
+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"
+"\n"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+"Bem vindo ao Evolution. Os ecrÃ£s seguintes irÃ£o permitir que o Evolution se "
+"ligue Ã s suas contas de email e importe ficheiros de outras aplicaÃ§Ãµes. \n"
+"\n"
+"Prima o botÃ£o \"AvanÃ§ar\" para continuar. "
+
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Add local address books to Evolution."
 msgstr "Adicionar livros de endereÃ§os locais ao Evolution."
@@ -16298,16 +16170,8 @@ msgstr ""
 "Lista de pistas para o plugin de lembrete de anexos procurar no corpo da "
 "mensagem"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr ""
-"Lista de pistas para o plugin de lembrete de anexos procurar no corpo da "
-"mensagem."
-
-#: ../plugins/attachment-reminder/attachment-reminder.c:514
-#: ../plugins/templates/templates.c:413
+#: ../plugins/attachment-reminder/attachment-reminder.c:451
+#: ../plugins/templates/templates.c:410
 msgid "Keywords"
 msgstr "Palavras Chave"
 
@@ -16348,24 +16212,24 @@ msgstr "Ã?udio Embutido"
 msgid "Play audio attachments directly in mail messages."
 msgstr "Reproduzir anexos Ã¡udio directamente nas mensagens de email."
 
-#: ../plugins/backup-restore/backup-restore.c:152
+#: ../plugins/backup-restore/backup-restore.c:160
 msgid "Select name of the Evolution backup file"
 msgstr "Seleccione o nome do ficheiro de cÃ³pia de seguranÃ§a do Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:191
 msgid "_Restart Evolution after backup"
 msgstr "_Reiniciar o Evolution apÃ³s a cÃ³pia de seguranÃ§a"
 
-#: ../plugins/backup-restore/backup-restore.c:209
+#: ../plugins/backup-restore/backup-restore.c:217
 msgid "Select name of the Evolution backup file to restore"
 msgstr ""
 "Seleccione o nome do ficheiro de cÃ³pia de seguranÃ§a do Evolution a repÃ´r"
 
-#: ../plugins/backup-restore/backup-restore.c:222
+#: ../plugins/backup-restore/backup-restore.c:230
 msgid "_Restart Evolution after restore"
 msgstr "_Reiniciar o Evolution apÃ³s repÃ´r o arquivo"
 
-#: ../plugins/backup-restore/backup-restore.c:290
+#: ../plugins/backup-restore/backup-restore.c:298
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
@@ -16375,143 +16239,143 @@ msgstr ""
 "recuperar todo o Correio, CalendÃ¡rios, Tarefas, Memos e Contactos. TambÃ©m "
 "recupera todas as suas definiÃ§Ãµes pessoais, filtros de correio, etc."
 
-#: ../plugins/backup-restore/backup-restore.c:297
+#: ../plugins/backup-restore/backup-restore.c:305
 msgid "_Restore Evolution from the backup file"
 msgstr "_Recuperar o Evolution a partir de um ficheiro de cÃ³pia de seguranÃ§a"
 
-#: ../plugins/backup-restore/backup-restore.c:304
+#: ../plugins/backup-restore/backup-restore.c:312
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Seleccione um ficheiro de CÃ³pia de SeguranÃ§a do Evolution a recuperar:"
 
-#: ../plugins/backup-restore/backup-restore.c:307
+#: ../plugins/backup-restore/backup-restore.c:315
 msgid "Choose a file to restore"
 msgstr "Seleccione um ficheiro a recuperar"
 
-#: ../plugins/backup-restore/backup-restore.c:315
+#: ../plugins/backup-restore/backup-restore.c:323
 msgid "Restore from backup"
 msgstr "Recuperar da cÃ³pia de seguranÃ§a"
 
-#: ../plugins/backup-restore/backup-restore.c:353
-msgid "_Backup Settings..."
-msgstr "_Realizar CÃ³pia de SeguranÃ§a das DefiniÃ§Ãµes..."
+#: ../plugins/backup-restore/backup-restore.c:361
+msgid "_Backup Evolution Settings..."
+msgstr "_Realizar CÃ³pia de SeguranÃ§a das DefiniÃ§Ãµes do Evolution..."
 
-#: ../plugins/backup-restore/backup-restore.c:355
+#: ../plugins/backup-restore/backup-restore.c:363
 msgid "Backup Evolution data and settings to an archive file"
 msgstr ""
 "Realizar uma cÃ³pia de seguranÃ§a dos dados e configuraÃ§Ãµes do Evolution para "
 "um ficheiro de arquivo"
 
-#: ../plugins/backup-restore/backup-restore.c:360
-msgid "R_estore Settings..."
-msgstr "R_ecuperar as DefiniÃ§Ãµes..."
+#: ../plugins/backup-restore/backup-restore.c:368
+msgid "R_estore Evolution Settings..."
+msgstr "R_ecuperar as DefiniÃ§Ãµes do Evolution..."
 
-#: ../plugins/backup-restore/backup-restore.c:362
+#: ../plugins/backup-restore/backup-restore.c:370
 msgid "Restore Evolution data and settings from an archive file"
 msgstr ""
 "Repor os dados e definiÃ§Ãµes do Evolution a partie de um ficheiro de arquivo"
 
-#: ../plugins/backup-restore/backup.c:63
+#: ../plugins/backup-restore/backup.c:77
 msgid "Backup Evolution directory"
 msgstr "DirectÃ³rio de cÃ³pia de seguranÃ§a do Evolution"
 
-#: ../plugins/backup-restore/backup.c:65
+#: ../plugins/backup-restore/backup.c:79
 msgid "Restore Evolution directory"
 msgstr "RepÃ´r o directÃ³rio do Evolution"
 
-#: ../plugins/backup-restore/backup.c:67
+#: ../plugins/backup-restore/backup.c:81
 msgid "Check Evolution Backup"
 msgstr "Verificar o Ficheiro de CÃ³pia de SeguranÃ§a do Evolution"
 
-#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:83
 msgid "Restart Evolution"
 msgstr "Reiniciar o Evolution"
 
-#: ../plugins/backup-restore/backup.c:71
+#: ../plugins/backup-restore/backup.c:85
 msgid "With Graphical User Interface"
 msgstr "Com o Interface GrÃ¡fico de Utilizador"
 
-#: ../plugins/backup-restore/backup.c:189
-#: ../plugins/backup-restore/backup.c:251
+#: ../plugins/backup-restore/backup.c:203
+#: ../plugins/backup-restore/backup.c:265
 msgid "Shutting down Evolution"
 msgstr "A desligar o Evolution"
 
-#: ../plugins/backup-restore/backup.c:196
+#: ../plugins/backup-restore/backup.c:210
 msgid "Backing Evolution accounts and settings"
 msgstr "A realizar a cÃ³pia de seguranÃ§a das contas e definiÃ§Ãµes do Evolution"
 
-#: ../plugins/backup-restore/backup.c:202
+#: ../plugins/backup-restore/backup.c:216
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "A realizar a cÃ³pia de seguranÃ§a dos dados do Evolution (Correio, Contactos, "
 "CalendÃ¡rios, Tarefas, Memos)"
 
-#: ../plugins/backup-restore/backup.c:213
+#: ../plugins/backup-restore/backup.c:227
 msgid "Backup complete"
 msgstr "CÃ³pia de seguranÃ§a terminada"
 
-#: ../plugins/backup-restore/backup.c:218
-#: ../plugins/backup-restore/backup.c:239
-#: ../plugins/backup-restore/backup.c:285
+#: ../plugins/backup-restore/backup.c:232
+#: ../plugins/backup-restore/backup.c:253
+#: ../plugins/backup-restore/backup.c:299
 msgid "Restarting Evolution"
 msgstr "A Reiniciar o Evolution"
 
-#: ../plugins/backup-restore/backup.c:255
-msgid "Backup current Evolution data"
-msgstr "Realizar de cÃ³pia de seguranÃ§a dos dados actuais do Evolution"
+#: ../plugins/backup-restore/backup.c:269
+msgid "Back up current Evolution data"
+msgstr "Realizar cÃ³pia de seguranÃ§a dos dados actuais do Evolution"
 
-#: ../plugins/backup-restore/backup.c:260
+#: ../plugins/backup-restore/backup.c:274
 msgid "Extracting files from backup"
 msgstr "A extrair ficheiros da cÃ³pia de seguranÃ§a"
 
-#: ../plugins/backup-restore/backup.c:267
+#: ../plugins/backup-restore/backup.c:281
 msgid "Loading Evolution settings"
 msgstr "A ler as definiÃ§Ãµes do Evolution"
 
-#: ../plugins/backup-restore/backup.c:274
+#: ../plugins/backup-restore/backup.c:288
 msgid "Removing temporary backup files"
 msgstr "A remover os ficheiros temporÃ¡rios de cÃ³pia de seguranÃ§a"
 
-#: ../plugins/backup-restore/backup.c:281
+#: ../plugins/backup-restore/backup.c:295
 msgid "Ensuring local sources"
 msgstr "A garantir recursos locais"
 
-#: ../plugins/backup-restore/backup.c:428
+#: ../plugins/backup-restore/backup.c:464
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "A criar cÃ³pia de seguranÃ§a na pasta %s"
 
-#: ../plugins/backup-restore/backup.c:433
+#: ../plugins/backup-restore/backup.c:469
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "A recuperar da pasta %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:491
 msgid "Evolution Backup"
 msgstr "CÃ³pia de SeguranÃ§a do Evolution"
 
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:491
 msgid "Evolution Restore"
 msgstr "RecuperaÃ§Ã£o do Evolution"
 
-#: ../plugins/backup-restore/backup.c:488
+#: ../plugins/backup-restore/backup.c:532
 msgid "Backing up Evolution Data"
 msgstr "A Realizar de CÃ³pia de SeguranÃ§a dos Dados do Evolution"
 
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:533
 msgid "Please wait while Evolution is backing up your data."
 msgstr ""
 "Aguarde enquanto o Evolution realiza uma cÃ³pia de seguranÃ§a dos seus dados."
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:535
 msgid "Restoring Evolution Data"
 msgstr "Recuperar Dados do Evolution"
 
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:536
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Aguarde enquanto o Evolution recupera os seus dados."
 
-#: ../plugins/backup-restore/backup.c:510
+#: ../plugins/backup-restore/backup.c:554
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 "Esta operaÃ§Ã£o poderÃ¡ demorar dependendo da quantidade de dados na sua conta."
@@ -16538,79 +16402,81 @@ msgstr ""
 "seguranÃ§a seleccionada?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid ""
-"Evolution backup can start only when Evolution is not running. Please make "
-"sure that you save and close all your unsaved windows before proceeding.  If "
-"you want Evolution to restart automatically after backup, please enable the "
-"toggle button."
-msgstr ""
-"A cÃ³pia de seguranÃ§a do Evolution apenas pode ser iniciada se o Evolution "
-"nÃ£o se encontrar em execuÃ§Ã£o. Grave e feche todas as janelas por gravar "
-"antes de prosseguir. Se desejar que o Evolution se reinicie automaticamente "
-"apÃ³s terminada a cÃ³pia de seguranÃ§a, active o botÃ£o de alternÃ¢ncia."
+msgid "Close and Backup Evolution"
+msgstr "Fechar e Realizar CÃ³pia de SeguranÃ§a do Evolution"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid "Close and Restore Evolution"
+msgstr "Fechar e Reiniciar o Evolution"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Insufficient Permissions"
 msgstr "PermissÃµes Insuficientes"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Invalid Evolution backup file"
 msgstr "Ficheiro de cÃ³pia de seguranÃ§a do Evolution invÃ¡lido"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
 msgid "Please select a valid backup file to restore."
 msgstr "Seleccione uma cÃ³pia de seguranÃ§a vÃ¡lida a restaurar."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid "The selected folder is not writable."
 msgstr "A pasta seleccionada nÃ£o permite a escrita."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
+#: ../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."
+msgstr ""
+"Para realizar uma cÃ³pia de seguranÃ§a dos seus dados e definiÃ§Ãµes, tem "
+"primeiro de fechar o Evolution. Certifique-se de que gravou quaisquer dados "
+"por gravar antes de prosseguir."
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
 msgid ""
-"This will delete all your current Evolution data and settings and restore "
-"them from your backup. Evolution restore can start only when Evolution is "
-"not running. Please make sure that you close all your unsaved windows before "
-"you proceed. If you want Evolution to restart automatically restart after "
-"restore, please enable the toggle button."
+"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."
 msgstr ""
-"Isto irÃ¡ apagar todos os dados e definiÃ§Ãµes actuais do Evolution e recuperÃ¡-"
-"las da cÃ³pia de seguranÃ§a. A recuperaÃ§Ã£o do Evolution apenas pode ser "
-"iniciada quando o Evolution nÃ£o se encontrar em execuÃ§Ã£o. Certifique-se de "
-"que fechar todas as janelas por gravar antes de prosseguir. Se desejar que o "
-"Evolution se reinicie automaticamente apÃ³s a recuperaÃ§Ã£o, active o botÃ£o de "
-"alternÃ¢ncia."
+"Para repor os seus dados e definiÃ§Ãµes, tem primeiro de fechar o Evolution. "
+"Certifique-se de que gravou quaisquer dados por gravar antes de prosseguir. "
+"Esta operaÃ§Ã£o irÃ¡ apagar todos os seus dados e definiÃ§Ãµes actuais do "
+"Evolution e repor o que estÃ¡ gravado na cÃ³pia de seguranÃ§a."
 
-#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
+#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Contactos AutomÃ¡ticos"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:710
+#: ../plugins/bbdb/bbdb.c:709
 msgid "Create _address book entries when sending mails"
 msgstr "Criar _entradas no livro de endereÃ§os ao enviar mensagens"
 
-#: ../plugins/bbdb/bbdb.c:716
+#: ../plugins/bbdb/bbdb.c:715
 msgid "Select Address book for Automatic Contacts"
 msgstr "Seleccionar o livro de EndereÃ§os para os Contactos AutomÃ¡ticos"
 
-#: ../plugins/bbdb/bbdb.c:731
+#: ../plugins/bbdb/bbdb.c:730
 msgid "Instant Messaging Contacts"
 msgstr "Contactos de Mensagens InstantÃ¢neas"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:746
-msgid "Synchronize contact info and images from Pidgin buddy list"
+#: ../plugins/bbdb/bbdb.c:745
+msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
-"Sincronizar a informaÃ§Ã£o e imagens de contactos com a lista de contactos do "
+"_Sincronizar a informaÃ§Ã£o e imagens de contactos com a lista de contactos do "
 "Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:752
+#: ../plugins/bbdb/bbdb.c:751
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Seleccionar o livro de EndereÃ§os para a lista de contactos Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:763
+#: ../plugins/bbdb/bbdb.c:762
 msgid "Synchronize with _buddy list now"
 msgstr "Sincronizar com a lista de _amigos agora"
 
@@ -16632,28 +16498,28 @@ msgstr ""
 "medida que responde a mensagens. TambÃ©m preenche informaÃ§Ã£o de contacto de "
 "Mensagens InstantÃ¢neas partir das suas listas de contactos de mensageiro."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:154
 #, c-format
 msgid "Bogofilter is not available. Please install it first."
 msgstr "O Bogofilter nÃ£o estÃ¡ disponÃvel. 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:162
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Ocorreu um erro ao lanÃ§ar %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Processo filho bogofilter nÃ£o responde, a matÃ¡-lo..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:189
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Interrompida a espera pelo processo filho bogofilter, a terminar..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:212
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Falha na ligaÃ§Ã£o com o bogofilter, cÃ³digo de erro: %d."
@@ -16687,15 +16553,15 @@ msgstr "OpÃ§Ãµes do Bogofilter"
 msgid "Filter junk messages using Bogofilter."
 msgstr "Filtrar as mensagens nÃ£o solicitadas utilizando o Bogofilter."
 
-#: ../plugins/caldav/caldav-browse-server.c:198
+#: ../plugins/caldav/caldav-browse-server.c:197
 msgid "Authentication failed. Server requires correct login."
 msgstr "Falha na autenticaÃ§Ã£o. O servidor requer uma sessÃ£o correcta."
 
-#: ../plugins/caldav/caldav-browse-server.c:200
+#: ../plugins/caldav/caldav-browse-server.c:199
 msgid "Given URL cannot be found."
 msgstr "Incapaz de encontrar o URL especificado."
 
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -16704,36 +16570,31 @@ msgstr ""
 "O servidor devolveu dados inesperados.\n"
 "%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:204
-#: ../plugins/caldav/caldav-browse-server.c:1249 ../plugins/face/face.c:169
-msgid "Unknown error"
-msgstr "Erro desconhecido"
-
-#: ../plugins/caldav/caldav-browse-server.c:334
-#: ../plugins/caldav/caldav-browse-server.c:585
+#: ../plugins/caldav/caldav-browse-server.c:333
+#: ../plugins/caldav/caldav-browse-server.c:584
 msgid "Failed to parse server response."
 msgstr "Falha ao processar a resposta do servidor."
 
-#: ../plugins/caldav/caldav-browse-server.c:428
+#: ../plugins/caldav/caldav-browse-server.c:427
 msgid "Events"
 msgstr "Eventos"
 
-#: ../plugins/caldav/caldav-browse-server.c:450
+#: ../plugins/caldav/caldav-browse-server.c:449
 msgid "User's calendars"
 msgstr "CalendÃ¡rios do utilizador"
 
-#: ../plugins/caldav/caldav-browse-server.c:558
-#: ../plugins/caldav/caldav-browse-server.c:629
+#: ../plugins/caldav/caldav-browse-server.c:557
+#: ../plugins/caldav/caldav-browse-server.c:628
 msgid "Failed to get server URL."
 msgstr "Falha ao obter o URL do servidor."
 
-#: ../plugins/caldav/caldav-browse-server.c:627
-#: ../plugins/caldav/caldav-browse-server.c:668
-#: ../plugins/caldav/caldav-browse-server.c:1272
+#: ../plugins/caldav/caldav-browse-server.c:626
+#: ../plugins/caldav/caldav-browse-server.c:667
+#: ../plugins/caldav/caldav-browse-server.c:1277
 msgid "Searching for user's calendars..."
 msgstr "A procurar os calendÃ¡rios do utilizador..."
 
-#: ../plugins/caldav/caldav-browse-server.c:666
+#: ../plugins/caldav/caldav-browse-server.c:665
 msgid "Could not find any user calendar."
 msgstr "Incapaz de encontrar qualquer calendÃ¡rio do utilizador."
 
@@ -16747,67 +16608,70 @@ msgstr "Falha na tentativa anterior: %s"
 msgid "Previous attempt failed with code %d"
 msgstr "A tentativa anterior falhou com o cÃ³digo %d"
 
-#: ../plugins/caldav/caldav-browse-server.c:799
+#: ../plugins/caldav/caldav-browse-server.c:801
 #, c-format
-msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
-msgstr "Introduza a senha para o utilizador <b>%s</b> no servidor <b>%s</b>"
+msgid "Enter password for user %s on server %s"
+msgstr "Introduza a senha para o utilizador %s no servidor %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:856
+#: ../plugins/caldav/caldav-browse-server.c:860
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr "Incapaz de criar a mensagem soup para o URL '%s'"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1091
+#: ../plugins/caldav/caldav-browse-server.c:1095
 msgid "Searching folder content..."
 msgstr "A procurar no conteÃºdo da pasta..."
 
-#: ../plugins/caldav/caldav-browse-server.c:1134
+#: ../plugins/caldav/caldav-browse-server.c:1138
 msgid "List of available calendars:"
 msgstr "Lista de calendÃ¡rios disponÃveis:"
 
-#: ../plugins/caldav/caldav-browse-server.c:1171
+#: ../plugins/caldav/caldav-browse-server.c:1175
 msgid "Supports"
 msgstr "Suporta"
 
-#: ../plugins/caldav/caldav-browse-server.c:1249
+#: ../plugins/caldav/caldav-browse-server.c:1254
 #, c-format
 msgid "Failed to create thread: %s"
 msgstr "Falha ao criar uma thread: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1357
+#: ../plugins/caldav/caldav-browse-server.c:1362
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
 msgstr "URL de servidor '%s' nÃ£o Ã© um URL vÃ¡lido"
 
-#: ../plugins/caldav/caldav-browse-server.c:1363
+#: ../plugins/caldav/caldav-browse-server.c:1368
 msgid "Browse for a CalDAV calendar"
 msgstr "Navegar para procurar um calendÃ¡rio CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:66
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#: ../plugins/caldav/caldav-source.c:215
-#: ../plugins/calendar-http/calendar-http.c:92
+#: ../plugins/caldav/caldav-source.c:216
+#: ../plugins/calendar-http/calendar-http.c:100
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:219
-#: ../plugins/google-account-setup/google-contacts-source.c:305
+#: ../plugins/caldav/caldav-source.c:223
+#: ../plugins/google-account-setup/google-contacts-source.c:308
 msgid "Use _SSL"
 msgstr "Utilizar _SSL"
 
-#: ../plugins/caldav/caldav-source.c:228
+#: ../plugins/caldav/caldav-source.c:225
+#: ../plugins/google-account-setup/google-contacts-source.c:286
+#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
+msgid "User_name:"
+msgstr "_Nome de utilizador:"
+
+#: ../plugins/caldav/caldav-source.c:235
 msgid "Brows_e server for a calendar"
 msgstr "Nav_egar no servidor por um calendÃ¡rio"
 
-#: ../plugins/caldav/caldav-source.c:237
-#: ../plugins/calendar-file/calendar-file.c:178
-#: ../plugins/calendar-http/calendar-http.c:111
-#: ../plugins/calendar-weather/calendar-weather.c:393
-#: ../plugins/google-account-setup/google-contacts-source.c:323
-#: ../plugins/google-account-setup/google-source.c:627
+#: ../plugins/caldav/caldav-source.c:251
+#: ../plugins/calendar-file/calendar-file.c:191
+#: ../plugins/calendar-http/calendar-http.c:119
+#: ../plugins/calendar-weather/calendar-weather.c:395
+#: ../plugins/google-account-setup/google-contacts-source.c:326
+#: ../plugins/google-account-setup/google-source.c:630
 msgid "Re_fresh:"
 msgstr "Act_ualizar:"
 
@@ -16819,31 +16683,31 @@ msgstr "Adicionar suporte CalDAV ao Evolution."
 msgid "CalDAV Support"
 msgstr "Suporte CalDAV"
 
-#: ../plugins/calendar-file/calendar-file.c:112
+#: ../plugins/calendar-file/calendar-file.c:125
 msgid "_Customize options"
 msgstr "_Personalizar as opÃ§Ãµes"
 
-#: ../plugins/calendar-file/calendar-file.c:131
+#: ../plugins/calendar-file/calendar-file.c:144
 msgid "File _name:"
 msgstr "_Nome do ficheiro:"
 
-#: ../plugins/calendar-file/calendar-file.c:135
+#: ../plugins/calendar-file/calendar-file.c:148
 msgid "Choose calendar file"
 msgstr "Seleccione o ficheiro de calendÃ¡rio"
 
-#: ../plugins/calendar-file/calendar-file.c:183
+#: ../plugins/calendar-file/calendar-file.c:196
 msgid "On open"
 msgstr "Ao abrir"
 
-#: ../plugins/calendar-file/calendar-file.c:184
+#: ../plugins/calendar-file/calendar-file.c:197
 msgid "On file change"
 msgstr "Ao alterar o ficheiro"
 
-#: ../plugins/calendar-file/calendar-file.c:185
+#: ../plugins/calendar-file/calendar-file.c:198
 msgid "Periodically"
 msgstr "Periodicamente"
 
-#: ../plugins/calendar-file/calendar-file.c:200
+#: ../plugins/calendar-file/calendar-file.c:213
 msgid "Force read _only"
 msgstr "F_orÃ§ar apenas de leitura"
 
@@ -16855,11 +16719,11 @@ msgstr "Adicionar calendÃ¡rios locais ao Evolution."
 msgid "Local Calendars"
 msgstr "CalendÃ¡rios Locais"
 
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/calendar-http/calendar-http.c:134
 msgid "_Secure connection"
 msgstr "LigaÃ§Ã£o _segura"
 
-#: ../plugins/calendar-http/calendar-http.c:186
+#: ../plugins/calendar-http/calendar-http.c:194
 msgid "Userna_me:"
 msgstr "Utili_zador:"
 
@@ -16907,26 +16771,26 @@ msgstr "O Tempo: Noite Limpa"
 msgid "Weather: Thunderstorms"
 msgstr "O Tempo: Trovoada"
 
-#: ../plugins/calendar-weather/calendar-weather.c:221
+#: ../plugins/calendar-weather/calendar-weather.c:222
 msgid "Select a location"
 msgstr "Seleccione uma localizaÃ§Ã£o"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:371
+#: ../plugins/calendar-weather/calendar-weather.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:373
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "Nenhuma"
 
-#: ../plugins/calendar-weather/calendar-weather.c:446
+#: ../plugins/calendar-weather/calendar-weather.c:448
 msgid "_Units:"
 msgstr "_Unidades:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:453
+#: ../plugins/calendar-weather/calendar-weather.c:455
 msgid "Metric (Celsius, cm, etc)"
 msgstr "MÃ©trico (Celcius, cm, etc)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:454
+#: ../plugins/calendar-weather/calendar-weather.c:456
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imperial (Fahrenheit, inches, etc)"
 
@@ -16956,47 +16820,43 @@ msgstr ""
 msgid "Map for contacts"
 msgstr "Mapa de contactos"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
-msgid "Check whether Evolution is the default mailer"
-msgstr "Verificar se o Evolution Ã© a aplicaÃ§Ã£o de correio por omissÃ£o"
+#: ../plugins/dbx-import/dbx-importer.c:232
+msgid "Select folder to import OE folder into"
+msgstr "Seleccionar a pasta para onde importar a pasta do Outlook Express"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
-msgstr ""
-"Sempre que o Evolution for iniciado, verificar se Ã© a aplicaÃ§Ã£o de correio "
-"por omissÃ£o."
+#: ../plugins/dbx-import/dbx-importer.c:251
+msgid "Importing Outlook Express data"
+msgstr "A importar dados do Outlook Express"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Check whether Evolution is the default mail client on startup."
-msgstr ""
-"Verificar ao arrancar se o Evolution Ã© a aplicaÃ§Ã£o de correio por omissÃ£o."
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
+msgid "Import Outlook Express messages from DBX file"
+msgstr "Importar mensagens Outlook Express de um ficheiro DBX"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client"
-msgstr "Cliente de Correio por OmissÃ£o"
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
+msgid "Outlook DBX import"
+msgstr "Importador de DBX do Outlook"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
-msgid "Do you want to make Evolution your default e-mail client?"
-msgstr "Deseja tornar o Evolution no seu cliente de email por omissÃ£o?"
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+msgid "Outlook Express 5/6 personal folders (.dbx)"
+msgstr "Pastas pessoais do Outlook Express 5/6 (.dbx)"
 
-#: ../plugins/default-source/default-source.c:75
+#: ../plugins/default-source/default-source.c:83
 msgid "Mark as _default address book"
 msgstr "Marcar como livro de endereÃ§os por _omissÃ£o"
 
-#: ../plugins/default-source/default-source.c:88
+#: ../plugins/default-source/default-source.c:96
 msgid "A_utocomplete with this address book"
 msgstr "Completar a_utomaticamente com este livro de endereÃ§os"
 
-#: ../plugins/default-source/default-source.c:97
+#: ../plugins/default-source/default-source.c:105
 msgid "Mark as _default calendar"
 msgstr "Marcar como calendÃ¡rio por _omissÃ£o"
 
-#: ../plugins/default-source/default-source.c:98
+#: ../plugins/default-source/default-source.c:106
 msgid "Mark as _default task list"
 msgstr "Marcar como lista de tarefas por _omissÃ£o"
 
-#: ../plugins/default-source/default-source.c:99
+#: ../plugins/default-source/default-source.c:107
 msgid "Mark as _default memo list"
 msgstr "Marcar como lista de memos por _omissÃ£o"
 
@@ -17036,7 +16896,7 @@ msgid "Protected"
 msgstr "Protegido"
 
 #: ../plugins/email-custom-header/email-custom-header.c:324
-#: ../widgets/misc/e-send-options.ui.h:18
+#: ../widgets/misc/e-send-options.ui.h:21
 msgid "Secret"
 msgstr "Secreto"
 
@@ -17051,12 +16911,12 @@ msgctxt "email-custom-header"
 msgid "None"
 msgstr "Nenhuma"
 
-#: ../plugins/email-custom-header/email-custom-header.c:569
+#: ../plugins/email-custom-header/email-custom-header.c:571
 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:894
+#: ../plugins/email-custom-header/email-custom-header.c:830
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -17065,12 +16925,12 @@ msgstr ""
 "Ã©:\n"
 "Nome dos valores de chaves de CabeÃ§alhos Personalizados separados por \";\"."
 
-#: ../plugins/email-custom-header/email-custom-header.c:948
+#: ../plugins/email-custom-header/email-custom-header.c:884
 msgid "Key"
 msgstr "Chave"
 
-#: ../plugins/email-custom-header/email-custom-header.c:959
-#: ../plugins/templates/templates.c:419
+#: ../plugins/email-custom-header/email-custom-header.c:900
+#: ../plugins/templates/templates.c:416
 msgid "Values"
 msgstr "Valores"
 
@@ -17094,7 +16954,7 @@ msgstr ""
 "correio"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:119
+#: ../plugins/external-editor/external-editor.c:129
 msgid "Automatically launch when a new mail is edited"
 msgstr "Iniciar automaticamente ao editar uma nova mensagem"
 
@@ -17106,11 +16966,11 @@ msgstr "Editor Externo por OmissÃ£o"
 msgid "The default command that must be used as the editor."
 msgstr "O comando por omissÃ£o que deve ser utilizado como o editor."
 
-#: ../plugins/external-editor/external-editor.c:108
+#: ../plugins/external-editor/external-editor.c:118
 msgid "Command to be executed to launch the editor: "
 msgstr "Comando a ser executado para iniciar o editor: "
 
-#: ../plugins/external-editor/external-editor.c:109
+#: ../plugins/external-editor/external-editor.c:119
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -17118,8 +16978,8 @@ msgstr ""
 "Para o Emacs utilize \"xemacs\"\n"
 "Para o VI utilize \"gvim -f\""
 
-#: ../plugins/external-editor/external-editor.c:375
-#: ../plugins/external-editor/external-editor.c:377
+#: ../plugins/external-editor/external-editor.c:385
+#: ../plugins/external-editor/external-editor.c:387
 msgid "Compose in External Editor"
 msgstr "Compor num Editor Externo"
 
@@ -17198,7 +17058,7 @@ msgstr "_Inserir por omissÃ£o imagem de Face"
 msgid "Load new _Face picture"
 msgstr "Ler nova imagem de _Face"
 
-#: ../plugins/face/face.c:415
+#: ../plugins/face/face.c:422
 msgid "Include _Face"
 msgstr "Incluir _Face"
 
@@ -17231,24 +17091,19 @@ msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr ""
 "O ficheiro seleccionado nÃ£o aparenta ser uma imagem .png vÃ¡lida. Erro: {0}"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:53
-#: ../plugins/google-account-setup/google-source.c:82
-msgid "Google"
-msgstr "Google"
-
-#: ../plugins/google-account-setup/google-contacts-source.c:273
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:235
-msgid "<b>Server</b>"
-msgstr "<b>Servidor</b>"
+#: ../plugins/google-account-setup/google-contacts-source.c:274
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
+msgid "Server"
+msgstr "Servidor"
 
-#: ../plugins/google-account-setup/google-source.c:439
+#: ../plugins/google-account-setup/google-source.c:437
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr ""
 "Introduza a senha do utilizador %s para aceder Ã  lista de calendÃ¡rios "
 "subscritos."
 
-#: ../plugins/google-account-setup/google-source.c:545
+#: ../plugins/google-account-setup/google-source.c:548
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17257,19 +17112,19 @@ msgstr ""
 "Incapaz de ler dados do servidor Google.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:545
-#: ../plugins/mail-to-task/mail-to-task.c:725
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/google-account-setup/google-source.c:548
+#: ../plugins/mail-to-task/mail-to-task.c:737
+#: ../plugins/mail-to-task/mail-to-task.c:953
 msgid "Unknown error."
 msgstr "Erro desconhecido."
 
-#: ../plugins/google-account-setup/google-source.c:631
+#: ../plugins/google-account-setup/google-source.c:634
 msgid "Cal_endar:"
 msgstr "Cal_endÃ¡rio:"
 
-#: ../plugins/google-account-setup/google-source.c:666
-msgid "Retrieve _list"
-msgstr "Obter a _lista"
+#: ../plugins/google-account-setup/google-source.c:669
+msgid "Retrieve _List"
+msgstr "Obter a _Lista"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
 msgid "Add Google Calendars to Evolution."
@@ -17279,7 +17134,7 @@ msgstr "Adicionar CalendÃ¡rios Google ao Evolution."
 msgid "Google Calendars"
 msgstr "CalendÃ¡rio Google"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
 msgid "Checklist"
 msgstr "Lista de VerificaÃ§Ã£o"
 
@@ -17311,12 +17166,12 @@ msgstr "Aceitar Tentativamente"
 msgid "Rese_nd Meeting..."
 msgstr "Ree_nviar ReuniÃ£o..."
 
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../plugins/groupwise-features/install-shared.c:165
+#: ../plugins/groupwise-features/share-folder-common.c:342
 msgid "Create folder"
 msgstr "Criar uma pasta"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:217
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17341,19 +17196,19 @@ msgstr ""
 "Prima 'Aplicar' para instalar a pasta partilhada\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:237
+#: ../plugins/groupwise-features/install-shared.c:229
 msgid "Install the shared folder"
 msgstr "Instalar a pasta partilhada"
 
-#: ../plugins/groupwise-features/install-shared.c:241
+#: ../plugins/groupwise-features/install-shared.c:233
 msgid "Shared Folder Installation"
 msgstr "InstalaÃ§Ã£o de Pasta Partilhada"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:81
+#: ../plugins/groupwise-features/junk-mail-settings.c:82
 msgid "Junk Settings"
 msgstr "DefiniÃ§Ãµes de NÃ£o Solicitado"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:94
+#: ../plugins/groupwise-features/junk-mail-settings.c:96
 #: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "DefiniÃ§Ãµes de Correio NÃ£o Solicitado"
@@ -17366,11 +17221,6 @@ msgstr "Email:"
 msgid "Junk List:"
 msgstr "Lista de NÃ£o Solicitado:"
 
-#: ../plugins/groupwise-features/junk-settings.ui.h:5
-#: ../plugins/publish-calendar/publish-calendar.c:596
-msgid "_Disable"
-msgstr "_Desactivar"
-
 #: ../plugins/groupwise-features/junk-settings.ui.h:6
 msgid "_Enable"
 msgstr "_Activar"
@@ -17380,7 +17230,7 @@ msgid "_Junk List"
 msgstr "_Lista de NÃ£o Solicitado"
 
 #: ../plugins/groupwise-features/junk-settings.ui.h:8
-#: ../plugins/groupwise-features/properties.ui.h:13
+#: ../plugins/groupwise-features/properties.ui.h:12
 #: ../widgets/table/e-table-config.ui.h:21
 msgid "_Remove"
 msgstr "_Remover"
@@ -17389,7 +17239,7 @@ msgstr "_Remover"
 msgid "Message Retract"
 msgstr "Anular Mensagem Enviada"
 
-#: ../plugins/groupwise-features/mail-retract.c:86
+#: ../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?"
@@ -17397,7 +17247,7 @@ msgstr ""
 "Ao anular uma mensagem enviada poderÃ¡ removÃª-la da caixa de correio do "
 "destinatÃ¡rio. Tem a certeza de que o deseja fazer?"
 
-#: ../plugins/groupwise-features/mail-retract.c:107
+#: ../plugins/groupwise-features/mail-retract.c:111
 msgid "Message retracted successfully"
 msgstr "Mensagem anulada com sucesso"
 
@@ -17405,6 +17255,11 @@ msgstr "Mensagem anulada com sucesso"
 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 irÃ£o receber 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 Ã s mensagens GroupWise"
@@ -17523,37 +17378,29 @@ msgid "Would you like to decline it?"
 msgstr "Deseja recusÃ¡-la?"
 
 #: ../plugins/groupwise-features/properties.ui.h:1
-msgid "<b>Users:</b>"
-msgstr "<b>Utilizadores:</b>"
-
-#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "C_ustomize notification message"
 msgstr "Personali_zar a mensagem de notificaÃ§Ã£o"
 
-#: ../plugins/groupwise-features/properties.ui.h:3
+#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "Con_tacts..."
 msgstr "Con_tactos..."
 
-#: ../plugins/groupwise-features/properties.ui.h:6
+#: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Shared Folder Notification"
 msgstr "NotificaÃ§Ã£o de Pasta Partilhada"
 
 #: ../plugins/groupwise-features/properties.ui.h:8
-msgid "The participants will receive the following notification.\n"
-msgstr "Os participantes irÃ£o receber a seguinte notificaÃ§Ã£o.\n"
+msgid "Users:"
+msgstr "Utilizadores:"
 
-#: ../plugins/groupwise-features/properties.ui.h:12
+#: ../plugins/groupwise-features/properties.ui.h:11
 msgid "_Not Shared"
 msgstr "_NÃ£o Partilhada"
 
-#: ../plugins/groupwise-features/properties.ui.h:14
+#: ../plugins/groupwise-features/properties.ui.h:13
 msgid "_Shared With..."
 msgstr "_Partilhada Com..."
 
-#: ../plugins/groupwise-features/properties.ui.h:15
-msgid "_Sharing"
-msgstr "_Partilhar"
-
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
 msgid "Access Rights"
 msgstr "PermissÃµes de Acesso"
@@ -17599,52 +17446,59 @@ msgid "Proxy"
 msgstr "Proxy"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-msgid "<b>Account Name</b>"
-msgstr "<b>Nome da Conta</b>"
+#: ../widgets/misc/e-account-tree-view.c:230
+msgid "Account Name"
+msgstr "Nome de Conta"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
 msgid "Proxy Login"
 msgstr "InÃcio de SessÃ£o na Proxy"
 
-#: ../plugins/groupwise-features/proxy-login.c:210
-#: ../plugins/groupwise-features/proxy-login.c:253
-#: ../plugins/groupwise-features/proxy.c:495
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:251
+#: ../plugins/groupwise-features/proxy.c:493
+#: ../plugins/groupwise-features/send-options.c:84
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sIntroduza a senha para %s (utilizador %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:692
+#: ../plugins/groupwise-features/proxy.c:689
 msgid "The Proxy tab will be available only when the account is online."
 msgstr ""
 "O separador de Proxy apenas estarÃ¡ disponÃvel quando a conta estiver ligada."
 
 #. 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
+#: ../plugins/groupwise-features/proxy.c:695
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 "O separador de Proxy apenas estarÃ¡ disponÃvel quando a conta estiver activa."
 
-#: ../plugins/groupwise-features/proxy.c:931
-#: ../plugins/groupwise-features/share-folder.c:701
+#. 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:700
+msgctxt "GW"
+msgid "Proxy"
+msgstr "Delegado"
+
+#: ../plugins/groupwise-features/proxy.c:926
+#: ../plugins/groupwise-features/share-folder.c:691
 msgid "Add User"
 msgstr "Adicionar Utilizador"
 
-#: ../plugins/groupwise-features/send-options.c:213
+#: ../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:317
-#: ../plugins/groupwise-features/share-folder.c:736
+#: ../plugins/groupwise-features/share-folder-common.c:310
+#: ../plugins/groupwise-features/share-folder.c:726
 msgid "Users"
 msgstr "Utilizadores"
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:311
 msgid "Enter the users and set permissions"
 msgstr "Introduza os utilizadores e defina as permissÃµes"
 
-#: ../plugins/groupwise-features/share-folder-common.c:415
+#: ../plugins/groupwise-features/share-folder-common.c:407
 msgid "Sharing"
 msgstr "Partilhar"
 
@@ -17652,67 +17506,63 @@ msgstr "Partilhar"
 msgid "Custom Notification"
 msgstr "NotificaÃ§Ã£o Personalizada"
 
-#: ../plugins/groupwise-features/share-folder.c:741
+#: ../plugins/groupwise-features/share-folder.c:731
 msgid "Add   "
 msgstr "Adicionar   "
 
-#: ../plugins/groupwise-features/status-track.c:126
+#: ../plugins/groupwise-features/share-folder.c:737
+msgid "Modify"
+msgstr "Alterar"
+
+#: ../plugins/groupwise-features/status-track.c:123
 msgid "Message Status"
 msgstr "Estado da Mensagem"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: ../plugins/groupwise-features/status-track.c:154
+#: ../plugins/groupwise-features/status-track.c:151
 msgid "From:"
 msgstr "De:"
 
-#: ../plugins/groupwise-features/status-track.c:169
+#: ../plugins/groupwise-features/status-track.c:166
 msgid "Creation date:"
 msgstr "Data de criaÃ§Ã£o:"
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:206
 msgid "Recipient: "
 msgstr "DestinatÃ¡rio: "
 
-#: ../plugins/groupwise-features/status-track.c:216
+#: ../plugins/groupwise-features/status-track.c:213
 msgid "Delivered: "
 msgstr "Entregue: "
 
-#: ../plugins/groupwise-features/status-track.c:222
+#: ../plugins/groupwise-features/status-track.c:219
 msgid "Opened: "
 msgstr "Aberta: "
 
-#: ../plugins/groupwise-features/status-track.c:227
+#: ../plugins/groupwise-features/status-track.c:224
 msgid "Accepted: "
 msgstr "Aceite: "
 
-#: ../plugins/groupwise-features/status-track.c:232
+#: ../plugins/groupwise-features/status-track.c:229
 msgid "Deleted: "
 msgstr "Apagada: "
 
-#: ../plugins/groupwise-features/status-track.c:237
+#: ../plugins/groupwise-features/status-track.c:234
 msgid "Declined: "
 msgstr "Recusada: "
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:239
 msgid "Completed: "
 msgstr "Terminada: "
 
-#: ../plugins/groupwise-features/status-track.c:247
+#: ../plugins/groupwise-features/status-track.c:244
 msgid "Undelivered: "
 msgstr "NÃ£o-entregue: "
 
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "Add Hula support to Evolution."
-msgstr "Adicionar suporte Hula ao Evolution."
-
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Support"
-msgstr "Suporte Hula"
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
 msgstr "Imagem Embutida"
@@ -17721,12 +17571,12 @@ msgstr "Imagem Embutida"
 msgid "View image attachments directly in mail messages."
 msgstr "Visualizar os anexos de imagens directamente nas mensagens de email."
 
-#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.c:330
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "CabeÃ§alhos personalizados"
 
-#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.c:343
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "CabeÃ§alhos IMAP"
@@ -17773,34 +17623,36 @@ msgstr "Afinar as suas contas IMAP."
 msgid "IMAP Features"
 msgstr "Funcionalidades IMAP"
 
-#: ../plugins/itip-formatter/itip-formatter.c:486
+#. Translators: The first '%s' is replaced with a calendar name,
+#. the second '%s' with an error message
+#: ../plugins/itip-formatter/itip-formatter.c:485
 #, c-format
-msgid "Failed to load the calendar '%s'"
-msgstr "Falha ao ler o calendÃ¡rio '%s'"
+msgid "Failed to load the calendar '%s' (%s)"
+msgstr "Falha ao ler o calendÃ¡rio '%s' (%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:652
+#: ../plugins/itip-formatter/itip-formatter.c:649
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Um compromisso no calendÃ¡rio '%s' entra em conflicto com esta reuniÃ£o"
 
-#: ../plugins/itip-formatter/itip-formatter.c:688
+#: ../plugins/itip-formatter/itip-formatter.c:685
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Encontrado o compromisso no calendÃ¡rio '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:787
+#: ../plugins/itip-formatter/itip-formatter.c:784
 msgid "Unable to find any calendars"
 msgstr "Incapaz de encontrar qualquer calendÃ¡rio"
 
-#: ../plugins/itip-formatter/itip-formatter.c:794
+#: ../plugins/itip-formatter/itip-formatter.c:791
 msgid "Unable to find this meeting in any calendar"
 msgstr "Incapaz de encontrar esta reuniÃ£o em qualquer calendÃ¡rio"
 
-#: ../plugins/itip-formatter/itip-formatter.c:798
+#: ../plugins/itip-formatter/itip-formatter.c:795
 msgid "Unable to find this task in any task list"
 msgstr "Incapaz de encontrar esta tarefa em qualquer lista de tarefas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:802
+#: ../plugins/itip-formatter/itip-formatter.c:799
 msgid "Unable to find this memo in any memo list"
 msgstr "Incapaz de encontrar este memo em qualquer lista de memos"
 
@@ -17901,13 +17753,13 @@ msgstr "calendario.ics"
 msgid "Save Calendar"
 msgstr "Gravar o CalendÃ¡rio"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
+#: ../plugins/itip-formatter/itip-formatter.c:1586
+#: ../plugins/itip-formatter/itip-formatter.c:1597
 msgid "The calendar attached is not valid"
 msgstr "O calendÃ¡rio anexo Ã© invÃ¡lido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1588
-#: ../plugins/itip-formatter/itip-formatter.c:1599
+#: ../plugins/itip-formatter/itip-formatter.c:1587
+#: ../plugins/itip-formatter/itip-formatter.c:1598
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17915,15 +17767,15 @@ msgstr ""
 "A mensagem indica conter um calendÃ¡rio, mas este nÃ£o Ã© um calendÃ¡rio "
 "iCalendar vÃ¡lido."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1639
-#: ../plugins/itip-formatter/itip-formatter.c:1667
-#: ../plugins/itip-formatter/itip-formatter.c:1773
+#: ../plugins/itip-formatter/itip-formatter.c:1638
+#: ../plugins/itip-formatter/itip-formatter.c:1666
+#: ../plugins/itip-formatter/itip-formatter.c:1775
 msgid "The item in the calendar is not valid"
 msgstr "O item no calendÃ¡rio Ã© invÃ¡lido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1640
-#: ../plugins/itip-formatter/itip-formatter.c:1668
-#: ../plugins/itip-formatter/itip-formatter.c:1774
+#: ../plugins/itip-formatter/itip-formatter.c:1639
+#: ../plugins/itip-formatter/itip-formatter.c:1667
+#: ../plugins/itip-formatter/itip-formatter.c:1776
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17931,11 +17783,11 @@ msgstr ""
 "A mensagem contÃ©m um calendÃ¡rio mas este nÃ£o contÃ©m quaisquer eventos, "
 "tarefas ou informaÃ§Ã£o de livre/ocupado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1680
 msgid "The calendar attached contains multiple items"
 msgstr "O calendÃ¡rio anexo contÃ©m mÃºltiplos itens"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1682
+#: ../plugins/itip-formatter/itip-formatter.c:1681
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17943,514 +17795,506 @@ msgstr ""
 "Para processar todos estes itens, o ficheiro deverÃ¡ ser gravado e o "
 "calendÃ¡rio importado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2447
+#: ../plugins/itip-formatter/itip-formatter.c:2454
 msgid "This meeting recurs"
 msgstr "Esta reuniÃ£o Ã© recorrente"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2450
+#: ../plugins/itip-formatter/itip-formatter.c:2457
 msgid "This task recurs"
 msgstr "Esta tarefa Ã© recorrente"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2453
+#: ../plugins/itip-formatter/itip-formatter.c:2460
 msgid "This memo recurs"
 msgstr "Este memo Ã© recorrente"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2682
+#: ../plugins/itip-formatter/itip-formatter.c:2694
 msgid "_Delete message after acting"
 msgstr "_Apagar as mensagens depois de agir"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2692
-#: ../plugins/itip-formatter/itip-formatter.c:2725
+#: ../plugins/itip-formatter/itip-formatter.c:2704
+#: ../plugins/itip-formatter/itip-formatter.c:2737
 msgid "Conflict Search"
 msgstr "Procura de Conflitos"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2707
+#: ../plugins/itip-formatter/itip-formatter.c:2719
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccione os calendÃ¡rios onde procurar por conflitos entre reuniÃµes"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "Hoje %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../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.
-#: ../plugins/itip-formatter/itip-view.c:213
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "Hoje %l:%M:%S %p"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "AmanhÃ£ %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../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.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "AmanhÃ£ %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:241
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "AmanhÃ£ %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../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.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../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.
-#: ../plugins/itip-formatter/itip-view.c:274
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:278
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:297
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:302
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:326
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:330
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:355
-#: ../plugins/itip-formatter/itip-view.c:443
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
-msgid "Please respond on behalf of <b>%s</b>"
-msgstr "Responda em nome de <b>%s</b>"
-
-#: ../plugins/itip-formatter/itip-view.c:357
-#: ../plugins/itip-formatter/itip-view.c:445
-#: ../plugins/itip-formatter/itip-view.c:532
-#, c-format
-msgid "Received on behalf of <b>%s</b>"
-msgstr "Recebida em nome de <b>%s</b>"
-
-#: ../plugins/itip-formatter/itip-view.c:362
-#, c-format
-msgid "<b>%s</b> through %s has published the following meeting information:"
-msgstr "<b>%s</b> atravÃ©s de %s publicou a seguinte informaÃ§Ã£o de reuniÃ£o:"
-
-#: ../plugins/itip-formatter/itip-view.c:364
-#, c-format
-msgid "<b>%s</b> has published the following meeting information:"
-msgstr "<b>%s</b> publicou a seguinte informaÃ§Ã£o de reuniÃ£o:"
+msgid "Please respond on behalf of %s"
+msgstr "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
 #, c-format
-msgid "<b>%s</b> has delegated the following meeting to you:"
-msgstr "<b>%s</b> delegou-lhe a seguinte reuniÃ£o:"
-
-#: ../plugins/itip-formatter/itip-view.c:372
-#, c-format
-msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr "<b>%s</b> atravÃ©s de %s pede a sua presenÃ§a na seguinte reuniÃ£o:"
+msgid "Received on behalf of %s"
+msgstr "Recebida em nome de %s"
 
 #: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
-msgid "<b>%s</b> requests your presence at the following meeting:"
-msgstr "<b>%s</b> pede a sua presenÃ§a na seguinte reuniÃ£o:"
+msgid "%s through %s has published the following meeting information:"
+msgstr "%s atravÃ©s de %s publicou a seguinte informaÃ§Ã£o de reuniÃ£o:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
-msgstr "<b>%s</b> atravÃ©s de %s deseja adicionar a uma reuniÃ£o existente:"
+msgid "%s has published the following meeting information:"
+msgstr "%s publicou a seguinte informaÃ§Ã£o de reuniÃ£o:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:381
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting:"
-msgstr "<b>%s</b> deseja adicionar a uma reuniÃ£o existente:"
+msgid "%s has delegated the following meeting to you:"
+msgstr "%s delegou-lhe a seguinte reuniÃ£o:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following meeting:"
-msgstr ""
-"<b>%s</b> atravÃ©s de %s deseja receber a mais recente informaÃ§Ã£o sobre a "
-"seguinte reuniÃ£o:"
+msgid "%s through %s requests your presence at the following meeting:"
+msgstr "%s atravÃ©s de %s pede a sua presenÃ§a na seguinte reuniÃ£o:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr ""
-"<b>%s</b> deseja receber a mais recente informaÃ§Ã£o sobre a seguinte reuniÃ£o:"
+msgid "%s requests your presence at the following meeting:"
+msgstr "%s pede a sua presenÃ§a na seguinte reuniÃ£o:"
 
 #: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
-msgid "<b>%s</b> through %s has sent back the following meeting response:"
-msgstr "<b>%s</b> atravÃ©s de %s enviou de volta a seguinte resposta Ã  reuniÃ£o:"
+msgid "%s through %s wishes to add to an existing meeting:"
+msgstr "%s atravÃ©s de %s deseja adicionar a uma reuniÃ£o existente:"
 
 #: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
-msgid "<b>%s</b> has sent back the following meeting response:"
-msgstr "<b>%s</b> enviou de volta a seguinte resposta Ã  reuniÃ£o:"
+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
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following meeting:"
-msgstr "<b>%s</b> atravÃ©s de %s cancelou a seguinte reuniÃ£o:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
+msgstr ""
+"%s atravÃ©s de %s deseja receber a mais recente informaÃ§Ã£o sobre a seguinte "
+"reuniÃ£o:"
 
 #: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
-msgid "<b>%s</b> has canceled the following meeting."
-msgstr "<b>%s</b> cancelou a seguinte reuniÃ£o."
+msgid "%s wishes to receive the latest information for the following meeting:"
+msgstr "%s deseja receber a mais recente informaÃ§Ã£o sobre a seguinte reuniÃ£o:"
 
 #: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
-msgid "<b>%s</b> through %s has proposed the following meeting changes."
-msgstr "<b>%s</b> atravÃ©s de %s propÃ´s as seguintes alteraÃ§Ãµes Ã  reuniÃ£o."
+msgid "%s through %s has sent back the following meeting response:"
+msgstr "%s atravÃ©s de %s enviou a seguinte resposta Ã  reuniÃ£o:"
 
 #: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
-msgid "<b>%s</b> has proposed the following meeting changes."
-msgstr "<b>%s</b> propÃ´s as seguintes alteraÃ§Ãµes Ã  reuniÃ£o:"
+msgid "%s has sent back the following meeting response:"
+msgstr "%s enviou a seguinte resposta Ã  reuniÃ£o:"
 
 #: ../plugins/itip-formatter/itip-view.c:410
 #, c-format
-msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr "<b>%s</b> atravÃ©s de %s recusou as seguintes alteraÃ§Ãµes Ã  reuniÃ£o:"
+msgid "%s through %s has canceled the following meeting:"
+msgstr "%s atravÃ©s de %s cancelou a seguinte reuniÃ£o:"
 
 #: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
-msgid "<b>%s</b> has declined the following meeting changes."
-msgstr "<b>%s</b> recusou as seguintes alteraÃ§Ãµes Ã  reuniÃ£o:"
+msgid "%s has canceled the following meeting."
+msgstr "%s cancelou a seguinte reuniÃ£o."
 
-#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:416
 #, c-format
-msgid "<b>%s</b> through %s has published the following task:"
-msgstr "<b>%s</b> atravÃ©s de %s publicou a seguinte tarefa:"
+msgid "%s through %s has proposed the following meeting changes."
+msgstr "%s atravÃ©s de %s propÃ´s as seguintes alteraÃ§Ãµes Ã  reuniÃ£o."
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:418
 #, c-format
-msgid "<b>%s</b> has published the following task:"
-msgstr "<b>%s</b> publicou a seguinte tarefa:"
+msgid "%s has proposed the following meeting changes."
+msgstr "%s propÃ´s as seguintes alteraÃ§Ãµes Ã  reuniÃ£o."
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:422
 #, c-format
-msgid "<b>%s</b> requests the assignment of %s to the following task:"
-msgstr "<b>%s</b> pede que seja atribuÃda a %s a seguinte tarefa:"
+msgid "%s through %s has declined the following meeting changes:"
+msgstr "%s atravÃ©s de %s recusou as seguintes alteraÃ§Ãµes Ã  reuniÃ£o:"
 
-#: ../plugins/itip-formatter/itip-view.c:460
+#: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
-msgid "<b>%s</b> through %s has assigned you a task:"
-msgstr "<b>%s</b> atravÃ©s de %s atribuiu-lhe uma tarefa:"
+msgid "%s has declined the following meeting changes."
+msgstr "%s recusou as seguintes alteraÃ§Ãµes Ã  reuniÃ£o:"
 
 #: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
-msgid "<b>%s</b> has assigned you a task:"
-msgstr "<b>%s</b> atribuiu-lhe uma tarefa:"
+msgid "%s through %s has published the following task:"
+msgstr "%s atravÃ©s de %s publicou a seguinte tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing task:"
-msgstr "<b>%s</b> atravÃ©s de %s deseja adicionar a uma tarefa existente:"
+msgid "%s has published the following task:"
+msgstr "%s publicou a seguinte tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:469
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing task:"
-msgstr "<b>%s</b> deseja adicionar a uma tarefa existente:"
+msgid "%s requests the assignment of %s to the following task:"
+msgstr "%s pede que seja atribuÃda a %s a seguinte tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following assigned task:"
-msgstr ""
-"<b>%s</b> atravÃ©s de %s deseja receber a mais recente informaÃ§Ã£o sobre a "
-"seguinte tarefa atribuÃda:"
+msgid "%s through %s has assigned you a task:"
+msgstr "%s atravÃ©s de %s atribuiu-lhe uma tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following "
-"assigned task:"
-msgstr ""
-"<b>%s</b> deseja receber a mais recente informaÃ§Ã£o sobre a seguinte tarefa "
-"atribuÃda:"
+msgid "%s has assigned you a task:"
+msgstr "%s atribuiu-lhe uma tarefa:"
 
 #: ../plugins/itip-formatter/itip-view.c:480
 #, c-format
-msgid ""
-"<b>%s</b> through %s has sent back the following assigned task response:"
-msgstr ""
-"<b>%s</b> atravÃ©s de %s enviou de volta a seguinte resposta Ã  tarefa "
-"atribuÃda:"
+msgid "%s through %s wishes to add to an existing task:"
+msgstr "%s atravÃ©s de %s deseja adicionar a uma tarefa existente:"
 
 #: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
-msgid "<b>%s</b> has sent back the following assigned task response:"
-msgstr "<b>%s</b> enviou de volta a seguinte resposta Ã  tarefa atribuÃda:"
+msgid "%s wishes to add to an existing task:"
+msgstr "%s deseja adicionar a uma tarefa existente:"
 
 #: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following assigned task:"
-msgstr "<b>%s</b> atravÃ©s de %s cancelou a seguinte tarefa atribuÃda:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"assigned task:"
+msgstr ""
+"%s atravÃ©s de %s deseja receber a mais recente informaÃ§Ã£o sobre a seguinte "
+"tarefa atribuÃda:"
 
 #: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
-msgid "<b>%s</b> has canceled the following assigned task:"
-msgstr "<b>%s</b> cancelou a seguinte tarefa atribuÃda:"
+msgid ""
+"%s wishes to receive the latest information for the following assigned task:"
+msgstr ""
+"%s deseja receber a mais recente informaÃ§Ã£o sobre a seguinte tarefa "
+"atribuÃda:"
 
 #: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
-msgid ""
-"<b>%s</b> through %s has proposed the following task assignment changes:"
-msgstr ""
-"<b>%s</b> atravÃ©s de %s propÃ´s as seguintes alteraÃ§Ãµes Ã  atribuiÃ§Ã£o da "
-"tarefa:"
+msgid "%s through %s has sent back the following assigned task response:"
+msgstr "%s atravÃ©s de %s enviou a seguinte resposta Ã  tarefa atribuÃda:"
 
 #: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
-msgid "<b>%s</b> has proposed the following task assignment changes:"
-msgstr "<b>%s</b> propÃ´s as seguintes alteraÃ§Ãµes Ã  atribuiÃ§Ã£o da tarefa:"
+msgid "%s has sent back the following assigned task response:"
+msgstr "%s enviou a seguinte resposta Ã  tarefa atribuÃda:"
 
 #: ../plugins/itip-formatter/itip-view.c:498
 #, c-format
-msgid "<b>%s</b> through %s has declined the following assigned task:"
-msgstr "<b>%s</b> atravÃ©s de %s recusou a seguinte tarefa atribuÃda:"
+msgid "%s through %s has canceled the following assigned task:"
+msgstr "%s atravÃ©s de %s cancelou a seguinte tarefa atribuÃda:"
 
 #: ../plugins/itip-formatter/itip-view.c:500
 #, c-format
-msgid "<b>%s</b> has declined the following assigned task:"
-msgstr "<b>%s</b> recusou a atribuiÃ§Ã£o da seguinte tarefa:"
+msgid "%s has canceled the following assigned task:"
+msgstr "%s cancelou a seguinte tarefa atribuÃda:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:504
 #, c-format
-msgid "<b>%s</b> through %s has published the following memo:"
-msgstr "<b>%s</b> atravÃ©s de %s publicou o seguinte memo:"
+msgid "%s through %s has proposed the following task assignment changes:"
+msgstr ""
+"%s atravÃ©s de %s propÃ´s as seguintes alteraÃ§Ãµes Ã  atribuiÃ§Ã£o da tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:506
 #, c-format
-msgid "<b>%s</b> has published the following memo:"
-msgstr "<b>%s</b> publicou o seguinte memo:"
+msgid "%s has proposed the following task assignment changes:"
+msgstr "%s propÃ´s as seguintes alteraÃ§Ãµes Ã  atribuiÃ§Ã£o da tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:510
+#, c-format
+msgid "%s through %s has declined the following assigned task:"
+msgstr "%s atravÃ©s de %s recusou a seguinte tarefa atribuÃda:"
+
+#: ../plugins/itip-formatter/itip-view.c:512
+#, c-format
+msgid "%s has declined the following assigned task:"
+msgstr "%s recusou a atribuiÃ§Ã£o da seguinte tarefa:"
+
+#: ../plugins/itip-formatter/itip-view.c:549
+#, c-format
+msgid "%s through %s has published the following memo:"
+msgstr "%s atravÃ©s de %s publicou o seguinte memo:"
+
+#: ../plugins/itip-formatter/itip-view.c:551
+#, c-format
+msgid "%s has published the following memo:"
+msgstr "%s publicou o seguinte memo:"
+
+#: ../plugins/itip-formatter/itip-view.c:556
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing memo:"
-msgstr "<b>%s</b> atravÃ©s de %s deseja adicionar a um memo existente:"
+msgid "%s through %s wishes to add to an existing memo:"
+msgstr "%s atravÃ©s de %s deseja adicionar a um memo existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:546
+#: ../plugins/itip-formatter/itip-view.c:558
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing memo:"
-msgstr "<b>%s</b> deseja adicionar a um memo existente:"
+msgid "%s wishes to add to an existing memo:"
+msgstr "%s deseja adicionar a um memo existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:562
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following shared memo:"
-msgstr "<b>%s</b> atravÃ©s de %s cancelou o seguinte memo partilhado:"
+msgid "%s through %s has canceled the following shared memo:"
+msgstr "%s atravÃ©s de %s cancelou o seguinte memo partilhado:"
 
-#: ../plugins/itip-formatter/itip-view.c:552
+#: ../plugins/itip-formatter/itip-view.c:564
 #, c-format
-msgid "<b>%s</b> has canceled the following shared memo:"
-msgstr "<b>%s</b> cancelou o seguinte memo partilhado:"
+msgid "%s has canceled the following shared memo:"
+msgstr "%s cancelou o seguinte memo partilhado:"
 
-#: ../plugins/itip-formatter/itip-view.c:676
+#: ../plugins/itip-formatter/itip-view.c:688
 msgid "All day:"
 msgstr "Dia completo:"
 
-#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:698
 msgid "Start day:"
 msgstr "Dia de inÃcio:"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:686
-#: ../plugins/itip-formatter/itip-view.c:1045
+#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:1053
 msgid "Start time:"
 msgstr "Hora de inÃcio:"
 
-#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:710
 msgid "End day:"
 msgstr "Dia de finalizaÃ§Ã£o:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1056
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:1064
 msgid "End time:"
 msgstr "Hora de finalizaÃ§Ã£o:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Open Calendar"
 msgstr "_Abrir o CalendÃ¡rio"
 
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:841
-#: ../plugins/itip-formatter/itip-view.c:847
-#: ../plugins/itip-formatter/itip-view.c:864
-#: ../plugins/itip-formatter/itip-view.c:869
+#: ../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:881
 msgid "_Decline"
 msgstr "_Recusar"
 
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:843
 #: ../plugins/itip-formatter/itip-view.c:850
-#: ../plugins/itip-formatter/itip-view.c:866
-#: ../plugins/itip-formatter/itip-view.c:871
-msgid "_Accept"
-msgstr "_Aceitar"
-
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../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:883
+msgid "A_ccept"
+msgstr "A_ceitar"
+
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Decline all"
 msgstr "_Recusar tudo"
 
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Tentative all"
 msgstr "Todas _tentativas"
 
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:848
-#: ../plugins/itip-formatter/itip-view.c:865
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../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:882
 msgid "_Tentative"
 msgstr "_Tentativa"
 
-#: ../plugins/itip-formatter/itip-view.c:843
-msgid "_Accept all"
-msgstr "_Aceitar todas"
+#: ../plugins/itip-formatter/itip-view.c:855
+msgid "A_ccept all"
+msgstr "A_ceitar todas"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:866
 msgid "_Send Information"
 msgstr "_Enviar InformaÃ§Ã£o"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:870
 msgid "_Update Attendee Status"
 msgstr "_Actualizar o Estado dos Presentes"
 
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:873
 msgid "_Update"
 msgstr "_Actualizar"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1076
-#: ../plugins/itip-formatter/itip-view.c:1130
+#: ../plugins/itip-formatter/itip-view.c:1084
+#: ../plugins/itip-formatter/itip-view.c:1138
 msgid "Comment:"
 msgstr "ComentÃ¡rio:"
 
-#: ../plugins/itip-formatter/itip-view.c:1115
+#: ../plugins/itip-formatter/itip-view.c:1123
 msgid "Send _reply to sender"
 msgstr "_Responder ao remetente"
 
-#: ../plugins/itip-formatter/itip-view.c:1145
+#: ../plugins/itip-formatter/itip-view.c:1153
 msgid "Send _updates to attendees"
 msgstr "Enviar actualizaÃ§Ãµes aos _participantes"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "_Apply to all instances"
 msgstr "A_plicar a todas as instÃ¢ncias"
 
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1171
 msgid "Show time as _free"
 msgstr "Apresentar as horas como _livres"
 
-#: ../plugins/itip-formatter/itip-view.c:1166
+#: ../plugins/itip-formatter/itip-view.c:1174
 msgid "_Preserve my reminder"
 msgstr "_Manter o meu lembrete"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1180
 msgid "_Inherit reminder"
 msgstr "_Herdar o lembrete"
 
-#: ../plugins/itip-formatter/itip-view.c:1915
+#: ../plugins/itip-formatter/itip-view.c:1923
 msgid "_Tasks:"
 msgstr "_Tarefas:"
 
-#: ../plugins/itip-formatter/itip-view.c:1917
+#: ../plugins/itip-formatter/itip-view.c:1925
 msgid "_Memos:"
 msgstr "_Memos:"
 
@@ -18463,18 +18307,14 @@ msgid "Itip Formatter"
 msgstr "Formatador Itip"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid ""
-"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
-msgstr ""
-"&quot;{0}&quot; delegou a reuniÃ£o. Deseja adicionar o delegado &quot;{1}"
-"&quot;?"
+msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
+msgstr "'{0}' delegou a reuniÃ£o. Deseja adicionar o delegado '{1}'?"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "This meeting has been delegated"
 msgstr "Esta reuniÃ£o foi delegada"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid ""
 "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr ""
@@ -18486,22 +18326,18 @@ msgid "Beep or play sound file."
 msgstr "Emitir um \"beep\" ou reproduzir um ficheiro de som."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Blink icon in notification area."
-msgstr "Piscar o Ãcone na Ã¡rea de notificaÃ§Ã£o."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable D-Bus messages."
 msgstr "Activar as mensagens D-Bus."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable icon in notification area."
 msgstr "Activar o Ãcone na Ã¡rea de notificaÃ§Ã£o."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+#: ../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 notificaÃ§Ã£o D-BUS ao receber uma nova mensagem."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
 msgid ""
 "If \"true\", then beep, otherwise will play sound file when new messages "
 "arrive."
@@ -18509,70 +18345,65 @@ msgstr ""
 "Se \"true\", emitir um \"beep\", caso contrÃ¡rio reproduzir um ficheiro de "
 "som ao receber mensagens novas."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
 msgid "Notify new messages for Inbox only."
 msgstr "Apenas notificar sobre mensagens novas na Caixa de Entrada."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Play sound when new messages arrive."
 msgstr "Reproduzir um som ao chegarem novas mensagens."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr ""
 "Reproduzir ficheiro Ã¡udio ao chegarem novas mensagens, se nÃ£o estiver em "
 "modo \"beep\"."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Popup message together with the icon."
 msgstr "Apresentar um popup da mensagem juntamente com o Ãcone."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr ""
 "Apresentar um Ãcone de mensagens novas na Ã¡rea de notificaÃ§Ã£o quando "
 "chegarem mensagens novas."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Sound file name to be played."
 msgstr "Nome do ficheiro de som a ser reproduzido."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr ""
 "Ficheiro de som a ser reproduzido ao chegarem novas mensagens, se nÃ£o "
 "estiver em modo \"beep\"."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Use sound theme"
 msgstr "Utilizar tema de som"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
 msgid "Whether play sound or beep when new messages arrive."
 msgstr "Se reproduzir um som ou \"beep\" ao chegarem novas mensagens."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 msgid "Whether show message over the icon when new messages arrive."
 msgstr "Se apresentar ou nÃ£o a mensagem sobre o Ãcone quando esta chega."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:17
-msgid "Whether the icon should blink or not."
-msgstr "Se o Ãcone deverÃ¡ ou nÃ£o piscar."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:18
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Se notificar apenas sobre mensagens na Caixa de Entrada ou todas."
 
-#: ../plugins/mail-notification/mail-notification.c:344
+#: ../plugins/mail-notification/mail-notification.c:352
 msgid "Evolution's Mail Notification"
 msgstr "NotificaÃ§Ã£o de Nova Mensagem do Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:366
+#: ../plugins/mail-notification/mail-notification.c:374
 msgid "Mail Notification Properties"
 msgstr "Propriedades da NotificaÃ§Ã£o de Nova Mensagem"
 
-#. To translators: '%d' is the count of mails received and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:495
+#: ../plugins/mail-notification/mail-notification.c:507
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18587,67 +18418,65 @@ msgstr[1] ""
 "Recebeu %d mensagens novas\n"
 "em %s."
 
-#. To Translators: "From:" is preceding a new mail sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:506
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../plugins/mail-notification/mail-notification.c:519
 #, c-format
 msgid "From: %s"
 msgstr "De: %s"
 
-#. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:518
+#. Translators: "Subject:" is preceding a new mail
+#. * subject, like "Subject: It happened again"
+#: ../plugins/mail-notification/mail-notification.c:532
 #, c-format
 msgid "Subject: %s"
 msgstr "Assunto: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:527
+#: ../plugins/mail-notification/mail-notification.c:542
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Recebeu %d mensagem nova."
 msgstr[1] "Recebeu %d mensagens novas."
 
-#: ../plugins/mail-notification/mail-notification.c:545
-#: ../plugins/mail-notification/mail-notification.c:550
+#: ../plugins/mail-notification/mail-notification.c:559
+#: ../plugins/mail-notification/mail-notification.c:566
 msgid "New email"
 msgstr "Nova mensagem"
 
-#: ../plugins/mail-notification/mail-notification.c:604
+#: ../plugins/mail-notification/mail-notification.c:627
 msgid "Show icon in _notification area"
 msgstr "Apresentar o Ãcone na Ã¡rea de _notificaÃ§Ã£o"
 
-#: ../plugins/mail-notification/mail-notification.c:632
-msgid "B_link icon in notification area"
-msgstr "P_iscar o Ãcone na Ã¡rea de notificaÃ§Ã£o"
-
-#: ../plugins/mail-notification/mail-notification.c:642
+#: ../plugins/mail-notification/mail-notification.c:656
 msgid "Popup _message together with the icon"
 msgstr "Apresentar a _mensagem em popup junto ao Ãcone"
 
-#: ../plugins/mail-notification/mail-notification.c:827
+#: ../plugins/mail-notification/mail-notification.c:843
 msgid "_Play sound when new messages arrive"
 msgstr "_Reproduzir um som ao chegarem novas mensagens"
 
-#: ../plugins/mail-notification/mail-notification.c:856
+#: ../plugins/mail-notification/mail-notification.c:872
 msgid "_Beep"
 msgstr "_Beep"
 
-#: ../plugins/mail-notification/mail-notification.c:869
+#: ../plugins/mail-notification/mail-notification.c:885
 msgid "Use sound _theme"
 msgstr "Utilizar _tema de som"
 
-#: ../plugins/mail-notification/mail-notification.c:888
+#: ../plugins/mail-notification/mail-notification.c:904
 msgid "Play _file:"
 msgstr "Reproduzir _ficheiro:"
 
-#: ../plugins/mail-notification/mail-notification.c:899
+#: ../plugins/mail-notification/mail-notification.c:915
 msgid "Select sound file"
 msgstr "Seleccione um ficheiro de som"
 
-#: ../plugins/mail-notification/mail-notification.c:957
+#: ../plugins/mail-notification/mail-notification.c:973
 msgid "Notify new messages for _Inbox only"
 msgstr "Apenas notificar sobre mensagens novas na Caixa de _Entrada"
 
-#: ../plugins/mail-notification/mail-notification.c:966
+#: ../plugins/mail-notification/mail-notification.c:982
 msgid "Generate a _D-Bus message"
 msgstr "Gerar uma mensagem _D-Bus"
 
@@ -18660,12 +18489,12 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Notifica-o ao chegarem novas mensagens."
 
 #. 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:166
+#: ../plugins/mail-to-task/mail-to-task.c:158
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Criado a partir de um email de %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:496
+#: ../plugins/mail-to-task/mail-to-task.c:490
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -18674,7 +18503,7 @@ msgstr ""
 "O calendÃ¡rio seleccionado jÃ¡ contÃ©m o evento '%s'. Deseja editar o evento "
 "antigo?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:499
+#: ../plugins/mail-to-task/mail-to-task.c:493
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -18683,7 +18512,7 @@ msgstr ""
 "A lista de tarefas seleccionada jÃ¡ contÃ©m a tarefa '%s'. Deseja editar a "
 "tarefa antiga?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:502
+#: ../plugins/mail-to-task/mail-to-task.c:496
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18692,7 +18521,10 @@ msgstr ""
 "A lista de memos seleccionada jÃ¡ contÃ©m o memo '%s'. Deseja editar o memo "
 "antigo?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:519
+#. 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:516
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
@@ -18700,6 +18532,9 @@ msgstr ""
 "O calendÃ¡rio seleccionado jÃ¡ contÃ©m alguns eventos para as mensagens "
 "indicadas. Ainda assim deseja criar novos eventos?"
 
+#. 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:522
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
@@ -18708,7 +18543,10 @@ msgstr ""
 "A lista de tarefas seleccionada jÃ¡ contÃ©m algumas tarefas para as mensagens "
 "indicadas. Ainda assim deseja criar novas tarefas?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:525
+#. 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:528
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -18716,7 +18554,10 @@ msgstr ""
 "A lista de memos seleccionada jÃ¡ contÃ©m alguns memos para as mensagens "
 "indicadas. Ainda assim deseja criar novos memos?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:543
+#. 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:549
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -18730,7 +18571,10 @@ msgstr[1] ""
 "O calendÃ¡rio seleccionado jÃ¡ contÃ©m eventos para as mensagens indicadas. "
 "Ainda assim deseja criar novos eventos?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:549
+#. 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:558
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -18744,7 +18588,10 @@ msgstr[1] ""
 "A lista de tarefas seleccionada jÃ¡ contÃ©m tarefas para as mensagens "
 "indicadas. Ainda assim deseja criar novas tarefas?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:555
+#. 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:567
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -18758,25 +18605,25 @@ msgstr[1] ""
 "A lista de memos seleccionada jÃ¡ contÃ©m memos para as mensagens indicadas. "
 "Ainda assim deseja criar novos memos?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:614
+#: ../plugins/mail-to-task/mail-to-task.c:626
 msgid "[No Summary]"
 msgstr "[Sem Resumo]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:637
 msgid "Invalid object returned from a server"
 msgstr "Servidor devolveu um objecto invÃ¡lido"
 
-#: ../plugins/mail-to-task/mail-to-task.c:696
+#: ../plugins/mail-to-task/mail-to-task.c:708
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Ocorreu um erro ao processar: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:737
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Incapaz de abrir o calendÃ¡rio. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:732
+#: ../plugins/mail-to-task/mail-to-task.c:744
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18784,7 +18631,7 @@ msgstr ""
 "A fonte seleccionada Ã© apenas de leitura, pelo que nÃ£o Ã© possÃvel lÃ¡ criar "
 "eventos. Seleccione outra fonte."
 
-#: ../plugins/mail-to-task/mail-to-task.c:735
+#: ../plugins/mail-to-task/mail-to-task.c:747
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18792,7 +18639,7 @@ msgstr ""
 "A fonte seleccionada Ã© apenas de leitura, pelo que nÃ£o Ã© possÃvel lÃ¡ criar "
 "tarefas. Seleccione outra fonte."
 
-#: ../plugins/mail-to-task/mail-to-task.c:738
+#: ../plugins/mail-to-task/mail-to-task.c:750
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18800,40 +18647,40 @@ msgstr ""
 "A fonte seleccionada Ã© apenas de leitura, pelo que nÃ£o Ã© possÃvel lÃ¡ criar "
 "um memo. Seleccione outra fonte."
 
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/mail-to-task/mail-to-task.c:953
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "Incapaz de obter a lista de origens. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1060
+#: ../plugins/mail-to-task/mail-to-task.c:1072
 msgid "Create an _Event"
 msgstr "Criar um _Evento"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1062
+#: ../plugins/mail-to-task/mail-to-task.c:1074
 msgid "Create a new event from the selected message"
 msgstr "Criar um novo evento a partir da mensagem seleccionada"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1067
+#: ../plugins/mail-to-task/mail-to-task.c:1079
 msgid "Create a Mem_o"
 msgstr "Criar um Mem_o"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1069
+#: ../plugins/mail-to-task/mail-to-task.c:1081
 msgid "Create a new memo from the selected message"
 msgstr "Criar um novo memo a partir da mensagem seleccionada"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1074
+#: ../plugins/mail-to-task/mail-to-task.c:1086
 msgid "Create a _Task"
 msgstr "Criar uma _Tarefa"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1076
+#: ../plugins/mail-to-task/mail-to-task.c:1088
 msgid "Create a new task from the selected message"
 msgstr "Criar uma nova tarefa a partir da mensagem seleccionada"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/mail-to-task/mail-to-task.c:1096
 msgid "Create a _Meeting"
 msgstr "Criar uma _ReuniÃ£o"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1086
+#: ../plugins/mail-to-task/mail-to-task.c:1098
 msgid "Create a new meeting from the selected message"
 msgstr "Criar uma nova reuniÃ£o a partir da mensagem seleccionada"
 
@@ -18841,57 +18688,57 @@ msgstr "Criar uma nova reuniÃ£o a partir da mensagem seleccionada"
 msgid "Convert a mail message to a task."
 msgstr "Converter uma mensagem de email numa tarefa."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:291
 msgid "Get List _Archive"
 msgstr "Obter o _Arquivo da Lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
 msgid "Get an archive of the list this message belongs to"
 msgstr "Obter um arquivo da lista a que esta mensagem pertence"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:298
 msgid "Get List _Usage Information"
 msgstr "Obter InformaÃ§Ã£o de _UtilizaÃ§Ã£o da Lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Obter informaÃ§Ã£o de utilizaÃ§Ã£o da lista a que esta mensagem pertence"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:305
 msgid "Contact List _Owner"
 msgstr "Contactar o _Dono da Lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "Contactar o dono da lista de distribuiÃ§Ã£o a que esta mensagem pertence"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:312
 msgid "_Post Message to List"
 msgstr "_Enviar Mensagem para a Lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
 msgid "Post a message to the mailing list this message belongs to"
 msgstr ""
 "Enviar uma mensagem para a lista de distribuiÃ§Ã£o a que esta mensagem pertence"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:319
 msgid "_Subscribe to List"
 msgstr "_Subscrever a Lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Subscrever a lista de distribuiÃ§Ã£o a que esta mensagem pertence"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:326
 msgid "_Unsubscribe from List"
 msgstr "_Remover a SubscriÃ§Ã£o da Lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:328
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr ""
 "Remover a subscriÃ§Ã£o da lista de distribuiÃ§Ã£o a que esta mensagem pertence"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:335
 msgid "Mailing _List"
 msgstr "_Lista de DistribuiÃ§Ã£o"
 
@@ -18999,15 +18846,15 @@ msgstr ""
 "Deseja marcar como lidas apenas as mensagens na pasta actual ou nesta bem "
 "como em todas as suas subpastas?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:168
+#: ../plugins/mark-all-read/mark-all-read.c:196
 msgid "In Current Folder and _Subfolders"
 msgstr "Na Pasta Actual e _Subpastas"
 
-#: ../plugins/mark-all-read/mark-all-read.c:182
+#: ../plugins/mark-all-read/mark-all-read.c:210
 msgid "In Current _Folder Only"
 msgstr "Apenas Na _Pasta Actual"
 
-#: ../plugins/mark-all-read/mark-all-read.c:402
+#: ../plugins/mark-all-read/mark-all-read.c:439
 msgid "Mark Me_ssages as Read"
 msgstr "Marcar as Men_sagens como Lidas"
 
@@ -19019,40 +18866,6 @@ msgstr "Marcar Todas como Lidas"
 msgid "Mark all messages in a folder as read."
 msgstr "Marcar todas as mensagens numa pasta como lidas."
 
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-msgid "Manage your Evolution plugins."
-msgstr "Gerir os plugins do Evolution."
-
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:244
-msgid "Plugin Manager"
-msgstr "Gestor de Plugins"
-
-#: ../plugins/plugin-manager/plugin-manager.c:59
-msgid "Author(s)"
-msgstr "Autor(es)"
-
-#: ../plugins/plugin-manager/plugin-manager.c:259
-msgid "Note: Some changes will not take effect until restart"
-msgstr "Nota: Algumas alteraÃ§Ãµes nÃ£o terÃ£o efeito atÃ© que reinicie"
-
-#: ../plugins/plugin-manager/plugin-manager.c:285
-msgid "Overview"
-msgstr "Resumo"
-
-#: ../plugins/plugin-manager/plugin-manager.c:356
-#: ../plugins/plugin-manager/plugin-manager.c:418
-msgid "Plugin"
-msgstr "Plugin"
-
-#: ../plugins/plugin-manager/plugin-manager.c:430
-msgid "_Plugins"
-msgstr "_Plugins"
-
-#: ../plugins/plugin-manager/plugin-manager.c:432
-msgid "Enable and disable plugins"
-msgstr "Activar e desactivar plugins"
-
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
@@ -19068,19 +18881,19 @@ msgstr ""
 "Visualizar as mensagens de correio como texto simples, mesmo quando contÃªm "
 "conteÃºdo HTML."
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Show HTML if present"
 msgstr "Apresentar HTML se existente"
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Let Evolution choose the best part to show."
 msgstr "Permitir que o Evolution seleccione a melhor parte a apresentar."
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid "Show plain text if present"
 msgstr "Apresentar texto simples, se existente"
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -19088,11 +18901,11 @@ msgstr ""
 "Apresentar a parte em texto simples, se existir, caso contrÃ¡rio permitir que "
 "o Evolution seleccione a melhor parte a apresentar."
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid "Only ever show plain text"
 msgstr "Apenas apresentar texto simples"
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
@@ -19100,11 +18913,11 @@ msgstr ""
 "Apresentar sempre apenas a parte de texto simples e criar anexos para as "
 "outras partes, se pedido."
 
-#: ../plugins/prefer-plain/prefer-plain.c:250
+#: ../plugins/prefer-plain/prefer-plain.c:247
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Apresentar as partes HTML s_uprimidas como anexos"
 
-#: ../plugins/prefer-plain/prefer-plain.c:270
+#: ../plugins/prefer-plain/prefer-plain.c:267
 msgid "HTML _Mode"
 msgstr "_Modo HTML"
 
@@ -19128,31 +18941,35 @@ msgstr "Importador de PST do Outlook"
 msgid "Outlook personal folders (.pst)"
 msgstr "Pastas pessoais do Outlook (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:299
+#: ../plugins/pst-import/pst-importer.c:295
 msgid "_Mail"
 msgstr "E_mail"
 
+#: ../plugins/pst-import/pst-importer.c:307
+msgid "Destination folder:"
+msgstr "Pasta de destino:"
+
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:317
+#: ../plugins/pst-import/pst-importer.c:313
 msgid "_Address Book"
 msgstr "Livro de _EndereÃ§os"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:324
+#: ../plugins/pst-import/pst-importer.c:320
 msgid "A_ppointments"
 msgstr "Com_promissos"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:326 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tarefas"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:336
+#: ../plugins/pst-import/pst-importer.c:332
 msgid "_Journal entries"
 msgstr "_Entradas de diÃ¡rio"
 
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:347
 msgid "Importing Outlook data"
 msgstr "Importar dados do Outlook"
 
@@ -19318,47 +19135,47 @@ msgstr "Nova LocalizaÃ§Ã£o"
 msgid "Edit Location"
 msgstr "Editar LocalizaÃ§Ã£o"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:121
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "Incapaz de encontrar o SpamAssassin, cÃ³digo: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:129
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:137
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Falha ao criar um canal: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:176
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Erro apÃ³s o fork: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "Processo filho SpamAssassin nÃ£o responde, a matÃ¡-lo..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:234
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "Espera pelo processo filho SpamAssassin interrompida, a terminar..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "Falha no canal com o SpamAssassin, cÃ³digo de erro: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:506
 #, c-format
 msgid "SpamAssassin is not available. Please install it first."
 msgstr "O SpamAssassin estÃ¡ indisponÃvel. Instale-o primeiro."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:927
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Isto tornarÃ¡ o SpamAssassin mais preciso, mas mais lento"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:935
 msgid "I_nclude remote tests"
 msgstr "I_ncluir testes remotos"
 
@@ -19475,94 +19292,26 @@ msgstr "%FT%T"
 msgid "RDF format (.rdf)"
 msgstr "Formato RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:111
+#: ../plugins/save-calendar/save-calendar.c:120
 msgid "_Format:"
 msgstr "_Formato:"
 
-#: ../plugins/save-calendar/save-calendar.c:172
+#: ../plugins/save-calendar/save-calendar.c:181
 msgid "Select destination file"
 msgstr "Seleccionar o ficheiro de destino"
 
-#: ../plugins/save-calendar/save-calendar.c:325
+#: ../plugins/save-calendar/save-calendar.c:334
 msgid "Save the selected calendar to disk"
 msgstr "Gravar o calendÃ¡rio seleccionado no disco"
 
-#: ../plugins/save-calendar/save-calendar.c:356
+#: ../plugins/save-calendar/save-calendar.c:365
 msgid "Save the selected memo list to disk"
 msgstr "Gravar a lista de memos seleccionada no disco"
 
-#: ../plugins/save-calendar/save-calendar.c:387
+#: ../plugins/save-calendar/save-calendar.c:396
 msgid "Save the selected task list to disk"
 msgstr "Gravar a lista de tarefas seleccionada no disco"
 
-#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "Guides you through your initial account setup."
-msgstr "Guia-o atravÃ©s da configuraÃ§Ã£o inicial de conta."
-
-#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Setup Assistant"
-msgstr "Assistente de ConfiguraÃ§Ã£o"
-
-#: ../plugins/startup-wizard/startup-wizard.c:110
-msgid "Evolution Setup Assistant"
-msgstr "Assistente de ConfiguraÃ§Ã£o do Evolution"
-
-#: ../plugins/startup-wizard/startup-wizard.c:115
-msgid "Welcome"
-msgstr "Bem Vindo"
-
-#: ../plugins/startup-wizard/startup-wizard.c:118
-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"
-"\n"
-"Please click the \"Forward\" button to continue. "
-msgstr ""
-"Bem vindo ao Evolution. Os ecrÃ£s seguintes irÃ£o permitir que o Evolution se "
-"ligue Ã s suas contas de email e importe ficheiros de outras aplicaÃ§Ãµes. \n"
-"\n"
-"Prima o botÃ£o \"AvanÃ§ar\" para continuar. "
-
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../widgets/misc/e-import-assistant.c:385
-msgid "Please select the information that you would like to import:"
-msgstr "Seleccione a informaÃ§Ã£o que deseja importar:"
-
-#: ../plugins/startup-wizard/startup-wizard.c:168
-#: ../widgets/misc/e-import-assistant.c:542
-#, c-format
-msgid "From %s:"
-msgstr "De %s:"
-
-#: ../plugins/startup-wizard/startup-wizard.c:185
-msgid "Importing files"
-msgstr "A importar ficheiros"
-
-#: ../plugins/startup-wizard/startup-wizard.c:248
-msgid "Importing data."
-msgstr "A importar os dados."
-
-#: ../plugins/startup-wizard/startup-wizard.c:250
-msgid "Please wait"
-msgstr "Aguarde por favor"
-
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
-msgid "Sort mail message threads by subject."
-msgstr "Organizar as mensagens em Ã¡rvore por assunto."
-
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
-msgid "Subject Threading"
-msgstr "OrganizaÃ§Ã£o em Ã?rvore por Assunto"
-
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
-msgid "Thread messages by subject"
-msgstr "Organizar as mensagens em Ã¡rvore por assunto"
-
-#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:56
-msgid "F_all back to threading messages by subject"
-msgstr "Recorrer a organizar as mensagens em Ã¡r_vore por assunto"
-
 #: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
 msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
@@ -19575,15 +19324,15 @@ msgstr ""
 msgid "Drafts based template plugin"
 msgstr "Plugin de modelos baseados em rascunhos"
 
-#: ../plugins/templates/templates.c:617
+#: ../plugins/templates/templates.c:621
 msgid "No Title"
 msgstr "Sem TÃtulo"
 
-#: ../plugins/templates/templates.c:688
+#: ../plugins/templates/templates.c:715
 msgid "Save as _Template"
 msgstr "Gravar como _Modelo"
 
-#: ../plugins/templates/templates.c:690
+#: ../plugins/templates/templates.c:717
 msgid "Save as Template"
 msgstr "Gravar como Modelo"
 
@@ -19603,27 +19352,27 @@ msgstr "vCards Embutidos"
 msgid "Show vCards directly in mail messages."
 msgstr "Apresentar vCards directamente nas mensagens de correio."
 
-#: ../plugins/vcard-inline/vcard-inline.c:160
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:181
+#: ../plugins/vcard-inline/vcard-inline.c:266
 msgid "Show Full vCard"
 msgstr "Apresentar vCard Completo"
 
-#: ../plugins/vcard-inline/vcard-inline.c:163
+#: ../plugins/vcard-inline/vcard-inline.c:184
 msgid "Show Compact vCard"
 msgstr "Apresentar vCard Compacto"
 
-#: ../plugins/vcard-inline/vcard-inline.c:224
+#: ../plugins/vcard-inline/vcard-inline.c:245
 msgid "There is one other contact."
 msgstr "Existe um outro contacto."
 
-#: ../plugins/vcard-inline/vcard-inline.c:233
+#: ../plugins/vcard-inline/vcard-inline.c:254
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Existe %d outro contacto."
 msgstr[1] "Existem %d outros contactos."
 
-#: ../plugins/vcard-inline/vcard-inline.c:254
+#: ../plugins/vcard-inline/vcard-inline.c:275
 msgid "Save in Address Book"
 msgstr "Gravar no Livro de EndereÃ§os"
 
@@ -19639,11 +19388,11 @@ msgstr "Contactos WebDAV"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:248
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:271
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:274
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Evitar IfMatch (necessÃ¡rio no Apache < 2.2.8)"
 
@@ -19808,7 +19557,7 @@ msgstr "Barra lateral estÃ¡ visÃvel"
 msgid "Skip development warning dialog"
 msgstr "Saltar o diÃ¡logo de aviso de versÃ£o de desenvolvimento"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:326
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:337
 msgid "Start in offline mode"
 msgstr "Iniciar em modo desligado"
 
@@ -19966,143 +19715,46 @@ msgstr "Estilo dos botÃµes da janela"
 msgid "Window buttons are visible"
 msgstr "BotÃµes da janela sÃ£o visÃveis"
 
-#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
+#: ../shell/e-shell-content.c:528 ../shell/e-shell-content.c:529
 msgid "Searches"
 msgstr "Procuras"
 
-#: ../shell/e-shell-content.c:619
+#: ../shell/e-shell-content.c:571
 msgid "Save Search"
 msgstr "Gravar a Procura"
 
-#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
 #. Translators: The "Show:" label precedes a combo box that
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:883
+#: ../shell/e-shell-searchbar.c:932
 msgid "Sho_w:"
 msgstr "Apr_esentar:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:910
+#: ../shell/e-shell-searchbar.c:963
 msgid "Sear_ch:"
 msgstr "Proc_urar:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:970
+#: ../shell/e-shell-searchbar.c:1024
 msgid "i_n"
 msgstr "e_m"
 
-#: ../shell/e-shell-switcher.c:448
-msgid "Toolbar Style"
-msgstr "Estilo da Barra de Ferramentas"
-
-#: ../shell/e-shell-switcher.c:449
-msgid "The switcher's toolbar style"
-msgstr "O estilo da barra de ferramentas do alternador"
-
-#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:740
-msgid "Toolbar Visible"
-msgstr "Barra de Ferramentas VisÃvel"
-
-#: ../shell/e-shell-switcher.c:466
-msgid "Whether the switcher is visible"
-msgstr "Se o alternador deverÃ¡ ou nÃ£o estar visÃvel"
-
-#: ../shell/e-shell-utils.c:245
+#: ../shell/e-shell-utils.c:253
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:247
+#: ../shell/e-shell-utils.c:255
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
-#: ../shell/e-shell-utils.c:268
+#: ../shell/e-shell-utils.c:276
 msgid "All Files (*)"
 msgstr "Todos os Ficheiros (*)"
 
-#: ../shell/e-shell-view.c:675
-msgid "Switcher Action"
-msgstr "AcÃ§Ã£o de Alternar"
-
-#: ../shell/e-shell-view.c:676
-msgid "The switcher action for this shell view"
-msgstr "A acÃ§Ã£o de alternar para esta vista de consola"
-
-#: ../shell/e-shell-view.c:691
-msgid "Page Number"
-msgstr "NÃºmero da PÃ¡gina"
-
-#: ../shell/e-shell-view.c:692
-msgid "The notebook page number of the shell view"
-msgstr "O nÃºmero da pÃ¡gina do livro na vista de consola"
-
-#: ../shell/e-shell-view.c:708
-msgid "Search Rule"
-msgstr "Regra de Procura"
-
-#: ../shell/e-shell-view.c:709
-msgid "Criteria for the current search results"
-msgstr "CritÃ©rio dos resultados da procura actual"
-
-#: ../shell/e-shell-view.c:724
-msgid "The EShellBackend for this shell view"
-msgstr "O EShellBackend desta vista de consola"
-
-#: ../shell/e-shell-view.c:739
-msgid "Shell Content Widget"
-msgstr "Widget de ConteÃºdo de Consola"
-
-#: ../shell/e-shell-view.c:740
-msgid "The content widget appears in a shell window's right pane"
-msgstr "O widget de conteÃºdo surge no painel da direita da janela de consola"
-
-#: ../shell/e-shell-view.c:756
-msgid "Shell Sidebar Widget"
-msgstr "Widget Lateral da Consola"
-
-#: ../shell/e-shell-view.c:757
-msgid "The sidebar widget appears in a shell window's left pane"
-msgstr "O widget lateral surge no painel da esquerda de uma janela de consola"
-
-#: ../shell/e-shell-view.c:772
-msgid "Shell Taskbar Widget"
-msgstr "Widget de Barra de Tarefas de Consola"
-
-#: ../shell/e-shell-view.c:773
-msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr "O widget de barra de tarefas surge no fundo de uma janela de consola"
-
-#: ../shell/e-shell-view.c:788
-msgid "Shell Window"
-msgstr "Janela de Consola"
-
-#: ../shell/e-shell-view.c:789
-msgid "The window to which the shell view belongs"
-msgstr "A janela Ã  qual pertence a vista de consola"
-
-#: ../shell/e-shell-view.c:805
-msgid "The key file holding widget state data"
-msgstr "O ficheiro que armazena os dados de estado do widget"
-
-#: ../shell/e-shell-view.c:820
-msgid "The title of the shell view"
-msgstr "O tÃtulo da vista de consola"
-
-#: ../shell/e-shell-view.c:834
-msgid "Current View ID"
-msgstr "ID da Vista Actual"
-
-#: ../shell/e-shell-view.c:835
-msgid "The current GAL view ID"
-msgstr "O ID GAL da vista actual"
-
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
@@ -20114,408 +19766,303 @@ msgstr "Duarte Loreto <happyguy_pt hotmail com>"
 msgid "Evolution Website"
 msgstr "PÃ¡gina Web do Evolution"
 
-#: ../shell/e-shell-window-actions.c:1224
+#: ../shell/e-shell-window-actions.c:1236
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy nÃ£o estÃ¡ instalado."
 
-#: ../shell/e-shell-window-actions.c:1226
+#: ../shell/e-shell-window-actions.c:1238
 msgid "Bug Buddy could not be run."
 msgstr "Incapaz de executar o Bug Buddy."
 
-#: ../shell/e-shell-window-actions.c:1343
-msgid "GNOME Pilot is not installed."
-msgstr "GNOME Pilot nÃ£o estÃ¡ instalado."
-
-#: ../shell/e-shell-window-actions.c:1345
-msgid "GNOME Pilot could not be run."
-msgstr "Incapaz de executar o GNOME Pilot."
-
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1419
 msgid "Show information about Evolution"
 msgstr "Apresentar informaÃ§Ã£o sobre o Evolution"
 
-#: ../shell/e-shell-window-actions.c:1444
+#: ../shell/e-shell-window-actions.c:1424
+#: ../shell/e-shell-window-actions.c:1438
 msgid "_Close Window"
 msgstr "_Fechar a Janela"
 
-#: ../shell/e-shell-window-actions.c:1451
+#: ../shell/e-shell-window-actions.c:1445
 msgid "_Contents"
 msgstr "_ConteÃºdo"
 
-#: ../shell/e-shell-window-actions.c:1453
+#: ../shell/e-shell-window-actions.c:1447
 msgid "Open the Evolution User Guide"
 msgstr "Abrir o Guia de Utilizador do Evolution"
 
-#: ../shell/e-shell-window-actions.c:1479
+#: ../shell/e-shell-window-actions.c:1473
 msgid "Evolution _FAQ"
 msgstr "Perguntas _Frequentes do Evolution"
 
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1475
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "Abrir a pÃ¡gina web de Perguntas Frequentes"
 
-#: ../shell/e-shell-window-actions.c:1486
+#: ../shell/e-shell-window-actions.c:1480
 msgid "_Forget Passwords"
 msgstr "Es_quecer as Senhas"
 
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:1482
 msgid "Forget all remembered passwords"
 msgstr "Esquecer todas as senhas memorizadas"
 
-#: ../shell/e-shell-window-actions.c:1493
+#: ../shell/e-shell-window-actions.c:1487
 msgid "I_mport..."
 msgstr "I_mportar..."
 
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:1489
 msgid "Import data from other programs"
 msgstr "Importar dados de outras aplicaÃ§Ãµes"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1494
 msgid "New _Window"
 msgstr "Nova _Janela"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1496
 msgid "Create a new window displaying this view"
 msgstr "Criar uma nova janela que apresente esta vista"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1510
 msgid "Configure Evolution"
 msgstr "Configurar o Evolution"
 
-#: ../shell/e-shell-window-actions.c:1521
+#: ../shell/e-shell-window-actions.c:1515
 msgid "_Quick Reference"
 msgstr "_ReferÃªncia RÃ¡pida"
 
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1517
 msgid "Show Evolution's shortcut keys"
 msgstr "Apresentar as teclas de atalho do Evolution"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1524
 msgid "Exit the program"
 msgstr "Sair da aplicaÃ§Ã£o"
 
-#: ../shell/e-shell-window-actions.c:1535
+#: ../shell/e-shell-window-actions.c:1529
 msgid "_Advanced Search..."
 msgstr "Procura _AvanÃ§ada..."
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1531
 msgid "Construct a more advanced search"
 msgstr "Construir uma procura mais avanÃ§ada"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1538
 msgid "Clear the current search parameters"
 msgstr "Limpar os parÃ¢metros de procura actuais"
 
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:1543
 msgid "_Edit Saved Searches..."
 msgstr "_Editar as Procuras Gravadas..."
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1545
 msgid "Manage your saved searches"
 msgstr "Gerir as suas procuras gravadas"
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1552
 msgid "Click here to change the search type"
 msgstr "Clique aqui para alterar o tipo de procura"
 
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:1557
 msgid "_Find Now"
 msgstr "Procurar _Agora"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1559
 msgid "Execute the current search parameters"
 msgstr "Executar os parÃ¢metros de procura actuais"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1564
 msgid "_Save Search..."
 msgstr "_Gravar a Procura..."
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1566
 msgid "Save the current search parameters"
 msgstr "Gravar os parÃ¢metros de procura actuais"
 
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1578
 msgid "Send / _Receive"
 msgstr "Enviar / _Receber"
 
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1580
 msgid "Send queued items and retrieve new items"
 msgstr "Enviar itens em fila e obter novos"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1585
 msgid "Submit _Bug Report..."
 msgstr "Enviar um RelatÃ³rio de _Erro..."
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1587
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar um relatÃ³rio de erro utilizando o Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1598
-msgid "GNOME Pilot _Synchronization..."
-msgstr "_SincronizaÃ§Ã£o com o GNOME Pilot..."
-
-#: ../shell/e-shell-window-actions.c:1600
-msgid "Set up GNOME Pilot configuration"
-msgstr "Definir a configuraÃ§Ã£o do GNOME Pilot"
-
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1592
 msgid "_Work Offline"
 msgstr "Trabalhar _Desligado"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1594
 msgid "Put Evolution into offline mode"
 msgstr "Colocar o Evolution em modo desligado"
 
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1599
 msgid "_Work Online"
 msgstr "Trabalhar _Ligado"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1601
 msgid "Put Evolution into online mode"
 msgstr "Colocar o Evolution em modo ligado"
 
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1629
 msgid "Lay_out"
 msgstr "Disp_osiÃ§Ã£o"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1636
 msgid "_New"
 msgstr "_Novo"
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1643
 msgid "_Search"
 msgstr "_Procurar"
 
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1650
 msgid "_Switcher Appearance"
 msgstr "AparÃªncia do _Alternador"
 
-#: ../shell/e-shell-window-actions.c:1677
+#: ../shell/e-shell-window-actions.c:1664
 msgid "_Window"
 msgstr "_Janela"
 
-#: ../shell/e-shell-window-actions.c:1706
+#: ../shell/e-shell-window-actions.c:1693
 msgid "Show Side _Bar"
 msgstr "Apresentar a _Barra Lateral"
 
-#: ../shell/e-shell-window-actions.c:1708
+#: ../shell/e-shell-window-actions.c:1695
 msgid "Show the side bar"
 msgstr "Apresentar a barra lateral"
 
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1701
 msgid "Show _Buttons"
 msgstr "Apresentar os _BotÃµes"
 
-#: ../shell/e-shell-window-actions.c:1716
+#: ../shell/e-shell-window-actions.c:1703
 msgid "Show the switcher buttons"
 msgstr "Apresentar os botÃµes de alternar"
 
-#: ../shell/e-shell-window-actions.c:1722
+#: ../shell/e-shell-window-actions.c:1709
 msgid "Show _Status Bar"
 msgstr "Apresentar a Barra de _Estados"
 
-#: ../shell/e-shell-window-actions.c:1724
+#: ../shell/e-shell-window-actions.c:1711
 msgid "Show the status bar"
 msgstr "Apresentar a barra de estados"
 
-#: ../shell/e-shell-window-actions.c:1730
+#: ../shell/e-shell-window-actions.c:1717
 msgid "Show _Tool Bar"
 msgstr "Apresentar a Barra de Ferramen_tas"
 
-#: ../shell/e-shell-window-actions.c:1732
+#: ../shell/e-shell-window-actions.c:1719
 msgid "Show the tool bar"
 msgstr "Apresentar a barra de ferramentas"
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1741
 msgid "_Icons Only"
 msgstr "Apenas Ã?_cones"
 
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1743
 msgid "Display window buttons with icons only"
 msgstr "Apresentar os botÃµes das janelas apenas com Ãcones"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1748
 msgid "_Text Only"
 msgstr "Apenas _Texto"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1750
 msgid "Display window buttons with text only"
 msgstr "Apresentar os botÃµes das janelas apenas com texto"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1755
 msgid "Icons _and Text"
 msgstr "Ã?cones _e Texto"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1757
 msgid "Display window buttons with icons and text"
 msgstr "Apresentar os botÃµes das janelas com Ãcones e texto"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1762
 msgid "Tool_bar Style"
 msgstr "Estilo da _Barra de Ferramentas"
 
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1764
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 "Apresentar os botÃµes das janelas utilizando as definiÃ§Ãµes da barra de "
 "ferramentas do ambiente de trabalho"
 
-#: ../shell/e-shell-window-actions.c:1785
+#: ../shell/e-shell-window-actions.c:1772
 msgid "Define Views..."
 msgstr "Definir as Vistas..."
 
-#: ../shell/e-shell-window-actions.c:1787
+#: ../shell/e-shell-window-actions.c:1774
 msgid "Create or edit views"
 msgstr "Criar ou editar vistas"
 
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1779
 msgid "Save Custom View..."
 msgstr "Gravar a Vista Personalizada..."
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1781
 msgid "Save current custom view"
 msgstr "Gravar a vista personalizada actual"
 
-#: ../shell/e-shell-window-actions.c:1801
+#: ../shell/e-shell-window-actions.c:1788
 msgid "C_urrent View"
 msgstr "Vista Act_ual"
 
-#: ../shell/e-shell-window-actions.c:1811
+#: ../shell/e-shell-window-actions.c:1798
 msgid "Custom View"
 msgstr "Vista Personalizada"
 
-#: ../shell/e-shell-window-actions.c:1813
+#: ../shell/e-shell-window-actions.c:1800
 msgid "Current view is a customized view"
 msgstr "A vista actual Ã© uma vista personalizada"
 
-#: ../shell/e-shell-window-actions.c:1823
+#: ../shell/e-shell-window-actions.c:1810
 msgid "Change the page settings for your current printer"
 msgstr "Alterar as configuraÃ§Ãµes de pÃ¡gina para a sua impressora actual"
 
-#: ../shell/e-shell-window-actions.c:2200
+#: ../shell/e-shell-window-actions.c:2183
 #, c-format
 msgid "Switch to %s"
 msgstr "Alternar para %s"
 
-#: ../shell/e-shell-window-actions.c:2413
+#: ../shell/e-shell-window-actions.c:2396
 msgid "Execute these search parameters"
 msgstr "Executar estes parÃ¢metros de procura"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:567
+#: ../shell/e-shell-window-private.c:576
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:366
+#: ../shell/e-shell-window.c:419
 msgid "New"
 msgstr "Novo"
 
-#: ../shell/e-shell-window.c:616
-msgid "Active Shell View"
-msgstr "Vista de Consola Activa"
-
-#: ../shell/e-shell-window.c:617
-msgid "Name of the active shell view"
-msgstr "Nome da vista de consola activa"
-
-#: ../shell/e-shell-window.c:632
-msgid "The shell window's EFocusTracker"
-msgstr "O EFocusTracker da janela de consola"
-
-#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:803
-msgid "Geometry"
-msgstr "Geometria"
-
-#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:804
-msgid "Initial window geometry string"
-msgstr "A expressÃ£o de geometria inicial da janela"
-
-#: ../shell/e-shell-window.c:662
-msgid "Safe Mode"
-msgstr "Modo de SeguranÃ§a"
-
-#: ../shell/e-shell-window.c:663
-msgid "Whether the shell window is in safe mode"
-msgstr "Se a janela de consola estÃ¡ ou nÃ£o em modo de seguranÃ§a"
-
-#: ../shell/e-shell-window.c:694
-msgid "Sidebar Visible"
-msgstr "Barra Lateral VisÃvel"
-
-#: ../shell/e-shell-window.c:695
-msgid "Whether the shell window's side bar is visible"
-msgstr "Se a barra lateral da janela de consola deverÃ¡ ou nÃ£o estar visÃvel"
-
-#: ../shell/e-shell-window.c:709
-msgid "Switcher Visible"
-msgstr "Alternador VisÃvel"
-
-#: ../shell/e-shell-window.c:710
-msgid "Whether the shell window's switcher buttons are visible"
-msgstr ""
-"Se os botÃµes de alternar da janela de consola deverÃ£o ser ou nÃ£o visÃveis"
-
-#: ../shell/e-shell-window.c:725
-msgid "Taskbar Visible"
-msgstr "Barra de Tarefas VisÃvel"
-
-#: ../shell/e-shell-window.c:726
-msgid "Whether the shell window's task bar is visible"
-msgstr "Se a barra de tarefas da janela de consola deverÃ¡ ou nÃ£o estar visÃvel"
-
-#: ../shell/e-shell-window.c:741
-msgid "Whether the shell window's tool bar is visible"
-msgstr ""
-"Se a barra de ferramentas da janela de consola deverÃ¡ ou nÃ£o estar visÃvel"
-
-#: ../shell/e-shell-window.c:755
-msgid "UI Manager"
-msgstr "Gestor do Interface GrÃ¡fico"
-
-#: ../shell/e-shell-window.c:756
-msgid "The shell window's GtkUIManager"
-msgstr "O GtkUIManager da janela de consola"
-
-#: ../shell/e-shell.c:212
+#: ../shell/e-shell.c:247
 msgid "Preparing to go offline..."
 msgstr "A preparar-se para ficar em modo desligado..."
 
-#: ../shell/e-shell.c:262
+#: ../shell/e-shell.c:300
 msgid "Preparing to go online..."
 msgstr "A preparar-se para ficar em modo ligado..."
 
-#: ../shell/e-shell.c:330
+#: ../shell/e-shell.c:362
 msgid "Preparing to quit..."
 msgstr "A preparar-se para terminar..."
 
-#: ../shell/e-shell.c:819
-msgid "Module Directory"
-msgstr "DirectÃ³rio de MÃ³dulos"
-
-#: ../shell/e-shell.c:820
-msgid "The directory from which to load EModules"
-msgstr "O directÃ³rio de ondeler os EModules"
-
-#: ../shell/e-shell.c:835
-msgid "Network Available"
-msgstr "Rede DisponÃvel"
-
-#: ../shell/e-shell.c:836
-msgid "Whether the network is available"
-msgstr "Se a rede estÃ¡ ou nÃ£o disponÃvel"
-
-#: ../shell/e-shell.c:851 ../widgets/misc/e-online-button.c:134
-msgid "Online"
-msgstr "Ligado"
-
-#: ../shell/e-shell.c:852
-msgid "Whether the shell is online"
-msgstr "Se a consola estÃ¡ ou nÃ£o ligada"
-
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:168
+#: ../shell/main.c:186
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20551,7 +20098,7 @@ msgstr ""
 "Esperamos que lhe agrade o resultado do nosso trabalho e aguardamos\n"
 "as suas contribuiÃ§Ãµes!\n"
 
-#: ../shell/main.c:192
+#: ../shell/main.c:210
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20559,62 +20106,57 @@ msgstr ""
 "Obrigado\n"
 "A Equipa do Evolution\n"
 
-#: ../shell/main.c:199
+#: ../shell/main.c:217
 msgid "Do not tell me again"
 msgstr "NÃ£o apresentar esta mensagem novamente"
 
-#: ../shell/main.c:322
+#: ../shell/main.c:333
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar o Evolution activando o componente especificado"
 
-#: ../shell/main.c:324
+#: ../shell/main.c:335
 msgid "Apply the given geometry to the main window"
 msgstr "Aplicar a geometria especificada Ã  janela principal"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:339
 msgid "Start in online mode"
 msgstr "Iniciar em modo ligado"
 
-#: ../shell/main.c:330
+#: ../shell/main.c:341
 msgid "Start in \"express\" mode"
 msgstr "Iniciar em modo \"expresso\""
 
-#: ../shell/main.c:333
+#: ../shell/main.c:344
 msgid "Forcibly shut down Evolution"
 msgstr "ForÃ§ar o Evolution a terminar"
 
-#: ../shell/main.c:337
-msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr ""
-"ForÃ§ar uma nova actualizaÃ§Ã£o de ficheiros de configuraÃ§Ã£o do Evolution 1.4"
-
-#: ../shell/main.c:340
+#: ../shell/main.c:347
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 "Enviar o resultado de depuraÃ§Ã£o de todos os componentes para um ficheiro."
 
-#: ../shell/main.c:342
+#: ../shell/main.c:349
 msgid "Disable loading of any plugins."
 msgstr "Desactivar o carregamento de quaisquer plugins."
 
-#: ../shell/main.c:344
+#: ../shell/main.c:351
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desactivar o painel de antevisÃ£o de Correio, Contactos e Tarefas."
 
-#: ../shell/main.c:348
+#: ../shell/main.c:355
 msgid "Import URIs or file names given as rest of arguments."
 msgstr ""
 "Importar URIs ou nomes de ficheiros indicados como o resto de argumentos."
 
-#: ../shell/main.c:350
+#: ../shell/main.c:357
 msgid "Request a running Evolution process to quit"
 msgstr "Pedir um processo Evolution em execuÃ§Ã£o para terminar"
 
-#: ../shell/main.c:465
+#: ../shell/main.c:501 ../shell/main.c:509
 msgid "- The Evolution PIM and Email Client"
 msgstr "- O Cliente de Email e Gestor Pessoal Evolution"
 
-#: ../shell/main.c:491
+#: ../shell/main.c:571
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20629,99 +20171,44 @@ msgstr ""
 "Tem a certeza de que deseja que sejam esquecidas todas as senhas memorizadas?"
 
 #: ../shell/shell.error.xml.h:2
-msgid "Continue"
-msgstr "Prosseguir"
+msgid "Cannot upgrade directly from version {0}"
+msgstr "Incapaz de actualizar a versÃ£o directamente a partir da versÃ£o {0}"
 
 #: ../shell/shell.error.xml.h:3
-msgid "Delete old data from version {0}?"
-msgstr "Apagar dados antigos da versÃ£o {0}?"
+msgid "Continue Anyway"
+msgstr "Ainda Assim Prosseguir"
 
 #: ../shell/shell.error.xml.h:4
 msgid ""
+"Evolution no longer supports upgrading directly from version {0}. However as "
+"a workaround you might try first upgrading to Evolution 2, and then "
+"upgrading to Evolution 3."
+msgstr ""
+"O Evolution jÃ¡ nÃ£o suporta actualizar directamente a partir da versÃ£o {0}. "
+"Como alternativa poderÃ¡ primeiro tentar actualizar para o Evolution 2 e "
+"depois actualizar para o Evolution 3."
+
+#: ../shell/shell.error.xml.h:5
+msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
 msgstr ""
 "Esquecer as senhas recordadas irÃ¡ limpar todas as senhas memorizadas. Estas "
 "ser-lhe-Ã£o pedidas novamente da prÃ³xima vez que forem necessÃ¡rias."
 
-#: ../shell/shell.error.xml.h:6
-msgid "Insufficient disk space for upgrade."
-msgstr "EspaÃ§o em disco insuficiente para a actualizaÃ§Ã£o."
-
 #: ../shell/shell.error.xml.h:7
-msgid "Really delete old data?"
-msgstr "Apagar mesmo os dados antigos?"
+msgid "Quit Now"
+msgstr "Sair Agora"
 
 #: ../shell/shell.error.xml.h:8
-msgid ""
-"The entire contents of the &quot;evolution&quot; directory are about to be "
-"permanently removed.\n"
-"\n"
-"It is suggested you manually verify that all of your mail, contact, and "
-"calendar data is present, and that this version of Evolution operates "
-"correctly before deleting this old data.\n"
-"\n"
-"Once deleted, you cannot downgrade to the previous version of Evolution "
-"without manual intervention.\n"
-msgstr ""
-"Todo o conteÃºdo do directÃ³rio &quot;evolution&quot; estÃ¡ prestes a ser "
-"definitivamente removido.\n"
-"\n"
-"Sugere-se que verifique manualmente que todas as suas mensagens, contactos e "
-"dados de calendÃ¡rio estÃ£o migrados e que esta versÃ£o do Evolution funciona "
-"correctamente antes de apagar os dados antigos.\n"
-"\n"
-"Uma vez apagados, nÃ£o poderÃ¡ retroceder para uma versÃ£o anterior do "
-"Evolution sem recorrer a intervenÃ§Ã£o manual.\n"
-
-#: ../shell/shell.error.xml.h:14
-msgid ""
-"The previous version of Evolution stored its data in a different location.\n"
-"\n"
-"If you choose to remove this data, the entire contents of the &quot;"
-"evolution&quot; directory will be removed permanently. If you choose to keep "
-"this data, then you may manually remove the contents of &quot;"
-"evolution&quot; at your convenience.\n"
-msgstr ""
-"A versÃ£o anterior do Evolution armazenava os seus dados numa localizaÃ§Ã£o "
-"diferente.\n"
-"\n"
-"Se seleccionar remover estes dados, todo o conteÃºdo do directÃ³rio &quot;"
-"evolution&quot; serÃ¡ removido definitivamente. Se decidir manter estes "
-"dados, poderÃ¡ remover manualmente o conteÃºdo de &quot;evolution&quot; quando "
-"o desejar.\n"
-
-#: ../shell/shell.error.xml.h:18
 msgid "Upgrade from previous version failed:"
 msgstr "Falha ao actualizar de uma versÃ£o anterior:"
 
-#: ../shell/shell.error.xml.h:19
-msgid ""
-"Upgrading your data and settings will require up to {0} of disk space, but "
-"you only have {1} available.\n"
-"\n"
-"You will need to make more space available in your home directory before you "
-"can continue."
-msgstr ""
-"Actualizar os seus dados e definiÃ§Ãµes irÃ¡ requerer atÃ© {0} de espaÃ§o em "
-"disco, mas apenas possui disponÃveis {1}.\n"
-"\n"
-"TerÃ¡ de disponibilizar mais espaÃ§o livre em disco na sua pasta pessoal antes "
-"de poder prosseguir."
-
-#: ../shell/shell.error.xml.h:22
+#: ../shell/shell.error.xml.h:9
 msgid "_Forget"
 msgstr "_Esquecer"
 
-#: ../shell/shell.error.xml.h:23
-msgid "_Keep Data"
-msgstr "_Manter os Dados"
-
-#: ../shell/shell.error.xml.h:24
-msgid "_Remind Me Later"
-msgstr "_Lembrar-me Mais Tarde"
-
-#: ../shell/shell.error.xml.h:25
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "{0}\n"
 "\n"
@@ -20815,7 +20302,7 @@ msgstr "OpÃ§Ãµes de gestÃ£o de sessÃ£o:"
 msgid "Show session management options"
 msgstr "Apresentar as opÃ§Ãµes de gestÃ£o de sessÃ£o"
 
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20846,67 +20333,75 @@ msgstr ""
 "como sendo credÃvel, entÃ£o nÃ£o considera credÃvel a autenticidade deste "
 "certificado excepto se aqui especificado"
 
-#: ../smime/gui/certificate-manager.c:135
-#: ../smime/gui/certificate-manager.c:382
-#: ../smime/gui/certificate-manager.c:610
+#: ../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 "Seleccionar um certificado a importar..."
 
-#: ../smime/gui/certificate-manager.c:144
+#: ../smime/gui/certificate-manager.c:157
 msgid "All PKCS12 files"
 msgstr "Todos os ficheiro PKCS12"
 
-#: ../smime/gui/certificate-manager.c:150
-#: ../smime/gui/certificate-manager.c:397
-#: ../smime/gui/certificate-manager.c:624
+#: ../smime/gui/certificate-manager.c:163
+#: ../smime/gui/certificate-manager.c:475
+#: ../smime/gui/certificate-manager.c:711
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:487
-#: ../smime/gui/certificate-manager.c:712
+#: ../smime/gui/certificate-manager.c:182
+msgid "Failed to import user's certificate"
+msgstr "Falha ao importar o certificado do utilizador"
+
+#: ../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:283
-#: ../smime/gui/certificate-manager.c:505
+#: ../smime/gui/certificate-manager.c:361
+#: ../smime/gui/certificate-manager.c:592
 msgid "Purposes"
 msgstr "PropÃ³sitos"
 
-#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:34
+#: ../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:300
+#: ../smime/gui/certificate-manager.c:378
 msgid "Expires"
 msgstr "Expira"
 
-#: ../smime/gui/certificate-manager.c:391
+#: ../smime/gui/certificate-manager.c:469
 msgid "All email certificate files"
 msgstr "Todos os ficheiros de certificaÃ§Ã£o de correio"
 
-#: ../smime/gui/certificate-manager.c:496
+#: ../smime/gui/certificate-manager.c:502
+msgid "Failed to import contact's certificate"
+msgstr "Falha ao importar o certificado do contacto"
+
+#: ../smime/gui/certificate-manager.c:583
 msgid "E-Mail Address"
 msgstr "EndereÃ§o de Email"
 
-#: ../smime/gui/certificate-manager.c:619
+#: ../smime/gui/certificate-manager.c:706
 msgid "All CA certificate files"
 msgstr "Todos os ficheiros de certificado de AC"
 
-#: ../smime/gui/certificate-manager.c:1050
-msgid "Certificates"
-msgstr "Certificados"
+#: ../smime/gui/certificate-manager.c:737
+msgid "Failed to import certificate authority's certificate"
+msgstr "Falha ao importar o certificado da autoridade de certificaÃ§Ã£o"
 
-#: ../smime/gui/certificate-viewer.c:332
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Visualizador de Certificado: %s"
 
 #: ../smime/gui/component.c:46
 #, c-format
-msgid "Enter the password for `%s'"
-msgstr "Introduza a senha para `%s'"
+msgid "Enter the password for '%s'"
+msgstr "Introduza a senha para '%s'"
 
 #. we're setting the password initially
 #: ../smime/gui/component.c:69
@@ -20936,7 +20431,7 @@ msgstr ""
 "Emitido por:\n"
 "  Assunto: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:165
+#: ../smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "Seleccionar certificado"
 
@@ -20949,14 +20444,10 @@ msgid "Authorities"
 msgstr "Autoridades"
 
 #: ../smime/gui/smime-ui.ui.h:3
-msgid "Backup"
-msgstr "CÃ³pia de SeguranÃ§a"
+msgid "Backup _All"
+msgstr "Efectuar CÃ³pia de SeguranÃ§a de _Tudo"
 
 #: ../smime/gui/smime-ui.ui.h:4
-msgid "Backup All"
-msgstr "Efectuar CÃ³pia de SeguranÃ§a de Tudo"
-
-#: ../smime/gui/smime-ui.ui.h:5
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -20964,163 +20455,155 @@ msgstr ""
 "Antes de confiar nesta AC para qualquer propÃ³sito, deverÃ¡ examinar o seu "
 "certificado, regras e procedimentos (se disponÃveis)."
 
-#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1071
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1086
 msgid "Certificate"
 msgstr "Certificado"
 
-#: ../smime/gui/smime-ui.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:6
 msgid "Certificate Authority Trust"
 msgstr "Confiar na Autoridade de CertificaÃ§Ã£o"
 
-#: ../smime/gui/smime-ui.ui.h:8
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "Certificate Fields"
 msgstr "Campos do Certificado"
 
-#: ../smime/gui/smime-ui.ui.h:9
+#: ../smime/gui/smime-ui.ui.h:8
 msgid "Certificate Hierarchy"
 msgstr "Hierarquia do Certificado"
 
-#: ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/smime-ui.ui.h:9
 msgid "Certificate details"
 msgstr "Detalhes do certificado"
 
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificates Table"
 msgstr "Tabela de Certificados"
 
-#: ../smime/gui/smime-ui.ui.h:12
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Common Name (CN)"
 msgstr "Nome Comum (NC)"
 
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Contact Certificates"
 msgstr "Contactos Certificados"
 
-#: ../smime/gui/smime-ui.ui.h:15
+#: ../smime/gui/smime-ui.ui.h:14
 msgid "Do not trust the authenticity of this certificate"
 msgstr "NÃ£o considerar a autenticidade deste certificado credÃvel"
 
-#: ../smime/gui/smime-ui.ui.h:16
-msgid "Edit"
-msgstr "Editar"
-
-#: ../smime/gui/smime-ui.ui.h:17
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Email Certificate Trust Settings"
 msgstr "DefiniÃ§Ãµes de Credibilidade de Certificados de Email"
 
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Email Recipient Certificate"
 msgstr "Certificado de DestinatÃ¡rio da Mensagem"
 
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Email Signer Certificate"
 msgstr "Certificado do Assinante da Mensagem"
 
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Expires On"
 msgstr "Expira A"
 
-#: ../smime/gui/smime-ui.ui.h:21
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Field Value"
 msgstr "Valor do Campo"
 
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Fingerprints"
 msgstr "ImpressÃµes Digitais"
 
-#: ../smime/gui/smime-ui.ui.h:24
-msgid "Import"
-msgstr "Importar"
-
-#: ../smime/gui/smime-ui.ui.h:25
+#: ../smime/gui/smime-ui.ui.h:23
 msgid "Issued By"
 msgstr "Emitido Por"
 
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Issued On"
 msgstr "Emitido Em"
 
-#: ../smime/gui/smime-ui.ui.h:27
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Issued To"
 msgstr "Emitido A"
 
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "MD5 Fingerprint"
 msgstr "ImpressÃ£o Digital MD5"
 
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Organization (O)"
 msgstr "OrganizaÃ§Ã£o (O)"
 
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "Organizational Unit (OU)"
 msgstr "Unidade Organizacional (UO)"
 
-#: ../smime/gui/smime-ui.ui.h:31
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "SHA1 Fingerprint"
 msgstr "ImpressÃ£o Digital SHA1"
 
-#: ../smime/gui/smime-ui.ui.h:32 ../smime/lib/e-cert.c:815
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:824
 msgid "SSL Client Certificate"
 msgstr "Certificado de Cliente SSL"
 
-#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:828
 msgid "SSL Server Certificate"
 msgstr "Certificado de Servidor SSL"
 
-#: ../smime/gui/smime-ui.ui.h:35
+#: ../smime/gui/smime-ui.ui.h:33
 msgid "This certificate has been verified for the following uses:"
 msgstr "Este certificado foi validado para as seguintes utilizaÃ§Ãµes:"
 
-#: ../smime/gui/smime-ui.ui.h:36
+#: ../smime/gui/smime-ui.ui.h:34
 msgid "Trust the authenticity of this certificate"
 msgstr "Considerar credÃvel a autenticidade deste certificado"
 
-#: ../smime/gui/smime-ui.ui.h:37
+#: ../smime/gui/smime-ui.ui.h:35
 msgid "Trust this CA to identify email users."
 msgstr "Confiar nesta AC para identificar utilizadores de email."
 
-#: ../smime/gui/smime-ui.ui.h:38
+#: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust this CA to identify software developers."
 msgstr "Confiar nesta AC para identificar programadores de aplicaÃ§Ãµes."
 
-#: ../smime/gui/smime-ui.ui.h:39
-msgid "Trust this CA to identify web sites."
+#: ../smime/gui/smime-ui.ui.h:37
+msgid "Trust this CA to identify websites."
 msgstr "Confiar nesta AC para identificar pÃ¡ginas web."
 
-#: ../smime/gui/smime-ui.ui.h:40
+#: ../smime/gui/smime-ui.ui.h:38
 msgid "Validity"
 msgstr "Validade"
 
-#: ../smime/gui/smime-ui.ui.h:41
-msgid "View"
-msgstr "Ver"
-
-#: ../smime/gui/smime-ui.ui.h:42
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Possui certificados destas organizaÃ§Ãµes, que o identificam:"
 
-#: ../smime/gui/smime-ui.ui.h:43
+#: ../smime/gui/smime-ui.ui.h:40
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Possui certificados em ficheiro que identificam estas autoridades de "
 "certificaÃ§Ã£o:"
 
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../smime/gui/smime-ui.ui.h:41
 msgid "You have certificates on file that identify these people:"
 msgstr "Possui certificados em ficheiro que identificam estas pessoas:"
 
-#: ../smime/gui/smime-ui.ui.h:45
+#: ../smime/gui/smime-ui.ui.h:42
 msgid "Your Certificates"
 msgstr "Os Seus Certificados"
 
-#: ../smime/gui/smime-ui.ui.h:46
+#. This is a verb, as in "make a backup".
+#: ../smime/gui/smime-ui.ui.h:44
+msgid "_Backup"
+msgstr "_CÃ³pia de SeguranÃ§a"
+
+#: ../smime/gui/smime-ui.ui.h:45
 msgid "_Edit CA Trust"
 msgstr "_Editar Credibilidade da AC"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:711
+#: ../smime/lib/e-cert-db.c:906
 msgid "Certificate already exists"
 msgstr "Certificado jÃ¡ existe"
 
@@ -21165,125 +20648,143 @@ msgstr "MD5 PKCS nÂº1 Com EncriptaÃ§Ã£o RSA"
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "SHA-1 PKCS nÂº1 Com EncriptaÃ§Ã£o RSA"
 
-#: ../smime/lib/e-cert.c:663
+#: ../smime/lib/e-cert.c:639
+msgid "PKCS #1 SHA-256 With RSA Encryption"
+msgstr "PKCS nÂº1 SHA-256 Com EncriptaÃ§Ã£o RSA"
+
+#: ../smime/lib/e-cert.c:642
+msgid "PKCS #1 SHA-384 With RSA Encryption"
+msgstr "PKCS nÂº1 SHA-384 Com EncriptaÃ§Ã£o RSA"
+
+#: ../smime/lib/e-cert.c:645
+msgid "PKCS #1 SHA-512 With RSA Encryption"
+msgstr "PKCS nÂº1 SHA-512 Com EncriptaÃ§Ã£o RSA"
+
+#: ../smime/lib/e-cert.c:672
 msgid "PKCS #1 RSA Encryption"
 msgstr "EncriptaÃ§Ã£o RSA PKCS nÂº1"
 
-#: ../smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:675
 msgid "Certificate Key Usage"
 msgstr "UtilizaÃ§Ã£o de Chave de Certificado"
 
-#: ../smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:678
 msgid "Netscape Certificate Type"
 msgstr "Tipo de Certificado Netscape"
 
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:681
 msgid "Certificate Authority Key Identifier"
 msgstr "Identificador de Chave de Autoridade de CertificaÃ§Ã£o"
 
-#: ../smime/lib/e-cert.c:684
+#: ../smime/lib/e-cert.c:693
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identificador de Objecto (%s)"
 
-#: ../smime/lib/e-cert.c:735
+#: ../smime/lib/e-cert.c:744
 msgid "Algorithm Identifier"
 msgstr "Identificador de AlgorÃtmo"
 
-#: ../smime/lib/e-cert.c:743
+#: ../smime/lib/e-cert.c:752
 msgid "Algorithm Parameters"
 msgstr "ParÃ¢metros do AlgorÃtmo"
 
-#: ../smime/lib/e-cert.c:765
+#: ../smime/lib/e-cert.c:774
 msgid "Subject Public Key Info"
 msgstr "InformaÃ§Ã£o da Chave PÃºblica do Sujeito"
 
-#: ../smime/lib/e-cert.c:770
+#: ../smime/lib/e-cert.c:779
 msgid "Subject Public Key Algorithm"
 msgstr "AlgorÃtmo da Chave PÃºblica do Sujeito"
 
-#: ../smime/lib/e-cert.c:785
+#: ../smime/lib/e-cert.c:794
 msgid "Subject's Public Key"
 msgstr "Chave PÃºblica do Sujeito"
 
-#: ../smime/lib/e-cert.c:806 ../smime/lib/e-cert.c:855
+#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:864
 msgid "Error: Unable to process extension"
 msgstr "Erro: Incapaz de processar a extensÃ£o"
 
-#: ../smime/lib/e-cert.c:827 ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:836 ../smime/lib/e-cert.c:848
 msgid "Object Signer"
 msgstr "Assinante do Objecto"
 
-#: ../smime/lib/e-cert.c:831
+#: ../smime/lib/e-cert.c:840
 msgid "SSL Certificate Authority"
 msgstr "Autoridade de CertificaÃ§Ã£o SSL"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:844
 msgid "Email Certificate Authority"
 msgstr "Autoridade de CertificaÃ§Ã£o de Email"
 
-#: ../smime/lib/e-cert.c:863
+#: ../smime/lib/e-cert.c:872
 msgid "Signing"
 msgstr "Assinar"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:876
 msgid "Non-repudiation"
 msgstr "NÃ£o repudiar"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:880
 msgid "Key Encipherment"
 msgstr "Cifra de Chave"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:884
 msgid "Data Encipherment"
 msgstr "Cifra de Dados"
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:888
 msgid "Key Agreement"
 msgstr "Acordo de Chave"
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:892
 msgid "Certificate Signer"
 msgstr "Assinante do Certificado"
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:896
 msgid "CRL Signer"
 msgstr "Assinante CRL"
 
-#: ../smime/lib/e-cert.c:935
+#: ../smime/lib/e-cert.c:944
 msgid "Critical"
 msgstr "CrÃtico"
 
-#: ../smime/lib/e-cert.c:937 ../smime/lib/e-cert.c:940
+#: ../smime/lib/e-cert.c:946 ../smime/lib/e-cert.c:949
 msgid "Not Critical"
 msgstr "NÃ£o CrÃtico"
 
-#: ../smime/lib/e-cert.c:961
+#: ../smime/lib/e-cert.c:970
 msgid "Extensions"
 msgstr "ExtensÃµes"
 
-#: ../smime/lib/e-cert.c:1030
+#. 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
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
+#: ../smime/lib/e-cert.c:1100 ../smime/lib/e-cert.c:1223
 msgid "Certificate Signature Algorithm"
 msgstr "AlgorÃtmo de Assinatura do Certificado"
 
-#: ../smime/lib/e-cert.c:1094
+#: ../smime/lib/e-cert.c:1109
 msgid "Issuer"
 msgstr "Emissor"
 
-#: ../smime/lib/e-cert.c:1149
+#: ../smime/lib/e-cert.c:1164
 msgid "Issuer Unique ID"
 msgstr "ID Ã?nico de Emissor"
 
-#: ../smime/lib/e-cert.c:1168
+#: ../smime/lib/e-cert.c:1183
 msgid "Subject Unique ID"
 msgstr "ID Ã?nico de Sujeito"
 
-#: ../smime/lib/e-cert.c:1214
+#: ../smime/lib/e-cert.c:1229
 msgid "Certificate Signature Value"
 msgstr "Valor da Assinatura do Certificado"
 
@@ -21372,11 +20873,11 @@ msgid "With _Status"
 msgstr "Com _Estado"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:226
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:436
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:776
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../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
 msgid "UTC"
 msgstr "UTC"
 
@@ -21406,19 +20907,14 @@ msgstr ""
 msgid "_Selection"
 msgstr "_SelecÃ§Ã£o"
 
-#: ../widgets/menus/gal-define-views-dialog.c:74
-#: ../widgets/menus/gal-define-views-model.c:185
-msgid "Collection"
-msgstr "ColecÃ§Ã£o"
-
-#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../widgets/menus/gal-define-views-dialog.c:346
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Definir Vistas para %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:335
-#: ../widgets/menus/gal-define-views-dialog.c:337
+#: ../widgets/menus/gal-define-views-dialog.c:354
+#: ../widgets/menus/gal-define-views-dialog.c:356
 msgid "Define Views"
 msgstr "Definir Vistas"
 
@@ -21431,10 +20927,6 @@ msgstr "Definir Vistas para \"%s\""
 msgid "Table"
 msgstr "Tabela"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
-msgid "Instance"
-msgstr "InstÃ¢ncia"
-
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
 msgid "Save Current View"
 msgstr "Gravar a Vista Actual"
@@ -21447,11 +20939,7 @@ msgstr "_Criar uma nova vista"
 msgid "_Replace existing view"
 msgstr "_Substituir a vista existente"
 
-#: ../widgets/menus/gal-view-new-dialog.c:67
-msgid "Factory"
-msgstr "FÃ¡brica"
-
-#: ../widgets/menus/gal-view-new-dialog.c:98
+#: ../widgets/menus/gal-view-new-dialog.c:106
 msgid "Define New View"
 msgstr "Definir uma Nova Vista"
 
@@ -21467,129 +20955,122 @@ msgstr "Tipo de Vista"
 msgid "Type of view:"
 msgstr "Tipo de vista:"
 
-#: ../widgets/misc/e-account-manager.c:348
+#: ../widgets/misc/e-account-manager.c:354
 msgid "De_fault"
 msgstr "_OmissÃ£o"
 
-#: ../widgets/misc/e-account-tree-view.c:224
-msgid "Account Name"
-msgstr "Nome de Conta"
-
-#: ../widgets/misc/e-account-tree-view.c:255
+#: ../widgets/misc/e-account-tree-view.c:261
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../widgets/misc/e-action-combo-box.c:388
-msgid "Action"
-msgstr "AcÃ§Ã£o"
-
-#: ../widgets/misc/e-action-combo-box.c:389
-msgid "A GtkRadioAction"
-msgstr "Um GtkRadioAction"
-
-#: ../widgets/misc/e-attachment-dialog.c:305
+#: ../widgets/misc/e-attachment-dialog.c:307
 msgid "Attachment Properties"
 msgstr "Propriedades do Anexo"
 
-#: ../widgets/misc/e-attachment-dialog.c:328
+#: ../widgets/misc/e-attachment-dialog.c:332
 msgid "_Filename:"
 msgstr "_Ficheiro:"
 
-#: ../widgets/misc/e-attachment-dialog.c:363
+#: ../widgets/misc/e-attachment-dialog.c:367
 msgid "MIME Type:"
 msgstr "Tipo MIME:"
 
-#: ../widgets/misc/e-attachment-dialog.c:371
-#: ../widgets/misc/e-attachment-store.c:550
+#: ../widgets/misc/e-attachment-dialog.c:375
+#: ../widgets/misc/e-attachment-store.c:525
 msgid "_Suggest automatic display of attachment"
 msgstr "_Sugerir a apresentaÃ§Ã£o automÃ¡tica do anexo"
 
-#: ../widgets/misc/e-attachment-handler-image.c:95
+#: ../widgets/misc/e-attachment-handler-image.c:100
 msgid "Could not set as background"
 msgstr "Incapaz de definir como fundo"
 
-#: ../widgets/misc/e-attachment-handler-image.c:147
+#: ../widgets/misc/e-attachment-handler-image.c:152
 msgid "Set as _Background"
 msgstr "Definir como _Fundo"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:87
+#: ../widgets/misc/e-attachment-handler-sendto.c:90
 msgid "Could not send attachment"
 msgid_plural "Could not send attachments"
 msgstr[0] "Incapaz de enviar o anexo"
 msgstr[1] "Incapaz de enviar os anexos"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:129
+#: ../widgets/misc/e-attachment-handler-sendto.c:132
 msgid "_Send To..."
 msgstr "_Enviar Para..."
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:131
+#: ../widgets/misc/e-attachment-handler-sendto.c:134
 msgid "Send the selected attachments somewhere"
 msgstr "Enviar os anexos seleccionados para alguÃ©m"
 
-#: ../widgets/misc/e-attachment-icon-view.c:480
-#: ../widgets/misc/e-attachment-tree-view.c:517
+#: ../widgets/misc/e-attachment-icon-view.c:506
+#: ../widgets/misc/e-attachment-tree-view.c:545
 msgid "Loading"
 msgstr "A Ler"
 
-#: ../widgets/misc/e-attachment-icon-view.c:492
-#: ../widgets/misc/e-attachment-tree-view.c:529
+#: ../widgets/misc/e-attachment-icon-view.c:518
+#: ../widgets/misc/e-attachment-tree-view.c:557
 msgid "Saving"
 msgstr "A Gravar"
 
-#: ../widgets/misc/e-attachment-paned.c:87
+#: ../widgets/misc/e-attachment-paned.c:98
 msgid "Hide Attachment _Bar"
 msgstr "Esconder a _Barra de Anexos"
 
-#: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:100
+#: ../widgets/misc/e-attachment-paned.c:631
 msgid "Show Attachment _Bar"
 msgstr "Apresentar a _Barra de Anexos"
 
-#: ../widgets/misc/e-attachment-paned.c:631
-msgid "Show _Attachment Bar"
-msgstr "Apresentar a Barra de _Anexos"
-
-#: ../widgets/misc/e-attachment-store.c:538
+#: ../widgets/misc/e-attachment-store.c:513
 msgid "Add Attachment"
 msgstr "Adicionar Anexo"
 
-#: ../widgets/misc/e-attachment-store.c:541
+#: ../widgets/misc/e-attachment-store.c:516
 msgid "A_ttach"
 msgstr "Ane_xar"
 
-#: ../widgets/misc/e-attachment-store.c:604
+#: ../widgets/misc/e-attachment-store.c:579
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Gravar Anexo"
 msgstr[1] "Gravar Anexos"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2319
+#: ../widgets/misc/e-attachment-store.c:608
+#: ../widgets/misc/e-attachment.c:1785 ../widgets/misc/e-attachment.c:2327
 msgid "attachment.dat"
 msgstr "anexo.dat"
 
-#: ../widgets/misc/e-attachment-view.c:300
+#: ../widgets/misc/e-attachment-view.c:353
 msgid "S_ave All"
 msgstr "Gr_avar Todos"
 
-#: ../widgets/misc/e-attachment-view.c:326
+#: ../widgets/misc/e-attachment-view.c:379
 msgid "A_dd Attachment..."
 msgstr "A_dicionar anexo..."
 
-#: ../widgets/misc/e-attachment-view.c:350
+#: ../widgets/misc/e-attachment-view.c:403
 msgid "_Hide"
 msgstr "_Esconder"
 
-#: ../widgets/misc/e-attachment-view.c:357
+#: ../widgets/misc/e-attachment-view.c:410
+msgid "Hid_e All"
+msgstr "_Esconder Todos"
+
+#: ../widgets/misc/e-attachment-view.c:417
 msgid "_View Inline"
 msgstr "_Ver Embutido"
 
-#: ../widgets/misc/e-attachment-view.c:639
+#: ../widgets/misc/e-attachment-view.c:424
+msgid "Vie_w All Inline"
+msgstr "Ver Todos E_mbutidos"
+
+#: ../widgets/misc/e-attachment-view.c:741
 #, c-format
 msgid "Open with \"%s\""
 msgstr "Abrir com \"%s\""
 
-#: ../widgets/misc/e-attachment-view.c:642
+#: ../widgets/misc/e-attachment-view.c:744
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Abrir este anexo com o %s"
@@ -21598,183 +21079,124 @@ msgstr "Abrir este anexo com o %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:1002
+#: ../widgets/misc/e-attachment.c:997
 msgid "Attached message"
 msgstr "Mensagem anexa"
 
-#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2621
+#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
 msgid "A load operation is already in progress"
 msgstr "JÃ¡ estÃ¡ em curso uma operaÃ§Ã£o de leitura"
 
-#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
+#: ../widgets/misc/e-attachment.c:1836 ../widgets/misc/e-attachment.c:2637
 msgid "A save operation is already in progress"
 msgstr "JÃ¡ estÃ¡ em curso uma operaÃ§Ã£o de gravaÃ§Ã£o"
 
-#: ../widgets/misc/e-attachment.c:1920
+#: ../widgets/misc/e-attachment.c:1928
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Incapaz de ler '%s'"
 
-#: ../widgets/misc/e-attachment.c:1923
+#: ../widgets/misc/e-attachment.c:1931
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Incapaz de ler o anexo"
 
-#: ../widgets/misc/e-attachment.c:2199
+#: ../widgets/misc/e-attachment.c:2207
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Incapaz de abrir '%s'"
 
-#: ../widgets/misc/e-attachment.c:2202
+#: ../widgets/misc/e-attachment.c:2210
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Incapaz de abrir o anexo"
 
-#: ../widgets/misc/e-attachment.c:2637
+#: ../widgets/misc/e-attachment.c:2645
 msgid "Attachment contents not loaded"
 msgstr "O conteÃºdo do anexo nÃ£o foi lido"
 
-#: ../widgets/misc/e-attachment.c:2713
+#: ../widgets/misc/e-attachment.c:2721
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Incapaz de gravar '%s'"
 
-#: ../widgets/misc/e-attachment.c:2716
+#: ../widgets/misc/e-attachment.c:2724
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Incapaz de gravar 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:363
+#: ../widgets/misc/e-buffer-tagger.c:362
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-clicar para abrir um link"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1249
+#: ../widgets/misc/e-calendar-item.c:1261
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:217
+#: ../widgets/misc/e-calendar.c:220
 msgid "Month Calendar"
 msgstr "CalendÃ¡rio do MÃªs"
 
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-text.c:3399
-#: ../widgets/text/e-text.c:3400
-msgid "Fill color"
-msgstr "Cor de enchimento"
-
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486 ../widgets/text/e-text.c:3406
-#: ../widgets/text/e-text.c:3407 ../widgets/text/e-text.c:3413
-#: ../widgets/text/e-text.c:3414
-msgid "GDK fill color"
-msgstr "Cor GDK de enchimento"
-
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493 ../widgets/text/e-text.c:3420
-#: ../widgets/text/e-text.c:3421
-msgid "Fill stipple"
-msgstr "Textura de enchimento"
-
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
-msgid "X1"
-msgstr "X1"
-
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
-msgid "X2"
-msgstr "X2"
-
-#: ../widgets/misc/e-canvas-background.c:513
-#: ../widgets/misc/e-canvas-background.c:514
-msgid "Y1"
-msgstr "Y1"
-
-#: ../widgets/misc/e-canvas-background.c:520
-#: ../widgets/misc/e-canvas-background.c:521
-msgid "Y2"
-msgstr "Y2"
-
-#: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/table/e-table-group-container.c:1009
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:2884
-msgid "Minimum width"
-msgstr "Largura mÃnima"
-
-#: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/table/e-table-group-container.c:1010
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:2885
-msgid "Minimum Width"
-msgstr "Largura MÃnima"
-
-#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
-msgid "Spacing"
-msgstr "EspaÃ§amento"
-
-#: ../widgets/misc/e-charset-combo-box.c:93
+#: ../widgets/misc/e-charset-combo-box.c:96
 msgid "Character Encoding"
 msgstr "CodificaÃ§Ã£o de Caracteres"
 
-#: ../widgets/misc/e-charset-combo-box.c:117
+#: ../widgets/misc/e-charset-combo-box.c:122
 msgid "Enter the character set to use"
 msgstr "Introduza o conjunto de caracteres a utilizar"
 
-#: ../widgets/misc/e-charset-combo-box.c:336
+#: ../widgets/misc/e-charset-combo-box.c:341
 msgid "Other..."
 msgstr "Outro..."
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:508
 msgid "Date and Time"
 msgstr "Data e Hora"
 
-#: ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:529
 msgid "Text entry to input date"
 msgstr "Entrada de texto para introduzir a data"
 
-#: ../widgets/misc/e-dateedit.c:566
+#: ../widgets/misc/e-dateedit.c:551
 msgid "Click this button to show a calendar"
 msgstr "Prima este botÃ£o para apresentar um calendÃ¡rio"
 
-#: ../widgets/misc/e-dateedit.c:612
+#: ../widgets/misc/e-dateedit.c:597
 msgid "Drop-down combination box to select time"
 msgstr "Caixa de selecÃ§Ã£o para escolher a hora"
 
-#: ../widgets/misc/e-dateedit.c:684
+#: ../widgets/misc/e-dateedit.c:669
 msgid "No_w"
 msgstr "Ag_ora"
 
-#: ../widgets/misc/e-dateedit.c:690
+#: ../widgets/misc/e-dateedit.c:675
 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:698
+#: ../widgets/misc/e-dateedit.c:683
 msgid "_None"
 msgstr "_Nenhuma"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1703 ../widgets/misc/e-dateedit.c:1939
+#: ../widgets/misc/e-dateedit.c:1688 ../widgets/misc/e-dateedit.c:1920
 msgctxt "date"
 msgid "None"
 msgstr "Nenhuma"
 
-#: ../widgets/misc/e-dateedit.c:1834
+#: ../widgets/misc/e-dateedit.c:1815
 msgid "Invalid Date Value"
 msgstr "Valor de Data InvÃ¡lido"
 
-#: ../widgets/misc/e-dateedit.c:1878
+#: ../widgets/misc/e-dateedit.c:1859
 msgid "Invalid Time Value"
 msgstr "Valor de Hora InvÃ¡lido"
 
-#: ../widgets/misc/e-import-assistant.c:238
+#: ../widgets/misc/e-import-assistant.c:252
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -21782,40 +21204,37 @@ msgstr ""
 "Seleccione o ficheiro que deseja importar para o Evolution, e seleccione da "
 "lista qual o seu tipo de ficheiro."
 
-#: ../widgets/misc/e-import-assistant.c:255
+#: ../widgets/misc/e-import-assistant.c:269
 msgid "F_ilename:"
 msgstr "Nome do f_icheiro:"
 
-#: ../widgets/misc/e-import-assistant.c:265
+#: ../widgets/misc/e-import-assistant.c:279
 msgid "Select a file"
 msgstr "Seleccione um ficheiro"
 
-#: ../widgets/misc/e-import-assistant.c:279
-#: ../widgets/misc/e-import-assistant.c:455
+#: ../widgets/misc/e-import-assistant.c:293
+#: ../widgets/misc/e-import-assistant.c:468
 msgid "File _type:"
 msgstr "_Tipo de ficheiro:"
 
-#: ../widgets/misc/e-import-assistant.c:322
+#: ../widgets/misc/e-import-assistant.c:336
+#: ../widgets/misc/e-import-assistant.c:919
 msgid "Choose the destination for this import"
 msgstr "Seleccione o destino desta importaÃ§Ã£o"
 
-#: ../widgets/misc/e-import-assistant.c:347
+#: ../widgets/misc/e-import-assistant.c:361
 msgid "Choose the type of importer to run:"
 msgstr "Seleccione o tipo de importador a executar:"
 
-#: ../widgets/misc/e-import-assistant.c:355
+#: ../widgets/misc/e-import-assistant.c:369
 msgid "Import data and settings from _older programs"
 msgstr "Importar dados e configuraÃ§Ãµes de aplicaÃ§Ãµes _antigas"
 
-#: ../widgets/misc/e-import-assistant.c:363
+#: ../widgets/misc/e-import-assistant.c:377
 msgid "Import a _single file"
 msgstr "Importar _um Ãºnico ficheiro"
 
-#: ../widgets/misc/e-import-assistant.c:439
-msgid "Select what type of file you want to import from the list."
-msgstr "Seleccione da lista que tipo de ficheiro deseja importar."
-
-#: ../widgets/misc/e-import-assistant.c:516
+#: ../widgets/misc/e-import-assistant.c:529
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -21825,17 +21244,38 @@ msgstr ""
 "Pine, Netscape, Elm, iCalendar. NÃ£o foram encontradas definiÃ§Ãµes "
 "importÃ¡veis. Se desejar tentar novamente, prima o botÃ£o \"Retroceder\"."
 
-#: ../widgets/misc/e-import-assistant.c:1187
-#: ../widgets/misc/e-import-assistant.c:1214
+#. Install a custom "Cancel Import" button.
+#: ../widgets/misc/e-import-assistant.c:776
+msgid "_Cancel Import"
+msgstr "_Cancelar a ImportaÃ§Ã£o"
+
+#: ../widgets/misc/e-import-assistant.c:918
+msgid "Preview data to be imported"
+msgstr "Antever os dados a serem importados"
+
+#: ../widgets/misc/e-import-assistant.c:924
+#: ../widgets/misc/e-import-assistant.c:937
+#: ../widgets/misc/e-import-assistant.c:1287
+#: ../widgets/misc/e-import-assistant.c:1353
+#: ../widgets/misc/e-import-assistant.c:1362
+msgid "Import Data"
+msgstr "Importar Dados"
+
+#: ../widgets/misc/e-import-assistant.c:932
+msgid "Select what type of file you want to import from the list."
+msgstr "Seleccione da lista que tipo de ficheiro deseja importar."
+
+#: ../widgets/misc/e-import-assistant.c:1277
+#: ../widgets/misc/e-import-assistant.c:1311
 msgid "Evolution Import Assistant"
 msgstr "Assistente de ImportaÃ§Ã£o do Evolution"
 
-#: ../widgets/misc/e-import-assistant.c:1196
-#: ../widgets/misc/e-import-assistant.c:1248
+#: ../widgets/misc/e-import-assistant.c:1294
+#: ../widgets/misc/e-import-assistant.c:1341
 msgid "Import Location"
 msgstr "Importar LocalizaÃ§Ã£o"
 
-#: ../widgets/misc/e-import-assistant.c:1207
+#: ../widgets/misc/e-import-assistant.c:1305
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -21845,33 +21285,28 @@ msgstr ""
 "Este assistente guiÃ¡-lo-Ã¡ atravÃ©s do processo de importaÃ§Ã£o de ficheiros "
 "externos para o Evolution."
 
-#: ../widgets/misc/e-import-assistant.c:1223
+#: ../widgets/misc/e-import-assistant.c:1319
 msgid "Importer Type"
 msgstr "Tipo de Importador"
 
-#: ../widgets/misc/e-import-assistant.c:1232
+#: ../widgets/misc/e-import-assistant.c:1327
 msgid "Select Information to Import"
 msgstr "Seleccionar a InformaÃ§Ã£o a Importar"
 
-#: ../widgets/misc/e-import-assistant.c:1240
+#: ../widgets/misc/e-import-assistant.c:1334
 msgid "Select a File"
 msgstr "Seleccionar um Ficheiro"
 
-#: ../widgets/misc/e-import-assistant.c:1255
+#: ../widgets/misc/e-import-assistant.c:1348
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr ""
 "Prima \"Aplicar\" para iniciar a importaÃ§Ã£o do ficheiro para o Evolution."
 
-#: ../widgets/misc/e-import-assistant.c:1261
-#: ../widgets/misc/e-import-assistant.c:1271
-msgid "Import Data"
-msgstr "Importar Dados"
-
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:560
 msgid "World Map"
 msgstr "Mapa Mundi"
 
-#: ../widgets/misc/e-map.c:631
+#: ../widgets/misc/e-map.c:562
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21895,126 +21330,56 @@ msgstr ""
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "Evolution de momento estÃ¡ desligado porque a rede estÃ¡ indisponÃvel."
 
-#: ../widgets/misc/e-online-button.c:135
-msgid "The button state is online"
-msgstr "O estado do botÃ£o Ã© ligado"
-
-#: ../widgets/misc/e-paned.c:306
-msgid "Horizontal Position"
-msgstr "PosiÃ§Ã£o Horizontal"
-
-#: ../widgets/misc/e-paned.c:307
-msgid "Pane position when oriented horizontally"
-msgstr "PosiÃ§Ã£o do painel quando orientado horizontalmente"
-
-#: ../widgets/misc/e-paned.c:318
-msgid "Vertical Position"
-msgstr "PosiÃ§Ã£o Vertical"
-
-#: ../widgets/misc/e-paned.c:319
-msgid "Pane position when oriented vertically"
-msgstr "PosiÃ§Ã£o do painel quando orientado verticalmente"
-
-#: ../widgets/misc/e-paned.c:330
-msgid "Proportion"
-msgstr "ProporÃ§Ã£o"
-
-#: ../widgets/misc/e-paned.c:331
-msgid "Proportion of the 2nd pane size"
-msgstr "ProporÃ§Ã£o do tamanho do 2Âº painel"
-
-#: ../widgets/misc/e-paned.c:342
-msgid "Fixed Resize"
-msgstr "Redimensionamento Fixo"
-
-#: ../widgets/misc/e-paned.c:343
-msgid "Keep the 2nd pane fixed during resize"
-msgstr "Manter o 2Âº painel fixo durante o redimensionamento"
-
-#: ../widgets/misc/e-pilot-settings.c:95
-msgid "Sync with:"
-msgstr "Sincronizar com:"
-
-#: ../widgets/misc/e-pilot-settings.c:103
-msgid "Sync Private Records:"
-msgstr "Sincronizar os Registos Privados:"
-
-#: ../widgets/misc/e-pilot-settings.c:112
-msgid "Sync Categories:"
-msgstr "Categorias de SincronizaÃ§Ã£o:"
-
-#: ../widgets/misc/e-preferences-window.c:218
+#: ../widgets/misc/e-preferences-window.c:281
 msgid "Evolution Preferences"
 msgstr "PreferÃªncias do Evolution"
 
-#: ../widgets/misc/e-search-bar.c:77
+#: ../widgets/misc/e-search-bar.c:84
 #, c-format
 msgid "Matches: %d"
 msgstr "EquivalÃªncias: %d"
 
-#: ../widgets/misc/e-search-bar.c:558
+#: ../widgets/misc/e-search-bar.c:560
 msgid "Close the find bar"
 msgstr "Fechar a barra de procura"
 
-#: ../widgets/misc/e-search-bar.c:566
+#: ../widgets/misc/e-search-bar.c:568
 msgid "Fin_d:"
 msgstr "Proc_urar:"
 
-#: ../widgets/misc/e-search-bar.c:578
+#: ../widgets/misc/e-search-bar.c:580
 msgid "Clear the search"
 msgstr "Limpar a procura"
 
-#: ../widgets/misc/e-search-bar.c:601
+#: ../widgets/misc/e-search-bar.c:603
 msgid "_Previous"
 msgstr "_Anterior"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:609
 msgid "Find the previous occurrence of the phrase"
 msgstr "Procurar a ocorrÃªncia anterior da frase"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:619
 msgid "_Next"
 msgstr "_Seguinte"
 
-#: ../widgets/misc/e-search-bar.c:623
+#: ../widgets/misc/e-search-bar.c:625
 msgid "Find the next occurrence of the phrase"
 msgstr "Procurar a ocorrÃªncia seguinte da frase"
 
-#: ../widgets/misc/e-search-bar.c:633
+#: ../widgets/misc/e-search-bar.c:635
 msgid "Mat_ch case"
 msgstr "Coincidir a capitali_zaÃ§Ã£o"
 
-#: ../widgets/misc/e-search-bar.c:661
+#: ../widgets/misc/e-search-bar.c:663
 msgid "Reached bottom of page, continued from top"
 msgstr "AlcanÃ§ado o fundo da pÃ¡gina, continuar a partir do topo"
 
-#: ../widgets/misc/e-search-bar.c:683
+#: ../widgets/misc/e-search-bar.c:685
 msgid "Reached top of page, continued from bottom"
 msgstr "AlcanÃ§ado o topo da pÃ¡gina, continuar a partir do fundo"
 
-#: ../widgets/misc/e-selection-model-array.c:593
-#: ../widgets/table/e-tree-selection-model.c:803
-msgid "Cursor Row"
-msgstr "Linha de Cursor"
-
-#: ../widgets/misc/e-selection-model-array.c:600
-#: ../widgets/table/e-tree-selection-model.c:810
-msgid "Cursor Column"
-msgstr "Coluna de Cursor"
-
-#: ../widgets/misc/e-selection-model.c:216
-msgid "Sorter"
-msgstr "Ordenador"
-
-#: ../widgets/misc/e-selection-model.c:223
-msgid "Selection Mode"
-msgstr "Modo de SelecÃ§Ã£o"
-
-#: ../widgets/misc/e-selection-model.c:231
-msgid "Cursor Mode"
-msgstr "Modo de Cursor"
-
-#: ../widgets/misc/e-send-options.c:515
+#: ../widgets/misc/e-send-options.c:516
 msgid "When de_leted:"
 msgstr "Ao apa_gar:"
 
@@ -22035,89 +21400,102 @@ msgid "Delivery Options"
 msgstr "OpÃ§Ãµes de Entrega"
 
 #: ../widgets/misc/e-send-options.ui.h:6
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "_AtÃ©"
+
+#: ../widgets/misc/e-send-options.ui.h:7
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "_ApÃ³s"
+
+#: ../widgets/misc/e-send-options.ui.h:8
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "dias"
+
+#: ../widgets/misc/e-send-options.ui.h:9
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "_Entre"
+
+#: ../widgets/misc/e-send-options.ui.h:10
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "dias"
+
+#: ../widgets/misc/e-send-options.ui.h:11
 msgid "For Your Eyes Only"
 msgstr "Apenas Para os Seus Olhos"
 
-#: ../widgets/misc/e-send-options.ui.h:7
+#: ../widgets/misc/e-send-options.ui.h:12
 msgid "Gene_ral Options"
 msgstr "OpÃ§Ãµes Ge_rais"
 
-#: ../widgets/misc/e-send-options.ui.h:10
+#: ../widgets/misc/e-send-options.ui.h:15
 msgid "Mail Receipt"
 msgstr "Recibo de Leitura"
 
-#: ../widgets/misc/e-send-options.ui.h:14
+#: ../widgets/misc/e-send-options.ui.h:17
 msgid "Proprietary"
 msgstr "ProprietÃ¡rio"
 
-#: ../widgets/misc/e-send-options.ui.h:15
+#: ../widgets/misc/e-send-options.ui.h:18
 msgid "R_eply requested"
 msgstr "R_esposta requerida"
 
-#: ../widgets/misc/e-send-options.ui.h:17
+#: ../widgets/misc/e-send-options.ui.h:20
 msgid "Return Notification"
 msgstr "Devolver NotificaÃ§Ã£o"
 
-#: ../widgets/misc/e-send-options.ui.h:20
+#: ../widgets/misc/e-send-options.ui.h:23
 msgid "Sta_tus Tracking"
 msgstr "Acompanhamento de Es_tado"
 
-#: ../widgets/misc/e-send-options.ui.h:21
+#: ../widgets/misc/e-send-options.ui.h:24
 msgid "Standard"
 msgstr "Base"
 
-#: ../widgets/misc/e-send-options.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:25
 msgid "Status Tracking"
 msgstr "Acompanhamento de Estado"
 
-#: ../widgets/misc/e-send-options.ui.h:23
+#: ../widgets/misc/e-send-options.ui.h:26
 msgid "Top Secret"
 msgstr "Altamente Secreto"
 
-#: ../widgets/misc/e-send-options.ui.h:25
+#: ../widgets/misc/e-send-options.ui.h:28
 msgid "When acce_pted:"
 msgstr "_Quando aceite:"
 
-#: ../widgets/misc/e-send-options.ui.h:26
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "When co_mpleted:"
 msgstr "Quando ter_minada:"
 
-#: ../widgets/misc/e-send-options.ui.h:27
+#: ../widgets/misc/e-send-options.ui.h:30
 msgid "When decli_ned:"
 msgstr "Qua_ndo recusada:"
 
-#: ../widgets/misc/e-send-options.ui.h:28
-msgid "Wi_thin"
-msgstr "_Entre"
-
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "_After:"
-msgstr "_ApÃ³s:"
-
-#: ../widgets/misc/e-send-options.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:31
 msgid "_All information"
 msgstr "_Toda a informaÃ§Ã£o"
 
-#: ../widgets/misc/e-send-options.ui.h:31
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_Classification:"
 msgstr "_ClassificaÃ§Ã£o:"
 
-#: ../widgets/misc/e-send-options.ui.h:32
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Delay message delivery"
 msgstr "_Atrasar a entrega das mensagens"
 
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delivered"
 msgstr "_Entregue"
 
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Set expiration date"
 msgstr "_Definir data de expiraÃ§Ã£o"
 
-#: ../widgets/misc/e-send-options.ui.h:36
-msgid "_Until:"
-msgstr "_AtÃ©:"
-
 #: ../widgets/misc/e-send-options.ui.h:37
 msgid "_When convenient"
 msgstr "_Quando conveniente"
@@ -22126,38 +21504,44 @@ msgstr "_Quando conveniente"
 msgid "_When opened:"
 msgstr "_Quando aberta:"
 
-#: ../widgets/misc/e-signature-editor.c:133
-#: ../widgets/misc/e-signature-editor.c:549
-#: ../widgets/misc/e-signature-manager.c:349
-#: ../widgets/misc/e-signature-script-dialog.c:218
+#. Translators: Used in send options dialog
+#: ../widgets/misc/e-send-options.ui.h:40
+msgctxt "send-options"
+msgid "None"
+msgstr "Nenhum"
+
+#: ../widgets/misc/e-signature-editor.c:136
+#: ../widgets/misc/e-signature-editor.c:524
+#: ../widgets/misc/e-signature-manager.c:356
+#: ../widgets/misc/e-signature-script-dialog.c:220
 msgid "Unnamed"
 msgstr "Sem nome"
 
-#: ../widgets/misc/e-signature-editor.c:210
+#: ../widgets/misc/e-signature-editor.c:213
 msgid "_Save and Close"
 msgstr "_Gravar e Fechar"
 
-#: ../widgets/misc/e-signature-editor.c:389
+#: ../widgets/misc/e-signature-editor.c:391
 msgid "Edit Signature"
 msgstr "Editar a Assinatura"
 
-#: ../widgets/misc/e-signature-editor.c:404
+#: ../widgets/misc/e-signature-editor.c:406
 msgid "_Signature Name:"
 msgstr "Nome da _Assinatura:"
 
-#: ../widgets/misc/e-signature-manager.c:294
+#: ../widgets/misc/e-signature-manager.c:301
 msgid "Add Signature Script"
 msgstr "Adicionar Script de Assinatura"
 
-#: ../widgets/misc/e-signature-manager.c:359
+#: ../widgets/misc/e-signature-manager.c:366
 msgid "Edit Signature Script"
 msgstr "Editar o Script de Assinatura"
 
-#: ../widgets/misc/e-signature-manager.c:576
+#: ../widgets/misc/e-signature-manager.c:582
 msgid "Add _Script"
 msgstr "Adicionar um _Script"
 
-#: ../widgets/misc/e-signature-script-dialog.c:266
+#: ../widgets/misc/e-signature-script-dialog.c:270
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -22167,53 +21551,53 @@ msgstr ""
 "assinatura. O nome que especificar serÃ¡ utilizado\n"
 "apenas para visualizaÃ§Ã£o."
 
-#: ../widgets/misc/e-signature-script-dialog.c:311
+#: ../widgets/misc/e-signature-script-dialog.c:315
 msgid "S_cript:"
 msgstr "S_cript:"
 
-#: ../widgets/misc/e-signature-script-dialog.c:342
+#: ../widgets/misc/e-signature-script-dialog.c:346
 msgid "Script file must be executable."
 msgstr "O ficheiro de script tem de ser executÃ¡vel."
 
-#: ../widgets/misc/e-url-entry.c:105
+#: ../widgets/misc/e-url-entry.c:78
 msgid "Click here to go to URL"
 msgstr "Clique aqui para ir para o URL"
 
-#: ../widgets/misc/e-web-view.c:348
+#: ../widgets/misc/e-web-view.c:374
 msgid "_Copy Link Location"
 msgstr "_Copiar a LocalizaÃ§Ã£o do Link"
 
-#: ../widgets/misc/e-web-view.c:350
+#: ../widgets/misc/e-web-view.c:376
 msgid "Copy the link to the clipboard"
 msgstr "Copiar o link para a Ã¡rea de transferÃªncia"
 
-#: ../widgets/misc/e-web-view.c:358
+#: ../widgets/misc/e-web-view.c:384
 msgid "_Open Link in Browser"
 msgstr "Abrir o Link no _Navegador"
 
-#: ../widgets/misc/e-web-view.c:360
+#: ../widgets/misc/e-web-view.c:386
 msgid "Open the link in a web browser"
 msgstr "Abrir o link num navegador web"
 
-#: ../widgets/misc/e-web-view.c:368
+#: ../widgets/misc/e-web-view.c:394
 msgid "_Copy Email Address"
 msgstr "_Copiar o EndereÃ§o de Email"
 
-#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
+#: ../widgets/misc/e-web-view.c:423 ../widgets/misc/e-web-view.c:1078
 msgid "Select all text and images"
 msgstr "Seleccionar todo o texto e imagens"
 
-#: ../widgets/misc/e-web-view.c:752 ../widgets/misc/e-web-view.c:754
-#: ../widgets/misc/e-web-view.c:756
+#: ../widgets/misc/e-web-view.c:855 ../widgets/misc/e-web-view.c:857
+#: ../widgets/misc/e-web-view.c:859
 #, c-format
 msgid "Click to call %s"
 msgstr "Clicar para realizar uma chamada para %s"
 
-#: ../widgets/misc/e-web-view.c:758
+#: ../widgets/misc/e-web-view.c:861
 msgid "Click to hide/unhide addresses"
 msgstr "Clicar para esconder/apresentar os endereÃ§os"
 
-#: ../widgets/misc/e-web-view.c:760
+#: ../widgets/misc/e-web-view.c:863
 #, c-format
 msgid "Click to open %s"
 msgstr "Clicar para abrir %s"
@@ -22232,7 +21616,7 @@ msgstr "CalendÃ¡rio: de %s a %s"
 msgid "evolution calendar item"
 msgstr "item de calendÃ¡rio evolution"
 
-#: ../widgets/table/e-cell-combo.c:171
+#: ../widgets/table/e-cell-combo.c:177
 msgid "popup list"
 msgstr "lista em popup"
 
@@ -22250,7 +21634,7 @@ msgstr "Nenhuma"
 msgid "OK"
 msgstr "OK"
 
-#: ../widgets/table/e-cell-date-edit.c:878
+#: ../widgets/table/e-cell-date-edit.c:872
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "A hora tem de ser no formato: %s"
@@ -22259,70 +21643,34 @@ msgstr "A hora tem de ser no formato: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "O valor de percentagem tem de ser entre 0 e 100, inclusivÃ©"
 
-#: ../widgets/table/e-cell-pixbuf.c:357
-msgid "Selected Column"
-msgstr "Coluna Seleccionada"
-
-#: ../widgets/table/e-cell-pixbuf.c:364
-msgid "Focused Column"
-msgstr "Coluna com Foco"
-
-#: ../widgets/table/e-cell-pixbuf.c:371
-msgid "Unselected Column"
-msgstr "Coluna Des-seleccionada"
-
-#: ../widgets/table/e-cell-text.c:1631
-msgid "Strikeout Column"
-msgstr "Coluna Riscada"
-
-#: ../widgets/table/e-cell-text.c:1638
-msgid "Underline Column"
-msgstr "Sublinhar Coluna"
-
-#: ../widgets/table/e-cell-text.c:1645
-msgid "Bold Column"
-msgstr "Coluna em Negrito"
-
-#: ../widgets/table/e-cell-text.c:1652
-msgid "Color Column"
-msgstr "Coluna Colorida"
-
-#: ../widgets/table/e-cell-text.c:1666
-msgid "BG Color Column"
-msgstr "Cor de Fundo da Coluna"
-
-#: ../widgets/table/e-table-click-to-add.c:586
+#: ../widgets/table/e-table-click-to-add.c:598
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
 msgid "click to add"
 msgstr "clique para adicionar"
 
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "Estado"
-
-#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Ascending)"
 msgstr "(Ascendente)"
 
-#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Descending)"
 msgstr "(Descendente)"
 
-#: ../widgets/table/e-table-config.c:388
+#: ../widgets/table/e-table-config.c:392
 msgid "Not sorted"
 msgstr "NÃ£o ordenado"
 
-#: ../widgets/table/e-table-config.c:429
+#: ../widgets/table/e-table-config.c:433
 msgid "No grouping"
 msgstr "NÃ£o agrupado"
 
-#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.c:654
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "Apresentar Campos"
 
-#: ../widgets/table/e-table-config.c:658
+#: ../widgets/table/e-table-config.c:674
 msgid "Available Fields"
 msgstr "Campos DisponÃveis"
 
@@ -22331,7 +21679,7 @@ msgid "A_vailable Fields:"
 msgstr "Campos DisponÃ_veis:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1704
 msgid "Ascending"
 msgstr "Ascendente"
 
@@ -22344,7 +21692,7 @@ msgid "Clear _All"
 msgstr "Limpar _Todos"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1704
 msgid "Descending"
 msgstr "Descendente"
 
@@ -22404,7 +21752,7 @@ msgstr "A_presentar estes campos por ordem:"
 msgid "_Sort..."
 msgstr "_Ordenar..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:114
+#: ../widgets/table/e-table-field-chooser-dialog.c:117
 msgid "Add a Column"
 msgstr "Adicionar uma Coluna"
 
@@ -22416,248 +21764,112 @@ msgstr ""
 "Para adicionar uma coluna Ã  sua tabela, arraste-a\n"
 "para o local onde a deseja."
 
-#: ../widgets/table/e-table-group-container.c:342
-#, c-format
-msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
-msgstr[0] "%s : %s (%d item)"
-msgstr[1] "%s : %s (%d itens)"
-
-#: ../widgets/table/e-table-group-container.c:348
+#. 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)"
+#.
+#: ../widgets/table/e-table-group-container.c:354
+#, c-format
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
+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)"
+#.
+#: ../widgets/table/e-table-group-container.c:366
 #, 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-group-container.c:932
-#: ../widgets/table/e-table-group-container.c:933
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:2842 ../widgets/table/e-table-item.c:2843
-msgid "Alternating Row Colors"
-msgstr "Cores de Linhas Alternadas"
-
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:2849 ../widgets/table/e-table-item.c:2850
-#: ../widgets/table/e-tree.c:3373 ../widgets/table/e-tree.c:3374
-msgid "Horizontal Draw Grid"
-msgstr "Grelha Desenhada Horizontalmente"
-
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:2856 ../widgets/table/e-table-item.c:2857
-#: ../widgets/table/e-tree.c:3379 ../widgets/table/e-tree.c:3380
-msgid "Vertical Draw Grid"
-msgstr "Grelha Desenhada Verticalmente"
-
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:2863 ../widgets/table/e-table-item.c:2864
-#: ../widgets/table/e-tree.c:3385 ../widgets/table/e-tree.c:3386
-msgid "Draw focus"
-msgstr "Desenhar foco"
-
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:2870 ../widgets/table/e-table-item.c:2871
-msgid "Cursor mode"
-msgstr "Modo do cursor"
-
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:2835 ../widgets/table/e-table-item.c:2836
-msgid "Selection model"
-msgstr "Modelo de selecÃ§Ã£o"
-
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:2877 ../widgets/table/e-table-item.c:2878
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3367
-#: ../widgets/table/e-tree.c:3368
-msgid "Length Threshold"
-msgstr "TolerÃ¢ncia de Comprimento"
-
-#: ../widgets/table/e-table-group-container.c:981
-#: ../widgets/table/e-table-group-container.c:982
-#: ../widgets/table/e-table-group-leaf.c:663
-#: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:2911 ../widgets/table/e-table-item.c:2912
-#: ../widgets/table/e-table.c:3346 ../widgets/table/e-tree.c:3399
-#: ../widgets/table/e-tree.c:3400
-msgid "Uniform row height"
-msgstr "Altura de linha uniforme"
-
-#: ../widgets/table/e-table-group-container.c:988
-#: ../widgets/table/e-table-group-container.c:989
-#: ../widgets/table/e-table-group-leaf.c:656
-#: ../widgets/table/e-table-group-leaf.c:657
-msgid "Frozen"
-msgstr "EstÃ¡tico"
-
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1548
 msgid "Customize Current View"
 msgstr "Personalizar a Vista Actual"
 
-#: ../widgets/table/e-table-header-item.c:1508
+#: ../widgets/table/e-table-header-item.c:1569
 msgid "Sort _Ascending"
 msgstr "OrdenaÃ§Ã£o _Ascendente"
 
-#: ../widgets/table/e-table-header-item.c:1511
+#: ../widgets/table/e-table-header-item.c:1572
 msgid "Sort _Descending"
 msgstr "OrdenaÃ§Ã£o _Descendente"
 
-#: ../widgets/table/e-table-header-item.c:1514
+#: ../widgets/table/e-table-header-item.c:1575
 msgid "_Unsort"
 msgstr "_Desordenar"
 
-#: ../widgets/table/e-table-header-item.c:1517
+#: ../widgets/table/e-table-header-item.c:1578
 msgid "Group By This _Field"
 msgstr "Agrupar Por _Este Campo"
 
-#: ../widgets/table/e-table-header-item.c:1520
+#: ../widgets/table/e-table-header-item.c:1581
 msgid "Group By _Box"
 msgstr "Agrupar Por _Caixa"
 
-#: ../widgets/table/e-table-header-item.c:1524
+#: ../widgets/table/e-table-header-item.c:1585
 msgid "Remove This _Column"
 msgstr "Remover Esta _Coluna"
 
-#: ../widgets/table/e-table-header-item.c:1527
+#: ../widgets/table/e-table-header-item.c:1588
 msgid "Add a C_olumn..."
 msgstr "Adicionar uma C_oluna..."
 
-#: ../widgets/table/e-table-header-item.c:1531
+#: ../widgets/table/e-table-header-item.c:1592
 msgid "A_lignment"
 msgstr "A_linhamento"
 
-#: ../widgets/table/e-table-header-item.c:1534
+#: ../widgets/table/e-table-header-item.c:1595
 msgid "B_est Fit"
 msgstr "Melhor A_juste"
 
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1598
 msgid "Format Column_s..."
 msgstr "Formatar as Coluna_s..."
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1602
 msgid "Custo_mize Current View..."
 msgstr "Personali_zar a Vista Actual..."
 
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1661
 msgid "_Sort By"
 msgstr "_Ordenar Por"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1618
+#: ../widgets/table/e-table-header-item.c:1679
 msgid "_Custom"
 msgstr "_Personalizado"
 
-#: ../widgets/table/e-table-item.c:2821 ../widgets/table/e-table-item.c:2822
-msgid "Table header"
-msgstr "CabeÃ§alho da tabela"
-
-#: ../widgets/table/e-table-item.c:2828 ../widgets/table/e-table-item.c:2829
-msgid "Table model"
-msgstr "Modelo da tabela"
-
-#: ../widgets/table/e-table-item.c:2904 ../widgets/table/e-table-item.c:2905
-msgid "Cursor row"
-msgstr "Linha do cursor"
-
-#: ../widgets/table/e-table-sorter.c:173
-msgid "Sort Info"
-msgstr "Info de OrdenaÃ§Ã£o"
-
-#: ../widgets/table/e-table.c:3353 ../widgets/table/e-tree.c:3406
-#: ../widgets/table/e-tree.c:3407
-msgid "Always search"
-msgstr "Procurar sempre"
-
-#: ../widgets/table/e-table.c:3360
-msgid "Use click to add"
-msgstr "Utilizar clique para adicionar"
-
-#: ../widgets/table/e-table.c:3374
-msgid "Vertical Row Spacing"
-msgstr "EspaÃ§amento Vertical da Linha"
-
-#: ../widgets/table/e-table.c:3375
-msgid "Vertical space between rows. It is added to top and to bottom of a row"
-msgstr ""
-"EspaÃ§amento vertical entre linhas. Ã? adicionado ao topo e fundo de uma linha"
-
-#: ../widgets/table/e-tree.c:3392 ../widgets/table/e-tree.c:3393
-msgid "ETree table adapter"
-msgstr "Adaptador de tabela ETree"
-
-#: ../widgets/table/e-tree.c:3413
-msgid "Retro Look"
-msgstr "Aspecto Retro"
-
-#: ../widgets/table/e-tree.c:3414
-msgid "Draw lines and +/- expanders."
-msgstr "Desenhar linhas e expansores +/-."
-
-#: ../widgets/table/e-tree.c:3420
-msgid "Expander Size"
-msgstr "Tamanho do Expansor"
-
-#: ../widgets/table/e-tree.c:3421
-msgid "Size of the expander arrow"
-msgstr "Tamanho da seta de expansÃ£o"
-
-#: ../widgets/table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "popup"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+#. Translators: description of a "popup" action
+#: ../widgets/table/gal-a11y-e-cell-popup.c:126
 msgid "popup a child"
 msgstr "abrir um filho em popup"
 
-#: ../widgets/table/gal-a11y-e-cell-text.c:616
-msgid "edit"
-msgstr "editar"
-
-#: ../widgets/table/gal-a11y-e-cell-text.c:617
+#. Translators: description of an "edit" action
+#: ../widgets/table/gal-a11y-e-cell-text.c:618
 msgid "begin editing this cell"
 msgstr "iniciar a ediÃ§Ã£o desta cÃ©lula"
 
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
-msgid "toggle"
-msgstr "alternar"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
+#. Translators: description of a "toggle" action
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
 msgid "toggle the cell"
 msgstr "alternar a cÃ©lula"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "expandir"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:211
+#. Translators: description of an "expand" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:212
 msgid "expands the row in the ETree containing this cell"
 msgstr "expande a linha na ETree que contÃ©m esta cÃ©lula"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "recolher"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:217
+#. Translators: description of a "collapse" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:219
 msgid "collapses the row in the ETree containing this cell"
 msgstr "recolhe a linha na ETree que contÃ©m esta cÃ©lula"
 
@@ -22673,118 +21885,1376 @@ msgstr "clique"
 msgid "sort"
 msgstr "ordenar"
 
-#: ../widgets/text/e-text.c:2486
+#: ../widgets/text/e-text.c:2538
 msgid "Select All"
 msgstr "Seleccionar Todos"
 
-#: ../widgets/text/e-text.c:2498
+#: ../widgets/text/e-text.c:2550
 msgid "Input Methods"
 msgstr "MÃ©todos de IntroduÃ§Ã£o"
 
-#: ../widgets/text/e-text.c:3315 ../widgets/text/e-text.c:3316
-msgid "Event Processor"
-msgstr "Processador de Eventos"
+#~ msgid "(Not Recommended)"
+#~ msgstr "(NÃ£o Recomendado)"
+
+#~ msgid "(Note: Requires restart of the application)"
+#~ msgstr "(Nota: Necessita de reiniciar a aplicaÃ§Ã£o)"
+
+#~ msgid "Checks incoming mail messages to be Junk"
+#~ msgstr "Verificar nas mensagens recebidas se sÃ£o NÃ£o Solicitadas"
+
+#~| msgid "Do not format messages when text si_ze exceeds"
+#~ msgid "Do not display messages when text si_ze exceeds"
+#~ msgstr "NÃ£o apresentar mensagens quando o taman_ho do texto exceder"
+
+#~ msgid "Enable Magic S_pacebar"
+#~ msgstr "Activar a Barra de Es_paÃ§os MÃ¡gica"
+
+#~ msgid "Enable Sea_rch Folders"
+#~ msgstr "Activatar as Pastas de Procu_ra"
+
+#~ msgid "Fi_xed-width:"
+#~ msgstr "Largura fi_xa:"
+
+#~ msgid "Font Properties"
+#~ msgstr "Propriedades da Fonte"
+
+#~ msgid "KB"
+#~ msgstr "KB"
+
+#~ msgid "Message Fonts"
+#~ msgstr "Fontes das Mensagens"
+
+#~ msgid ""
+#~ "Note: you will not be prompted for a password until you connect for the "
+#~ "first time"
+#~ msgstr ""
+#~ "Nota: nÃ£o lhe serÃ¡ pedida nenhuma senha atÃ© que se ligue pela primeira vez"
+
+#~ msgid "Printed Fonts"
+#~ msgstr "Fontes de ImpressÃ£o"
+
+#~| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+#~ msgid "Prompt when sending replies to _many recipients"
+#~ msgstr "Questionar ao enviar respostas para _muitos destinatÃ¡rios"
+
+#~ msgid "Select Drafts Folder"
+#~ msgstr "Seleccionar a Pasta de Rascunhos"
+
+#~ msgid "Select HTML fixed width font for printing"
+#~ msgstr "Seleccionar a fonte HTML de largura fixa para impressÃ£o"
+
+#~ msgid "Select HTML variable width font for printing"
+#~ msgstr "Seleccionar a fonte HTML de largura variÃ¡vel para impressÃ£o"
+
+#~| msgid "Select Folder"
+#~ msgid "Select Junk Folder"
+#~ msgstr "Seleccionar a Pasta de NÃ£o Solicitado"
+
+#~ msgid "Select Sent Folder"
+#~ msgstr "Seleccionar a Pasta de Enviado"
+
+#~| msgid "Select Drafts Folder"
+#~ msgid "Select Trash Folder"
+#~ msgstr "Seleccionar a Pasta de Lixo"
+
+#~ msgid "Sending Mail"
+#~ msgstr "A Enviar Mensagens"
+
+#~ msgid "Sent and Draft Messages"
+#~ msgstr "Mensagens Enviadas e Rascunhos"
+
+#~| msgid "Posting destination"
+#~ msgid "Top Posting Option"
+#~ msgstr "OpÃ§Ã£o de Resposta no InÃcio"
+
+#~ msgid "V_ariable-width:"
+#~ msgstr "Largura v_ariÃ¡vel:"
+
+#~ msgid "_Mark messages as read after"
+#~ msgstr "_Marcar as mensagens como lidas apÃ³s"
+
+#~ msgid "_Show image animations"
+#~ msgstr "Apresentar as animaÃ§Ãµes de imagen_s"
+
+#~ msgid "_Shrink To / Cc / Bcc headers to "
+#~ msgstr "_Encurtar os cabeÃ§alhos Para / Cc / Bcc para "
+
+#~ msgid "addresses"
+#~ msgstr "endereÃ§os"
 
-#: ../widgets/text/e-text.c:3322 ../widgets/text/e-text.c:3323
-msgid "Text"
-msgstr "Texto"
+#~ msgid "_Sharing"
+#~ msgstr "_Partilhar"
 
-#: ../widgets/text/e-text.c:3329 ../widgets/text/e-text.c:3330
-msgid "Bold"
-msgstr "Negrito"
+#~ msgid "Manage your Evolution plugins."
+#~ msgstr "Gerir os plugins do Evolution."
 
-#: ../widgets/text/e-text.c:3336 ../widgets/text/e-text.c:3337
-msgid "Strikeout"
-msgstr "Riscada"
+#~ msgid "Sort mail message threads by subject."
+#~ msgstr "Organizar as mensagens em Ã¡rvore por assunto."
 
-#: ../widgets/text/e-text.c:3343 ../widgets/text/e-text.c:3344
-msgid "Anchor"
-msgstr "Ã?ncora"
+#~ msgid "Subject Threading"
+#~ msgstr "OrganizaÃ§Ã£o em Ã?rvore por Assunto"
 
-#: ../widgets/text/e-text.c:3350 ../widgets/text/e-text.c:3351
-msgid "Justification"
-msgstr "Alinhamento"
+#~ msgid "Thread messages by subject"
+#~ msgstr "Organizar as mensagens em Ã¡rvore por assunto"
 
-#: ../widgets/text/e-text.c:3357 ../widgets/text/e-text.c:3358
-msgid "Clip Width"
-msgstr "Cortar Ã  Largura"
+#~ msgid "{0}"
+#~ msgstr "{0}"
 
-#: ../widgets/text/e-text.c:3364 ../widgets/text/e-text.c:3365
-msgid "Clip Height"
-msgstr "Cortar Ã  Altura"
+#~ msgid "{1}"
+#~ msgstr "{1}"
 
-#: ../widgets/text/e-text.c:3371 ../widgets/text/e-text.c:3372
-msgid "Clip"
-msgstr "Cortar"
+#~ msgid "Default Sync Address:"
+#~ msgstr "EndereÃ§o de SincronizaÃ§Ã£o Por OmissÃ£o:"
 
-#: ../widgets/text/e-text.c:3378 ../widgets/text/e-text.c:3379
-msgid "Fill clip rectangle"
-msgstr "Encher rectÃ¢ngulo de corte"
+#~ msgid "Could not load address book"
+#~ msgstr "Incapaz de ler o livro de endereÃ§os"
 
-#: ../widgets/text/e-text.c:3385 ../widgets/text/e-text.c:3386
-msgid "X Offset"
-msgstr "Deslocamento X"
+#~ msgid "Could not read pilot's Address application block"
+#~ msgstr "Incapaz de ler o bloco da aplicaÃ§Ã£o de EndereÃ§os da pilot"
 
-#: ../widgets/text/e-text.c:3392 ../widgets/text/e-text.c:3393
-msgid "Y Offset"
-msgstr "Deslocamento Y"
+#~ msgid "Web Log:"
+#~ msgstr "DiÃ¡rio na Web:"
 
-#: ../widgets/text/e-text.c:3427 ../widgets/text/e-text.c:3428
-msgid "Text width"
-msgstr "Largura do texto"
+#~ msgid "_Web Log:"
+#~ msgstr "DiÃ¡rio na _Web:"
 
-#: ../widgets/text/e-text.c:3434 ../widgets/text/e-text.c:3435
-msgid "Text height"
-msgstr "Altura do texto"
+#~ msgid "Editable"
+#~ msgstr "EditÃ¡vel"
 
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
-msgid "Use ellipsis"
-msgstr "Utilizar reticÃªncias"
+#~ msgid "Source Book"
+#~ msgstr "Livro de Origem"
 
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
-msgid "Ellipsis"
-msgstr "ReticÃªncias"
+#~ msgid "Target Book"
+#~ msgstr "Livro de Destino"
 
-#: ../widgets/text/e-text.c:3462 ../widgets/text/e-text.c:3463
-msgid "Line wrap"
-msgstr "Quebra linha"
+#~ msgid "Is New Contact"
+#~ msgstr "Ã? um Novo Contacto"
 
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
-msgid "Break characters"
-msgstr "Caracteres de quebra"
+#~ msgid "Writable Fields"
+#~ msgstr "Campos EditÃ¡veis"
 
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
-msgid "Max lines"
-msgstr "Linhas mÃ¡x."
+#~ msgid "Required Fields"
+#~ msgstr "Campos Requeridos"
 
-#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
-msgid "Draw borders"
-msgstr "Desenhar margens"
+#~ msgid "Changed"
+#~ msgstr "Alterado"
 
-#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
-msgid "Allow newlines"
-msgstr "Permitir novas linhas"
+#~ msgid "Shell"
+#~ msgstr "Consola"
 
-#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
-msgid "Draw background"
-msgstr "Desenhar fundo"
+#~ msgid "The EShell singleton"
+#~ msgstr "O singleton EShell"
 
-#: ../widgets/text/e-text.c:3518 ../widgets/text/e-text.c:3519
-msgid "Draw button"
-msgstr "Desenhar botÃ£o"
+#~ msgid "Book"
+#~ msgstr "Livro"
 
-#: ../widgets/text/e-text.c:3525 ../widgets/text/e-text.c:3526
-msgid "Cursor position"
-msgstr "PosiÃ§Ã£o do cursor"
+#~ msgid "Is New List"
+#~ msgstr "Ã? uma Nova Lista"
 
-#. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3535
-msgid "IM Context"
-msgstr "Contexto IM"
+#~ msgid "Query"
+#~ msgstr "Consulta"
 
-#: ../widgets/text/e-text.c:3541 ../widgets/text/e-text.c:3542
-msgid "Handle Popup"
-msgstr "ManÃpulo de Popup"
+#~ msgid "Model"
+#~ msgstr "Modelo"
+
+#~ msgid "Shell View"
+#~ msgstr "Vista de Consola"
+
+#~ msgid "Source"
+#~ msgstr "Origem"
+
+#~ msgid "Width"
+#~ msgstr "Largura"
+
+#~ msgid "Height"
+#~ msgstr "Altura"
+
+#~ msgid "Has Focus"
+#~ msgstr "Tem Foco"
+
+#~ msgid "Field"
+#~ msgstr "Campo"
+
+#~ msgid "Field Name"
+#~ msgstr "Nome do Campo"
+
+#~ msgid "Text Model"
+#~ msgstr "Modelo de Texto"
+
+#~ msgid "Max field name length"
+#~ msgstr "Comprimento mÃ¡x. do nome do campo"
+
+#~ msgid "Column Width"
+#~ msgstr "Largura da Coluna"
+
+#~ msgid "Adapter"
+#~ msgstr "Adaptador"
+
+#~ msgid "Selected"
+#~ msgstr "Seleccionado"
+
+#~ msgid "Has Cursor"
+#~ msgstr "Tem Cursor"
+
+#~ msgid "Success"
+#~ msgstr "Sucesso"
+
+#~ msgid "Backend busy"
+#~ msgstr "MÃ³dulo de suporte ocupado"
+
+#~ msgid "Repository offline"
+#~ msgstr "RepositÃ³rio desligado"
+
+#~ msgid "Address Book does not exist"
+#~ msgstr "Livro de EndereÃ§os nÃ£o existe"
+
+#~ msgid "No Self Contact defined"
+#~ msgstr "Nenhum Contacto PrÃ³prio definido"
+
+#~ msgid "Permission denied"
+#~ msgstr "AutorizaÃ§Ã£o negada"
+
+#~ msgid "Contact not found"
+#~ msgstr "Contacto nÃ£o foi encontrado"
+
+#~ msgid "Contact ID already exists"
+#~ msgstr "ID de contacto jÃ¡ existe"
+
+#~ msgid "Protocol not supported"
+#~ msgstr "Protocolo nÃ£o Ã© suportado"
+
+#~ msgid "Could not cancel"
+#~ msgstr "Incapaz de cancelar"
+
+#~ msgid "Authentication Failed"
+#~ msgstr "AutenticaÃ§Ã£o Falhou"
+
+#~ msgid "Authentication Required"
+#~ msgstr "AutenticaÃ§Ã£o Requerida"
+
+#~ msgid "TLS not Available"
+#~ msgstr "TLS IndisponÃvel"
+
+#~ msgid "No such source"
+#~ msgstr "Origem inexistente"
+
+#~ msgid "Not available in offline mode"
+#~ msgstr "IndisponÃvel em modo desligado"
+
+#~ msgid "Other error"
+#~ msgstr "Outro erro"
+
+#~ msgid "Invalid server version"
+#~ msgstr "VersÃ£o do servidor invÃ¡lida"
+
+#~ msgid "Unsupported authentication method"
+#~ msgstr "MÃ©todo de autenticaÃ§Ã£o nÃ£o suportado"
+
+#~ msgid "Calendar repository is offline."
+#~ msgstr "RepositÃ³rio de calendÃ¡rio estÃ¡ desligado."
+
+#~ msgid "Error on '{0}'"
+#~ msgstr "Erro em '{0}'"
+
+#~ msgid "No response from the server."
+#~ msgstr "Nenhuma resposta do servidor."
+
+#~ msgid "Unable to load the calendar"
+#~ msgstr "Incapaz de ler o calendÃ¡rio"
+
+#~ msgid "{0}."
+#~ msgstr "{0}."
+
+#~ msgid "Split Multi-Day Events:"
+#~ msgstr "Dividir Eventos Multi-Dias:"
+
+#~ msgid "Could not start evolution-data-server"
+#~ msgstr "Incapaz de iniciar o evolution-data-server"
+
+#~ msgid "Could not read pilot's Calendar application block"
+#~ msgstr "Incapaz de ler o bloco da aplicaÃ§Ã£o de CalendÃ¡rio da pilot"
+
+#~ msgid "Could not read pilot's Memo application block"
+#~ msgstr "Incapaz de ler o bloco da aplicaÃ§Ã£o de Memos da pilot"
+
+#~ msgid "Could not write pilot's Memo application block"
+#~ msgstr "Incapaz de escrever o bloco da aplicaÃ§Ã£o de Memos da pilot"
+
+#~ msgid "Default Priority:"
+#~ msgstr "Prioridade por OmissÃ£o:"
+
+#~ msgid "Could not read pilot's ToDo application block"
+#~ msgstr "Incapaz de ler o bloco da aplicaÃ§Ã£o de A Fazer da pilot"
+
+#~ msgid "Could not write pilot's ToDo application block"
+#~ msgstr "Incapaz de escrever o bloco da aplicaÃ§Ã£o de A Fazer da pilot"
+
+#~ msgid "Check this to use system timezone in Evolution."
+#~ msgstr ""
+#~ "Seleccione aqui para utilizar o fuso-horÃ¡rio de sistema no Evolution."
+
+#~ msgid "Show week numbers in date navigator"
+#~ msgstr "Apresentar os nÃºmeros das semanas no navegador de datas"
+
+#~ msgid "Whether to show week number in the Day and Work Week View."
+#~ msgstr ""
+#~ "Se apresentar ou nÃ£o os nÃºmeros das semanas nas Vistas de Dia e Semana de "
+#~ "Trabalho."
+
+#~ msgid "Show week n_umber in Day and Work Week View"
+#~ msgstr ""
+#~ "Apresentar os _nÃºmeros das semanas nas Vistas de Dia e Semana de Trabalho"
+
+#~ msgid "Save"
+#~ msgstr "Gravar"
+
+#~ msgid "The event could not be deleted due to a corba error"
+#~ msgstr "O evento nÃ£o pode ser apagado devido a um erro corba"
+
+#~ msgid "The task could not be deleted due to a corba error"
+#~ msgstr "A tarefa nÃ£o pode ser apagada devido a um erro corba"
+
+#~ msgid "The memo could not be deleted due to a corba error"
+#~ msgstr "O memo nÃ£o pode ser apagado devido a um erro corba"
+
+#~ msgid "The item could not be deleted due to a corba error"
+#~ msgstr "O item nÃ£o pode ser apagado devido a um erro corba"
+
+#~ msgid "Appoint_ment"
+#~ msgstr "Compro_misso"
+
+#~ msgid "Attendee_s..."
+#~ msgstr "Participante_s..."
+
+#~ msgid "_Task"
+#~ msgstr "_Tarefa"
+
+#~ msgid "Default Client"
+#~ msgstr "Cliente por OmissÃ£o"
+
+#~ msgid "Shell Settings"
+#~ msgstr "DefiniÃ§Ãµes de Consola"
+
+#~ msgid "Application-wide settings"
+#~ msgstr "DefiniÃ§Ãµes globais da aplicaÃ§Ã£o"
+
+#~ msgid "A_ttendees..."
+#~ msgstr "Par_ticipantes..."
+
+#~ msgid "0%"
+#~ msgstr "0%"
+
+#~ msgid "10%"
+#~ msgstr "10%"
+
+#~ msgid "20%"
+#~ msgstr "20%"
+
+#~ msgid "30%"
+#~ msgstr "30%"
+
+#~ msgid "40%"
+#~ msgstr "40%"
+
+#~ msgid "50%"
+#~ msgstr "50%"
+
+#~ msgid "60%"
+#~ msgstr "60%"
+
+#~ msgid "70%"
+#~ msgstr "70%"
+
+#~ msgid "80%"
+#~ msgstr "80%"
+
+#~ msgid "90%"
+#~ msgstr "90%"
+
+#~ msgid "100%"
+#~ msgstr "100%"
+
+#~ msgid "_Select Today"
+#~ msgstr "_Seleccionar Hoje"
+
+#~ msgid "_From Field"
+#~ msgstr "Campo _De"
+
+#~ msgid "Toggles whether the From chooser is displayed"
+#~ msgstr "Alterna se o selector De Ã© ou nÃ£o apresentado"
+
+#~ msgid "Show"
+#~ msgstr "Apresentar"
+
+#~ msgid "Hide"
+#~ msgstr "Esconder"
+
+#~ msgid "Unable to reconstruct message from autosave file"
+#~ msgstr "Incapaz de recuperar a mensagem a partir do ficheiro de salvaguarda"
+
+#~ msgid "New Tab"
+#~ msgstr "Novo Separador"
+
+#~ msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
+#~ msgstr "<span size=\"large\" weight=\"bold\">Detalhes pessoais:</span>"
+
+#~ msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
+#~ msgstr "<span size=\"large\" weight=\"bold\">Detalhes da recepÃ§Ã£o:</span>"
+
+#~ msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
+#~ msgstr "<span size=\"large\" weight=\"bold\">A enviar detalhes:</span>"
+
+#~ msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
+#~ msgstr "<span size=\"large\" weight=\"bold\">GestÃ£o de conta</span>"
+
+#~ msgid "address card"
+#~ msgstr "cartÃ£o de visita"
+
+#~ msgid "calendar information"
+#~ msgstr "informaÃ§Ã£o de calendÃ¡rio"
+
+#~ msgid "Name of the logger"
+#~ msgstr "Nome do registo"
+
+#~ msgid "Filename"
+#~ msgstr "Ficheiro"
+
+#~ msgid "The filename of the module"
+#~ msgstr "O nome do ficheiro do mÃ³dulo"
+
+#~ msgid "Whether the plugin is enabled"
+#~ msgstr "Se o plugin estÃ¡ ou nÃ£o activo"
+
+#~ msgid "Could not parse PGP message: Unknown error"
+#~ msgstr "Incapaz de processar a mensagem PGP: Erro desconhecido"
+
+#~ msgid "Focus Tracker"
+#~ msgstr "Controlador de Foco"
+
+#~ msgid "Shell Module"
+#~ msgstr "MÃ³dulo de Consola"
+
+#~ msgid "The mail shell backend"
+#~ msgstr "O motor de consola de email"
+
+#~ msgid "Show Deleted"
+#~ msgstr "Apresentar Apagadas"
+
+#~ msgid "To Do"
+#~ msgstr "A Fazer"
+
+#~ msgid "Later"
+#~ msgstr "Mais Tarde"
+
+#~ msgid "Unable to create new folder `%s': %s"
+#~ msgstr "Incapaz de criar a nova pasta `%s': %s"
+
+#~ msgid "Unable to copy folder `%s' to `%s': %s"
+#~ msgstr "Incapaz de copiar a pasta `%s' para `%s': %s"
+
+#~ msgid "Unable to scan for existing mailboxes at `%s': %s"
+#~ msgstr "Incapaz de analisar caixas de correio existentes em `%s': %s"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution mailbox folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "A localizaÃ§Ã£o e hierarquia das pastas de email Evolution foram alteradas "
+#~ "desde o Evolution 1.x.\n"
+#~ "\n"
+#~ "Aguarde enquanto o Evolution migra as suas pastas..."
+
+#~ msgid "Unable to open old POP keep-on-server data `%s': %s"
+#~ msgstr "Incapaz de abir dados antigos POP manter-no-servidor `%s': %s"
+
+#~ msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+#~ msgstr ""
+#~ "Incapaz de criar o directÃ³rio de dados POP3 manter-no-servidor `%s': %s"
+
+#~ msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+#~ msgstr "Incapaz de copiar os dados POP3 manter-no-servidor `%s': %s"
+
+#~ msgid "Failed to create local mail storage `%s': %s"
+#~ msgstr "Falha ao criar o armazenamento local de mensagens `%s': %s"
+
+#~ msgid ""
+#~ "Unable to read settings from previous Evolution install, `evolution/"
+#~ "config.xmldb' does not exist or is corrupt."
+#~ msgstr ""
+#~ "Incapaz de ler as definiÃ§Ãµes da instalaÃ§Ã£o anterior do Evolution, "
+#~ "`evolution/config.xmldb' nÃ£o existe ou estÃ¡ corrompido."
+
+#~ msgid "Allows Evolution to display text part of limited size"
+#~ msgstr "Permite ao Evolution apresentar parte de tamanho limitado do texto"
+
+#~ msgid "Enable to render message text part of limited size."
+#~ msgstr ""
+#~ "Activar para apresentar uma parte com tamanho limitado do texto da "
+#~ "mensagem."
+
+#~ msgid "Show \"From\" field when sending a mail message"
+#~ msgstr "Apresentar o campo \"De\" ao enviar uma mensagem de email"
+
+#~ msgid ""
+#~ "Show the \"From\" field when sending a mail message. This is controlled "
+#~ "from the View menu when a mail account is chosen."
+#~ msgstr ""
+#~ "Apresentar o campo \"De\" ao enviar uma mensagem de email. Esta chave Ã© "
+#~ "controlada pelo menu Ver quando Ã© seleccionada uma conta de email."
+
+#~ msgid "Text message part limit"
+#~ msgstr "Limite da parte de texto da mensagem"
+
+#~ msgid "<b>Top Posting Option</b> (Not Recommended)"
+#~ msgstr "<b>OpÃ§Ã£o de Resposta no InÃcio</b> (NÃ£o Ã© Recomendada)"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "Because \"{0}\"."
+#~ msgstr "Devido a \"{0}\"."
+
+#~ msgid "Because \"{2}\"."
+#~ msgstr "Devido a \"{2}\"."
+
+#~ msgid "Do not d_elete"
+#~ msgstr "NÃ£o _apagar"
+
+#~ msgid ""
+#~ "The following Search Folder(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "A(s) seguinte(s) Pasta(s) de Procura:\n"
+#~ "{0}\n"
+#~ "Utilizavam a pasta agora removida:\n"
+#~ "    \"{1}\"\n"
+#~ "E foram actualizadas."
+
+#~ msgid ""
+#~ "The following filter rule(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "A(s) seguinte(s) regra(s) de filtro:\n"
+#~ "{0}\n"
+#~ "Utilizavam a pasta agora removida:\n"
+#~ "    \"{1}\"\n"
+#~ "E foram actualizadas."
+
+#~ msgid "Shell Backend"
+#~ msgstr "Motor de Consola"
+
+#~ msgid ""
+#~ "There are only hidden messages in this folder. Use View->Show Hidden "
+#~ "Messages to show them."
+#~ msgstr ""
+#~ "Apenas existem mensagens escondidas nesta pasta. Utilize Ver->Apresentar "
+#~ "Mensagens Escondidas para as ver."
+
+#~ msgid "Table column:"
+#~ msgstr "Coluna da tabela:"
+
+#~ msgid "Source List"
+#~ msgstr "Lista de Origem"
+
+#~ msgid "The registry of address books"
+#~ msgstr "O registo de livros de endereÃ§os"
+
+#~ msgid "Current View"
+#~ msgstr "Vista Actual"
+
+#~ msgid "The currently selected address book view"
+#~ msgstr "A vista de livros de endereÃ§os actualmente seleccionada"
+
+#~ msgid "Previewed Contact"
+#~ msgstr "Contacto em AntevisÃ£o"
+
+#~ msgid "The contact being shown in the preview pane"
+#~ msgstr "O contacto que estÃ¡ a ser apresentado no painel de antevisÃ£o"
+
+#~ msgid "Preview is Visible"
+#~ msgstr "AntevisÃ£o estÃ¡ VisÃvel"
+
+#~ msgid "Whether the preview pane is visible"
+#~ msgstr "Se o painel de antevisÃ£o estÃ¡ ou nÃ£o visÃvel"
+
+#~ msgid "LDAP Servers"
+#~ msgstr "Servidores LDAP"
+
+#~ msgid "Autocompletion Settings"
+#~ msgstr "DefiniÃ§Ãµes de Completar Automaticamente"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution contact folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "A localizaÃ§Ã£o e hierarquia das pastas de contactos Evolution foi alterada "
+#~ "desde o Evolution 1.x.\n"
+#~ "\n"
+#~ "Aguarde enquanto o Evolution migra as suas pastas..."
+
+#~ msgid ""
+#~ "The format of mailing list contacts has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "O formato dos contactos de lista de distribuiÃ§Ã£o foi alterado.\n"
+#~ "\n"
+#~ "Aguarde enquanto o Evolution migra as suas pastas..."
+
+#~ msgid ""
+#~ "The way Evolution stores some phone numbers has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "A forma como o evolution armazena alguns nÃºmeros de telefone foi "
+#~ "alterada.\n"
+#~ "\n"
+#~ "Aguarde enquanto o Evolution migra as suas pastas..."
+
+#~ msgid ""
+#~ "Evolution's Palm Sync changelog and map files have changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your Pilot Sync data..."
+#~ msgstr ""
+#~ "O registo de alteraÃ§Ãµes Palm Sync e ficheiros de mapeamento do Evolution "
+#~ "foram alterados.\n"
+#~ "\n"
+#~ "Aguarde enquanto o Evolution migra os seus dados Pilot Sync..."
+
+#~ msgid "Source Selector Widget"
+#~ msgstr "Widget de SelecÃ§Ã£o de Origem"
+
+#~ msgid "This widget displays groups of address books"
+#~ msgstr "Este widget apresenta grupos de livros de endereÃ§os"
+
+#~ msgid "Save as vCard..."
+#~ msgstr "Gravar como um vCard..."
+
+#~ msgid "3268"
+#~ msgstr "3268"
+
+#~ msgid "389"
+#~ msgstr "389"
+
+#~ msgid "636"
+#~ msgstr "636"
+
+#~ msgid "The registry of calendars"
+#~ msgstr "O registo de calendÃ¡rios"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution calendar folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "A localizaÃ§Ã£o e hierarquia da pasta de calendÃ¡rios do Evolution foi "
+#~ "alterada desde o Evolution 1.x.\n"
+#~ "\n"
+#~ "Aguarde enquanto o Evolution migra as suas pastas..."
+
+#~ msgid "Unable to migrate old settings from evolution/config.xmldb"
+#~ msgstr ""
+#~ "Incapaz de migrar as configuraÃ§Ãµes antigas de evolution/config.xmldb"
+
+#~ msgid "Unable to migrate calendar `%s'"
+#~ msgstr "Incapaz de migrar o calendÃ¡rio `%s'"
+
+#~ msgid "Date Navigator Widget"
+#~ msgstr "Widget de NavegaÃ§Ã£o de Datas"
+
+#~ msgid "This widget displays a miniature calendar"
+#~ msgstr "Este widget apresenta um calendÃ¡rio em miniatura"
+
+#~ msgid "Default Calendar Client"
+#~ msgstr "Cliente de CalendÃ¡rio por OmissÃ£o"
+
+#~ msgid "Default client for calendar operations"
+#~ msgstr "Cliente por omissÃ£o para operaÃ§Ãµes de calendÃ¡rio"
+
+#~ msgid "This widget displays groups of calendars"
+#~ msgstr "Este widget apresenta grupos de calendÃ¡rios"
+
+#~ msgid "The registry of memo lists"
+#~ msgstr "O registo de listas de memos"
+
+#~ msgid "The memo table model"
+#~ msgstr "O modelo da tabela de memos"
+
+#~ msgid "Default Memo Client"
+#~ msgstr "Cliente de Memos por OmissÃ£o"
+
+#~ msgid "Default client for memo operations"
+#~ msgstr "Cliente por omissÃ£o para operaÃ§Ãµes sobre memos"
+
+#~ msgid "This widget displays groups of memo lists"
+#~ msgstr "Este widget apresenta grupos de listas de memos"
+
+#~ msgid "The registry of task lists"
+#~ msgstr "O registo de listas de tarefas"
+
+#~ msgid "The task table model"
+#~ msgstr "O modelo da tabela de tarefas"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution task folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "A localizaÃ§Ã£o e hierarquia da pasta de tarefas do Evolution foi alterada "
+#~ "desde o Evolution 1.x.\n"
+#~ "\n"
+#~ "Aguarde enquanto o Evolution migra as suas pastas..."
+
+#~ msgid "Unable to migrate tasks `%s'"
+#~ msgstr "Incapaz de migrar as tarefas `%s'"
+
+#~ msgid "Default Task Client"
+#~ msgstr "Cliente de Tarefas por OmissÃ£o"
+
+#~ msgid "Default client for task operations"
+#~ msgstr "Cliente por omissÃ£o para operaÃ§Ãµes sobre tarefas"
+
+#~ msgid "This widget displays groups of task lists"
+#~ msgstr "Este widget apresenta grupos de listas de tarefas"
+
+#~ msgid "Group by Threads"
+#~ msgstr "Agrupar Por Ã?rvores"
+
+#~ msgid "Whether to group messages by threads"
+#~ msgstr "Se agrupar ou nÃ£o as mensagens por Ã¡rvores"
+
+#~ msgid "Hide _Read Messages"
+#~ msgstr "Esconder as Mensagens _Lidas"
+
+#~ msgid "Temporarily hide all messages that have already been read"
+#~ msgstr "Esconder temporariamente todas as mensagens que jÃ¡ foram lidas"
+
+#~ msgid "Hide S_elected Messages"
+#~ msgstr "Esconder as Mensagens S_eleccionadas"
+
+#~ msgid "Temporarily hide the selected messages"
+#~ msgstr "Esconder temporariamente as mensagens seleccionadas"
+
+#~ msgid "Show Hidde_n Messages"
+#~ msgstr "Apresentar as Mensagens _Escondidas"
+
+#~ msgid "Show messages that have been temporarily hidden"
+#~ msgstr "Apresentar as mensagens que foram temporariamente escondidas"
+
+#~ msgid "Hide _Deleted Messages"
+#~ msgstr "Esconder as Mensagens _Apagadas"
+
+#~ msgid ""
+#~ "Hide deleted messages rather than displaying them with a line through them"
+#~ msgstr "Esconder as mensagens apagadas em vez de as apresentar riscadas"
+
+#~ msgid ""
+#~ "List of clues for the attachment reminder plugin to look for in a message "
+#~ "body."
+#~ msgstr ""
+#~ "Lista de pistas para o plugin de lembrete de anexos procurar no corpo da "
+#~ "mensagem."
+
+#~ msgid ""
+#~ "Evolution backup can start only when Evolution is not running. Please "
+#~ "make sure that you save and close all your unsaved windows before "
+#~ "proceeding.  If you want Evolution to restart automatically after backup, "
+#~ "please enable the toggle button."
+#~ msgstr ""
+#~ "A cÃ³pia de seguranÃ§a do Evolution apenas pode ser iniciada se o Evolution "
+#~ "nÃ£o se encontrar em execuÃ§Ã£o. Grave e feche todas as janelas por gravar "
+#~ "antes de prosseguir. Se desejar que o Evolution se reinicie "
+#~ "automaticamente apÃ³s terminada a cÃ³pia de seguranÃ§a, active o botÃ£o de "
+#~ "alternÃ¢ncia."
+
+#~ msgid ""
+#~ "This will delete all your current Evolution data and settings and restore "
+#~ "them from your backup. Evolution restore can start only when Evolution is "
+#~ "not running. Please make sure that you close all your unsaved windows "
+#~ "before you proceed. If you want Evolution to restart automatically "
+#~ "restart after restore, please enable the toggle button."
+#~ msgstr ""
+#~ "Isto irÃ¡ apagar todos os dados e definiÃ§Ãµes actuais do Evolution e "
+#~ "recuperÃ¡-las da cÃ³pia de seguranÃ§a. A recuperaÃ§Ã£o do Evolution apenas "
+#~ "pode ser iniciada quando o Evolution nÃ£o se encontrar em execuÃ§Ã£o. "
+#~ "Certifique-se de que fechar todas as janelas por gravar antes de "
+#~ "prosseguir. Se desejar que o Evolution se reinicie automaticamente apÃ³s a "
+#~ "recuperaÃ§Ã£o, active o botÃ£o de alternÃ¢ncia."
+
+#~ msgid "Check whether Evolution is the default mail client on startup."
+#~ msgstr ""
+#~ "Verificar ao arrancar se o Evolution Ã© a aplicaÃ§Ã£o de correio por omissÃ£o."
+
+#~ msgid "Default Mail Client"
+#~ msgstr "Cliente de Correio por OmissÃ£o"
+
+#~ msgid "<b>Server</b>"
+#~ msgstr "<b>Servidor</b>"
+
+#~ msgid "<b>Users:</b>"
+#~ msgstr "<b>Utilizadores:</b>"
+
+#~ msgid "<b>Account Name</b>"
+#~ msgstr "<b>Nome da Conta</b>"
+
+#~ msgid "Add Hula support to Evolution."
+#~ msgstr "Adicionar suporte Hula ao Evolution."
+
+#~ msgid "Hula Support"
+#~ msgstr "Suporte Hula"
+
+#~ msgid "_Accept"
+#~ msgstr "_Aceitar"
+
+#~ msgid "Blink icon in notification area."
+#~ msgstr "Piscar o Ãcone na Ã¡rea de notificaÃ§Ã£o."
+
+#~ msgid "Whether the icon should blink or not."
+#~ msgstr "Se o Ãcone deverÃ¡ ou nÃ£o piscar."
+
+#~ msgid "B_link icon in notification area"
+#~ msgstr "P_iscar o Ãcone na Ã¡rea de notificaÃ§Ã£o"
+
+#~ msgid "Guides you through your initial account setup."
+#~ msgstr "Guia-o atravÃ©s da configuraÃ§Ã£o inicial de conta."
+
+#~ msgid "Setup Assistant"
+#~ msgstr "Assistente de ConfiguraÃ§Ã£o"
+
+#~ msgid "Importing data."
+#~ msgstr "A importar os dados."
+
+#~ msgid "Please wait"
+#~ msgstr "Aguarde por favor"
+
+#~ msgid "%ld KB"
+#~ msgstr "%ld KB"
+
+#~ msgid "Toolbar Style"
+#~ msgstr "Estilo da Barra de Ferramentas"
+
+#~ msgid "The switcher's toolbar style"
+#~ msgstr "O estilo da barra de ferramentas do alternador"
+
+#~ msgid "Toolbar Visible"
+#~ msgstr "Barra de Ferramentas VisÃvel"
+
+#~ msgid "Whether the switcher is visible"
+#~ msgstr "Se o alternador deverÃ¡ ou nÃ£o estar visÃvel"
+
+#~ msgid "Switcher Action"
+#~ msgstr "AcÃ§Ã£o de Alternar"
+
+#~ msgid "The switcher action for this shell view"
+#~ msgstr "A acÃ§Ã£o de alternar para esta vista de consola"
+
+#~ msgid "Page Number"
+#~ msgstr "NÃºmero da PÃ¡gina"
+
+#~ msgid "The notebook page number of the shell view"
+#~ msgstr "O nÃºmero da pÃ¡gina do livro na vista de consola"
+
+#~ msgid "Search Rule"
+#~ msgstr "Regra de Procura"
+
+#~ msgid "Criteria for the current search results"
+#~ msgstr "CritÃ©rio dos resultados da procura actual"
+
+#~ msgid "The EShellBackend for this shell view"
+#~ msgstr "O EShellBackend desta vista de consola"
+
+#~ msgid "Shell Content Widget"
+#~ msgstr "Widget de ConteÃºdo de Consola"
+
+#~ msgid "The content widget appears in a shell window's right pane"
+#~ msgstr ""
+#~ "O widget de conteÃºdo surge no painel da direita da janela de consola"
+
+#~ msgid "Shell Sidebar Widget"
+#~ msgstr "Widget Lateral da Consola"
+
+#~ msgid "The sidebar widget appears in a shell window's left pane"
+#~ msgstr ""
+#~ "O widget lateral surge no painel da esquerda de uma janela de consola"
+
+#~ msgid "Shell Taskbar Widget"
+#~ msgstr "Widget de Barra de Tarefas de Consola"
+
+#~ msgid "The taskbar widget appears at the bottom of a shell window"
+#~ msgstr ""
+#~ "O widget de barra de tarefas surge no fundo de uma janela de consola"
+
+#~ msgid "Shell Window"
+#~ msgstr "Janela de Consola"
+
+#~ msgid "The window to which the shell view belongs"
+#~ msgstr "A janela Ã  qual pertence a vista de consola"
+
+#~ msgid "The key file holding widget state data"
+#~ msgstr "O ficheiro que armazena os dados de estado do widget"
+
+#~ msgid "The title of the shell view"
+#~ msgstr "O tÃtulo da vista de consola"
+
+#~ msgid "Current View ID"
+#~ msgstr "ID da Vista Actual"
+
+#~ msgid "The current GAL view ID"
+#~ msgstr "O ID GAL da vista actual"
+
+#~ msgid "GNOME Pilot is not installed."
+#~ msgstr "GNOME Pilot nÃ£o estÃ¡ instalado."
+
+#~ msgid "GNOME Pilot could not be run."
+#~ msgstr "Incapaz de executar o GNOME Pilot."
+
+#~ msgid "GNOME Pilot _Synchronization..."
+#~ msgstr "_SincronizaÃ§Ã£o com o GNOME Pilot..."
+
+#~ msgid "Set up GNOME Pilot configuration"
+#~ msgstr "Definir a configuraÃ§Ã£o do GNOME Pilot"
+
+#~ msgid "Active Shell View"
+#~ msgstr "Vista de Consola Activa"
+
+#~ msgid "Name of the active shell view"
+#~ msgstr "Nome da vista de consola activa"
+
+#~ msgid "The shell window's EFocusTracker"
+#~ msgstr "O EFocusTracker da janela de consola"
+
+#~ msgid "Geometry"
+#~ msgstr "Geometria"
+
+#~ msgid "Initial window geometry string"
+#~ msgstr "A expressÃ£o de geometria inicial da janela"
+
+#~ msgid "Safe Mode"
+#~ msgstr "Modo de SeguranÃ§a"
+
+#~ msgid "Whether the shell window is in safe mode"
+#~ msgstr "Se a janela de consola estÃ¡ ou nÃ£o em modo de seguranÃ§a"
+
+#~ msgid "Sidebar Visible"
+#~ msgstr "Barra Lateral VisÃvel"
+
+#~ msgid "Whether the shell window's side bar is visible"
+#~ msgstr "Se a barra lateral da janela de consola deverÃ¡ ou nÃ£o estar visÃvel"
+
+#~ msgid "Switcher Visible"
+#~ msgstr "Alternador VisÃvel"
+
+#~ msgid "Whether the shell window's switcher buttons are visible"
+#~ msgstr ""
+#~ "Se os botÃµes de alternar da janela de consola deverÃ£o ser ou nÃ£o visÃveis"
+
+#~ msgid "Taskbar Visible"
+#~ msgstr "Barra de Tarefas VisÃvel"
+
+#~ msgid "Whether the shell window's task bar is visible"
+#~ msgstr ""
+#~ "Se a barra de tarefas da janela de consola deverÃ¡ ou nÃ£o estar visÃvel"
+
+#~ msgid "Whether the shell window's tool bar is visible"
+#~ msgstr ""
+#~ "Se a barra de ferramentas da janela de consola deverÃ¡ ou nÃ£o estar visÃvel"
+
+#~ msgid "UI Manager"
+#~ msgstr "Gestor do Interface GrÃ¡fico"
+
+#~ msgid "The shell window's GtkUIManager"
+#~ msgstr "O GtkUIManager da janela de consola"
+
+#~ msgid "Module Directory"
+#~ msgstr "DirectÃ³rio de MÃ³dulos"
+
+#~ msgid "The directory from which to load EModules"
+#~ msgstr "O directÃ³rio de ondeler os EModules"
+
+#~ msgid "Network Available"
+#~ msgstr "Rede DisponÃvel"
+
+#~ msgid "Whether the network is available"
+#~ msgstr "Se a rede estÃ¡ ou nÃ£o disponÃvel"
+
+#~ msgid "Online"
+#~ msgstr "Ligado"
+
+#~ msgid "Whether the shell is online"
+#~ msgstr "Se a consola estÃ¡ ou nÃ£o ligada"
+
+#~ msgid "Forcibly re-migrate from Evolution 1.4"
+#~ msgstr ""
+#~ "ForÃ§ar uma nova actualizaÃ§Ã£o de ficheiros de configuraÃ§Ã£o do Evolution 1.4"
+
+#~ msgid "Insufficient disk space for upgrade."
+#~ msgstr "EspaÃ§o em disco insuficiente para a actualizaÃ§Ã£o."
+
+#~ msgid "Really delete old data?"
+#~ msgstr "Apagar mesmo os dados antigos?"
+
+#~ msgid ""
+#~ "The entire contents of the &quot;evolution&quot; directory are about to "
+#~ "be permanently removed.\n"
+#~ "\n"
+#~ "It is suggested you manually verify that all of your mail, contact, and "
+#~ "calendar data is present, and that this version of Evolution operates "
+#~ "correctly before deleting this old data.\n"
+#~ "\n"
+#~ "Once deleted, you cannot downgrade to the previous version of Evolution "
+#~ "without manual intervention.\n"
+#~ msgstr ""
+#~ "Todo o conteÃºdo do directÃ³rio &quot;evolution&quot; estÃ¡ prestes a ser "
+#~ "definitivamente removido.\n"
+#~ "\n"
+#~ "Sugere-se que verifique manualmente que todas as suas mensagens, "
+#~ "contactos e dados de calendÃ¡rio estÃ£o migrados e que esta versÃ£o do "
+#~ "Evolution funciona correctamente antes de apagar os dados antigos.\n"
+#~ "\n"
+#~ "Uma vez apagados, nÃ£o poderÃ¡ retroceder para uma versÃ£o anterior do "
+#~ "Evolution sem recorrer a intervenÃ§Ã£o manual.\n"
+
+#~ msgid ""
+#~ "The previous version of Evolution stored its data in a different "
+#~ "location.\n"
+#~ "\n"
+#~ "If you choose to remove this data, the entire contents of the &quot;"
+#~ "evolution&quot; directory will be removed permanently. If you choose to "
+#~ "keep this data, then you may manually remove the contents of &quot;"
+#~ "evolution&quot; at your convenience.\n"
+#~ msgstr ""
+#~ "A versÃ£o anterior do Evolution armazenava os seus dados numa localizaÃ§Ã£o "
+#~ "diferente.\n"
+#~ "\n"
+#~ "Se seleccionar remover estes dados, todo o conteÃºdo do directÃ³rio &quot;"
+#~ "evolution&quot; serÃ¡ removido definitivamente. Se decidir manter estes "
+#~ "dados, poderÃ¡ remover manualmente o conteÃºdo de &quot;evolution&quot; "
+#~ "quando o desejar.\n"
+
+#~ msgid ""
+#~ "Upgrading your data and settings will require up to {0} of disk space, "
+#~ "but you only have {1} available.\n"
+#~ "\n"
+#~ "You will need to make more space available in your home directory before "
+#~ "you can continue."
+#~ msgstr ""
+#~ "Actualizar os seus dados e definiÃ§Ãµes irÃ¡ requerer atÃ© {0} de espaÃ§o em "
+#~ "disco, mas apenas possui disponÃveis {1}.\n"
+#~ "\n"
+#~ "TerÃ¡ de disponibilizar mais espaÃ§o livre em disco na sua pasta pessoal "
+#~ "antes de poder prosseguir."
+
+#~ msgid "_Keep Data"
+#~ msgstr "_Manter os Dados"
+
+#~ msgid "_Remind Me Later"
+#~ msgstr "_Lembrar-me Mais Tarde"
+
+#~ msgid "Edit"
+#~ msgstr "Editar"
+
+#~ msgid "Import"
+#~ msgstr "Importar"
+
+#~ msgid "View"
+#~ msgstr "Ver"
+
+#~ msgid "Collection"
+#~ msgstr "ColecÃ§Ã£o"
+
+#~ msgid "Instance"
+#~ msgstr "InstÃ¢ncia"
+
+#~ msgid "Factory"
+#~ msgstr "FÃ¡brica"
+
+#~ msgid "Action"
+#~ msgstr "AcÃ§Ã£o"
+
+#~ msgid "A GtkRadioAction"
+#~ msgstr "Um GtkRadioAction"
+
+#~ msgid "Show _Attachment Bar"
+#~ msgstr "Apresentar a Barra de _Anexos"
+
+#~ msgid "Fill color"
+#~ msgstr "Cor de enchimento"
+
+#~ msgid "GDK fill color"
+#~ msgstr "Cor GDK de enchimento"
+
+#~ msgid "Fill stipple"
+#~ msgstr "Textura de enchimento"
+
+#~ msgid "X1"
+#~ msgstr "X1"
+
+#~ msgid "X2"
+#~ msgstr "X2"
+
+#~ msgid "Y1"
+#~ msgstr "Y1"
+
+#~ msgid "Y2"
+#~ msgstr "Y2"
+
+#~ msgid "Minimum width"
+#~ msgstr "Largura mÃnima"
+
+#~ msgid "Minimum Width"
+#~ msgstr "Largura MÃnima"
+
+#~ msgid "Spacing"
+#~ msgstr "EspaÃ§amento"
+
+#~ msgid "The button state is online"
+#~ msgstr "O estado do botÃ£o Ã© ligado"
+
+#~ msgid "Horizontal Position"
+#~ msgstr "PosiÃ§Ã£o Horizontal"
+
+#~ msgid "Pane position when oriented horizontally"
+#~ msgstr "PosiÃ§Ã£o do painel quando orientado horizontalmente"
+
+#~ msgid "Vertical Position"
+#~ msgstr "PosiÃ§Ã£o Vertical"
+
+#~ msgid "Pane position when oriented vertically"
+#~ msgstr "PosiÃ§Ã£o do painel quando orientado verticalmente"
+
+#~ msgid "Proportion"
+#~ msgstr "ProporÃ§Ã£o"
+
+#~ msgid "Proportion of the 2nd pane size"
+#~ msgstr "ProporÃ§Ã£o do tamanho do 2Âº painel"
+
+#~ msgid "Fixed Resize"
+#~ msgstr "Redimensionamento Fixo"
+
+#~ msgid "Keep the 2nd pane fixed during resize"
+#~ msgstr "Manter o 2Âº painel fixo durante o redimensionamento"
+
+#~ msgid "Sync with:"
+#~ msgstr "Sincronizar com:"
+
+#~ msgid "Sync Private Records:"
+#~ msgstr "Sincronizar os Registos Privados:"
+
+#~ msgid "Sync Categories:"
+#~ msgstr "Categorias de SincronizaÃ§Ã£o:"
+
+#~ msgid "Cursor Row"
+#~ msgstr "Linha de Cursor"
+
+#~ msgid "Cursor Column"
+#~ msgstr "Coluna de Cursor"
+
+#~ msgid "Sorter"
+#~ msgstr "Ordenador"
+
+#~ msgid "Selection Mode"
+#~ msgstr "Modo de SelecÃ§Ã£o"
+
+#~ msgid "Cursor Mode"
+#~ msgstr "Modo de Cursor"
+
+#~ msgid "Selected Column"
+#~ msgstr "Coluna Seleccionada"
+
+#~ msgid "Focused Column"
+#~ msgstr "Coluna com Foco"
+
+#~ msgid "Unselected Column"
+#~ msgstr "Coluna Des-seleccionada"
+
+#~ msgid "Strikeout Column"
+#~ msgstr "Coluna Riscada"
+
+#~ msgid "Underline Column"
+#~ msgstr "Sublinhar Coluna"
+
+#~ msgid "Bold Column"
+#~ msgstr "Coluna em Negrito"
+
+#~ msgid "Color Column"
+#~ msgstr "Coluna Colorida"
+
+#~ msgid "BG Color Column"
+#~ msgstr "Cor de Fundo da Coluna"
+
+#~ msgid "State"
+#~ msgstr "Estado"
+
+#~ msgid "Alternating Row Colors"
+#~ msgstr "Cores de Linhas Alternadas"
+
+#~ msgid "Horizontal Draw Grid"
+#~ msgstr "Grelha Desenhada Horizontalmente"
+
+#~ msgid "Vertical Draw Grid"
+#~ msgstr "Grelha Desenhada Verticalmente"
+
+#~ msgid "Draw focus"
+#~ msgstr "Desenhar foco"
+
+#~ msgid "Cursor mode"
+#~ msgstr "Modo do cursor"
+
+#~ msgid "Selection model"
+#~ msgstr "Modelo de selecÃ§Ã£o"
+
+#~ msgid "Length Threshold"
+#~ msgstr "TolerÃ¢ncia de Comprimento"
+
+#~ msgid "Uniform row height"
+#~ msgstr "Altura de linha uniforme"
+
+#~ msgid "Frozen"
+#~ msgstr "EstÃ¡tico"
+
+#~ msgid "Table header"
+#~ msgstr "CabeÃ§alho da tabela"
+
+#~ msgid "Table model"
+#~ msgstr "Modelo da tabela"
+
+#~ msgid "Cursor row"
+#~ msgstr "Linha do cursor"
+
+#~ msgid "Sort Info"
+#~ msgstr "Info de OrdenaÃ§Ã£o"
+
+#~ msgid "Always search"
+#~ msgstr "Procurar sempre"
+
+#~ msgid "Use click to add"
+#~ msgstr "Utilizar clique para adicionar"
+
+#~ msgid "Vertical Row Spacing"
+#~ msgstr "EspaÃ§amento Vertical da Linha"
+
+#~ msgid ""
+#~ "Vertical space between rows. It is added to top and to bottom of a row"
+#~ msgstr ""
+#~ "EspaÃ§amento vertical entre linhas. Ã? adicionado ao topo e fundo de uma "
+#~ "linha"
+
+#~ msgid "ETree table adapter"
+#~ msgstr "Adaptador de tabela ETree"
+
+#~ msgid "Retro Look"
+#~ msgstr "Aspecto Retro"
+
+#~ msgid "Draw lines and +/- expanders."
+#~ msgstr "Desenhar linhas e expansores +/-."
+
+#~ msgid "Expander Size"
+#~ msgstr "Tamanho do Expansor"
+
+#~ msgid "Size of the expander arrow"
+#~ msgstr "Tamanho da seta de expansÃ£o"
+
+#~ msgid "popup"
+#~ msgstr "popup"
+
+#~ msgid "edit"
+#~ msgstr "editar"
+
+#~ msgid "toggle"
+#~ msgstr "alternar"
+
+#~ msgid "expand"
+#~ msgstr "expandir"
+
+#~ msgid "Event Processor"
+#~ msgstr "Processador de Eventos"
+
+#~ msgid "Text"
+#~ msgstr "Texto"
+
+#~ msgid "Bold"
+#~ msgstr "Negrito"
+
+#~ msgid "Strikeout"
+#~ msgstr "Riscada"
+
+#~ msgid "Anchor"
+#~ msgstr "Ã?ncora"
+
+#~ msgid "Justification"
+#~ msgstr "Alinhamento"
+
+#~ msgid "Clip Width"
+#~ msgstr "Cortar Ã  Largura"
+
+#~ msgid "Clip Height"
+#~ msgstr "Cortar Ã  Altura"
+
+#~ msgid "Clip"
+#~ msgstr "Cortar"
+
+#~ msgid "Fill clip rectangle"
+#~ msgstr "Encher rectÃ¢ngulo de corte"
+
+#~ msgid "X Offset"
+#~ msgstr "Deslocamento X"
+
+#~ msgid "Y Offset"
+#~ msgstr "Deslocamento Y"
+
+#~ msgid "Text width"
+#~ msgstr "Largura do texto"
+
+#~ msgid "Text height"
+#~ msgstr "Altura do texto"
+
+#~ msgid "Use ellipsis"
+#~ msgstr "Utilizar reticÃªncias"
+
+#~ msgid "Ellipsis"
+#~ msgstr "ReticÃªncias"
+
+#~ msgid "Line wrap"
+#~ msgstr "Quebra linha"
+
+#~ msgid "Break characters"
+#~ msgstr "Caracteres de quebra"
+
+#~ msgid "Max lines"
+#~ msgstr "Linhas mÃ¡x."
+
+#~ msgid "Draw borders"
+#~ msgstr "Desenhar margens"
+
+#~ msgid "Allow newlines"
+#~ msgstr "Permitir novas linhas"
+
+#~ msgid "Draw background"
+#~ msgstr "Desenhar fundo"
+
+#~ msgid "Draw button"
+#~ msgstr "Desenhar botÃ£o"
+
+#~ msgid "Cursor position"
+#~ msgstr "PosiÃ§Ã£o do cursor"
+
+#~ msgid "IM Context"
+#~ msgstr "Contexto IM"
+
+#~ msgid "Handle Popup"
+#~ msgstr "ManÃpulo de Popup"
 
 #~ msgid "Error loading address book."
 #~ msgstr "Erro ao ler o livro de endereÃ§os."
@@ -23162,13 +23632,6 @@ msgstr "ManÃpulo de Popup"
 #~ msgid "Save Message..."
 #~ msgstr "Gravar a Mensagem..."
 
-#~ msgid ""
-#~ "It disables/enables the repeated prompts to ask if offline sync is "
-#~ "required before going into offline mode."
-#~ msgstr ""
-#~ "Desactiva/activa a funcionalidade onde perguntas consecutivas inquirem se "
-#~ "Ã© necessÃ¡ria a sincronizaÃ§Ã£o para desligado antes de desligar."
-
 #~ msgid "Prompt to check if the user wants to go offline immediately"
 #~ msgstr ""
 #~ "Perguntar ao utilizador se deseja entrar imediatamente em modo desligado"
@@ -23998,9 +24461,6 @@ msgstr "ManÃpulo de Popup"
 #~ msgid "Please restart Evolution for changes to take effect"
 #~ msgstr "Reinicie o Evolution para que as alteraÃ§Ãµes tenham efeito"
 
-#~ msgid "Please select a user."
-#~ msgstr "Seleccione outro utilizador."
-
 #~ msgid "Server rejected password because it is too weak."
 #~ msgstr "O servidor rejeitou a senha por ser demasiado simples."
 
@@ -24849,9 +25309,6 @@ msgstr "ManÃpulo de Popup"
 #~ msgid "Click OK to close these connections and go offline"
 #~ msgstr "Clique OK para fechar estas ligaÃ§Ãµes e ficar desligado"
 
-#~ msgid "_Import"
-#~ msgstr "_Importar"
-
 #~ msgid "The GNOME Pilot tools do not appear to be installed on this system."
 #~ msgstr ""
 #~ "Parece que as ferramentas GNOME Pilot nÃ£o estÃ£o instaladas neste sistema."
@@ -24881,9 +25338,6 @@ msgstr "ManÃpulo de Popup"
 #~ msgid "New Test"
 #~ msgstr "Novo Teste"
 
-#~ msgid "Cannot start Evolution"
-#~ msgstr "Incapaz de reiniciar o Evolution"
-
 #~ msgid "Evolution can not start."
 #~ msgstr "Incapaz de iniciar o Evolution."
 
@@ -25936,9 +26390,6 @@ msgstr "ManÃpulo de Popup"
 #~ msgid "Orientation"
 #~ msgstr "OrientaÃ§Ã£o"
 
-#~ msgid "Page"
-#~ msgstr "PÃ¡gina"
-
 #~ msgid "Page Setup:"
 #~ msgstr "ConfiguraÃ§Ã£o da PÃ¡gina:"
 
@@ -26588,9 +27039,6 @@ msgstr "ManÃpulo de Popup"
 #~ "foi utilizado. Como precauÃ§Ã£o, todos os paineis de antevisÃ£o serÃ£o\n"
 #~ "escondidas. Pode repÃ´-los a partir do menu Ver.\n"
 
-#~ msgid "_Do not show this message again"
-#~ msgstr "_NÃ£o apresentar esta mensagem novamente"
-
 #~ msgid "Permission Denied."
 #~ msgstr "AutorizaÃ§Ã£o Negada."
 
@@ -27017,9 +27465,6 @@ msgstr "ManÃpulo de Popup"
 #~ msgid "Calendar Group"
 #~ msgstr "Grupo de CalendÃ¡rio"
 
-#~ msgid "Calendar Name"
-#~ msgstr "Nome do CalendÃ¡rio"
-
 #~ msgid "<b>Task List Options</b>"
 #~ msgstr "<b>OpÃ§Ãµes da Lista de Tarefas</b>"
 
@@ -27393,9 +27838,6 @@ msgstr "ManÃpulo de Popup"
 #~ msgid "_Subscribe"
 #~ msgstr "_Subscrever"
 
-#~ msgid "Mark all messages as read in the selected folder"
-#~ msgstr "Marcar todas as mensagens como lidas na pasta seleccionada"
-
 #~ msgid ""
 #~ "The message was sent via the &quot;sendmail&quot; external application. "
 #~ "Sendmail reports the following error: status 67: mail not sent.\n"
@@ -27627,9 +28069,6 @@ msgstr "ManÃpulo de Popup"
 #~ msgid "T_erminal Font:"
 #~ msgstr "Fonte de _Consola:"
 
-#~ msgid "_Show animated images"
-#~ msgstr "Apre_sentar as imagens animadas"
-
 #~ msgid "Server: %s, Type: %s"
 #~ msgstr "Servidor: %s, Tipo: %s"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]