Updated Portuguese translation.

2006-03-10 Duarte Loreto <happyguy_pt@hotmail.com> * pt.po: Updated Portuguese translation. svn path=/trunk/; revision=31688
author: Duarte Loreto <happyguy_pt@hotmail.com> 2006-03-11 07:39:22 +0800
committer: Duarte Loreto <dnloreto@src.gnome.org> 2006-03-11 07:39:22 +0800
commit: 20708e895aba6a2644dd4dd6bc9a285c514e967d (patch)
tree: ce75d487a92f24d7a24f938283695b272dc33cee /po/pt.po
parent: f88138b2223058c78954346fe1cb711ed63badfc (diff)
download: gsoc2013-evolution-20708e895aba6a2644dd4dd6bc9a285c514e967d.tar.gz
gsoc2013-evolution-20708e895aba6a2644dd4dd6bc9a285c514e967d.tar.zst
gsoc2013-evolution-20708e895aba6a2644dd4dd6bc9a285c514e967d.zip
1 files changed, 5522 insertions, 4022 deletions
diff --git a/po/pt.po b/po/pt.po
index 6d8d4d2749..b45c5cb65c 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,15 +1,15 @@
 # Evolution's Portuguese translation.
-# Copyright © 2000, 2002, 2003, 2004, 2005 evolution
+# Copyright © 2000, 2002, 2003, 2004, 2005, 2006 evolution
 # Distributed under the same licence as the evolution package.
-# Duarte Loreto <happyguy_pt@hotmail.com>, 2002, 2003, 2004, 2005.
+# Duarte Loreto <happyguy_pt@hotmail.com>, 2002, 2003, 2004, 2005, 2006.
 # Tiago Antão <tiagoantao@bigfoot.com>, 2000.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.12\n"
+"Project-Id-Version: 2.14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-11 17:30+0200\n"
-"PO-Revision-Date: 2005-08-30 20:30+0000\n"
+"POT-Creation-Date: 2006-03-10 23:24+0000\n"
+"PO-Revision-Date: 2006-03-10 23:30+0000\n"
 "Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
 "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -24,12 +24,12 @@ msgid "evolution addressbook"
 msgstr "livro de endereços evolution"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:225
+#: ../addressbook/gui/component/addressbook-component.c:226
 msgid "New Contact"
 msgstr "Novo Contacto"
 
 #: ../a11y/addressbook/ea-minicard-view.c:35
-#: ../addressbook/gui/component/addressbook-component.c:233
+#: ../addressbook/gui/component/addressbook-component.c:234
 msgid "New Contact List"
 msgstr "Nova Lista de Contactos"
 
@@ -41,8 +41,7 @@ msgstr[0] "pasta do livro de endereços actual tem %d cartão"
 msgstr[1] "pasta do livro de endereços actual tem %d cartões"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../calendar/gui/alarm-notify/alarm-queue.c:953
-#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-message-composer.xml.h:12
 msgid "Open"
 msgstr "Abrir"
 
@@ -87,23 +86,23 @@ msgstr "evento de vista de calendário"
 msgid "Grab Focus"
 msgstr "Obter o Foco"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "New Appointment"
 msgstr "Novo Compromisso"
 
-#: ../a11y/calendar/ea-cal-view.c:307
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "New All Day Event"
 msgstr "Novo Evento de Dia Completo"
 
-#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1505
+#: ../a11y/calendar/ea-cal-view.c:304
 msgid "New Meeting"
 msgstr "Nova Reunião"
 
-#: ../a11y/calendar/ea-cal-view.c:309
+#: ../a11y/calendar/ea-cal-view.c:305
 msgid "Go to Today"
 msgstr "Ir para Hoje"
 
-#: ../a11y/calendar/ea-cal-view.c:310
+#: ../a11y/calendar/ea-cal-view.c:306
 msgid "Go to Date"
 msgstr "Ir para uma Data"
 
@@ -112,37 +111,37 @@ 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"
 
-#: ../a11y/calendar/ea-day-view.c:146 ../a11y/calendar/ea-week-view.c:148
+#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:151
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "Possui %d evento."
 msgstr[1] "Possui %d eventos."
 
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:153
 msgid "It has no events."
 msgstr "Não possui qualquer evento."
 
-#: ../a11y/calendar/ea-day-view.c:152
+#: ../a11y/calendar/ea-day-view.c:155
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Vista de Semana de Trabalho: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:155
+#: ../a11y/calendar/ea-day-view.c:158
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Vista de Dia: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:186
+#: ../a11y/calendar/ea-day-view.c:189
 msgid "calendar view for a work week"
 msgstr "vista de calendário para uma semana de trabalho"
 
-#: ../a11y/calendar/ea-day-view.c:188
+#: ../a11y/calendar/ea-day-view.c:191
 msgid "calendar view for one or more days"
 msgstr "vista de calendário para um ou mais dias"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:187
-#: ../calendar/gui/calendar-component.c:660
+#: ../calendar/gui/calendar-component.c:661
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -153,8 +152,8 @@ msgstr "%A %d %b %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:190
-#: ../calendar/gui/calendar-component.c:663
-#: ../calendar/gui/e-day-view-top-item.c:719 ../calendar/gui/e-day-view.c:1510
+#: ../calendar/gui/calendar-component.c:664
+#: ../calendar/gui/e-day-view-top-item.c:711 ../calendar/gui/e-day-view.c:1503
 #: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -162,9 +161,9 @@ msgstr "%a %d %b"
 #: ../a11y/calendar/ea-gnome-calendar.c:192
 #: ../a11y/calendar/ea-gnome-calendar.c:197
 #: ../a11y/calendar/ea-gnome-calendar.c:199
-#: ../calendar/gui/calendar-component.c:665
-#: ../calendar/gui/calendar-component.c:670
-#: ../calendar/gui/calendar-component.c:672
+#: ../calendar/gui/calendar-component.c:666
+#: ../calendar/gui/calendar-component.c:671
+#: ../calendar/gui/calendar-component.c:673
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -172,10 +171,10 @@ msgstr "%a %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:222
 #: ../a11y/calendar/ea-gnome-calendar.c:228
 #: ../a11y/calendar/ea-gnome-calendar.c:230
-#: ../calendar/gui/calendar-component.c:684
-#: ../calendar/gui/calendar-component.c:691
-#: ../calendar/gui/calendar-component.c:697
-#: ../calendar/gui/calendar-component.c:699
+#: ../calendar/gui/calendar-component.c:685
+#: ../calendar/gui/calendar-component.c:692
+#: ../calendar/gui/calendar-component.c:698
+#: ../calendar/gui/calendar-component.c:700
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -185,15 +184,15 @@ msgstr "%d %b %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:220
-#: ../calendar/gui/calendar-component.c:689
-#: ../calendar/gui/e-day-view-top-item.c:723 ../calendar/gui/e-day-view.c:1526
+#: ../calendar/gui/calendar-component.c:690
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1519
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:247
 #: ../a11y/calendar/ea-gnome-calendar.c:255
-#: ../calendar/importers/icalendar-importer.c:738
+#: ../calendar/importers/icalendar-importer.c:772
 msgid "Gnome Calendar"
 msgstr "Calendário Gnome"
 
@@ -213,21 +212,21 @@ msgstr "Botão de ir para"
 msgid "Click here, you can find more events."
 msgstr "Clique aqui, pode encontrar mais eventos."
 
-#: ../a11y/calendar/ea-week-view.c:155
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Vista de Mês: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:159
+#: ../a11y/calendar/ea-week-view.c:162
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Vista de Semana: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:190
+#: ../a11y/calendar/ea-week-view.c:193
 msgid "calendar view for a month"
 msgstr "vista de calendário para um mês"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:195
 msgid "calendar view for one or more weeks"
 msgstr "vista de calendário para uma ou mais semanas"
 
@@ -279,7 +278,7 @@ msgstr "Célula de Tabela"
 
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c:575
+#: ../widgets/table/e-table-click-to-add.c:574
 msgid "click to add"
 msgstr "clique para adicionar"
 
@@ -356,48 +355,61 @@ msgid "Could not remove addressbook."
 msgstr "Incapaz de remover o livro de endereços."
 
 #: ../addressbook/addressbook.error.xml.h:8
+msgid ""
+"Currently you can access only GroupWise System Address Book from Evolution. "
+"Please use some other GroupWise mail client once, to get your GroupWise "
+"Frequent Contacts and Groupwise Personal Contacts folders."
+msgstr ""
+"Actualmente apenas pode aceder através do Evolution a Livros de Endereços do "
+"Sistema Groupwise. Utilize uma vez um qualquer outro cliente de email "
+"Groupwise para criar as suas pastas de Contactos Frequentes e Pessoais."
+
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Delete address book '{0}'?"
 msgstr "Apagar o livro de endereços '{0}'?"
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:10
 msgid "Error loading addressbook."
 msgstr "Erro ao ler o livro de endereços."
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:11
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Erro ao gravar {0} para {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Failed to authenticate with LDAP server."
 msgstr "Falha ao autenticar-se no servidor LDAP."
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:13
+msgid "GroupWise Address book creation:"
+msgstr "Criação de Livro de Endereços Groupwise:"
+
+#: ../addressbook/addressbook.error.xml.h:14
 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:13
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "Server Version"
 msgstr "Versão do Servidor"
 
-#: ../addressbook/addressbook.error.xml.h:14
-#: ../calendar/calendar.error.xml.h:44
+#: ../addressbook/addressbook.error.xml.h:16
 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:15
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "O livro de endereços do Evolution terminou inesperadamente."
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:18
 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:17
+#: ../addressbook/addressbook.error.xml.h:19
 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 "
@@ -407,21 +419,21 @@ 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:18
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "This address book will be removed permanently."
 msgstr "Este livro de endereços será definitivamente removido."
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:21
 msgid "This addressbook could not be opened."
 msgstr "Incapaz de abrir este livro de endereços."
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "This addressbook 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:21
+#: ../addressbook/addressbook.error.xml.h:23
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -429,27 +441,27 @@ 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:22
+#: ../addressbook/addressbook.error.xml.h:24
 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:23
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "Unable to open addressbook"
 msgstr "Incapaz de abrir o livro de endereços"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "Unable to perform search."
 msgstr "Incapaz de efectuar a procura."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "Unable to save {0}."
 msgstr "Incapaz de gravar {0}."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "Would you like to save your changes?"
 msgstr "Deseja gravar as suas alterações?"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:29
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -457,8 +469,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:28
-#: ../calendar/calendar.error.xml.h:59
+#: ../addressbook/addressbook.error.xml.h:30
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -468,50 +479,50 @@ 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:29
+#: ../addressbook/addressbook.error.xml.h:31
 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:30
+#: ../addressbook/addressbook.error.xml.h:32
 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:31 ../mail/em-vfolder-rule.c:494
+#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:496
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
 msgid "_Add"
 msgstr "_Adicionar"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:35
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "{0}"
 msgstr "{0}"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:36
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:300
 msgid "Default Sync Address:"
 msgstr "Endereço de Sincronização Por Omissão:"
 
-#: ../addressbook/conduit/address-conduit.c:1183
-#: ../addressbook/conduit/address-conduit.c:1184
+#: ../addressbook/conduit/address-conduit.c:1241
+#: ../addressbook/conduit/address-conduit.c:1242
 msgid "Could not load addressbook"
 msgstr "Incapaz de ler o livro de endereços"
 
-#: ../addressbook/conduit/address-conduit.c:1252
-#: ../addressbook/conduit/address-conduit.c:1255
+#: ../addressbook/conduit/address-conduit.c:1310
+#: ../addressbook/conduit/address-conduit.c:1313
 msgid "Could not read pilot's Address application block"
 msgstr "Incapaz de ler o bloco da aplicação de Endereços da pilot"
 
@@ -533,29 +544,30 @@ msgstr "Configurar aqui o completar automaticamente"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1133
-#: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:388
+#: ../addressbook/gui/component/addressbook-view.c:1334
+#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
+#: ../plugins/exchange-operations/exchange-folder.c:585
 msgid "Contacts"
 msgstr "Contactos"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook"
+msgid "Evolution Address Book"
 msgstr "Livro de Endereços Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr "Popup de endereços do Livro de Endereços Evolution"
+msgid "Evolution Address Book address pop-up"
+msgstr "Popup de endereço do Livro de Endereços Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
-msgstr "Visualizador de endereços do Livro de Endereços Evolution"
+msgid "Evolution Address Book address viewer"
+msgstr "Visualizador de endereço do Livro de Endereços Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
-msgstr "Visualizador de cartões do Livro de Endereços Evolution"
+msgid "Evolution Address Book card viewer"
+msgstr "Visualizador de cartão do Livro de Endereços Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
+msgid "Evolution Address Book component"
 msgstr "Componente de Livro de Endereços Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
@@ -572,12 +584,14 @@ msgstr "Efectue aqui a gestão dos seus certificados S/MIME"
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:137
-#: ../addressbook/gui/component/addressbook-migrate.c:502
-#: ../calendar/gui/calendar-component.c:208 ../calendar/gui/migration.c:462
-#: ../calendar/gui/migration.c:555 ../calendar/gui/tasks-component.c:188
-#: ../mail/em-folder-tree-model.c:197 ../mail/em-folder-tree-model.c:199
-#: ../mail/mail-component.c:292 ../mail/mail-vfolder.c:223
+#: ../addressbook/gui/component/addressbook-component.c:141
+#: ../addressbook/gui/component/addressbook-migrate.c:483
+#: ../calendar/gui/calendar-component.c:209
+#: ../calendar/gui/memos-component.c:194 ../calendar/gui/migration.c:474
+#: ../calendar/gui/migration.c:567 ../calendar/gui/migration.c:1075
+#: ../calendar/gui/tasks-component.c:190 ../mail/em-folder-tree-model.c:199
+#: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:299
+#: ../mail/mail-vfolder.c:223
 msgid "On This Computer"
 msgstr "Neste Computador"
 
@@ -586,132 +600,135 @@ msgstr "Neste Computador"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:145
-#: ../addressbook/gui/component/addressbook-migrate.c:510
+#: ../addressbook/gui/component/addressbook-component.c:149
+#: ../addressbook/gui/component/addressbook-migrate.c:491
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../calendar/gui/calendar-component.c:216 ../calendar/gui/migration.c:470
-#: ../calendar/gui/migration.c:563 ../calendar/gui/tasks-component.c:196
-#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1043
-#: ../mail/mail-config.c:78 ../mail/mail-config.glade.h:104
+#: ../calendar/gui/calendar-component.c:217
+#: ../calendar/gui/memos-component.c:202 ../calendar/gui/migration.c:482
+#: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
+#: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "Pessoal"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:155
-#: ../addressbook/gui/component/addressbook-migrate.c:520
+#: ../addressbook/gui/component/addressbook-component.c:159
+#: ../addressbook/gui/component/addressbook-migrate.c:501
 msgid "On LDAP Servers"
 msgstr "Em Servidores LDAP"
 
-#: ../addressbook/gui/component/addressbook-component.c:226
+#: ../addressbook/gui/component/addressbook-component.c:227
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: ../addressbook/gui/component/addressbook-component.c:227
+#: ../addressbook/gui/component/addressbook-component.c:228
 msgid "Create a new contact"
 msgstr "Criar um novo contacto"
 
-#: ../addressbook/gui/component/addressbook-component.c:234
+#: ../addressbook/gui/component/addressbook-component.c:235
 msgid "Contact _List"
 msgstr "_Lista de Contactos"
 
-#: ../addressbook/gui/component/addressbook-component.c:235
+#: ../addressbook/gui/component/addressbook-component.c:236
 msgid "Create a new contact list"
 msgstr "Criar uma nova lista de contactos"
 
-#: ../addressbook/gui/component/addressbook-component.c:241
-#: ../addressbook/gui/component/addressbook-config.c:1118
-#: ../addressbook/gui/component/addressbook-view.c:763
+#: ../addressbook/gui/component/addressbook-component.c:242
+#: ../addressbook/gui/component/addressbook-config.c:1202
 msgid "New Address Book"
 msgstr "Novo Livro de Endereços"
 
-#: ../addressbook/gui/component/addressbook-component.c:242
+#: ../addressbook/gui/component/addressbook-component.c:243
 msgid "Address _Book"
 msgstr "Livro de _Endereços"
 
-#: ../addressbook/gui/component/addressbook-component.c:243
+#: ../addressbook/gui/component/addressbook-component.c:244
 msgid "Create a new address book"
 msgstr "Criar um novo livro de endereços"
 
-#: ../addressbook/gui/component/addressbook-component.c:385
-msgid "Failed upgrading Addressbook settings or folders."
-msgstr "Falha ao actualizar as pastas ou definições de Livro de Endereços."
+#: ../addressbook/gui/component/addressbook-component.c:406
+msgid "Failed upgrading Address Book settings or folders."
+msgstr "Falha ao actualizar as pastas ou definições do Livro de Endereços."
 
-#: ../addressbook/gui/component/addressbook-config.c:313
+#: ../addressbook/gui/component/addressbook-config.c:329
 msgid "Base"
 msgstr "Base"
 
-#: ../addressbook/gui/component/addressbook-config.c:508
+#: ../addressbook/gui/component/addressbook-config.c:530
 #: ../calendar/gui/dialogs/calendar-setup.c:192
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../addressbook/gui/component/addressbook-config.c:607
+#: ../addressbook/gui/component/addressbook-config.c:632
 msgid "Copy book content locally for offline operation"
 msgstr "Copiar o conteúdo do livro localmente para trabalhar em modo desligado"
 
-#: ../addressbook/gui/component/addressbook-config.c:902
-#: ../addressbook/gui/component/ldap-config.glade.h:23
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/calendar-setup.c:366
-#: ../calendar/gui/dialogs/calendar-setup.c:377
-#: ../mail/em-folder-properties.c:215 ../mail/mail-config.glade.h:85
+#: ../addressbook/gui/component/addressbook-config.c:981
+#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../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:222 ../mail/mail-config.glade.h:86
+#: ../plugins/itip-formatter/itip-formatter.c:1978
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Geral"
 
-#: ../addressbook/gui/component/addressbook-config.c:903
-#: ../mail/importers/pine-importer.c:393
-msgid "Addressbook"
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:563
+#: ../mail/importers/pine-importer.c:392
+msgid "Address Book"
 msgstr "Livro de Endereços"
 
-#: ../addressbook/gui/component/addressbook-config.c:907
+#: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
 msgstr "Informação de Servidor"
 
-#: ../addressbook/gui/component/addressbook-config.c:909
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
 msgstr "Autenticação"
 
-#: ../addressbook/gui/component/addressbook-config.c:912
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 #: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detalhes"
 
-#: ../addressbook/gui/component/addressbook-config.c:913
+#: ../addressbook/gui/component/addressbook-config.c:992
 msgid "Searching"
 msgstr "A procurar"
 
-#: ../addressbook/gui/component/addressbook-config.c:915
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Downloading"
 msgstr "A Efectuar Download"
 
-#: ../addressbook/gui/component/addressbook-config.c:1116
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../addressbook/gui/component/addressbook-config.c:1200
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "Propriedades do Livro de Endereços"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:72
-#: ../calendar/gui/migration.c:142 ../mail/em-migrate.c:1190
+#: ../addressbook/gui/component/addressbook-migrate.c:73
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
 msgid "Migrating..."
 msgstr "A migrar..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:124
-#: ../calendar/gui/migration.c:189 ../mail/em-migrate.c:1231
+#: ../addressbook/gui/component/addressbook-migrate.c:125
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "A migrar `%s':"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:648
+#: ../addressbook/gui/component/addressbook-migrate.c:629
 msgid "LDAP Servers"
 msgstr "Servidores LDAP"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:763
+#: ../addressbook/gui/component/addressbook-migrate.c:744
 msgid "Autocompletion Settings"
 msgstr "Definições de Completar Automaticamente"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1134
+#: ../addressbook/gui/component/addressbook-migrate.c:1119
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -723,7 +740,7 @@ msgstr ""
 "\n"
 "Aguarde enquanto o Evolution migra as suas pastas..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1148
+#: ../addressbook/gui/component/addressbook-migrate.c:1133
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -733,7 +750,7 @@ msgstr ""
 "\n"
 "Aguarde enquanto o Evolution migra as suas pastas..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1157
+#: ../addressbook/gui/component/addressbook-migrate.c:1142
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -743,7 +760,7 @@ msgstr ""
 "\n"
 "Aguarde enquanto o Evolution migra as suas pastas..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1167
+#: ../addressbook/gui/component/addressbook-migrate.c:1152
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -754,22 +771,54 @@ msgstr ""
 "\n"
 "Aguarde enquanto o Evolution migra os seus dados Pilot Sync..."
 
-#: ../addressbook/gui/component/addressbook-view.c:764
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
-#: ../calendar/gui/calendar-component.c:537
-#: ../calendar/gui/tasks-component.c:441 ../mail/em-filter-i18n.h:11
-#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:26 ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Apagar"
+#: ../addressbook/gui/component/addressbook-view.c:434
+#: ../mail/em-folder-utils.c:503
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Renomear a pasta \"%s\" para:"
+
+#: ../addressbook/gui/component/addressbook-view.c:437
+#: ../mail/em-folder-utils.c:505
+msgid "Rename Folder"
+msgstr "Renomear a Pasta"
+
+#: ../addressbook/gui/component/addressbook-view.c:442
+#: ../mail/em-folder-utils.c:511
+msgid "Folder names cannot contain '/'"
+msgstr "Nomes de pastas não podem conter '/'"
+
+#: ../addressbook/gui/component/addressbook-view.c:445
+msgid "A Folder with this name already exists"
+msgstr "Já existe uma Pasta com este nome"
 
-#: ../addressbook/gui/component/addressbook-view.c:766
+#: ../addressbook/gui/component/addressbook-view.c:953
+msgid "_New Address Book"
+msgstr "_Novo Livro de Endereços"
+
+#. FIXME: need to disable for undeletable folders
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
 #: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/tasks-component.c:442
-msgid "Properties..."
-msgstr "Propriedades..."
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:49
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:30
+#: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
+msgid "_Delete"
+msgstr "Apa_gar"
 
-#: ../addressbook/gui/component/addressbook-view.c:1144
+#: ../addressbook/gui/component/addressbook-view.c:956
+msgid "Save As Vcard..."
+msgstr "Gravar como um VCard..."
+
+#: ../addressbook/gui/component/addressbook-view.c:958
+#: ../calendar/gui/calendar-component.c:539
+#: ../calendar/gui/tasks-component.c:444
+msgid "_Properties..."
+msgstr "_Propriedades..."
+
+#: ../addressbook/gui/component/addressbook-view.c:1345
 msgid "Contact Source Selector"
 msgstr "Selector de Origem do Contacto"
 
@@ -777,13 +826,13 @@ msgstr "Selector de Origem do Contacto"
 msgid "Accessing LDAP Server anonymously"
 msgstr "A aceder anonimamente ao Servidor LDAP"
 
-#: ../addressbook/gui/component/addressbook.c:191
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:485
+#: ../addressbook/gui/component/addressbook.c:197
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
 msgid "Failed to authenticate.\n"
 msgstr "Falha ao autenticar-se.\n"
 
-#: ../addressbook/gui/component/addressbook.c:198
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:464
+#: ../addressbook/gui/component/addressbook.c:204
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Introduza a senha para %s (utilizador %s)"
@@ -829,7 +878,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "URI da última pasta utilizada no diálogo de selecção de nomes."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "Posição vertical do painel"
 
@@ -838,168 +887,184 @@ msgid "Whether to show the preview pane."
 msgstr "Se apresentar ou não o painel de antevisão."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:1
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-#: ../calendar/gui/dialogs/event-page.glade.h:1
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../mail/message-tags.glade.h:1
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
-#: ../plugins/groupwise-features/properties.glade.h:1
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "*"
-msgstr "*"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr "1"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:3
+#: ../addressbook/gui/component/ldap-config.glade.h:2
 msgid "3268"
 msgstr "3268"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:3
 msgid "389"
 msgstr "389"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:5
+#: ../addressbook/gui/component/ldap-config.glade.h:4
 msgid "5"
 msgstr "5"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:6
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "636"
 msgstr "636"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:7
+#: ../addressbook/gui/component/ldap-config.glade.h:6
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Autenticação</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:8
+#: ../addressbook/gui/component/ldap-config.glade.h:7
 msgid "<b>Display</b>"
 msgstr "<b>Apresentação</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Downloading</b>"
 msgstr "<b>A Efectuar Download</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Searching</b>"
 msgstr "<b>A Procurar</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Server Information</b>"
 msgstr "<b>Informação de Servidor</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Type:</b>"
 msgstr "<b>Tipo:</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/ldap-config.glade.h:12
 msgid "Add Address Book"
 msgstr "Adicionar Livro de Endereços"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:759
+#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../mail/em-account-editor.c:777
 msgid "Always"
 msgstr "Sempre"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 msgid "Anonymously"
 msgstr "Anonimamente"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Basic"
 msgstr "Básico"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Distinguished name"
 msgstr "Nome distinto"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Email address"
 msgstr "Endereço de email"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution irá utilizar este endereço de email para o autenticar no servidor."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
 msgstr "Procurar Possíveis Bases de Procura"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 msgid "Lo_gin:"
 msgstr "_Sessão:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:758
+#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../mail/em-account-editor.c:776
 msgid "Never"
 msgstr "Nunca"
 
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. It will not use an encrypted connection.
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:304
+msgid "No encryption"
+msgstr "Sem encriptação"
+
 #: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "Um"
 
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
+#. abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../mail/em-account-editor.c:312
+msgid "SSL encryption"
+msgstr "Encriptação SSL"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:28
+msgid "Search Filter"
+msgstr "Filtro de Procura"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search _base:"
 msgstr "_Base da procura:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:30
+msgid "Search _filter:"
+msgstr "_Filtro de procura:"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:31
+msgid "Search filter"
+msgstr "Filtro de procura"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:32
+msgid ""
+"Search filter is the type of the objects searched for, while performing the "
+"search. If this is not modified, by  default search will be performed on "
+"objectclass of the type \"person\"."
+msgstr ""
+"Filtro de procura são os tipos de objectos procurados, durante a pesquisa. "
+"Se não for alterado, por omissão a procura será realizada sobre classes de "
+"objecto do tipo \"person\" (pessoa)."
+
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL."
 msgstr ""
 "Seleccionar esta opção significa que o Evolution apenas se ligará ao seu "
-"servidor LDAP se este suportar SSL ou TLS."
+"servidor LDAP se este suportar SSL."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
-"Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a insecure environment. For example, if you and your LDAP server "
-"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
-"because your connection is already secure."
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
 msgstr ""
-"Seleccionar esta opção significa que o Evolution apenas tentará utilizar SSL/"
-"TLS se você estiver num ambiente inseguro. Por exemplo, se o seu computador "
-"e o servidor LDAP estiverem por trás de uma firewall no emprego, o Evolution "
-"não necessita de utilizar SSL/TLS pois a sua ligação já é segura."
+"Seleccionar esta opção significa que o Evolution apenas se ligará ao seu "
+"servidor LDAP se este suportar TLS."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits. "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
 msgstr ""
 "Seleccionar esta opção significa que o seu servidor não suporta nem SSL nem "
-"TLS.  Isto significa que a sua ligação será insegura e que estará vulnerável "
-"a abusos de segurança. "
+"TLS. Isto significa que a sua ligação será insegura e que estará vulnerável "
+"a abusos de segurança."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
 msgstr "Sub"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "Supported Search Bases"
 msgstr "Bases de Procura Suportadas"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../mail/em-account-editor.c:308
+msgid "TLS encryption"
+msgstr "Encriptação TLS"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
-"The search base is the distinguished name (DN)  of the entry where your "
+"The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
 "root of the directory tree."
 msgstr ""
@@ -1007,7 +1072,7 @@ msgstr ""
 "irão começar. Se vazio, as procuras iniciar-se-ão na raiz da árvore de "
 "directório."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 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 "
@@ -1019,7 +1084,7 @@ msgstr ""
 "abaixo da sua base de procura. Um âmbito de procura \"um\" incluirá apenas "
 "as entradas um nível abaixo da sua base."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -1027,7 +1092,7 @@ msgstr ""
 "Este é o nome completo do seu servidor ldap. Por exemplo, \"ldap."
 "minhaempresa.pt\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1035,7 +1100,7 @@ msgstr ""
 "Este é o número máximo de entradas a efectuar download. Definir um número "
 "demasiado grande irá tornar o seu livro de endereços mais lento."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1045,7 +1110,7 @@ msgstr ""
 "configurar este parâmetro para \"Endereço de Email\" requer acesso anónimo "
 "ao seu servidor ldap."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1053,7 +1118,7 @@ msgstr ""
 "Este é o nome deste servidor que será apresentado na sua lista de pasta "
 "Evolution. O seu propósito é apenas de visualização. "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 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 "
@@ -1063,78 +1128,101 @@ msgstr ""
 "apresentada uma lista de portos standard. Pergunte ao administrador do seu "
 "sistema que porto deverá seleccionar."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
 msgstr "Utilizar o nome distinto (ND)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "Using email address"
 msgstr "Utilizar o endereço de email"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
-#: ../mail/em-account-editor.c:301
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "Whenever Possible"
 msgstr "Sempre Que Possível"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Add Address Book"
 msgstr "_Adicionar Livro de Endereços"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Download limit:"
 msgstr "Limite de _download:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Find Possible Search Bases"
 msgstr "Procurar Possíveis _Bases de Procura"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Login method:"
 msgstr "_Método de autenticação:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
-#: ../calendar/gui/dialogs/calendar-setup.c:244
+#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../calendar/gui/dialogs/calendar-setup.c:245
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:8
 #: ../mail/mail-config.glade.h:164
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_Porto:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Search scope:"
 msgstr "Â_mbito da procura:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:56
 #: ../mail/mail-config.glade.h:171
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "_Timeout:"
 msgstr "Limite de e_xpiração:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "_Utilizar uma ligação segura:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "cartões"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1951
-#: ../plugins/calendar-http/calendar-http.c:263
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
+#: ../mail/em-account-editor.c:2021
+#: ../plugins/calendar-http/calendar-http.c:286
 #: ../plugins/calendar-weather/calendar-weather.c:563
 msgid "minutes"
 msgstr "minutos"
 
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../mail/message-tags.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:1
+msgid "*"
+msgstr "*"
+
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>Email</b>"
@@ -1172,23 +1260,23 @@ msgid "<b>Work</b>"
 msgstr "<b>Emprego</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
 #: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:274
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: ../addressbook/gui/widgets/e-minicard.c:182
 msgid "Contact"
 msgstr "Contacto"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:525
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:540
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2353
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:566
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2402
 msgid "Contact Editor"
 msgstr "Editor de Contactos"
 
@@ -1201,7 +1289,7 @@ msgid "Image"
 msgstr "Imagem"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
@@ -1214,7 +1302,7 @@ msgid "Ni_ckname:"
 msgstr "Al_cunha:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
@@ -1228,10 +1316,10 @@ msgstr "Telefone"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:235
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1042
-#: ../mail/mail-config.c:77 ../mail/mail-config.glade.h:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
+#: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "Emprego"
 
@@ -1253,11 +1341,13 @@ msgid "_Birthday:"
 msgstr "_Data de Nascimento:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../plugins/itip-formatter/itip-view.c:1662
+#: ../plugins/itip-formatter/itip-view.c:1652
 msgid "_Calendar:"
 msgstr "_Calendário:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
 msgid "_Categories"
 msgstr "_Categorias"
 
@@ -1345,17 +1435,17 @@ msgstr "_Onde:"
 msgid "_Zip/Postal Code:"
 msgstr "Código _Postal:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
 #: ../addressbook/gui/widgets/eab-contact-display.c:367
 #: ../addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "Endereço"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:302
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
 #: ../addressbook/gui/widgets/e-addressbook-model.c:310
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
@@ -1363,1088 +1453,1088 @@ msgstr "Endereço"
 #: ../addressbook/gui/widgets/e-minicard-view.c:520
 #: ../addressbook/gui/widgets/e-minicard.c:175
 #: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1768 ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3584
-#: ../widgets/text/e-text.c:3585
+#: ../widgets/table/e-cell-text.c:1777 ../widgets/text/e-entry.c:1312
+#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
+#: ../widgets/text/e-text.c:3608
 msgid "Editable"
 msgstr "Editável"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "United States"
 msgstr "Estados Unidos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Afghanistan"
 msgstr "Afganistão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Albania"
 msgstr "Albânia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Algeria"
 msgstr "Algéria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "American Samoa"
 msgstr "Samoa Americana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Andorra"
 msgstr "Andorra"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Angola"
 msgstr "Angola"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Antarctica"
 msgstr "Antárctida"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Antigua And Barbuda"
 msgstr "Antígua e Barbuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Argentina"
 msgstr "Argentina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Armenia"
 msgstr "Arménia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Aruba"
 msgstr "Aruba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Australia"
 msgstr "Austrália"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Austria"
 msgstr "Áustria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Azerbaijan"
 msgstr "Azerbeijão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bahrain"
 msgstr "Baraín"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Barbados"
 msgstr "Barbados"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Belarus"
 msgstr "Bielorrússia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Belgium"
 msgstr "Bélgica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Belize"
 msgstr "Belize"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Benin"
 msgstr "Benin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bermuda"
 msgstr "Bermudas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bhutan"
 msgstr "Butão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Bolivia"
 msgstr "Bolívia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bosnia And Herzegowina"
 msgstr "Bósnia e Herzegowina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Botswana"
 msgstr "Bostwana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Bouvet Island"
 msgstr "Ilha Bouvet"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "British Indian Ocean Territory"
 msgstr "Território Britânico no Oceano Índico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Bulgaria"
 msgstr "Bulgária"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Burundi"
 msgstr "Burundi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Cambodia"
 msgstr "Cambodja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cameroon"
 msgstr "Camarões"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Canada"
 msgstr "Canadá"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cape Verde"
 msgstr "Cabo Verde"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cayman Islands"
 msgstr "Ilhas Caimão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Central African Republic"
 msgstr "República Centro-Africana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Chad"
 msgstr "Chade"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Chile"
 msgstr "Chile"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "China"
 msgstr "China"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Christmas Island"
 msgstr "Ilha do Natal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cocos (Keeling) Islands"
 msgstr "Ilhas Cocos (Keeling)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Colombia"
 msgstr "Colômbia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Comoros"
 msgstr "Comoros"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Congo"
 msgstr "Congo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Congo, República Democrática do"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cook Islands"
 msgstr "Ilhas Cook"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Cote d'Ivoire"
 msgstr "Costa do Marfim"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Croatia"
 msgstr "Croácia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Cuba"
 msgstr "Cuba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Cyprus"
 msgstr "Chipre"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Czech Republic"
 msgstr "República Checa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Denmark"
 msgstr "Dinamarca"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Dominica"
 msgstr "Dominica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Dominican Republic"
 msgstr "República Dominicana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ecuador"
 msgstr "Equador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Egypt"
 msgstr "Egipto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Equatorial Guinea"
 msgstr "Guiné Equatorial"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Eritrea"
 msgstr "Eritreia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Estonia"
 msgstr "Estónia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Ethiopia"
 msgstr "Etiópia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Falkland Islands"
 msgstr "Ilhas Malvinas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Faroe Islands"
 msgstr "Ilhas Faraoe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Fiji"
 msgstr "Fiji"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Finland"
 msgstr "Finlândia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "France"
 msgstr "França"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Guiana"
 msgstr "Guiana Francesa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Polynesia"
 msgstr "Polinésia Francesa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "French Southern Territories"
 msgstr "Territórios Sul Franceses"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gabon"
 msgstr "Gabão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Gambia"
 msgstr "Gâmbia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Georgia"
 msgstr "Geórgia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Germany"
 msgstr "Alemanha"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Ghana"
 msgstr "Ghana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greece"
 msgstr "Grécia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Greenland"
 msgstr "Greenland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Grenada"
 msgstr "Granada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guadeloupe"
 msgstr "Guadaloupe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guam"
 msgstr "Guam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guinea"
 msgstr "Guiné"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Guinea-bissau"
 msgstr "Guiné-bissau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Guyana"
 msgstr "Guiana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Haiti"
 msgstr "Haiti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Heard And McDonald Islands"
 msgstr "Ilhas Heard e McDonald"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Holy See"
 msgstr "Mar Santo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Hungary"
 msgstr "Hungria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Iceland"
 msgstr "Islândia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "India"
 msgstr "Índia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Indonesia"
 msgstr "Indonésia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Iran"
 msgstr "Irão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Iraq"
 msgstr "Iraque"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Ireland"
 msgstr "Irlanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Isle of Man"
 msgstr "Ilha de Man"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Israel"
 msgstr "Israel"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Italy"
 msgstr "Itália"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Japan"
 msgstr "Japão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Jersey"
 msgstr "Jersey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Jordan"
 msgstr "Jordão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kazakhstan"
 msgstr "Casaquistão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kenya"
 msgstr "Quénia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Coreia, República Popular Democrática da"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Korea, Republic Of"
 msgstr "Coreia, República da"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Kyrgyzstan"
 msgstr "Kyrgyzstão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Laos"
 msgstr "Laos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Latvia"
 msgstr "Letónia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lebanon"
 msgstr "Líbano"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Lesotho"
 msgstr "Lesoto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Liberia"
 msgstr "Libéria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Libya"
 msgstr "Líbia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Lithuania"
 msgstr "Lituânia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Luxembourg"
 msgstr "Luxemburgo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Macao"
 msgstr "Macau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Macedonia"
 msgstr "Macedónia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Malawi"
 msgstr "Malawi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Malaysia"
 msgstr "Malásia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Maldives"
 msgstr "Maldivas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mali"
 msgstr "Mali"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Malta"
 msgstr "Malta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Marshall Islands"
 msgstr "Ilhas Marshall"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Martinique"
 msgstr "Martinica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Mauritania"
 msgstr "Mauritânia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mauritius"
 msgstr "Maurícias"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Mexico"
 msgstr "México"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Micronesia"
 msgstr "Micronésia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Moldova, Republic Of"
 msgstr "Moldávia, República da"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Monaco"
 msgstr "Mónaco"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Mongolia"
 msgstr "Mongólia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Morocco"
 msgstr "Marrocos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Mozambique"
 msgstr "Moçambique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Namibia"
 msgstr "Namíbia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nauru"
 msgstr "Nauru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nepal"
 msgstr "Nepal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Netherlands"
 msgstr "Holanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Netherlands Antilles"
 msgstr "Antilhas Holandesas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "New Caledonia"
 msgstr "Nova Caledónia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "New Zealand"
 msgstr "Nova Zelândia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Nicaragua"
 msgstr "Niquerágua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Niger"
 msgstr "Niger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Nigeria"
 msgstr "Negéria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Niue"
 msgstr "Niue"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Norfolk Island"
 msgstr "Ilha Norfolk"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Northern Mariana Islands"
 msgstr "Ilhas Marianas do Norte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Norway"
 msgstr "Noruéga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Oman"
 msgstr "Oman"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Pakistan"
 msgstr "Paquistão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Palau"
 msgstr "Palau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Palestinian Territory"
 msgstr "Território Palestiniano"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Panama"
 msgstr "Panamá"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Papua New Guinea"
 msgstr "Papua Nova-Guiné"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Paraguay"
 msgstr "Paraguai"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Peru"
 msgstr "Perú"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Philippines"
 msgstr "Filipinas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Poland"
 msgstr "Polónia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Puerto Rico"
 msgstr "Porto Rico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Qatar"
 msgstr "Quatar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Reunion"
 msgstr "Reunião"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Romania"
 msgstr "Roménia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Russian Federation"
 msgstr "Federação Russa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saint Kitts And Nevis"
 msgstr "São Kitts e Nevis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saint Lucia"
 msgstr "Santa Lucia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Saint Vincent And The Grenadines"
 msgstr "São Vicente e as Grenadines"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Samoa"
 msgstr "Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "San Marino"
 msgstr "São Marino"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sao Tome And Principe"
 msgstr "São Tomé e Príncipe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Saudi Arabia"
 msgstr "Arábia Saudita"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Senegal"
 msgstr "Senegal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Serbia And Montenegro"
 msgstr "Sérvia e Montenegro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Seychelles"
 msgstr "Seicheles"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Sierra Leone"
 msgstr "Serra Leoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Singapore"
 msgstr "Singapura"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Slovakia"
 msgstr "Eslováquia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Slovenia"
 msgstr "Eslovénia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Solomon Islands"
 msgstr "Ilhas Salomão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Somalia"
 msgstr "Somália"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "South Africa"
 msgstr "África do Sul"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Geórgia Sul e as Ilhas Sandwich Sul"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Spain"
 msgstr "Espanha"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "St. Helena"
 msgstr "Santa Helena"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "St. Pierre And Miquelon"
 msgstr "São Pierre e Miquelon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Sudan"
 msgstr "Sudão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Suriname"
 msgstr "Suriname"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Ilhas Svalbard e Jan Mayen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Swaziland"
 msgstr "Suazilândia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Sweden"
 msgstr "Suécia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Switzerland"
 msgstr "Suiça"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Syria"
 msgstr "Síria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Taiwan"
 msgstr "Ilha Formosa (Taiwan)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tajikistan"
 msgstr "Tajiquistão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tanzania, United Republic Of"
 msgstr "Tanzânia, República Unida da"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Thailand"
 msgstr "Tailândia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Timor-Leste"
 msgstr "Timor-Leste"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Togo"
 msgstr "Togo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Tonga"
 msgstr "Tonga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Trinidad And Tobago"
 msgstr "Trinidad e Tobago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Tunisia"
 msgstr "Tunísia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Turkey"
 msgstr "Turquia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Turkmenistan"
 msgstr "Turquemenistão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Turks And Caicos Islands"
 msgstr "Ilhas Turks e Caicos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uganda"
 msgstr "Uganda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Ukraine"
 msgstr "Ucrânia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "United Arab Emirates"
 msgstr "Emirados Árabes Unidos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "United Kingdom"
 msgstr "Reino Unido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "United States Minor Outlying Islands"
 msgstr "Ilhas Menores Destacadas dos Estados Unidos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Uruguay"
 msgstr "Uruguai"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Uzbekistan"
 msgstr "Uzbequistão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Viet Nam"
 msgstr "Vietname"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Virgin Islands, British"
 msgstr "Ilhas Virgens Britânicas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Virgin Islands, U.S."
 msgstr "Ilhas Virgens dos E.U.A"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
 msgid "Wallis And Futuna Islands"
 msgstr "Ilhas Wallis e Futuna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
 msgid "Western Sahara"
 msgstr "Saará Ocidental"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
 msgid "Yemen"
 msgstr "Yemen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
 msgid "Zambia"
 msgstr "Zâmbia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
 msgid "Zimbabwe"
 msgstr "Zimbabué"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-#: ../plugins/exchange-operations/exchange-delegates.c:936
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:717
-#: ../plugins/plugin-manager/plugin-manager.c:44
-#: ../plugins/save-attachments/save-attachments.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
+#: ../plugins/exchange-operations/exchange-delegates.c:934
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
+#: ../plugins/plugin-manager/plugin-manager.c:42
+#: ../plugins/save-attachments/save-attachments.c:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "Nome"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "Yahoo Messenger"
 msgstr "Yahoo Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
 #: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:119
 msgid "Service"
 msgstr "Serviço"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:587
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "Localização"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
 msgid "Username"
 msgstr "Utilizador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:231
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
 msgid "Home"
 msgstr "Casa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:239
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
 msgid "Other"
 msgstr "Outro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
 #: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:260
 msgid "Source Book"
 msgstr "Livro de Origem"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:267
 msgid "Target Book"
 msgstr "Livro de Destino"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:281
 msgid "Is New Contact"
 msgstr "É um Novo Contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:288
 msgid "Writable Fields"
 msgstr "Campos Editáveis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:295
 msgid "Required Fields"
 msgstr "Campos Requeridos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:309
 msgid "Changed"
 msgstr "Alterado"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:535
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2348
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:561
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2397
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de Contactos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2661
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2775
 msgid "Please select an image for this contact"
 msgstr "Seleccione uma imagem para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2662
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2776
 msgid "No image"
 msgstr "Sem imagem"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2941
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3060
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2452,36 +2542,40 @@ msgstr ""
 "Os dados do contacto são inválidos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2993
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
 msgid "Invalid contact."
 msgstr "Contacto inválido."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:277
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:291
 msgid "Contact Quick-Add"
 msgstr "Adição Rápida de Contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:280
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "_Edit Full"
 msgstr "_Edição Completa"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:306
-msgid "_Full name:"
-msgstr "Nome comp_leto:"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
+msgid "_Full name"
+msgstr "Nome comp_leto"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
+msgid "E-_mail"
+msgstr "E-_mail"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:316
-msgid "E-_mail:"
-msgstr "E-_mail:"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:357
+msgid "_Select Address Book"
+msgstr "_Seleccione o Livro de Endereços"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:323
+#: ../addressbook/gui/contact-editor/eab-editor.c:322
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s) ?"
+"to delete contact list (%s)?"
 msgstr ""
 "Tem a certeza de que deseja\n"
-"apagar a lista de contactos (%s) ?"
+"apagar a lista de contactos (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:326
+#: ../addressbook/gui/contact-editor/eab-editor.c:325
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2489,16 +2583,16 @@ msgstr ""
 "Tem a certeza de que deseja\n"
 "apagar estas listas de contactos?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:331
+#: ../addressbook/gui/contact-editor/eab-editor.c:330
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s) ?"
+"to delete contact (%s)?"
 msgstr ""
 "Tem a certeza de que deseja\n"
-"apagar este contacto (%s) ?"
+"apagar este contacto (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:334
+#: ../addressbook/gui/contact-editor/eab-editor.c:333
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2605,8 +2699,8 @@ msgstr "Serviço de _IM:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:215
-#: ../plugins/exchange-operations/exchange-contacts.c:193
+#: ../plugins/exchange-operations/exchange-calendar.c:239
+#: ../plugins/exchange-operations/exchange-contacts.c:228
 msgid "_Location:"
 msgstr "_Localização:"
 
@@ -2619,7 +2713,7 @@ msgid "Add an email to the List"
 msgstr "Adicionar um email à Lista"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:834
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
 msgid "Contact List Editor"
 msgstr "Editor de Lista de Contactos"
 
@@ -2652,7 +2746,7 @@ 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:162
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
 #: ../addressbook/gui/widgets/e-addressbook-view.c:223
@@ -2661,15 +2755,15 @@ msgstr ""
 msgid "Book"
 msgstr "Livro"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
 msgid "Is New List"
 msgstr "É uma Nova Lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:707
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
 msgid "_Members"
 msgstr "_Membros"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:710
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
 msgid "Contact List Members"
 msgstr "Membros da Lista de Contacto"
 
@@ -2710,11 +2804,28 @@ msgstr ""
 "O nome ou endereço de email deste contacto já existe nesta\n"
 "pasta.  Ainda assim deseja adicioná-lo?"
 
-#. FIXME: get the toplevel window...
-#: ../addressbook/gui/search/e-addressbook-search-dialog.c:160
-#: ../widgets/misc/e-filter-bar.c:156
-msgid "Advanced Search"
-msgstr "Procura Avançada"
+#. We attach subitems below
+#: ../addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:53
+msgid "Any field contains"
+msgstr "Qualquer campo contém"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:50
+msgid "Category is"
+msgstr "Categoria é"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.c:170
+msgid "Email begins with"
+msgstr "Email começa por"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:4
+#: ../addressbook/gui/widgets/e-addressbook-view.c:169
+msgid "Name begins with"
+msgstr "Nome começa por"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
@@ -2740,12 +2851,12 @@ msgid "Error getting book view"
 msgstr "Erro ao obter a vista de livro"
 
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../widgets/table/e-table-click-to-add.c:503
+#: ../widgets/table/e-table-click-to-add.c:502
 #: ../widgets/table/e-table-selection-model.c:311
-#: ../widgets/table/e-table.c:3344
+#: ../widgets/table/e-table.c:3329
 #: ../widgets/table/e-tree-selection-model.c:825
 #: ../widgets/text/e-entry.c:1235 ../widgets/text/e-entry.c:1236
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
+#: ../widgets/text/e-text.c:3471 ../widgets/text/e-text.c:3472
 msgid "Model"
 msgstr "Modelo"
 
@@ -2753,30 +2864,6 @@ msgstr "Modelo"
 msgid "Error modifying card"
 msgstr "Erro ao alterar o cartão"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:169
-msgid "Name begins with"
-msgstr "Nome começa por"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:170
-msgid "Email begins with"
-msgstr "Email começa por"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-#: ../calendar/gui/cal-search-bar.c:53
-msgid "Category is"
-msgstr "Categoria é"
-
-#. We attach subitems below
-#: ../addressbook/gui/widgets/e-addressbook-view.c:172
-#: ../calendar/gui/cal-search-bar.c:48
-msgid "Any field contains"
-msgstr "Qualquer campo contém"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:173
-#: ../addressbook/gui/widgets/e-addressbook-view.c:178
-msgid "Advanced..."
-msgstr "Avançado..."
-
 #: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr "Origem"
@@ -2784,96 +2871,101 @@ msgstr "Origem"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:370
+#: ../calendar/gui/e-meeting-list-view.c:486
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Tipo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:544
-msgid "Address Book"
-msgstr "Livro de Endereços"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:807
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2011
-#: ../ui/evolution-addressbook.xml.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.c:834
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2067
+#: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "Gravar como um VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:930
-#: ../calendar/gui/e-calendar-table.c:1154
-#: ../calendar/gui/e-calendar-view.c:1528 ../ui/evolution-addressbook.xml.h:37
+#: ../addressbook/gui/widgets/e-addressbook-view.c:957
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
+#: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Abrir"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:932
-msgid "New Contact..."
-msgstr "Novo Contacto..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+msgid "_New Contact..."
+msgstr "_Novo Contacto..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
-msgid "New Contact List..."
-msgstr "Nova Lista de Contactos..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
+msgid "New Contact _List..."
+msgstr "Nova _Lista de Contactos..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
-#: ../ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "Reenviar Contacto"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+msgid "_Save as VCard..."
+msgstr "_Gravar como VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
-msgid "Forward Contacts"
-msgstr "Reenviar Contactos"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+msgid "_Forward Contact"
+msgstr "_Reenviar Contacto"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
-msgid "Send Message to Contact"
-msgstr "Enviar Mensagem para o Contacto"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+msgid "_Forward Contacts"
+msgstr "_Reenviar Contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
-msgid "Send Message to List"
-msgstr "Enviar Mensagem para a Lista"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+msgid "Send _Message to Contact"
+msgstr "Enviar _Mensagem para o Contacto"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
-msgid "Send Message to Contacts"
-msgstr "Enviar Mensagem para os Contactos"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+msgid "Send _Message to List"
+msgstr "Enviar _Mensagem para a Lista"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2501
-#: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "Imprimir"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+msgid "Send _Message to Contacts"
+msgstr "Enviar _Mensagem para os Contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
-msgid "Copy to Address Book..."
-msgstr "Copiar para o Livro de Endereços..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
+msgid "_Print"
+msgstr "_Imprimir"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
-msgid "Move to Address Book..."
-msgstr "Mover para o Livro de Endereços..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+msgid "Cop_y to Address Book..."
+msgstr "C_opiar para o Livro de Endereços..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
-#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Cortar"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
+msgid "Mo_ve to Address Book..."
+msgstr "Mo_ver para o Livro de Endereços..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
-#: ../calendar/gui/calendar-component.c:536
-#: ../calendar/gui/tasks-component.c:440 ../ui/evolution-addressbook.xml.h:2
-#: ../ui/evolution-mail-message.xml.h:12 ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Copiar"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
+#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
+msgid "Cu_t"
+msgstr "Cor_tar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
-#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Colar"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../calendar/gui/calendar-component.c:537
+#: ../calendar/gui/dialogs/comp-editor.c:445
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
+#: ../mail/message-list.c:1724 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:13
+#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
+msgid "_Copy"
+msgstr "_Copiar"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
+msgid "P_aste"
+msgstr "Col_ar"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1562
-#: ../calendar/gui/cal-search-bar.c:346
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1601
+#: ../calendar/gui/cal-search-bar.c:343
 msgid "Any Category"
 msgstr "Qualquer Categoria"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1761
+#. FIXME: Allow range selection in table views, as in minicard view
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1802
 msgid "Print cards"
 msgstr "Imprimir cartões"
 
@@ -2906,9 +2998,10 @@ msgid "Car Phone"
 msgstr "Telefone do Carro"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/task-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.glade.h:8
 #: ../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
 msgid "Categories"
 msgstr "Categorias"
 
@@ -2917,18 +3010,16 @@ msgid "Company Phone"
 msgstr "Telefone da Empresa"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:564
-#: ../smime/lib/e-cert.c:826
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
+#: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "Email"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-popup-control.c:441
 msgid "Email 2"
 msgstr "Email 2"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: ../addressbook/gui/widgets/eab-popup-control.c:451
 msgid "Email 3"
 msgstr "Email 3"
 
@@ -3013,9 +3104,9 @@ msgstr "Rádio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:378
+#: ../calendar/gui/e-meeting-list-view.c:497
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
 msgid "Role"
 msgstr "Cargo"
 
@@ -3052,31 +3143,31 @@ msgstr "Página Web"
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:138
 #: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1437 ../widgets/misc/e-reflow.c:1438
-#: ../widgets/table/e-table-click-to-add.c:517
+#: ../widgets/misc/e-reflow.c:1436 ../widgets/misc/e-reflow.c:1437
+#: ../widgets/table/e-table-click-to-add.c:516
 #: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:667
-#: ../widgets/table/e-table-group-container.c:971
-#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-field-chooser-item.c:656
+#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-container.c:968
 #: ../widgets/table/e-table-group-leaf.c:629
 #: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3012 ../widgets/table/e-table-item.c:3013
-#: ../widgets/text/e-text.c:3626 ../widgets/text/e-text.c:3627
+#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3650
 msgid "Width"
 msgstr "Largura"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:145
 #: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1445 ../widgets/misc/e-reflow.c:1446
-#: ../widgets/table/e-table-click-to-add.c:524
-#: ../widgets/table/e-table-field-chooser-item.c:674
-#: ../widgets/table/e-table-group-container.c:964
-#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/misc/e-reflow.c:1444 ../widgets/misc/e-reflow.c:1445
+#: ../widgets/table/e-table-click-to-add.c:523
+#: ../widgets/table/e-table-field-chooser-item.c:663
+#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-container.c:961
 #: ../widgets/table/e-table-group-leaf.c:622
 #: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
-#: ../widgets/text/e-text.c:3634 ../widgets/text/e-text.c:3635
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
+#: ../widgets/text/e-text.c:3657 ../widgets/text/e-text.c:3658
 msgid "Height"
 msgstr "Altura"
 
@@ -3211,7 +3302,7 @@ msgid "WWW"
 msgstr "WWW"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:378
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
 msgid "Blog"
 msgstr "Blog"
 
@@ -3219,116 +3310,116 @@ msgstr "Blog"
 msgid "personal"
 msgstr "pessoal"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "Título do Cargo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "Página pessoal"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
 msgstr "Sucesso"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Backend busy"
 msgstr "Módulo de suporte ocupado"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:52
+#: ../addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Repository offline"
 msgstr "Repositório desligado"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:54
 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:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
 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:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "Permission denied"
 msgstr "Autorização negada"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Contact not found"
 msgstr "Contacto não foi encontrado"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Contact ID already exists"
 msgstr "ID de contacto já existe"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Protocol not supported"
 msgstr "Protocolo não é suportado"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:232
-#: ../calendar/gui/e-cal-model-tasks.c:348
-#: ../calendar/gui/e-cal-model-tasks.c:661
-#: ../calendar/gui/e-calendar-table.c:456 ../calendar/gui/print.c:2364
-msgid "Cancelled"
+#: ../calendar/gui/e-cal-component-preview.c:234
+#: ../calendar/gui/e-cal-model-tasks.c:349
+#: ../calendar/gui/e-cal-model-tasks.c:657
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2372
+msgid "Canceled"
 msgstr "Cancelado"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Could not cancel"
 msgstr "Incapaz de cancelar"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-#: ../calendar/gui/comp-editor-factory.c:438
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../calendar/gui/comp-editor-factory.c:433
 msgid "Authentication Failed"
 msgstr "Autenticação Falhou"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
 msgid "Authentication Required"
 msgstr "Autenticação Requerida"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 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:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "No such source"
 msgstr "Origem inexistente"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Not available in offline mode"
 msgstr "Indisponível em modo desligado"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Other error"
 msgstr "Outro erro"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "Invalid server version"
 msgstr "Versão do servidor inválida"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:93
+#: ../addressbook/gui/widgets/eab-gui-util.c:94
 msgid ""
 "We were unable to open this addressbook. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3339,7 +3430,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:102
+#: ../addressbook/gui/widgets/eab-gui-util.c:103
 #, c-format
 msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
@@ -3348,7 +3439,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:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:112
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3356,7 +3447,7 @@ msgstr ""
 "Incapaz de abrir este livro de endereços.  Isto significa que ou introduziu "
 "um URI incorrecto ou o servir LDAP está inacessível."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:115
+#: ../addressbook/gui/widgets/eab-gui-util.c:117
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3366,7 +3457,7 @@ msgstr ""
 "deseja utilizar LDAP no Evolution terá de instalar um pacote do Evolution "
 "com o LDAP activo."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:122
+#: ../addressbook/gui/widgets/eab-gui-util.c:124
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -3374,7 +3465,7 @@ msgstr ""
 "Incapaz de abrir este livro de endereços.  Isto ou significa que 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:147
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3386,7 +3477,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:151
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -3398,47 +3489,47 @@ msgstr ""
 "forma mais específica ou aumente o limite de tempo nas preferências do\n"
 "servidor de directório para este livro de endereços."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:157
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "O suporte para este livro de endereços foi incapaz de parsear a consulta."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
+#: ../addressbook/gui/widgets/eab-gui-util.c:162
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 "O suporte para este livro de endereços recusou-se a efectuar esta consulta."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:163
+#: ../addressbook/gui/widgets/eab-gui-util.c:165
 msgid "This query did not complete successfully."
 msgstr "Esta consulta não terminou com sucesso."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:185
+#: ../addressbook/gui/widgets/eab-gui-util.c:187
 msgid "Error adding list"
 msgstr "Erro ao adicionar a lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:185
-#: ../addressbook/gui/widgets/eab-gui-util.c:693
+#: ../addressbook/gui/widgets/eab-gui-util.c:187
+#: ../addressbook/gui/widgets/eab-gui-util.c:695
 msgid "Error adding contact"
 msgstr "Erro ao adicionar o contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:196
+#: ../addressbook/gui/widgets/eab-gui-util.c:198
 msgid "Error modifying list"
 msgstr "Erro ao alterar a lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:196
+#: ../addressbook/gui/widgets/eab-gui-util.c:198
 msgid "Error modifying contact"
 msgstr "Erro ao alterar o contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:210
 msgid "Error removing list"
 msgstr "Erro ao remover a lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
-#: ../addressbook/gui/widgets/eab-gui-util.c:648
+#: ../addressbook/gui/widgets/eab-gui-util.c:210
+#: ../addressbook/gui/widgets/eab-gui-util.c:650
 msgid "Error removing contact"
 msgstr "Erro ao remover o contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:290
+#: ../addressbook/gui/widgets/eab-gui-util.c:292
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3453,7 +3544,7 @@ msgstr[1] ""
 "Abrir %d contactos irá abrir %d novas janelas.\n"
 "Deseja mesmo visualizar todos estes contactos?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:319
+#: ../addressbook/gui/widgets/eab-gui-util.c:321
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3462,93 +3553,72 @@ msgstr ""
 "%s já existe\n"
 "Deseja sobrepo-lo?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:323
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "Overwrite"
 msgstr "Sobrepor"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:368
-#: ../addressbook/gui/widgets/eab-gui-util.c:371
+#: ../addressbook/gui/widgets/eab-gui-util.c:370
+#: ../addressbook/gui/widgets/eab-gui-util.c:373
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "contacto"
 msgstr[1] "contactos"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:418
+#: ../addressbook/gui/widgets/eab-gui-util.c:420
 msgid "card.vcf"
 msgstr "cartao.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:594
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
+msgid "Select Address Book"
+msgstr "Seleccionar o Livro de Endereços"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:754
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Move contact to"
 msgstr "Mover contacto para"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:756
+#: ../addressbook/gui/widgets/eab-gui-util.c:758
 msgid "Copy contact to"
 msgstr "Copiar contacto para"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:759
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
 msgid "Move contacts to"
 msgstr "Mover contactos para"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:761
+#: ../addressbook/gui/widgets/eab-gui-util.c:763
 msgid "Copy contacts to"
 msgstr "Copiar contactos para"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:764
-msgid "Select target addressbook."
-msgstr "Seleccionar o livro de endereços de destino."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:987
+#: ../addressbook/gui/widgets/eab-gui-util.c:989
 msgid "Multiple VCards"
 msgstr "Múltiplos VCards"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:990
+#: ../addressbook/gui/widgets/eab-gui-util.c:992
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard de %s"
 
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * contact.
-#.
-#: ../addressbook/gui/widgets/eab-popup-control.c:198
-msgid "(none)"
-msgstr "(nenhum)"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:431
-msgid "Primary Email"
-msgstr "Email Principal"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:567
-msgid "Select an Action"
-msgstr "Seleccionar uma Acção"
+#: ../addressbook/gui/widgets/eab-gui-util.c:1033
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
+msgid "Contact information"
+msgstr "Informação de contacto"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:575
+#: ../addressbook/gui/widgets/eab-gui-util.c:1053
 #, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Criar um novo contacto \"%s\""
+msgid "Contact information for %s"
+msgstr "Informação de contacto para %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:591
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Adicionar endereço ao contacto já existente \"%s\""
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:869
+#: ../addressbook/gui/widgets/eab-popup-control.c:287
 msgid "Querying Address Book..."
 msgstr "A Consultar o Livro de Endereços..."
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:968
-msgid "Merge E-Mail Address"
-msgstr "Juntar Endereço de Email"
-
 #: ../addressbook/gui/widgets/eab-vcard-control.c:139
 #, c-format
 msgid "There is one other contact."
@@ -3577,26 +3647,56 @@ msgstr "Vista de Cartão"
 msgid "GTK Tree View"
 msgstr "Vista em Árvore GTK"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:486
-#: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:311
-#: ../calendar/importers/icalendar-importer.c:643 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-csv-importer.c:624
+#: ../mail/importers/evolution-outlook-importer.c:264
+#: ../mail/importers/netscape-importer.c:1252
+msgid "Importing..."
+msgstr "A Importar..."
+
+#: ../addressbook/importers/evolution-csv-importer.c:826
+msgid "Outlook CSV or Tab (.csv, .tab)"
+msgstr "CSV ou Tab do Outlook (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:827
+msgid "Outlook CSV and Tab Importer"
+msgstr "Importador de CSV e Tabs do Outlook"
+
+#: ../addressbook/importers/evolution-csv-importer.c:835
+msgid "Mozilla CSV or Tab (.csv, .tab)"
+msgstr "CSV ou Tab do Mozilla (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:836
+msgid "Mozilla CSV and Tab Importer"
+msgstr "Importador de CSV e Tabs do Mozilla"
+
+#: ../addressbook/importers/evolution-csv-importer.c:844
+msgid "Evolution CSV or Tab (.csv, .tab)"
+msgstr "CSV ou Tab do Evolution (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:845
+msgid "Evolution CSV and Tab Importer"
+msgstr "Importador de CSV e Tabs do Evolution"
+
+#: ../addressbook/importers/evolution-ldif-importer.c:583
+#: ../addressbook/importers/evolution-vcard-importer.c:250
+#: ../calendar/importers/icalendar-importer.c:312
+#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
 msgid "Importing ..."
 msgstr "A Importar..."
 
-#: ../addressbook/importers/evolution-ldif-importer.c:652
+#: ../addressbook/importers/evolution-ldif-importer.c:754
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Formato de Intercâmbio de Dados LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:653
+#: ../addressbook/importers/evolution-ldif-importer.c:755
 msgid "Evolution LDIF importer"
 msgstr "Importador LDIF do Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:529
+#: ../addressbook/importers/evolution-vcard-importer.c:547
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:530
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "Evolution VCard Importer"
 msgstr "Importador de VCard do Evolution"
 
@@ -3605,12 +3705,12 @@ msgstr "Importador de VCard do Evolution"
 msgid "Print envelope"
 msgstr "Imprimir envelope"
 
-#: ../addressbook/printing/e-contact-print.c:1001
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "Imprimir contactos"
 
-#: ../addressbook/printing/e-contact-print.c:1066
-#: ../addressbook/printing/e-contact-print.c:1093
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "Imprimir contacto"
 
@@ -3655,11 +3755,11 @@ msgid "Format"
 msgstr "Formato"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../widgets/table/e-table-click-to-add.c:496
+#: ../widgets/table/e-table-click-to-add.c:495
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
-#: ../widgets/table/e-table-field-chooser-item.c:660
-#: ../widgets/table/e-table-field-chooser.c:93
-#: ../widgets/table/e-table-header-item.c:1831
+#: ../widgets/table/e-table-field-chooser-item.c:649
+#: ../widgets/table/e-table-field-chooser.c:91
+#: ../widgets/table/e-table-header-item.c:1825
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Cabeçalho"
@@ -3713,7 +3813,7 @@ msgid "Options"
 msgstr "Opções"
 
 #: ../addressbook/printing/e-contact-print.glade.h:24
-#: ../e-util/eggtrayicon.c:118
+#: ../e-util/eggtrayicon.c:120
 msgid "Orientation"
 msgstr "Orientação"
 
@@ -3763,9 +3863,9 @@ msgstr "Sombreado"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:917
-#: ../plugins/exchange-operations/exchange-calendar.c:205
-#: ../plugins/exchange-operations/exchange-contacts.c:176
+#: ../plugins/exchange-operations/exchange-account-setup.c:955
+#: ../plugins/exchange-operations/exchange-calendar.c:229
+#: ../plugins/exchange-operations/exchange-contacts.c:211
 msgid "Size:"
 msgstr "Tamanho:"
 
@@ -3816,17 +3916,17 @@ msgstr "Teste de Impressão de Contacto"
 msgid "This should test the contact print code"
 msgstr "Isto deverá testar o código de impressão de um contacto"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:664
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:700
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "Incapaz de abrir o ficheiro"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
 msgid "Couldn't get list of addressbooks"
 msgstr "Incapaz de obter a lista de livros de endereços"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
 msgid "failed to open book"
 msgstr "falha ao abrir o livro"
 
@@ -3902,37 +4002,21 @@ msgstr "Nenhum nome de ficheiro indicado."
 
 #: ../calendar/calendar.error.xml.h:1
 msgid ""
-" There are few attachments getting downloaded. Saving the appointment will "
-"cause the appointment to be saved without those pending attachments "
-msgstr ""
-" Está a ser efectuado o download de alguns anexos. Gravar o compromisso irá "
-"fazer com que este seja gravado sem os anexos pendentes."
-
-#: ../calendar/calendar.error.xml.h:2
-msgid ""
-" There are few attachments getting downloaded. Saving the task will cause "
-"the task to be saved without those pending attachments "
-msgstr ""
-" Está a ser efectuado o download de alguns anexos. Gravar a tarefa irá fazer "
-"com que esta seja gravada sem os anexos pendentes."
-
-#: ../calendar/calendar.error.xml.h:3
-msgid ""
-"Adding a meaningful Summary to your appointment will give your recipients an "
+"Adding a meaningful summary to your appointment will give your recipients 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 compromisso."
+"Adicionar um resumo coerente ao seu compromisso dará aos seus receptores uma "
+"ideia sobre o teor do mesmo."
 
-#: ../calendar/calendar.error.xml.h:4
+#: ../calendar/calendar.error.xml.h:2
 msgid ""
-"Adding a meaningful Summary to your task will give your recipients an idea "
+"Adding a meaningful summary to your task will give your recipients 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 tarefa."
+"Adicionar um resumo coerente à sua tarefa dará aos seus receptores uma ideia "
+"sobre o teor da mesma."
 
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:3
 msgid ""
 "All information in these journal entries will be deleted and can not be "
 "restored."
@@ -3940,14 +4024,14 @@ msgstr ""
 "Toda a informação relativa a estas entradas de diário será apagada e não "
 "poderá ser reposta."
 
-#: ../calendar/calendar.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:4
 msgid ""
 "All information in this journal will be deleted and can not be restored."
 msgstr ""
 "Toda a informação relativa a este diário será apagada e não poderá ser "
 "reposta."
 
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:5
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
@@ -3955,20 +4039,20 @@ msgstr ""
 "Toda a informação relativa a estes compromissos será apagada e não poderá "
 "ser reposta."
 
-#: ../calendar/calendar.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:6
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr ""
 "Toda a informação relativa a estas tarefas será apagada e não poderá ser "
 "reposta."
 
-#: ../calendar/calendar.error.xml.h:9
+#: ../calendar/calendar.error.xml.h:7
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
 msgstr ""
 "Toda a informação relativa a este compromisso será apagada e não poderá ser "
 "reposta."
 
-#: ../calendar/calendar.error.xml.h:10
+#: ../calendar/calendar.error.xml.h:8
 msgid ""
 "All information on this journal entry will be deleted and can not be "
 "restored."
@@ -3976,103 +4060,100 @@ msgstr ""
 "Toda a informação relativa a esta entrada de diário será apagada e não "
 "poderá ser reposta."
 
-#: ../calendar/calendar.error.xml.h:11
+#: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on this meeting will be deleted and can not be restored."
 msgstr ""
 "Toda a informação relativa a esta reunião será apagada e não poderá ser "
 "reposta."
 
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:10
 msgid "All information on this task will be deleted and can not be restored."
 msgstr ""
 "Toda a informação relativa a esta tarefa será apagada e não poderá ser "
 "reposta."
 
-#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:11
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "Tem a certeza de que deseja apagar a tarefa '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:12
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Tem a certeza de que deseja apagar o compromisso entitulado '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:13
 msgid "Are you sure you want to delete the journal entry '{0}'?"
 msgstr "Tem a certeza de que deseja apagar a entrada de diário '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:14
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Tem a certeza de que deseja apagar estes {0} compromissos?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete these {0} journal entries?"
 msgstr "Tem a certeza de que deseja apagar estas {0} entradas de diário?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Tem a certeza de que deseja apagar estas {0} tarefas?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Tem a certeza de que deseja apagar este compromisso?"
 
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete this journal entry?"
 msgstr "Tem a certeza de que deseja apagar esta entrada de diário?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Tem a certeza de que deseja apagar esta reunião?"
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:20
 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:23
+#: ../calendar/calendar.error.xml.h:21
 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?"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:22
 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?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:23
+msgid "Cannot create a new event"
+msgstr "Incapaz de criar um novo evento"
+
+#: ../calendar/calendar.error.xml.h:24
 msgid "Delete calendar '{0}'?"
 msgstr "Apagar o calendário '{0}'?"
 
+#: ../calendar/calendar.error.xml.h:25
+msgid "Delete memo list '{0}'?"
+msgstr "Apagar a lista de memos '{0}'?"
+
 #: ../calendar/calendar.error.xml.h:26
 msgid "Delete task list '{0}'?"
 msgstr "Apagar a lista de tarefas '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:27
-msgid "Discard Changes"
-msgstr "Descartar as Alterações"
+msgid "Do _not Send"
+msgstr "_Não Enviar"
 
 #: ../calendar/calendar.error.xml.h:28
-msgid "Don't Send"
-msgstr "Não Enviar"
-
-#: ../calendar/calendar.error.xml.h:29
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Download em curso. Deseja gravar este compromisso?"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:29
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Download em curso. Deseja gravar esta tarefa?"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:30
 msgid "Editor could not be loaded."
 msgstr "Incapaz de ler o editor."
 
-#: ../calendar/calendar.error.xml.h:32
-msgid ""
-"Email invitations will be sent to all participants and allow them to RSVP."
-msgstr ""
-"Serão enviadas notificações por email a todos os participantes e ser-lhes-á "
-"possível RSVP."
-
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:31
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -4080,17 +4161,28 @@ msgstr ""
 "Serão enviados convites por email a todos os participantes e ser-lhes-á "
 "permitido aceitar esta tarefa."
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:32
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
+msgstr ""
+"Serão enviados convites a todos os participantes e ser-lhes-á possível "
+"responder."
+
+#: ../calendar/calendar.error.xml.h:33
 msgid "Error loading calendar"
 msgstr "Erro ao ler o calendário"
 
+#: ../calendar/calendar.error.xml.h:34
+msgid "Error loading memo list"
+msgstr "Erro ao ler a lista de memos"
+
 #: ../calendar/calendar.error.xml.h:35
 msgid "Error loading task list"
 msgstr "Erro ao ler a lista de tarefas"
 
 #: ../calendar/calendar.error.xml.h:36
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
+"If you do not send a cancelation notice, the other participants may not know "
 "the journal has been deleted."
 msgstr ""
 "Se não enviar uma notificação de cancelamento, os outros participantes "
@@ -4098,7 +4190,7 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:37
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
+"If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
 msgstr ""
 "Se não enviar uma notificação de cancelamento, os outros participantes "
@@ -4106,26 +4198,13 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:38
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
+"If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
 msgstr ""
 "Se não enviar uma notificação de cancelamento, os outros participantes "
 "poderão não saber que a tarefa foi apagada."
 
 #: ../calendar/calendar.error.xml.h:39
-msgid "Save Changes"
-msgstr "Gravar as Alterações"
-
-#: ../calendar/calendar.error.xml.h:40
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Send"
-msgstr "Enviar"
-
-#: ../calendar/calendar.error.xml.h:41
-msgid "Send Notice"
-msgstr "Enviar Notificação"
-
-#: ../calendar/calendar.error.xml.h:42
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4133,7 +4212,7 @@ msgstr ""
 "Enviar informação actualizada permite aos outros participantes manter os "
 "seus calendários actualizados."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:40
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4141,133 +4220,215 @@ msgstr ""
 "Enviar informação actualizada permite aos outros participantes manter as "
 "suas listas de tarefas actualizadas."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:41
+msgid ""
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
+msgstr ""
+"Está a ser efectuado o download de alguns anexos. Gravar o compromisso irá "
+"resultar na perca destes anexos."
+
+#: ../calendar/calendar.error.xml.h:42
+msgid ""
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
+msgstr ""
+"Está a ser efectuado o download de alguns anexos. Gravar a tarefa irá "
+"resultar na perca destes anexos."
+
+#: ../calendar/calendar.error.xml.h:43
+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:44
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "O calendário Evolution terminou inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:45
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "As tarefas Evolution terminaram inesperadamente."
 
+#: ../calendar/calendar.error.xml.h:46
+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:47
-msgid "The calendar is not marked for offline usage"
-msgstr "O calendário não está marcado para utilização quando desligado"
+msgid "The calendar you have selected is read-only"
+msgstr "O calendário seleccionado é apenas de leitura"
 
 #: ../calendar/calendar.error.xml.h:48
-msgid "The task list is not marked for offline usage"
-msgstr "A lista de tarefas não está marcada para utilização quando desligado"
+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:49
+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:50
 msgid "This calendar will be removed permanently."
 msgstr "Este calendário será definitivamente removido."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:51
+msgid "This memo list will be removed permanently."
+msgstr "Esta lista de memos será definitivamente removida."
+
+#: ../calendar/calendar.error.xml.h:52
 msgid "This task list will be removed permanently."
 msgstr "Esta lista de tarefas será definitivamente removida."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:53
 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:52
+#: ../calendar/calendar.error.xml.h:54
+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:55
 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:53
-msgid "Would you like to send a cancellation notice for this journal entry?"
-msgstr ""
-"Deseja enviar uma notificação de cancelamento para esta entrada de diário?"
+#: ../calendar/calendar.error.xml.h:56
+msgid "Would you like to send a cancelation notice for this journal entry?"
+msgstr "Deseja enviar uma notificação de cancelamento desta entrada de diário?"
 
-#: ../calendar/calendar.error.xml.h:54
-msgid "Would you like to send all the participants a cancellation notice?"
+#: ../calendar/calendar.error.xml.h:57
+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:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Deseja enviar aos convocados convites de participação?"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to send this task to participants?"
 msgstr "Deseja enviar esta tarefa a participantes?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 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:58
+#: ../calendar/calendar.error.xml.h:61
 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:60
-msgid "You have made changes to this appointment, but not yet saved them."
-msgstr "Efectuou alterações a este compromisso mas ainda não as gravou."
+#: ../calendar/calendar.error.xml.h:62
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results, the server should be upgraded to "
+"a supported version."
+msgstr ""
+"Está a ligar-se a um servidor GroupWise não suportado e poderá sentir "
+"problemas na utilização do Evolution. Para melhores resultados o servidor "
+"deverá ser actualizado para uma versão suportada."
 
-#: ../calendar/calendar.error.xml.h:61
-msgid "You have made changes to this task, but not yet saved them."
-msgstr "Efectuou alterações a esta tarefa mas ainda não as gravou."
+#: ../calendar/calendar.error.xml.h:63
+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:62
+#: ../calendar/calendar.error.xml.h:64
+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:65
+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:66
 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:63
+#: ../calendar/calendar.error.xml.h:67
 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:64
-#: ../ui/evolution-message-composer.xml.h:51
+#: ../calendar/calendar.error.xml.h:68
+#: ../composer/mail-composer.error.xml.h:27
+msgid "_Discard Changes"
+msgstr "_Descartar as Alterações"
+
+#: ../calendar/calendar.error.xml.h:69 ../ui/evolution-editor.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:53
 msgid "_Save"
 msgstr "_Gravar"
 
-#: ../calendar/calendar.error.xml.h:65
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:123
+#: ../calendar/calendar.error.xml.h:70
+msgid "_Save Changes"
+msgstr "_Gravar as Alterações"
+
+#: ../calendar/calendar.error.xml.h:71
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:134
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:72
+msgid "_Send Notice"
+msgstr "_Enviar Notificação"
+
+#: ../calendar/calendar.error.xml.h:73
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:301
-#: ../smime/gui/component.c:48
+#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:323
+#: ../smime/gui/component.c:50
 msgid "Enter password"
 msgstr "Introduza a senha"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:246
+#: ../calendar/conduits/calendar/calendar-conduit.c:255
 msgid "Split Multi-Day Events:"
 msgstr "Dividir Eventos Multi-Dias:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1365
-#: ../calendar/conduits/calendar/calendar-conduit.c:1366
-#: ../calendar/conduits/todo/todo-conduit.c:879
-#: ../calendar/conduits/todo/todo-conduit.c:880
+#: ../calendar/conduits/calendar/calendar-conduit.c:1432
+#: ../calendar/conduits/calendar/calendar-conduit.c:1433
+#: ../calendar/conduits/memo/memo-conduit.c:854
+#: ../calendar/conduits/memo/memo-conduit.c:855
+#: ../calendar/conduits/todo/todo-conduit.c:1032
+#: ../calendar/conduits/todo/todo-conduit.c:1033
 msgid "Could not start evolution-data-server"
 msgstr "Incapaz de iniciar o evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1474
-#: ../calendar/conduits/calendar/calendar-conduit.c:1477
+#: ../calendar/conduits/calendar/calendar-conduit.c:1529
+#: ../calendar/conduits/calendar/calendar-conduit.c:1532
 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/todo/todo-conduit.c:234
+#: ../calendar/conduits/memo/memo-conduit.c:937
+#: ../calendar/conduits/memo/memo-conduit.c:940
+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:976
+#: ../calendar/conduits/memo/memo-conduit.c:979
+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:239
 msgid "Default Priority:"
 msgstr "Prioridade por Omissão:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:959
-#: ../calendar/conduits/todo/todo-conduit.c:962
+#: ../calendar/conduits/todo/todo-conduit.c:1112
+#: ../calendar/conduits/todo/todo-conduit.c:1115
 msgid "Could not read pilot's ToDo application block"
-msgstr "Incapaz de ler o bloco da aplicação A Fazer da pilot"
+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/GNOME_Evolution_Calendar.server.in.in.h:1
+#: ../plugins/itip-formatter/itip-formatter.c:1969
 msgid "Calendar and Tasks"
 msgstr "Calendário e Tarefas"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1309
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "Calendários"
 
@@ -4296,26 +4457,42 @@ msgid "Evolution's Calendar component"
 msgstr "Componente de Calendário Evolution"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution's Memos component"
+msgstr "Componente de Memos do Evolution"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Tasks component"
 msgstr "Componente de Tarefas Evolution"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#: ../calendar/gui/e-tasks.c:1257 ../calendar/gui/print.c:1822
-#: ../calendar/gui/tasks-component.c:519
-#: ../calendar/gui/tasks-component.c:1006 ../calendar/gui/tasks-control.c:457
-#: ../calendar/importers/icalendar-importer.c:79
-#: ../calendar/importers/icalendar-importer.c:707
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Memo_s"
+msgstr "Memo_s"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: ../calendar/gui/e-memo-table.c:274 ../calendar/gui/e-memos.c:1084
+#: ../calendar/gui/memos-component.c:530 ../calendar/gui/memos-component.c:997
+#: ../calendar/gui/memos-control.c:340
+msgid "Memos"
+msgstr "Memos"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
+#: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
+#: ../calendar/importers/icalendar-importer.c:80
+#: ../calendar/importers/icalendar-importer.c:741
+#: ../plugins/exchange-operations/exchange-folder.c:591
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:582
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Tarefas"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
 msgid "_Calendars"
 msgstr "_Calendários"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
 #: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tarefas"
@@ -4330,19 +4507,22 @@ msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:248
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
+#: ../plugins/calendar-http/calendar-http.c:287
+#: ../plugins/calendar-weather/calendar-weather.c:564
+msgid "hours"
+msgid_plural "hours"
+msgstr[0] "hora"
+msgstr[1] "horas"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "Hora de início"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:347
-#, c-format
-msgid ""
-"<big><b>%s</b></big>\n"
-"%s until %s"
-msgstr ""
-"<big><b>%s</b></big>\n"
-"%s até %s"
-
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
 msgid "Appointments"
@@ -4350,8 +4530,10 @@ msgstr "Compromissos"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/e-itip-control.c:1120
-#: ../plugins/itip-formatter/itip-view.c:884
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
+#: ../calendar/gui/e-itip-control.c:1113
+#: ../plugins/itip-formatter/itip-view.c:880
 msgid "Location:"
 msgstr "Localização:"
 
@@ -4360,17 +4542,17 @@ msgid "Snooze _time:"
 msgstr "_Tempo de adiamento:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:13
-#: ../ui/evolution-addressbook.xml.h:34 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:8
-#: ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-message-composer.xml.h:44
-#: ../ui/evolution-signature-editor.xml.h:23
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:23
-#: ../ui/evolution.xml.h:35
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-signature-editor.xml.h:24
+#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
+#: ../ui/evolution.xml.h:40
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -4378,54 +4560,36 @@ msgstr "_Editar"
 msgid "_Snooze"
 msgstr "_Adiar"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-msgid "description of appointment"
-msgstr "descrição do compromisso"
-
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 msgid "location of appointment"
 msgstr "localização do compromisso"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:954
-msgid "Dismiss"
-msgstr "Desactivar"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:955
-msgid "Dismiss All"
-msgstr "Desactivar Todas"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1037
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "Nenhum resumo disponível."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1046
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1048
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 msgid "No description available."
 msgstr "Nenhuma descrição disponível."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1056
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "Nenhuma informação de local disponível."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1072
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
-msgid ""
-"Alarm on %s\n"
-"%s\n"
-"Starting at %s\n"
-"Ending at %s"
-msgstr ""
-"Alarme a %s\n"
-"%s\n"
-"Iniciar a %s\n"
-"Terminar a %s"
+msgid "You have %d alarms"
+msgstr "Possui %d alertas"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1175
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1199
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1179
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4437,7 +4601,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:1205
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4454,7 +4618,7 @@ msgstr ""
 "\n"
 "Tem a certeza que deseja executar esta aplicação?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1219
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 msgid "Do not ask me about this program again."
 msgstr "Não perguntar novamente sobre esta aplicação."
 
@@ -4462,7 +4626,7 @@ msgstr "Não perguntar novamente sobre esta aplicação."
 msgid "Could not initialize Bonobo"
 msgstr "Incapaz de inicializar o Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:151
+#: ../calendar/gui/alarm-notify/notify-main.c:153
 msgid "Could not create the alarm notify service factory"
 msgstr "Incapaz de criar a fábrica de serviço de alarme de notificação"
 
@@ -4470,6 +4634,35 @@ msgstr "Incapaz de criar a fábrica de serviço de alarme de notificação"
 msgid "invalid time"
 msgstr "hora inválida"
 
+#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/misc.c:113
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hora"
+msgstr[1] "%d horas"
+
+#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
+#: ../calendar/gui/misc.c:119
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuto"
+msgstr[1] "%d minutos"
+
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
+#: ../calendar/gui/misc.c:123
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d segundo"
+msgstr[1] "%d segundos"
+
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 msgid "Alarm programs"
 msgstr "Aplicações de alarme"
@@ -4530,11 +4723,11 @@ msgid "Default reminder value"
 msgstr "Valor do lembrete por omissão"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Free/busy server urls"
+msgid "Free/busy server URLs"
 msgstr "URLs de servidor de livre/ocupado"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Free/busy template url"
+msgid "Free/busy template URL"
 msgstr "URL de modelo de livre/ocupado"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
@@ -4574,8 +4767,8 @@ msgid "Last alarm time"
 msgstr "Hora do último alarme"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
-msgid "List of server urls for free/busy publishing."
-msgstr "Lista de urls onde publicar informação de livre/ocupado."
+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.in.h:25
 msgid "Marcus Bains Line"
@@ -4606,8 +4799,8 @@ msgid "Month view vertical pane position"
 msgstr "Posição vertical do painel de vista de mês"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
-msgid "Number of units for determining for a default reminder."
-msgstr "Número de unidades para determinar para o lembrete por omissão."
+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.in.h:33
 msgid "Number of units for determining when to hide tasks."
@@ -4662,27 +4855,73 @@ 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.in.h:41
+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.in.h:42
+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.in.h:43
 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.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+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.in.h:45
 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.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+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.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
+msgid "Show the \"Preview\" pane"
+msgstr "Apresentar o painel de \"Antevisão\""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
+msgid "Show the \"Preview\" pane."
+msgstr "Apresentar o painel de \"Antevisão\"."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+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.in.h:50
+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.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "Apresentar os números das semanas no navegador de datas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "Cor das tarefas cujo prazo termina hoje"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "Posição do painel vertical de tarefas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#, no-c-format
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
+msgstr ""
+"O modelo de URL a utilizar como um recurso de dados livre/ocupado, %u é "
+"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.in.h:56
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -4691,65 +4930,55 @@ 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.in.h:48
-#, no-c-format
-msgid ""
-"The url template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
-msgstr ""
-"O modelo de URL a utilizar como um recurso de dados livre/ocupado, %u é "
-"substituido pela parte de utilizador do endereço de email e %d é substituido "
-"pelo domínio."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "Divisões temporais"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 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.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "Zona Horária"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
 msgstr "Formato de vinte-e-quatro horas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 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.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 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.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "Início da semana"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 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.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 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.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 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.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 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.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -4757,61 +4986,96 @@ 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.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 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.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 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.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 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.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 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.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+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.in.h:75
+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.in.h:76
+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.in.h:77
+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.in.h:78
 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.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+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.in.h:80
+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.in.h:81
 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.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
 msgid "Work days"
 msgstr "Dias úteis"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "Hora a que termina o expediente"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "Minuto a que termina o expediente"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "Hora a que se inicia o expediente"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "Minuto a que se inicia o expediente"
 
-#: ../calendar/gui/cal-search-bar.c:49
+#: ../calendar/gui/cal-search-bar.c:48
 msgid "Summary contains"
 msgstr "Resumo contém"
 
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:49
 msgid "Description contains"
 msgstr "Descrição contém"
 
@@ -4823,21 +5087,32 @@ msgstr "Comentário contém"
 msgid "Location contains"
 msgstr "Localização contém"
 
-#: ../calendar/gui/cal-search-bar.c:350
+#: ../calendar/gui/cal-search-bar.c:347
 msgid "Unmatched"
 msgstr "Sem equivalência"
 
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2509
+#: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:11
+#: ../ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "Imprimir"
+
 #: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/gnome-cal.c:2094
+#: ../calendar/gui/calendar-component.c:709
+#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../calendar/gui/gnome-cal.c:2111
+#: ../plugins/exchange-operations/exchange-folder.c:579
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:581
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:590
+#: ../plugins/hula-account-setup/camel-hula-listener.c:379
+#: ../plugins/hula-account-setup/camel-hula-listener.c:408
+#: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "Calendário"
 
-#: ../calendar/gui/calendar-commands.c:354
+#: ../calendar/gui/calendar-commands.c:348
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -4847,104 +5122,106 @@ msgstr ""
 "que o perído de tempo seleccionado. Se continuar, não lhe será possível "
 "recuperar estas tarefas."
 
-#: ../calendar/gui/calendar-commands.c:360
+#: ../calendar/gui/calendar-commands.c:354
 msgid "Purge events older than"
 msgstr "Expurgar eventos mais antigos do que"
 
-#: ../calendar/gui/calendar-commands.c:365
+#: ../calendar/gui/calendar-commands.c:359
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:12
-#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:265
+#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
 #: ../plugins/calendar-weather/calendar-weather.c:565
 #: ../widgets/misc/e-send-options.glade.h:36
 msgid "days"
 msgstr "dias"
 
 #. Create the On the web source group
+#. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:234 ../calendar/gui/migration.c:489
-#: ../calendar/gui/migration.c:582 ../calendar/gui/tasks-component.c:215
+#: ../calendar/gui/calendar-component.c:235
+#: ../calendar/gui/memos-component.c:221 ../calendar/gui/migration.c:501
+#: ../calendar/gui/migration.c:594 ../calendar/gui/migration.c:1102
+#: ../calendar/gui/tasks-component.c:217
 msgid "On The Web"
 msgstr "Na Web"
 
-#: ../calendar/gui/calendar-component.c:252 ../calendar/gui/migration.c:391
+#: ../calendar/gui/calendar-component.c:253 ../calendar/gui/migration.c:403
 msgid "Birthdays & Anniversaries"
 msgstr "Datas de Nascimento & Aniversários"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:258
+#: ../calendar/gui/calendar-component.c:259
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "O Tempo"
 
-#: ../calendar/gui/calendar-component.c:535
-#: ../calendar/gui/dialogs/calendar-setup.c:449
-msgid "New Calendar"
-msgstr "Novo Calendário"
+#: ../calendar/gui/calendar-component.c:536
+msgid "_New Calendar"
+msgstr "_Novo Calendário"
 
-#: ../calendar/gui/calendar-component.c:858
+#: ../calendar/gui/calendar-component.c:840
 msgid "Failed upgrading calendars."
 msgstr "Falha ao actualizar os calendários."
 
-#: ../calendar/gui/calendar-component.c:1154
+#: ../calendar/gui/calendar-component.c:1139
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Incapaz de abrir o calendário '%s' para criar eventos e reuniões"
 
-#: ../calendar/gui/calendar-component.c:1170
+#: ../calendar/gui/calendar-component.c:1152
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Não existe nenhum calendário disponível para criar eventos e reuniões"
 
-#: ../calendar/gui/calendar-component.c:1284
+#: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
 msgstr "Selector de Origem do Calendário"
 
-#: ../calendar/gui/calendar-component.c:1475
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New appointment"
 msgstr "Novo compromisso"
 
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1458
 msgid "_Appointment"
 msgstr "_Compromisso"
 
-#: ../calendar/gui/calendar-component.c:1477
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new appointment"
 msgstr "Criar um novo compromisso"
 
-#: ../calendar/gui/calendar-component.c:1483
+#: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
 msgstr "Nova reunião"
 
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1466
 msgid "M_eeting"
 msgstr "R_eunião"
 
-#: ../calendar/gui/calendar-component.c:1485
+#: ../calendar/gui/calendar-component.c:1467
 msgid "Create a new meeting request"
 msgstr "Criar uma nova convocatória de reunião"
 
-#: ../calendar/gui/calendar-component.c:1491
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New all day appointment"
 msgstr "Novo compromisso de dia completo"
 
-#: ../calendar/gui/calendar-component.c:1492
+#: ../calendar/gui/calendar-component.c:1474
 msgid "All Day A_ppointment"
 msgstr "Com_promisso de Dia Completo"
 
-#: ../calendar/gui/calendar-component.c:1493
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new all-day appointment"
 msgstr "Criar um novo compromisso de dia completo"
 
-#: ../calendar/gui/calendar-component.c:1499
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
 msgstr "Novo calendário"
 
-#: ../calendar/gui/calendar-component.c:1500
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Cale_ndar"
 msgstr "Cale_ndário"
 
-#: ../calendar/gui/calendar-component.c:1501
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new calendar"
 msgstr "Criar um novo calendário"
 
@@ -4964,22 +5241,26 @@ msgstr "Vista de Semana"
 msgid "Month View"
 msgstr "Vista de Mês"
 
-#: ../calendar/gui/comp-editor-factory.c:420
+#: ../calendar/gui/comp-editor-factory.c:415
 msgid "Error while opening the calendar"
 msgstr "Erro ao abrir o calendário"
 
-#: ../calendar/gui/comp-editor-factory.c:426
+#: ../calendar/gui/comp-editor-factory.c:421
 msgid "Method not supported when opening the calendar"
 msgstr "Método não suportado ao abrir o calendário"
 
-#: ../calendar/gui/comp-editor-factory.c:432
+#: ../calendar/gui/comp-editor-factory.c:427
 msgid "Permission denied to open the calendar"
 msgstr "Autorização negada ao abrir o calendário"
 
-#: ../calendar/gui/comp-editor-factory.c:444 ../shell/e-shell.c:1267
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
+#: ../calendar/gui/dialogs/alarm-dialog.c:567
+msgid "Edit Alarm"
+msgstr "Editar Alarme"
+
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
 msgstr "<b>Alarme</b>"
@@ -5009,17 +5290,17 @@ msgid "Mes_sage:"
 msgstr "Men_sagem:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:444
+#: ../calendar/gui/e-alarm-list.c:446
 msgid "Play a sound"
 msgstr "Reproduzir um som"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:448
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Pop up an alert"
 msgstr "Apresentar um alerta em popup"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:456
+#: ../calendar/gui/e-alarm-list.c:458
 msgid "Run a program"
 msgstr "Executar uma aplicação"
 
@@ -5028,7 +5309,7 @@ msgid "Send To:"
 msgstr "Enviar Para:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
-#: ../calendar/gui/e-alarm-list.c:452
+#: ../calendar/gui/e-alarm-list.c:454
 msgid "Send an email"
 msgstr "Enviar uma mensagem"
 
@@ -5056,8 +5337,10 @@ msgstr "após"
 msgid "before"
 msgstr "antes"
 
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "day(s)"
 msgstr "dia(s)"
 
@@ -5073,13 +5356,6 @@ msgstr "tempos extra a cada"
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../filter/filter.glade.h:15 ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:564
-msgid "hours"
-msgstr "horas"
-
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 msgid "minute(s)"
 msgstr "minuto(s)"
@@ -5088,7 +5364,7 @@ msgstr "minuto(s)"
 msgid "start of appointment"
 msgstr "início do compromisso"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:199
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:235
 msgid "Action/Trigger"
 msgstr "Acção/Despoletar"
 
@@ -5097,70 +5373,12 @@ msgid "A_dd"
 msgstr "A_dicionar"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:4
+#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:110
-#: ../composer/e-msg-composer-attachment-bar.c:105
-#: ../widgets/misc/e-attachment-bar.c:106
-#, c-format
-msgid "%.0fK"
-msgstr "%.0fK"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:113
-#: ../composer/e-msg-composer-attachment-bar.c:108
-#: ../widgets/misc/e-attachment-bar.c:109
-#, c-format
-msgid "%.0fM"
-msgstr "%.0fM"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:116
-#: ../composer/e-msg-composer-attachment-bar.c:111
-#: ../widgets/misc/e-attachment-bar.c:112
-#, c-format
-msgid "%.0fG"
-msgstr "%.0fG"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:311
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
-#: ../calendar/gui/dialogs/comp-editor.c:2440
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:444
-#: ../mail/em-utils.c:481 ../widgets/misc/e-attachment-bar.c:341
-msgid "attachment"
-msgstr "anexo"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:473
-#: ../calendar/gui/dialogs/comp-editor.c:1083
-#: ../calendar/gui/dialogs/meeting-page.c:887
-#: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3400
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:14
-#: ../widgets/table/e-table-config.glade.h:18
-msgid "_Remove"
-msgstr "_Remover"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:474
-#: ../calendar/gui/dialogs/comp-editor.c:1084
-#: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3401 ../mail/em-folder-tree.c:2047
-#: ../ui/evolution-mail-list.xml.h:29
-msgid "_Properties"
-msgstr "_Propriedades"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:476
-#: ../calendar/gui/dialogs/comp-editor.c:1086
-#: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3403
-msgid "_Add attachment..."
-msgstr "_Adicionar um anexo..."
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:736
-#: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:963
-msgid "Attachment Bar"
-msgstr "Barra de Anexos"
-
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:6
@@ -5172,33 +5390,9 @@ msgid "Suggest automatic display of attachment"
 msgstr "Sugerir a apresentação automática do anexo"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
-#: ../composer/e-msg-composer-select-file.c:241
 msgid "Attach file(s)"
 msgstr "Anexar ficheiro(s)"
 
-#: ../calendar/gui/dialogs/cal-attachment.c:210
-#: ../calendar/gui/dialogs/cal-attachment.c:226
-#: ../calendar/gui/dialogs/cal-attachment.c:319
-#: ../calendar/gui/dialogs/cal-attachment.c:335
-#: ../composer/e-msg-composer-attachment.c:187
-#: ../composer/e-msg-composer-attachment.c:203
-#: ../composer/e-msg-composer-attachment.c:297
-#: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:221 ../widgets/misc/e-attachment.c:237
-#: ../widgets/misc/e-attachment.c:425 ../widgets/misc/e-attachment.c:441
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "Incapaz de anexar o ficheiro %s: %s"
-
-#: ../calendar/gui/dialogs/cal-attachment.c:218
-#: ../calendar/gui/dialogs/cal-attachment.c:327
-#: ../composer/e-msg-composer-attachment.c:195
-#: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:229 ../widgets/misc/e-attachment.c:433
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "Incapaz de anexar o ficheiro %s: não é um ficheiro normal"
-
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:2
 #: ../composer/e-msg-composer-attachment.glade.h:2
 #: ../widgets/misc/e-attachment.glade.h:2
@@ -5206,8 +5400,8 @@ msgid "Attachment Properties"
 msgstr "Propriedades do Anexo"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:267
-#: ../calendar/gui/e-itip-control.c:1166
+#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-itip-control.c:1159
 #: ../calendar/gui/e-itip-control.glade.h:6
 #: ../composer/e-msg-composer-attachment.glade.h:3
 #: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
@@ -5226,325 +5420,303 @@ msgstr "Nome do ficheiro:"
 msgid "MIME type:"
 msgstr "Tipo MIME:"
 
-#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:576
-#: ../mail/em-account-prefs.c:504 ../mail/em-composer-prefs.c:891
-#: ../plugins/plugin-manager/plugin-manager.c:213
-msgid "Enabled"
-msgstr "Activo"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:730
-msgid "Are you sure you want to remove this URL?"
-msgstr "Tem a certeza que deseja apagar este URL?"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:733
-msgid "Remove"
-msgstr "Remover"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:738
-msgid "Don't Remove"
-msgstr "Não Apagar"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:853
-#: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
-#: ../mail/em-account-prefs.c:406
-msgid "Disable"
-msgstr "Desactivar"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:855
-#: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
-#: ../mail/em-account-prefs.c:408
-msgid "Enable"
-msgstr "Activar"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid "05 minutes"
-msgstr "05 minutos"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "10 minutes"
-msgstr "10 minutos"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
+msgid "Selected Calendars for Alarms"
+msgstr "Calendários Seleccionados para Alarmes"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
-msgstr "15 minutos"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "30 minutes"
-msgstr "30 minutos"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "60 minutes"
-msgstr "60 minutos"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid ""
+"60 minutes\n"
+"30 minutes\n"
+"15 minutes\n"
+"10 minutes\n"
+"05 minutes"
+msgstr ""
+"60 minutos\n"
+"30 minutos\n"
+"15 minutos\n"
+"10 minutos\n"
+"05 minutos"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "<b>Alerts</b>"
-msgstr "<b>Alertas</b>"
+#, no-c-format
+msgid ""
+"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgstr ""
+"<i>%u e %d serão substituidos pelo seu utilizador e domínio do endereço de "
+"email.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "<b>Default Free/Busy Server</b>"
-msgstr "<b>Servidor por Omissão de Livre/Ocupado</b>"
+#: ../mail/mail-config.glade.h:9
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr "<span weight=\"bold\">Alertas</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "<b>General</b>"
-msgstr "<b>Geral</b>"
+msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
+msgstr "<span weight=\"bold\">Servidor Livre/Ocupado por Omissão</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "<b>Publishing</b>"
-msgstr "<b>Publicação</b>"
+#: ../mail/mail-config.glade.h:18
+#: ../plugins/publish-calendar/publish-calendar.glade.h:1
+msgid "<span weight=\"bold\">General</span>"
+msgstr "<span weight=\"bold\">Geral</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "<b>Task List</b>"
-msgstr "<b>Lista de Tarefas</b>"
+msgid "<span weight=\"bold\">Task List</span>"
+msgstr "<span weight=\"bold\">Lista de Tarefas</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "<b>Time</b>"
-msgstr "<b>Hora</b>"
+msgid "<span weight=\"bold\">Time</span>"
+msgstr "<span weight=\"bold\">Tempo</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "<b>Work Week</b>"
-msgstr "<b>Semana de Trabalho</b>"
+msgid "<span weight=\"bold\">Work Week</span>"
+msgstr "<span weight=\"bold\">Semana de Trabalho</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr ""
-"<i>%u e %d serão substituidos pelo seu utilizador e domínio do endereço de "
-"email.</i>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Calendar and Tasks Settings"
-msgstr "Configurações do Calendário e Tarefas"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Color for overdue tasks"
-msgstr "Cor para as tarefas atrasadas"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Color for tasks due today"
-msgstr "Cor para as tarefas cujo prazo termina hoje"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Day _ends:"
 msgstr "Dia t_ermina:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Days"
-msgstr "Dias"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Display"
 msgstr "Apresentação"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: ../mail/mail-config.glade.h:74
-msgid "E_nable"
-msgstr "_Activar"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/event-editor.c:572
+#: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "Livre/Ocupado"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Friday"
 msgstr "Sexta-Feira"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Hours"
-msgstr "Horas"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Minutes"
-msgstr "Minutos"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+msgid ""
+"Minutes\n"
+"Hours\n"
+"Days"
+msgstr ""
+"Minutos\n"
+"Horas\n"
+"Dias"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
+#: ../calendar/gui/e-itip-control.c:726
 msgid "Monday"
 msgstr "Segunda-Feira"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Publishing Table"
-msgstr "Tabela de Publicação"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+msgid ""
+"Monday\n"
+"Tuesday\n"
+"Wednesday\n"
+"Thursday\n"
+"Friday\n"
+"Saturday\n"
+"Sunday"
+msgstr ""
+"Segunda-Feira\n"
+"Terça-Feira\n"
+"Quarta-Feira\n"
+"Quinta-Feira\n"
+"Sexta-Feira\n"
+"Sábado\n"
+"Domingo"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../mail/mail-config.glade.h:106
+msgid "Pick a color"
+msgstr "Seleccione uma cor"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "S_un"
 msgstr "_Dom"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Saturday"
 msgstr "Sábado"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+msgid "Select the calendars for alarm notification"
+msgstr "Seleccione os calendários para alarmes de notificação"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Sh_ow a reminder"
 msgstr "Apresentar um _lembrete"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Show week _numbers in date navigator"
 msgstr "Apresentar os _números das semanas no navegador de datas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:725
 msgid "Sunday"
 msgstr "Domingo"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "T_asks due today:"
 msgstr "T_arefas cujo prazo termina hoje:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "T_hu"
 msgstr "Q_ui"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Template:"
 msgstr "Modelo:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Thursday"
 msgstr "Quinta-Feira"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Time _zone:"
 msgstr "Fuso-_horário:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Time format:"
 msgstr "Formato de hora:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/recurrence-page.c:1081
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Tuesday"
 msgstr "Terça-Feira"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "W_eek starts:"
-msgstr "S_emana começa:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Wednesday"
 msgstr "Quarta-Feira"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+msgid "Wee_k starts on:"
+msgstr "S_emana começa à:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Work days:"
 msgstr "Dias úteis:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_12 hour (AM/PM)"
 msgstr "_12 horas (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_24 hour"
 msgstr "_24 horas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-msgid "_Add URL"
-msgstr "_Adicionar URL"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "Pedir confirmação ao _apagar itens"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Compress weekends in month view"
 msgstr "_Comprimir os fins-de-semana na vista de mês"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Day begins:"
 msgstr "_Dia começa:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Fri"
 msgstr "Se_x"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Hide completed tasks after"
 msgstr "_Esconder as tarefas terminadas após"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Mon"
 msgstr "_Seg"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Overdue tasks:"
 msgstr "Tare_fas atrasadas:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Sat"
 msgstr "Sá_b"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "_Show appointment end times in week and month views"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+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.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Time divisions:"
 msgstr "Divisões _temporais:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Tue"
 msgstr "T_er"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Wed"
 msgstr "_Qua"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "before every appointment"
 msgstr "antes de todos os compromissos"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "option menu to choose reminder units"
-msgstr "menu de opções onde escolher as unidades do lembrete"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "option menu to choose time units"
-msgstr "menu de opções onde escolher as unidades temporais"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:287
+#: ../calendar/gui/dialogs/calendar-setup.c:288
 msgid "Copy calendar contents locally for offline operation"
 msgstr ""
 "Copiar o conteúdo do calendário localmente para trabalhar em modo desligado"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
+#: ../calendar/gui/dialogs/calendar-setup.c:291
 msgid "Copy task list contents locally for offline operation"
 msgstr ""
 "Copiar o conteúdo da lista de tarefas localmente para trabalhar em modo "
 "desligado"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:341
+#: ../calendar/gui/dialogs/calendar-setup.c:293
+msgid "Copy memo list contents locally for offline operation"
+msgstr ""
+"Copiar 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.glade.h:4
 msgid "C_olor:"
 msgstr "C_ores:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Tasks List"
 msgstr "Lista de Tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:447
+#: ../calendar/gui/dialogs/calendar-setup.c:392
+msgid "Memos List"
+msgstr "Lista de Memos"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "Propriedades do Calendário"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:515
+#: ../calendar/gui/dialogs/calendar-setup.c:463
+msgid "New Calendar"
+msgstr "Novo Calendário"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "Propriedades da Lista de Tarefas"
 
+#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/memos-component.c:450
+msgid "New Memo List"
+msgstr "Nova Lista de Memos"
+
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
 msgstr "Adicionar Calendário"
@@ -5553,11 +5725,6 @@ msgstr "Adicionar Calendário"
 msgid "Add Task List"
 msgstr "Adicionar uma Lista de Tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-#: ../mail/mail-config.glade.h:105
-msgid "Pick a color"
-msgstr "Seleccione uma cor"
-
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "_Adicionar um Calendário"
@@ -5567,18 +5734,19 @@ msgid "_Add Task List"
 msgstr "_Adicionar uma Lista de Tarefas"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:9
-#: ../plugins/calendar-http/calendar-http.c:248
+#: ../plugins/calendar-http/calendar-http.c:271
 #: ../plugins/calendar-weather/calendar-weather.c:548
 msgid "_Refresh:"
 msgstr "Actual_izar:"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:11
-#: ../plugins/calendar-http/calendar-http.c:120
+#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/calendar-http/calendar-http.c:133
 msgid "_URL:"
 msgstr "_URL:"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:15
-#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:266
+#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
 #: ../plugins/calendar-weather/calendar-weather.c:566
 msgid "weeks"
 msgstr "semanas"
@@ -5628,131 +5796,166 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Não efectuou quaisquer alterações, actualizar o editor?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:464
+#: ../calendar/gui/dialogs/comp-editor-page.c:515
 #, c-format
 msgid "Validation error: %s"
 msgstr "Erro de validação: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2261
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2267
 msgid " to "
 msgstr " para "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2265
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2271
 msgid " (Completed "
 msgstr " (Terminada "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2267
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2273
 msgid "Completed "
 msgstr "Terminada "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2272
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2278
 msgid " (Due "
 msgstr " (Prazo "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2274
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2280
 msgid "Due "
 msgstr "Prazo "
 
-#: ../calendar/gui/dialogs/comp-editor.c:190 ../composer/e-msg-composer.c:2664
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "Mensagem anexa - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:195
-#: ../calendar/gui/dialogs/comp-editor.c:365 ../composer/e-msg-composer.c:2669
-#: ../composer/e-msg-composer.c:2846
+#: ../calendar/gui/dialogs/comp-editor.c:212
+#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Mensagem anexa"
 msgstr[1] "%d mensagens anexas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:428
-#: ../calendar/gui/e-calendar-table.c:1162
-#: ../calendar/gui/e-calendar-view.c:1535 ../composer/e-msg-composer.c:2911
-#: ../mail/em-folder-tree.c:974 ../mail/em-folder-view.c:1035
-#: ../mail/message-list.c:1708 ../ui/evolution-addressbook.xml.h:31
-#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
-#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-tasks.xml.h:21
-msgid "_Copy"
-msgstr "_Copiar"
-
-#: ../calendar/gui/dialogs/comp-editor.c:429 ../composer/e-msg-composer.c:2912
-#: ../mail/em-folder-tree.c:975 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1709
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../calendar/gui/dialogs/comp-editor.c:431 ../composer/e-msg-composer.c:2914
-#: ../mail/em-folder-tree.c:977 ../mail/message-list.c:1711
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr "Cancelar A_rrastar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:774
+#: ../calendar/gui/dialogs/comp-editor.c:802
 msgid "Could not update object"
 msgstr "Incapaz de actualizar o objecto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:977 ../composer/e-msg-composer.c:2318
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> Anexo"
 msgstr[1] "<b>%d</b> Anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1249
-msgid "_Attachment Bar (drop attachments here)"
-msgstr "Barra de _Anexos (largar os anexos aqui)"
+#: ../calendar/gui/dialogs/comp-editor.c:977
+msgid "Hide Attachment _Bar"
+msgstr "Esconder a _Barra de Anexos"
+
+#: ../calendar/gui/dialogs/comp-editor.c:980
+#: ../calendar/gui/dialogs/comp-editor.c:1444
+msgid "Show Attachment _Bar"
+msgstr "Apresentar a _Barra de Anexos"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1894
+#: ../calendar/gui/dialogs/meeting-page.c:899
+#: ../calendar/gui/dialogs/task-page.c:1202
+#: ../composer/e-msg-composer-attachment-bar.c:470
+#: ../composer/e-msg-composer.c:3619
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:14
+#: ../widgets/table/e-table-config.glade.h:18
+msgid "_Remove"
+msgstr "_Remover"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1850
-#: ../calendar/gui/dialogs/comp-editor.c:1893
+#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../composer/e-msg-composer-attachment-bar.c:471
+#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
+msgid "_Properties"
+msgstr "_Propriedades"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1092
+#: ../composer/e-msg-composer-attachment-bar.c:473
+#: ../composer/e-msg-composer.c:3622
+msgid "_Add attachment..."
+msgstr "_Adicionar um anexo..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
+msgid "Show Attachments"
+msgstr "Apresentar os Anexos"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1469
+msgid "Press space key to toggle attachment bar"
+msgstr "Prima a tecla de espaços para alternar a barra de anexos"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "Editar Compromisso"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1856
-#: ../calendar/gui/dialogs/comp-editor.c:1899
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "Reunião - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1858
-#: ../calendar/gui/dialogs/comp-editor.c:1901
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "Compromisso - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1862
-#: ../calendar/gui/dialogs/comp-editor.c:1905
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tarefa Atribuída - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1864
-#: ../calendar/gui/dialogs/comp-editor.c:1907
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1867
-#: ../calendar/gui/dialogs/comp-editor.c:1910
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada de diário - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1878
-#: ../calendar/gui/dialogs/comp-editor.c:1920
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "Sem resumo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2528
-#: ../calendar/gui/dialogs/comp-editor.c:2561
-#: ../calendar/gui/dialogs/comp-editor.c:2585
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:464
+#: ../mail/em-utils.c:501 ../widgets/misc/e-attachment-bar.c:339
+msgid "attachment"
+msgstr "anexo"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 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:2609
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "Incapaz de utilizar a versão actual!"
 
@@ -5829,246 +6032,217 @@ msgstr "Delegar A:"
 msgid "Enter Delegate"
 msgstr "Introduzir Delegado"
 
-#: ../calendar/gui/dialogs/event-editor.c:141 ../calendar/gui/print.c:2298
-msgid "Appointment"
-msgstr "Compromisso"
+#: ../calendar/gui/dialogs/event-editor.c:547
+msgid "Appoint_ment"
+msgstr "Compro_misso"
 
-#: ../calendar/gui/dialogs/event-editor.c:150
+#: ../calendar/gui/dialogs/event-editor.c:551
+#: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "Recorrência"
 
-#: ../calendar/gui/dialogs/event-editor.c:164
-#: ../calendar/gui/dialogs/event-editor.c:248
-#: ../calendar/gui/dialogs/event-editor.c:422
-msgid "Scheduling"
-msgstr "Calendarização"
+#: ../calendar/gui/dialogs/event-page.c:807
+#: ../calendar/gui/dialogs/event-page.c:2714
+msgid "This event has alarms"
+msgstr "Este evnto possui alertas"
 
-#: ../calendar/gui/dialogs/event-editor.c:174
-msgid "Delegatees"
-msgstr "Delegados"
+#: ../calendar/gui/dialogs/event-page.c:872
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+msgid "Cale_ndar:"
+msgstr "Cale_ndário:"
 
-#: ../calendar/gui/dialogs/event-editor.c:178
-msgid "Attendees"
-msgstr "Participantes"
+#: ../calendar/gui/dialogs/event-page.c:878
+#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+#: ../calendar/gui/dialogs/task-page.c:446
+msgid "Or_ganizer:"
+msgstr "Or_ganizador:"
+
+#: ../calendar/gui/dialogs/event-page.c:916
+msgid "_Delegatees"
+msgstr "_Delegados"
 
-#: ../calendar/gui/dialogs/event-editor.c:251
-#: ../calendar/gui/dialogs/event-editor.c:425
-msgid "Invitations"
-msgstr "Convites"
+#: ../calendar/gui/dialogs/event-page.c:918
+msgid "Atte_ndees"
+msgstr "Participa_ntes"
 
-#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:1086
 msgid "Event with no start date"
 msgstr "Evento sem data de início"
 
-#: ../calendar/gui/dialogs/event-page.c:734
+#: ../calendar/gui/dialogs/event-page.c:1089
 msgid "Event with no end date"
 msgstr "Evento sem data de finalização"
 
-#: ../calendar/gui/dialogs/event-page.c:900
-#: ../calendar/gui/dialogs/task-page.c:556
+#: ../calendar/gui/dialogs/event-page.c:1257
+#: ../calendar/gui/dialogs/task-page.c:852
 msgid "Start date is wrong"
 msgstr "Data de início incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:910
+#: ../calendar/gui/dialogs/event-page.c:1267
 msgid "End date is wrong"
 msgstr "Data de finalização incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:933
+#: ../calendar/gui/dialogs/event-page.c:1290
 msgid "Start time is wrong"
 msgstr "Hora de início incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:940
+#: ../calendar/gui/dialogs/event-page.c:1297
 msgid "End time is wrong"
 msgstr "Hora de finalização incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1686
+#: ../calendar/gui/dialogs/event-page.c:1452
+#: ../calendar/gui/dialogs/meeting-page.c:469
+#: ../calendar/gui/dialogs/task-page.c:909
+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:1458
+#: ../calendar/gui/dialogs/meeting-page.c:475
+#: ../calendar/gui/dialogs/task-page.c:915
+msgid "An organizer is required."
+msgstr "É necessário um organizador."
+
+#: ../calendar/gui/dialogs/event-page.c:1473
+#: ../calendar/gui/dialogs/meeting-page.c:490
+#: ../calendar/gui/dialogs/task-page.c:930
+msgid "At least one attendee is required."
+msgstr "É necessário pelo menos um participante."
+
+#: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/meeting-page.c:900
+#: ../calendar/gui/dialogs/task-page.c:1203
+msgid "_Add "
+msgstr "_Adicionar "
+
+#: ../calendar/gui/dialogs/event-page.c:2621
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Incapaz de abrir o calendário '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:1892
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, 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:1900
+#: ../calendar/gui/dialogs/event-page.c:2932
 #, 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:1908
+#: ../calendar/gui/dialogs/event-page.c:2940
 #, c-format
 msgid "%d minute before appointement"
 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.glade.h:2
+#: ../calendar/gui/dialogs/event-page.c:2956
+msgid "Customize"
+msgstr "Personalizar"
+
+#. an empty string is the same as 'None'
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../calendar/gui/dialogs/event-page.c:2961
+#: ../calendar/gui/dialogs/meeting-page.c:321
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../calendar/gui/e-cal-model-tasks.c:649
+#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2271
+#: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
+#: ../mail/em-account-editor.c:1388 ../mail/em-account-prefs.c:475
+#: ../mail/em-junk-hook.c:78
+#: ../plugins/calendar-weather/calendar-weather.c:370
+#: ../plugins/calendar-weather/calendar-weather.c:424
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
+#: ../plugins/itip-formatter/itip-formatter.c:1626
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
+#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
+#: ../widgets/misc/e-dateedit.c:1505 ../widgets/misc/e-dateedit.c:1719
+msgid "None"
+msgstr "Nenhum(a)"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:1
 msgid "1 day before appointment"
 msgstr "1 dia antes do compromisso"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:3
+#: ../calendar/gui/dialogs/event-page.glade.h:2
 msgid "1 hour before appointment"
 msgstr "1 hora antes do compromisso"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:4
+#: ../calendar/gui/dialogs/event-page.glade.h:3
 msgid "15 minutes before appointment"
 msgstr "15 minutos antes do compromisso"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "<b>Basics</b>"
-msgstr "<b>Básicos</b>"
+msgid "Atte_ndees..."
+msgstr "Participa_ntes..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/dialogs/task-page.glade.h:2
-msgid "<b>Date and Time</b>"
-msgstr "<b>Data e Hora</b>"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "<b>Send Options</b>"
-msgstr "<b>Opções de Envio</b>"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:8
-msgid "A_ll day event"
-msgstr "_Evento de dia completo"
+#: ../calendar/gui/dialogs/memo-page.glade.h:1
+msgid "Ca_tegories..."
+msgstr "Ca_tegorias..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-#: ../calendar/gui/dialogs/task-page.glade.h:4
-msgid "Ad_vanced send options"
-msgstr "Opções a_vançadas de envio"
+msgid "Custom Alarm:"
+msgstr "Alarme Personalizado:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:10
-msgid "C_ustomize..."
-msgstr "Personali_zar..."
+#: ../calendar/gui/dialogs/task-page.glade.h:3
+msgid "D_escription:"
+msgstr "D_escrição:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:11
-#: ../calendar/gui/dialogs/task-page.glade.h:5
-msgid "Ca_tegories..."
-msgstr "Ca_tegorias..."
-
-#: ../calendar/gui/dialogs/event-page.glade.h:12
-msgid "Cale_ndar:"
-msgstr "Cale_ndário:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:13
-#: ../calendar/gui/dialogs/task-page.glade.h:7
-msgid "Classi_fication:"
-msgstr "Classi_ficação:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:360
-msgid "Confidential"
-msgstr "Confidencial"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Event Description"
 msgstr "Descrição do Evento"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:16
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Locat_ion:"
 msgstr "Local_ização:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:17
-#: ../calendar/gui/dialogs/task-page.glade.h:10
-#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:359
-msgid "Private"
-msgstr "Privado"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/task-page.glade.h:11
-#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:358
-msgid "Public"
-msgstr "Público"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:19
-msgid "Show time as _busy"
-msgstr "Apresentar horas como _ocupadas"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:20
-#: ../calendar/gui/dialogs/task-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "Resu_mo:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:21
-msgid "This appointment has customized alarms"
-msgstr "Este compromisso possui alarmes personalizados"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:22
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Alarm"
 msgstr "_Alarme"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:23
-msgid "_Description:"
-msgstr "_Descrição:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:24
-#: ../calendar/gui/e-meeting-time-sel.c:642
-msgid "_End time:"
-msgstr "_Hora de finalização:"
+#: ../calendar/gui/dialogs/event-page.glade.h:17
+msgid "_Time:"
+msgstr "_Tempo:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:25
-#: ../calendar/gui/e-meeting-time-sel.c:615
-msgid "_Start time:"
-msgstr "Hora de _início:"
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/event-page.glade.h:18
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "for"
+msgstr "para"
 
-#: ../calendar/gui/dialogs/meeting-page.c:303
-msgid "<b>Dele_gatees</b>"
-msgstr "<b>Dele_gados</b>"
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][until][2006/01/01]' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/event-page.glade.h:21
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:25
+msgid "until"
+msgstr "até"
 
 #: ../calendar/gui/dialogs/meeting-page.c:307
-msgid "<b>From:</b>"
-msgstr "<b>De:</b>"
+msgid "Dele_gatees"
+msgstr "Dele_gados"
 
-#. an empty string is the same as 'None'
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
 #: ../calendar/gui/dialogs/meeting-page.c:313
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:653
-#: ../calendar/gui/e-itip-control.c:1106 ../composer/e-msg-composer.c:2122
-#: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
-#: ../mail/em-account-editor.c:1348 ../mail/em-account-prefs.c:464
-#: ../mail/em-folder-view.c:1064 ../mail/em-junk-hook.c:78
-#: ../plugins/calendar-weather/calendar-weather.c:370
-#: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
-#: ../plugins/itip-formatter/itip-formatter.c:1627
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
-#: ../widgets/misc/e-cell-date-edit.c:248 ../widgets/misc/e-dateedit.c:465
-#: ../widgets/misc/e-dateedit.c:1504 ../widgets/misc/e-dateedit.c:1673
-msgid "None"
-msgstr "Nenhum(a)"
-
-#: ../calendar/gui/dialogs/meeting-page.c:461
-msgid "The organizer selected no longer has an account."
-msgstr "O organizador seleccionado já não possui uma conta."
-
-#: ../calendar/gui/dialogs/meeting-page.c:467
-msgid "An organizer is required."
-msgstr "É necessário um organizador."
-
-#: ../calendar/gui/dialogs/meeting-page.c:482
-msgid "At least one attendee is required."
-msgstr "É necessário pelo menos um participante."
-
-#: ../calendar/gui/dialogs/meeting-page.c:884
-msgid "_Delegate To..."
-msgstr "_Delegar A..."
+msgid "From:"
+msgstr "De:"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
-#: ../calendar/gui/e-meeting-list-view.c:358
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Participante"
@@ -6103,16 +6277,16 @@ msgstr "Idioma"
 msgid "Member"
 msgstr "Membro"
 
+#. To translators: RSVP means "please reply"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:386
+#: ../calendar/gui/e-meeting-list-view.c:509
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
-msgstr "RSVP"
+msgstr "Responder SFF"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
-#: ../calendar/gui/dialogs/task-editor.c:147
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:394
+#: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
 #: ../mail/message-list.etspec.h:12
 msgid "Status"
@@ -6127,13 +6301,8 @@ msgid "C_hange Organizer"
 msgstr "Alterar o Organi_zador"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:3
-#: ../calendar/gui/e-meeting-time-sel.c:428
-msgid "Con_tacts..."
-msgstr "Con_tactos..."
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "Or_ganizer:"
-msgstr "Or_ganizador:"
+msgid "Co_ntacts..."
+msgstr "Co_ntactos..."
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "Organizer"
@@ -6144,6 +6313,25 @@ msgstr "Organizador"
 msgid "Organizer:"
 msgstr "Organizador:"
 
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2308
+msgid "Memo"
+msgstr "Memo"
+
+#: ../calendar/gui/dialogs/memo-page.c:551
+#, c-format
+msgid "Unable to open memos in '%s'."
+msgstr "Incapaz de abrir os memos em '%s'."
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:2
+#: ../calendar/gui/dialogs/task-page.c:439
+#: ../calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Group:"
+msgstr "_Grupo:"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:3
+msgid "_Memo Content:"
+msgstr "Conteúdo do _Memo:"
+
 #: ../calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Opções de calendário</b>"
@@ -6181,21 +6369,21 @@ msgid "Task List Name"
 msgstr "Nome da Lista de Tarefas"
 
 #: ../calendar/gui/dialogs/recur-comp.c:52
-msgid "You are modifying a recurring event, what would you like to modify?"
-msgstr "Está a alterar um evento recorrente, o que deseja alterar?"
+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:54
-msgid "You are delegating a recurring event, what would like to delegate?"
-msgstr "Está a delegar um evento recorrente, o que deseja delegar?"
+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:58
-msgid "You are modifying a recurring task, what would you like to modify?"
-msgstr "Está a alterar uma tarefa recorrente, o que deseja alterar?"
+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:62
 msgid ""
-"You are modifying a recurring journal entry, what would you like to modify?"
-msgstr "Está a alterar uma entrada de diário recorrente, o que deseja alterar?"
+"You are modifying a recurring journal entry. What would you like to modify?"
+msgstr "Está a alterar uma entrada de diário recorrente. O que deseja alterar?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
@@ -6213,55 +6401,107 @@ msgstr "Esta Instância e Futuras"
 msgid "All Instances"
 msgstr "Todas as Instâncias"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:496
+#: ../calendar/gui/dialogs/recurrence-page.c:494
 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:817
+#: ../calendar/gui/dialogs/recurrence-page.c:815
 msgid "Recurrence date is invalid"
 msgstr "Data de recorrência é inválida"
 
+#. 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:928
 msgid "on"
 msgstr "a"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:988
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "primeiro"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:989
+#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
+#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
+#. * (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:998
 msgid "second"
 msgstr "segundo"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:990
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
+#. * (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:1003
 msgid "third"
 msgstr "terceiro"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:991
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] [Monday] [forever]'
+#. * (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:1008
 msgid "fourth"
 msgstr "quarto"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
+#. * (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:1013
 msgid "last"
 msgstr "último"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1015
+#. 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:1039
 msgid "Other Date"
 msgstr "Outra Data"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * 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:1047
+msgid "1st to 10th"
+msgstr "1º ao 10º"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * 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:1053
+msgid "11th to 20th"
+msgstr "11º ao 20º"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * 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:1059
+msgid "21st to 31st"
+msgstr "21º ao 31º"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1079
 msgid "day"
 msgstr "dia"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1180
+#. 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:1219
 msgid "on the"
 msgstr "no"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1369
+#: ../calendar/gui/dialogs/recurrence-page.c:1408
 msgid "occurrences"
 msgstr "ocorrências"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2325
+#: ../calendar/gui/dialogs/recurrence-page.c:2377
 msgid "Date/Time"
 msgstr "Data/Hora"
 
@@ -6278,44 +6518,46 @@ msgstr "<b>Antever</b>"
 msgid "<b>Recurrence</b>"
 msgstr "<b>Recorrência</b>"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:4
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
 msgid "Every"
 msgstr "A Cada"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "This appointment rec_urs"
 msgstr "Este compromisso _repete-se"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
-msgid "for"
-msgstr "para"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:19
 msgid "forever"
 msgstr "para sempre"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:22
 msgid "month(s)"
 msgstr "mes(es)"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "until"
-msgstr "até"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:12
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:28
 msgid "week(s)"
 msgstr "semana(s)"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
 msgid "year(s)"
 msgstr "ano(s)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:430
+#: ../calendar/gui/dialogs/task-details-page.c:411
+#: ../calendar/gui/dialogs/task-details-page.c:431
 msgid "Completed date is wrong"
 msgstr "Data de finalização incorrecta"
 
-#: ../calendar/gui/dialogs/task-details-page.c:522
+#: ../calendar/gui/dialogs/task-details-page.c:518
 msgid "Web Page"
 msgstr "Página Web"
 
@@ -6330,48 +6572,48 @@ msgstr "<span weight=\"bold\">Estado</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:229
-#: ../calendar/gui/e-cal-model-tasks.c:346
-#: ../calendar/gui/e-cal-model-tasks.c:659
-#: ../calendar/gui/e-calendar-table.c:455 ../calendar/gui/e-itip-control.c:898
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../calendar/gui/print.c:2361 ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/e-cal-component-preview.c:231
+#: ../calendar/gui/e-cal-model-tasks.c:347
+#: ../calendar/gui/e-cal-model-tasks.c:655
+#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Terminada"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-calendar-table.c:380 ../mail/message-list.c:1008
+#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1012
 msgid "High"
 msgstr "Alta"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:226
-#: ../calendar/gui/e-cal-model-tasks.c:344
-#: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-cal-model-tasks.c:732
-#: ../calendar/gui/e-calendar-table.c:454 ../calendar/gui/print.c:2358
+#: ../calendar/gui/e-cal-component-preview.c:228
+#: ../calendar/gui/e-cal-model-tasks.c:345
+#: ../calendar/gui/e-cal-model-tasks.c:653
+#: ../calendar/gui/e-cal-model-tasks.c:728
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2366
 msgid "In Progress"
 msgstr "Em Curso"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1006
+#: ../calendar/gui/e-cal-component-preview.c:254
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1010
 msgid "Low"
 msgstr "Baixa"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:381
-#: ../mail/message-list.c:1007
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-cal-model.c:918 ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "Normal"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:236
-#: ../calendar/gui/e-cal-model-tasks.c:342
-#: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:453 ../calendar/gui/print.c:2355
+#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-cal-model-tasks.c:343
+#: ../calendar/gui/e-cal-model-tasks.c:651
+#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/print.c:2363
 msgid "Not Started"
 msgstr "Por Iniciar"
 
@@ -6380,66 +6622,65 @@ msgid "P_ercent complete:"
 msgstr "P_ercentagem terminada:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:11
-#: ../calendar/gui/e-calendar-table.c:383
+msgid "Stat_us:"
+msgstr "Esta_do:"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/e-calendar-table.c:389
 msgid "Undefined"
 msgstr "Indefinida"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Date completed:"
 msgstr "_Data de finalização:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+#: ../calendar/gui/dialogs/task-details-page.glade.h:14
 #: ../widgets/misc/e-send-options.glade.h:31
 msgid "_Priority:"
 msgstr "_Prioridade:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:14
-msgid "_Status:"
-msgstr "E_stado:"
-
 #: ../calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Web Page:"
 msgstr "Página _Web:"
 
-#: ../calendar/gui/dialogs/task-editor.c:138 ../calendar/gui/print.c:2300
-msgid "Task"
-msgstr "Tarefa"
+#: ../calendar/gui/dialogs/task-editor.c:426
+#: ../calendar/gui/tasks-component.c:1171
+msgid "_Task"
+msgstr "_Tarefa"
 
-#: ../calendar/gui/dialogs/task-editor.c:162
-#: ../calendar/gui/dialogs/task-editor.c:224
-#: ../calendar/gui/dialogs/task-editor.c:378
-msgid "Assignment"
-msgstr "Atribuição"
+#: ../calendar/gui/dialogs/task-editor.c:430
+msgid "Task Details"
+msgstr "Detalhes da Tarefa"
 
-#: ../calendar/gui/dialogs/task-page.c:529
+#: ../calendar/gui/dialogs/task-page.c:825
 msgid "Due date is wrong"
 msgstr "Data de finalização incorrecta"
 
-#: ../calendar/gui/dialogs/task-page.c:873
+#: ../calendar/gui/dialogs/task-page.c:1653
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Incapaz de abrir as tarefas em '%s'."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:9
-msgid "D_escription:"
-msgstr "D_escrição:"
+#: ../calendar/gui/dialogs/task-page.glade.h:2
+msgid "Categor_ies..."
+msgstr "Categor_ias..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:12
+#: ../calendar/gui/dialogs/task-page.glade.h:4
+msgid "Or_ganiser:"
+msgstr "Or_ganizador:"
+
+#: ../calendar/gui/dialogs/task-page.glade.h:5
 msgid "Sta_rt date:"
 msgstr "_Data de início:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:14
-msgid "Task Description"
-msgstr "Descrição da Tarefa"
+#: ../calendar/gui/dialogs/task-page.glade.h:7
+msgid "Time zone:"
+msgstr "Fuso-horário:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:15
+#: ../calendar/gui/dialogs/task-page.glade.h:8
 msgid "_Due date:"
 msgstr "Data de _finalização:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:16
-msgid "_Group:"
-msgstr "_Grupo:"
-
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Free/Busy C_alendars</b>"
 msgstr "<b>C_alendários Livre/Ocupado</b>"
@@ -6465,14 +6706,17 @@ msgid "_Manual"
 msgstr "_Manual"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_Password:"
 msgstr "_Senha:"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Remember password"
 msgstr "_Recordar a senha"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Username:"
 msgstr "_Utilizador:"
 
@@ -6480,131 +6724,143 @@ msgstr "_Utilizador:"
 msgid "_Weekly"
 msgstr "Se_manalmente"
 
-#: ../calendar/gui/e-alarm-list.c:395
+#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:396
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: ../calendar/gui/e-alarm-list.c:400
+#. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:402
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: ../calendar/gui/e-alarm-list.c:405
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d hora"
-msgstr[1] "%d horas"
-
-#: ../calendar/gui/e-alarm-list.c:410
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minuto"
-msgstr[1] "%d minutos"
-
-#: ../calendar/gui/e-alarm-list.c:415
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d segundo"
-msgstr[1] "%d segundos"
-
-#: ../calendar/gui/e-alarm-list.c:462
+#: ../calendar/gui/e-alarm-list.c:464
 msgid "Unknown action to be performed"
 msgstr "Acção desconhecida a ser efectuada"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:476
+#: ../calendar/gui/e-alarm-list.c:478
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s antes do início do compromisso"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:481
+#: ../calendar/gui/e-alarm-list.c:483
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s após o início do compromisso"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:488
+#: ../calendar/gui/e-alarm-list.c:490
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s ao iniciar o compromisso"
 
-#: ../calendar/gui/e-alarm-list.c:497
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:501
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s antes de finalizar o compromisso"
 
-#: ../calendar/gui/e-alarm-list.c:500
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:506
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s após finalizar o compromisso"
 
-#: ../calendar/gui/e-alarm-list.c:505
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:513
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s no final do compromisso"
 
-#: ../calendar/gui/e-alarm-list.c:527
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
+#: ../calendar/gui/e-alarm-list.c:537
 #, c-format
 msgid "%s at %s"
 msgstr "%s em %s"
 
-#: ../calendar/gui/e-alarm-list.c:533
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound". "Trigger types" are absolute or relative dates
+#: ../calendar/gui/e-alarm-list.c:545
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s para um tipo despoletado desconhecido"
 
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2703
+#: ../calendar/gui/e-cal-component-memo-preview.c:72
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2823
 #, c-format
 msgid "Click to open %s"
 msgstr "Clicar para abrir %s"
 
-#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:796
+#: ../calendar/gui/e-cal-component-memo-preview.c:166
+msgid "Memo:"
+msgstr "Memo:"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:199
+#: ../calendar/gui/e-cal-component-preview.c:301
+msgid "Web Page:"
+msgstr "Página Web:"
+
+#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
 msgid "Untitled"
 msgstr "Sem título"
 
-#: ../calendar/gui/e-cal-component-preview.c:186
-#: ../calendar/gui/e-itip-control.c:1110
+#: ../calendar/gui/e-cal-component-preview.c:188
+#: ../calendar/gui/e-itip-control.c:1103
 #: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumo:"
 
-#: ../calendar/gui/e-cal-component-preview.c:193
-#: ../calendar/gui/e-cal-component-preview.c:204
+#: ../calendar/gui/e-cal-component-preview.c:195
+#: ../calendar/gui/e-cal-component-preview.c:206
 msgid "Start Date:"
 msgstr "Data de Início:"
 
-#: ../calendar/gui/e-cal-component-preview.c:215
+#: ../calendar/gui/e-cal-component-preview.c:217
 msgid "Due Date:"
 msgstr "Data de _Término:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:222
-#: ../calendar/gui/e-itip-control.c:1134
-#: ../plugins/exchange-operations/exchange-account-setup.c:263
-#: ../plugins/itip-formatter/itip-view.c:909
+#: ../calendar/gui/e-cal-component-preview.c:224
+#: ../calendar/gui/e-itip-control.c:1127
+#: ../plugins/exchange-operations/exchange-account-setup.c:269
+#: ../plugins/itip-formatter/itip-view.c:905
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:248
 msgid "Priority:"
 msgstr "Prioridade:"
 
-#: ../calendar/gui/e-cal-component-preview.c:299
-msgid "Web Page:"
-msgstr "Página Web:"
+#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:314
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:364
+msgid "Public"
+msgstr "Público"
+
+#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
+#: ../calendar/gui/e-calendar-table.c:365
+msgid "Private"
+msgstr "Privado"
+
+#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:366
+msgid "Confidential"
+msgstr "Confidencial"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
@@ -6616,22 +6872,23 @@ msgstr "Data de Início"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../mail/mail-dialogs.glade.h:16 ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:16
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "Resumo"
 
-#: ../calendar/gui/e-cal-model-calendar.c:180
-#: ../calendar/gui/e-calendar-table.c:432
+#: ../calendar/gui/e-cal-model-calendar.c:183
+#: ../calendar/gui/e-calendar-table.c:438
 msgid "Free"
 msgstr "Livre"
 
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:433
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-cal-model-calendar.c:186
+#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../calendar/gui/e-cal-model-tasks.c:607
+#: ../calendar/gui/e-cal-model-tasks.c:603
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6641,170 +6898,191 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:925
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:168 ../calendar/gui/e-meeting-store.c:178
-#: ../calendar/gui/e-meeting-store.c:808
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
+#: ../calendar/gui/e-meeting-list-view.c:193
+#: ../calendar/gui/e-meeting-store.c:167 ../calendar/gui/e-meeting-store.c:177
+#: ../calendar/gui/e-meeting-store.c:770
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Sim"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:925
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:180
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
+#: ../calendar/gui/e-meeting-list-view.c:194
+#: ../calendar/gui/e-meeting-store.c:179
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Não"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-model.c:330
-#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.c:1292
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1244
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-popup.c:107
+#: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
+#: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
+#: ../calendar/gui/e-meeting-list-view.c:169
+#: ../calendar/gui/e-meeting-list-view.c:183
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:160
+#: ../calendar/gui/e-meeting-store.c:223 ../mail/em-utils.c:1274
 #: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1652
-#: ../plugins/plugin-manager/plugin-manager.c:72
-#: ../widgets/misc/e-attachment-bar.c:659
-#: ../widgets/misc/e-charset-picker.c:62
+#: ../plugins/itip-formatter/itip-formatter.c:1651
+#: ../plugins/plugin-manager/plugin-manager.c:68
+#: ../widgets/misc/e-attachment-bar.c:686
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "Desconhecida"
 
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "Recorrente"
 
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "Atribuída"
 
-#: ../calendar/gui/e-calendar-table.c:402
+#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
+msgid "Save As..."
+msgstr "Gravar Como..."
+
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
+msgid "Select folder to save selected attachments..."
+msgstr "Seleccionar a pasta onde gravar os anexos especificados..."
+
+#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
+#, c-format
+msgid "untitled_image.%s"
+msgstr "imagem_sem_titulo.%s"
+
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+msgid "_Save As..."
+msgstr "Gravar _Como..."
+
+#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:555
+#: ../mail/em-popup.c:566
+msgid "Set as _Background"
+msgstr "Definir como _Fundo"
+
+#: ../calendar/gui/e-cal-popup.c:278
+msgid "_Save Selected"
+msgstr "_Gravar as Seleccionadas"
+
+#: ../calendar/gui/e-cal-popup.c:400 ../mail/em-popup.c:775
+#, c-format
+msgid "Open in %s..."
+msgstr "Abrir em %s..."
+
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:403
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:404
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:405
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:407
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:418
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:514
-msgid "Task Table"
-msgstr "Tabela da Tarefa"
-
-#: ../calendar/gui/e-calendar-table.c:692
-#: ../calendar/gui/e-calendar-view.c:661
+#: ../calendar/gui/e-calendar-table.c:703
+#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:433
 msgid "Deleting selected objects"
 msgstr "A apagar os objectos seleccionados"
 
-#: ../calendar/gui/e-calendar-table.c:871
-#: ../calendar/gui/e-calendar-view.c:789
+#: ../calendar/gui/e-calendar-table.c:882
+#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "A actualizar os objectos"
 
-#: ../calendar/gui/e-calendar-table.c:1012
-#: ../calendar/gui/e-calendar-view.c:1105 ../composer/e-msg-composer.c:1243
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
+#: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "Gravar como..."
 
-#: ../calendar/gui/e-calendar-table.c:1155
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "Abrir Página _Web"
 
-#: ../calendar/gui/e-calendar-table.c:1156
-#: ../calendar/gui/e-calendar-view.c:1529 ../mail/em-folder-view.c:1045
-#: ../mail/em-popup.c:541 ../mail/em-popup.c:552
-msgid "_Save As..."
-msgstr "Gravar _Como..."
-
-#: ../calendar/gui/e-calendar-table.c:1157
-#: ../calendar/gui/e-calendar-view.c:1509
-#: ../calendar/gui/e-calendar-view.c:1530 ../mail/em-folder-view.c:1046
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:120 ../ui/evolution-tasks.xml.h:27
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "Im_primir..."
 
-#: ../calendar/gui/e-calendar-table.c:1161
-#: ../calendar/gui/e-calendar-view.c:1534 ../ui/evolution-addressbook.xml.h:1
-#: ../ui/evolution-calendar.xml.h:1 ../ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
+#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
+#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "C_ortar"
 
-#: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:1512
-#: ../calendar/gui/e-calendar-view.c:1536 ../ui/evolution-addressbook.xml.h:38
-#: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
-#: ../ui/evolution-tasks.xml.h:26
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
+#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
+#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "Co_lar"
 
-#: ../calendar/gui/e-calendar-table.c:1167 ../ui/evolution-tasks.xml.h:20
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Atribuir a Tarefa"
 
-#: ../calendar/gui/e-calendar-table.c:1168 ../ui/evolution-tasks.xml.h:24
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
+#: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Reenviar como iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1169
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "_Marcar como Terminada"
 
-#: ../calendar/gui/e-calendar-table.c:1170
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar as Tarefas Seleccionadas como Terminadas"
 
-#. FIXME: need to disable for undeletable folders
-#: ../calendar/gui/e-calendar-table.c:1174
-#: ../calendar/gui/e-calendar-view.c:1548 ../mail/em-folder-tree.c:2043
-#: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:33
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
-#: ../ui/evolution-tasks.xml.h:22
-msgid "_Delete"
-msgstr "Apa_gar"
-
-#: ../calendar/gui/e-calendar-table.c:1175
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "_Apagar as Tarefas Seleccionadas"
 
-#: ../calendar/gui/e-calendar-table.c:1326
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Clicar para adicionar uma tarefa"
@@ -6814,7 +7092,7 @@ msgstr "Clicar para adicionar uma tarefa"
 msgid "% Complete"
 msgstr "% Terminada"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:617
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:627
 msgid "Complete"
 msgstr "Terminada"
 
@@ -6839,97 +7117,120 @@ msgstr "Data de início"
 msgid "Task sort"
 msgstr "Ordenação de tarefas"
 
-#: ../calendar/gui/e-calendar-view.c:1231
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "A mover itens"
 
-#: ../calendar/gui/e-calendar-view.c:1233
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "A copiar itens"
 
-#: ../calendar/gui/e-calendar-view.c:1503
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "Novo _Compromisso..."
 
-#: ../calendar/gui/e-calendar-view.c:1504
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "Novo _Evento de Dia Completo"
 
-#: ../calendar/gui/e-calendar-view.c:1506
-msgid "New Task"
-msgstr "Nova Tarefa"
+#: ../calendar/gui/e-calendar-view.c:1577
+msgid "New _Meeting"
+msgstr "Nova _Reunião"
+
+#: ../calendar/gui/e-calendar-view.c:1578
+msgid "New _Task"
+msgstr "Nova _Tarefa"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1516
-msgid "Current View"
-msgstr "Vista Actual"
+#: ../calendar/gui/e-calendar-view.c:1588
+msgid "_Current View"
+msgstr "Vista A_ctual"
 
-#: ../calendar/gui/e-calendar-view.c:1518 ../ui/evolution-calendar.xml.h:26
-msgid "Select _Today"
-msgstr "Seleccionar _Hoje"
+#: ../calendar/gui/e-calendar-view.c:1590
+msgid "Select T_oday"
+msgstr "Seleccionar H_oje"
 
-#: ../calendar/gui/e-calendar-view.c:1519
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "_Seleccionar a Data..."
 
-#. TODO: Why is this in a context menu when it applies globally?
-#: ../calendar/gui/e-calendar-view.c:1524 ../ui/evolution-calendar.xml.h:45
-msgid "_Publish Free/Busy Information"
-msgstr "_Publicar a Informação de Livre/Ocupado"
-
-#: ../calendar/gui/e-calendar-view.c:1540
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "Cop_iar para o Calendário..."
 
-#: ../calendar/gui/e-calendar-view.c:1541
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver para o Calendário..."
 
-#: ../calendar/gui/e-calendar-view.c:1542
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "_Delegar Reunião..."
 
-#: ../calendar/gui/e-calendar-view.c:1543
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "A_gendar Reunião..."
 
-#: ../calendar/gui/e-calendar-view.c:1544
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "_Reenviar como iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1549
+#: ../calendar/gui/e-calendar-view.c:1612
+msgid "_Reply"
+msgstr "_Responder"
+
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
+#: ../mail/em-popup.c:559 ../mail/em-popup.c:570
+#: ../ui/evolution-mail-message.xml.h:82
+msgid "Reply to _All"
+msgstr "Responder _a Todos"
+
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "Tornar esta Ocorrência _Móvel"
 
-#: ../calendar/gui/e-calendar-view.c:1550
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Apagar esta _Ocorrência"
 
-#: ../calendar/gui/e-calendar-view.c:1551
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "_Apagar Todas as Ocorrências"
 
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-view.c:2030
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organizador: %s <%s>"
+
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-view.c:2034
+#, c-format
+msgid "Organizer: %s"
+msgstr "Organizador: %s"
+
+#. To Translators: It will display "Location: PlaceOfTheMeeting"
+#: ../calendar/gui/e-calendar-view.c:2050 ../calendar/gui/print.c:2336
+#, c-format
+msgid "Location: %s"
+msgstr "Localização: %s"
+
+#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
+#: ../calendar/gui/e-calendar-view.c:2081
+#, c-format
+msgid "Time: %s %s"
+msgstr "Hora: %s %s"
+
 #. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
-#: ../calendar/gui/e-cell-date-edit-text.c:115 ../e-util/e-time-utils.c:180
-#: ../e-util/e-time-utils.c:393
+#: ../calendar/gui/e-cell-date-edit-text.c:116
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
-#: ../calendar/gui/e-cell-date-edit-text.c:118 ../e-util/e-time-utils.c:175
-#: ../e-util/e-time-utils.c:402
+#: ../calendar/gui/e-cell-date-edit-text.c:119
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:123
+#: ../calendar/gui/e-cell-date-edit-text.c:124
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -6940,7 +7241,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../calendar/gui/e-day-view-time-item.c:553
+#. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
+#. * to change the length of the time division in the calendar day view, e.g.
+#. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
+#.
+#: ../calendar/gui/e-day-view-time-item.c:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i divisões de minuto"
@@ -6951,111 +7256,111 @@ msgstr "%02i divisões de minuto"
 #. 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:715 ../calendar/gui/e-day-view.c:1493
-#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1517
+#: ../calendar/gui/e-day-view-top-item.c:707 ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1525
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:512
+#: ../calendar/gui/e-day-view.c:744 ../calendar/gui/e-week-view.c:503
 #: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:751 ../calendar/gui/e-week-view.c:515
+#: ../calendar/gui/e-day-view.c:747 ../calendar/gui/e-week-view.c:506
 #: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:763
+#: ../calendar/gui/e-itip-control.c:759
 msgid "Yes. (Complex Recurrence)"
 msgstr "Sim. (Recorrência Complexa)"
 
-#: ../calendar/gui/e-itip-control.c:774
+#: ../calendar/gui/e-itip-control.c:770
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Todos os dias"
 msgstr[1] "Todos os %d dias"
 
-#: ../calendar/gui/e-itip-control.c:779
+#: ../calendar/gui/e-itip-control.c:775
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Todas as semanas"
 msgstr[1] "Todas as %d semanas"
 
-#: ../calendar/gui/e-itip-control.c:781
+#: ../calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Todas as semanas à "
 msgstr[1] "Todas as %d semanas à "
 
-#: ../calendar/gui/e-itip-control.c:789
+#: ../calendar/gui/e-itip-control.c:785
 msgid " and "
 msgstr " e "
 
-#: ../calendar/gui/e-itip-control.c:796
+#: ../calendar/gui/e-itip-control.c:792
 #, c-format
 msgid "The %s day of "
 msgstr "O %s dia de "
 
-#: ../calendar/gui/e-itip-control.c:809
+#: ../calendar/gui/e-itip-control.c:805
 #, c-format
 msgid "The %s %s of "
 msgstr "O %s %s de "
 
-#: ../calendar/gui/e-itip-control.c:816
+#: ../calendar/gui/e-itip-control.c:812
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "todos os meses"
 msgstr[1] "todos os %d meses"
 
-#: ../calendar/gui/e-itip-control.c:820
+#: ../calendar/gui/e-itip-control.c:816
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Todos os anos"
 msgstr[1] "Todos os %d anos"
 
-#: ../calendar/gui/e-itip-control.c:831
+#: ../calendar/gui/e-itip-control.c:827
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " um total de %d vez"
 msgstr[1] " um total de %d vezes"
 
-#: ../calendar/gui/e-itip-control.c:840
+#: ../calendar/gui/e-itip-control.c:836
 msgid ", ending on "
 msgstr ", a terminar em "
 
-#: ../calendar/gui/e-itip-control.c:864
+#: ../calendar/gui/e-itip-control.c:857
 msgid "Starts"
 msgstr "Inicia-se"
 
-#: ../calendar/gui/e-itip-control.c:877
+#: ../calendar/gui/e-itip-control.c:870
 msgid "Ends"
 msgstr "Termina"
 
-#: ../calendar/gui/e-itip-control.c:911
+#: ../calendar/gui/e-itip-control.c:904
 #: ../plugins/save-calendar/csv-format.c:395
 msgid "Due"
 msgstr "Limite"
 
-#: ../calendar/gui/e-itip-control.c:951 ../calendar/gui/e-itip-control.c:1008
+#: ../calendar/gui/e-itip-control.c:944 ../calendar/gui/e-itip-control.c:1001
 msgid "iCalendar Information"
 msgstr "Informação de iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:968
+#: ../calendar/gui/e-itip-control.c:961
 msgid "iCalendar Error"
 msgstr "Erro de iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1040 ../calendar/gui/e-itip-control.c:1056
-#: ../calendar/gui/e-itip-control.c:1067 ../calendar/gui/e-itip-control.c:1084
+#: ../calendar/gui/e-itip-control.c:1033 ../calendar/gui/e-itip-control.c:1049
+#: ../calendar/gui/e-itip-control.c:1060 ../calendar/gui/e-itip-control.c:1077
 #: ../plugins/itip-formatter/itip-view.c:338
 #: ../plugins/itip-formatter/itip-view.c:339
 #: ../plugins/itip-formatter/itip-view.c:406
@@ -7064,7 +7369,7 @@ msgid "An unknown person"
 msgstr "Uma pessoa desconhecida"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1091
+#: ../calendar/gui/e-itip-control.c:1084
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7072,298 +7377,295 @@ msgstr ""
 "<br> Reveja a informação seguinte e depois seleccione uma acção do menu "
 "abaixo."
 
-#: ../calendar/gui/e-itip-control.c:1139
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:548
-#: ../plugins/itip-formatter/itip-formatter.c:1640
+#: ../calendar/gui/e-itip-control.c:1132
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/itip-utils.c:669
+#: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
 msgstr "Aceite"
 
-#: ../calendar/gui/e-itip-control.c:1143 ../calendar/gui/itip-utils.c:551
-#: ../plugins/itip-formatter/itip-formatter.c:1643
+#: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:672
+#: ../plugins/itip-formatter/itip-formatter.c:1642
 msgid "Tentatively Accepted"
 msgstr "Aceite Tentativamente"
 
-#: ../calendar/gui/e-itip-control.c:1147
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/itip-utils.c:554 ../calendar/gui/itip-utils.c:583
-#: ../plugins/itip-formatter/itip-formatter.c:1646
+#: ../calendar/gui/e-itip-control.c:1140
+#: ../calendar/gui/e-meeting-list-view.c:206
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
+#: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
 msgstr "Recusada"
 
-#: ../calendar/gui/e-itip-control.c:1231
+#: ../calendar/gui/e-itip-control.c:1224
 msgid ""
-"The meeting has been cancelled, however it could not be found in your "
+"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 no seu calendário"
+"A reunião foi cancelada, no entanto não foi encontrada nos seus calendários"
 
-#: ../calendar/gui/e-itip-control.c:1233
+#: ../calendar/gui/e-itip-control.c:1226
 msgid ""
-"The task has been cancelled, however it could not be found in your task lists"
+"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 na sua lista de tarefas"
+"A tarefa foi cancelada, no entanto não foi encontrada nas suas listas de "
+"tarefas"
 
-#: ../calendar/gui/e-itip-control.c:1312
+#: ../calendar/gui/e-itip-control.c:1305
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> publicou informação de reunião."
 
-#: ../calendar/gui/e-itip-control.c:1313
+#: ../calendar/gui/e-itip-control.c:1306
 msgid "Meeting Information"
 msgstr "Informação de Reunião"
 
-#: ../calendar/gui/e-itip-control.c:1319
+#: ../calendar/gui/e-itip-control.c:1312
 #, 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."
 
-#: ../calendar/gui/e-itip-control.c:1321
+#: ../calendar/gui/e-itip-control.c:1314
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> pede a sua presença na reunião."
 
-#: ../calendar/gui/e-itip-control.c:1322
+#: ../calendar/gui/e-itip-control.c:1315
 msgid "Meeting Proposal"
 msgstr "Proposta de Reunião"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1328
+#: ../calendar/gui/e-itip-control.c:1321
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> deseja adicionar a uma reunião existente."
 
-#: ../calendar/gui/e-itip-control.c:1329
+#: ../calendar/gui/e-itip-control.c:1322
 msgid "Meeting Update"
 msgstr "Actualização de Reunião"
 
-#: ../calendar/gui/e-itip-control.c:1333
+#: ../calendar/gui/e-itip-control.c:1326
 #, 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."
 
-#: ../calendar/gui/e-itip-control.c:1334
+#: ../calendar/gui/e-itip-control.c:1327
 msgid "Meeting Update Request"
 msgstr "Pedido de Actualização de Reunião"
 
-#: ../calendar/gui/e-itip-control.c:1341
+#: ../calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> respondeu a um pedido de reunião."
 
-#: ../calendar/gui/e-itip-control.c:1342
+#: ../calendar/gui/e-itip-control.c:1335
 msgid "Meeting Reply"
 msgstr "Resposta de Reunião"
 
-#: ../calendar/gui/e-itip-control.c:1349
+#: ../calendar/gui/e-itip-control.c:1342
 #, c-format
-msgid "<b>%s</b> has cancelled a meeting."
+msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> cancelou uma reunião."
 
-#: ../calendar/gui/e-itip-control.c:1350
-msgid "Meeting Cancellation"
+#: ../calendar/gui/e-itip-control.c:1343
+msgid "Meeting Cancelation"
 msgstr "Cancelamento de Reunião"
 
-#: ../calendar/gui/e-itip-control.c:1360 ../calendar/gui/e-itip-control.c:1437
-#: ../calendar/gui/e-itip-control.c:1477
+#: ../calendar/gui/e-itip-control.c:1353 ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1470
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> enviou uma mensagem imperceptível."
 
-#: ../calendar/gui/e-itip-control.c:1361
+#: ../calendar/gui/e-itip-control.c:1354
 msgid "Bad Meeting Message"
 msgstr "Mensagem de Reunião Inválida"
 
-#: ../calendar/gui/e-itip-control.c:1388
+#: ../calendar/gui/e-itip-control.c:1381
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> publicou informação de tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1389
+#: ../calendar/gui/e-itip-control.c:1382
 msgid "Task Information"
 msgstr "Informação de Tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1389
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> requer que %s execute uma tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1398
+#: ../calendar/gui/e-itip-control.c:1391
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> requer que uma tarefa seja executada por si."
 
-#: ../calendar/gui/e-itip-control.c:1399
+#: ../calendar/gui/e-itip-control.c:1392
 msgid "Task Proposal"
 msgstr "Proposta de Tarefa"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1398
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> deseja adicionar a uma tarefa existente."
 
-#: ../calendar/gui/e-itip-control.c:1406
+#: ../calendar/gui/e-itip-control.c:1399
 msgid "Task Update"
 msgstr "Actualização de Tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1410
+#: ../calendar/gui/e-itip-control.c:1403
 #, 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."
 
-#: ../calendar/gui/e-itip-control.c:1411
+#: ../calendar/gui/e-itip-control.c:1404
 msgid "Task Update Request"
 msgstr "Pedido de Actualização de Tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1418
+#: ../calendar/gui/e-itip-control.c:1411
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> respondeu a uma atribuição de tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1419
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Task Reply"
 msgstr "Resposta a Tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1426
+#: ../calendar/gui/e-itip-control.c:1419
 #, c-format
-msgid "<b>%s</b> has cancelled a task."
+msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> cancelou uma tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1427
-msgid "Task Cancellation"
+#: ../calendar/gui/e-itip-control.c:1420
+msgid "Task Cancelation"
 msgstr "Cancelamento de Tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1438
+#: ../calendar/gui/e-itip-control.c:1431
 msgid "Bad Task Message"
 msgstr "Mensagem de Tarefa Inválida"
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1455
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> publicou informação de livre/ocupado."
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1456
 msgid "Free/Busy Information"
 msgstr "Informação de Livre/Ocupado"
 
-#: ../calendar/gui/e-itip-control.c:1467
+#: ../calendar/gui/e-itip-control.c:1460
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> pede a sua informação de livre/ocupado."
 
-#: ../calendar/gui/e-itip-control.c:1468
+#: ../calendar/gui/e-itip-control.c:1461
 msgid "Free/Busy Request"
 msgstr "Pedido de Livre/Ocupado"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1465
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> respondeu a um pedido de livre/ocupado."
 
-#: ../calendar/gui/e-itip-control.c:1473
+#: ../calendar/gui/e-itip-control.c:1466
 msgid "Free/Busy Reply"
 msgstr "Resposta de Livre/Ocupado"
 
-#: ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1471
 msgid "Bad Free/Busy Message"
 msgstr "Mensagem de Livre/Ocupado Inválida"
 
-#: ../calendar/gui/e-itip-control.c:1553
+#: ../calendar/gui/e-itip-control.c:1546
 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:1612
+#: ../calendar/gui/e-itip-control.c:1605
 msgid "The message contains only unsupported requests."
 msgstr "A mensagem apenas contém pedidos não suportados."
 
-#: ../calendar/gui/e-itip-control.c:1645
+#: ../calendar/gui/e-itip-control.c:1638
 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:1677
+#: ../calendar/gui/e-itip-control.c:1670
 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:1911
+#: ../calendar/gui/e-itip-control.c:1904
 msgid "Update complete\n"
 msgstr "Actualização terminada\n"
 
-#: ../calendar/gui/e-itip-control.c:1939
+#: ../calendar/gui/e-itip-control.c:1932
 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:1949
+#: ../calendar/gui/e-itip-control.c:1942
 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:1961
+#: ../calendar/gui/e-itip-control.c:1954
 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:1978
+#: ../calendar/gui/e-itip-control.c:1971
 msgid "Attendee status updated\n"
 msgstr "Estado de participante actualizado\n"
 
-#: ../calendar/gui/e-itip-control.c:1981
-#: ../plugins/itip-formatter/itip-formatter.c:1025
+#: ../calendar/gui/e-itip-control.c:1974
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 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:2011
-msgid "Removal Complete"
-msgstr "Acção de Remoção Terminada"
-
-#: ../calendar/gui/e-itip-control.c:2034 ../calendar/gui/e-itip-control.c:2082
+#: ../calendar/gui/e-itip-control.c:1998 ../calendar/gui/e-itip-control.c:2046
 msgid "Item sent!\n"
 msgstr "Item enviado!\n"
 
-#: ../calendar/gui/e-itip-control.c:2036 ../calendar/gui/e-itip-control.c:2086
+#: ../calendar/gui/e-itip-control.c:2000 ../calendar/gui/e-itip-control.c:2050
 msgid "The item could not be sent!\n"
 msgstr "O item não pode ser enviado!\n"
 
-#: ../calendar/gui/e-itip-control.c:2166
+#: ../calendar/gui/e-itip-control.c:2130
 msgid "Choose an action:"
 msgstr "Seleccione uma acção:"
 
-#: ../calendar/gui/e-itip-control.c:2237
+#: ../calendar/gui/e-itip-control.c:2202
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../calendar/gui/e-itip-control.c:2265
+#: ../calendar/gui/e-itip-control.c:2230
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Aceitar"
 
-#: ../calendar/gui/e-itip-control.c:2266
+#: ../calendar/gui/e-itip-control.c:2231
 msgid "Tentatively accept"
 msgstr "Aceitar tentativamente"
 
-#: ../calendar/gui/e-itip-control.c:2267
+#: ../calendar/gui/e-itip-control.c:2232
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Recusar"
 
-#: ../calendar/gui/e-itip-control.c:2296
+#: ../calendar/gui/e-itip-control.c:2261
 msgid "Send Free/Busy Information"
 msgstr "Enviar Informação de Livre/Ocupado"
 
-#: ../calendar/gui/e-itip-control.c:2324
+#: ../calendar/gui/e-itip-control.c:2289
 msgid "Update respondent status"
 msgstr "Actualizar o estado das respostas"
 
-#: ../calendar/gui/e-itip-control.c:2352
+#: ../calendar/gui/e-itip-control.c:2317
 msgid "Send Latest Information"
 msgstr "Enviar a Mais Recente Informação"
 
-#: ../calendar/gui/e-itip-control.c:2380 ../calendar/gui/itip-utils.c:571
-#: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
+#: ../calendar/gui/e-itip-control.c:2345 ../calendar/gui/itip-utils.c:692
+#: ../mail/mail-send-recv.c:423 ../mail/mail-send-recv.c:476
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
@@ -7405,94 +7707,99 @@ msgstr "data-finalização"
 msgid "date-start"
 msgstr "data-início"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Chair Persons"
 msgstr "Coordenadores"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
-#: ../calendar/gui/e-meeting-list-view.c:153
+#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:154
 msgid "Required Participants"
 msgstr "Participantes Requeridos"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:72
 msgid "Optional Participants"
 msgstr "Participantes Opcionais"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:73
 msgid "Resources"
 msgstr "Recursos"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:802
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
+#: ../calendar/gui/e-meeting-store.c:764
 msgid "Individual"
 msgstr "Individual"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Grupo"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-list-view.c:167
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Resource"
 msgstr "Recurso"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-list-view.c:168
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 msgid "Room"
 msgstr "Sala"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
 msgid "Chair"
 msgstr "Coordenador"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:805
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
+#: ../calendar/gui/e-meeting-store.c:767
 msgid "Required Participant"
 msgstr "Participante Requerido"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Optional Participant"
 msgstr "Participante Opcional"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 msgid "Non-Participant"
 msgstr "Não-Participante"
 
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-store.c:815
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
+#: ../calendar/gui/e-meeting-store.c:777
 msgid "Needs Action"
 msgstr "Requer Acção"
 
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-list-view.c:207
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Tentativa"
 
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/itip-utils.c:557
-#: ../plugins/itip-formatter/itip-formatter.c:1649
+#: ../calendar/gui/e-meeting-list-view.c:208
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/itip-utils.c:678
+#: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
 msgstr "Delegada"
 
-#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#. The extra space is just a hack to occupy more space for Attendee
+#: ../calendar/gui/e-meeting-list-view.c:470
+msgid "Attendee                          "
+msgstr "Participante                      "
+
+#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
 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:444
-#: ../calendar/gui/e-meeting-time-sel.c:2102
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2098
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
@@ -7500,83 +7807,95 @@ msgstr "%A, %d %B, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
-#: ../calendar/gui/e-meeting-time-sel-item.c:448
-#: ../calendar/gui/e-meeting-time-sel.c:2135 ../e-util/e-time-utils.c:203
-#: ../e-util/e-time-utils.c:296 ../e-util/e-time-utils.c:384
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2131
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
-#: ../calendar/gui/e-meeting-time-sel-item.c:452 ../e-util/e-time-utils.c:238
-#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1682
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Fora do Escritório"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Nenhuma Informação"
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:427
+msgid "A_ttendees..."
+msgstr "Par_ticipantes..."
+
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "O_pções"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "Apenas apresentar as h_oras úteis"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "Apresentar com _zoom reduzido"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "Act_ualizar livre/ocupado"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "_Autoselecção"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "Tod_as as pessoas e recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "Todas as _pessoas e um recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "Pessoas _requeridas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "Pessoas requeridas e _um recurso"
 
-#: ../calendar/gui/e-pub-utils.c:300
-#, c-format
-msgid "Enter the password for %s"
-msgstr "Introduza a senha para %s"
+#: ../calendar/gui/e-meeting-time-sel.c:614
+msgid "_Start time:"
+msgstr "Hora de _início:"
+
+#: ../calendar/gui/e-meeting-time-sel.c:641
+msgid "_End time:"
+msgstr "_Hora de finalização:"
+
+#: ../calendar/gui/e-memo-table.c:870
+msgid "_Delete Selected Memos"
+msgstr "_Apagar os Memos Seleccionados"
+
+#: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
+msgid "Click to add a memo"
+msgstr "Clicar para adicionar um memo"
+
+#: ../calendar/gui/e-memo-table.etspec.h:3
+msgid "Memo sort"
+msgstr "Ordenação de memos"
 
-#: ../calendar/gui/e-tasks.c:798 ../calendar/gui/gnome-cal.c:2532
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
+#: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7585,73 +7904,84 @@ msgstr ""
 "Erro em %s:\n"
 " %s"
 
-#: ../calendar/gui/e-tasks.c:846
+#: ../calendar/gui/e-memos.c:772
+msgid "Loading memos"
+msgstr "A ler os memos"
+
+#: ../calendar/gui/e-memos.c:853
+#, c-format
+msgid "Opening memos at %s"
+msgstr "A abrir os memos em %s"
+
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
+msgid "Deleting selected objects..."
+msgstr "A apagar os objectos seleccionados..."
+
+#: ../calendar/gui/e-pub-utils.c:322
+#, c-format
+msgid "Enter the password for %s"
+msgstr "Introduza a senha para %s"
+
+#: ../calendar/gui/e-tasks.c:884
 msgid "Loading tasks"
 msgstr "A ler as tarefas"
 
-#: ../calendar/gui/e-tasks.c:930
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "A abrir tarefas em %s"
 
-#: ../calendar/gui/e-tasks.c:1126
+#: ../calendar/gui/e-tasks.c:1216
 msgid "Completing tasks..."
 msgstr "A terminar as tarefas..."
 
-#: ../calendar/gui/e-tasks.c:1149
-msgid "Deleting selected objects..."
-msgstr "A apagar os objectos seleccionados..."
-
-#: ../calendar/gui/e-tasks.c:1176
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr "A expurgar"
 
 #: ../calendar/gui/e-timezone-entry.c:133
-msgid "Timezone Button"
-msgstr "Botão de Fuso-Horário"
+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:329 ../calendar/gui/print.c:1501
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:789
+#: ../calendar/gui/gnome-cal.c:786
 msgid "Updating query"
 msgstr "A actualizar a consulta"
 
-#. bonobo displays this string so it must be in locale
-#: ../calendar/gui/gnome-cal.c:2209 ../widgets/menus/gal-view-instance.c:585
-#: ../widgets/menus/gal-view-menus.c:350
-msgid "Custom View"
-msgstr "Vista Personalizada"
+#: ../calendar/gui/gnome-cal.c:2234
+msgid "_Custom View"
+msgstr "Vista _Personalizada"
 
-#: ../calendar/gui/gnome-cal.c:2210 ../widgets/menus/gal-view-instance.c:586
-msgid "Save Custom View"
-msgstr "Gravar a Vista Personalizada"
+#: ../calendar/gui/gnome-cal.c:2235
+msgid "_Save Custom View"
+msgstr "_Gravar a Vista Personalizada"
 
-#: ../calendar/gui/gnome-cal.c:2215 ../widgets/menus/gal-view-instance.c:590
-#: ../widgets/menus/gal-view-menus.c:372
-msgid "Define Views..."
-msgstr "Definir as Vistas..."
+#: ../calendar/gui/gnome-cal.c:2240
+msgid "_Define Views..."
+msgstr "_Definir as Vistas..."
 
-#: ../calendar/gui/gnome-cal.c:2378
+#: ../calendar/gui/gnome-cal.c:2402
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "A ler os compromisso em %s"
 
-#: ../calendar/gui/gnome-cal.c:2397
+#: ../calendar/gui/gnome-cal.c:2421
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "A ler as tarefas em %s"
 
-#: ../calendar/gui/gnome-cal.c:2498
+#: ../calendar/gui/gnome-cal.c:2525
 #, c-format
 msgid "Opening %s"
 msgstr "A abrir %s"
 
-#: ../calendar/gui/gnome-cal.c:3388
+#: ../calendar/gui/gnome-cal.c:3430
 msgid "Purging"
 msgstr "A expurgar"
 
@@ -7711,61 +8041,138 @@ msgstr "Setembro"
 msgid "_Select Today"
 msgstr "_Seleccionar Hoje"
 
-#: ../calendar/gui/itip-utils.c:353 ../calendar/gui/itip-utils.c:402
-#: ../calendar/gui/itip-utils.c:442
+#: ../calendar/gui/itip-utils.c:412 ../calendar/gui/itip-utils.c:461
+#: ../calendar/gui/itip-utils.c:563
 msgid "An organizer must be set."
 msgstr "Tem de ser definido um organizador."
 
-#: ../calendar/gui/itip-utils.c:389
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "É necessário pelo menos um participante"
 
-#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:632
+#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:754
 msgid "Event information"
 msgstr "Informação do evento"
 
-#: ../calendar/gui/itip-utils.c:512 ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:756
 msgid "Task information"
 msgstr "Informação da tarefa"
 
-#: ../calendar/gui/itip-utils.c:514 ../calendar/gui/itip-utils.c:636
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:758
 msgid "Journal information"
 msgstr "Informação de diário"
 
-#: ../calendar/gui/itip-utils.c:516 ../calendar/gui/itip-utils.c:654
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:776
 msgid "Free/Busy information"
 msgstr "Informação de livre/ocupado"
 
-#: ../calendar/gui/itip-utils.c:518
+#: ../calendar/gui/itip-utils.c:639
 msgid "Calendar information"
 msgstr "Informação de calendário"
 
-#: ../calendar/gui/itip-utils.c:567
+#: ../calendar/gui/itip-utils.c:688
 msgid "Updated"
 msgstr "Actualizado"
 
-#: ../calendar/gui/itip-utils.c:575
+#: ../calendar/gui/itip-utils.c:696
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: ../calendar/gui/itip-utils.c:579
+#: ../calendar/gui/itip-utils.c:700
 msgid "Counter-proposal"
 msgstr "Contra-proposta"
 
-#: ../calendar/gui/itip-utils.c:650
+#: ../calendar/gui/itip-utils.c:772
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informação de livre/ocupado (%s para %s)"
 
-#: ../calendar/gui/itip-utils.c:660
+#: ../calendar/gui/itip-utils.c:782
 msgid "iCalendar information"
 msgstr "Informação de iCalendar"
 
-#: ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:937
 msgid "You must be an attendee of the event."
 msgstr "Tem de ser um participante do evento."
 
-#: ../calendar/gui/migration.c:151
+#: ../calendar/gui/memos-component.c:451 ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Copiar"
+
+#: ../calendar/gui/memos-component.c:452 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
+#: ../ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Apagar"
+
+#: ../calendar/gui/memos-component.c:453
+msgid "Properties..."
+msgstr "Propriedades..."
+
+#: ../calendar/gui/memos-component.c:526
+#, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] "%d memo"
+msgstr[1] "%d memos"
+
+#: ../calendar/gui/memos-component.c:528 ../calendar/gui/tasks-component.c:519
+#: ../mail/mail-component.c:560
+#, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] ", %d seleccionada"
+msgstr[1] ", %d seleccionadas"
+
+#: ../calendar/gui/memos-component.c:575
+msgid "Failed upgrading memos."
+msgstr "Falha ao actualizar os memos."
+
+#: ../calendar/gui/memos-component.c:871
+#, c-format
+msgid "Unable to open the memo list '%s' for creating events and meetings"
+msgstr "Incapaz de abrir a lista de memos '%s' para criar eventos e reuniões"
+
+#: ../calendar/gui/memos-component.c:884
+msgid "There is no calendar available for creating memos"
+msgstr "Não existe nenhum calendário disponível para criar memos"
+
+#: ../calendar/gui/memos-component.c:972
+msgid "Memo Source Selector"
+msgstr "Selector de Origem da Memos"
+
+#: ../calendar/gui/memos-component.c:1155
+msgid "New memo"
+msgstr "Novo memo"
+
+#: ../calendar/gui/memos-component.c:1156
+msgid "_Memo"
+msgstr "_Memo"
+
+#: ../calendar/gui/memos-component.c:1157
+msgid "Create a new memo"
+msgstr "Criar um novo memo"
+
+#: ../calendar/gui/memos-component.c:1163
+msgid "New memo list"
+msgstr "Nova lista de memos"
+
+#: ../calendar/gui/memos-component.c:1164
+msgid "Memo l_ist"
+msgstr "L_ista de memos"
+
+#: ../calendar/gui/memos-component.c:1165
+msgid "Create a new memo list"
+msgstr "Criar uma nova lista de memos"
+
+#: ../calendar/gui/memos-control.c:340
+msgid "Print Memos"
+msgstr "Imprimir Memos"
+
+#: ../calendar/gui/migration.c:162
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -7777,7 +8184,7 @@ msgstr ""
 "\n"
 "Aguarde enquanto o Evolution migra as suas pastas..."
 
-#: ../calendar/gui/migration.c:155
+#: ../calendar/gui/migration.c:166
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -7790,327 +8197,320 @@ msgstr ""
 "Aguarde enquanto o Evolution migra as suas pastas..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:748 ../calendar/gui/migration.c:915
+#: ../calendar/gui/migration.c:765 ../calendar/gui/migration.c:933
 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
-#: ../calendar/gui/migration.c:777
+#: ../calendar/gui/migration.c:794
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Incapaz de migrar o calendário `%s'"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:944
+#: ../calendar/gui/migration.c:962
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Incapaz de migrar as tarefas `%s'"
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:493
 msgid "1st"
 msgstr "1º"
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:493
 msgid "2nd"
 msgstr "2º"
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:493
 msgid "3rd"
 msgstr "3º"
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:493
 msgid "4th"
 msgstr "4º"
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:493
 msgid "5th"
 msgstr "5º"
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:494
 msgid "6th"
 msgstr "6º"
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:494
 msgid "7th"
 msgstr "7º"
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:494
 msgid "8th"
 msgstr "8º"
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:494
 msgid "9th"
 msgstr "9º"
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:494
 msgid "10th"
 msgstr "10º"
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:495
 msgid "11th"
 msgstr "11º"
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:495
 msgid "12th"
 msgstr "12º"
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:495
 msgid "13th"
 msgstr "13º"
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:495
 msgid "14th"
 msgstr "14º"
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:495
 msgid "15th"
 msgstr "15º"
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:496
 msgid "16th"
 msgstr "16º"
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:496
 msgid "17th"
 msgstr "17º"
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:496
 msgid "18th"
 msgstr "18º"
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:496
 msgid "19th"
 msgstr "19º"
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:496
 msgid "20th"
 msgstr "20º"
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:497
 msgid "21st"
 msgstr "21º"
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:497
 msgid "22nd"
 msgstr "22º"
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:497
 msgid "23rd"
 msgstr "23º"
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:497
 msgid "24th"
 msgstr "24º"
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:497
 msgid "25th"
 msgstr "25º"
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:498
 msgid "26th"
 msgstr "26º"
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:498
 msgid "27th"
 msgstr "27º"
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:498
 msgid "28th"
 msgstr "28º"
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:498
 msgid "29th"
 msgstr "29º"
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:498
 msgid "30th"
 msgstr "30º"
 
-#: ../calendar/gui/print.c:498
+#: ../calendar/gui/print.c:499
 msgid "31st"
 msgstr "31º"
 
-#: ../calendar/gui/print.c:573
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
+#: ../calendar/gui/print.c:574
 msgid "Su"
 msgstr "Do"
 
-#: ../calendar/gui/print.c:573
+#: ../calendar/gui/print.c:574
 msgid "Mo"
 msgstr "Sg"
 
-#: ../calendar/gui/print.c:573
+#: ../calendar/gui/print.c:574
 msgid "Tu"
 msgstr "Te"
 
-#: ../calendar/gui/print.c:573
+#: ../calendar/gui/print.c:574
 msgid "We"
 msgstr "Qa"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:575
 msgid "Th"
 msgstr "Qi"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:575
 msgid "Fr"
 msgstr "Sx"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:575
 msgid "Sa"
 msgstr "Sá"
 
 #. Day
-#: ../calendar/gui/print.c:1917
+#: ../calendar/gui/print.c:1923
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Dia seleccionado (%a %d %b %Y)"
 
-#: ../calendar/gui/print.c:1942 ../calendar/gui/print.c:1946
+#: ../calendar/gui/print.c:1948 ../calendar/gui/print.c:1952
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: ../calendar/gui/print.c:1943
+#: ../calendar/gui/print.c:1949
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: ../calendar/gui/print.c:1947 ../calendar/gui/print.c:1949
-#: ../calendar/gui/print.c:1950
+#: ../calendar/gui/print.c:1953 ../calendar/gui/print.c:1955
+#: ../calendar/gui/print.c:1956
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: ../calendar/gui/print.c:1954
+#: ../calendar/gui/print.c:1960
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Semana seleccionada (%s - %s)"
 
 #. Month
-#: ../calendar/gui/print.c:1962
+#: ../calendar/gui/print.c:1968
 msgid "Selected month (%b %Y)"
 msgstr "Mês seleccionado (%b %Y)"
 
 #. Year
-#: ../calendar/gui/print.c:1969
+#: ../calendar/gui/print.c:1975
 msgid "Selected year (%Y)"
 msgstr "Ano seleccionado (%Y)"
 
-#: ../calendar/gui/print.c:2320
-#, c-format
-msgid "Summary: %s"
-msgstr "Resumo: %s"
+#: ../calendar/gui/print.c:2304
+msgid "Appointment"
+msgstr "Compromisso"
+
+#: ../calendar/gui/print.c:2306
+msgid "Task"
+msgstr "Tarefa"
 
 #: ../calendar/gui/print.c:2328
 #, c-format
-msgid "Location: %s"
-msgstr "Localização: %s"
+msgid "Summary: %s"
+msgstr "Resumo: %s"
 
-#: ../calendar/gui/print.c:2371
+#: ../calendar/gui/print.c:2379
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:2388
+#: ../calendar/gui/print.c:2396
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridade: %s"
 
-#: ../calendar/gui/print.c:2400
+#: ../calendar/gui/print.c:2408
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Percentagem Terminada: %i"
 
-#: ../calendar/gui/print.c:2412
+#: ../calendar/gui/print.c:2420
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2426
+#: ../calendar/gui/print.c:2434
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorias: %s"
 
-#: ../calendar/gui/print.c:2437
+#: ../calendar/gui/print.c:2445
 msgid "Contacts: "
 msgstr "Contactos: "
 
-#: ../calendar/gui/print.c:2577 ../calendar/gui/print.c:2665
-#: ../calendar/gui/print.c:2791 ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2585 ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2799 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Antever a Impressão"
 
-#: ../calendar/gui/print.c:2612
+#: ../calendar/gui/print.c:2620
 msgid "Print Item"
 msgstr "Imprimir o Item"
 
-#: ../calendar/gui/tasks-component.c:439
-msgid "New Task List"
-msgstr "Nova Lista de Tarefas"
+#: ../calendar/gui/tasks-component.c:441
+msgid "_New Task List"
+msgstr "_Nova Lista de Tarefas"
 
-#: ../calendar/gui/tasks-component.c:515
+#: ../calendar/gui/tasks-component.c:517
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tarefa"
 msgstr[1] "%d tarefas"
 
-#: ../calendar/gui/tasks-component.c:517 ../mail/mail-component.c:548
-#, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] ", %d seleccionada"
-msgstr[1] ", %d seleccionadas"
-
-#: ../calendar/gui/tasks-component.c:564
+#: ../calendar/gui/tasks-component.c:566
 msgid "Failed upgrading tasks."
 msgstr "Falha ao actualizar as tarefas."
 
-#: ../calendar/gui/tasks-component.c:872
+#: ../calendar/gui/tasks-component.c:877
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Incapaz de abrir a lista de tarefas '%s' para criar eventos e reuniões"
 
-#: ../calendar/gui/tasks-component.c:887
+#: ../calendar/gui/tasks-component.c:890
 msgid "There is no calendar available for creating tasks"
 msgstr "Não existe nenhum calendário disponível para criar tarefas"
 
-#: ../calendar/gui/tasks-component.c:981
+#: ../calendar/gui/tasks-component.c:987
 msgid "Task Source Selector"
 msgstr "Selector de Origem da Tarefa"
 
-#: ../calendar/gui/tasks-component.c:1164
+#: ../calendar/gui/tasks-component.c:1170
 msgid "New task"
 msgstr "Nova tarefa"
 
-#: ../calendar/gui/tasks-component.c:1165
-msgid "_Task"
-msgstr "_Tarefa"
-
-#: ../calendar/gui/tasks-component.c:1166
+#: ../calendar/gui/tasks-component.c:1172
 msgid "Create a new task"
 msgstr "Criar uma nova tarefa"
 
-#: ../calendar/gui/tasks-component.c:1172
+#: ../calendar/gui/tasks-component.c:1178
 msgid "New assigned task"
 msgstr "Nova tarefa atribuída"
 
-#: ../calendar/gui/tasks-component.c:1173
+#: ../calendar/gui/tasks-component.c:1179
 msgid "Assigne_d Task"
 msgstr "Tarefa Atribuí_da"
 
-#: ../calendar/gui/tasks-component.c:1174
+#: ../calendar/gui/tasks-component.c:1180
 msgid "Create a new assigned task"
 msgstr "Criar uma nova tarefa atribuída"
 
-#: ../calendar/gui/tasks-component.c:1180
+#: ../calendar/gui/tasks-component.c:1186
 msgid "New task list"
 msgstr "Nova lista de tarefas"
 
-#: ../calendar/gui/tasks-component.c:1181
+#: ../calendar/gui/tasks-component.c:1187
 msgid "Task l_ist"
 msgstr "L_ista de tarefas"
 
-#: ../calendar/gui/tasks-component.c:1182
+#: ../calendar/gui/tasks-component.c:1188
 msgid "Create a new task list"
 msgstr "Criar uma nova lista de tarefas"
 
-#: ../calendar/gui/tasks-control.c:419
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8122,11 +8522,11 @@ msgstr ""
 "\n"
 "Apagar mesmo estas tarefas?"
 
-#: ../calendar/gui/tasks-control.c:422
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "Não perguntar novamente."
 
-#: ../calendar/gui/tasks-control.c:457
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "Imprimir as Tarefas"
 
@@ -8135,40 +8535,40 @@ msgstr "Imprimir as Tarefas"
 msgid "SMTWTFS"
 msgstr "DSTQQSS"
 
-#: ../calendar/importers/icalendar-importer.c:78
+#: ../calendar/importers/icalendar-importer.c:79
 msgid "Appointments and Meetings"
 msgstr "Compromissos e Reuniões"
 
-#: ../calendar/importers/icalendar-importer.c:336
-#: ../calendar/importers/icalendar-importer.c:586
+#: ../calendar/importers/icalendar-importer.c:337
+#: ../calendar/importers/icalendar-importer.c:620
 msgid "Opening calendar"
 msgstr "A abrir o calendário"
 
-#: ../calendar/importers/icalendar-importer.c:429
+#: ../calendar/importers/icalendar-importer.c:444
 msgid "iCalendar files (.ics)"
 msgstr "Ficheiros iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:430
+#: ../calendar/importers/icalendar-importer.c:445
 msgid "Evolution iCalendar importer"
 msgstr "Importador de iCalendar Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:494
-msgid "Reminder!!"
-msgstr "Lembrete!!"
+#: ../calendar/importers/icalendar-importer.c:521
+msgid "Reminder!"
+msgstr "Lembrete!"
 
-#: ../calendar/importers/icalendar-importer.c:539
+#: ../calendar/importers/icalendar-importer.c:573
 msgid "vCalendar files (.vcf)"
 msgstr "Ficheiros vCalendar (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:540
+#: ../calendar/importers/icalendar-importer.c:574
 msgid "Evolution vCalendar importer"
 msgstr "Importador de vCalendar Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:702
+#: ../calendar/importers/icalendar-importer.c:736
 msgid "Calendar Events"
 msgstr "Eventos do Calendário"
 
-#: ../calendar/importers/icalendar-importer.c:739
+#: ../calendar/importers/icalendar-importer.c:773
 msgid "Evolution Calendar intelligent importer"
 msgstr "Importador inteligente de Calendário Evolution"
 
@@ -9702,15 +10102,55 @@ msgstr "Pacífico/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacífico/Yap"
 
-#: ../composer/e-msg-composer-hdrs.c:558
+#: ../composer/e-msg-composer-attachment-bar.c:105
+#: ../widgets/misc/e-attachment-bar.c:107
+#, c-format
+msgid "%.0fK"
+msgstr "%.0fK"
+
+#: ../composer/e-msg-composer-attachment-bar.c:108
+#: ../widgets/misc/e-attachment-bar.c:110
+#, c-format
+msgid "%.0fM"
+msgstr "%.0fM"
+
+#: ../composer/e-msg-composer-attachment-bar.c:111
+#: ../widgets/misc/e-attachment-bar.c:113
+#, c-format
+msgid "%.0fG"
+msgstr "%.0fG"
+
+#: ../composer/e-msg-composer-attachment-bar.c:740
+#: ../widgets/misc/e-attachment-bar.c:988
+msgid "Attachment Bar"
+msgstr "Barra de Anexos"
+
+#: ../composer/e-msg-composer-attachment.c:187
+#: ../composer/e-msg-composer-attachment.c:203
+#: ../composer/e-msg-composer-attachment.c:297
+#: ../composer/e-msg-composer-attachment.c:313
+#: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
+#: ../widgets/misc/e-attachment.c:441 ../widgets/misc/e-attachment.c:457
+#, c-format
+msgid "Cannot attach file %s: %s"
+msgstr "Incapaz de anexar o ficheiro %s: %s"
+
+#: ../composer/e-msg-composer-attachment.c:195
+#: ../composer/e-msg-composer-attachment.c:305
+#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:449
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr "Incapaz de anexar o ficheiro %s: não é um ficheiro normal"
+
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "Destino da afixagem"
 
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "Seleccione as pastas onde anexar a mensagem."
 
-#: ../composer/e-msg-composer-hdrs.c:593
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "Clique aqui para o livro de endereços"
 
@@ -9721,45 +10161,45 @@ msgstr "Clique aqui para o livro de endereços"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:623
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "_Responder-A:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:630
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "_De:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:637
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "Ass_unto:"
 
-#: ../composer/e-msg-composer-hdrs.c:646
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "_Para:"
 
-#: ../composer/e-msg-composer-hdrs.c:647
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatários da mensagem"
 
-#: ../composer/e-msg-composer-hdrs.c:650
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-msg-composer-hdrs.c:651
+#: ../composer/e-msg-composer-hdrs.c:647
 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-msg-composer-hdrs.c:654
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-msg-composer-hdrs.c:655
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9770,15 +10210,15 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "Afi_xar Em:"
 
-#: ../composer/e-msg-composer-hdrs.c:667
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "Clique aqui para seleccionar as pastas onde afixar"
 
-#: ../composer/e-msg-composer-hdrs.c:673
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "Afixar Em:"
 
@@ -9786,14 +10226,18 @@ msgstr "Afixar Em:"
 msgid "A_ttach"
 msgstr "Ane_xar"
 
-#: ../composer/e-msg-composer.c:738
+#: ../composer/e-msg-composer-select-file.c:239
+msgid "Insert Attachment"
+msgstr "Inserir Anexo"
+
+#: ../composer/e-msg-composer.c:828
 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:745
+#: ../composer/e-msg-composer.c:835
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -9801,47 +10245,52 @@ msgstr ""
 "Incapaz de encriptar a mensagem a enviar: Nenhum certificado de encriptação "
 "para esta conta"
 
-#: ../composer/e-msg-composer.c:1224 ../composer/e-msg-composer.c:1257
+#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
+msgid "Hide _Attachment Bar"
+msgstr "Esconder a Barra de _Anexos"
+
+#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3865
+msgid "Show _Attachment Bar"
+msgstr "Apresentar a Barra de _Anexos"
+
+#: ../composer/e-msg-composer.c:1330 ../composer/e-msg-composer.c:1364
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Razão desconhecida"
 
-#: ../composer/e-msg-composer.c:1294
+#: ../composer/e-msg-composer.c:1402
 msgid "Could not open file"
 msgstr "Incapaz de abrir o ficheiro"
 
-#: ../composer/e-msg-composer.c:1302
+#: ../composer/e-msg-composer.c:1410
 msgid "Unable to retrieve message from editor"
 msgstr "Incapaz de recuperar a mensagem do editor"
 
-#: ../composer/e-msg-composer.c:1572
+#: ../composer/e-msg-composer.c:1689
 msgid "Untitled Message"
 msgstr "Mensagem sem Título"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1606
+#: ../composer/e-msg-composer.c:1724
 msgid "Open File"
 msgstr "Abrir o Ficheiro"
 
-#: ../composer/e-msg-composer.c:2006 ../mail/em-account-editor.c:588
-#: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:700
+#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:606
+#: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "Gerada automaticamente"
 
-#: ../composer/e-msg-composer.c:2105
+#: ../composer/e-msg-composer.c:2254
 msgid "Si_gnature:"
 msgstr "A_ssinatura:"
 
-#: ../composer/e-msg-composer.c:2347 ../composer/e-msg-composer.c:3527
-#: ../composer/e-msg-composer.c:3528
-msgid "Compose a message"
-msgstr "Escrever uma mensagem"
-
-#: ../composer/e-msg-composer.c:3643
-msgid "_Attachment Bar"
-msgstr "Barra de _Anexos"
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
+msgid "Compose Message"
+msgstr "Escrever uma Mensagem"
 
-#: ../composer/e-msg-composer.c:4718
+#: ../composer/e-msg-composer.c:4974
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -9876,7 +10325,7 @@ msgstr ""
 "mensagem."
 
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{1}&quot;."
 msgstr "Devido a &quot;{1}&quot;."
 
@@ -9919,18 +10368,14 @@ msgid "Do you want to recover unfinished messages?"
 msgstr "Deseja recuperar as mensagens por terminar?"
 
 #: ../composer/mail-composer.error.xml.h:14
-msgid "Don't Recover"
-msgstr "Não Recuperar"
-
-#: ../composer/mail-composer.error.xml.h:15
 msgid "Download in progress. Do you want to send the mail?"
 msgstr "Download em curso. Deseja enviar a mensagem?"
 
-#: ../composer/mail-composer.error.xml.h:16
+#: ../composer/mail-composer.error.xml.h:15
 msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "Erro ao gravar para a gravação automática devido a &quot;{1}&quot;."
 
-#: ../composer/mail-composer.error.xml.h:17
+#: ../composer/mail-composer.error.xml.h:16
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
@@ -9938,17 +10383,13 @@ msgstr ""
 "O Evolution terminou inesperadamente enquanto compunha uma nova mensagem. "
 "Recuperar a mensagem irá permitir-lhe continuar onde estava."
 
-#: ../composer/mail-composer.error.xml.h:18
-msgid "Recover"
-msgstr "Recuperar"
-
-#: ../composer/mail-composer.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:17
 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 "
 "mensagem."
 
-#: ../composer/mail-composer.error.xml.h:20
+#: ../composer/mail-composer.error.xml.h:18
 msgid ""
 "To attach the contents of this directory, either attach the files in this "
 "directory individually, or create an archive of the directory and attach it."
@@ -9956,7 +10397,7 @@ msgstr ""
 "Para anexar o conteúdo deste directório, anexe individualmente os ficheiros "
 "contidos ou crie um arquivo com todos os ficheiros e anexe-o."
 
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:19
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -9968,29 +10409,33 @@ msgstr ""
 "Certifique-se de que possui instaladas as versões correctas do gtkhtml e "
 "libgtkhtml."
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:22
 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:25
+#: ../composer/mail-composer.error.xml.h:23
 msgid "Unfinished messages found"
 msgstr "Foram encontradas mensagens por terminar"
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:24
 msgid "Warning: Modified Message"
 msgstr "Aviso: Mensagem Alterada"
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:25
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Não é possível anexar o ficheiro `{0}' a esta mensagem."
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:26
 msgid "You need to configure an account before you can compose mail."
 msgstr "Tem de configurar uma conta antes de poder compor uma mensagem."
 
+#: ../composer/mail-composer.error.xml.h:28
+msgid "_Do not Recover"
+msgstr "_Não Recuperar"
+
 #: ../composer/mail-composer.error.xml.h:29
-msgid "_Discard Changes"
-msgstr "_Descartar as Alterações"
+msgid "_Recover"
+msgstr "_Recuperar"
 
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Save Message"
@@ -9998,13 +10443,17 @@ msgstr "_Gravar a Mensagem"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:509
+#: ../shell/main.c:514
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2
-msgid "The Evolution Groupware Suite"
-msgstr "O Pacote de Colaboração Evolution"
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:544
+msgid "Groupware Suite"
+msgstr "Groupwise Suite"
+
+#: ../data/evolution.desktop.in.in.h:3
+msgid "The Evolution PIM and Email Client"
+msgstr "O Gestor Pessoal e Cliente de Email Evolution"
 
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
@@ -10051,7 +10500,7 @@ msgid "I am currently out of the office"
 msgstr "De momento estou ausente do escritório"
 
 #: ../designs/OOA/ooa.glade.h:10
-msgid "No, Don't Change Status"
+msgid "No, Do not Change Status"
 msgstr "Não, Não Alterar o Estado"
 
 #: ../designs/OOA/ooa.glade.h:12
@@ -10120,7 +10569,7 @@ msgstr ""
 "Quando receber uma mensagem com um pedido de recibo de leitura, o que deverá "
 "o Evolution fazer?"
 
-#: ../e-util/e-dialog-utils.c:267
+#: ../e-util/e-dialog-utils.c:281
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10128,7 +10577,7 @@ msgstr ""
 "Já existe um ficheiro com esse nome.\n"
 "Sobrepo-lo?"
 
-#: ../e-util/e-dialog-utils.c:269 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:283 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Sobrepor o ficheiro?"
 
@@ -10149,12 +10598,10 @@ msgid "Evolution Query"
 msgstr "Questão Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:438
+#: ../e-util/e-error.c:443
 #, c-format
-msgid ""
-"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
-msgstr ""
-"<span weight=\"bold\">Erro interno, pedido o erro desconhecido '%s'</span>"
+msgid "Internal error, unknown error '%s' requested"
+msgstr "Erro interno, pedido o erro desconhecido '%s'"
 
 #: ../e-util/e-system.error.xml.h:2
 msgid "Cannot open file &quot;{0}&quot;."
@@ -10172,109 +10619,11 @@ msgstr "Deseja sobrepo-lo?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "Ficheiro &quot;{0}&quot; existe."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:122
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:133
 msgid "_Overwrite"
 msgstr "_Sobrepor"
 
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: ../e-util/e-time-utils.c:185 ../e-util/e-time-utils.c:398
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%a %d/%m/%Y %I:%M %p"
-
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: ../e-util/e-time-utils.c:190 ../e-util/e-time-utils.c:389
-msgid "%a %m/%d/%Y %H:%M"
-msgstr "%a %d/%m/%Y %H:%M"
-
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without minutes or seconds.
-#: ../e-util/e-time-utils.c:195
-msgid "%a %m/%d/%Y %I %p"
-msgstr "%a %d/%m/%Y %I %p"
-
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without minutes or seconds.
-#: ../e-util/e-time-utils.c:200
-msgid "%a %m/%d/%Y %H"
-msgstr "%a %d/%m/%Y %H"
-
-#. strptime format of a date and a time, in 12-hour format.
-#: ../e-util/e-time-utils.c:211
-msgid "%m/%d/%Y %I:%M:%S %p"
-msgstr "%d/%m/%Y %I:%M:%S %p"
-
-#. strptime format of a date and a time, in 24-hour format.
-#: ../e-util/e-time-utils.c:215
-msgid "%m/%d/%Y %H:%M:%S"
-msgstr "%d/%m/%Y %H:%M:%S"
-
-#. strptime format of a date and a time, in 12-hour format,
-#. without seconds.
-#: ../e-util/e-time-utils.c:220
-msgid "%m/%d/%Y %I:%M %p"
-msgstr "%d/%m/%Y %I:%M %p"
-
-#. strptime format of a date and a time, in 24-hour format,
-#. without seconds.
-#: ../e-util/e-time-utils.c:225
-msgid "%m/%d/%Y %H:%M"
-msgstr "%d/%m/%Y %H:%M"
-
-#. strptime format of a date and a time, in 12-hour format,
-#. without minutes or seconds.
-#: ../e-util/e-time-utils.c:230
-msgid "%m/%d/%Y %I %p"
-msgstr "%d/%m/%Y %I %p"
-
-#. strptime format of a date and a time, in 24-hour format,
-#. without minutes or seconds.
-#: ../e-util/e-time-utils.c:235
-msgid "%m/%d/%Y %H"
-msgstr "%d/%m/%Y %H"
-
-#. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
-#: ../e-util/e-time-utils.c:339 ../e-util/e-time-utils.c:438
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p"
-
-#. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
-#: ../e-util/e-time-utils.c:343 ../e-util/e-time-utils.c:430
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. strptime format for time of day, without seconds,
-#. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../e-util/e-time-utils.c:348 ../e-util/e-time-utils.c:435
-#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1720
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../e-util/e-time-utils.c:352 ../e-util/e-time-utils.c:427
-#: ../widgets/misc/e-dateedit.c:1435 ../widgets/misc/e-dateedit.c:1717
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strptime format for hour and AM/PM, 12-hour format.
-#: ../e-util/e-time-utils.c:356
-msgid "%I %p"
-msgstr "%I %p"
-
-#: ../e-util/eggtrayicon.c:119
+#: ../e-util/eggtrayicon.c:121
 msgid "The orientation of the tray."
 msgstr "A orientação da área de notificação."
 
@@ -10344,25 +10693,24 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Seleccione uma data com a qual comparar"
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:289
 msgid "Choose a file"
 msgstr "Seleccione um ficheiro"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1041 ../mail/mail-config.c:76
-#: ../mail/mail-config.glade.h:91
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "Importante"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1044
-#: ../mail/mail-config.c:79 ../mail/mail-config.glade.h:145
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
+#: ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "A Fazer"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1045
-#: ../mail/mail-config.c:80 ../mail/mail-config.glade.h:95
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
+#: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "Mais Tarde"
 
@@ -10370,48 +10718,52 @@ msgstr "Mais Tarde"
 msgid "Test"
 msgstr "Teste"
 
-#: ../filter/filter-rule.c:791
-msgid "_Rule name:"
-msgstr "Nome da _regra:"
+#: ../filter/filter-rule.c:799
+msgid "_Search name:"
+msgstr "_Procurar nome:"
 
-#: ../filter/filter-rule.c:819
-msgid "If"
-msgstr "Se"
+#: ../filter/filter-rule.c:827
+msgid "Find items that meet the following criteria"
+msgstr "Procurar itens que cumpram os seguintes critérios"
 
-#: ../filter/filter-rule.c:858
-msgid "if all criteria are met"
-msgstr "se todos os critérios se verificarem"
+#: ../filter/filter-rule.c:866
+msgid "If all criteria are met"
+msgstr "Se todos os critérios se verificarem"
 
-#: ../filter/filter-rule.c:858
-msgid "if any criteria are met"
-msgstr "se qualquer um dos critérios se verificar"
+#: ../filter/filter-rule.c:866
+msgid "If any criteria are met"
+msgstr "Se qualquer um dos critérios se verificar"
 
-#: ../filter/filter-rule.c:860
-msgid "Execute actions"
-msgstr "Executar as acções"
+#: ../filter/filter-rule.c:868
+msgid "Find items:"
+msgstr "Procurar itens:"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:889
 msgid "All related"
 msgstr "Todas as relacionadas"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:889
 msgid "Replies"
 msgstr "Respostas"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:889
 msgid "Replies and parents"
 msgstr "Respostas e pais"
 
-#: ../filter/filter-rule.c:883
+#: ../filter/filter-rule.c:889
+msgid "No reply or parent"
+msgstr "Nenhuma resposta ou pai"
+
+#: ../filter/filter-rule.c:891
 msgid "Include threads"
 msgstr "Incluir árvores"
 
-#: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:291
+#: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:311
 msgid "Incoming"
 msgstr "Recebidas"
 
-#: ../filter/filter-rule.c:978 ../mail/em-utils.c:292
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:312
 msgid "Outgoing"
 msgstr "Caixa de Saída"
 
@@ -10435,7 +10787,7 @@ msgstr "Data inexistente."
 msgid "Missing file name."
 msgstr "Nome de ficheiro inexistente."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:65
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
 msgid "Missing name."
 msgstr "Nome inexistente."
 
@@ -10507,7 +10859,7 @@ msgstr "atrás"
 msgid "months"
 msgstr "meses"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:177
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
 msgid "seconds"
 msgstr "segundos"
 
@@ -10523,15 +10875,15 @@ msgstr "a data especificada"
 msgid "years"
 msgstr "anos"
 
-#: ../filter/rule-editor.c:290
+#: ../filter/rule-editor.c:378
 msgid "Add Rule"
 msgstr "Adicionar a Regra"
 
-#: ../filter/rule-editor.c:366
+#: ../filter/rule-editor.c:454
 msgid "Edit Rule"
 msgstr "Editar a Regra"
 
-#: ../filter/rule-editor.c:698
+#: ../filter/rule-editor.c:732
 msgid "Rule name"
 msgstr "Nome da regra"
 
@@ -10580,21 +10932,22 @@ msgstr "Controlo de configuração de compositor de Mensagem Evolution"
 msgid "Evolution Mail preferences control"
 msgstr "Controlo de preferências de Email Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:494
-#: ../mail/importers/elm-importer.c:342
-#: ../mail/importers/netscape-importer.c:1902
-#: ../mail/importers/pine-importer.c:388 ../mail/mail-component.c:561
-#: ../mail/mail-component.c:648
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
+#: ../mail/importers/elm-importer.c:341
+#: ../mail/importers/netscape-importer.c:1903
+#: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
+#: ../mail/mail-component.c:579 ../mail/mail-component.c:664
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Email"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: ../mail/em-account-prefs.c:531
 msgid "Mail Accounts"
 msgstr "Contas de Email"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Preferências do Email"
 
@@ -10602,12 +10955,12 @@ msgstr "Preferências do Email"
 msgid "_Mail"
 msgstr "E_mail"
 
-#: ../mail/em-account-editor.c:387
+#: ../mail/em-account-editor.c:403
 #, c-format
 msgid "%s License Agreement"
 msgstr "Acordo de Licença de %s"
 
-#: ../mail/em-account-editor.c:394
+#: ../mail/em-account-editor.c:410
 #, c-format
 msgid ""
 "\n"
@@ -10620,104 +10973,117 @@ msgstr ""
 "para %s apresentado abaixo\n"
 "e marque a caixa de selecção para a aceitar\n"
 
-#: ../mail/em-account-editor.c:464 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:494
+#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-vfolder-rule.c:496
 msgid "Select Folder"
 msgstr "Seleccionar Pasta"
 
-#: ../mail/em-account-editor.c:760
+#: ../mail/em-account-editor.c:778
 msgid "Ask for each message"
 msgstr "Perguntar para cada mensagem"
 
-#: ../mail/em-account-editor.c:1724 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:91
 msgid "Identity"
 msgstr "Identidade"
 
-#: ../mail/em-account-editor.c:1760 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "A Receber Mensagens"
 
-#: ../mail/em-account-editor.c:1943
+#: ../mail/em-account-editor.c:2013
 msgid "Automatically check for _new mail every"
 msgstr "Verificar automaticamente se existem _novas mensagens a cada"
 
-#: ../mail/em-account-editor.c:2111 ../mail/mail-config.glade.h:128
+#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "A Enviar Mensagens"
 
-#: ../mail/em-account-editor.c:2162 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Omissões"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:122
-#: ../plugins/exchange-operations/exchange-account-setup.c:311
+#: ../mail/em-account-editor.c:2319 ../mail/mail-config.glade.h:123
+#: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "Segurança"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2260 ../mail/em-account-editor.c:2334
+#: ../mail/em-account-editor.c:2356 ../mail/em-account-editor.c:2447
 msgid "Receiving Options"
 msgstr "Opções de Recepção"
 
-#: ../mail/em-account-editor.c:2261 ../mail/em-account-editor.c:2335
+#: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
 msgid "Checking for New Mail"
 msgstr "A Verificar a Existência de Novas Mensagens"
 
-#: ../mail/em-account-editor.c:2659 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Editor de Contas"
 
-#: ../mail/em-account-editor.c:2659 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Assistente de Contas Evolution"
 
+#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
+#: ../mail/em-account-prefs.c:409
+msgid "Disable"
+msgstr "Desactivar"
+
+#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
+#: ../mail/em-account-prefs.c:411
+msgid "Enable"
+msgstr "Activar"
+
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:455
+#: ../mail/em-account-prefs.c:466
 msgid "[Default]"
 msgstr "[Por Omissão]"
 
-#: ../mail/em-account-prefs.c:510
+#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
+#: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
+#: ../plugins/plugin-manager/plugin-manager.c:205
+#: ../plugins/publish-calendar/publish-calendar.c:493
+msgid "Enabled"
+msgstr "Activo"
+
+#: ../mail/em-account-prefs.c:524
 msgid "Account name"
 msgstr "Nome da conta"
 
-#: ../mail/em-account-prefs.c:512
+#: ../mail/em-account-prefs.c:526
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../mail/em-account-prefs.c:517
-msgid "Mail Accounts Table"
-msgstr "Tabela de Contas de Email"
-
-#: ../mail/em-composer-prefs.c:307 ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:958
+#: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
+#: ../mail/mail-config.c:967
 msgid "Unnamed"
 msgstr "Sem nome"
 
-#: ../mail/em-composer-prefs.c:897
+#: ../mail/em-composer-prefs.c:936
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
-#: ../mail/em-composer-prefs.c:940
+#: ../mail/em-composer-prefs.c:979
 msgid "Add signature script"
 msgstr "Adicionar script de assinatura"
 
-#: ../mail/em-composer-prefs.c:960
+#: ../mail/em-composer-prefs.c:999
 msgid "Signature(s)"
 msgstr "Assinatura(s)"
 
-#: ../mail/em-composer-utils.c:853 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:874 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr "------ Mensagem Reencaminhada ------"
 
-#: ../mail/em-composer-utils.c:1648
+#: ../mail/em-composer-utils.c:1666
 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:1695
+#: ../mail/em-composer-utils.c:1713
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10725,7 +11091,7 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Year}-${Month}-${Day} às ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escreveu:"
 
-#: ../mail/em-filter-editor.c:147
+#: ../mail/em-filter-editor.c:155
 msgid "_Filter Rules"
 msgstr "Regras de _Filtro"
 
@@ -10854,7 +11220,7 @@ msgstr "não é"
 msgid "is not Flagged"
 msgstr "não está Marcada"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Não Solicitado"
@@ -10863,8 +11229,7 @@ msgstr "Não Solicitado"
 msgid "Junk Test"
 msgstr "Teste de Não Solicitado"
 
-#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1063
-#: ../widgets/misc/e-expander.c:189
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etiqueta"
 
@@ -10904,7 +11269,7 @@ msgstr "Canal para a Aplicação"
 msgid "Play Sound"
 msgstr "Reproduzir o Som"
 
-#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:80
+#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:81
 msgid "Read"
 msgstr "Ler"
 
@@ -10972,12 +11337,12 @@ msgstr "começa por"
 msgid "Stop Processing"
 msgstr "Parar o Processamento"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1572
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1584
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:88 ../mail/message-list.etspec.h:13
-#: ../mail/message-tag-followup.c:330
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
+#: ../mail/message-tag-followup.c:336
 #: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1131
+#: ../smime/lib/e-cert.c:1132
 msgid "Subject"
 msgstr "Assunto"
 
@@ -10990,24 +11355,26 @@ msgstr "Retirar o Estado"
 msgid "<b>Then</b>"
 msgstr "<b>Então</b>"
 
-#: ../mail/em-folder-browser.c:134
+#: ../mail/em-folder-browser.c:144
 msgid "C_reate Search Folder From Search..."
 msgstr "C_riar uma Pasta Baseada na Procura..."
 
 #. TODO: can this be done in a loop?
-#: ../mail/em-folder-properties.c:144
-msgid "Total message:"
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:150
+msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Total de mensagens:"
 msgstr[1] "Total de mensagens:"
 
-#: ../mail/em-folder-properties.c:156
-msgid "Unread message:"
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:163
+msgid "Unread messages:"
 msgid_plural "Unread messages:"
-msgstr[0] "Mensagem por ler:"
+msgstr[0] "Mensagens por ler:"
 msgstr[1] "Mensagens por ler:"
 
-#: ../mail/em-folder-properties.c:278
+#: ../mail/em-folder-properties.c:316
 #: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Folder Properties"
 msgstr "Propriedades da Pasta"
@@ -11024,301 +11391,298 @@ msgstr "Criar"
 msgid "Folder _name:"
 msgstr "_Nome da pasta:"
 
-#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
-#: ../mail/mail-vfolder.c:937 ../mail/mail-vfolder.c:1007
+#: ../mail/em-folder-tree-model.c:203 ../mail/em-folder-tree-model.c:205
+#: ../mail/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
 msgid "Search Folders"
 msgstr "Pastas de Procura"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
+#: ../mail/em-folder-tree-model.c:209 ../mail/em-folder-tree-model.c:211
 msgid "UNMATCHED"
 msgstr "SEMEQUIVALÊNCIA"
 
-#: ../mail/em-folder-tree-model.c:469 ../mail/mail-component.c:144
+#: ../mail/em-folder-tree-model.c:484 ../mail/mail-component.c:151
 msgid "Drafts"
 msgstr "Rascunhos"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:472 ../mail/mail-component.c:143
+#: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
+#: ../plugins/exchange-operations/exchange-folder.c:597
 msgid "Inbox"
 msgstr "Caixa de Entrada"
 
-#: ../mail/em-folder-tree-model.c:475 ../mail/mail-component.c:145
+#: ../mail/em-folder-tree-model.c:490 ../mail/mail-component.c:152
 msgid "Outbox"
 msgstr "Caixa de Saída"
 
-#: ../mail/em-folder-tree-model.c:477 ../mail/mail-component.c:146
+#: ../mail/em-folder-tree-model.c:492 ../mail/mail-component.c:153
 msgid "Sent"
 msgstr "Enviadas"
 
-#: ../mail/em-folder-tree-model.c:498 ../mail/em-folder-tree-model.c:802
+#: ../mail/em-folder-tree-model.c:514 ../mail/em-folder-tree-model.c:818
 msgid "Loading..."
 msgstr "A Ler..."
 
-#: ../mail/em-folder-tree.c:689
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "Árvore de Pastas de Mensagens"
 
-#: ../mail/em-folder-tree.c:849
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "A mover a pasta %s"
 
-#: ../mail/em-folder-tree.c:851
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "A copiar a pasta %s"
 
-#: ../mail/em-folder-tree.c:858 ../mail/message-list.c:1613
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "A mover as mensagens para a pasta %s"
 
-#: ../mail/em-folder-tree.c:860 ../mail/message-list.c:1615
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "A copiar as mensagens para a pasta %s"
 
-#: ../mail/em-folder-tree.c:876
+#: ../mail/em-folder-tree.c:881
 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-tree.c:972 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Copiar para a Pasta"
 
-#: ../mail/em-folder-tree.c:973 ../ui/evolution-mail-message.xml.h:114
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Mover para a Pasta"
 
-#: ../mail/em-folder-tree.c:1678 ../mail/mail-ops.c:1057
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "A analisar as pastas em \"%s\""
 
-#: ../mail/em-folder-tree.c:2031 ../ui/evolution-addressbook.xml.h:44
-#: ../ui/evolution-mail-global.xml.h:24
+#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:52
 msgid "_View"
 msgstr "_Ver"
 
-#: ../mail/em-folder-tree.c:2032
+#: ../mail/em-folder-tree.c:2043
 msgid "Open in _New Window"
 msgstr "Abrir numa _Nova Janela"
 
-#: ../mail/em-folder-tree.c:2036
+#: ../mail/em-folder-tree.c:2047
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ../mail/em-folder-tree.c:2037
+#: ../mail/em-folder-tree.c:2048
 msgid "_Move..."
 msgstr "_Mover..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2041
+#: ../mail/em-folder-tree.c:2052
 msgid "_New Folder..."
 msgstr "_Nova Pasta..."
 
-#: ../mail/em-folder-tree.c:2044 ../ui/evolution-mail-list.xml.h:30
+#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "_Renomear..."
 
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:130
+msgid "_Empty Trash"
+msgstr "_Esvaziar o Lixo"
+
 #: ../mail/em-folder-utils.c:104
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "A copiar `%s' para `%s'"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:931
-#: ../mail/em-folder-view.c:946 ../mail/importers/evolution-mbox-importer.c:85
-#: ../mail/importers/evolution-outlook-importer.c:134
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Seleccionar a pasta"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:946
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "C_opiar"
 
-#: ../mail/em-folder-utils.c:503
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Renomear a pasta \"%s\" para:"
-
-#: ../mail/em-folder-utils.c:505
-msgid "Rename Folder"
-msgstr "Renomear a Pasta"
-
-#: ../mail/em-folder-utils.c:511
-msgid "Folder names cannot contain '/'"
-msgstr "Nomes de pastas não podem conter '/'"
-
 #: ../mail/em-folder-utils.c:581
-#: ../plugins/groupwise-features/share-folder-common.c:141
+#: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "A criar a pasta `%s'"
 
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../plugins/groupwise-features/share-folder-common.c:388
 msgid "Create folder"
 msgstr "Criar uma pasta"
 
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../plugins/groupwise-features/share-folder-common.c:388
 msgid "Specify where to create the folder:"
 msgstr "Especificar onde criar a pasta:"
 
-#: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:546 ../mail/em-popup.c:557
-msgid "Reply to _All"
-msgstr "Responder _a Todos"
-
-#: ../mail/em-folder-view.c:1040 ../ui/evolution-mail-message.xml.h:122
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Responder ao Remetente"
 
-#: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:548 ../mail/em-popup.c:559
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "R_eencaminhar"
 
-#: ../mail/em-folder-view.c:1044 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Editar como uma Nova Mensagem..."
 
-#: ../mail/em-folder-view.c:1050
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "R_ecuperar"
 
-#: ../mail/em-folder-view.c:1051 ../ui/evolution-addressbook.xml.h:36
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "_Mover para a Pasta..."
 
-#: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:32
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "_Copiar para a Pasta..."
 
-#: ../mail/em-folder-view.c:1055
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "_Marcar como Lida"
 
-#: ../mail/em-folder-view.c:1056
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "Marcar _Por Ler"
 
-#: ../mail/em-folder-view.c:1057
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "Marcar como _Importante"
 
-#: ../mail/em-folder-view.c:1058
+#: ../mail/em-folder-view.c:1100
 msgid "_Mark as Unimportant"
 msgstr "_Marcar como Irrelevante"
 
-#: ../mail/em-folder-view.c:1059
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "Marcar como _Não Solicitada"
 
-#: ../mail/em-folder-view.c:1060
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "Marcar como _Solicitada"
 
-#: ../mail/em-folder-view.c:1061
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar para Dar Se_guimento..."
 
-#: ../mail/em-folder-view.c:1069
+#: ../mail/em-folder-view.c:1105
+msgid "_Label"
+msgstr "_Etiqueta"
+
+#: ../mail/em-folder-view.c:1106
+msgid "_None"
+msgstr "_Nenhuma"
+
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "Marcar como _Terminada"
 
-#: ../mail/em-folder-view.c:1070
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "L_impar a Marca"
 
-#: ../mail/em-folder-view.c:1073
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "Criar Regra a Par_tir da Mensagem"
 
-#: ../mail/em-folder-view.c:1074
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "Pasta de Procura baseada no A_ssunto"
 
-#: ../mail/em-folder-view.c:1075
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "Pasta de Procura baseada no Remete_nte"
 
-#: ../mail/em-folder-view.c:1076
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "Pasta de Procura baseada nos Destinatá_rios"
 
-#: ../mail/em-folder-view.c:1077
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "Pasta de Procura baseada na _Lista de Distribuição"
 
-#: ../mail/em-folder-view.c:1081
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "Filtrar baseado no Ass_unto"
 
-#: ../mail/em-folder-view.c:1082
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "Filtrar baseado no _Remetente"
 
-#: ../mail/em-folder-view.c:1083
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "Filtrar baseado no _Destinatário"
 
-#: ../mail/em-folder-view.c:1084
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "Filtrar baseado na _Lista de Distribuição"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1921 ../mail/em-folder-view.c:1965
+#: ../mail/em-folder-view.c:1968 ../mail/em-folder-view.c:2012
 msgid "Default"
 msgstr "Por Omissão"
 
-#: ../mail/em-folder-view.c:2064
+#: ../mail/em-folder-view.c:2111
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Imprimir a Mensagem"
 
-#: ../mail/em-folder-view.c:2220
+#: ../mail/em-folder-view.c:2267
 msgid "Unable to retrieve message"
 msgstr "Incapaz de obter a mensagem"
 
-#: ../mail/em-folder-view.c:2413
+#: ../mail/em-folder-view.c:2460
 msgid "_Copy Link Location"
 msgstr "_Copiar a Localização do Link"
 
-#: ../mail/em-folder-view.c:2415
+#: ../mail/em-folder-view.c:2462
 msgid "Create _Search Folder"
 msgstr "Criar uma Pasta de _Procura"
 
-#: ../mail/em-folder-view.c:2416
+#: ../mail/em-folder-view.c:2463
 msgid "_From this Address"
 msgstr "_Deste Endereço"
 
-#: ../mail/em-folder-view.c:2417
+#: ../mail/em-folder-view.c:2464
 msgid "_To this Address"
 msgstr "_Para este Endereço"
 
-#: ../mail/em-folder-view.c:2698
+#: ../mail/em-folder-view.c:2818
 #, c-format
 msgid "Click to mail %s"
 msgstr "Clicar para enviar mensagem a %s"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:445
+#: ../mail/em-format-html-display.c:496
 #, c-format
 msgid "Matches: %d"
 msgstr "Equivalências: %d"
 
-#: ../mail/em-format-html-display.c:696 ../mail/em-format-html.c:597
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "Não assinada"
 
-#: ../mail/em-format-html-display.c:696
+#: ../mail/em-format-html-display.c:756
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11326,11 +11690,11 @@ msgstr ""
 "Esta mensagem não está assinada. Não existe nenhuma garantia de que seja "
 "autêntica."
 
-#: ../mail/em-format-html-display.c:697 ../mail/em-format-html.c:598
+#: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "Assinatura válida"
 
-#: ../mail/em-format-html-display.c:697
+#: ../mail/em-format-html-display.c:757
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11338,11 +11702,11 @@ msgstr ""
 "Esta mensagem está assinada e é válida o que significa que muito "
 "provavelmente é autêntica."
 
-#: ../mail/em-format-html-display.c:698 ../mail/em-format-html.c:599
+#: ../mail/em-format-html-display.c:758 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "Assinatura inválida"
 
-#: ../mail/em-format-html-display.c:698
+#: ../mail/em-format-html-display.c:758
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11350,11 +11714,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:699
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "Assinatura válida, incapaz de verificar o remetente"
 
-#: ../mail/em-format-html-display.c:699
+#: ../mail/em-format-html-display.c:759
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11362,37 +11726,37 @@ 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:705 ../mail/em-format-html.c:606
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "Sem encriptação"
 
-#: ../mail/em-format-html-display.c:705
+#: ../mail/em-format-html-display.c:765
 msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
+"This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
-"Esta mensagem não está encriptada.  O seu conteúdo pode ser visualizado "
+"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:706 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "Encriptada com cifra fraca"
 
-#: ../mail/em-format-html-display.c:706
+#: ../mail/em-format-html-display.c:766
 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 "
+"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 "
 "message in a practical amount of time."
 msgstr ""
-"Esta mensagem está encriptada mas com um algorítmo de encriptação fraco.  "
+"Esta mensagem está encriptada mas com um algorítmo de encriptação fraco. "
 "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:707 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "Encriptada"
 
-#: ../mail/em-format-html-display.c:707
+#: ../mail/em-format-html-display.c:767
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11400,186 +11764,188 @@ msgstr ""
 "Esta mensagem está encriptada.  Seria difícil que um terceiro conseguisse "
 "visualizar o seu conteúdo."
 
-#: ../mail/em-format-html-display.c:708 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "Encriptada com cifra forte"
 
-#: ../mail/em-format-html-display.c:708
+#: ../mail/em-format-html-display.c:768
 msgid ""
-"This message is encrypted, with a strong encryption algorithm.  It would be "
+"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 "
 "practical amount of time."
 msgstr ""
-"Esta mensagem está encriptada com um algorítmo de encriptação forte.  Seria "
+"Esta mensagem está encriptada com um algorítmo de encriptação forte. Seria "
 "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:809 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Visualizar o Certificado"
 
-#: ../mail/em-format-html-display.c:824
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "Este certificado não é visualizável"
 
-#: ../mail/em-format-html-display.c:1106
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Terminada a %B %d, %Y, %l:%M %P"
 
-#: ../mail/em-format-html-display.c:1114
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "Atrasada:"
 
-#: ../mail/em-format-html-display.c:1117
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "por %B %d, %Y, %l:%M %P"
 
-#: ../mail/em-format-html-display.c:1177
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "_Ver Imbutido"
 
-#: ../mail/em-format-html-display.c:1178
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "_Esconder"
 
-#: ../mail/em-format-html-display.c:1179
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "_Caber à Largura"
 
-#: ../mail/em-format-html-display.c:1180
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "Apresentar no Tamanho _Original"
 
-#: ../mail/em-format-html-display.c:1550
-msgid "Attachment Button"
-msgstr "Botão de Anexo"
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Anexo"
 
-#: ../mail/em-format-html-display.c:1757
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "Seleccionar a pasta onde gravar todos os anexos..."
 
-#: ../mail/em-format-html-display.c:1796
-msgid "Select folder to save selected attachments..."
-msgstr "Seleccionar a pasta onde gravar os anexos especificados..."
-
-#: ../mail/em-format-html-display.c:1804
-msgid "Save Selected..."
-msgstr "Gravar Especificados..."
+#: ../mail/em-format-html-display.c:1921
+msgid "_Save Selected..."
+msgstr "_Gravar Seleccionados..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1871
+#: ../mail/em-format-html-display.c:1988
 #, c-format
-msgid "%d attachment"
-msgid_plural "%d attachments"
-msgstr[0] "%d anexo"
-msgstr[1] "%d anexos"
+msgid "%d attachme_nt"
+msgid_plural "%d attachme_nts"
+msgstr[0] "%d a_nexo"
+msgstr[1] "%d a_nexos"
+
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
+msgid "S_ave"
+msgstr "Gr_avar"
 
-#: ../mail/em-format-html-display.c:1935
+#: ../mail/em-format-html-display.c:2006
+msgid "S_ave All"
+msgstr "Gr_avar Todos"
+
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "Nenhum Anexo"
 
-#: ../mail/em-format-html-display.c:1938
-msgid "Save All"
-msgstr "Gravar Todos"
-
 #: ../mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "Página %d de %d"
 
-#: ../mail/em-format-html.c:473 ../mail/em-format-html.c:475
+#: ../mail/em-format-html.c:483 ../mail/em-format-html.c:485
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "A obter `%s'"
 
-#: ../mail/em-format-html.c:600
+#: ../mail/em-format-html.c:610
 msgid "Valid signature but cannot verify sender"
 msgstr "Assinatura válida mas incapaz de verificar o remetente"
 
-#: ../mail/em-format-html.c:870
+#: ../mail/em-format-html.c:881
 msgid "Malformed external-body part."
 msgstr "Parte do corpo-externo mal formada."
 
-#: ../mail/em-format-html.c:900
+#: ../mail/em-format-html.c:911
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Ponteiro para o servidor FTP (%s)"
 
-#: ../mail/em-format-html.c:911
+#: ../mail/em-format-html.c:922
 #, 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:913
+#: ../mail/em-format-html.c:924
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Ponteiro para o ficheiro local (%s)"
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:945
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Ponteiro para dados remotos (%s)"
 
-#: ../mail/em-format-html.c:945
+#: ../mail/em-format-html.c:956
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Ponteiro para dados externos desconhecidos (tipo \"%s\")"
 
-#: ../mail/em-format-html.c:1171
+#: ../mail/em-format-html.c:1183
 msgid "Formatting message"
 msgstr "A formatar a mensagem"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:83
-#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:326
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
+#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "De"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:84
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "Responder-A"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:85
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
 #: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Para"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:86
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:87
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1576 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:987
+#: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
 msgstr "Aplicação de Email"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1603
+#: ../mail/em-format-html.c:1615
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1606
+#: ../mail/em-format-html.c:1618
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1616 ../mail/em-format-quote.c:329
-#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:89
-#: ../mail/message-list.etspec.h:2
+#: ../mail/em-format-html.c:1628 ../mail/em-format-quote.c:329
+#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
+#: ../widgets/misc/e-dateedit.c:363
 msgid "Date"
 msgstr "Data"
 
-#: ../mail/em-format-html.c:1639 ../mail/em-format.c:851
-#: ../mail/em-mailer-prefs.c:90
+#: ../mail/em-format-html.c:1651 ../mail/em-format.c:851
+#: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr "Grupo de notícias"
 
@@ -11588,47 +11954,47 @@ msgstr "Grupo de notícias"
 msgid "%s attachment"
 msgstr "anexo %s"
 
-#: ../mail/em-format.c:1141 ../mail/em-format.c:1288 ../mail/em-format.c:1575
+#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1576
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Incapaz de parsear a mensagem S/MIME: Erro desconhecido"
 
-#: ../mail/em-format.c:1270 ../mail/em-format.c:1426
+#: ../mail/em-format.c:1271 ../mail/em-format.c:1427
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Incapaz de parsear a mensagem MIME. A apresentar como código."
 
-#: ../mail/em-format.c:1278
+#: ../mail/em-format.c:1279
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tipo de encriptação não suportada para multipartes/encriptada"
 
-#: ../mail/em-format.c:1445
+#: ../mail/em-format.c:1446
 msgid "Unsupported signature format"
 msgstr "Formato de assinatura não suportado"
 
-#: ../mail/em-format.c:1453 ../mail/em-format.c:1517
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
 msgid "Error verifying signature"
 msgstr "Erro ao verificar a assinatura"
 
-#: ../mail/em-format.c:1453 ../mail/em-format.c:1517
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
 msgid "Unknown error verifying signature"
 msgstr "Erro desconhecido ao verificar a assinatura"
 
-#: ../mail/em-mailer-prefs.c:101
+#: ../mail/em-mailer-prefs.c:103
 msgid "Every time"
 msgstr "Sempre"
 
-#: ../mail/em-mailer-prefs.c:102
+#: ../mail/em-mailer-prefs.c:104
 msgid "Once per day"
 msgstr "Uma vez por dia"
 
-#: ../mail/em-mailer-prefs.c:103
+#: ../mail/em-mailer-prefs.c:105
 msgid "Once per week"
 msgstr "Uma vez por semana"
 
-#: ../mail/em-mailer-prefs.c:104
+#: ../mail/em-mailer-prefs.c:106
 msgid "Once per month"
 msgstr "Uma vez por mês"
 
-#: ../mail/em-migrate.c:1198
+#: ../mail/em-migrate.c:1209
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -11640,48 +12006,48 @@ msgstr ""
 "\n"
 "Aguarde enquanto o Evolution migra as suas pastas..."
 
-#: ../mail/em-migrate.c:1632
+#: ../mail/em-migrate.c:1648
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Incapaz de criar a nova pasta `%s': %s"
 
-#: ../mail/em-migrate.c:1658
+#: ../mail/em-migrate.c:1674
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Incapaz de copiar a pasta `%s' para `%s': %s"
 
-#: ../mail/em-migrate.c:1843
+#: ../mail/em-migrate.c:1859
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Incapaz de analisar caixas de correio existentes em `%s': %s"
 
-#: ../mail/em-migrate.c:2047
+#: ../mail/em-migrate.c:2063
 #, 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/em-migrate.c:2061
+#: ../mail/em-migrate.c:2077
 #, 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/em-migrate.c:2090
+#: ../mail/em-migrate.c:2106
 #, 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/em-migrate.c:2561 ../mail/em-migrate.c:2573
+#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Falha ao criar o armazenamento local de mensagens `%s': %s"
 
-#: ../mail/em-migrate.c:2693
+#: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Incapaz de criar as pastas locais de mensagens em `%s': %s"
 
-#: ../mail/em-migrate.c:2711
+#: ../mail/em-migrate.c:2731
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -11689,97 +12055,79 @@ msgstr ""
 "Incapaz de ler as definições da instalação anterior do Evolution, `evolution/"
 "config.xmldb' não existe ou está corrompido."
 
-#: ../mail/em-popup.c:399
-msgid "Save As..."
-msgstr "Gravar Como..."
-
-#: ../mail/em-popup.c:424
-#, c-format
-msgid "untitled_image.%s"
-msgstr "imagem_sem_titulo.%s"
-
-#: ../mail/em-popup.c:542 ../mail/em-popup.c:553
-msgid "Set as _Background"
-msgstr "Definir como _Fundo"
-
-#: ../mail/em-popup.c:544 ../mail/em-popup.c:555
+#: ../mail/em-popup.c:557 ../mail/em-popup.c:568
 msgid "_Reply to sender"
 msgstr "_Responder ao remetente"
 
-#: ../mail/em-popup.c:545 ../mail/em-popup.c:556
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../mail/em-popup.c:558 ../mail/em-popup.c:569
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Responder para a _Lista"
 
-#: ../mail/em-popup.c:607
+#: ../mail/em-popup.c:620
 msgid "_Open Link in Browser"
 msgstr "Abrir o Link no _Navegador"
 
-#: ../mail/em-popup.c:608
+#: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
 msgstr "_Enviar uma Nova Mensagem Para..."
 
-#: ../mail/em-popup.c:609
-msgid "_Add to Addressbook"
+#: ../mail/em-popup.c:622
+msgid "_Add to Address Book"
 msgstr "_Adicionar ao Livro de Endereços"
 
-#: ../mail/em-popup.c:762
-#, c-format
-msgid "Open in %s..."
-msgstr "Abrir em %s..."
-
-#: ../mail/em-subscribe-editor.c:614
+#: ../mail/em-subscribe-editor.c:615
 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:643
+#: ../mail/em-subscribe-editor.c:644
 msgid "Subscribed"
 msgstr "Subscrito"
 
-#: ../mail/em-subscribe-editor.c:647
+#: ../mail/em-subscribe-editor.c:648
 msgid "Folder"
 msgstr "Pasta"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:862
+#: ../mail/em-subscribe-editor.c:869
 msgid "Please select a server."
 msgstr "Seleccione um servidor."
 
-#: ../mail/em-subscribe-editor.c:883
+#: ../mail/em-subscribe-editor.c:890
 msgid "No server has been selected"
 msgstr "Não seleccionou nenhum servidor"
 
-#: ../mail/em-utils.c:105
-msgid "Don't show this message again."
+#: ../mail/em-utils.c:124
+msgid "Do not show this message again."
 msgstr "Não apresentar esta mensagem novamente."
 
-#: ../mail/em-utils.c:299
-msgid "Filters"
-msgstr "Filtros"
+#: ../mail/em-utils.c:319
+msgid "Message Filters"
+msgstr "Filtros de Mensagens"
 
-#: ../mail/em-utils.c:442 ../mail/em-utils.c:479
+#: ../mail/em-utils.c:462 ../mail/em-utils.c:499
 msgid "message"
 msgstr "mensagem"
 
-#: ../mail/em-utils.c:614
+#: ../mail/em-utils.c:634
 msgid "Save Message..."
 msgstr "Gravar a Mensagem..."
 
-#: ../mail/em-utils.c:663
+#: ../mail/em-utils.c:683
 msgid "Add address"
 msgstr "Adicionar o endereço"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1142
+#: ../mail/em-utils.c:1167
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensagens de %s"
 
-#: ../mail/em-vfolder-editor.c:104
+#: ../mail/em-vfolder-editor.c:112
 msgid "Search _Folders"
 msgstr "_Pastas de Procura"
 
-#: ../mail/em-vfolder-rule.c:574
+#: ../mail/em-vfolder-rule.c:576
 msgid "Search Folder source"
 msgstr "Origem das Pastas de Procura"
 
@@ -12012,10 +12360,9 @@ msgid "Message Window default width"
 msgstr "Largura por omissão da Janela de Mensagem"
 
 #: ../mail/evolution-mail.schemas.in.in.h:50
-msgid "Message-display style (normal, full headers, source)"
+msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
-"Estilo de apresentação de mensagem (normal, cabeçalhos completos, código "
-"fonte)"
+"Estilo de apresentação de mensagem (\"normal\", \"full headers\", \"source\")"
 
 #: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
@@ -12114,14 +12461,6 @@ msgstr "Apresentar as mensagens apagadas (riscadas) na lista de mensagens."
 msgid "Show deleted messages in the message-list"
 msgstr "Apresentar as mensagens apagadas na lista de mensagens"
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
-msgid "Show the \"Preview\" pane"
-msgstr "Apresentar o painel de \"Antevisão\""
-
-#: ../mail/evolution-mail.schemas.in.in.h:74
-msgid "Show the \"Preview\" pane."
-msgstr "Apresentar o painel de \"Antevisão\"."
-
 #: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Ficheiro de som a reproduzir ao chegarem novas mensagens."
@@ -12274,70 +12613,65 @@ 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/importers/elm-importer.c:193
+#: ../mail/importers/elm-importer.c:192
 msgid "Importing Elm data"
 msgstr "A Importar os dados do Elm"
 
-#: ../mail/importers/elm-importer.c:382
+#: ../mail/importers/elm-importer.c:381
 msgid "Evolution Elm importer"
 msgstr "Importador de Elm do Evolution"
 
-#: ../mail/importers/elm-importer.c:383
+#: ../mail/importers/elm-importer.c:382
 msgid "Import mail from Elm."
 msgstr "Importar correio do Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:82
-#: ../mail/importers/evolution-outlook-importer.c:131
+#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-outlook-importer.c:136
 msgid "Destination folder:"
 msgstr "Pasta de destino:"
 
-#: ../mail/importers/evolution-mbox-importer.c:85
-#: ../mail/importers/evolution-outlook-importer.c:134
+#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder to import into"
 msgstr "Seleccionar a pasta para onde importar"
 
-#: ../mail/importers/evolution-mbox-importer.c:216
+#: ../mail/importers/evolution-mbox-importer.c:223
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Caixa de Correio Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:217
+#: ../mail/importers/evolution-mbox-importer.c:224
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Pastas do importador do formato Caixa de Correio Berkeley"
 
-#: ../mail/importers/evolution-outlook-importer.c:257
-#: ../mail/importers/mail-importer.c:230 ../shell/e-shell-importer.c:516
+#: ../mail/importers/evolution-outlook-importer.c:262
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "A Importar `%s'"
 
-#: ../mail/importers/evolution-outlook-importer.c:259
-#: ../mail/importers/netscape-importer.c:1251
-msgid "Importing..."
-msgstr "A Importar..."
-
-#: ../mail/importers/evolution-outlook-importer.c:261
-#: ../mail/importers/netscape-importer.c:1253
-#: ../plugins/startup-wizard/startup-wizard.c:236
-#: ../shell/e-shell-importer.c:523
+#: ../mail/importers/evolution-outlook-importer.c:266
+#: ../mail/importers/netscape-importer.c:1254
+#: ../plugins/startup-wizard/startup-wizard.c:237
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "Aguarde por favor"
 
-#: ../mail/importers/evolution-outlook-importer.c:305
-#: ../mail/importers/mail-importer.c:144
+#: ../mail/importers/evolution-outlook-importer.c:310
+#: ../mail/importers/mail-importer.c:148
 msgid "Importing mailbox"
 msgstr "A Importar caixa de correio"
 
-#: ../mail/importers/mail-importer.c:373
+#: ../mail/importers/mail-importer.c:376
 #, c-format
 msgid "Scanning %s"
 msgstr "A analizar %s"
 
-#: ../mail/importers/netscape-importer.c:73
+#: ../mail/importers/netscape-importer.c:74
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Filtro de Prioridade \"%s\""
 
-#: ../mail/importers/netscape-importer.c:662
+#: ../mail/importers/netscape-importer.c:663
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -12363,7 +12697,7 @@ msgstr ""
 "pontuações em vez de prioridades. Verifique os filtros importados\n"
 "para se certificar de que tudo continua a funcionar como deseja."
 
-#: ../mail/importers/netscape-importer.c:686
+#: ../mail/importers/netscape-importer.c:687
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -12375,7 +12709,7 @@ msgstr ""
 "a Árvore\", que não é suportada pelo Evolution.\n"
 "Estes filtros serão descartados."
 
-#: ../mail/importers/netscape-importer.c:703
+#: ../mail/importers/netscape-importer.c:704
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -12389,23 +12723,23 @@ msgstr ""
 "Esses filtros foram alterados para testar se essa expressão\n"
 "está ou não contida no corpo da mensagem."
 
-#: ../mail/importers/netscape-importer.c:1250
+#: ../mail/importers/netscape-importer.c:1251
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution está a importar os seus dados antigos do Netscape"
 
-#: ../mail/importers/netscape-importer.c:1707
+#: ../mail/importers/netscape-importer.c:1708
 msgid "Importing Netscape data"
 msgstr "A importar os dados do Netscape"
 
-#: ../mail/importers/netscape-importer.c:1907
+#: ../mail/importers/netscape-importer.c:1908
 msgid "Settings"
 msgstr "Definições"
 
-#: ../mail/importers/netscape-importer.c:1912
+#: ../mail/importers/netscape-importer.c:1913
 msgid "Mail Filters"
 msgstr "Filtros de Mensagens"
 
-#: ../mail/importers/netscape-importer.c:1933
+#: ../mail/importers/netscape-importer.c:1934
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -12413,119 +12747,143 @@ msgstr ""
 "Evolution encontrou ficheiros de mensagens Netscape.\n"
 "Deseja importá-los para o Evolution?"
 
-#: ../mail/importers/pine-importer.c:230
+#: ../mail/importers/pine-importer.c:229
 msgid "Importing Pine data"
 msgstr "A Importar os dados do Pine"
 
-#: ../mail/importers/pine-importer.c:434
+#: ../mail/importers/pine-importer.c:433
 msgid "Evolution Pine importer"
 msgstr "Importador de Pine do Evolution"
 
-#: ../mail/importers/pine-importer.c:435
+#: ../mail/importers/pine-importer.c:434
 msgid "Import mail from Pine."
 msgstr "Importar correio do Pine."
 
-#: ../mail/mail-autofilter.c:78
+#: ../mail/mail-autofilter.c:79
 #, c-format
 msgid "Mail to %s"
 msgstr "Mensagem para %s"
 
-#: ../mail/mail-autofilter.c:242 ../mail/mail-autofilter.c:281
+#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
 #, c-format
 msgid "Mail from %s"
 msgstr "Mensagem de %s"
 
-#: ../mail/mail-autofilter.c:265
+#: ../mail/mail-autofilter.c:266
 #, c-format
 msgid "Subject is %s"
 msgstr "Assunto é %s"
 
-#: ../mail/mail-autofilter.c:300
+#: ../mail/mail-autofilter.c:301
 #, c-format
 msgid "%s mailing list"
 msgstr "lista de distribuição %s"
 
-#: ../mail/mail-autofilter.c:369
+#: ../mail/mail-autofilter.c:372
 msgid "Add Filter Rule"
 msgstr "Adicionar Regra de Filtro"
 
-#: ../mail/mail-component.c:509
+#: ../mail/mail-component.c:521
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d seleccionada"
 msgstr[1] "%d seleccionadas"
 
-#: ../mail/mail-component.c:511
+#: ../mail/mail-component.c:523
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d não solicitado"
 msgstr[1] "%d não solicitados"
 
-#: ../mail/mail-component.c:534
+#: ../mail/mail-component.c:546
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d rascunho"
 msgstr[1] "%d rascunhos"
 
-#: ../mail/mail-component.c:536
+#: ../mail/mail-component.c:548
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d enviada"
 msgstr[1] "%d enviadas"
 
-#: ../mail/mail-component.c:538
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d por enviar"
 msgstr[1] "%d por enviar"
 
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d no total"
 msgstr[1] "%d no total"
 
-#: ../mail/mail-component.c:544
+#: ../mail/mail-component.c:556
 #, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
 msgstr[0] ", %d por ler"
 msgstr[1] ", %d por ler"
 
-#: ../mail/mail-component.c:765
+#: ../mail/mail-component.c:779
 msgid "New Mail Message"
 msgstr "Nova Mensagem de Email"
 
-#: ../mail/mail-component.c:766
+#: ../mail/mail-component.c:780
 msgid "_Mail Message"
 msgstr "_Mensagem de Email"
 
-#: ../mail/mail-component.c:767
+#: ../mail/mail-component.c:781
 msgid "Compose a new mail message"
 msgstr "Compor uma nova mensagem de email"
 
-#: ../mail/mail-component.c:773
+#: ../mail/mail-component.c:787
 msgid "New Mail Folder"
 msgstr "Nova Pasta de Mensagens"
 
-#: ../mail/mail-component.c:774
+#: ../mail/mail-component.c:788
 msgid "Mail _Folder"
 msgstr "_Pasta de Mensagens"
 
-#: ../mail/mail-component.c:775
+#: ../mail/mail-component.c:789
 msgid "Create a new mail folder"
 msgstr "Criar uma nova pasta de mensagens"
 
-#: ../mail/mail-component.c:919
+#: ../mail/mail-component.c:933
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Falha ao actualizar as definições ou pastas de Mensagens."
 
+#: ../mail/mail-config.c:85
+msgid "I_mportant"
+msgstr "I_mportante"
+
+#. red
+#: ../mail/mail-config.c:86
+msgid "_Work"
+msgstr "_Emprego"
+
+#. orange
+#: ../mail/mail-config.c:87
+msgid "_Personal"
+msgstr "_Pessoal"
+
+#. forest green
+#: ../mail/mail-config.c:88
+msgid "_To Do"
+msgstr "A _Fazer"
+
+#. blue
+#: ../mail/mail-config.c:89
+msgid "_Later"
+msgstr "Mais _Tarde"
+
 #: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
@@ -12541,8 +12899,8 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL não é suportado nesta compilação do Evolution</b>"
 
 #: ../mail/mail-config.glade.h:5
-msgid "<b>S_ignatures</b>"
-msgstr "<b>Ass_inaturas</b>"
+msgid "<b>Sig_natures</b>"
+msgstr "<b>Assi_naturas</b>"
 
 #: ../mail/mail-config.glade.h:6
 msgid "<b>_Languages</b>"
@@ -12556,10 +12914,6 @@ msgstr "<small>Isto tornará o filtro mais preciso mas mais lento</small>"
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Informação de Conta</span>"
 
-#: ../mail/mail-config.glade.h:9
-msgid "<span weight=\"bold\">Alerts</span>"
-msgstr "<span weight=\"bold\">Alertas</span>"
-
 #: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Tipo de Autenticação</span>"
@@ -12592,11 +12946,6 @@ msgstr "<span weight=\"bold\">Apresentar os Cabeçal_hos das Mensagens</span>"
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Opções de Filtro</span>"
 
-#: ../mail/mail-config.glade.h:18
-#: ../plugins/itip-formatter/itip-formatter.c:1977
-msgid "<span weight=\"bold\">General</span>"
-msgstr "<span weight=\"bold\">Geral</span>"
-
 #: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Etiquetas e Cores</span>"
@@ -12622,6 +12971,7 @@ msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Notificação de Nova Mensagem</span>"
 
 #: ../mail/mail-config.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Informação Opcional</span>"
 
@@ -12697,13 +13047,9 @@ msgstr "Encriptar se_mpre para o próprio ao enviar mensagens encriptadas"
 msgid "Attach original message"
 msgstr "Anexar a mensagem original"
 
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "Anexo"
-
 #: ../mail/mail-config.glade.h:46
-msgid "Automatically _insert smiley images"
-msgstr "_Inserir automaticamente imagens de risonhos"
+msgid "Automatically insert _smiley images"
+msgstr "Inserir automaticamente imagens de ri_sonhos"
 
 #: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
@@ -12726,8 +13072,8 @@ msgid "Ch_eck for Supported Types "
 msgstr "Verifi_car Tipos Suportados "
 
 #: ../mail/mail-config.glade.h:52
-msgid "Check _incoming mail for junk"
-msgstr "Ver_ificar nas mensagens recebidas por não solicitadas"
+msgid "Check in_coming mail for junk"
+msgstr "Verifi_car nas mensagens recebidas por não solicitadas"
 
 #: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
@@ -12797,6 +13143,11 @@ msgstr "Terminado"
 msgid "Drafts _Folder:"
 msgstr "_Pasta de Rascunhos:"
 
+#: ../mail/mail-config.glade.h:74
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
+msgid "E_nable"
+msgstr "_Activar"
+
 #: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "Contas de Email"
@@ -12818,8 +13169,8 @@ msgid "Encrypt out_going messages (by default)"
 msgstr "_Encriptar as mensagens enviadas (por omissão)"
 
 #: ../mail/mail-config.glade.h:81
-msgid "Execute Command..."
-msgstr "Executar um Comando..."
+msgid "Fi_xed width Font:"
+msgstr "Fonte de largura fi_xa:"
 
 #: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
@@ -12833,66 +13184,70 @@ msgstr "Propriedades da Fonte"
 msgid "Format messages in _HTML"
 msgstr "Formatar mensagens em _HTML"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:85
+msgid "Full Nam_e:"
+msgstr "Nom_e Completo:"
+
+#: ../mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "Correio HTML"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "Cabeçalhos"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "_Realçar as citações com"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:90
 msgid "I_nclude remote tests"
 msgstr "I_ncluir testes remotos"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Inline"
 msgstr "Imbutido"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Languages Table"
 msgstr "Tabela de Idiomas"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Mail Configuration"
 msgstr "Configuração de Email"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "Mail Headers Table"
 msgstr "Tabela de Cabeçalhos de Mensagens"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Localização da caixa de correio"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Compositor de Mensagens"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 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.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Or_ganization:"
 msgstr "Or_ganização:"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "PGP/GPG _Key ID:"
 msgstr "ID de C_have PGP/GPG:"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "Play sound file when new mail arri_ves"
 msgstr "_Reproduzir um ficheiro de som ao chegarem novas mensagens"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -12900,7 +13255,7 @@ msgstr ""
 "Introduza um nome descritivo para esta conta no espaço abaixo.\n"
 "Este nome será utilizado apenas para apresentação."
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -12909,7 +13264,7 @@ msgstr ""
 "certeza, pergunte ao seu administrador de sistemas ou Fornecedor de Serviço "
 "de Internet."
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 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 "
@@ -12919,115 +13274,115 @@ msgstr ""
 "abaixo não têm de ser preenchidos, excepto se desejar incluir essa "
 "informação nas mensagens que enviar."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Please select among the following options"
 msgstr "Seleccione de entre as seguintes opções"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 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.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Citar a mensagem original"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Citada"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "Recordar a sen_ha"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "Res_ponder-A:"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Remember _password"
 msgstr "Recordar a sen_ha"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "S_elect..."
 msgstr "S_eleccionar..."
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "S_tandard Font:"
 msgstr "Fonte _Base:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Se_lect..."
 msgstr "Se_leccionar..."
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
 msgid "Select HTML fixed width font"
 msgstr "Seleccionar a fonte HTML de largura fixa"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font for printing"
 msgstr "Seleccionar a fonte HTML de largura fixa para impressão"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "Select HTML variable width font"
 msgstr "Seleccionar a fonte HTML de largura variável"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "Select HTML variable width font for printing"
 msgstr "Seleccionar a fonte HTML de largura variável para impressão"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
+msgid "Select sound file"
+msgstr "Seleccione um ficheiro de som"
+
+#: ../mail/mail-config.glade.h:129
 msgid "Send message receipts:"
 msgstr "Enviar recibos de mensagem:"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "A Enviar Mensagens"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:132
 msgid "Sent _Messages Folder:"
 msgstr "Pasta de _Mensagens Enviadas:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:133
 msgid "Ser_ver requires authentication"
 msgstr "Ser_vidor requer autenticação"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:134
 msgid "Server _Type: "
 msgstr "_Tipo de Servidor: "
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:135
 msgid "Sig_ning certificate:"
 msgstr "Certificado de assi_natura:"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:136
 msgid "Signat_ure:"
 msgstr "Assinat_ura:"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:137
 msgid "Signatures"
 msgstr "Assinaturas"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:138
 msgid "Signatures Table"
 msgstr "Tabela de Assinaturas"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Especificar um nome de _ficheiro:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "Verificar a _Ortografia"
 
-#: ../mail/mail-config.glade.h:139
-msgid "T_erminal Font:"
-msgstr "Fonte de _Consola:"
-
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "T_ype: "
 msgstr "T_ipo: "
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -13035,7 +13390,7 @@ msgstr ""
 "Esta listagem de idiomas reflecte apenas aqueles para os quais possui um "
 "dicionário instalado."
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13045,7 +13400,7 @@ msgstr ""
 "sua assinatura. O nome que especificar será utilizado\n"
 "apenas para visualização. "
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:147
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13053,15 +13408,15 @@ msgstr ""
 "Indique o nome pelo qual deseja referir-se a esta conta.\n"
 "Por exemplo: \"Trabalho\" ou \"Pessoal\""
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
 msgid "User_name:"
 msgstr "_Nome de utilizador:"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "Largura v_ariável:"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13071,31 +13426,27 @@ msgstr ""
 "\n"
 "Prima \"Avançar\" para começar. "
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:155
 msgid "_Add Signature"
 msgstr "_Adicionar Assinatura"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:156
 msgid "_Always load images from the Internet"
 msgstr "_Ler sempre as imagens da Internet"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Não me notificar ao receber novas mensagens"
 
-#: ../mail/mail-config.glade.h:157
-msgid "_Don't sign meeting requests (for Outlook compatibility)"
+#: ../mail/mail-config.glade.h:158
+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.glade.h:159
+#: ../mail/mail-config.glade.h:160
 msgid "_Forward style:"
 msgstr "_Estilo de reencaminhamento:"
 
-#: ../mail/mail-config.glade.h:160
-msgid "_Full Name:"
-msgstr "Nome Comp_leto:"
-
 #: ../mail/mail-config.glade.h:161
 msgid "_Load images in mail from contacts"
 msgstr "_Ler imagens em mensagens de contactos"
@@ -13117,7 +13468,7 @@ msgid "_Path:"
 msgstr "_Caminho"
 
 #: ../mail/mail-config.glade.h:167
-msgid "_Prompt when sending HTML messages to contacts that don't want them"
+msgid "_Prompt when sending HTML messages to contacts that do not want them"
 msgstr "_Avisar ao enviar mensagens HTML para contactos que as não desejam"
 
 #: ../mail/mail-config.glade.h:168
@@ -13132,23 +13483,24 @@ msgstr "Estilo de _resposta:"
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.glade.h:172
-msgid "_Show animated images"
-msgstr "Apre_sentar as imagens animadas"
-
+#. If enabled, show animation; if disabled, only display a static image without any animation
 #: ../mail/mail-config.glade.h:173
+msgid "_Show image animations"
+msgstr "Apresentar as animações de image_s"
+
+#: ../mail/mail-config.glade.h:174
 msgid "_Use Secure Connection:"
 msgstr "_Utilizar uma Ligação Segura:"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:175
 msgid "_Use the same fonts as other applications"
 msgstr "_Utilizar a mesma fonte que as outras aplicações"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:176
 msgid "color"
 msgstr "cor"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:177
 msgid "description"
 msgstr "descrição"
 
@@ -13165,8 +13517,8 @@ msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">Encriptação</span>"
 
 #: ../mail/mail-dialogs.glade.h:5
-msgid "Case _Sensitive"
-msgstr "_Sensível à Capitalização"
+msgid "Case _sensitive"
+msgstr "_Sensível à capitalização"
 
 #: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
@@ -13180,7 +13532,7 @@ msgstr "_Procurar:"
 msgid "Find in Message"
 msgstr "Procurar na Mensagem"
 
-#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:295
+#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:297
 #: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Marcar para Dar Seguimento"
@@ -13254,26 +13606,26 @@ msgstr "com todas as pastas locais e as remotas activas"
 msgid "with all local folders"
 msgstr "com todas as pastas locais"
 
-#: ../mail/mail-folder-cache.c:855
+#: ../mail/mail-folder-cache.c:858
 #, c-format
 msgid "Pinging %s"
 msgstr "A pingar %s"
 
-#: ../mail/mail-ops.c:102
+#: ../mail/mail-ops.c:104
 msgid "Filtering Folder"
 msgstr "A Filtrar a Pasta"
 
-#: ../mail/mail-ops.c:263
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "A Obter as Mensagens"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:563
+#: ../mail/mail-ops.c:565
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Falha ao aplicar os filtros de envio: %s"
 
-#: ../mail/mail-ops.c:575 ../mail/mail-ops.c:604
+#: ../mail/mail-ops.c:577 ../mail/mail-ops.c:606
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13282,114 +13634,114 @@ msgstr ""
 "Falha ao acrescentar a %s: %s\n"
 "Acrescentado à pasta `Enviadas'."
 
-#: ../mail/mail-ops.c:621
+#: ../mail/mail-ops.c:623
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Falha ao acrescentar à pasta local `Enviadas': %s"
 
-#: ../mail/mail-ops.c:733
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "A enviar a mensagem %d de %d"
 
-#: ../mail/mail-ops.c:758
+#: ../mail/mail-ops.c:760
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Falha ao enviar %d de %d mensagens."
 
-#: ../mail/mail-ops.c:760 ../mail/mail-send-recv.c:613
-msgid "Cancelled."
+#: ../mail/mail-ops.c:762 ../mail/mail-send-recv.c:623
+msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:764
 msgid "Complete."
 msgstr "Terminado."
 
-#: ../mail/mail-ops.c:859
+#: ../mail/mail-ops.c:861
 msgid "Saving message to folder"
 msgstr "A gravar a mensagem na pasta"
 
-#: ../mail/mail-ops.c:944
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Moving messages to %s"
 msgstr "A mover as mensagens para %s"
 
-#: ../mail/mail-ops.c:944
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Copying messages to %s"
 msgstr "A copiar as mensagens para %s"
 
-#: ../mail/mail-ops.c:1167
+#: ../mail/mail-ops.c:1169
 msgid "Forwarded messages"
 msgstr "Mensagens reencaminhadas"
 
-#: ../mail/mail-ops.c:1210
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "A abrir a pasta %s"
 
-#: ../mail/mail-ops.c:1282
+#: ../mail/mail-ops.c:1284
 #, c-format
 msgid "Opening store %s"
 msgstr "A abrir o armazenamento %s"
 
-#: ../mail/mail-ops.c:1360
+#: ../mail/mail-ops.c:1362
 #, c-format
 msgid "Removing folder %s"
 msgstr "A remover a pasta %s"
 
-#: ../mail/mail-ops.c:1454
+#: ../mail/mail-ops.c:1456
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "A armazenar a pasta '%s'"
 
-#: ../mail/mail-ops.c:1519
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "A expurgar e armazenar a conta '%s'"
 
-#: ../mail/mail-ops.c:1520
+#: ../mail/mail-ops.c:1522
 #, c-format
 msgid "Storing account '%s'"
 msgstr "A armazenar a conta '%s'"
 
-#: ../mail/mail-ops.c:1575
+#: ../mail/mail-ops.c:1577
 msgid "Refreshing folder"
 msgstr "A actualizar a pasta"
 
-#: ../mail/mail-ops.c:1611 ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1613 ../mail/mail-ops.c:1664
 msgid "Expunging folder"
 msgstr "A expurgar a pasta"
 
-#: ../mail/mail-ops.c:1659
+#: ../mail/mail-ops.c:1661
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "A esvaziar o lixo em '%s'"
 
-#: ../mail/mail-ops.c:1660
+#: ../mail/mail-ops.c:1662
 msgid "Local Folders"
 msgstr "Pastas Locais"
 
-#: ../mail/mail-ops.c:1743
+#: ../mail/mail-ops.c:1745
 #, c-format
 msgid "Retrieving message %s"
 msgstr "A obter a mensagem %s"
 
-#: ../mail/mail-ops.c:1853
+#: ../mail/mail-ops.c:1855
 #, 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:1939
+#: ../mail/mail-ops.c:1941
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "A gravar %d mensagem"
 msgstr[1] "A gravar %d mensagens"
 
-#: ../mail/mail-ops.c:1989
+#: ../mail/mail-ops.c:1991
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13398,7 +13750,7 @@ msgstr ""
 "Incapaz de criar o ficheiro de resultado: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2017
+#: ../mail/mail-ops.c:2019
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13407,11 +13759,11 @@ msgstr ""
 "Erro ao gravar as mensagens em: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2088
+#: ../mail/mail-ops.c:2091
 msgid "Saving attachment"
 msgstr "A gravar o anexo"
 
-#: ../mail/mail-ops.c:2100
+#: ../mail/mail-ops.c:2104 ../mail/mail-ops.c:2110
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13420,110 +13772,96 @@ msgstr ""
 "Incapaz de criar o ficheiro de resultado: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2110
+#: ../mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Incapaz de escrever dados: %s"
 
-#: ../mail/mail-ops.c:2260
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "A desligar-se de %s"
 
-#: ../mail/mail-ops.c:2260
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "A estabelecer nova ligação a %s"
 
-#: ../mail/mail-ops.c:2376
+#: ../mail/mail-ops.c:2385
 msgid "Checking Service"
 msgstr "A Verificar o Serviço"
 
 #: ../mail/mail-send-recv.c:158
-msgid "Cancelling..."
+msgid "Canceling..."
 msgstr "A Cancelar..."
 
-#: ../mail/mail-send-recv.c:265
-#, c-format
-msgid "Server: %s, Type: %s"
-msgstr "Servidor: %s, Tipo: %s"
-
-#: ../mail/mail-send-recv.c:267
-#, c-format
-msgid "Path: %s, Type: %s"
-msgstr "Caminho: %s, Tipo: %s"
-
-#: ../mail/mail-send-recv.c:269
-#, c-format
-msgid "Type: %s"
-msgstr "Tipo: %s"
-
-#: ../mail/mail-send-recv.c:320
+#: ../mail/mail-send-recv.c:329
 msgid "Send & Receive Mail"
 msgstr "Enviar & Receber Mensagens"
 
-#: ../mail/mail-send-recv.c:327
+#: ../mail/mail-send-recv.c:336
 msgid "Cancel _All"
 msgstr "Cancelar _Tudo"
 
-#: ../mail/mail-send-recv.c:416
+#: ../mail/mail-send-recv.c:425
 msgid "Updating..."
 msgstr "A Actualizar..."
 
-#: ../mail/mail-send-recv.c:416 ../mail/mail-send-recv.c:468
+#: ../mail/mail-send-recv.c:425 ../mail/mail-send-recv.c:478
 msgid "Waiting..."
 msgstr "A Aguardar..."
 
-#: ../mail/mail-send-recv.c:699
+#: ../mail/mail-send-recv.c:709
 msgid "Checking for new mail"
 msgstr "A verificar a existência de novas mensagens"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:204
+#: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduza a Senha para %s"
 
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "Introduza a Senha"
 
-#: ../mail/mail-session.c:244
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
 msgstr "Utilizador cancelou a operação."
 
-#: ../mail/mail-signature-editor.c:372
+#: ../mail/mail-signature-editor.c:384
 msgid "Edit signature"
 msgstr "Editar assinatura"
 
-#: ../mail/mail-signature-editor.c:412
+#: ../mail/mail-signature-editor.c:431
 msgid "Enter a name for this signature."
 msgstr "Introduza um nome para esta assinatura."
 
-#: ../mail/mail-signature-editor.c:415
+#: ../mail/mail-signature-editor.c:434
 #: ../plugins/groupwise-features/properties.glade.h:5
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../mail/mail-tools.c:116
+#: ../mail/mail-tools.c:120
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Incapaz de criar o directório de spool `%s': %s"
 
-#: ../mail/mail-tools.c:143
+#: ../mail/mail-tools.c:150
 #, 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"
 
-#: ../mail/mail-tools.c:242
+#: ../mail/mail-tools.c:256
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensagem reencaminhada - %s"
 
-#: ../mail/mail-tools.c:244
+#: ../mail/mail-tools.c:258
 msgid "Forwarded message"
 msgstr "Mensagem reencaminhada"
 
-#: ../mail/mail-tools.c:284
+#: ../mail/mail-tools.c:298
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Pasta inválida: `%s'"
@@ -13543,11 +13881,11 @@ msgstr "A actualizar as Pastas de Procura para '%s:%s'"
 msgid "Updating Search Folders for '%s'"
 msgstr "A actualizar as Pastas de Procura para '%s'"
 
-#: ../mail/mail-vfolder.c:1046
+#: ../mail/mail-vfolder.c:1050
 msgid "Edit Search Folder"
 msgstr "Editar a Pasta de Procura"
 
-#: ../mail/mail-vfolder.c:1130
+#: ../mail/mail-vfolder.c:1134
 msgid "New Search Folder"
 msgstr "Nova Pasta de Procura"
 
@@ -13571,33 +13909,48 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;.  Send "
-"the reciept notification to {0}?"
+"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
+"receipt notification to {0}?"
 msgstr ""
 "Foi pedido um recibo de notificação de leitura para &quot;{1}&quot;. Enviar "
 "o recibo de notificação para {0}?"
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
+"A signature already exists with the name &quot;{0}&quot;. Please specify a "
+"different name."
+msgstr ""
+"Já existe uma assinatura denominada &quot;{0}&quot;. Utilize um nome "
+"diferente."
+
+#: ../mail/mail.error.xml.h:8
+msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
 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:8
+#: ../mail/mail.error.xml.h:9
 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:9
+#: ../mail/mail.error.xml.h:10
 msgid "Are you sure you want to delete this account?"
 msgstr "Tem a certeza que quer apagar esta conta?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:11
+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:11
+#: ../mail/mail.error.xml.h:13
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -13605,7 +13958,7 @@ msgstr ""
 "Deseja mesmo remover definitivamente todas as mensagens apagadas em todas as "
 "pastas?"
 
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
@@ -13613,175 +13966,187 @@ msgstr ""
 "Deseja mesmo remover definitivamente todas as mensagens apagadas na pasta "
 "&quot;{0}&quot;?"
 
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:15
 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:14
+#: ../mail/mail.error.xml.h:16
 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:15
+#: ../mail/mail.error.xml.h:17
 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:16
+#: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{0}&quot;."
 msgstr "Devido a &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
 msgid "Because &quot;{2}&quot;."
 msgstr "Devido a &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:21
+msgid "Blank Signature"
+msgstr "Assinatura em Branco"
+
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "Incapaz de adicionar a Pasta de Procura &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Incapaz de copiar a pasta &quot;{0}&quot; para &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "Incapaz de criar a pasta &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
 msgstr "Incapaz de criar o directório temporário de gravação."
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "Incapaz de criar o directório de gravação devido a &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "Incapaz de apagar a pasta &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "Incapaz de apagar a pasta de sistema &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr ""
 "Incapaz de editar a Pasta de Procura &quot;{0}&quot; pois esta não existe."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Incapaz de mover a pasta &quot;{0}&quot; para &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "Incapaz de abrir a origem &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "Incapaz de abrir a origem &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "Incapaz de abrir o destino &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:34
 msgid ""
 "Cannot read the license file &quot;{0}&quot;, due to an installation "
-"problem.  You will not be able to use this provider until you can accept its "
+"problem. You will not be able to use this provider until you can accept its "
 "license."
 msgstr ""
 "Incapaz de ler o ficheiro de licença &quot;{0}&quot;, devido a um problema "
-"na instalação.  Não será possível utilizar este fornecedor até que possa "
+"na instalação. Não será possível utilizar este fornecedor até que possa "
 "aceitar a sua licença."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Incapaz de renomear &quot;{0}&quot; para &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr "Incapaz de renomear ou mover a pasta de sistema &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot save changes to account."
 msgstr "Incapaz de gravar as alterações à conta."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "Incapaz de gravar no directório &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "Incapaz de gravar para o ficheiro &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "Incapaz de definir o script de assinatura &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:41
 msgid ""
-"Check to make sure your password is spelled correctly.  Remember that many "
+"Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
 msgstr ""
-"Certifique-se de que a sua senha está correctamente escrita.  Lembre-se de "
+"Certifique-se de que a sua senha está correctamente escrita. Lembre-se de "
 "que muitas senhas são sensíveis à capitalização; o caps lock poderá estar "
 "activo."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:42
 msgid "Could not save signature file."
 msgstr "Incapaz de gravar o ficheiro de assinatura."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:43
 msgid "Delete &quot;{0}&quot;?"
 msgstr "Apagar &quot;{0}&quot;?"
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:44
 msgid "Delete account?"
 msgstr "Apagar a conta?"
 
-#: ../mail/mail.error.xml.h:42
-msgid "Discard changed?"
+#: ../mail/mail.error.xml.h:45
+msgid "Discard changes?"
 msgstr "Descartar as alterações?"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:46
+msgid "Do not delete"
+msgstr "Não apagar"
+
+#: ../mail/mail.error.xml.h:47
+msgid "Do not disable"
+msgstr "Não desactivar"
+
+#: ../mail/mail.error.xml.h:48
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr "Deseja que a operação seja realizada nas subpastas?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:49
+msgid "Do you want to mark all messages as read?"
+msgstr "Deseja marcar todas as mensagens como lidas?"
+
+#: ../mail/mail.error.xml.h:50
 msgid "Do you wish to save your changes?"
 msgstr "Deseja gravar as suas alterações?"
 
-#: ../mail/mail.error.xml.h:45
-msgid "Don't delete"
-msgstr "Não apagar"
-
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:51
 msgid "Enter password."
 msgstr "Introduza a senha."
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:52
 msgid "Error loading filter definitions."
 msgstr "Erro ao ler as definições de filtro."
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:53
 msgid "Error while performing operation."
 msgstr "Erro durante execução da operação."
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:54
 msgid "Error while {0}."
 msgstr "Erro durante {0}."
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:55
 msgid "File exists but cannot overwrite it."
 msgstr "Ficheiro já existe mas não é possível sobrepo-lo."
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:56
 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:52
+#: ../mail/mail.error.xml.h:57
 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:53
+#: ../mail/mail.error.xml.h:58
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -13789,7 +14154,11 @@ msgstr ""
 "Se apagar a pasta, todo o seu conteúdo e das suas subpastas será "
 "definitivamente apagado."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:59
+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:60
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13797,11 +14166,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:56
+#: ../mail/mail.error.xml.h:62
 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:57
+#: ../mail/mail.error.xml.h:63
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13809,19 +14178,19 @@ msgstr ""
 "Se sair, estas mensagens não serão enviadas até que o Evolution seja "
 "novamente iniciado."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:64
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:65
 msgid "Invalid authentication"
 msgstr "Autenticação inválida"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:66
 msgid "Mail filters automatically updated."
 msgstr "Filtros de mensagens actualizados automaticamente."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:67
 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 "
@@ -13833,32 +14202,36 @@ 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:62
+#: ../mail/mail.error.xml.h:68
 msgid "Mark all messages as read"
 msgstr "Marcar todas as mensagens como lidas"
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:69
 msgid "Mark all messages as read in the selected folder"
 msgstr "Marcar todas as mensagens como lidas na pasta seleccionada"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:70
 msgid "Missing folder."
 msgstr "Pasta inexistente."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:72
 msgid "No sources selected."
 msgstr "Nenhuma origem seleccionada."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:73
 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:68
+#: ../mail/mail.error.xml.h:74
 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:69
+#: ../mail/mail.error.xml.h:75
+msgid "Please enable the account or send using another account."
+msgstr "Active a conta ou envie utilizando outra conta."
+
+#: ../mail/mail.error.xml.h:76
 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."
@@ -13866,7 +14239,7 @@ msgstr ""
 "Introduza um endereço de email válido no campo Para:. Pode procurar "
 "endereços de email primindo o botão Para: junto à caixa de introdução."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:77
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13878,41 +14251,49 @@ msgstr ""
 "{0}\n"
 "Ainda assim enviar?"
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:80
+msgid "Please provide an unique name to identify this signature."
+msgstr "Introduza um nome único para identificar esta assinatura."
+
+#: ../mail/mail.error.xml.h:81
 msgid "Please wait."
 msgstr "Aguarde por favor."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:82
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Problemas ao migrar a pasta de mensagens antiga &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server"
 msgstr "A consultar o servidor"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:84
 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:77
+#: ../mail/mail.error.xml.h:85
 msgid "Read receipt requested."
 msgstr "Foi pedido um recibo de leitura."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:86
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Apagar mesmo a pasta &quot;{0}&quot; e todas as suas subpastas?"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:87
 msgid "Search Folders automatically updated."
 msgstr "Pastas de Procura automaticamente actualizadas."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:88
 msgid "Send Receipt"
 msgstr "Enviar Recibo"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:89
+msgid "Signature Already Exists"
+msgstr "Assinatura Já Existe"
+
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -13920,7 +14301,7 @@ msgstr ""
 "As pastas de sistema são necessárias para que o Ximian Evolution funcione "
 "correctamente pelo que não podem ser renomeadas, movidas ou apagadas."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:91
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13937,7 +14318,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:85
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -13951,7 +14332,7 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "E foram actualizadas."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -13965,23 +14346,23 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "E foram actualizadas."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:104
 msgid ""
-"The message was sent via the &quot;sendmail&quot; external application.  "
+"The message was sent via the &quot;sendmail&quot; external application. "
 "Sendmail reports the following error: status 67: mail not sent.\n"
-"The message is stored in the Outbox folder.  Check the message for errors "
-"and resend."
+"The message is stored in the Outbox folder. Check the message for errors and "
+"resend."
 msgstr ""
-"A mensagem foi enviada através da aplicação externa &quot;sendmail&quaot;.  "
+"A mensagem foi enviada através da aplicação externa &quot;sendmail&quaot;. "
 "Sendmail relata o seguinte erro: estado 67: mensagem não foi enviada.\n"
-"A mensagem fica armazenada na pasta de Saída.  Certifique-se de que a "
+"A mensagem fica armazenada na pasta de Saída. Certifique-se de que a "
 "mensagem não possui erros e reenvie-a."
 
-#: ../mail/mail.error.xml.h:97
+#: ../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:98
+#: ../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."
@@ -13989,13 +14370,21 @@ 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:100
+#: ../mail/mail.error.xml.h:109
 msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
 msgstr ""
-"Esta mensagem nã poderá ser enviada pois não especificou nenhum Destinatário"
+"Esta mensagem não pode ser enviada pois a conta seleccionada para a enviar "
+"não está activa"
 
-#: ../mail/mail.error.xml.h:101
+#: ../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:111
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14003,55 +14392,63 @@ 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:102
+#: ../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:103
+#: ../mail/mail.error.xml.h:113
+msgid ""
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
+msgstr ""
+"Esta operação irá marcar todas as mensagens como lidas na pasta seleccionada "
+"e suas subpastas."
+
+#: ../mail/mail.error.xml.h:114
 msgid "Unable to connect to the GroupWise server."
 msgstr "Incapaz de se ligar ao servidor GroupWise."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:115
 msgid ""
-"Unable to open the drafts folder for this account.  Use the system drafts "
+"Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr ""
-"Incapaz de abrir a pasta de rascunhos desta conta.  Deseja utilizar a pasta "
+"Incapaz de abrir a pasta de rascunhos desta conta. Deseja utilizar a pasta "
 "de rascunhos do sistema?"
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:116
 msgid "Unable to read license file."
 msgstr "Incapaz de ler o ficheiro de licença."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:117
 msgid "Use _Default"
 msgstr "Utilizar Por _Omissão"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:118
 msgid "Use default drafts folder?"
 msgstr "Utilizar a pasta por omissão de rascunhos"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:119
 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:109
+#: ../mail/mail.error.xml.h:120
 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:110
+#: ../mail/mail.error.xml.h:121
 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:111
+#: ../mail/mail.error.xml.h:122
 msgid "You must name this Search Folder."
 msgstr "Tem de indicar um nome para esta Pasta de Procura."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:123
 msgid "You must specify a folder."
 msgstr "Tem de especificar uma pasta."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:124
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14061,104 +14458,100 @@ msgstr ""
 "Pode seleccionar as pastas individualmente e/ou seleccionar todas as pastas "
 "locais, todas as remotas ou ambas."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:126
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr ""
 "O seu início de sessão no servidor &quot;{0}&quot; como &quot;{0}&quot; "
 "falhou."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:127
 msgid "Your message with the subject &quot;{0}&quot; was not delivered."
 msgstr "A sua mensagem com o assunto &quot;{0}&quot; não foi entregue."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:128
 msgid "_Append"
 msgstr "_Acrescentar"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:129
 msgid "_Discard changes"
 msgstr "_Descartar as alterações"
 
-#: ../mail/mail.error.xml.h:119
-msgid "_Empty Trash"
-msgstr "_Esvaziar o Lixo"
-
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:131
 msgid "_Expunge"
 msgstr "_Expurgar"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:132
 msgid "_Open Messages"
 msgstr "_Abrir as Mensagens"
 
-#: ../mail/message-list.c:996
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "Por Ler"
 
-#: ../mail/message-list.c:997
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "Lida"
 
-#: ../mail/message-list.c:998
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "Respondida"
 
-#: ../mail/message-list.c:999
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "Múltiplas Mensagens Por Ler"
 
-#: ../mail/message-list.c:1000
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
 msgstr "Múltiplas Mensagens"
 
-#: ../mail/message-list.c:1004
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "Mais Baixo"
 
-#: ../mail/message-list.c:1005
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "Baixo"
 
-#: ../mail/message-list.c:1009
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "Alto"
 
-#: ../mail/message-list.c:1010
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "Mais Alto"
 
-#: ../mail/message-list.c:1338 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1341 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1345 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Hoje %l:%M %p"
 
-#: ../mail/message-list.c:1354 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1357 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Ontem %l:%M %p"
 
-#: ../mail/message-list.c:1366 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1374 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2042
-msgid "Message List"
-msgstr "Lista de Mensagens"
+#: ../mail/message-list.c:2063
+msgid "Messages"
+msgstr "Mensagens"
 
-#: ../mail/message-list.c:3387
+#: ../mail/message-list.c:3441
 msgid "Generating message list"
 msgstr "A gerar a lista de mensagens"
 
@@ -14187,42 +14580,43 @@ msgid "Received"
 msgstr "Recebida"
 
 #: ../mail/message-list.etspec.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Tamanho"
 
-#: ../mail/message-tag-followup.c:74
+#: ../mail/message-tag-followup.c:75
 msgid "Call"
 msgstr "Chamar"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:76
 msgid "Do Not Forward"
 msgstr "Não Reencaminhar"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:77
 msgid "Follow-Up"
 msgstr "Dar Seguimento"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:78
 msgid "For Your Information"
 msgstr "Para Sua Informação"
 
-#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Reencaminhar"
 
-#: ../mail/message-tag-followup.c:79
+#: ../mail/message-tag-followup.c:80
 msgid "No Response Necessary"
 msgstr "Nenhuma Resposta Necessária"
 
-#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:82
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Responder"
 
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:83
+#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "Responder a Todos"
 
-#: ../mail/message-tag-followup.c:83
+#: ../mail/message-tag-followup.c:84
 msgid "Review"
 msgstr "Rever"
 
@@ -14250,6 +14644,14 @@ msgstr "Assunto contém"
 msgid "Subject or Sender contains"
 msgstr "Assunto ou Remetente contém"
 
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
+msgid "Local Address Books"
+msgstr "Livros de Endereços Locais"
+
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
+msgid "Provides core functionality for local address books."
+msgstr "Disponibiliza funcionalidades base para os livros de endereços locais."
+
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
@@ -14317,57 +14719,58 @@ msgstr "Cópia de segurança e reposição dos dados e configurações do Evolut
 msgid "Restore Settings..."
 msgstr "Repôr as Configurações..."
 
-#: ../plugins/bbdb/bbdb.c:404
+#: ../plugins/bbdb/bbdb.c:430 ../plugins/bbdb/bbdb.c:439
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Contactos Automáticos"
 
-#: ../plugins/bbdb/bbdb.c:413
-msgid "<span weight=\"bold\">Automatic Contacts</span>"
-msgstr "<span weight=\"bold\">Contactos Automáticos</span>"
-
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:426
+#: ../plugins/bbdb/bbdb.c:454
 msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
 msgstr ""
 "Criar _automaticamente entradas no livro de endereços ao responder a "
 "mensagens"
 
-#: ../plugins/bbdb/bbdb.c:444
-msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
-msgstr "<span weight=\"bold\">Contactos de Mensagens Instantâneas</span>"
+#: ../plugins/bbdb/bbdb.c:475
+msgid "Instant Messaging Contacts"
+msgstr "Contactos de Mensagens Instantâneas"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:457
+#: ../plugins/bbdb/bbdb.c:490
 msgid ""
-"Periodically synchronize contact information and images from my _instant "
-"messenger"
+"Periodically synchronize contact information and images from gaim buddy list"
 msgstr ""
-"Sincronizar periodicamente a informação e imagens de contactos da aplicação "
-"de mensagens _instantâneas"
+"Sincronizar periodicamente a informação e imagens de contactos com a lista "
+"de contactos do gaim"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:464
+#: ../plugins/bbdb/bbdb.c:507
 msgid "Synchronize with _buddy list now"
 msgstr "Sincronizar com a lista de _amigos agora"
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
-msgid "Automatic contacts"
-msgstr "Contactos automáticos"
-
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
 msgid ""
 "Automatically fills your addressbook with names and email addresses as you "
-"reply to mails. Also fills in IM contact information from your buddy lists."
+"reply to messages. Also fills in IM contact information from your buddy "
+"lists."
 msgstr ""
 "Preenche automaticamente o seu livro de endereços com nomes e endereços à "
 "medida que responde a mensagens. Também preenche informação de contacto a "
-"partir da sua lista de notificações."
+"partir da sua lista de contactos de mensageiro."
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
 msgstr "BBDB"
 
+#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../plugins/caldav/caldav-source.c:269
+msgid "Use _SSL"
+msgstr "Utilizar _SSL"
+
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
 msgid "Local Calendars"
 msgstr "Calendários Locais"
@@ -14376,6 +14779,10 @@ msgstr "Calendários Locais"
 msgid "Provides core functionality for local calendars."
 msgstr "Disponibiliza funcionalidades base para calendários locais."
 
+#: ../plugins/calendar-http/calendar-http.c:339
+msgid "_Secure connection"
+msgstr "Ligação _segura"
+
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
 msgid "HTTP Calendars"
 msgstr "Calendários HTTP"
@@ -14479,8 +14886,20 @@ msgstr "Deseja tornar o Evolution no seu cliente de email por omissão?"
 
 #: ../plugins/default-source/default-source.c:82
 #: ../plugins/default-source/default-source.c:109
-msgid "Mark as default folder"
-msgstr "Marcar como pasta por omissão"
+msgid "Mark as _default folder"
+msgstr "Marcar como pasta por _omissão"
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
+msgid "Default Sources"
+msgstr "Origens por omissão"
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
+msgid ""
+"Provides functionallity for marking a calendar or addressbook as the default "
+"one."
+msgstr ""
+"Disponibiliza funcionalidades para marcar um calendário ou livro de "
+"endereços como o por omissão."
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
@@ -14524,11 +14943,11 @@ msgstr ""
 "Esta opção irá estabelecer uma ligação a um servidor Exchange utilizando "
 "autenticação com senha em texto simples."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:251
+#: ../plugins/exchange-operations/exchange-account-setup.c:257
 msgid "Out Of Office"
 msgstr "Fora do Escritório"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:258
+#: ../plugins/exchange-operations/exchange-account-setup.c:264
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -14536,69 +14955,80 @@ msgstr ""
 "A mensagem abaixo especificada será automaticamente enviada para todas \n"
 "as pessoas lhe enviarem uma mensagem enquanto estiver ausente do escritório."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:270
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:276
+#: ../plugins/exchange-operations/exchange-account-setup.c:281
 msgid "I am out of the office"
 msgstr "Estou ausente do escritório"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:271
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:277
+#: ../plugins/exchange-operations/exchange-account-setup.c:280
 msgid "I am in the office"
 msgstr "Encontro-me no escritório"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:321
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 msgid "Change the password for Exchange account"
 msgstr "Alterar a senha para conats Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:323
+#: ../plugins/exchange-operations/exchange-account-setup.c:330
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Change Password"
 msgstr "Alterar a Senha"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:327
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Gerir as definições de delegação para contas Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:329
+#: ../plugins/exchange-operations/exchange-account-setup.c:337
 msgid "Delegation Assitant"
 msgstr "Assistente de Delegação"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:339
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
 msgid "Miscelleneous"
 msgstr "Vários"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "View the size of all Exchange folders"
 msgstr "Visualizar o tamanho de todas as pastas Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:351
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
 msgid "Folders Size"
 msgstr "Tamanho das Pastas"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:358
+#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Definições de Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:601
-msgid "_OWA Url:"
+#: ../plugins/exchange-operations/exchange-account-setup.c:609
+msgid "_OWA URL:"
 msgstr "URL _OWA:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:626
+#: ../plugins/exchange-operations/exchange-account-setup.c:635
 msgid "A_uthenticate"
 msgstr "A_utenticar"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:814
+#: ../plugins/exchange-operations/exchange-account-setup.c:828
 msgid "Authentication Type"
 msgstr "Tipo de Autenticação"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:828
+#: ../plugins/exchange-operations/exchange-account-setup.c:842
 msgid "Ch_eck for Supported Types"
 msgstr "_Consultar por Tipos Suportados"
 
+#: ../plugins/exchange-operations/exchange-calendar.c:193
+#: ../plugins/exchange-operations/exchange-contacts.c:167
+msgid ""
+"Evolution is in offline mode. You cannot create or modify folders now.\n"
+"Please switch to online mode for such operations."
+msgstr ""
+"O Evolution está em modo desligado. Não é agora possível criar ou alterar "
+"pastas.\n"
+"Alterne para modo ligado para efectuar essas operações."
+
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
@@ -14630,12 +15060,22 @@ msgstr "Nova Senha:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "A sua senha actual expirou. Altere a sua senha agora."
 
+#: ../plugins/exchange-operations/exchange-config-listener.c:662
+#, c-format
+msgid "Your password will expire in the next %d days"
+msgstr "A sua senha irá expirar nos próximos %d dias"
+
 #: ../plugins/exchange-operations/exchange-delegates-user.c:144
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:576
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
 msgid "Custom"
 msgstr "Personalizado"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:191
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+msgid "Delegate Permissions"
+msgstr "Permissões do Delegado"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:202
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
 #, c-format
 msgid "Permissions for %s"
@@ -14650,34 +15090,34 @@ msgstr "Delegar A"
 msgid "Remove the delegate %s?"
 msgstr "Remover a delegação %s?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:679
+#: ../plugins/exchange-operations/exchange-delegates.c:680
 msgid "Could not access Active Directory"
 msgstr "Incapaz de aceder ao Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:694
+#: ../plugins/exchange-operations/exchange-delegates.c:692
 msgid "Could not find self in Active Directory"
 msgstr "Incapaz de encontrar o próprio no Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:707
+#: ../plugins/exchange-operations/exchange-delegates.c:705
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "Incapaz de encontrar o delegado %s no Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:719
+#: ../plugins/exchange-operations/exchange-delegates.c:717
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "Incapaz de remover a delegação %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:779
+#: ../plugins/exchange-operations/exchange-delegates.c:777
 msgid "Could not update list of delegates."
 msgstr "Incapaz de actualizar a lista de delegações."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:797
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Incapaz de adicionar o delegado %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:965
+#: ../plugins/exchange-operations/exchange-delegates.c:963
 msgid "Error reading delegates list."
 msgstr "Erro ao ler a lista de delegados."
 
@@ -14685,35 +15125,33 @@ msgstr "Erro ao ler a lista de delegados."
 msgid "Author (read, create)"
 msgstr "Autor (ler, criar)"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
+#. Translators: This is used for permissions for <user> for the folder Calendar.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
 msgid "C_alendar:"
 msgstr "C_alendário:"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+#. Translators: This is used for permissions for <user> for the folder Contacts.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
 msgid "Co_ntacts:"
 msgstr "Co_ntactos:"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
-msgid "Delegate Permissions"
-msgstr "Permissões do Delegado"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
 msgid "Delegates"
 msgstr "Delegados"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Editor (ler, criar, editar)"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
 msgid "Permissions for"
 msgstr "Permissões para"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Revisor (apenas-leitura)"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
 msgid ""
 "These users will be able to send mail on your behalf\n"
 "and access your folders with the permissions you give them."
@@ -14721,15 +15159,17 @@ msgstr ""
 "Estes utilizadores poderão enviar mensagens em seu nome\n"
 "e aceder às suas pastas com as permissões que lhes conceder."
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
 msgid "_Delegate can see private items"
 msgstr "_Delegado consegue ver itens privados"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
+#. Translators: This is used for permissions for <user> for the folder Inbox.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
 msgid "_Inbox:"
 msgstr "Caixa de _Entrada:"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#. Translators: This is used for permissions for <user> for the folder Tasks.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:19
 msgid "_Tasks:"
 msgstr "_Tarefas:"
 
@@ -14738,45 +15178,66 @@ msgstr "_Tarefas:"
 msgid "Permissions..."
 msgstr "Permissões..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:136
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:135
 msgid "Folder Name"
 msgstr "Nome da Pasta"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:140
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:139
 msgid "Folder Size"
 msgstr "Tamanho da Pasta"
 
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:279
+#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
+msgid "Subscribe to Other User's Folder"
+msgstr "Subscrever a Pasta de Outro Utilizador"
+
 #: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
 msgid "Exchange Folder Tree"
 msgstr "Árvore de Pastas Exchange"
 
-#: ../plugins/exchange-operations/exchange-folder.c:62
-#: ../plugins/exchange-operations/exchange-folder.c:223
-#: ../plugins/exchange-operations/exchange-folder.c:233
+#: ../plugins/exchange-operations/exchange-folder.c:66
+#: ../plugins/exchange-operations/exchange-folder.c:229
+#: ../plugins/exchange-operations/exchange-folder.c:239
 msgid "Unsubscribe Folder..."
 msgstr "Remover Subscrição de Pasta..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:460
-#: ../plugins/exchange-operations/exchange-folder.c:520
+#: ../plugins/exchange-operations/exchange-folder.c:463
+#: ../plugins/exchange-operations/exchange-folder.c:523
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Remover mesmo a subscrição da pasta \"%s\"?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:472
-#: ../plugins/exchange-operations/exchange-folder.c:532
+#: ../plugins/exchange-operations/exchange-folder.c:475
+#: ../plugins/exchange-operations/exchange-folder.c:535
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Remover a subscrição de \"%s\""
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:301
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
+msgid "Password Expiry Warning..."
+msgstr "Aviso de Expiração de Senha..."
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
+msgid "Your password will expire in 7 days..."
+msgstr "A sua senha irá expirar dentro de 7 dias..."
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
+msgid "_Change Password"
+msgstr "Alterar a _Senha"
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:4
+msgid "ok_button"
+msgstr "botão_ok"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
 msgid "(Permission denied.)"
 msgstr "(Permissão negada.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
 msgid "Add User:"
 msgstr "Adicionar Utilizador:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
 msgid "Add User"
 msgstr "Adicionar Utilizador"
 
@@ -14841,7 +15302,7 @@ msgid "Select User"
 msgstr "Seleccionar Utilizador"
 
 #: ../plugins/exchange-operations/exchange-user-dialog.c:182
-msgid "Addressbook..."
+msgid "Address Book..."
 msgstr "Livro de Endereços..."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
@@ -14852,6 +15313,18 @@ msgstr "Subscrever os Contactos de Outro Utilizador"
 msgid "Subscribe to Other User's Calendar"
 msgstr "Subscrever o Calendário de Outro Utilizador"
 
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
+msgid ""
+"A plugin that handles a collection of Exchange account specific operations "
+"and features."
+msgstr ""
+"Um plugin que gere um conjunto de operações e funcionalidades específicas de "
+"contas Exchange."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
+msgid "Exchange Operations"
+msgstr "Operações de Exchange"
+
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
 msgid "Cannot change password due to configuration problems."
 msgstr "Incapaz de alterar a senha devido a problemas de configuração."
@@ -14887,81 +15360,79 @@ msgstr ""
 "utilizador e senha e tente novamente."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
+msgid "Could not connect to Exchange server."
+msgstr "Incapaz de estabelecer uma ligação ao servidor Exchange."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
 msgid "Could not connect to server {0}."
 msgstr "Incapaz de estabelecer uma ligação ao servidor {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not determine folder permissions for delegates."
 msgstr "Incapaz de determinar as permissões de pasta para os delegados."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not find Exchange Web Storage System."
 msgstr "Incapaz de encontrar o Exchange Web Storage System."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not locate server {0}."
 msgstr "Incapaz de localizar o servidor {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not make {0} a delegate"
 msgstr "Incapaz de tornar {0} um delegado"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not read folder permissions"
 msgstr "Incapaz de ler as permissões da pasta"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not read folder permissions."
 msgstr "Incapaz de ler as permissões da pasta."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read out-of-office state"
 msgstr "Incapaz de ler o estado de fora-do-escritório"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not update folder permissions."
 msgstr "Incapaz de actualizar as permissões de pasta."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not update out-of-office state"
 msgstr "Incapaz de actualizar o estado de fora-do-escritório"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Exchange Account is offline."
 msgstr "Conta Exchange está em modo desligado."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
-msgid "Exchange Connector access error."
-msgstr "Erro de acesso do Conector Exchange."
-
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
-"to be disabled or blocked.  (This is usually \n"
-"unintentional.)  Your Exchange Administrator will \n"
+"to be disabled or blocked. (This is usually \n"
+"unintentional.) Your Exchange Administrator will \n"
 "need to enable this functionality in order for \n"
-"you to be able to use Ximian Connector.\n"
+"you to be able to use Evolution Exchange Connector.\n"
 "\n"
 "For information to provide to your Exchange \n"
 "administrator, please follow the link below:\n"
 "\n"
-"http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328."
-"html\n"
+"{0}\n"
 "  "
 msgstr ""
 "Conector Exchange necessita de acesso a determinadas\n"
 "funcionalidades do Servidor Exchange que parecem\n"
-"estar inactivas ou bloqueadas.  (Normalmente isto é \n"
-"sem intenção.)  O seu Administrador de Exchange \n"
+"estar inactivas ou bloqueadas. (Normalmente isto é \n"
+"sem intenção.) O seu Administrador de Exchange \n"
 "terá de activar estas funcionalidades por forma a que \n"
-"possa utilizar o Conector Ximian.\n"
+"possa utilizar o Conector Exchange do Evolution.\n"
 "\n"
 "Para informações a disponibilizar ao seu administrador \n"
 "Exchange, consulte o link abaixo:\n"
 "\n"
-"http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328."
-"html\n"
+"{0}\n"
 "  "
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
@@ -14981,7 +15452,7 @@ msgid "Folder offline"
 msgstr "Pasta desligada"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
-#: ../shell/e-shell.c:1265
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "Erro genérico"
 
@@ -15053,7 +15524,7 @@ msgstr "O servidor Exchange não é compatível com o Conector Exchange."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid ""
-"The server is runinng Exchange 5.5. Exchange Connector \n"
+"The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
 msgstr ""
 "O servidor está a executar Exchange 5.5. O Conector Exhange \n"
@@ -15102,7 +15573,7 @@ msgid "Unsupported operation"
 msgstr "Operação não suportada"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
-msgid "You are nearing your quota available for storing mails on this server."
+msgid "You are nearing your quota available for storing mail on this server."
 msgstr ""
 "Está prestes a atingir a sua quota disponível para armazenar email neste "
 "servidor."
@@ -15112,7 +15583,7 @@ msgid "You cannot make yourself your own delegate"
 msgstr "Não pode delegar em si prórpio"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-msgid "You have exceeded your quota for storing mails on this server."
+msgid "You have exceeded your quota for storing mail on this server."
 msgstr "Excedeu a sua quota para armazenar email neste servidor."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
@@ -15121,27 +15592,27 @@ msgstr "Apenas pode configurar uma única conta Exchange."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid ""
-"Your current usage is : {0}KB. Try to clear up some space by deleting some "
-"mails."
+"Your current usage is: {0} KB. Try to clear up some space by deleting some "
+"mail."
 msgstr ""
-"A sua utilização actual é : {0}KB. Tente libertar algum espaço apagando "
+"A sua utilização actual é: {0} KB. Tente libertar algum espaço apagando "
 "algumas mensagens."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid ""
-"Your current usage is : {0}KB. You will not be able to either send or "
-"recieve mails now."
+"Your current usage is: {0} KB. You will not be able to either send or "
+"receive mail now."
 msgstr ""
-"A sua utilização actual é : {0}KB. Não lhe será agora possível enviar ou "
+"A sua utilização actual é: {0} KB. Não lhe será agora possível enviar nem "
 "receber mensagens."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
-"Your current usage is : {0}KB. You will not be able to send mails till you "
-"clear up some space by deleting some mails."
+"Your current usage is: {0} KB. You will not be able to send mail until you "
+"clear up some space by deleting some mail."
 msgstr ""
-"A sua utilização actual é : {0}KB. Não lhe será agora possível enviar "
-"mensagens até que liberte algum espaço."
+"A sua utilização actual é: {0} KB. Não lhe será possível enviar mensagens "
+"até que liberte algum espaço apagando algumas mensagens."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
@@ -15167,10 +15638,6 @@ msgstr "Subscrever as Tarefas de Outro Utilizador"
 msgid "Check folder permissions"
 msgstr "Verificar as permissões da pasta"
 
-#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
-msgid "Subscribe to Other User's Folder"
-msgstr "Subscrever a Pasta de Outro Utilizador"
-
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
@@ -15207,8 +15674,8 @@ msgid "Junk Mail Settings..."
 msgstr "Definições de Correio Não Solicitado..."
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:1
-msgid "<b>Junk List :</b>"
-msgstr "<b>Lista de Não Solicitado :</b>"
+msgid "<b>Junk List:</b>"
+msgstr "<b>Lista de Não Solicitado:</b>"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:2
 msgid "Email:"
@@ -15236,6 +15703,7 @@ msgid "Add Send Options to groupwise messages"
 msgstr "Adicionar Opções de Envio às mensagens groupwise"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
 #: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "Opções de Envio"
@@ -15253,11 +15721,11 @@ msgid "Accept Tentatively"
 msgstr "Aceitar Tentativamente"
 
 #: ../plugins/groupwise-features/properties.glade.h:2
-msgid "<b>Users :</b>"
-msgstr "<b>Utilizadores :</b>"
+msgid "<b>Users:</b>"
+msgstr "<b>Utilizadores:</b>"
 
 #: ../plugins/groupwise-features/properties.glade.h:4
-#: ../widgets/table/e-table-click-to-add.c:510
+#: ../widgets/table/e-table-click-to-add.c:509
 msgid "Message"
 msgstr "Mensagem"
 
@@ -15274,7 +15742,7 @@ msgid "_Contacts..."
 msgstr "_Contactos..."
 
 #: ../plugins/groupwise-features/properties.glade.h:12
-msgid "_Cutomize notification message"
+msgid "_Customize notification message"
 msgstr "_Personalizar a mensagem de notificação"
 
 #: ../plugins/groupwise-features/properties.glade.h:13
@@ -15326,7 +15794,7 @@ msgid "Subscribe to my _notifications"
 msgstr "Subscrever as minhas _notificações"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
 msgstr "_Ler"
 
@@ -15338,13 +15806,6 @@ msgstr "_Escrever"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../plugins/groupwise-features/proxy-listing.glade.h:2
-#: ../smime/gui/smime-ui.glade.h:49
-#: ../widgets/table/e-table-config-no-group.glade.h:20
-#: ../widgets/table/e-table-config.glade.h:21
-msgid "dialog1"
-msgstr "diálogo1"
-
 #: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
 msgid "<b>Account Name</b>"
 msgstr "<b>Nome da Conta</b>"
@@ -15353,120 +15814,251 @@ msgstr "<b>Nome da Conta</b>"
 msgid "Proxy Login"
 msgstr "Início de Sessão na Proxy"
 
-#: ../plugins/groupwise-features/proxy-login.c:219
-#: ../plugins/groupwise-features/proxy-login.c:261
-#: ../plugins/groupwise-features/proxy.c:490
+#: ../plugins/groupwise-features/proxy-login.c:220
+#: ../plugins/groupwise-features/proxy-login.c:263
+#: ../plugins/groupwise-features/proxy.c:503
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sIntroduza a senha para %s (utilizador %s)"
 
-#: ../plugins/groupwise-features/proxy-login.c:484
+#: ../plugins/groupwise-features/proxy-login.c:505
 msgid "_Proxy Login..."
 msgstr "Início de Sessão na _Proxy..."
 
-#: ../plugins/groupwise-features/proxy.c:672
+#: ../plugins/groupwise-features/proxy.c:697
+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."
+
+#: ../plugins/groupwise-features/proxy.c:702
 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/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Users"
 msgstr "Utilizadores"
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder-common.c:323
 msgid "Enter the users and set permissions"
 msgstr "Introduza os utilizadores e defina as permissões"
 
-#: ../plugins/groupwise-features/share-folder-common.c:338
+#: ../plugins/groupwise-features/share-folder-common.c:342
 msgid "New _Shared Folder..."
 msgstr "Nova Pasta _Partilhada..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:453
+#: ../plugins/groupwise-features/share-folder-common.c:450
 msgid "Sharing"
 msgstr "Partilhar"
 
-#: ../plugins/groupwise-features/status-track.c:235
+#: ../plugins/groupwise-features/status-track.c:242
 msgid "Track Message Status..."
 msgstr "Acompanhar o Estado da Mensagem..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:724
+#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
+msgid "A plugin to setup hula calendar sources."
+msgstr "Um plugin para configurar origens de calendário hula."
+
+#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
+msgid "Hula Account Setup"
+msgstr "Configuração de Conta Hula"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:83
+msgid "_Import to Calendar"
+msgstr "_Importar para o Calendário"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:88
+msgid "_Import to Tasks"
+msgstr "_Importar para as Tarefas"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:198
+msgid "Import ICS"
+msgstr "Importar ICS"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:226
+msgid "Select Task List"
+msgstr "Seleccionar a Lista de Tarefas"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:230
+msgid "Select Calendar"
+msgstr "Seleccionar o Calendário"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:261
+#: ../shell/e-shell-importer.c:703
+msgid "_Import"
+msgstr "_Importar"
+
+#: ../plugins/ipod-sync/ical-format.c:137
+#: ../plugins/save-calendar/ical-format.c:137
+msgid "iCalendar format (.ics)"
+msgstr "Formato iCalendar (.ics)"
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
+msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
+msgstr ""
+"Sincronizar o livro de endereços/tarefas/calendário com o iPod da Apple"
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
+msgid "Synchronize to iPod"
+msgstr "Sincronizar com o iPod"
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
+msgid "iPod Synchronization"
+msgstr "Sincronização com iPod"
+
+#: ../plugins/ipod-sync/sync.c:158
+msgid "No output directory!"
+msgstr "Nenhum directório de destino!"
+
+#: ../plugins/ipod-sync/sync.c:159
+msgid ""
+"The output directory was not found on iPod! Please ensure that iPod has been "
+"correctly set up and try again."
+msgstr ""
+"O directório de destino não foi encontrado no iPod! Certifique-se de que o "
+"iPod foi correctamente configurado e tente novamente."
+
+#: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
+msgid "Could not export data!"
+msgstr "Incapaz de exportar os dados!"
+
+#: ../plugins/ipod-sync/sync.c:203
+msgid "Exporting data failed."
+msgstr "Falha ao exportar os dados."
+
+#: ../plugins/ipod-sync/sync.c:231
+msgid "Could not open addressbook!"
+msgstr "Incapaz de abrir o livro de endereços!"
+
+#: ../plugins/ipod-sync/sync.c:232
+msgid "Could not open the Evolution addressbook to export data."
+msgstr ""
+"Incapaz de abrir o livro de endereços do Evolution para exportar os dados."
+
+#: ../plugins/ipod-sync/sync.c:291
+msgid "Could not open calendar/todo!"
+msgstr "Incapaz de abrir o calendário/a fazer!"
+
+#: ../plugins/ipod-sync/sync.c:292
+msgid "Could not open the Evolution calendar/todo list to export data."
+msgstr ""
+"Incapaz de abrir a lista de calendários/a fazer do Evolution para exportar "
+"os dados."
+
+#: ../plugins/itip-formatter/itip-formatter.c:275
+#: ../plugins/itip-formatter/itip-formatter.c:392
+#, c-format
+msgid "Failed to load the calendar '%s'"
+msgstr "Falha ao ler o calendário '%s'"
+
+#: ../plugins/itip-formatter/itip-formatter.c:407
+#, 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:433
+#, c-format
+msgid "Found the appointment in the calendar '%s'"
+msgstr "Encontrado o compromisso no calendário '%s'"
+
+#: ../plugins/itip-formatter/itip-formatter.c:488
+msgid "Unable to find any calendars"
+msgstr "Incapaz de encontrar qualquer calendário"
+
+#: ../plugins/itip-formatter/itip-formatter.c:495
+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:499
+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:503
+msgid "Unable to find this journal entry in any journal"
+msgstr "Incapaz de encontrar esta entrada de diário em qualquer diário"
+
+#: ../plugins/itip-formatter/itip-formatter.c:529
+msgid "Searching for an existing version of this appointment"
+msgstr "A procurar por uma versão existente deste compromisso"
+
+#: ../plugins/itip-formatter/itip-formatter.c:726
 msgid "Unable to parse item"
 msgstr "Incapaz de parsear o item"
 
-#: ../plugins/itip-formatter/itip-formatter.c:780
+#: ../plugins/itip-formatter/itip-formatter.c:782
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Incapaz de enviar o item para o calendário '%s'.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:791
+#: ../plugins/itip-formatter/itip-formatter.c:793
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Enviar para o calendário '%s' como aceite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:795
+#: ../plugins/itip-formatter/itip-formatter.c:797
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviar para o calendário '%s' como tentativa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:800
+#: ../plugins/itip-formatter/itip-formatter.c:802
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviar para o calendário '%s' como recusada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:805
+#: ../plugins/itip-formatter/itip-formatter.c:807
 #, c-format
-msgid "Sent to calendar '%s' as cancelled"
-msgstr "Enviar para o calendário '%s' como cancelada"
+msgid "Sent to calendar '%s' as canceled"
+msgstr "Enviada para o calendário '%s' como cancelada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:898
+#: ../plugins/itip-formatter/itip-formatter.c:900
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizador removeu o delegado %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:905
-msgid "Sent a cancellation notice to the delegate"
-msgstr "Enviou uma notificação de cancelamento ao delegado"
-
 #: ../plugins/itip-formatter/itip-formatter.c:907
-msgid "Could not send the cancellation notice to the delegate"
+msgid "Sent a cancelation notice to the delegate"
+msgstr "Enviada uma notificação de cancelamento ao delegado"
+
+#: ../plugins/itip-formatter/itip-formatter.c:909
+msgid "Could not send the cancelation notice to the delegate"
 msgstr "Incapaz de enviar uma notificação de cancelamento ao delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:991
+#: ../plugins/itip-formatter/itip-formatter.c:994
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "Incapaz de actualizar o estado de participante pois o estado é inválido!"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1017
+#: ../plugins/itip-formatter/itip-formatter.c:1021
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Incapaz de actualizar o participante. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1021
+#: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status updated"
 msgstr "Estado de participante actualizado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1148
+#: ../plugins/itip-formatter/itip-formatter.c:1152
 msgid "The calendar attached is not valid"
 msgstr "O calendário anexo é inválido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1149
+#: ../plugins/itip-formatter/itip-formatter.c:1153
 msgid ""
-"The message claims to contain a calendar, but the calendar is not valid "
+"The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr ""
-"A mensagem indica conter um calendário mas este não é um calendário "
+"A mensagem indica conter um calendário, mas este não é um calendário "
 "iCalendar válido."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1183
-#: ../plugins/itip-formatter/itip-formatter.c:1198
-#: ../plugins/itip-formatter/itip-formatter.c:1274
+#: ../plugins/itip-formatter/itip-formatter.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:1202
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "The item in the calendar is not valid"
 msgstr "O item no calendário é inválido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1184
-#: ../plugins/itip-formatter/itip-formatter.c:1199
-#: ../plugins/itip-formatter/itip-formatter.c:1275
+#: ../plugins/itip-formatter/itip-formatter.c:1188
+#: ../plugins/itip-formatter/itip-formatter.c:1203
+#: ../plugins/itip-formatter/itip-formatter.c:1279
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -15474,11 +16066,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:1209
+#: ../plugins/itip-formatter/itip-formatter.c:1213
 msgid "The calendar attached contains multiple items"
 msgstr "O calendário anexo contém múltiplos itens"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1210
+#: ../plugins/itip-formatter/itip-formatter.c:1214
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -15486,32 +16078,25 @@ msgstr ""
 "Para processar todos estes itens, o ficheiro deverá ser gravado e o "
 "calendário importado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1968
-msgid "Meetings and Tasks"
-msgstr "Reuniões e Tarefas"
-
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:1991
+#: ../plugins/itip-formatter/itip-formatter.c:1994
 msgid "_Delete message after acting"
 msgstr "_Apagar as mensagens depois de agir"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2001
-msgid "<span weight=\"bold\">Conflict Search</span>"
-msgstr "<span weight=\"bold\">Procura de Conflitos</span>"
+#: ../plugins/itip-formatter/itip-formatter.c:2004
+#: ../plugins/itip-formatter/itip-formatter.c:2036
+msgid "Conflict Search"
+msgstr "Procura de Conflitos"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2014
+#: ../plugins/itip-formatter/itip-formatter.c:2019
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccione os calendários onde procurar por conflitos entre reuniões"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2031
-msgid "Conflict Search Table"
-msgstr "Tabela de Procura de Conflitos"
-
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:240 ../widgets/misc/e-dateedit.c:457
+#: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:467
 msgid "Today"
 msgstr "Hoje"
 
@@ -15701,12 +16286,12 @@ msgstr "<b>%s</b> enviou de volta a seguinte resposta à reunião:"
 
 #: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
-msgid "<b>%s</b> through %s has cancelled the following meeting:"
+msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> através de %s cancelou a seguinte reunião:"
 
 #: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
-msgid "<b>%s</b> has cancelled the following meeting."
+msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> cancelou a seguinte reunião:"
 
 #: ../plugins/itip-formatter/itip-view.c:379
@@ -15775,12 +16360,12 @@ msgstr "<b>%s</b> enviou de volta a seguinte resposta à tarefa atribuída:"
 
 #: ../plugins/itip-formatter/itip-view.c:442
 #, c-format
-msgid "<b>%s</b> through %s has cancelled the following assigned task:"
+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:"
 
 #: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
-msgid "<b>%s</b> has cancelled the following assigned task:"
+msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> cancelou a seguinte tarefa atribuída:"
 
 #: ../plugins/itip-formatter/itip-view.c:447
@@ -15798,27 +16383,81 @@ msgstr "<b>%s</b> através de %s recusou a seguinte tarefa atribuída:"
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> recusou a atribuição da seguinte tarefa:"
 
+#. Everything gets the open button
+#: ../plugins/itip-formatter/itip-view.c:705
+msgid "_Open Calendar"
+msgstr "_Abrir o Calendário"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:715
+#: ../plugins/itip-formatter/itip-view.c:720
+#: ../plugins/itip-formatter/itip-view.c:736
+#: ../plugins/itip-formatter/itip-view.c:741
+msgid "_Accept"
+msgstr "_Aceitar"
+
+#: ../plugins/itip-formatter/itip-view.c:713
+msgid "_Decline all"
+msgstr "_Recusar tudo"
+
+#: ../plugins/itip-formatter/itip-view.c:713
+#: ../plugins/itip-formatter/itip-view.c:718
+#: ../plugins/itip-formatter/itip-view.c:734
+#: ../plugins/itip-formatter/itip-view.c:739
+msgid "_Decline"
+msgstr "_Recusar"
+
+#: ../plugins/itip-formatter/itip-view.c:714
+msgid "_Tentative all"
+msgstr "Todas _tentativas"
+
+#: ../plugins/itip-formatter/itip-view.c:714
+#: ../plugins/itip-formatter/itip-view.c:719
+#: ../plugins/itip-formatter/itip-view.c:735
+#: ../plugins/itip-formatter/itip-view.c:740
+msgid "_Tentative"
+msgstr "_Tentativa"
+
+#: ../plugins/itip-formatter/itip-view.c:715
+msgid "_Accept all"
+msgstr "_Aceitar todas"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:724
+msgid "_Send Information"
+msgstr "_Enviar Informação"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:728
+msgid "_Update Attendee Status"
+msgstr "_Actualizar o Estado dos Presentes"
+
+#: ../plugins/itip-formatter/itip-view.c:731
+msgid "_Update"
+msgstr "_Actualizar"
+
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:892
+#: ../plugins/itip-formatter/itip-view.c:888
 msgid "Start time:"
 msgstr "Hora de início:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:901
+#: ../plugins/itip-formatter/itip-view.c:897
 msgid "End time:"
 msgstr "Hora de finalização:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:917
-#: ../plugins/itip-formatter/itip-view.c:967
+#: ../plugins/itip-formatter/itip-view.c:913
+#: ../plugins/itip-formatter/itip-view.c:963
 msgid "Comment:"
 msgstr "Comentário:"
 
-#: ../plugins/itip-formatter/itip-view.c:981
+#: ../plugins/itip-formatter/itip-view.c:977
 msgid "Send u_pdates to attendees"
 msgstr "Enviar actualizações aos _participantes"
 
-#: ../plugins/itip-formatter/itip-view.c:990
+#: ../plugins/itip-formatter/itip-view.c:986
 msgid "A_pply to all instances"
 msgstr "A_plicar a todas as instâncias"
 
@@ -15833,10 +16472,10 @@ 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; ?"
+"&quot;{1}&quot;?"
 msgstr ""
 "&quot;{0}&quot; delegou a reunião. Deseja adicionar o delegado &quot;{1}"
-"&quot; ?"
+"&quot;?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
@@ -15915,6 +16554,7 @@ msgstr ""
 "mensagens de correio."
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
 msgid "Con_vert to Task"
 msgstr "Con_verter em Tarefa"
 
@@ -15922,6 +16562,10 @@ msgstr "Con_verter em Tarefa"
 msgid "Mail to task"
 msgstr "Mensagem para tarefa"
 
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
+msgid "Convert the selected message to a new task"
+msgstr "Converter a mensagem seleccionada numa nova tarefa"
+
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
 msgid "Contact list _owner"
@@ -16077,6 +16721,19 @@ msgid "Unsubscribe to the mailing list this message belongs to"
 msgstr ""
 "Remover a subscrição da lista de distribuição a que esta mensagem pertence"
 
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
+msgid "Mark All Read"
+msgstr "Marcar Todas como Lidas"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
+msgid "Mark me_ssages as read"
+msgstr "Marcar as men_sagens como lidas"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
+msgid "Used for marking all the messages under a folder as read"
+msgstr ""
+"Utilizado para marcar todas as mensagens abaixo de uma pasta como lidas"
+
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
 msgid "Mark calendar offline"
 msgstr "Marcar o calendário para modo desligado"
@@ -16117,54 +16774,43 @@ msgstr "Notificação de nova mensagem"
 msgid "A plugin for managing which plugins are enabled or disabled."
 msgstr "Um plugin para gerir que plugins estão activos ou inactivos."
 
+#. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-msgid "Plugin manager"
-msgstr "Gestor de plugins"
+#: ../plugins/plugin-manager/plugin-manager.c:180
+msgid "Plugin Manager"
+msgstr "Gestor do Plugin"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
 msgid "Enable and disable plugins"
 msgstr "Activar e desactivar plugins"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
-msgid "Plugins"
-msgstr "Plugins"
+msgid "_Plugins"
+msgstr "_Plugins"
 
-#: ../plugins/plugin-manager/plugin-manager.c:45
+#: ../plugins/plugin-manager/plugin-manager.c:43
 msgid "Author(s)"
 msgstr "Autor(es)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:46
-msgid "Id"
-msgstr "Id"
-
-#: ../plugins/plugin-manager/plugin-manager.c:47
-msgid "Path"
-msgstr "Caminho"
-
-#: ../plugins/plugin-manager/plugin-manager.c:48
+#: ../plugins/plugin-manager/plugin-manager.c:44
 #: ../widgets/table/e-table-config-no-group.glade.h:6
 #: ../widgets/table/e-table-config.glade.h:5
 msgid "Description"
 msgstr "Descrição"
 
-#. Setup the ui
-#: ../plugins/plugin-manager/plugin-manager.c:188
-msgid "Plugin Manager"
-msgstr "Gestor do Plugin"
-
-#: ../plugins/plugin-manager/plugin-manager.c:201
+#: ../plugins/plugin-manager/plugin-manager.c:193
 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:210
-#: ../plugins/plugin-manager/plugin-manager.c:271
+#: ../plugins/plugin-manager/plugin-manager.c:202
+#: ../plugins/plugin-manager/plugin-manager.c:262
 msgid "Plugin"
 msgstr "Plugin"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
 msgid ""
 "A test plugin which demonstrates a formatter plugin which lets you choose to "
-"disable HTML mails.\n"
+"disable HTML messages.\n"
 "\n"
 "This plugin is unsupported demonstration code only.\n"
 msgstr ""
@@ -16203,8 +16849,9 @@ msgid "Gives an option to print mail from composer"
 msgstr "Permite imprimir a mensagem a partir do compositor"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-tasks.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
+#: ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Ante_ver a Impressão"
 
@@ -16212,17 +16859,117 @@ msgstr "Ante_ver a Impressão"
 msgid "Prints the message"
 msgstr "Imprime a mensagem"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:98
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
+msgid "Evolution Profiler"
+msgstr "Depurador do Evolution"
+
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
+msgid "Writes a log of profiling data events."
+msgstr "Escreve um registo de dados de eventos de depuração."
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+msgid "Allows calendars to be published to the web"
+msgstr "Permite publicar calendários na internet"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
+msgid "Calendar Publishing"
+msgstr "Publicação de Calendários"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+msgid "Locations"
+msgstr "Localizações"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
+msgid "_Publish Calendar Information"
+msgstr "_Publicar Informação de Calendários"
+
+#: ../plugins/publish-calendar/publish-calendar.c:399
+msgid "Are you sure you want to remove this URL?"
+msgstr "Tem a certeza que deseja apagar este URL?"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:2
+msgid "<span weight=\"bold\">Location</span>"
+msgstr "<span weight=\"bold\">Localização</span>"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:4
+msgid "<span weight=\"bold\">Sources</span>"
+msgstr "<span weight=\"bold\">Origens</span>"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:6
+msgid ""
+"Daily\n"
+"Weekly\n"
+"Manual (via Actions menu)"
+msgstr ""
+"Diário\n"
+"Semanal\n"
+"Manual (através do menu Acções)"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:10
+msgid "P_ort:"
+msgstr "P_orto:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+msgid "Publishing Location"
+msgstr "Localização de Publicação"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+msgid "Publishing _Frequency:"
+msgstr "_Frequência de Publicação:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:13
+msgid ""
+"SSH\n"
+"Public FTP\n"
+"FTP (with login)\n"
+"Windows share\n"
+"WebDAV (HTTP)\n"
+"Secure WebDAV (HTTPS)\n"
+"Custom Location"
+msgstr ""
+"SSH\n"
+"FTP Público\n"
+"FTP (com sessão)\n"
+"Partilha Windows\n"
+"WebDAV (HTTP)\n"
+"WebDAV Seguro (HTTPS)\n"
+"Localização Personalizada"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:20
+msgid "Service _type:"
+msgstr "_Tipo de serviço:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+msgid "_File:"
+msgstr "_Ficheiro:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+msgid "_Publish as:"
+msgstr "_Publicar como:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+msgid ""
+"iCal\n"
+"Free/Busy"
+msgstr ""
+"iCal\n"
+"Livre/Ocupado"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:101
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (incorporado)"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid "Sa junk-plugin"
-msgstr "Plugin de assassino de correio não solicitado"
+msgid ""
+"Filters junk messages using Spamassassin. This plugin requires Spamassassin "
+"to be installed."
+msgstr ""
+"Filtrar mensagens não solicitadas utilizando o Spamassassin. Este plugin "
+"necessira que o Spamassassin esteja instalado."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "learns junk messages using spamd."
-msgstr "aprende a distinguir correio não solicitado utilizando o spamd."
+msgid "Spamassassin junk plugin"
+msgstr "Plugin de não solicitados Spamassassin"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
@@ -16243,16 +16990,16 @@ msgstr "Gravar Anexos ..."
 msgid "Save all attachments"
 msgstr "Gravar todos os anexos"
 
-#: ../plugins/save-attachments/save-attachments.c:331
+#: ../plugins/save-attachments/save-attachments.c:338
 msgid "Select save base name"
 msgstr "Seleccionar nome base de gravação"
 
-#: ../plugins/save-attachments/save-attachments.c:351
+#: ../plugins/save-attachments/save-attachments.c:358
 msgid "MIME Type"
 msgstr "Tipo MIME"
 
-#: ../plugins/save-attachments/save-attachments.c:359
-#: ../ui/evolution-message-composer.xml.h:18
+#: ../plugins/save-attachments/save-attachments.c:366
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Gravar"
 
@@ -16265,8 +17012,8 @@ msgid "%F %T"
 msgstr "%F %T"
 
 #: ../plugins/save-calendar/csv-format.c:385
-msgid "Uid"
-msgstr "Uid"
+msgid "UID"
+msgstr "UID"
 
 #: ../plugins/save-calendar/csv-format.c:387
 msgid "Description List"
@@ -16301,8 +17048,8 @@ msgid "percent Done"
 msgstr "percentagem Realizada"
 
 #: ../plugins/save-calendar/csv-format.c:398
-msgid "Url"
-msgstr "Url"
+msgid "URL"
+msgstr "URL"
 
 #: ../plugins/save-calendar/csv-format.c:399
 msgid "Attendees List"
@@ -16336,22 +17083,18 @@ msgstr "Encapsular os valores com:"
 msgid "Comma separated value format (.csv)"
 msgstr "Formato de valores separados por vírgula (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:137
-msgid "iCalendar format (.ics)"
-msgstr "Formato iCalendar (.ics)"
-
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
 msgstr "Gravar as Seleccionadas"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-msgid "Save to _Disk"
-msgstr "Gravar em _Disco"
-
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
 msgid "Saves selected calendar or tasks list to disk."
 msgstr "Grava o calendário ou lista de tarefas seleccionada em disco."
 
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
+msgid "_Save to Disk"
+msgstr "_Gravar em Disco"
+
 #.
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the rdf-file.
@@ -16365,20 +17108,11 @@ msgstr "%FT%T"
 msgid "RDF format (.rdf)"
 msgstr "Formato RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:171
-#: ../plugins/save-calendar/save-calendar.c:181
+#: ../plugins/save-calendar/save-calendar.c:169
+#: ../plugins/save-calendar/save-calendar.c:179
 msgid "Select destination file"
 msgstr "Seleccionar o ficheiro de destino"
 
-#: ../plugins/save-calendar/save-calendar.c:216
-#, c-format
-msgid ""
-"The suggested filename extension of this filetype (%s) is unused in the "
-"chosen filename. Do you want to continue?"
-msgstr ""
-"A extensão de ficheiro sugerida para este tipo de ficheiro (%s) não foi "
-"utilizada no nome de ficheiro indicado. Deseja prosseguir?"
-
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
 msgid "Select one source"
 msgstr "Seleccionar uma origem"
@@ -16388,14 +17122,18 @@ msgid "Selects a single calendar or task source for viewing."
 msgstr "Selecciona um único calendários ou tarefa de origem para visualização."
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
-msgid "_Show only this Calendar"
+msgid "Show _only this Calendar"
 msgstr "_Apresentar apenas este Calendário"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
-msgid "_Show only this Task List"
+msgid "Show _only this Task List"
 msgstr "_Apresentar apenas esta Lista de Tarefas"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
+msgid "A plugin that handles the Startup wizard."
+msgstr "Um plugin que gere o Assistente Inicial."
+
+#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
 msgid "Startup wizard"
 msgstr "Assistente Inicial"
 
@@ -16420,18 +17158,18 @@ msgstr ""
 "Prima o botão \"Avançar\" para continuar. "
 
 #: ../plugins/startup-wizard/startup-wizard.c:140
-#: ../shell/e-shell-importer.c:145
+#: ../shell/e-shell-importer.c:147
 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:154
-#: ../shell/e-shell-importer.c:398
+#: ../plugins/startup-wizard/startup-wizard.c:155
+#: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:234
-#: ../shell/e-shell-importer.c:509
+#: ../plugins/startup-wizard/startup-wizard.c:235
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "A importar os dados."
 
@@ -16510,41 +17248,46 @@ msgid "Printer settings"
 msgstr "Configuração da impressora"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Sidebar is visible"
+msgstr "Barra lateral está visível"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Skip development warning dialog"
 msgstr "Saltar o diálogo de aviso de versão de desenvolvimento"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:468
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:473
 msgid "Start in offline mode"
 msgstr "Iniciar em modo desligado"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13
 msgid ""
-"The configuration version of Evolution, with major/minor/configuration level"
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
 msgstr ""
 "A versão da configuração do Evolution, com o nível principal/menor/"
-"configuração"
+"configuração (por exemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "The default height for the main window, in pixels."
 msgstr "A altura por omissão da janela principal, em pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default width for the main window, in pixels."
 msgstr "A largura por omissão da janela principal, em pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the sidebar, in pixels."
 msgstr "A largura por omissão da barra lateral, em pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level"
+"configuration level (for example \"2.6.0\")."
 msgstr ""
 "A última versão actualizada da configuração do Evolution, com o nível "
-"principal/menor/configuração"
+"principal/menor/configuração (por exemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -16554,34 +17297,38 @@ msgstr ""
 "\"toolbar\". Se estiver definido \"toolbar\", o estilo dos botões é "
 "determinado pela definição da barra de ferramentas GNOME."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid "Toolbar is visible"
 msgstr "Barra de ferramentas está visível"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Se o Evolution irá iniciar em modo desligado ou ligado."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+msgid "Whether the sidebar should be visible."
+msgstr "Se a barra lateral deverá ou não estar visível."
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether the toolbar should be visible."
 msgstr "Se a barra de ferramentas deverá ou não estar visível."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Se o diálogo de aviso de versão Evolution de desenvolvimento é ou não "
 "apresentado."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the window buttons should be visible."
 msgstr "Se os botões de janela deverão ser ou não visíveis."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid "Window button style"
 msgstr "Estilo dos botões da janela"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Window buttons are visible"
 msgstr "Botões da janela são visíveis"
 
@@ -16597,16 +17344,16 @@ msgstr "Ligações Activas"
 msgid "Click OK to close these connections and go offline"
 msgstr "Clique OK para fechar estas ligações e ficar desligado"
 
-#: ../shell/e-shell-folder-title-bar.c:586
-#: ../shell/e-shell-folder-title-bar.c:587
+#: ../shell/e-shell-folder-title-bar.c:584
+#: ../shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(Sem Título)"
 
-#: ../shell/e-shell-importer.c:133
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "Seleccione o tipo de importador a executar:"
 
-#: ../shell/e-shell-importer.c:136
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -16620,11 +17367,11 @@ msgstr ""
 "Se não souber pode seleccionar \"Automático\" e o Evolution tentará "
 "descobrir."
 
-#: ../shell/e-shell-importer.c:142
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "Seleccione o destino desta importação"
 
-#: ../shell/e-shell-importer.c:148
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -16636,33 +17383,29 @@ msgstr ""
 "encontradas nenhumas passíveis de serem importadas. Se desejar\n"
 "tentar novamente, prima o botão \"Retroceder\".\n"
 
-#: ../shell/e-shell-importer.c:283
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "Nome do f_icheiro:"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Seleccione um ficheiro"
 
-#: ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "_Tipo de ficheiro:"
 
-#: ../shell/e-shell-importer.c:336
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "Importar dados e configurações de aplicações _antigas"
 
-#: ../shell/e-shell-importer.c:339
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "Importar _um único ficheiro"
 
-#: ../shell/e-shell-importer.c:698
-msgid "_Import"
-msgstr "_Importar"
-
 #: ../shell/e-shell-settings-dialog.c:318
-msgid "Evolution Settings"
-msgstr "Configurações do Evolution"
+msgid "Evolution Preferences"
+msgstr "Preferências do Evolution"
 
 #: ../shell/e-shell-utils.c:118
 msgid "No folder name specified."
@@ -16684,90 +17427,85 @@ msgstr "Nome de pasta não pode conter o caracter \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' e '..' são nomes de pastas reservados."
 
-#: ../shell/e-shell-window-commands.c:70
+#: ../shell/e-shell-window-commands.c:71
 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."
 
-#: ../shell/e-shell-window-commands.c:78
+#: ../shell/e-shell-window-commands.c:79
 #, c-format
 msgid "Error executing %s."
 msgstr "Erro ao executar %s."
 
-#: ../shell/e-shell-window-commands.c:127
+#: ../shell/e-shell-window-commands.c:128
 msgid "Bug buddy is not installed."
 msgstr "Bub buddy não está instalado."
 
-#: ../shell/e-shell-window-commands.c:135
+#: ../shell/e-shell-window-commands.c:136
 msgid "Bug buddy could not be run."
 msgstr "Incapaz de executar o Bub buddy."
 
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
 #. * about box
-#: ../shell/e-shell-window-commands.c:532
+#: ../shell/e-shell-window-commands.c:530
 msgid "translator-credits"
 msgstr "Duarte Loreto <happyguy_pt@hotmail.com>"
 
-#: ../shell/e-shell-window-commands.c:546
-msgid "Groupware Suite"
-msgstr "Groupwise Suite"
-
-#: ../shell/e-shell-window-commands.c:774
+#: ../shell/e-shell-window-commands.c:775
 msgid "_Work Online"
 msgstr "Trabalhar _Ligado"
 
-#: ../shell/e-shell-window-commands.c:787 ../ui/evolution.xml.h:50
+#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "Trabalhar _Desligado"
 
-#: ../shell/e-shell-window-commands.c:800
+#: ../shell/e-shell-window-commands.c:801
 msgid "Work Offline"
 msgstr "Trabalhar Desligado"
 
-#: ../shell/e-shell-window.c:343
-msgid "Evolution is currently online.  Click on this button to work offline."
+#: ../shell/e-shell-window.c:368
+msgid "Evolution is currently online. Click on this button to work offline."
 msgstr ""
-"Evolution de momento está ligado.  Clique neste botão para trabalhar "
+"Evolution de momento está ligado. Clique neste botão para trabalhar "
 "desligado."
 
-#: ../shell/e-shell-window.c:351
+#: ../shell/e-shell-window.c:376
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution está no processo de se desligar."
 
-#: ../shell/e-shell-window.c:358
-msgid "Evolution is currently offline.  Click on this button to work online."
+#: ../shell/e-shell-window.c:383
+msgid "Evolution is currently offline. Click on this button to work online."
 msgstr ""
-"Evolution de momento está desligado.  Clique neste botão para trabalhar "
-"ligado."
+"Evolution de momento está desligado. Prima este botão para trabalhar ligado."
 
-#: ../shell/e-shell-window.c:724
+#: ../shell/e-shell-window.c:783
 #, c-format
 msgid "Switch to %s"
 msgstr "Alternar para %s"
 
-#: ../shell/e-shell.c:623
+#: ../shell/e-shell.c:633
 msgid "Uknown system error."
 msgstr "Erro de sistema desconhecido."
 
-#: ../shell/e-shell.c:825 ../shell/e-shell.c:826
+#: ../shell/e-shell.c:829 ../shell/e-shell.c:830
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1257 ../widgets/misc/e-cell-date-edit.c:256
+#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1259
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "Argumentos inválidos"
 
-#: ../shell/e-shell.c:1261
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "Incapaz de se registar no OAF"
 
-#: ../shell/e-shell.c:1263
+#: ../shell/e-shell.c:1267
 msgid "Configuration Database not found"
 msgstr "Base de Dados de Configuração não foi encontrada"
 
@@ -16839,7 +17577,7 @@ msgid ""
 "If you want a stable version of Evolution, we urge you to uninstall\n"
 "this version, and install version %s instead.\n"
 "\n"
-"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"If you find bugs, please report them to us at bugzilla.gnome.org.\n"
 "This product comes with no warranty and is not intended for\n"
 "individuals prone to violent fits of anger.\n"
 "\n"
@@ -16856,7 +17594,7 @@ msgstr ""
 "Se deseja uma versão estável do Evolution, aconselhamos vivamente que\n"
 "remova esta versão e instale a versão %s.\n"
 "\n"
-"Se encontrar erros, relate-os em bugzilla.ximian.com (em inglês).\n"
+"Se encontrar erros, relate-os em bugzilla.gnome.org (em inglês).\n"
 "Este produto vem sem qualquer garantia e não se destina a indivíduos\n"
 "com tendência para acessos violentos de raiva.\n"
 "\n"
@@ -16872,36 +17610,36 @@ msgstr ""
 "A Equipa do Evolution\n"
 
 #: ../shell/main.c:261
-msgid "Don't tell me again"
-msgstr "Não apresentar novamente"
+msgid "Do not tell me again"
+msgstr "Não apresentar esta mensagem novamente"
 
-#: ../shell/main.c:466
+#: ../shell/main.c:471
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar o Evolution activando o componente especificado"
 
-#: ../shell/main.c:470
+#: ../shell/main.c:475
 msgid "Start in online mode"
 msgstr "Iniciar em modo ligado"
 
-#: ../shell/main.c:473
+#: ../shell/main.c:478
 msgid "Forcibly shut down all Evolution components"
 msgstr "Forçar todos os componentes do Evolution a terminar"
 
-#: ../shell/main.c:477
+#: ../shell/main.c:482
 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:480
+#: ../shell/main.c:485
 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:482
+#: ../shell/main.c:487
 msgid "Disable loading of any plugins."
 msgstr "Desactivar o carregamento de quaisquer plugins."
 
-#: ../shell/main.c:513
+#: ../shell/main.c:518
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16930,10 +17668,10 @@ msgstr "Incapaz de iniciar o Evolution."
 #: ../shell/shell.error.xml.h:5
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed. "
+"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. "
+"ser-lhe-ão pedidas novamente da próxima vez que forem necessárias."
 
 #: ../shell/shell.error.xml.h:7
 msgid "Insufficient disk space for upgrade."
@@ -16945,7 +17683,7 @@ msgstr "Apagar mesmo os dados antigos?"
 
 #: ../shell/shell.error.xml.h:9
 msgid ""
-"The entire contents of the &quot;evolution&quot; directory is about to be be "
+"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 "
@@ -16970,15 +17708,15 @@ 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; 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 ""
 "As versões anteriores do Evolution armazenavam 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 "
+"evolution&quot; será removido definitivamente. Se decidir manter estes "
 "dados, poderá remover o conteúdo de &quot;evolution&quot; quando o desejar.\n"
 
 #: ../shell/shell.error.xml.h:19
@@ -16987,7 +17725,7 @@ msgstr "Falha ao actualizar de uma versão anterior: {0}"
 
 #: ../shell/shell.error.xml.h:20
 msgid ""
-"Upgrading your data and settings will require upto {0} of disk space, but "
+"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 "
@@ -16996,8 +17734,8 @@ 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 conseguir mais espaço livre em disco na sua pasta pessoal antes de "
-"poder prosseguir."
+"Terá de disponibilizar mais espaço livre em disco na sua pasta pessoal antes "
+"de poder prosseguir."
 
 #: ../shell/shell.error.xml.h:23
 msgid ""
@@ -17047,7 +17785,7 @@ msgstr ""
 "Se decidir prosseguir, poderá não ter acesso a alguns dos seus dados "
 "antigos.\n"
 
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -17058,7 +17796,7 @@ msgstr ""
 "\n"
 "Editar definições de credibilidade:"
 
-#: ../smime/gui/cert-trust-dialog.c:145
+#: ../smime/gui/cert-trust-dialog.c:154
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -17068,7 +17806,7 @@ msgstr ""
 "sendo credível, então considera credível a autenticidade deste certificado "
 "excepto se aqui especificado"
 
-#: ../smime/gui/cert-trust-dialog.c:149
+#: ../smime/gui/cert-trust-dialog.c:158
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -17078,60 +17816,60 @@ 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:134
-#: ../smime/gui/certificate-manager.c:142
-#: ../smime/gui/certificate-manager.c:377
-#: ../smime/gui/certificate-manager.c:385
-#: ../smime/gui/certificate-manager.c:597
-#: ../smime/gui/certificate-manager.c:605
+#: ../smime/gui/certificate-manager.c:136
+#: ../smime/gui/certificate-manager.c:144
+#: ../smime/gui/certificate-manager.c:375
+#: ../smime/gui/certificate-manager.c:383
+#: ../smime/gui/certificate-manager.c:595
+#: ../smime/gui/certificate-manager.c:603
 msgid "Select a certificate to import..."
 msgstr "Seleccionar um certificado a importar..."
 
-#: ../smime/gui/certificate-manager.c:265
-#: ../smime/gui/certificate-manager.c:474
-#: ../smime/gui/certificate-manager.c:692
+#: ../smime/gui/certificate-manager.c:267
+#: ../smime/gui/certificate-manager.c:472
+#: ../smime/gui/certificate-manager.c:690
 msgid "Certificate Name"
 msgstr "Nome do Certificado"
 
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:492
+#: ../smime/gui/certificate-manager.c:276
+#: ../smime/gui/certificate-manager.c:490
 msgid "Purposes"
 msgstr "Propósitos"
 
-#: ../smime/gui/certificate-manager.c:283 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:569
+#: ../smime/gui/certificate-manager.c:285 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/lib/e-cert.c:570
 msgid "Serial Number"
 msgstr "Número de Série"
 
-#: ../smime/gui/certificate-manager.c:291
+#: ../smime/gui/certificate-manager.c:293
 msgid "Expires"
 msgstr "Expira"
 
-#: ../smime/gui/certificate-manager.c:483
+#: ../smime/gui/certificate-manager.c:481
 msgid "E-Mail Address"
 msgstr "Endereço de Email"
 
-#: ../smime/gui/certificate-viewer.c:334
+#: ../smime/gui/certificate-viewer.c:341
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Visualizador de Certificado: %s"
 
-#: ../smime/gui/component.c:45
+#: ../smime/gui/component.c:47
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Introduza a senha para `%s'"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:68
+#: ../smime/gui/component.c:70
 msgid "Enter new password for certificate database"
 msgstr "Introduza a nova senha para a base de dados de certificados"
 
-#: ../smime/gui/component.c:70
+#: ../smime/gui/component.c:72
 msgid "Enter new password"
 msgstr "Introduza a nova senha"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:119
+#: ../smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -17140,7 +17878,7 @@ msgstr ""
 "Emitido a:\n"
 "  Assunto: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:120
+#: ../smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -17149,7 +17887,7 @@ msgstr ""
 "Emitido por:\n"
 "  Assunto: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:167
+#: ../smime/gui/e-cert-selector.c:174
 msgid "Select certificate"
 msgstr "Seleccionar certificado"
 
@@ -17209,7 +17947,7 @@ 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.glade.h:14 ../smime/lib/e-cert.c:1076
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
 msgid "Certificate"
 msgstr "Certificado"
 
@@ -17285,11 +18023,11 @@ msgstr "Unidade Organizacional (UO)"
 msgid "SHA1 Fingerprint"
 msgstr "Impressão Digital SHA1"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:818
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:819
 msgid "SSL Client Certificate"
 msgstr "Certificado de Cliente SSL"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:822
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:823
 msgid "SSL Server Certificate"
 msgstr "Certificado de Servidor SSL"
 
@@ -17337,246 +18075,206 @@ 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:651
+#: ../smime/lib/e-cert-db.c:664
 msgid "Certificate already exists"
 msgstr "Certificado já existe"
 
-#: ../smime/lib/e-cert.c:238 ../smime/lib/e-cert.c:248
+#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:424
+#: ../smime/lib/e-cert.c:425
 msgid "Sign"
 msgstr "Assinar"
 
-#: ../smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:426
 msgid "Encrypt"
 msgstr "Encriptar"
 
-#: ../smime/lib/e-cert.c:530
+#: ../smime/lib/e-cert.c:531
 msgid "Version"
 msgstr "Versão"
 
-#: ../smime/lib/e-cert.c:545
+#: ../smime/lib/e-cert.c:546
 msgid "Version 1"
 msgstr "Versão 1"
 
-#: ../smime/lib/e-cert.c:548
+#: ../smime/lib/e-cert.c:549
 msgid "Version 2"
 msgstr "Versão 2"
 
-#: ../smime/lib/e-cert.c:551
+#: ../smime/lib/e-cert.c:552
 msgid "Version 3"
 msgstr "Versão 3"
 
-#: ../smime/lib/e-cert.c:633
+#: ../smime/lib/e-cert.c:634
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "MD2 PKCS nº1 Com Encriptação RSA"
 
-#: ../smime/lib/e-cert.c:636
+#: ../smime/lib/e-cert.c:637
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "MD5 PKCS nº1 Com Encriptação RSA"
 
-#: ../smime/lib/e-cert.c:639
+#: ../smime/lib/e-cert.c:640
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "SHA-1 PKCS nº1 Com Encriptação RSA"
 
-#: ../smime/lib/e-cert.c:642
-msgid "C"
-msgstr "C"
-
-#: ../smime/lib/e-cert.c:645
-msgid "CN"
-msgstr "NC"
-
-#: ../smime/lib/e-cert.c:648
-msgid "OU"
-msgstr "UO"
-
-#: ../smime/lib/e-cert.c:651
-msgid "O"
-msgstr "O"
-
-#: ../smime/lib/e-cert.c:654
-msgid "L"
-msgstr "L"
-
-#: ../smime/lib/e-cert.c:657
-msgid "DN"
-msgstr "ND"
-
-#: ../smime/lib/e-cert.c:660
-msgid "DC"
-msgstr "CD"
-
-#: ../smime/lib/e-cert.c:663
-msgid "ST"
-msgstr "TS"
-
-#: ../smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:667
 msgid "PKCS #1 RSA Encryption"
 msgstr "Encriptação RSA PKCS nº1"
 
-#: ../smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:670
 msgid "Certificate Key Usage"
 msgstr "Utilização de Chave de Certificado"
 
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:673
 msgid "Netscape Certificate Type"
 msgstr "Tipo de Certificado Netscape"
 
-#: ../smime/lib/e-cert.c:675
+#: ../smime/lib/e-cert.c:676
 msgid "Certificate Authority Key Identifier"
 msgstr "Identificador de Chave de Autoridade de Certificação"
 
-#: ../smime/lib/e-cert.c:678
-msgid "UID"
-msgstr "UID"
-
-#: ../smime/lib/e-cert.c:681
-msgid "E"
-msgstr "E"
-
-#: ../smime/lib/e-cert.c:687
+#: ../smime/lib/e-cert.c:688
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identificador de Objecto (%s)"
 
-#: ../smime/lib/e-cert.c:738
+#: ../smime/lib/e-cert.c:739
 msgid "Algorithm Identifier"
 msgstr "Identificador de Algorítmo"
 
-#: ../smime/lib/e-cert.c:746
+#: ../smime/lib/e-cert.c:747
 msgid "Algorithm Parameters"
 msgstr "Parâmetros do Algorítmo"
 
-#: ../smime/lib/e-cert.c:768
+#: ../smime/lib/e-cert.c:769
 msgid "Subject Public Key Info"
 msgstr "Informação da Chave Pública do Sujeito"
 
-#: ../smime/lib/e-cert.c:773
+#: ../smime/lib/e-cert.c:774
 msgid "Subject Public Key Algorithm"
 msgstr "Algorítmo da Chave Pública do Sujeito"
 
-#: ../smime/lib/e-cert.c:788
+#: ../smime/lib/e-cert.c:789
 msgid "Subject's Public Key"
 msgstr "Chave Pública do Sujeito"
 
-#: ../smime/lib/e-cert.c:809 ../smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
 msgid "Error: Unable to process extension"
 msgstr "Erro: Incapaz de processar a extensão"
 
-#: ../smime/lib/e-cert.c:830 ../smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
 msgid "Object Signer"
 msgstr "Assinante do Objecto"
 
-#: ../smime/lib/e-cert.c:834
+#: ../smime/lib/e-cert.c:835
 msgid "SSL Certificate Authority"
 msgstr "Autoridade de Certificação SSL"
 
-#: ../smime/lib/e-cert.c:838
+#: ../smime/lib/e-cert.c:839
 msgid "Email Certificate Authority"
 msgstr "Autoridade de Certificação de Email"
 
-#: ../smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:867
 msgid "Signing"
 msgstr "Assinar"
 
-#: ../smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:871
 msgid "Non-repudiation"
 msgstr "Não repudiar"
 
-#: ../smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:875
 msgid "Key Encipherment"
 msgstr "Cifra de Chave"
 
-#: ../smime/lib/e-cert.c:878
+#: ../smime/lib/e-cert.c:879
 msgid "Data Encipherment"
 msgstr "Cifra de Dados"
 
-#: ../smime/lib/e-cert.c:882
+#: ../smime/lib/e-cert.c:883
 msgid "Key Agreement"
 msgstr "Acordo de Chave"
 
-#: ../smime/lib/e-cert.c:886
+#: ../smime/lib/e-cert.c:887
 msgid "Certificate Signer"
 msgstr "Assinante do Certificado"
 
-#: ../smime/lib/e-cert.c:890
+#: ../smime/lib/e-cert.c:891
 msgid "CRL Signer"
 msgstr "Assinante CRL"
 
-#: ../smime/lib/e-cert.c:938
+#: ../smime/lib/e-cert.c:939
 msgid "Critical"
 msgstr "Crítico"
 
-#: ../smime/lib/e-cert.c:940 ../smime/lib/e-cert.c:943
+#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
 msgid "Not Critical"
 msgstr "Não Crítico"
 
-#: ../smime/lib/e-cert.c:964
+#: ../smime/lib/e-cert.c:965
 msgid "Extensions"
 msgstr "Extensões"
 
-#: ../smime/lib/e-cert.c:1035
+#: ../smime/lib/e-cert.c:1036
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1211
+#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
 msgid "Certificate Signature Algorithm"
 msgstr "Algorítmo de Assinatura do Certificado"
 
-#: ../smime/lib/e-cert.c:1100
+#: ../smime/lib/e-cert.c:1101
 msgid "Issuer"
 msgstr "Emissor"
 
-#: ../smime/lib/e-cert.c:1154
+#: ../smime/lib/e-cert.c:1155
 msgid "Issuer Unique ID"
 msgstr "ID Único de Emissor"
 
-#: ../smime/lib/e-cert.c:1173
+#: ../smime/lib/e-cert.c:1174
 msgid "Subject Unique ID"
 msgstr "ID Único de Sujeito"
 
-#: ../smime/lib/e-cert.c:1216
+#: ../smime/lib/e-cert.c:1217
 msgid "Certificate Signature Value"
 msgstr "Valor da Assinatura do Certificado"
 
-#: ../smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "Senha do Ficheiro PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:266
 msgid "Enter password for PKCS12 file:"
 msgstr "Introduza a senha para o ficheiro PKCS12:"
 
-#: ../smime/lib/e-pkcs12.c:363
+#: ../smime/lib/e-pkcs12.c:365
 msgid "Imported Certificate"
 msgstr "Certificado Importado"
 
-#: ../tools/evolution-launch-composer.c:324
+#: ../tools/evolution-launch-composer.c:321
 msgid "An attachment to add."
 msgstr "Um anexo a adicionar."
 
-#: ../tools/evolution-launch-composer.c:325
+#: ../tools/evolution-launch-composer.c:322
 msgid "Content type of the attachment."
 msgstr "Tipo de conteúdo do anexo."
 
-#: ../tools/evolution-launch-composer.c:326
+#: ../tools/evolution-launch-composer.c:323
 msgid "The filename to display in the mail."
 msgstr "O nome de ficheiro a apresentar na mensagem."
 
-#: ../tools/evolution-launch-composer.c:327
+#: ../tools/evolution-launch-composer.c:324
 msgid "Description of the attachment."
 msgstr "Descrição do anexo."
 
-#: ../tools/evolution-launch-composer.c:328
+#: ../tools/evolution-launch-composer.c:325
 msgid "Mark attachment to be shown inline by default."
 msgstr "Marcar o anexo para, por omissão, ser apresentado imbutido."
 
-#: ../tools/evolution-launch-composer.c:329
+#: ../tools/evolution-launch-composer.c:326
 msgid "Default subject for the message."
 msgstr "Assunto por omissão da mensagem."
 
@@ -17593,108 +18291,210 @@ msgstr "Incapaz de executar '%s': %s\n"
 msgid "Shutting down %s (%s)\n"
 msgstr "A desligar %s (%s)\n"
 
+#: ../ui/evolution-addressbook.xml.h:1
+msgid "Address _Book Properties"
+msgstr "Propriedades do Livro de _Endereços"
+
 #: ../ui/evolution-addressbook.xml.h:3
+msgid "Change the properties of the selected folder"
+msgstr "Alterar as propriedades da pasta seleccionada"
+
+#: ../ui/evolution-addressbook.xml.h:4
+msgid "Co_py All Contacts To..."
+msgstr "Co_piar Todos os Contactos Para..."
+
+#: ../ui/evolution-addressbook.xml.h:5
+msgid "Contact _Preview"
+msgstr "_Antevisão de Contacto"
+
+#: ../ui/evolution-addressbook.xml.h:7
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "Copiar os Contactos Seleccionados para Outra Pasta..."
 
-#: ../ui/evolution-addressbook.xml.h:4 ../ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:8
+msgid "Copy the contacts of the selected folder into another folder"
+msgstr "Copiar os contactos da pasta seleccionada para outra pasta"
+
+#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Copiar a selecção"
 
-#: ../ui/evolution-addressbook.xml.h:5
+#: ../ui/evolution-addressbook.xml.h:10
 msgid "Copy to Folder..."
 msgstr "Copiar para a Pasta..."
 
-#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:11
+msgid "Create a new addressbook folder"
+msgstr "Criar uma nova pasta de livro de endereços"
+
+#: ../ui/evolution-addressbook.xml.h:12
+#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Cortar"
+
+#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Cortar a selecção"
 
-#: ../ui/evolution-addressbook.xml.h:9
+#: ../ui/evolution-addressbook.xml.h:14
+msgid "Del_ete Address Book"
+msgstr "Apa_gar Livro de Endereços"
+
+#: ../ui/evolution-addressbook.xml.h:16
 msgid "Delete selected contacts"
 msgstr "Apagar os contactos seleccionados"
 
-#: ../ui/evolution-addressbook.xml.h:11
+#: ../ui/evolution-addressbook.xml.h:17
+msgid "Delete the selected folder"
+msgstr "Apagar a pasta seleccionada"
+
+#: ../ui/evolution-addressbook.xml.h:18
+msgid "Forward Contact"
+msgstr "Reenviar Contacto"
+
+#: ../ui/evolution-addressbook.xml.h:19
+msgid "Mo_ve All Contacts To..."
+msgstr "Mo_ver Todos os Contactos Para..."
+
+#: ../ui/evolution-addressbook.xml.h:20
 msgid "Move Selected Contacts to Another Folder..."
 msgstr "Mover os Contactos Seleccionados para Outra Pasta..."
 
-#: ../ui/evolution-addressbook.xml.h:12
+#: ../ui/evolution-addressbook.xml.h:21
+msgid "Move the contacts of the selected folder into another folder"
+msgstr "Mover os contactos da pasta seleccionada para outra pasta"
+
+#: ../ui/evolution-addressbook.xml.h:22
 msgid "Move to Folder..."
 msgstr "Mover para a Pasta..."
 
-#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "Colar"
+
+#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Colar da área de transferência"
 
-#: ../ui/evolution-addressbook.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:25
 msgid "Previews the contacts to be printed"
 msgstr "Antevê os contactos a serem impressos"
 
-#: ../ui/evolution-addressbook.xml.h:18
+#: ../ui/evolution-addressbook.xml.h:28
 msgid "Print selected contacts"
 msgstr "Imprimir os contactos seleccionados"
 
-#: ../ui/evolution-addressbook.xml.h:20
+#: ../ui/evolution-addressbook.xml.h:29
+msgid "Rename the selected folder"
+msgstr "Renomear a pasta seleccionada"
+
+#: ../ui/evolution-addressbook.xml.h:30
+msgid "S_ave Address Book As VCard"
+msgstr "Gr_avar o Livro de Endereços como VCard"
+
+#: ../ui/evolution-addressbook.xml.h:32
 msgid "Save selected contacts as a VCard."
 msgstr "Gravar os contactos seleccionados como VCard."
 
-#: ../ui/evolution-addressbook.xml.h:21 ../widgets/text/e-text.c:2684
+#: ../ui/evolution-addressbook.xml.h:33
+msgid "Save the contacts of the selected folder as VCard"
+msgstr "Gravar os contactos da pasta seleccionada como VCard"
+
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2709
 msgid "Select All"
 msgstr "Seleccionar Todos"
 
-#: ../ui/evolution-addressbook.xml.h:22
+#: ../ui/evolution-addressbook.xml.h:35
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
+#: ../ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "Seleccion_ar Tudo"
+
+#: ../ui/evolution-addressbook.xml.h:36
 msgid "Select all contacts"
 msgstr "Seleccionar todos os contactos"
 
-#: ../ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-addressbook.xml.h:37
 msgid "Send a message to the selected contacts."
 msgstr "Enviar uma mensagem aos contactos seleccionados."
 
-#: ../ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-addressbook.xml.h:38
 msgid "Send message to contact"
 msgstr "Enviar uma mensagem ao contacto"
 
-#: ../ui/evolution-addressbook.xml.h:25
+#: ../ui/evolution-addressbook.xml.h:39
 msgid "Send selected contacts to another person."
 msgstr "Enviar os contactos seleccionados a outra pessoa."
 
-#: ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-addressbook.xml.h:40
 msgid "Show contact preview window"
 msgstr "Apresentar a janela de antevisão de contacto"
 
-#: ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-addressbook.xml.h:41
+msgid "St_op"
+msgstr "Pa_rar"
+
+#: ../ui/evolution-addressbook.xml.h:42
 msgid "Stop"
 msgstr "Parar"
 
-#: ../ui/evolution-addressbook.xml.h:28
+#: ../ui/evolution-addressbook.xml.h:43
 msgid "Stop Loading"
 msgstr "Parar a Leitura"
 
-#: ../ui/evolution-addressbook.xml.h:29
+#: ../ui/evolution-addressbook.xml.h:44
 msgid "View the current contact"
 msgstr "Ver o contacto actual"
 
-#: ../ui/evolution-addressbook.xml.h:30 ../ui/evolution-calendar.xml.h:38
-#: ../ui/evolution-tasks.xml.h:19
+#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "_Acções"
 
-#: ../ui/evolution-addressbook.xml.h:35
+#: ../ui/evolution-addressbook.xml.h:47
+msgid "_Copy Contact to..."
+msgstr "_Copiar Contacto para..."
+
+#: ../ui/evolution-addressbook.xml.h:48
+msgid "_Copy Folder Contacts To"
+msgstr "_Copiar Contactos da Pasta Para"
+
+#: ../ui/evolution-addressbook.xml.h:50
+msgid "_Delete Contact"
+msgstr "_Apagar Contacto"
+
+#: ../ui/evolution-addressbook.xml.h:52
 msgid "_Forward Contact..."
 msgstr "_Reencaminhar o Contacto..."
 
-#: ../ui/evolution-addressbook.xml.h:39
-msgid "_Preview Pane"
-msgstr "_Painel de Antevisão"
+#: ../ui/evolution-addressbook.xml.h:53
+msgid "_Move Contact to..."
+msgstr "_Mover o Contacto para..."
 
-#: ../ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard..."
-msgstr "_Gravar como VCard..."
+#: ../ui/evolution-addressbook.xml.h:54
+msgid "_Move Folder Contacts To"
+msgstr "_Mover Contactos da Pasta Para..."
 
-#: ../ui/evolution-addressbook.xml.h:42
-msgid "_Select All"
-msgstr "_Seleccionar Todos"
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:46
+msgid "_New"
+msgstr "_Novo"
 
-#: ../ui/evolution-addressbook.xml.h:43
+#: ../ui/evolution-addressbook.xml.h:60
+msgid "_Rename"
+msgstr "_Renomear"
+
+#: ../ui/evolution-addressbook.xml.h:61
+msgid "_Save Contact as VCard..."
+msgstr "_Gravar Contacto como VCard..."
+
+#: ../ui/evolution-addressbook.xml.h:62
+msgid "_Save Folder Contacts As VCard"
+msgstr "_Gravar os Contactos da Pasta Como VCard"
+
+#: ../ui/evolution-addressbook.xml.h:63
 msgid "_Send Message to Contact..."
 msgstr "_Enviar Mensagem a Contacto..."
 
@@ -17703,61 +18503,58 @@ msgid "Day"
 msgstr "Dia"
 
 #: ../ui/evolution-calendar.xml.h:6
-msgid "Delete All Occurrences"
-msgstr "Apagar Todas as Ocorrências"
+msgid "Delete _all Occurrences"
+msgstr "Apagar _todas as Ocorrências"
 
 #: ../ui/evolution-calendar.xml.h:7
-msgid "Delete the appointment"
-msgstr "Apagar o compromisso"
+msgid "Delete all occurrences"
+msgstr "Apagar todas as ocorrências"
 
 #: ../ui/evolution-calendar.xml.h:8
-msgid "Delete this Occurrence"
-msgstr "Apagar esta Ocorrência"
+msgid "Delete the appointment"
+msgstr "Apagar o compromisso"
 
-#: ../ui/evolution-calendar.xml.h:9
+#: ../ui/evolution-calendar.xml.h:10
 msgid "Delete this occurrence"
 msgstr "Apagar esta ocorrência"
 
-#: ../ui/evolution-calendar.xml.h:10
+#: ../ui/evolution-calendar.xml.h:11
 msgid "Go To"
 msgstr "Ir Para"
 
-#: ../ui/evolution-calendar.xml.h:11
+#: ../ui/evolution-calendar.xml.h:12
 msgid "Go back"
 msgstr "Retroceder"
 
-#: ../ui/evolution-calendar.xml.h:12
+#: ../ui/evolution-calendar.xml.h:13
 msgid "Go forward"
 msgstr "Avançar"
 
-#: ../ui/evolution-calendar.xml.h:13
+#: ../ui/evolution-calendar.xml.h:14
 msgid "List"
 msgstr "Lista"
 
-#: ../ui/evolution-calendar.xml.h:14
+#: ../ui/evolution-calendar.xml.h:15
 msgid "Month"
 msgstr "Mês"
 
-#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
 msgid "Next"
 msgstr "Seguinte"
 
-#: ../ui/evolution-calendar.xml.h:17
+#: ../ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Antevê o calendário a ser impresso"
 
-#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../ui/evolution-calendar.xml.h:21
+#: ../ui/evolution-calendar.xml.h:22
 msgid "Print this calendar"
 msgstr "Imprimir este calendário"
 
-#: ../ui/evolution-calendar.xml.h:22
-msgid "Publish Free/Busy information for this calendar"
-msgstr "Publicar a informação de Livre/Ocupado para este calendário"
-
 #: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "_Expurgar"
@@ -17770,6 +18567,10 @@ msgstr "Expurgar os compromissos e eventos antigos"
 msgid "Select _Date"
 msgstr "Seleccionar a _Data"
 
+#: ../ui/evolution-calendar.xml.h:26
+msgid "Select _Today"
+msgstr "Seleccionar _Hoje"
+
 #: ../ui/evolution-calendar.xml.h:27
 msgid "Select a specific date"
 msgstr "Seleccionar uma data específica"
@@ -17814,33 +18615,220 @@ msgstr "Semana de Trabalho"
 msgid "_Open Appointment"
 msgstr "_Abrir o Compromisso"
 
-#: ../ui/evolution-composer-entries.xml.h:1
+#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
 msgid "Copy selected text to the clipboard"
 msgstr "Copiar o texto seleccionado para a área de transferência"
 
-#: ../ui/evolution-composer-entries.xml.h:2
-msgid "Cu_t"
-msgstr "Cor_tar"
-
 #: ../ui/evolution-composer-entries.xml.h:3
+msgid "Copy selection to clipboard"
+msgstr "Copiar a selecção para a área de transferência"
+
+#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
 msgid "Cut selected text to the clipboard"
 msgstr "Cortar o texto seleccionado para a área de transferência"
 
-#: ../ui/evolution-composer-entries.xml.h:4
+#: ../ui/evolution-composer-entries.xml.h:7
+msgid "Cut selection to clipboard"
+msgstr "Cortar a selecção para a área de transferência"
+
+#: ../ui/evolution-composer-entries.xml.h:9
+msgid "Paste from clipboard"
+msgstr "Colar da área de transferência"
+
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "Colar o texto da área de transferência"
 
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-subscribe.xml.h:6
-msgid "Select _All"
-msgstr "Seleccion_ar Tudo"
-
-#: ../ui/evolution-composer-entries.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "Seleccionar todo o texto"
 
-#: ../ui/evolution-executive-summary.xml.h:1
-msgid "Customize My Evolution"
-msgstr "Personalizar o Meu Evolution"
+#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
+msgid "Attach"
+msgstr "Anexar"
+
+#: ../ui/evolution-editor.xml.h:2
+msgid "Click here to attach a file"
+msgstr "Clique aqui para anexar um ficheiro"
+
+#: ../ui/evolution-editor.xml.h:3
+msgid "Click here to close the current window"
+msgstr "Clique aqui para fechar a janela actual"
+
+#: ../ui/evolution-editor.xml.h:4
+msgid "Click here to save the current window"
+msgstr "Clique aqui para gravar a janela actual"
+
+#: ../ui/evolution-editor.xml.h:5
+msgid "Click here to view help available"
+msgstr "Clique aqui para consultar a ajuda disponível"
+
+#.
+#. <cmd name="FileSave" _label="Save"
+#. _tip="Save the current file" pixtype="stock" pixname="Save"
+#. accel="*Ctrl*s"/>
+#.
+#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
+#: ../ui/evolution-message-composer.xml.h:3
+#: ../ui/evolution-signature-editor.xml.h:7
+msgid "Close"
+msgstr "Fechar"
+
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
+msgid "_Attachment..."
+msgstr "_Anexo..."
+
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
+msgid "_Close"
+msgstr "_Fechar"
+
+#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-signature-editor.xml.h:25
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:41
+msgid "_File"
+msgstr "_Ficheiro"
+
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
+msgid "_Help"
+msgstr "_Ajuda"
+
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "_Inserir"
+
+#: ../ui/evolution-editor.xml.h:21
+msgid "_Options"
+msgstr "_Opções"
+
+#: ../ui/evolution-event-editor.xml.h:2
+msgid "All Day Event"
+msgstr "Evento de Dia Completo"
+
+#: ../ui/evolution-event-editor.xml.h:3
+msgid "All _Day Event"
+msgstr "Evento de _Dia Completo"
+
+#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
+#: ../ui/evolution-task-editor.xml.h:1
+msgid "Classify as Confidential"
+msgstr "Classificar como Confidencial"
+
+#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
+#: ../ui/evolution-task-editor.xml.h:2
+msgid "Classify as Private"
+msgstr "Classificar como Privado"
+
+#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
+#: ../ui/evolution-task-editor.xml.h:3
+msgid "Classify as public"
+msgstr "Classificar como público"
+
+#: ../ui/evolution-event-editor.xml.h:7
+msgid "Click here to set or unset alarms for this event"
+msgstr "Clique aqui para definir ou remover alarmes para este evento"
+
+#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
+msgid "Insert advanced send options"
+msgstr "Inserir opções avançadas de envio"
+
+#: ../ui/evolution-event-editor.xml.h:10
+msgid "Make this a recurring event"
+msgstr "Tornar este evento como recorrente"
+
+#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
+#: ../ui/evolution-task-editor.xml.h:6
+msgid "Pu_blic"
+msgstr "Pú_blico"
+
+#: ../ui/evolution-event-editor.xml.h:12
+msgid "Query free / busy information for the attendees"
+msgstr "Consultar a informação de livre/ocupado dos participantes"
+
+#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
+msgid "R_ole Field"
+msgstr "Campo de _Papel"
+
+#: ../ui/evolution-event-editor.xml.h:16
+msgid "Show time as _busy"
+msgstr "Apresentar horas como _ocupadas"
+
+#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:11
+msgid "Time _Zone"
+msgstr "Fuso-_Horário"
+
+#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:12
+msgid "Toggles whether the Attendee Type field is displayed"
+msgstr "Alterna se o campo de Tipo de Participante é ou não apresentado"
+
+#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:13
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Alterna se o campo Responder SFF é ou não apresentado"
+
+#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:14
+msgid "Toggles whether the Role field is displayed"
+msgstr "Alterna se o campo de Papel é ou não apresentado"
+
+#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:15
+msgid "Toggles whether the Status field is displayed"
+msgstr "Alterna se o campo de Estado é ou não apresentado"
+
+#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:16
+msgid "Toggles whether the time zone is displayed"
+msgstr "Alterna se o fuso horário é ou não apresentado"
+
+#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-memo-editor.xml.h:5
+#: ../ui/evolution-task-editor.xml.h:17
+msgid "Toggles whether to display categories"
+msgstr "Alterna se apresentar ou não as categorias"
+
+#: ../ui/evolution-event-editor.xml.h:24
+msgid "Toggles whether to have All Day Event"
+msgstr "Alterna se ter ou não apresentado Eventos de Dia Completo"
+
+#: ../ui/evolution-event-editor.xml.h:25
+msgid "Toggles whether to show time as busy"
+msgstr "Alterna se apresentar ou não o tempo como ocupado"
+
+#: ../ui/evolution-event-editor.xml.h:26
+msgid "_Alarms"
+msgstr "_Alarmes"
+
+#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
+#: ../ui/evolution-task-editor.xml.h:19
+msgid "_Classification"
+msgstr "_Classificação"
+
+#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:8
+#: ../ui/evolution-task-editor.xml.h:20
+msgid "_Confidential"
+msgstr "_Confidencial"
+
+#: ../ui/evolution-event-editor.xml.h:30
+msgid "_Free/Busy"
+msgstr "_Livre/Ocupado"
+
+#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-memo-editor.xml.h:9
+#: ../ui/evolution-task-editor.xml.h:21
+msgid "_Private"
+msgstr "_Privado"
+
+#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:22
+msgid "_RSVP"
+msgstr "_Responder SFF"
+
+#: ../ui/evolution-event-editor.xml.h:33
+msgid "_Recurrence"
+msgstr "_Recorrência"
+
+#: ../ui/evolution-event-editor.xml.h:34 ../ui/evolution-task-editor.xml.h:25
+msgid "_Status Field"
+msgstr "Campo de E_stado"
+
+#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:26
+msgid "_Type Field"
+msgstr "Campo _Tipo"
 
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
@@ -17866,44 +18854,44 @@ msgstr "Criar ou editar as regras para filtrar novas mensagens"
 msgid "Empty _Trash"
 msgstr "Esvaziar o Li_xo"
 
-#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:7
+#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:11
 #: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "P_asta"
 
 #: ../ui/evolution-mail-global.xml.h:9
-msgid "Message F_ilters"
-msgstr "F_iltros de Mensagens"
-
-#: ../ui/evolution-mail-global.xml.h:10
 msgid "Message _Preview"
 msgstr "_Antevisão da Mensagem"
 
-#: ../ui/evolution-mail-global.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Move the selected folder into another folder"
 msgstr "Mover a pasta seleccionada para dentro de outra pasta"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:13
+#: ../ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Remover definitivamente todas as mensagens apagadas de todas as pastas"
 
-#: ../ui/evolution-mail-global.xml.h:14
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
 msgstr "Pastas de Pr_ocura"
 
-#: ../ui/evolution-mail-global.xml.h:15
+#: ../ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
 msgstr "Apresentar a janela de antevisão de mensagem"
 
-#: ../ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Subscrever ou remover a subscrição de pastas em servidores remotos"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "_Copy Folder To..."
 msgstr "_Copiar a Pasta Para..."
 
+#: ../ui/evolution-mail-global.xml.h:17
+msgid "_Message Filters"
+msgstr "Filtros de _Mensagens"
+
 #: ../ui/evolution-mail-global.xml.h:18
 msgid "_Move Folder To..."
 msgstr "_Mover a Pasta Para..."
@@ -17927,98 +18915,114 @@ msgstr "Alterar o nome desta pasta"
 msgid "Change the properties of this folder"
 msgstr "Alterar as propriedades desta pasta"
 
-#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-list.xml.h:3
+msgid "Collapse All _Threads"
+msgstr "Recolher Todas as Ár_vores"
+
+#: ../ui/evolution-mail-list.xml.h:4
+msgid "Collapse all message threads"
+msgstr "Recolher todas as árvores de mensagens"
+
+#: ../ui/evolution-mail-list.xml.h:5
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Copiar a(s) mensagem(ns) seleccionada(s) para a área de transferência"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-list.xml.h:5 ../ui/evolution-mail-message.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:7
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Cortar a(s) mensagem(ns) seleccionada(s) para a área de transferência"
 
-#: ../ui/evolution-mail-list.xml.h:6
+#: ../ui/evolution-mail-list.xml.h:8
+msgid "E_xpand All Threads"
+msgstr "E_xpandir Todas as Árvores"
+
+#: ../ui/evolution-mail-list.xml.h:9
 msgid "E_xpunge"
 msgstr "E_xpurgar"
 
-#: ../ui/evolution-mail-list.xml.h:8
-msgid "Group By _Threads"
-msgstr "Agrupar Por Ár_vores"
+#: ../ui/evolution-mail-list.xml.h:10
+msgid "Expand all message threads"
+msgstr "Expandir todas as árvores de mensagens"
 
-#: ../ui/evolution-mail-list.xml.h:9
+#: ../ui/evolution-mail-list.xml.h:12
 msgid "Hide S_elected Messages"
 msgstr "Esconder as Mensagens S_eleccionadas"
 
-#: ../ui/evolution-mail-list.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:13
 msgid "Hide _Deleted Messages"
 msgstr "Esconder as Mensagens _Apagadas"
 
-#: ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-list.xml.h:14
 msgid "Hide _Read Messages"
 msgstr "Esconder as Mensagens _Lidas"
 
-#: ../ui/evolution-mail-list.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:15
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr "Esconder as mensagens apagadas em vez de as apresentar riscadas"
 
-#: ../ui/evolution-mail-list.xml.h:13
-msgid "Mark Me_ssages as Read"
-msgstr "Marcar as Men_sagens como Lidas"
+#: ../ui/evolution-mail-list.xml.h:16
+msgid "Mar_k All Messages as Read"
+msgstr "_Marcar Todas as Mensagens como Lidas"
 
-#: ../ui/evolution-mail-list.xml.h:14 ../ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-list.xml.h:17
 msgid "Paste message(s) from the clipboard"
 msgstr "Colar mensagem(ns) da área de transferência"
 
-#: ../ui/evolution-mail-list.xml.h:15
+#: ../ui/evolution-mail-list.xml.h:18
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Remover definitivamente todas as mensagens apagadas desta pasta"
 
-#: ../ui/evolution-mail-list.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:19
 msgid "Permanently remove this folder"
 msgstr "Remover definitivamente esta pasta"
 
-#: ../ui/evolution-mail-list.xml.h:17
+#: ../ui/evolution-mail-list.xml.h:20
 msgid "Select Message _Thread"
 msgstr "Seleccionar a Ár_vore de Mensagens"
 
-#: ../ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:21
 msgid "Select _All Messages"
 msgstr "Seleccionar _Todas as Mensagens"
 
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:22
 msgid "Select all and only the messages that are not currently selected"
 msgstr "Seleccionar todas as mensagens que de momento não estão seleccionadas"
 
-#: ../ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:23
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 "Seleccionar todas as mensagens na mesma árvore que a mensagem seleccionada"
 
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:24
 msgid "Select all visible messages"
 msgstr "Seleccionar todas as mensagens visíveis"
 
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "Sh_ow Hidden Messages"
 msgstr "Apresentar as Mensagens _Escondidas"
 
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:26
 msgid "Show messages that have been temporarily hidden"
 msgstr "Apresentar as mensagens que foram temporariamente escondidas"
 
-#: ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:27
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Esconder temporariamente todas as mensagens que já foram lidas"
 
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:28
 msgid "Temporarily hide the selected messages"
 msgstr "Esconder temporariamente as mensagens seleccionadas"
 
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:29
 msgid "Threaded Message list"
 msgstr "Lista de Mensagem em Árvore"
 
-#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-list.xml.h:31
+msgid "_Group By Threads"
+msgstr "Agrupar Por Ár_vores"
+
+#: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-mail-message.xml.h:116
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Mensagem"
@@ -18066,78 +19070,90 @@ msgstr ""
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Compor uma resposta para o remetente da mensagem seleccionada"
 
-#: ../ui/evolution-mail-message.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:12
 msgid "Copy selected messages to another folder"
 msgstr "Copiar as mensagens seleccionadas para outra pasta"
 
-#: ../ui/evolution-mail-message.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:13
+msgid "Copy selected messages to the clipboard"
+msgstr "Copiar as mensagens seleccionadas para a área de transferência"
+
+#: ../ui/evolution-mail-message.xml.h:14
 msgid "Create R_ule"
 msgstr "Criar uma _Regra"
 
-#: ../ui/evolution-mail-message.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:15
 msgid "Create a Search Folder for these recipients"
 msgstr "Criar uma Pasta de Procura para estes destinatários"
 
-#: ../ui/evolution-mail-message.xml.h:17
+#: ../ui/evolution-mail-message.xml.h:16
 msgid "Create a Search Folder for this mailing list"
 msgstr "Criar uma Pasta de Procura para esta lista de distribuição"
 
-#: ../ui/evolution-mail-message.xml.h:18
+#: ../ui/evolution-mail-message.xml.h:17
 msgid "Create a Search Folder for this sender"
 msgstr "Criar uma Pasta de Procura para este remetente"
 
-#: ../ui/evolution-mail-message.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:18
 msgid "Create a Search Folder for this subject"
 msgstr "Criar uma Pasta de Procura para este assunto"
 
-#: ../ui/evolution-mail-message.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a rule to filter messages from this sender"
 msgstr "Criar uma regra para filtrar mensagens deste remetente"
 
-#: ../ui/evolution-mail-message.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Criar uma regra para filtrar mensagens para estes destinatários"
 
-#: ../ui/evolution-mail-message.xml.h:22
+#: ../ui/evolution-mail-message.xml.h:21
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Criar uma regra para filtrar mensagens para esta lista de distribuição"
 
-#: ../ui/evolution-mail-message.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:22
 msgid "Create a rule to filter messages with this subject"
 msgstr "Criar uma regra para filtrar mensagens com este assunto"
 
-#: ../ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-mail-message.xml.h:23
+msgid "Cut selected messages to the clipboard"
+msgstr "Cortar as mensagens seleccionadas para a área de transferência"
+
+#: ../ui/evolution-mail-message.xml.h:24
 msgid "Decrease the text size"
 msgstr "Diminuir o tamanho do texto"
 
-#: ../ui/evolution-mail-message.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:26
 msgid "Display the next important message"
 msgstr "Apresentar a mensagem importante seguinte"
 
-#: ../ui/evolution-mail-message.xml.h:28
+#: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next message"
 msgstr "Apresentar a mensagem seguinte"
 
+#: ../ui/evolution-mail-message.xml.h:28
+msgid "Display the next thread"
+msgstr "Apresentar a árvore seguinte"
+
 #: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the next unread message"
 msgstr "Apresentar a mensagem por ler seguinte"
 
 #: ../ui/evolution-mail-message.xml.h:30
-msgid "Display the next unread thread"
-msgstr "Apresentar a árvore por ler seguinte"
-
-#: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous important message"
 msgstr "Apresentar a mensagem importante anterior"
 
-#: ../ui/evolution-mail-message.xml.h:32
+#: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous message"
 msgstr "Apresentar a mensagem anterior"
 
-#: ../ui/evolution-mail-message.xml.h:33
+#: ../ui/evolution-mail-message.xml.h:32
 msgid "Display the previous unread message"
 msgstr "Apresentar a mensagem anterior por ler"
 
+#: ../ui/evolution-mail-message.xml.h:33
+msgid "F_orward As..."
+msgstr "_Reencaminhar Como..."
+
 #: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr "Filtro à _Lista de Distribuição..."
@@ -18159,8 +19175,8 @@ msgid "Filter the selected messages for junk status"
 msgstr "Filtrar as mensagens seleccionadas pelo estado de não solicitado"
 
 #: ../ui/evolution-mail-message.xml.h:39
-msgid "Flag selected message(s) for follow-up"
-msgstr "Marcar a(s) mensagem(ns) para dar seguimento"
+msgid "Flag selected messages for follow-up"
+msgstr "Marcar as mensagens seleccionadas para dar seguimento"
 
 #: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
@@ -18195,256 +19211,265 @@ msgid "Mar_k as"
 msgstr "_Marcar como"
 
 #: ../ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected message(s) as having been read"
-msgstr "Marcar a(s) mensagem(ns) seleccionada(s) como lida(s)"
+msgid "Mark the selected messages as having been read"
+msgstr "Marcar as mensagens seleccionadas como lidas"
 
 #: ../ui/evolution-mail-message.xml.h:51
-msgid "Mark the selected message(s) as important"
-msgstr "Marcar a(s) mensagem(ns) seleccionada(s) como importante(s)"
+msgid "Mark the selected messages as important"
+msgstr "Marcar as mensagens seleccionadas como importantes"
 
 #: ../ui/evolution-mail-message.xml.h:52
-msgid "Mark the selected message(s) as junk"
-msgstr "Marcar a(s) mensagem(ns) seleccionada(s) como não solicitado"
+msgid "Mark the selected messages as junk"
+msgstr "Marcar as mensagens seleccionadas como não solicitadas"
 
 #: ../ui/evolution-mail-message.xml.h:53
-msgid "Mark the selected message(s) as not being junk"
-msgstr "Marcar a(s) mensagem(ns) seleccionada(s) como não sendo não solicitado"
+msgid "Mark the selected messages as not being junk"
+msgstr "Marcar as mensagens seleccionadas como não sendo não solicitadas"
 
 #: ../ui/evolution-mail-message.xml.h:54
-msgid "Mark the selected message(s) as not having been read"
-msgstr "Marcar a(s) mensagem(ns) seleccionada(s) como por ler"
+msgid "Mark the selected messages as not having been read"
+msgstr "Marcar as mensagens seleccionadas como por ler"
 
 #: ../ui/evolution-mail-message.xml.h:55
-msgid "Mark the selected message(s) as unimportant"
-msgstr "Marcar a(s) mensagem(ns) seleccionada(s) como irrelevante(s)"
+msgid "Mark the selected messages as unimportant"
+msgstr "Marcar as mensagens seleccionadas como não sendo importantes"
 
 #: ../ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar a(s) mensagem(ns) seleccionada(s) para serem apagadas"
 
 #: ../ui/evolution-mail-message.xml.h:57
-msgid "Message Source"
-msgstr "Origem da Mensagem"
-
-#: ../ui/evolution-mail-message.xml.h:58
-msgid "Move"
-msgstr "Mover"
+msgid "Move selected messages to another folder"
+msgstr "Mover as mensages seleccionadas para outra pasta"
 
 #: ../ui/evolution-mail-message.xml.h:59
-msgid "Move selected message(s) to another folder"
-msgstr "Mover a(s) mensagem(s) seleccionada(s) para outra pasta"
-
-#: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Important Message"
 msgstr "Mensagem _Importante Seguinte"
 
-#: ../ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:60
 msgid "Next _Thread"
 msgstr "Árvore Seguin_te"
 
-#: ../ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Unread Message"
 msgstr "Mensagem Por Ler Seg_uinte"
 
-#: ../ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:62
 msgid "Not Junk"
 msgstr "Não é Não Solicitado"
 
-#: ../ui/evolution-mail-message.xml.h:65
+#: ../ui/evolution-mail-message.xml.h:63
 msgid "Open a window for composing a mail message"
 msgstr "Abrir uma janela para compor uma mensagem de email"
 
-#: ../ui/evolution-mail-message.xml.h:66
-msgid "Open the selected message in a new window"
-msgstr "Abrir a mensagem seleccionada numa nova janela"
+#: ../ui/evolution-mail-message.xml.h:64
+msgid "Open the selected messages in a new window"
+msgstr "Abrir as mensagens seleccionadas numa nova janela"
 
-#: ../ui/evolution-mail-message.xml.h:67
-msgid "Open the selected message in the composer for editing"
-msgstr "Abrir a mensagem seleccionada no compositor para a editar"
+#: ../ui/evolution-mail-message.xml.h:65
+msgid "Open the selected messages in the composer for editing"
+msgstr "Abrir as mensagens seleccionadas no compositor para serem editadas"
 
-#: ../ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-message.xml.h:66
 msgid "P_revious Unread Message"
 msgstr "Mensagem Por Ler Ante_rior"
 
-#: ../ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-mail-message.xml.h:67
+msgid "Paste messages from the clipboard"
+msgstr "Colar mensagens da área de transferência"
+
+#: ../ui/evolution-mail-message.xml.h:68
 msgid "Pos_t New Message to Folder"
 msgstr "Afi_xar Nova Mensagem na Pasta"
 
-#: ../ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Post a Repl_y"
 msgstr "Afi_xar uma Resposta"
 
-#: ../ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-mail-message.xml.h:70
 msgid "Post a message to a Public folder"
 msgstr "Afixar uma mensagem numa pasta Pública"
 
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:71
 msgid "Post a reply to a message in a Public folder"
 msgstr "Afixar uma resposta a uma mensagem numa pasta Pública"
 
-#: ../ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-mail-message.xml.h:72
 msgid "Pr_evious Important Message"
 msgstr "Mensagem Importante Ant_erior"
 
-#: ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Preview the message to be printed"
 msgstr "Antever a mensagem a ser impressa"
 
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:77
 msgid "Print this message"
 msgstr "Imprimir esta mensagem"
 
-#: ../ui/evolution-mail-message.xml.h:80
+#: ../ui/evolution-mail-message.xml.h:78
 msgid "Re_direct"
 msgstr "Re_direccionar"
 
-#: ../ui/evolution-mail-message.xml.h:81
+#: ../ui/evolution-mail-message.xml.h:79
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redireccionar a mensagem seleccionada para alguém"
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Reset the text to its original size"
 msgstr "Repor o texto no seu tamanho original"
 
-#: ../ui/evolution-mail-message.xml.h:86
-msgid "Save the message as a text file"
-msgstr "Gravar a mensagem como ficheiro de texto"
+#: ../ui/evolution-mail-message.xml.h:85
+msgid "Save the selected messages as a text file"
+msgstr "Gravar as mensagens seleccionadas como um ficheiro de texto"
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Search Folder from Mailing _List..."
 msgstr "Pasta de Procura com base na _Lista de Distribuição..."
 
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Search Folder from Recipients..."
 msgstr "Pasta de Procura com base nos Destinatários..."
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Search Folder from S_ubject..."
 msgstr "Pasta de Procura com base no A_ssunto..."
 
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:89
 msgid "Search Folder from Sen_der..."
 msgstr "Pasta de Procura com base no Remete_nte..."
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Search for text in the body of the displayed message"
 msgstr "Procurar texto no corpo da mensagem apresentada"
 
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Select _All Text"
 msgstr "Seleccionar _Todo o Texto"
 
-#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Select all the text in a message"
 msgstr "Seleccionar todo o texto da mensagem"
 
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Set up the page settings for your current printer"
 msgstr "Definir as configurações de página para a impressora actual"
 
-#: ../ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Apresentar um cursor intermitente no corpo da mensagem apresentada"
 
+#: ../ui/evolution-mail-message.xml.h:95
+msgid "Show messages in the normal style"
+msgstr "Apresentar as mensagens em estilo normal"
+
 #: ../ui/evolution-mail-message.xml.h:96
-msgid "Show message in the normal style"
-msgstr "Apresentar a mensagem em estilo normal"
+msgid "Show messages with all email headers"
+msgstr "Apresentar as mensagens com todos os cabeçalhos de email"
 
 #: ../ui/evolution-mail-message.xml.h:97
-msgid "Show message with all email headers"
-msgstr "Apresentar a mensagem com todos os cabeçalhos de email"
-
-#: ../ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Apresentar o código fonte da mensagem"
 
-#: ../ui/evolution-mail-message.xml.h:99
-msgid "Un-delete the selected messages"
+#: ../ui/evolution-mail-message.xml.h:98
+msgid "Undelete the selected messages"
 msgstr "Recuperar as mensagens apagadas seleccionadas"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Uni_mportant"
 msgstr "_Não Importante"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "Zoom _Out"
 msgstr "_Afastar Zoom"
 
+#: ../ui/evolution-mail-message.xml.h:101
+msgid "_Attached"
+msgstr "_Anexado"
+
 #: ../ui/evolution-mail-message.xml.h:102
 msgid "_Caret Mode"
 msgstr "Modo de _Cursor"
 
-#: ../ui/evolution-mail-message.xml.h:105
+#: ../ui/evolution-mail-message.xml.h:103
+msgid "_Clear Flag"
+msgstr "L_impar a Marca"
+
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Delete Message"
 msgstr "_Apagar a Mensagem"
 
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Find in Message..."
 msgstr "_Procurar na Mensagem..."
 
 #: ../ui/evolution-mail-message.xml.h:109
+msgid "_Flag Completed"
+msgstr "Marcar como _Terminada"
+
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Go To"
 msgstr "_Ir Para"
 
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Important"
 msgstr "_Importante"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:113
+msgid "_Inline"
+msgstr "_Imbutida"
+
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Junk"
-msgstr "Não _Solicitado"
+msgstr "Não _Solicitada"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Load Images"
 msgstr "_Ler as Imagens"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:117
+msgid "_Message Source"
+msgstr "_Origem da Mensagem"
+
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Next Message"
 msgstr "Mensagem Segui_nte"
 
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Normal Size"
 msgstr "Tamanho _Normal"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Not Junk"
 msgstr "_Não é Não Solicitado"
 
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Open in New Window"
 msgstr "Abrir numa Nova _Janela"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:123
 msgid "_Previous Message"
 msgstr "Mensagem _Anterior"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:125
+msgid "_Quoted"
+msgstr "_Citada"
+
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "_Gravar a Mensagem..."
 
-#: ../ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
 msgstr "Rec_uperar a Mensagem Apagada"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
 msgstr "Marcar _por Ler"
 
-#: ../ui/evolution-mail-message.xml.h:126
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom In"
 msgstr "Aumentar _Zoom"
 
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:7
-msgid "Close"
-msgstr "Fechar"
-
 #: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Fechar esta janela"
@@ -18453,206 +19478,228 @@ msgstr "Fechar esta janela"
 msgid "Main toolbar"
 msgstr "Barra de ferramentas principal"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:42 ../ui/evolution-subscribe.xml.h:9
-msgid "_Close"
-msgstr "_Fechar"
+#: ../ui/evolution-memos.xml.h:3
+msgid "Copy selected memo"
+msgstr "Copiar o memo seleccionado"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:45
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:36
-msgid "_File"
-msgstr "_Ficheiro"
+#: ../ui/evolution-memos.xml.h:5
+msgid "Cut selected memo"
+msgstr "Cortar o memo seleccionado"
 
-#: ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Anexar"
+#: ../ui/evolution-memos.xml.h:7
+msgid "Delete selected memos"
+msgstr "Apagar os memos seleccionados"
+
+#: ../ui/evolution-memos.xml.h:9
+msgid "Paste memo from the clipboard"
+msgstr "Colar o memo da área de transferência"
+
+#: ../ui/evolution-memos.xml.h:10
+msgid "Previews the list of memos to be printed"
+msgstr "Antevê a lista de memos a serem impressos"
+
+#: ../ui/evolution-memos.xml.h:13
+msgid "Print the list of memos"
+msgstr "Imprime a lista de memos"
+
+#: ../ui/evolution-memos.xml.h:14
+msgid "View the selected memo"
+msgstr "Ver o memo seleccionado"
+
+#: ../ui/evolution-memos.xml.h:18
+msgid "_Open Memo"
+msgstr "_Abrir o Memo"
 
 #: ../ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Anexar um ficheiro"
 
-#: ../ui/evolution-message-composer.xml.h:3
-msgid "Check to get delivery notification when your message is read"
-msgstr ""
-"Seleccione para obter uma notificação de entrega quando a sua mensagem for "
-"lida"
-
 #.
 #. <cmd name="FileSave" _label="Save"
 #. _tip="Save the current file" pixtype="stock" pixname="Save"
 #. accel="*Ctrl*s"/>
 #.
-#: ../ui/evolution-message-composer.xml.h:5
+#: ../ui/evolution-message-composer.xml.h:4
 #: ../ui/evolution-signature-editor.xml.h:13
 msgid "Close the current file"
 msgstr "Fechar o ficheiro actual"
 
-#: ../ui/evolution-message-composer.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:5
 msgid "Delete all but signature"
 msgstr "Apagar tudo excepto a assinatura"
 
-#: ../ui/evolution-message-composer.xml.h:7
+#: ../ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "Encriptar esta mensagem com PGP"
 
-#: ../ui/evolution-message-composer.xml.h:8
+#: ../ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Encriptar esta mensagem com o seu Certificado de Encriptação S/MIME"
 
-#: ../ui/evolution-message-composer.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:8
 #: ../ui/evolution-signature-editor.xml.h:14
 msgid "For_mat"
 msgstr "For_mato"
 
+#: ../ui/evolution-message-composer.xml.h:9
+msgid "Get delivery notification when your message is read"
+msgstr "Obter notificação de entrega quando a mensagem for lida"
+
 #: ../ui/evolution-message-composer.xml.h:10
 msgid "HT_ML"
 msgstr "HT_ML"
 
-#: ../ui/evolution-message-composer.xml.h:12
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "I_nserir"
+
+#: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Abrir um ficheiro"
 
-#: ../ui/evolution-message-composer.xml.h:13
+#: ../ui/evolution-message-composer.xml.h:14
 msgid "PGP Encrypt"
 msgstr "Encriptação PGP"
 
-#: ../ui/evolution-message-composer.xml.h:14
+#: ../ui/evolution-message-composer.xml.h:15
 msgid "PGP Sign"
 msgstr "Assinatura PGP"
 
-#: ../ui/evolution-message-composer.xml.h:15
-msgid "Request read receipt"
-msgstr "Pedir recibo de leitura"
-
 #: ../ui/evolution-message-composer.xml.h:16
+msgid "R_equest Read Receipt"
+msgstr "P_edir Recibo de Leitura"
+
+#: ../ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Encrypt"
 msgstr "Encripação S/MIME"
 
-#: ../ui/evolution-message-composer.xml.h:17
+#: ../ui/evolution-message-composer.xml.h:18
 msgid "S/MIME Sign"
 msgstr "Assinatura S/MIME"
 
-#: ../ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-message-composer.xml.h:20
 msgid "Save As"
 msgstr "Gravar Como"
 
-#: ../ui/evolution-message-composer.xml.h:20
+#: ../ui/evolution-message-composer.xml.h:21
 msgid "Save Draft"
 msgstr "Gravar Rascunho"
 
-#: ../ui/evolution-message-composer.xml.h:21
+#: ../ui/evolution-message-composer.xml.h:22
 msgid "Save _As..."
 msgstr "Gravar _Como..."
 
-#: ../ui/evolution-message-composer.xml.h:22
+#: ../ui/evolution-message-composer.xml.h:23
 msgid "Save _Draft"
 msgstr "Gravar o _Rascunho"
 
-#: ../ui/evolution-message-composer.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:24
 msgid "Save as draft"
 msgstr "Gravar como rascunho"
 
-#: ../ui/evolution-message-composer.xml.h:24
+#: ../ui/evolution-message-composer.xml.h:25
 msgid "Save in folder..."
 msgstr "Gravar na pasta..."
 
-#: ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-message-composer.xml.h:26
 msgid "Save the current file"
 msgstr "Gravar o ficheiro actual"
 
-#: ../ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-message-composer.xml.h:27
 msgid "Save the current file with a different name"
 msgstr "Gravar o ficheiro actual com outro nome"
 
-#: ../ui/evolution-message-composer.xml.h:27
+#: ../ui/evolution-message-composer.xml.h:28
 msgid "Save the message in a specified folder"
 msgstr "Gravar a mensagem numa pasta especificada"
 
 #: ../ui/evolution-message-composer.xml.h:29
-#: ../ui/evolution-signature-editor.xml.h:22
+msgid "Send"
+msgstr "Enviar"
+
+#: ../ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-signature-editor.xml.h:23
 msgid "Send the mail in HTML format"
 msgstr "Enviar a mensagem em formato HTML"
 
-#: ../ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-message-composer.xml.h:31
 msgid "Send this message"
 msgstr "Enviar esta mensagem"
 
-#: ../ui/evolution-message-composer.xml.h:31
+#: ../ui/evolution-message-composer.xml.h:32
+msgid "Set the message priority to high"
+msgstr "Definir a prioridade da mensagem como elevada"
+
+#: ../ui/evolution-message-composer.xml.h:33
 msgid "Sign this message with your PGP key"
 msgstr "Assinar esta mensagem com a sua chave PGP"
 
-#: ../ui/evolution-message-composer.xml.h:32
+#: ../ui/evolution-message-composer.xml.h:34
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Assinar esta mensagem com o seu Certificado de Assinatura S/MIME"
 
-#: ../ui/evolution-message-composer.xml.h:33
+#: ../ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Alterna se o campo BCC é ou não apresentado"
 
-#: ../ui/evolution-message-composer.xml.h:34
+#: ../ui/evolution-message-composer.xml.h:36
 msgid "Toggles whether the CC field is displayed"
 msgstr "Alterna se o campo CC é ou não apresentado"
 
-#: ../ui/evolution-message-composer.xml.h:35
+#: ../ui/evolution-message-composer.xml.h:37
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Alterna se o selector De é ou não apresentado"
 
-#: ../ui/evolution-message-composer.xml.h:36
+#: ../ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Alterna se o campo Afixar-Em é ou não apresentado"
 
-#: ../ui/evolution-message-composer.xml.h:37
+#: ../ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Alterna se o campo Responder-A é ou não apresentado"
 
-#: ../ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the To field is displayed"
 msgstr "Alterna se o campo Para é ou não apresentado"
 
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "_Attachment..."
-msgstr "_Anexo..."
-
-#: ../ui/evolution-message-composer.xml.h:40
+#: ../ui/evolution-message-composer.xml.h:42
 msgid "_Bcc Field"
 msgstr "Campo _Bcc"
 
-#: ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-message-composer.xml.h:43
 msgid "_Cc Field"
 msgstr "Campo _Cc"
 
-#: ../ui/evolution-message-composer.xml.h:43
+#: ../ui/evolution-message-composer.xml.h:45
 msgid "_Delete all"
 msgstr "_Apagar tudo"
 
-#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-message-composer.xml.h:48
 msgid "_From Field"
 msgstr "Campo _De"
 
-#: ../ui/evolution-message-composer.xml.h:47
-#: ../ui/evolution-signature-editor.xml.h:25
-msgid "_Insert"
-msgstr "_Inserir"
-
-#: ../ui/evolution-message-composer.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:49
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ../ui/evolution-message-composer.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:50
 msgid "_Post-To Field"
 msgstr "Campo _Afixar-Em"
 
-#: ../ui/evolution-message-composer.xml.h:50
+#: ../ui/evolution-message-composer.xml.h:51
+msgid "_Prioritize Message"
+msgstr "_Prioritizar a Mensagem"
+
+#: ../ui/evolution-message-composer.xml.h:52
 msgid "_Reply-To Field"
 msgstr "Campo _Responder-A"
 
-#: ../ui/evolution-message-composer.xml.h:52
+#: ../ui/evolution-message-composer.xml.h:54
 msgid "_Security"
 msgstr "_Segurança"
 
-#: ../ui/evolution-message-composer.xml.h:53
+#: ../ui/evolution-message-composer.xml.h:55
 msgid "_To Field"
 msgstr "Campo _Para"
 
@@ -18664,18 +19711,18 @@ msgstr "_Fechar"
 msgid "H_TML"
 msgstr "H_TML"
 
-#: ../ui/evolution-signature-editor.xml.h:16
+#: ../ui/evolution-signature-editor.xml.h:17
 msgid "Save and Close"
 msgstr "Gravar e Fechar"
 
 #.
 #. <menuitem name="FileSave" verb="" _label="_Save"/>
 #.
-#: ../ui/evolution-signature-editor.xml.h:20
+#: ../ui/evolution-signature-editor.xml.h:21
 msgid "Save and _Close"
 msgstr "Gravar e Fec_har"
 
-#: ../ui/evolution-signature-editor.xml.h:21
+#: ../ui/evolution-signature-editor.xml.h:22
 msgid "Save the current file and close the window"
 msgstr "Gravar o ficheiro actual e fechar a janela"
 
@@ -18707,13 +19754,33 @@ msgstr "Remover a subscrição"
 msgid "_Invert Selection"
 msgstr "_Inverter a Selecção"
 
+#: ../ui/evolution-task-editor.xml.h:4
+msgid "Click change / view the status details of the task"
+msgstr "Clique alterar/ver os detalhes de estado da tarefa"
+
+#: ../ui/evolution-task-editor.xml.h:9
+msgid "Status Details"
+msgstr "Detalhes de Estado"
+
+#: ../ui/evolution-task-editor.xml.h:10
+msgid "Time Zone"
+msgstr "Fuso Horário"
+
+#: ../ui/evolution-task-editor.xml.h:23
+msgid "_Send Options"
+msgstr "_Opções de Envio"
+
+#: ../ui/evolution-task-editor.xml.h:24
+msgid "_Status Details"
+msgstr "Detalhes de _Estado"
+
 #: ../ui/evolution-tasks.xml.h:3
-msgid "Copy selected task"
-msgstr "Copiar a tarefa seleccionada"
+msgid "Copy selected tasks"
+msgstr "Copiar as tarefas seleccionadas"
 
 #: ../ui/evolution-tasks.xml.h:5
-msgid "Cut selected task"
-msgstr "Cortar a tarefa seleccionada"
+msgid "Cut selected tasks"
+msgstr "Cortar as tarefas seleccionadas"
 
 #: ../ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
@@ -18732,22 +19799,30 @@ msgid "Mark selected tasks as complete"
 msgstr "Marcar as Tarefas Seleccionadas como Terminadas"
 
 #: ../ui/evolution-tasks.xml.h:12
-msgid "Paste task from the clipboard"
-msgstr "Colar a tarefa da área de transferência"
+msgid "Paste tasks from the clipboard"
+msgstr "Colar as tarefas da área de transferência"
 
 #: ../ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
-msgstr "Antever a lista de tarefas a ser impressa"
+msgstr "Antevê a lista de tarefas a ser impressa"
 
 #: ../ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
 msgstr "Imprimir a lista de tarefas"
 
 #: ../ui/evolution-tasks.xml.h:18
+msgid "Show task preview window"
+msgstr "Apresentar a janela de antevisão de tarefa"
+
+#: ../ui/evolution-tasks.xml.h:19
+msgid "Task _Preview"
+msgstr "_Antevisão de Tarefa"
+
+#: ../ui/evolution-tasks.xml.h:20
 msgid "View the selected task"
 msgstr "Ver a tarefa seleccionada"
 
-#: ../ui/evolution-tasks.xml.h:25
+#: ../ui/evolution-tasks.xml.h:27
 msgid "_Open Task"
 msgstr "_Abrir a Tarefa"
 
@@ -18790,18 +19865,18 @@ msgid "Exit the program"
 msgstr "Sair da aplicação"
 
 #: ../ui/evolution.xml.h:11
-msgid "Forget _Passwords"
-msgstr "Esquecer as _Senhas"
-
-#: ../ui/evolution.xml.h:12
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 "Esquecer as senhas recordadas para que estas lhe sejam novamente pedidas"
 
-#: ../ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:12
 msgid "Hide window buttons"
 msgstr "Esconder os botões da janela"
 
+#: ../ui/evolution.xml.h:13
+msgid "I_mport..."
+msgstr "I_mportar..."
+
 #: ../ui/evolution.xml.h:14
 msgid "Icons _and text"
 msgstr "Ícones e te_xto"
@@ -18823,18 +19898,30 @@ msgid "Send / Receive"
 msgstr "Enviar / Receber"
 
 #: ../ui/evolution.xml.h:20
+msgid "Send / _Receive"
+msgstr "Enviar / _Receber"
+
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "Enviar itens em fila e obter novos"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "Definir a configuração da Pilot"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:23
 msgid "Show information about Evolution"
 msgstr "Apresentar informação sobre o Evolution"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:24
+msgid "Side _Bar"
+msgstr "_Barra Lateral"
+
+#: ../ui/evolution.xml.h:25
+msgid "Status _Bar"
+msgstr "_Barra de Estados"
+
+#: ../ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "Enviar um Relatório de Erro"
 
@@ -18842,79 +19929,75 @@ msgstr "Enviar um Relatório de Erro"
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:31
 msgid "Submit _Bug Report"
 msgstr "Enviar um Relatório de _Erro"
 
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:32
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar um relatório de erro utilizando o Bug Buddy"
 
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "Alternar se estamos ou não a trabalhar online."
 
-#: ../ui/evolution.xml.h:31
+#: ../ui/evolution.xml.h:34
 msgid "Tool_bar"
 msgstr "_Barra de ferramentas"
 
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:35
 msgid "Tool_bar style"
 msgstr "Estilo da _barra de ferramentas"
 
-#: ../ui/evolution.xml.h:33
-msgid "_About Evolution..."
-msgstr "_Sobre o Evolution..."
+#: ../ui/evolution.xml.h:36
+msgid "View/Hide the Side Bar"
+msgstr "Apresentar/Esconder a Barra Lateral"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:37
+msgid "View/Hide the Status Bar"
+msgstr "Apresentar/Esconder a Barra de Estados"
+
+#: ../ui/evolution.xml.h:38
+msgid "_About"
+msgstr "_Sobre"
+
+#: ../ui/evolution.xml.h:39
 msgid "_Close Window"
 msgstr "_Fechar a Janela"
 
-#: ../ui/evolution.xml.h:37
-msgid "_Help"
-msgstr "_Ajuda"
+#: ../ui/evolution.xml.h:42
+msgid "_Forget Passwords"
+msgstr "Es_quecer as Senhas"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:44
 msgid "_Hide buttons"
 msgstr "_Esconder os botões"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:45
 msgid "_Icons only"
 msgstr "Apenas í_cones"
 
-#: ../ui/evolution.xml.h:40
-msgid "_Import..."
-msgstr "_Importar..."
-
-#: ../ui/evolution.xml.h:41
-msgid "_New"
-msgstr "_Novo"
-
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:47
 msgid "_Quick Reference"
 msgstr "_Referência Rápida"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:48
 msgid "_Quit"
 msgstr "_Sair"
 
-#: ../ui/evolution.xml.h:44
-msgid "_Send / Receive"
-msgstr "_Enviar / Receber"
-
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:49
 msgid "_Switcher Appearance"
 msgstr "Aparência do _Alternador"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:50
 msgid "_Synchronization Options..."
 msgstr "Opções de _Sincronização..."
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:51
 msgid "_Text only"
 msgstr "Apenas _texto"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:53
 msgid "_Window"
 msgstr "_Janela"
 
@@ -18974,6 +20057,10 @@ msgstr "Por _Marca de Dar Seguimento"
 msgid "_Messages"
 msgstr "_Mensagens"
 
+#: ../views/memos/galview.xml.h:1
+msgid "_Memos"
+msgstr "_Memos"
+
 #: ../views/tasks/galview.xml.h:1
 msgid "With _Due Date"
 msgstr "Com Data de _Término"
@@ -18982,8 +20069,8 @@ msgstr "Com Data de _Término"
 msgid "With _Status"
 msgstr "Com _Estado"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:195
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:637
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:642
 msgid "UTC"
 msgstr "UTC"
 
@@ -19039,9 +20126,9 @@ msgid "_Edit..."
 msgstr "_Editar..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1845
-#: ../widgets/table/e-table-scrolled.c:224
-#: ../widgets/table/e-table-scrolled.c:225
+#: ../widgets/table/e-table-header-item.c:1839
+#: ../widgets/table/e-table-scrolled.c:222
+#: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
 msgstr "Tabela"
 
@@ -19061,9 +20148,24 @@ msgstr "_Criar uma nova vista"
 msgid "_Replace existing view"
 msgstr "_Substituir a vista existente"
 
+#. bonobo displays this string so it must be in locale
+#: ../widgets/menus/gal-view-instance.c:587
+#: ../widgets/menus/gal-view-menus.c:350
+msgid "Custom View"
+msgstr "Vista Personalizada"
+
+#: ../widgets/menus/gal-view-instance.c:588
+msgid "Save Custom View"
+msgstr "Gravar a Vista Personalizada"
+
+#: ../widgets/menus/gal-view-instance.c:592
+#: ../widgets/menus/gal-view-menus.c:372
+msgid "Define Views..."
+msgstr "Definir as Vistas..."
+
 #: ../widgets/menus/gal-view-menus.c:291
-msgid "_Current View"
-msgstr "Vista A_ctual"
+msgid "C_urrent View"
+msgstr "Vista Act_ual"
 
 #: ../widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View..."
@@ -19091,79 +20193,75 @@ msgstr "Tipo de vista:"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:415
+#: ../widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "STQQSSD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1097
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
-msgid "Previous Button"
-msgstr "Botão Anterior"
-
 #: ../widgets/misc/e-calendar.c:226
 msgid "Month Calendar"
 msgstr "Calendário do Mês"
 
-#: ../widgets/misc/e-canvas-background.c:456
-#: ../widgets/misc/e-canvas-background.c:457 ../widgets/text/e-entry.c:1284
-#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3540
-#: ../widgets/text/e-text.c:3541
+#: ../widgets/misc/e-canvas-background.c:457
+#: ../widgets/misc/e-canvas-background.c:458 ../widgets/text/e-entry.c:1284
+#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3563
+#: ../widgets/text/e-text.c:3564
 msgid "Fill color"
 msgstr "Cor de enchimento"
 
-#: ../widgets/misc/e-canvas-background.c:463
 #: ../widgets/misc/e-canvas-background.c:464
-#: ../widgets/misc/e-canvas-background.c:470
-#: ../widgets/misc/e-canvas-background.c:471 ../widgets/text/e-entry.c:1291
+#: ../widgets/misc/e-canvas-background.c:465
+#: ../widgets/misc/e-canvas-background.c:471
+#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-entry.c:1291
 #: ../widgets/text/e-entry.c:1292 ../widgets/text/e-entry.c:1298
-#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3547
-#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3555
-#: ../widgets/text/e-text.c:3556
+#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3578
+#: ../widgets/text/e-text.c:3579
 msgid "GDK fill color"
 msgstr "Cor GDK de enchimento"
 
-#: ../widgets/misc/e-canvas-background.c:477
-#: ../widgets/misc/e-canvas-background.c:478 ../widgets/text/e-entry.c:1305
-#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3562
-#: ../widgets/text/e-text.c:3563
+#: ../widgets/misc/e-canvas-background.c:478
+#: ../widgets/misc/e-canvas-background.c:479 ../widgets/text/e-entry.c:1305
+#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3585
+#: ../widgets/text/e-text.c:3586
 msgid "Fill stipple"
 msgstr "Textura de enchimento"
 
-#: ../widgets/misc/e-canvas-background.c:484
 #: ../widgets/misc/e-canvas-background.c:485
+#: ../widgets/misc/e-canvas-background.c:486
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:491
 #: ../widgets/misc/e-canvas-background.c:492
+#: ../widgets/misc/e-canvas-background.c:493
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:498
 #: ../widgets/misc/e-canvas-background.c:499
+#: ../widgets/misc/e-canvas-background.c:500
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:505
 #: ../widgets/misc/e-canvas-background.c:506
+#: ../widgets/misc/e-canvas-background.c:507
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1430
-#: ../widgets/table/e-table-group-container.c:978
+#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1429
+#: ../widgets/table/e-table-group-container.c:974
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3005
+#: ../widgets/table/e-table-item.c:3015
 msgid "Minimum width"
 msgstr "Largura mínima"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1431
-#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1430
+#: ../widgets/table/e-table-group-container.c:975
 #: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-item.c:3006
+#: ../widgets/table/e-table-item.c:3016
 msgid "Minimum Width"
 msgstr "Largura Mínima"
 
@@ -19172,11 +20270,11 @@ msgstr "Largura Mínima"
 msgid "Spacing"
 msgstr "Espaçamento"
 
-#: ../widgets/misc/e-cell-date-edit.c:232 ../widgets/misc/e-dateedit.c:451
+#: ../widgets/misc/e-cell-date-edit.c:233 ../widgets/misc/e-dateedit.c:461
 msgid "Now"
 msgstr "Agora"
 
-#: ../widgets/misc/e-cell-date-edit.c:801
+#: ../widgets/misc/e-cell-date-edit.c:793
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "A hora tem de ser no formato: %s"
@@ -19185,121 +20283,130 @@ 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/misc/e-charset-picker.c:63
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Baltic"
 msgstr "Báltico"
 
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Central European"
 msgstr "Europeu Central"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Chinese"
 msgstr "Chinês"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Cyrillic"
 msgstr "Cirílico"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Greek"
 msgstr "Grego"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Hebrew"
 msgstr "Hebreu"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Japanese"
 msgstr "Japonês"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:71
 msgid "Korean"
 msgstr "Coreano"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:72
+msgid "Thai"
+msgstr "Tailandês"
+
+#: ../widgets/misc/e-charset-picker.c:73
 msgid "Turkish"
 msgstr "Turco"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:74
 msgid "Unicode"
 msgstr "Unicode"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:75
 msgid "Western European"
 msgstr "Europeu Ocidental"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:76
 msgid "Western European, New"
 msgstr "Europeu Ocidental, Novo"
 
-#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
-#: ../widgets/misc/e-charset-picker.c:93
+#: ../widgets/misc/e-charset-picker.c:93 ../widgets/misc/e-charset-picker.c:94
+#: ../widgets/misc/e-charset-picker.c:95
 msgid "Traditional"
 msgstr "Tradicional"
 
-#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
 #: ../widgets/misc/e-charset-picker.c:96 ../widgets/misc/e-charset-picker.c:97
+#: ../widgets/misc/e-charset-picker.c:98 ../widgets/misc/e-charset-picker.c:99
 msgid "Simplified"
 msgstr "Simplificado"
 
-#: ../widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:102
 msgid "Ukrainian"
 msgstr "Ucraniano"
 
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:105
 msgid "Visual"
 msgstr "Visual"
 
-#: ../widgets/misc/e-charset-picker.c:171
+#: ../widgets/misc/e-charset-picker.c:174
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Conjunto de caracteres desconhecido: %s"
 
-#: ../widgets/misc/e-charset-picker.c:216
-#: ../widgets/misc/e-charset-picker.c:479
+#: ../widgets/misc/e-charset-picker.c:219
 msgid "Character Encoding"
 msgstr "Codificação de Caracteres"
 
-#: ../widgets/misc/e-charset-picker.c:231
+#: ../widgets/misc/e-charset-picker.c:234
 msgid "Enter the character set to use"
 msgstr "Introduza o conjunto de caracteres a utilizar"
 
-#: ../widgets/misc/e-charset-picker.c:338
+#: ../widgets/misc/e-charset-picker.c:341
 msgid "Other..."
 msgstr "Outro..."
 
+#: ../widgets/misc/e-charset-picker.c:482
+msgid "Ch_aracter Encoding"
+msgstr "Codificação de C_aracteres"
+
 #: ../widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: ../widgets/misc/e-dateedit.c:316
-msgid "Date and Time Entry"
-msgstr "Entrada de Data & Hora"
+#: ../widgets/misc/e-dateedit.c:321
+msgid "Date and Time"
+msgstr "Data e Hora"
 
-#: ../widgets/misc/e-dateedit.c:335
+#: ../widgets/misc/e-dateedit.c:340
 msgid "Text entry to input date"
 msgstr "Entrada de texto para introduzir a data"
 
-#: ../widgets/misc/e-dateedit.c:336
-msgid "Text Date Entry"
-msgstr "Entrada de Texto de Data"
-
-#: ../widgets/misc/e-dateedit.c:353
+#: ../widgets/misc/e-dateedit.c:362
 msgid "Click this button to show a calendar"
 msgstr "Prima este botão para apresentar um calendário"
 
-#: ../widgets/misc/e-dateedit.c:354
-msgid "Date Button"
-msgstr "Botão de Data"
-
-#: ../widgets/misc/e-dateedit.c:374
+#: ../widgets/misc/e-dateedit.c:384
 msgid "Combo box to select time"
 msgstr "Caixa de selecção para escolher a hora"
 
-#: ../widgets/misc/e-dateedit.c:375
-msgid "Time Combo Box"
-msgstr "Caixa de Selecção de Hora"
+#: ../widgets/misc/e-dateedit.c:385
+msgid "Time"
+msgstr "Hora"
+
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: ../widgets/misc/e-dateedit.c:1436 ../widgets/misc/e-dateedit.c:1763
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: ../widgets/misc/e-dateedit.c:1439 ../widgets/misc/e-dateedit.c:1766
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
 
 #: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
@@ -19338,11 +20445,11 @@ msgid "A widget to display in place of the usual expander label"
 msgstr ""
 "Um widget para apresentar em substituição da normal etiqueta de expansor"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3318
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "Tamanho do Expansor"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3319
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "Tamanho da seta de expansão"
 
@@ -19354,16 +20461,21 @@ msgstr "Espaçamento do Indicador"
 msgid "Spacing around expander arrow"
 msgstr "Espaço em torno da seta de expansão"
 
-#: ../widgets/misc/e-filter-bar.c:195
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:163
+msgid "Advanced Search"
+msgstr "Procura Avançada"
+
+#: ../widgets/misc/e-filter-bar.c:202
 msgid "_Searches"
 msgstr "_Procuras"
 
-#: ../widgets/misc/e-filter-bar.c:197
-msgid "Search Editor"
-msgstr "Editor de Procuras"
+#: ../widgets/misc/e-filter-bar.c:204
+msgid "Searches"
+msgstr "Procuras"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:220
+#: ../widgets/misc/e-filter-bar.c:227
 msgid "Save Search"
 msgstr "Gravar a Procura"
 
@@ -19383,11 +20495,11 @@ msgstr "Procura _Avançada..."
 msgid "Choose Image"
 msgstr "Seleccione a Imagem"
 
-#: ../widgets/misc/e-map.c:647
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "Mapa Mundi"
 
-#: ../widgets/misc/e-map.c:649
+#: ../widgets/misc/e-map.c:629
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should select the timezone from the below combo box instead."
@@ -19408,55 +20520,55 @@ msgstr "Sincronizar os Registos Privados:"
 msgid "Sync Categories:"
 msgstr "Categorias de Sincronização:"
 
-#: ../widgets/misc/e-reflow.c:1452 ../widgets/misc/e-reflow.c:1453
+#: ../widgets/misc/e-reflow.c:1451 ../widgets/misc/e-reflow.c:1452
 msgid "Empty message"
 msgstr "Mensagem vazia"
 
-#: ../widgets/misc/e-reflow.c:1459 ../widgets/misc/e-reflow.c:1460
+#: ../widgets/misc/e-reflow.c:1458 ../widgets/misc/e-reflow.c:1459
 msgid "Reflow model"
 msgstr "Modelo de refluxo"
 
-#: ../widgets/misc/e-reflow.c:1466 ../widgets/misc/e-reflow.c:1467
+#: ../widgets/misc/e-reflow.c:1465 ../widgets/misc/e-reflow.c:1466
 msgid "Column width"
 msgstr "Largura da coluna"
 
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:345
-msgid "Search Text Entry"
-msgstr "Entrada do Texto da Procura"
+#: ../widgets/misc/e-search-bar.c:371
+msgid "Search"
+msgstr "Procurar"
 
-#: ../widgets/misc/e-search-bar.c:549
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
 msgstr "_Procurar"
 
-#: ../widgets/misc/e-search-bar.c:555
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "Procurar _Agora"
 
-#: ../widgets/misc/e-search-bar.c:556 ../widgets/misc/e-search-bar.c:943
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "_Limpar"
 
-#: ../widgets/misc/e-search-bar.c:647
+#: ../widgets/misc/e-search-bar.c:686
 msgid "Search Type"
 msgstr "Tipo de Procura"
 
-#: ../widgets/misc/e-search-bar.c:851
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "ID de Item"
 
-#: ../widgets/misc/e-search-bar.c:858
+#: ../widgets/misc/e-search-bar.c:897
 msgid "Subitem ID"
 msgstr "ID de Subitem"
 
-#: ../widgets/misc/e-search-bar.c:865 ../widgets/text/e-entry.c:1249
-#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3462
-#: ../widgets/text/e-text.c:3463
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
+#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
+#: ../widgets/text/e-text.c:3486
 msgid "Text"
 msgstr "Texto"
 
-#: ../widgets/misc/e-search-bar.c:945
+#: ../widgets/misc/e-search-bar.c:984
 msgid "Find _Now"
 msgstr "Procurar _Agora"
 
@@ -19482,7 +20594,7 @@ msgstr "Modo de Selecção"
 msgid "Cursor Mode"
 msgstr "Modo de Cursor"
 
-#: ../widgets/misc/e-send-options.c:521
+#: ../widgets/misc/e-send-options.c:522
 msgid "When de_leted:"
 msgstr "Ao apa_gar:"
 
@@ -19561,21 +20673,21 @@ msgstr ""
 "Reduzida"
 
 #: ../widgets/misc/e-send-options.glade.h:23
-msgid "W_ithin"
-msgstr "_Entre"
-
-#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When acce_pted:"
 msgstr "_Quando aceite:"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When co_mpleted:"
 msgstr "Quando ter_minada:"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When decli_ned:"
 msgstr "Qua_ndo recusada:"
 
+#: ../widgets/misc/e-send-options.glade.h:26
+msgid "Wi_thin"
+msgstr "_Entre"
+
 #: ../widgets/misc/e-send-options.glade.h:27
 msgid "_After:"
 msgstr "_Após:"
@@ -19619,8 +20731,8 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% terminado)"
 
 #: ../widgets/misc/e-url-entry.c:107
-msgid "click here to go to url"
-msgstr "clique aqui para ir para o url"
+msgid "Click here to go to URL"
+msgstr "Clique aqui para ir para o URL"
 
 #: ../widgets/misc/gal-categories.glade.h:2
 msgid "Edit Master Category List..."
@@ -19658,23 +20770,23 @@ msgstr "Coluna com Foco"
 msgid "Unselected Column"
 msgstr "Coluna Des-seleccionada"
 
-#: ../widgets/table/e-cell-text.c:1740
+#: ../widgets/table/e-cell-text.c:1749
 msgid "Strikeout Column"
 msgstr "Coluna Riscada"
 
-#: ../widgets/table/e-cell-text.c:1747
+#: ../widgets/table/e-cell-text.c:1756
 msgid "Underline Column"
 msgstr "Sublinhar Coluna"
 
-#: ../widgets/table/e-cell-text.c:1754
+#: ../widgets/table/e-cell-text.c:1763
 msgid "Bold Column"
 msgstr "Coluna em Negrito"
 
-#: ../widgets/table/e-cell-text.c:1761
+#: ../widgets/table/e-cell-text.c:1770
 msgid "Color Column"
 msgstr "Coluna Colorida"
 
-#: ../widgets/table/e-cell-text.c:1775
+#: ../widgets/table/e-cell-text.c:1784
 msgid "BG Color Column"
 msgstr "Cor de Fundo da Coluna"
 
@@ -19794,16 +20906,16 @@ msgid "_Show these fields in order:"
 msgstr "A_presentar estes campos por ordem:"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
-#: ../widgets/table/e-table-field-chooser-item.c:646
-#: ../widgets/table/e-table-field-chooser.c:79
-#: ../widgets/table/e-table-header-item.c:1810
+#: ../widgets/table/e-table-field-chooser-item.c:635
+#: ../widgets/table/e-table-field-chooser.c:77
+#: ../widgets/table/e-table-header-item.c:1804
 msgid "DnD code"
 msgstr "Código de Não Perturbar"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
-#: ../widgets/table/e-table-field-chooser-item.c:653
-#: ../widgets/table/e-table-field-chooser.c:86
-#: ../widgets/table/e-table-header-item.c:1824
+#: ../widgets/table/e-table-field-chooser-item.c:642
+#: ../widgets/table/e-table-field-chooser.c:84
+#: ../widgets/table/e-table-header-item.c:1818
 msgid "Full Header"
 msgstr "Cabeçalho Completo"
 
@@ -19823,201 +20935,198 @@ msgstr ""
 "Para adicionar uma coluna à sua tabela, arraste-a\n"
 "para o local onde a deseja."
 
-#: ../widgets/table/e-table-group-container.c:350
+#: ../widgets/table/e-table-group-container.c:346
 #, c-format
 msgid "%s : %s (%d item)"
 msgstr "%s : %s (%d item)"
 
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:347
 #, c-format
 msgid "%s : %s (%d items)"
 msgstr "%s : %s (%d itens)"
 
-#: ../widgets/table/e-table-group-container.c:356
+#: ../widgets/table/e-table-group-container.c:352
 #, c-format
 msgid "%s (%d item)"
 msgstr "%s (%d item)"
 
-#: ../widgets/table/e-table-group-container.c:357
+#: ../widgets/table/e-table-group-container.c:353
 #, c-format
 msgid "%s (%d items)"
 msgstr "%s (%d itens)"
 
-#: ../widgets/table/e-table-group-container.c:901
-#: ../widgets/table/e-table-group-container.c:902
+#: ../widgets/table/e-table-group-container.c:897
+#: ../widgets/table/e-table-group-container.c:898
 #: ../widgets/table/e-table-group-leaf.c:573
 #: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2963 ../widgets/table/e-table-item.c:2964
+#: ../widgets/table/e-table-item.c:2973 ../widgets/table/e-table-item.c:2974
 msgid "Alternating Row Colors"
 msgstr "Cores de Linhas Alternadas"
 
-#: ../widgets/table/e-table-group-container.c:908
-#: ../widgets/table/e-table-group-container.c:909
+#: ../widgets/table/e-table-group-container.c:904
+#: ../widgets/table/e-table-group-container.c:905
 #: ../widgets/table/e-table-group-leaf.c:580
 #: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2970 ../widgets/table/e-table-item.c:2971
-#: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
+#: ../widgets/table/e-table-item.c:2980 ../widgets/table/e-table-item.c:2981
+#: ../widgets/table/e-tree.c:3265 ../widgets/table/e-tree.c:3266
 msgid "Horizontal Draw Grid"
 msgstr "Grelha Desenhada Horizontalmente"
 
-#: ../widgets/table/e-table-group-container.c:915
-#: ../widgets/table/e-table-group-container.c:916
+#: ../widgets/table/e-table-group-container.c:911
+#: ../widgets/table/e-table-group-container.c:912
 #: ../widgets/table/e-table-group-leaf.c:587
 #: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2977 ../widgets/table/e-table-item.c:2978
-#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
+#: ../widgets/table/e-table-item.c:2987 ../widgets/table/e-table-item.c:2988
+#: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
 msgid "Vertical Draw Grid"
 msgstr "Grelha Desenhada Verticalmente"
 
-#: ../widgets/table/e-table-group-container.c:922
-#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:918
+#: ../widgets/table/e-table-group-container.c:919
 #: ../widgets/table/e-table-group-leaf.c:594
 #: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2984 ../widgets/table/e-table-item.c:2985
-#: ../widgets/table/e-tree.c:3283 ../widgets/table/e-tree.c:3284
+#: ../widgets/table/e-table-item.c:2994 ../widgets/table/e-table-item.c:2995
+#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
 msgid "Draw focus"
 msgstr "Desenhar foco"
 
-#: ../widgets/table/e-table-group-container.c:929
-#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:925
+#: ../widgets/table/e-table-group-container.c:926
 #: ../widgets/table/e-table-group-leaf.c:601
 #: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:2991 ../widgets/table/e-table-item.c:2992
+#: ../widgets/table/e-table-item.c:3001 ../widgets/table/e-table-item.c:3002
 msgid "Cursor mode"
 msgstr "Modo do cursor"
 
-#: ../widgets/table/e-table-group-container.c:936
-#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:932
+#: ../widgets/table/e-table-group-container.c:933
 #: ../widgets/table/e-table-group-leaf.c:615
 #: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2956 ../widgets/table/e-table-item.c:2957
+#: ../widgets/table/e-table-item.c:2966 ../widgets/table/e-table-item.c:2967
 msgid "Selection model"
 msgstr "Modelo de selecção"
 
-#: ../widgets/table/e-table-group-container.c:943
-#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-container.c:940
 #: ../widgets/table/e-table-group-leaf.c:608
 #: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:2998 ../widgets/table/e-table-item.c:2999
-#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3265
-#: ../widgets/table/e-tree.c:3266
+#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table.c:3301 ../widgets/table/e-tree.c:3259
+#: ../widgets/table/e-tree.c:3260
 msgid "Length Threshold"
 msgstr "Tolerância de Comprimento"
 
-#: ../widgets/table/e-table-group-container.c:950
-#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-container.c:947
 #: ../widgets/table/e-table-group-leaf.c:650
 #: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
-#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3297
-#: ../widgets/table/e-tree.c:3298
+#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
+#: ../widgets/table/e-table.c:3308 ../widgets/table/e-tree.c:3291
+#: ../widgets/table/e-tree.c:3292
 msgid "Uniform row height"
 msgstr "Altura de linha uniforme"
 
-#: ../widgets/table/e-table-group-container.c:957
-#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:953
+#: ../widgets/table/e-table-group-container.c:954
 #: ../widgets/table/e-table-group-leaf.c:643
 #: ../widgets/table/e-table-group-leaf.c:644
 msgid "Frozen"
 msgstr "Estático"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1466
 msgid "Customize Current View"
 msgstr "Personalizar a Vista Actual"
 
-#: ../widgets/table/e-table-header-item.c:1492
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Sort Ascending"
 msgstr "Ordenação Ascendente"
 
-#: ../widgets/table/e-table-header-item.c:1493
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Sort Descending"
 msgstr "Ordenação Descendente"
 
-#: ../widgets/table/e-table-header-item.c:1494
+#: ../widgets/table/e-table-header-item.c:1488
 msgid "Unsort"
 msgstr "Não Ordenar"
 
-#: ../widgets/table/e-table-header-item.c:1496
+#: ../widgets/table/e-table-header-item.c:1490
 msgid "Group By This Field"
 msgstr "Agrupar Por Este Campo"
 
-#: ../widgets/table/e-table-header-item.c:1497
+#: ../widgets/table/e-table-header-item.c:1491
 msgid "Group By Box"
 msgstr "Agrupar Por Caixa"
 
-#: ../widgets/table/e-table-header-item.c:1499
+#: ../widgets/table/e-table-header-item.c:1493
 msgid "Remove This Column"
 msgstr "Remover Esta Coluna"
 
-#: ../widgets/table/e-table-header-item.c:1500
+#: ../widgets/table/e-table-header-item.c:1494
 msgid "Add a Column..."
 msgstr "Adicionar uma Coluna..."
 
-#: ../widgets/table/e-table-header-item.c:1502
+#: ../widgets/table/e-table-header-item.c:1496
 msgid "Alignment"
 msgstr "Alinhamento"
 
-#: ../widgets/table/e-table-header-item.c:1503
+#: ../widgets/table/e-table-header-item.c:1497
 msgid "Best Fit"
 msgstr "Melhor Ajuste"
 
-#: ../widgets/table/e-table-header-item.c:1504
+#: ../widgets/table/e-table-header-item.c:1498
 msgid "Format Columns..."
 msgstr "Formatar as Colunas..."
 
-#: ../widgets/table/e-table-header-item.c:1506
+#: ../widgets/table/e-table-header-item.c:1500
 msgid "Customize Current View..."
 msgstr "Personalizar a Vista Actual..."
 
-#: ../widgets/table/e-table-header-item.c:1817 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1811 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "Conjunto de fontes"
 
-#: ../widgets/table/e-table-header-item.c:1838
+#: ../widgets/table/e-table-header-item.c:1832
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Info de Ordenação"
 
-#: ../widgets/table/e-table-header-item.c:1852
-#: ../widgets/table/e-tree-scrolled.c:223
-#: ../widgets/table/e-tree-scrolled.c:224
+#: ../widgets/table/e-table-header-item.c:1846
+#: ../widgets/table/e-tree-scrolled.c:221
+#: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
 msgstr "Árvore"
 
-#: ../widgets/table/e-table-item.c:2942 ../widgets/table/e-table-item.c:2943
+#: ../widgets/table/e-table-item.c:2952 ../widgets/table/e-table-item.c:2953
 msgid "Table header"
 msgstr "Cabeçalho da tabela"
 
-#: ../widgets/table/e-table-item.c:2949 ../widgets/table/e-table-item.c:2950
+#: ../widgets/table/e-table-item.c:2959 ../widgets/table/e-table-item.c:2960
 msgid "Table model"
 msgstr "Modelo da tabela"
 
-#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
 msgid "Cursor row"
 msgstr "Linha do cursor"
 
-#: ../widgets/table/e-table.c:3330
-msgid "Always Search"
-msgstr "Procurar Sempre"
+#: ../widgets/table/e-table.c:3315 ../widgets/table/e-tree.c:3298
+#: ../widgets/table/e-tree.c:3299
+msgid "Always search"
+msgstr "Procurar sempre"
 
-#: ../widgets/table/e-table.c:3337
+#: ../widgets/table/e-table.c:3322
 msgid "Use click to add"
 msgstr "Utilizar clique para adicionar"
 
-#: ../widgets/table/e-tree.c:3290 ../widgets/table/e-tree.c:3291
+#: ../widgets/table/e-tree.c:3284 ../widgets/table/e-tree.c:3285
 msgid "ETree table adapter"
 msgstr "Adaptador de tabela ETree"
 
-#: ../widgets/table/e-tree.c:3304 ../widgets/table/e-tree.c:3305
-msgid "Always search"
-msgstr "Procurar sempre"
-
-#: ../widgets/table/e-tree.c:3311
+#: ../widgets/table/e-tree.c:3305
 msgid "Retro Look"
 msgstr "Aspecto Retro"
 
-#: ../widgets/table/e-tree.c:3312
+#: ../widgets/table/e-tree.c:3306
 msgid "Draw lines and +/- expanders."
 msgstr "Desenhar linhas e expansores +/-."
 
@@ -20034,7 +21143,7 @@ msgid "This should test the minicard canvas item"
 msgstr "Isto deverá testar o item de tela de minicartão"
 
 #: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
+#: ../widgets/text/e-text.c:3478 ../widgets/text/e-text.c:3479
 msgid "Event Processor"
 msgstr "Processador de Eventos"
 
@@ -20047,57 +21156,57 @@ msgid "GDKFont"
 msgstr "GDKFont"
 
 #: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3491 ../widgets/text/e-text.c:3492
+#: ../widgets/text/e-text.c:3514 ../widgets/text/e-text.c:3515
 msgid "Justification"
 msgstr "Alinhamento"
 
 #: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3591 ../widgets/text/e-text.c:3592
+#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
 msgid "Use ellipsis"
 msgstr "Utilizar elípticas"
 
 #: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3598 ../widgets/text/e-text.c:3599
+#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
 msgid "Ellipsis"
 msgstr "Elípticas"
 
 #: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3605 ../widgets/text/e-text.c:3606
+#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
 msgid "Line wrap"
 msgstr "Quebra linha"
 
 #: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3612 ../widgets/text/e-text.c:3613
+#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
 msgid "Break characters"
 msgstr "Caracteres de quebra"
 
 #: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3619 ../widgets/text/e-text.c:3620
+#: ../widgets/text/e-text.c:3642 ../widgets/text/e-text.c:3643
 msgid "Max lines"
 msgstr "Linhas máx."
 
 #: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3648 ../widgets/text/e-text.c:3649
+#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
 msgid "Allow newlines"
 msgstr "Permitir novas linhas"
 
 #: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3641 ../widgets/text/e-text.c:3642
+#: ../widgets/text/e-text.c:3664 ../widgets/text/e-text.c:3665
 msgid "Draw borders"
 msgstr "Desenhar margens"
 
 #: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3655 ../widgets/text/e-text.c:3656
+#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
 msgid "Draw background"
 msgstr "Desenhar fundo"
 
 #: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3662 ../widgets/text/e-text.c:3663
+#: ../widgets/text/e-text.c:3685 ../widgets/text/e-text.c:3686
 msgid "Draw button"
 msgstr "Desenhar botão"
 
 #: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3669 ../widgets/text/e-text.c:3670
+#: ../widgets/text/e-text.c:3692 ../widgets/text/e-text.c:3693
 msgid "Cursor position"
 msgstr "Posição do cursor"
 
@@ -20105,58 +21214,449 @@ msgstr "Posição do cursor"
 msgid "Emulate label resize"
 msgstr "Emular redimensionamento da etiqueta"
 
-#: ../widgets/text/e-text.c:2696
+#: ../widgets/text/e-text.c:2721
 msgid "Input Methods"
 msgstr "Métodos de Introdução"
 
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
+#: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
 msgid "Bold"
 msgstr "Negrito"
 
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
+#: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
 msgid "Strikeout"
 msgstr "Riscada"
 
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
+#: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
 msgid "Anchor"
 msgstr "Âncora"
 
-#: ../widgets/text/e-text.c:3498 ../widgets/text/e-text.c:3499
+#: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3522
 msgid "Clip Width"
 msgstr "Cortar à Largura"
 
-#: ../widgets/text/e-text.c:3505 ../widgets/text/e-text.c:3506
+#: ../widgets/text/e-text.c:3528 ../widgets/text/e-text.c:3529
 msgid "Clip Height"
 msgstr "Cortar à Altura"
 
-#: ../widgets/text/e-text.c:3512 ../widgets/text/e-text.c:3513
+#: ../widgets/text/e-text.c:3535 ../widgets/text/e-text.c:3536
 msgid "Clip"
 msgstr "Cortar"
 
-#: ../widgets/text/e-text.c:3519 ../widgets/text/e-text.c:3520
+#: ../widgets/text/e-text.c:3542 ../widgets/text/e-text.c:3543
 msgid "Fill clip rectangle"
 msgstr "Encher rectângulo de corte"
 
-#: ../widgets/text/e-text.c:3526 ../widgets/text/e-text.c:3527
+#: ../widgets/text/e-text.c:3549 ../widgets/text/e-text.c:3550
 msgid "X Offset"
 msgstr "Deslocamento X"
 
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3534
+#: ../widgets/text/e-text.c:3556 ../widgets/text/e-text.c:3557
 msgid "Y Offset"
 msgstr "Deslocamento Y"
 
-#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3592 ../widgets/text/e-text.c:3593
 msgid "Text width"
 msgstr "Largura do texto"
 
-#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
+#: ../widgets/text/e-text.c:3599 ../widgets/text/e-text.c:3600
 msgid "Text height"
 msgstr "Altura do texto"
 
-#: ../widgets/text/e-text.c:3676 ../widgets/text/e-text.c:3677
+#: ../widgets/text/e-text.c:3699 ../widgets/text/e-text.c:3700
 msgid "IM Context"
 msgstr "Contexto IM"
 
-#: ../widgets/text/e-text.c:3683 ../widgets/text/e-text.c:3684
+#: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
 msgid "Handle Popup"
 msgstr "Manípulo de Popup"
+
+#~ msgid "Addressbook"
+#~ msgstr "Livro de Endereços"
+
+#~ msgid ""
+#~ "Selecting this option means that Evolution will only try to use SSL/TLS "
+#~ "if you are in a insecure environment. For example, if you and your LDAP "
+#~ "server are behind a firewall at work, then Evolution doesn't need to use "
+#~ "SSL/TLS because your connection is already secure."
+#~ msgstr ""
+#~ "Seleccionar esta opção significa que o Evolution apenas tentará utilizar "
+#~ "SSL/TLS se você estiver num ambiente inseguro. Por exemplo, se o seu "
+#~ "computador e o servidor LDAP estiverem por trás de uma firewall no "
+#~ "emprego, o Evolution não necessita de utilizar SSL/TLS pois a sua ligação "
+#~ "já é segura."
+
+#~ msgid "Advanced..."
+#~ msgstr "Avançado..."
+
+#~ msgid "Select target addressbook."
+#~ msgstr "Seleccionar o livro de endereços de destino."
+
+#~ msgid "(none)"
+#~ msgstr "(nenhum)"
+
+#~ msgid "Primary Email"
+#~ msgstr "Email Principal"
+
+#~ msgid "Select an Action"
+#~ msgstr "Seleccionar uma Acção"
+
+#~ msgid "Create a new contact \"%s\""
+#~ msgstr "Criar um novo contacto \"%s\""
+
+#~ msgid "Add address to existing contact \"%s\""
+#~ msgstr "Adicionar endereço ao contacto já existente \"%s\""
+
+#~ msgid "Merge E-Mail Address"
+#~ msgstr "Juntar Endereço de Email"
+
+#~ msgid "Discard Changes"
+#~ msgstr "Descartar as Alterações"
+
+#~ msgid ""
+#~ "<big><b>%s</b></big>\n"
+#~ "%s until %s"
+#~ msgstr ""
+#~ "<big><b>%s</b></big>\n"
+#~ "%s até %s"
+
+#~ msgid "description of appointment"
+#~ msgstr "descrição do compromisso"
+
+#~ msgid "Dismiss"
+#~ msgstr "Desactivar"
+
+#~ msgid "Dismiss All"
+#~ msgstr "Desactivar Todas"
+
+#~ msgid ""
+#~ "Alarm on %s\n"
+#~ "%s\n"
+#~ "Starting at %s\n"
+#~ "Ending at %s"
+#~ msgstr ""
+#~ "Alarme a %s\n"
+#~ "%s\n"
+#~ "Iniciar a %s\n"
+#~ "Terminar a %s"
+
+#~ msgid "Remove"
+#~ msgstr "Remover"
+
+#~ msgid "Don't Remove"
+#~ msgstr "Não Apagar"
+
+#~ msgid "05 minutes"
+#~ msgstr "05 minutos"
+
+#~ msgid "10 minutes"
+#~ msgstr "10 minutos"
+
+#~ msgid "15 minutes"
+#~ msgstr "15 minutos"
+
+#~ msgid "30 minutes"
+#~ msgstr "30 minutos"
+
+#~ msgid "60 minutes"
+#~ msgstr "60 minutos"
+
+#~ msgid "<b>Alerts</b>"
+#~ msgstr "<b>Alertas</b>"
+
+#~ msgid "<b>Default Free/Busy Server</b>"
+#~ msgstr "<b>Servidor por Omissão de Livre/Ocupado</b>"
+
+#~ msgid "<b>General</b>"
+#~ msgstr "<b>Geral</b>"
+
+#~ msgid "<b>Publishing</b>"
+#~ msgstr "<b>Publicação</b>"
+
+#~ msgid "<b>Task List</b>"
+#~ msgstr "<b>Lista de Tarefas</b>"
+
+#~ msgid "<b>Time</b>"
+#~ msgstr "<b>Hora</b>"
+
+#~ msgid "<b>Work Week</b>"
+#~ msgstr "<b>Semana de Trabalho</b>"
+
+#~ msgid "Calendar and Tasks Settings"
+#~ msgstr "Configurações do Calendário e Tarefas"
+
+#~ msgid "Color for overdue tasks"
+#~ msgstr "Cor para as tarefas atrasadas"
+
+#~ msgid "Color for tasks due today"
+#~ msgstr "Cor para as tarefas cujo prazo termina hoje"
+
+#~ msgid "Days"
+#~ msgstr "Dias"
+
+#~ msgid "Hours"
+#~ msgstr "Horas"
+
+#~ msgid "Minutes"
+#~ msgstr "Minutos"
+
+#~ msgid "_Add URL"
+#~ msgstr "_Adicionar URL"
+
+#~ msgid "option menu to choose reminder units"
+#~ msgstr "menu de opções onde escolher as unidades do lembrete"
+
+#~ msgid "option menu to choose time units"
+#~ msgstr "menu de opções onde escolher as unidades temporais"
+
+#~ msgid "_Attachment Bar (drop attachments here)"
+#~ msgstr "Barra de _Anexos (largar os anexos aqui)"
+
+#~ msgid "Scheduling"
+#~ msgstr "Calendarização"
+
+#~ msgid "Invitations"
+#~ msgstr "Convites"
+
+#~ msgid "<b>Basics</b>"
+#~ msgstr "<b>Básicos</b>"
+
+#~ msgid "<b>Date and Time</b>"
+#~ msgstr "<b>Data e Hora</b>"
+
+#~ msgid "<b>Send Options</b>"
+#~ msgstr "<b>Opções de Envio</b>"
+
+#~ msgid "A_ll day event"
+#~ msgstr "_Evento de dia completo"
+
+#~ msgid "Classi_fication:"
+#~ msgstr "Classi_ficação:"
+
+#~ msgid "This appointment has customized alarms"
+#~ msgstr "Este compromisso possui alarmes personalizados"
+
+#~ msgid "_Description:"
+#~ msgstr "_Descrição:"
+
+#~ msgid "<b>Dele_gatees</b>"
+#~ msgstr "<b>Dele_gados</b>"
+
+#~ msgid "<b>From:</b>"
+#~ msgstr "<b>De:</b>"
+
+#~ msgid "_Delegate To..."
+#~ msgstr "_Delegar A..."
+
+#~ msgid "Con_tacts..."
+#~ msgstr "Con_tactos..."
+
+#~ msgid "Assignment"
+#~ msgstr "Atribuição"
+
+#~ msgid "Task Table"
+#~ msgstr "Tabela da Tarefa"
+
+#~ msgid "_Publish Free/Busy Information"
+#~ msgstr "_Publicar a Informação de Livre/Ocupado"
+
+#~ msgid "Removal Complete"
+#~ msgstr "Acção de Remoção Terminada"
+
+#~ msgid "Timezone Button"
+#~ msgstr "Botão de Fuso-Horário"
+
+#~ msgid "The Evolution Groupware Suite"
+#~ msgstr "O Pacote de Colaboração Evolution"
+
+#~ msgid "%a %m/%d/%Y %I:%M %p"
+#~ msgstr "%a %d/%m/%Y %I:%M %p"
+
+#~ msgid "%a %m/%d/%Y %H:%M"
+#~ msgstr "%a %d/%m/%Y %H:%M"
+
+#~ msgid "%a %m/%d/%Y %I %p"
+#~ msgstr "%a %d/%m/%Y %I %p"
+
+#~ msgid "%a %m/%d/%Y %H"
+#~ msgstr "%a %d/%m/%Y %H"
+
+#~ msgid "%m/%d/%Y %I:%M:%S %p"
+#~ msgstr "%d/%m/%Y %I:%M:%S %p"
+
+#~ msgid "%m/%d/%Y %H:%M:%S"
+#~ msgstr "%d/%m/%Y %H:%M:%S"
+
+#~ msgid "%m/%d/%Y %I:%M %p"
+#~ msgstr "%d/%m/%Y %I:%M %p"
+
+#~ msgid "%m/%d/%Y %H:%M"
+#~ msgstr "%d/%m/%Y %H:%M"
+
+#~ msgid "%m/%d/%Y %I %p"
+#~ msgstr "%d/%m/%Y %I %p"
+
+#~ msgid "%m/%d/%Y %H"
+#~ msgstr "%d/%m/%Y %H"
+
+#~ msgid "%I:%M:%S %p"
+#~ msgstr "%I:%M:%S %p"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%I %p"
+#~ msgstr "%I %p"
+
+#~ msgid "_Rule name:"
+#~ msgstr "Nome da _regra:"
+
+#~ msgid "If"
+#~ msgstr "Se"
+
+#~ msgid "Execute actions"
+#~ msgstr "Executar as acções"
+
+#~ msgid "Mail Accounts Table"
+#~ msgstr "Tabela de Contas de Email"
+
+#~ msgid "Attachment Button"
+#~ msgstr "Botão de Anexo"
+
+#~ msgid "Filters"
+#~ msgstr "Filtros"
+
+#~ msgid "Execute Command..."
+#~ msgstr "Executar um Comando..."
+
+#~ 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"
+
+#~ msgid "Path: %s, Type: %s"
+#~ msgstr "Caminho: %s, Tipo: %s"
+
+#~ msgid "Type: %s"
+#~ msgstr "Tipo: %s"
+
+#~ msgid "<span weight=\"bold\">Automatic Contacts</span>"
+#~ msgstr "<span weight=\"bold\">Contactos Automáticos</span>"
+
+#~ msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
+#~ msgstr "<span weight=\"bold\">Contactos de Mensagens Instantâneas</span>"
+
+#~ msgid "Automatic contacts"
+#~ msgstr "Contactos automáticos"
+
+#~ msgid "Exchange Connector access error."
+#~ msgstr "Erro de acesso do Conector Exchange."
+
+#~ msgid "dialog1"
+#~ msgstr "diálogo1"
+
+#~ msgid "Meetings and Tasks"
+#~ msgstr "Reuniões e Tarefas"
+
+#~ msgid "<span weight=\"bold\">Conflict Search</span>"
+#~ msgstr "<span weight=\"bold\">Procura de Conflitos</span>"
+
+#~ msgid "Plugin manager"
+#~ msgstr "Gestor de plugins"
+
+#~ msgid "Id"
+#~ msgstr "Id"
+
+#~ msgid "Path"
+#~ msgstr "Caminho"
+
+#~ msgid "Sa junk-plugin"
+#~ msgstr "Plugin de assassino de correio não solicitado"
+
+#~ msgid "learns junk messages using spamd."
+#~ msgstr "aprende a distinguir correio não solicitado utilizando o spamd."
+
+#~ msgid "Uid"
+#~ msgstr "Uid"
+
+#~ msgid "Url"
+#~ msgstr "Url"
+
+#~ msgid ""
+#~ "The suggested filename extension of this filetype (%s) is unused in the "
+#~ "chosen filename. Do you want to continue?"
+#~ msgstr ""
+#~ "A extensão de ficheiro sugerida para este tipo de ficheiro (%s) não foi "
+#~ "utilizada no nome de ficheiro indicado. Deseja prosseguir?"
+
+#~ msgid "Evolution Settings"
+#~ msgstr "Configurações do Evolution"
+
+#~ msgid "C"
+#~ msgstr "C"
+
+#~ msgid "CN"
+#~ msgstr "NC"
+
+#~ msgid "OU"
+#~ msgstr "UO"
+
+#~ msgid "O"
+#~ msgstr "O"
+
+#~ msgid "L"
+#~ msgstr "L"
+
+#~ msgid "DN"
+#~ msgstr "ND"
+
+#~ msgid "DC"
+#~ msgstr "CD"
+
+#~ msgid "ST"
+#~ msgstr "TS"
+
+#~ msgid "E"
+#~ msgstr "E"
+
+#~ msgid "_Preview Pane"
+#~ msgstr "_Painel de Antevisão"
+
+#~ msgid "_Select All"
+#~ msgstr "_Seleccionar Todos"
+
+#~ msgid "Delete this Occurrence"
+#~ msgstr "Apagar esta Ocorrência"
+
+#~ msgid "Customize My Evolution"
+#~ msgstr "Personalizar o Meu Evolution"
+
+#~ msgid "Move"
+#~ msgstr "Mover"
+
+#~ msgid "_About Evolution..."
+#~ msgstr "_Sobre o Evolution..."
+
+#~ msgid "_Send / Receive"
+#~ msgstr "_Enviar / Receber"
+
+#~ msgid "Previous Button"
+#~ msgstr "Botão Anterior"
+
+#~ msgid "Text Date Entry"
+#~ msgstr "Entrada de Texto de Data"
+
+#~ msgid "Date Button"
+#~ msgstr "Botão de Data"
+
+#~ msgid "Time Combo Box"
+#~ msgstr "Caixa de Selecção de Hora"
+
+#~ msgid "Search Text Entry"
+#~ msgstr "Entrada do Texto da Procura"
+
+#~ msgid "Always Search"
+#~ msgstr "Procurar Sempre"
author	Duarte Loreto <happyguy_pt@hotmail.com>	2006-03-11 07:39:22 +0800
committer	Duarte Loreto <dnloreto@src.gnome.org>	2006-03-11 07:39:22 +0800
commit	20708e895aba6a2644dd4dd6bc9a285c514e967d (patch)
tree	ce75d487a92f24d7a24f938283695b272dc33cee /po/pt.po
parent	f88138b2223058c78954346fe1cb711ed63badfc (diff)
download	gsoc2013-evolution-20708e895aba6a2644dd4dd6bc9a285c514e967d.tar.gz gsoc2013-evolution-20708e895aba6a2644dd4dd6bc9a285c514e967d.tar.zst gsoc2013-evolution-20708e895aba6a2644dd4dd6bc9a285c514e967d.zip