[evolution] Updated Brazilian Portuguese translation (partial)

From: Og B. Maciel <ogmaciel src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [evolution] Updated Brazilian Portuguese translation (partial)
Date: Tue, 25 Aug 2009 17:24:10 +0000 (UTC)
commit 3f623cc7d9c765f9137afe5b238fcd2ec2def6f8
Author: Og B. Maciel <ogmaciel gnome org>
Date:   Tue Aug 25 13:20:57 2009 -0400

    Updated Brazilian Portuguese translation (partial)
    (cherry picked from commit b4fe2feb65e5c8fe0b026208bfd5bd6caebcbd88)

 po/pt_BR.po |11855 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 6182 insertions(+), 5673 deletions(-)
---
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 9e3a371..28692fe 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -11,14 +11,13 @@
 # Og Maciel <ogmaciel gnome org>, 2008.
 # Leonardo Ferreira Fontenelle <leonardof gnome org>, 2008, 2009.
 # AndrÃ© Gondim <andregondim ubuntu com>, 2009
-#: ../shell/main.c:603
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-11 11:50-0300\n"
-"PO-Revision-Date: 2009-02-08 00:52-0300\n"
-"Last-Translator: Andre Gondim <andregondim ubuntu com>\n"
+"POT-Creation-Date: 2009-08-25 09:05-0400\n"
+"PO-Revision-Date: 2009-08-25 13:02-0500\n"
+"Last-Translator: Og Maciel <ogmaciel gnome org>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list gnome org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,21 +29,21 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
+#: ../a11y/addressbook/ea-minicard-view.c:178
 msgid "evolution address book"
 msgstr "catÃ¡logo de endereÃ§os do Evolution"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:208
 msgid "New Contact"
 msgstr "Novo contato"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:216
 msgid "New Contact List"
 msgstr "Nova lista de contatos"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -67,32 +66,32 @@ msgstr "Contato: "
 msgid "evolution minicard"
 msgstr "minicartÃ£o do Evolution"
 
-#: ../a11y/calendar/ea-cal-view-event.c:265
+#: ../a11y/calendar/ea-cal-view-event.c:263
 msgid "It has alarms."
 msgstr "Tem alarmes."
 
-#: ../a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has recurrences."
 msgstr "Tem recorrÃªncias."
 
-#: ../a11y/calendar/ea-cal-view-event.c:271
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It is a meeting."
 msgstr "Ã? uma reuniÃ£o."
 
-#: ../a11y/calendar/ea-cal-view-event.c:277
+#: ../a11y/calendar/ea-cal-view-event.c:275
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Evento de agenda: o resumo Ã© %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:279
+#: ../a11y/calendar/ea-cal-view-event.c:277
 msgid "Calendar Event: It has no summary."
 msgstr "Evento de agenda: nÃ£o tem resumo."
 
-#: ../a11y/calendar/ea-cal-view-event.c:299
+#: ../a11y/calendar/ea-cal-view-event.c:297
 msgid "calendar view event"
 msgstr "exibiÃ§Ã£o de evento da agenda"
 
-#: ../a11y/calendar/ea-cal-view-event.c:527
+#: ../a11y/calendar/ea-cal-view-event.c:525
 msgid "Grab Focus"
 msgstr "Capturar foco"
 
@@ -116,8 +115,8 @@ msgstr "Ir para hoje"
 msgid "Go to Date"
 msgstr "Ir para data"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:301
-#: ../a11y/calendar/ea-week-view-main-item.c:298
+#: ../a11y/calendar/ea-day-view-main-item.c:300
+#: ../a11y/calendar/ea-week-view-main-item.c:297
 msgid "a table to view and select the current time range"
 msgstr "uma tabela para ver e selecionar o intervalo de tempo vigente"
 
@@ -161,7 +160,7 @@ msgid "calendar view for one or more days"
 msgstr "exibiÃ§Ã£o de agenda para um ou mais dias"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:821
+#: ../calendar/gui/calendar-component.c:771
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -172,18 +171,18 @@ 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:189
-#: ../calendar/gui/calendar-component.c:824
-#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1601
-#: ../calendar/gui/e-week-view-main-item.c:335
+#: ../calendar/gui/calendar-component.c:774
+#: ../calendar/gui/e-day-view-top-item.c:844 ../calendar/gui/e-day-view.c:1593
+#: ../calendar/gui/e-week-view-main-item.c:368
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:191
 #: ../a11y/calendar/ea-gnome-calendar.c:196
 #: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:826
-#: ../calendar/gui/calendar-component.c:831
-#: ../calendar/gui/calendar-component.c:833
+#: ../calendar/gui/calendar-component.c:776
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:783
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -191,10 +190,10 @@ msgstr "%a %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:221
 #: ../a11y/calendar/ea-gnome-calendar.c:227
 #: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:845
-#: ../calendar/gui/calendar-component.c:852
-#: ../calendar/gui/calendar-component.c:858
-#: ../calendar/gui/calendar-component.c:860
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:802
+#: ../calendar/gui/calendar-component.c:808
+#: ../calendar/gui/calendar-component.c:810
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -204,15 +203,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:219
-#: ../calendar/gui/calendar-component.c:850
-#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1617
-#: ../calendar/gui/e-week-view-main-item.c:349
+#: ../calendar/gui/calendar-component.c:800
+#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1609
+#: ../calendar/gui/e-week-view-main-item.c:382
 msgid "%d %b"
 msgstr "%d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:245
 #: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/importers/icalendar-importer.c:782
 msgid "Gnome Calendar"
 msgstr "Agenda do GNOME"
 
@@ -224,11 +223,11 @@ msgstr "barra de pesquisa"
 msgid "evolution calendar search bar"
 msgstr "barra de pesquisa da agenda do Evolution"
 
-#: ../a11y/calendar/ea-jump-button.c:147
+#: ../a11y/calendar/ea-jump-button.c:146
 msgid "Jump button"
 msgstr "BotÃ£o de salto"
 
-#: ../a11y/calendar/ea-jump-button.c:156
+#: ../a11y/calendar/ea-jump-button.c:155
 msgid "Click here, you can find more events."
 msgstr "Clique aqui, vocÃª pode localizar mais eventos."
 
@@ -259,50 +258,50 @@ msgstr "popup"
 msgid "popup a child"
 msgstr "popup um filho"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:616
 msgid "edit"
 msgstr "editar"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:617
 msgid "begin editing this cell"
 msgstr "iniciar a ediÃ§Ã£o desta cÃ©lula"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:169
 msgid "toggle"
 msgstr "alternar"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:173
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:170
 msgid "toggle the cell"
 msgstr "alternar esta cÃ©lula"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:210
 msgid "expand"
 msgstr "expandir"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:209
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:211
 msgid "expands the row in the ETree containing this cell"
 msgstr "expandir a linha na ETree contendo esta cÃ©lula"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:216
 msgid "collapse"
 msgstr "recolher"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:215
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:217
 msgid "collapses the row in the ETree containing this cell"
 msgstr "recolhe a linha na ETree contendo esta cÃ©lula"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:121
+#: ../a11y/e-table/gal-a11y-e-cell.c:120
 msgid "Table Cell"
 msgstr "CÃ©lula de tabela"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:59
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:134
-#: ../widgets/table/e-table-click-to-add.c:580
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:58
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/e-table-click-to-add.c:578
 msgid "click to add"
 msgstr "clique para adicionar"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:68
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:67
 msgid "click"
 msgstr "clicar"
 
@@ -336,14 +335,6 @@ msgstr "Ativar padrÃ£o"
 msgid "Popup Menu"
 msgstr "Menu de contexto"
 
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "Alternar barra de anexos"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "ativado"
-
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
@@ -398,14 +389,14 @@ msgstr "NÃ£o foi possÃvel remover o catÃ¡logo de endereÃ§os."
 
 #: ../addressbook/addressbook.error.xml.h:11
 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."
+"Currently you can only access the 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 ""
-"Atualmente vocÃª pode acessar apenas o catÃ¡logo de endereÃ§os do Sistema "
-"GroupWise a partir do Evolution. Por favor, use um outro cliente de e-mail "
-"GroupWise para obter os seus contatos freqÃ¼entes do GroupWise e as pastas de "
-"contatos pessoais do GroupWise."
+"Atualmente vocÃª sÃ³ pode acessar catÃ¡logo de endereÃ§os do Sistema GroupWise a "
+"partir do Evolution. Por favor, use um outro cliente de e-mail GroupWise "
+"para obter os seus contatos freqÃ¼entes do GroupWise e as pastas de contatos "
+"pessoais do GroupWise."
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
@@ -425,7 +416,7 @@ msgstr "Falha ao autenticar-se com o servidor LDAP."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1745
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1752
 msgid "Failed to delete contact"
 msgstr "Falha ao excluir contatos"
 
@@ -582,104 +573,93 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:491
+#: ../addressbook/conduit/address-conduit.c:590
 msgid "Default Sync Address:"
 msgstr "EndereÃ§o padrÃ£o de sincronizaÃ§Ã£o:"
 
-#: ../addressbook/conduit/address-conduit.c:1521
-#: ../addressbook/conduit/address-conduit.c:1522
+#: ../addressbook/conduit/address-conduit.c:1613
+#: ../addressbook/conduit/address-conduit.c:1614
 msgid "Could not load address book"
 msgstr "NÃ£o foi possÃvel carregar o catÃ¡logo de endereÃ§os"
 
-#: ../addressbook/conduit/address-conduit.c:1599
-#: ../addressbook/conduit/address-conduit.c:1602
+#: ../addressbook/conduit/address-conduit.c:1691
+#: ../addressbook/conduit/address-conduit.c:1694
 msgid "Could not read pilot's Address application block"
 msgstr "NÃ£o foi possÃvel ler os dados do aplicativo de endereÃ§os do PDA"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#: ../addressbook/gui/component/autocompletion-config.c:173
-msgid "Autocompletion"
-msgstr "Completar automaticamente"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "C_ontacts"
 msgstr "C_ontatos"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Certificates"
 msgstr "Certificados"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configure autocomplete here"
-msgstr "Configure aqui o completamento automÃ¡tico"
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Configure contacts and autocompletion here"
+msgstr "Configure contatos e o completamento automÃ¡tico aqui"
 
-#. ensure the group name is in current locale, not read from configuration
 #. Create the contacts group
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 #: ../addressbook/gui/component/addressbook-view.c:1213
-#: ../calendar/gui/calendar-component.c:316
-#: ../calendar/gui/calendar-component.c:319 ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:582
+#: ../calendar/gui/calendar-component.c:193 ../calendar/gui/migration.c:395
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:579
 msgid "Contacts"
 msgstr "Contatos"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 msgid "Evolution Address Book"
 msgstr "CatÃ¡logo de endereÃ§os do Evolution"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 msgid "Evolution Address Book address popup"
 msgstr "Janela de endereÃ§os do catÃ¡logo de endereÃ§os do Evolution"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Address Book address viewer"
 msgstr "Visualizador de endereÃ§os do catÃ¡logo de endereÃ§os do Evolution"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Address Book card viewer"
 msgstr "Visualizador de cartÃµes do catÃ¡logo de endereÃ§os do Evolution"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Address Book component"
 msgstr "Componente do catÃ¡logo de endereÃ§os do Evolution"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution S/MIME Certificate Management Control"
 msgstr "Controle de gerenciamento de certificados S/MIME do Evolution"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution folder settings configuration control"
 msgstr "Controle de definiÃ§Ãµes das configuraÃ§Ãµes de pasta do Evolution"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Manage your S/MIME certificates here"
 msgstr "Gerencie aqui os seus certificados S/MIME"
 
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:142
-#: ../addressbook/gui/component/addressbook-component.c:146
-#: ../addressbook/gui/component/addressbook-migrate.c:500
-#: ../calendar/gui/calendar-component.c:243
-#: ../calendar/gui/calendar-component.c:247
-#: ../calendar/gui/memos-component.c:197 ../calendar/gui/memos-component.c:201
-#: ../calendar/gui/migration.c:475 ../calendar/gui/migration.c:577
-#: ../calendar/gui/migration.c:1091 ../calendar/gui/tasks-component.c:194
-#: ../calendar/gui/tasks-component.c:198 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2990
-#: ../mail/mail-component.c:316 ../mail/mail-vfolder.c:223
-#: ../mail/message-list.c:1517
+#: ../addressbook/gui/component/addressbook-component.c:97
+#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../calendar/gui/calendar-component.c:192
+#: ../calendar/gui/memos-component.c:151 ../calendar/gui/migration.c:474
+#: ../calendar/gui/migration.c:576 ../calendar/gui/migration.c:1090
+#: ../calendar/gui/tasks-component.c:148 ../mail/em-folder-tree-model.c:191
+#: ../mail/em-folder-tree-model.c:193 ../mail/em-migrate.c:2890
+#: ../mail/mail-component.c:320 ../mail/mail-vfolder.c:217
+#: ../mail/message-list.c:1515
 msgid "On This Computer"
 msgstr "Neste computador"
 
+#. Create the LDAP source group
+#: ../addressbook/gui/component/addressbook-component.c:98
+#: ../addressbook/gui/component/addressbook-migrate.c:517
+msgid "On LDAP Servers"
+msgstr "Em servidores LDAP"
+
 #. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. ensure the source name is in current locale, not read from configuration
@@ -691,146 +671,195 @@ msgstr "Neste computador"
 #. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:154
-#: ../addressbook/gui/component/addressbook-component.c:157
-#: ../addressbook/gui/component/addressbook-migrate.c:508
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: ../addressbook/gui/widgets/eab-contact-display.c:652
-#: ../calendar/gui/calendar-component.c:255
-#: ../calendar/gui/calendar-component.c:261
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memos-component.c:213
-#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
-#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:206
-#: ../calendar/gui/tasks-component.c:210 ../mail/em-migrate.c:1058
-#: ../plugins/email-custom-header/email-custom-header.c:338
+#: ../addressbook/gui/component/addressbook-component.c:135
+#: ../addressbook/gui/component/addressbook-component.c:138
+#: ../addressbook/gui/component/addressbook-migrate.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../calendar/gui/calendar-component.c:232
+#: ../calendar/gui/calendar-component.c:238
+#: ../calendar/gui/memos-component.c:189 ../calendar/gui/memos-component.c:193
+#: ../calendar/gui/migration.c:484 ../calendar/gui/migration.c:584
+#: ../calendar/gui/migration.c:1098 ../calendar/gui/tasks-component.c:186
+#: ../calendar/gui/tasks-component.c:190 ../mail/em-migrate.c:960
+#: ../plugins/email-custom-header/email-custom-header.c:337
 msgid "Personal"
 msgstr "Pessoal"
 
-#. ensure the group name is in current locale, not read from configuration
-#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:168
-#: ../addressbook/gui/component/addressbook-component.c:171
-#: ../addressbook/gui/component/addressbook-migrate.c:518
-msgid "On LDAP Servers"
-msgstr "Em servidores LDAP"
-
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:209
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Contato"
 
-#: ../addressbook/gui/component/addressbook-component.c:239
+#: ../addressbook/gui/component/addressbook-component.c:210
 msgid "Create a new contact"
 msgstr "Cria um novo contato"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:217
 msgctxt "New"
 msgid "Contact _List"
 msgstr "_Lista de contatos"
 
-#: ../addressbook/gui/component/addressbook-component.c:247
+#: ../addressbook/gui/component/addressbook-component.c:218
 msgid "Create a new contact list"
 msgstr "Cria uma nova lista de contatos"
 
-#: ../addressbook/gui/component/addressbook-component.c:253
-#: ../addressbook/gui/component/addressbook-config.c:1223
+#: ../addressbook/gui/component/addressbook-component.c:224
+#: ../addressbook/gui/component/addressbook-config.c:1245
 msgid "New Address Book"
 msgstr "Novo catÃ¡logo de endereÃ§os"
 
-#: ../addressbook/gui/component/addressbook-component.c:254
+#: ../addressbook/gui/component/addressbook-component.c:225
 msgctxt "New"
 msgid "Address _Book"
 msgstr "CatÃ¡logo de _endereÃ§os"
 
-#: ../addressbook/gui/component/addressbook-component.c:255
+#: ../addressbook/gui/component/addressbook-component.c:226
 msgid "Create a new address book"
 msgstr "Cria um novo catÃ¡logo de endereÃ§os"
 
-#: ../addressbook/gui/component/addressbook-component.c:418
+#: ../addressbook/gui/component/addressbook-component.c:389
 msgid "Failed upgrading Address Book settings or folders."
 msgstr ""
 "Falha ao atualizar as pastas ou configuraÃ§Ãµes do catÃ¡logo de endereÃ§os."
 
-#: ../addressbook/gui/component/addressbook-config.c:332
+#: ../addressbook/gui/component/addressbook-config.c:217
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"A seleÃ§Ã£o desta opÃ§Ã£o significa que o Evolution apenas se conectarÃ¡ ao seu "
+"servidor LDAP se este suportar SSL."
+
+#: ../addressbook/gui/component/addressbook-config.c:219
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"A seleÃ§Ã£o desta opÃ§Ã£o significa que o Evolution apenas se conectarÃ¡ ao seu "
+"servidor LDAP se este suportar TLS."
+
+#: ../addressbook/gui/component/addressbook-config.c:221
+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."
+msgstr ""
+"A seleÃ§Ã£o desta opÃ§Ã£o significa que o seu servidor nÃ£o suporta nem SSL nem "
+"TLS. Isto significa que a sua conexÃ£o serÃ¡ insegura e que vocÃª estarÃ¡ "
+"vulnerÃ¡vel a falhas de seguranÃ§a."
+
+#: ../addressbook/gui/component/addressbook-config.c:346
 msgid "Base"
 msgstr "Base"
 
-#: ../addressbook/gui/component/addressbook-config.c:533
-#: ../calendar/gui/dialogs/calendar-setup.c:170
+#: ../addressbook/gui/component/addressbook-config.c:547
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
+#: ../addressbook/gui/component/addressbook-config.c:648
 msgid "Copy _book content locally for offline operation"
 msgstr ""
 "Copiar o conteÃºdo do _catÃ¡logo localmente para funcionamento desconectado"
 
-#: ../addressbook/gui/component/addressbook-config.c:998
-#: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:90
-#: ../plugins/itip-formatter/itip-formatter.c:2532
+#: ../addressbook/gui/component/addressbook-config.c:759
+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 "
+"port you should specify."
+msgstr ""
+"Esta Ã© a porta no servidor LDAP na qual o Evolution tentarÃ¡ se conectar. Uma "
+"lista de portas padrÃ£o foi fornecida. Pergunte ao seu administrador de "
+"sistemas qual porta vocÃª deve escolher."
+
+#: ../addressbook/gui/component/addressbook-config.c:837
+msgid ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
+"server."
+msgstr ""
+"Este Ã© o mÃ©todo que o Evolution usarÃ¡ para autenticÃ¡-lo.  Note que a opÃ§Ã£o "
+"\"EndereÃ§o de E-mail\" requer acesso anÃ´nimo ao seu servidor LDAP."
+
+#: ../addressbook/gui/component/addressbook-config.c:916
+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 "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
+msgstr ""
+"O escopo de pesquisa define a profundidade atÃ© a qual vocÃª deseja que as "
+"pesquisas se estendam pela Ã¡rvore do diretÃ³rio. Um escopo de pesquisa de "
+"\"sub\" incluirÃ¡ todas as entradas sob a sua base de pesquisa. Um escopo de "
+"pesquisa de \"um\" incluirÃ¡ apenas as entradas que estÃ£o um nÃvel abaixo da "
+"sua base."
+
+#: ../addressbook/gui/component/addressbook-config.c:1020
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:95
+#: ../plugins/itip-formatter/itip-formatter.c:2558
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Geral"
 
-#: ../addressbook/gui/component/addressbook-config.c:999
+#: ../addressbook/gui/component/addressbook-config.c:1021
 #: ../addressbook/gui/widgets/e-addressbook-view.c:554
 #: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "CatÃ¡logo de endereÃ§os"
 
-#: ../addressbook/gui/component/addressbook-config.c:1003
+#: ../addressbook/gui/component/addressbook-config.c:1025
 msgid "Server Information"
 msgstr "InformaÃ§Ã£o do servidor"
 
-#: ../addressbook/gui/component/addressbook-config.c:1005
+#: ../addressbook/gui/component/addressbook-config.c:1027
 msgid "Authentication"
 msgstr "AutenticaÃ§Ã£o"
 
-#: ../addressbook/gui/component/addressbook-config.c:1008
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/addressbook-config.c:1030
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 #: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detalhes"
 
-#: ../addressbook/gui/component/addressbook-config.c:1009
-#: ../mail/em-folder-browser.c:1000
+#: ../addressbook/gui/component/addressbook-config.c:1031
+#: ../mail/em-folder-browser.c:1021
 msgid "Searching"
 msgstr "Pesquisando"
 
-#: ../addressbook/gui/component/addressbook-config.c:1011
+#: ../addressbook/gui/component/addressbook-config.c:1033
 msgid "Downloading"
 msgstr "Baixando"
 
-#: ../addressbook/gui/component/addressbook-config.c:1221
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/addressbook-config.c:1243
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "Address Book Properties"
 msgstr "Propriedades do catÃ¡logo de endereÃ§os"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:74
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1209
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1109
 msgid "Migrating..."
 msgstr "Migrando..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:126
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1268
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1168
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Migrando \"%s\":"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:646
+#: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
 msgstr "Servidores LDAP"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:761
+#: ../addressbook/gui/component/addressbook-migrate.c:760
 msgid "Autocompletion Settings"
 msgstr "ConfiguraÃ§Ãµes de completamento automÃ¡tico"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1137
+#: ../addressbook/gui/component/addressbook-migrate.c:1136
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -842,7 +871,7 @@ msgstr ""
 "\n"
 "Por favor, aguarde enquanto o Evolution migra as suas pastas..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1151
+#: ../addressbook/gui/component/addressbook-migrate.c:1150
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -852,7 +881,7 @@ msgstr ""
 "\n"
 "Por favor, aguarde enquanto o Evolution migra as suas pastas..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1160
+#: ../addressbook/gui/component/addressbook-migrate.c:1159
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -862,7 +891,7 @@ msgstr ""
 "\n"
 "Por favor, aguarde enquanto o Evolution migra as suas pastas..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1170
+#: ../addressbook/gui/component/addressbook-migrate.c:1169
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -875,18 +904,18 @@ msgstr ""
 "o PDA..."
 
 #: ../addressbook/gui/component/addressbook-view.c:422
-#: ../mail/em-folder-utils.c:448
+#: ../mail/em-folder-utils.c:453
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renomear a pasta \"%s\" para:"
 
 #: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:450
+#: ../mail/em-folder-utils.c:455
 msgid "Rename Folder"
 msgstr "Renomear pasta"
 
 #: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:456
+#: ../mail/em-folder-utils.c:461
 msgid "Folder names cannot contain '/'"
 msgstr "O nome da pasta nÃ£o pode conter o caractere \"/\""
 
@@ -899,19 +928,19 @@ msgid "Save As vCard..."
 msgstr "Salvar como vCard..."
 
 #: ../addressbook/gui/component/addressbook-view.c:951
-#: ../calendar/gui/calendar-component.c:678
-#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:501
-#: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:39
+#: ../calendar/gui/calendar-component.c:628
+#: ../calendar/gui/memos-component.c:479 ../calendar/gui/tasks-component.c:472
+#: ../mail/em-folder-tree.c:2122 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_Renomear..."
 
 #: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/calendar-component.c:681
-#: ../calendar/gui/e-calendar-table.c:1609
-#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:939
-#: ../calendar/gui/memos-component.c:512 ../calendar/gui/tasks-component.c:504
-#: ../mail/em-folder-tree.c:2129 ../mail/em-folder-view.c:1342
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../calendar/gui/calendar-component.c:631
+#: ../calendar/gui/e-calendar-table.c:1613
+#: ../calendar/gui/e-calendar-view.c:1828 ../calendar/gui/e-memo-table.c:949
+#: ../calendar/gui/memos-component.c:482 ../calendar/gui/tasks-component.c:475
+#: ../mail/em-folder-tree.c:2119 ../mail/em-folder-view.c:1340
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
@@ -919,11 +948,10 @@ msgid "_Delete"
 msgstr "E_xcluir"
 
 #: ../addressbook/gui/component/addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:686
-#: ../calendar/gui/dialogs/comp-editor.c:2092
-#: ../calendar/gui/memos-component.c:517 ../calendar/gui/tasks-component.c:509
-#: ../composer/e-msg-composer.c:1040 ../mail/em-folder-tree.c:2138
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+#: ../calendar/gui/calendar-component.c:636
+#: ../calendar/gui/memos-component.c:487 ../calendar/gui/tasks-component.c:480
+#: ../mail/em-folder-tree.c:2127 ../ui/evolution-addressbook.xml.h:59
+#: ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_Propriedades"
 
@@ -936,20 +964,20 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Acessando o servidor LDAP anonimamente"
 
 #: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:529
 msgid "Failed to authenticate.\n"
 msgstr "Falha ao autenticar.\n"
 
 #: ../addressbook/gui/component/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:515
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:509
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Digite a senha para %s (usuÃ¡rio %s)"
 
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:422
-#: ../plugins/publish-calendar/publish-calendar.c:191
+#: ../plugins/google-account-setup/google-source.c:500
+#: ../plugins/publish-calendar/publish-calendar.c:216
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "Digite a senha"
@@ -999,7 +1027,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "URI para a Ãºltima pasta usada no diÃ¡logo selecionar nomes."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Vertical pane position"
 msgstr "PosiÃ§Ã£o do painel vertical"
 
@@ -1016,10 +1044,23 @@ msgid "Whether to show the preview pane."
 msgstr "Mostrar o painel de visualizaÃ§Ã£o."
 
 #: ../addressbook/gui/component/autocompletion-config.c:175
+msgid "Autocompletion"
+msgstr "Completar automaticamente"
+
+#: ../addressbook/gui/component/autocompletion-config.c:177
 msgid "Always _show address of the autocompleted contact"
 msgstr "_Sempre mostrar o e-mail do contato"
 
-#: ../addressbook/gui/component/autocompletion-config.c:180
+#: ../addressbook/gui/component/autocompletion-config.c:182
+msgid "Date/Time Format"
+msgstr "Formato de data/hora"
+
+#: ../addressbook/gui/component/autocompletion-config.c:185
+#: ../mail/em-mailer-prefs.c:1456
+msgid "Table column:"
+msgstr "Coluna da tabela:"
+
+#: ../addressbook/gui/component/autocompletion-config.c:187
 msgid "Look up in address books"
 msgstr "Procurar nos catÃ¡logos de endereÃ§os"
 
@@ -1028,21 +1069,16 @@ msgid "1"
 msgstr "1"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:3
-msgid "389"
-msgstr "389"
+msgid ""
+"389\n"
+"636\n"
+"3268"
+msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:5
-msgid "636"
-msgstr "636"
-
 #: ../addressbook/gui/component/ldap-config.glade.h:6
 msgid "<b>Authentication</b>"
 msgstr "<b>AutenticaÃ§Ã£o</b>"
@@ -1055,147 +1091,74 @@ msgstr "<b>Baixando</b>"
 msgid "<b>Searching</b>"
 msgstr "<b>Pesquisando</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
-msgid "<b>Type:</b>"
-msgstr "<b>Tipo:</b>"
-
 #: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "Add Address Book"
-msgstr "Adicionar catÃ¡logo de endereÃ§os"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:760
-msgid "Always"
-msgstr "Sempre"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:13
-msgid "Anonymously"
-msgstr "Anonimamente"
+msgid ""
+"Anonymously\n"
+"Using email address\n"
+"Using distinguished name (DN)"
+msgstr ""
+"De forma anÃ´nima\n"
+"Usando um endereÃ§o de e-mail\n"
+"Usando um nome distinto (DN)"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "B_rowse this book until limit reached"
 msgstr "_Navegar esse catÃ¡logo atÃ© alcanÃ§ar o limite"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:16
-msgid "Basic"
-msgstr "BÃ¡sico"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:18
-msgid "Distinguished name"
-msgstr "Nome distinto (DN)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:19
-msgid "Email address"
-msgstr "EndereÃ§o de e-mail"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "O Evolution usarÃ¡ este endereÃ§o de e-mail para autenticÃ¡-lo com o servidor."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
-msgid "Find Possible Search Bases"
-msgstr "Localizar bases de pesquisa possÃveis"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Lo_gin:"
 msgstr "UsuÃ¡r_io:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:759
-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:287
-msgid "No encryption"
-msgstr "Sem criptografia"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:26
-msgid "One"
-msgstr "Um"
+#: ../addressbook/gui/component/ldap-config.glade.h:19
+msgid ""
+"One\n"
+"Sub"
+msgstr ""
+"Um\n"
+"Sub"
 
-#. 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:295
-msgid "SSL encryption"
-msgstr "Criptografia SSL"
+#: ../addressbook/gui/component/ldap-config.glade.h:21
+msgid ""
+"SSL encryption\n"
+"TLS encryption\n"
+"No encryption"
+msgstr ""
+"Criptografia SSL\n"
+"Criptografia TLS\n"
+"Sem criptografia"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "Search Filter"
 msgstr "Filtro de pesquisa"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 msgid "Search _base:"
 msgstr "_Base de pesquisa:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "Search _filter:"
 msgstr "_Filtro de pesquisa:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
-msgid "Search filter"
-msgstr "Filtro de pesquisa"
-
-#: ../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 pesquisa Ã© o tipo dos objetos que se deseja procurar enquanto a "
-"pesquisa Ã© feita. Se nÃ£o for modificado, o padrÃ£o Ã© procurar no ObjectClass "
-"do tipo \"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."
-msgstr ""
-"A seleÃ§Ã£o desta opÃ§Ã£o significa que o Evolution apenas se conectarÃ¡ ao seu "
-"servidor LDAP se este suportar SSL."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:34
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-msgstr ""
-"A seleÃ§Ã£o desta opÃ§Ã£o significa que o Evolution apenas se conectarÃ¡ ao seu "
-"servidor LDAP se este suportar TLS."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 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."
+"Search filter is the type of object to be searched for. If this is not "
+"modified, the default search will be performed on the type \"person\"."
 msgstr ""
-"A seleÃ§Ã£o desta opÃ§Ã£o significa que o seu servidor nÃ£o suporta nem SSL nem "
-"TLS. Isto significa que a sua conexÃ£o serÃ¡ insegura e que vocÃª estarÃ¡ "
-"vulnerÃ¡vel a falhas de seguranÃ§a."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:36
-msgid "Sub"
-msgstr "Sub"
+"Filtro de pesquisa Ã© o tipo de objeto a procurar. Se nÃ£o for modificado, a "
+"pesquisa padrÃ£o serÃ¡ feita usando o tipo \"pessoa\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Supported Search Bases"
 msgstr "Bases de pesquisa com suporte"
 
-#. 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:291
-msgid "TLS encryption"
-msgstr "Criptografia TLS"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "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 "
@@ -1205,20 +1168,7 @@ msgstr ""
 "pesquisas comeÃ§arÃ£o. Se vocÃª deixar este campo vazio as pesquisas comeÃ§arÃ£o "
 "na raiz da Ã¡rvore do diretÃ³rio."
 
-#: ../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 "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
-msgstr ""
-"O escopo de pesquisa define a profundidade atÃ© a qual vocÃª deseja que as "
-"pesquisas se estendam pela Ã¡rvore do diretÃ³rio. Um escopo de pesquisa de "
-"\"sub\" incluirÃ¡ todas as entradas sob a sua base de pesquisa. Um escopo de "
-"pesquisa de \"um\" incluirÃ¡ apenas as entradas que estÃ£o um nÃvel abaixo da "
-"sua base."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
 "\"."
@@ -1226,7 +1176,7 @@ msgstr ""
 "Este Ã© o nome completo do seu servidor LDAP. Por exemplo, \"ldap."
 "minhaempresa.com.br\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1234,16 +1184,7 @@ msgstr ""
 "Este Ã© o nÃºmero mÃ¡ximo de entradas a serem baixadas. Definir um valor muito "
 "grande a este nÃºmero diminuirÃ¡ a velocidade de seu catÃ¡logo de endereÃ§os."
 
-#: ../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 "
-"server."
-msgstr ""
-"Este Ã© o mÃ©todo que o Evolution usarÃ¡ para autenticÃ¡-lo.  Note que a opÃ§Ã£o "
-"\"EndereÃ§o de E-mail\" requer acesso anÃ´nimo ao seu servidor LDAP."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1251,87 +1192,61 @@ msgstr ""
 "Este Ã© o nome deste servidor que aparecerÃ¡ na lista de pastas do Evolution. "
 "Ele Ã© usado apenas para exibiÃ§Ã£o. "
 
-#: ../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 "
-"port you should specify."
-msgstr ""
-"Esta Ã© a porta no servidor LDAP na qual o Evolution tentarÃ¡ se conectar. Uma "
-"lista de portas padrÃ£o foi fornecida. Pergunte ao seu administrador de "
-"sistemas qual porta vocÃª deve escolher."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:46
-msgid "Using distinguished name (DN)"
-msgstr "Usando nome distinto (DN)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:47
-msgid "Using email address"
-msgstr "Usando endereÃ§o de e-mail"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:48
-msgid "Whenever Possible"
-msgstr "Quando possÃvel"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:49
-msgid "_Add Address Book"
-msgstr "_Adicionar catÃ¡logo de endereÃ§os"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid "_Download limit:"
 msgstr "_Limite de transferÃªncia:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "_Find Possible Search Bases"
 msgstr "Localizar bases de pesquisa _possÃveis"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid "_Login method:"
 msgstr "Modo de au_tenticaÃ§Ã£o:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:227
-#: ../mail/mail-config.glade.h:178
+#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid "_Search scope:"
 msgstr "_Escopo da pesquisa:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:187
-#: ../plugins/publish-calendar/publish-calendar.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../mail/mail-config.glade.h:184
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid "_Timeout:"
 msgstr "_Tempo limite:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid "_Use secure connection:"
 msgstr "_Usar conexÃ£o segura:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:59
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid "cards"
 msgstr "cartÃµes"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:60
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../plugins/caldav/caldav-source.c:430
-#: ../plugins/calendar-http/calendar-http.c:279
-#: ../plugins/calendar-weather/calendar-weather.c:524
-#: ../plugins/google-account-setup/google-source.c:652
-#: ../plugins/google-account-setup/google-contacts-source.c:366
+#: ../calendar/gui/dialogs/event-page.glade.h:24
+#: ../plugins/caldav/caldav-source.c:448
+#: ../plugins/calendar-file/calendar-file.c:286
+#: ../plugins/calendar-http/calendar-http.c:323
+#: ../plugins/calendar-weather/calendar-weather.c:523
+#: ../plugins/google-account-setup/google-source.c:720
+#: ../plugins/google-account-setup/google-contacts-source.c:330
 msgid "minutes"
 msgstr "minutos"
 
@@ -1356,44 +1271,42 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>Diversos</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+msgid "<b>Notes</b>"
+msgstr "<b>Notas</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>Outro</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>Telefone</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>EndereÃ§os Web</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
 msgstr "<b>Trabalho</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:605
-msgid "AIM"
-msgstr "AIM"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.glade.h:7
 #: ../calendar/gui/dialogs/memo-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tegorias..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
-#: ../addressbook/gui/widgets/e-minicard.c:199
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Contato"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:543
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:558
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2423
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2442
 msgid "Contact Editor"
 msgstr "Editor de contatos"
 
@@ -1402,1280 +1315,259 @@ msgid "Full _Name..."
 msgstr "_Nome completo..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
-#: ../composer/e-msg-composer.c:2473
 msgid "Image"
 msgstr "Imagem"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
-msgid "MSN Messenger"
-msgstr "MSN Messenger"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "EndereÃ§o de correio"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Nic_kname:"
 msgstr "_Apelido:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
-msgid "Novell GroupWise"
-msgstr "Novell Groupwise"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-msgid "Novell Groupwise"
-msgstr "Novell Groupwise"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../calendar/gui/migration.c:1225
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:451
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:564
+msgid "Notes"
+msgstr "Notas"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "Personal Information"
 msgstr "InformaÃ§Ã£o pessoal"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Telephone"
 msgstr "Telefone"
 
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:268
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
-#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
-#: ../mail/em-migrate.c:1057
-msgid "Work"
-msgstr "Trabalho"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Address:"
 msgstr "_EndereÃ§o:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Anniversary:"
 msgstr "Bod_as:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Assistant:"
 msgstr "_Assistente:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Birthday:"
 msgstr "Aniver_sÃ¡rio:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: ../calendar/gui/dialogs/event-page.c:792
-#: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../plugins/itip-formatter/itip-view.c:1909
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../calendar/gui/dialogs/event-page.c:820
+#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../plugins/itip-formatter/itip-view.c:1910
 msgid "_Calendar:"
 msgstr "Agen_da:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_City:"
 msgstr "_Cidade:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Company:"
 msgstr "Em_presa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Country:"
 msgstr "_PaÃs:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Department:"
 msgstr "_Departamento:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_File under:"
 msgstr "A_rquivar em:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Free/Busy:"
 msgstr "Disponibi_lidade:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Home Page:"
 msgstr "_PÃ¡gina web:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Manager:"
 msgstr "_Gerente:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
-msgid "_Notes:"
-msgstr "_Notas:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "EscritÃ³ri_o:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_PO Box:"
 msgstr "Caixa _postal:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Profession:"
 msgstr "_ProfissÃ£o:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Spouse:"
 msgstr "CÃ´n_juge:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_State/Province:"
 msgstr "E_stado/ProvÃncia:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/fullname.glade.h:19
 msgid "_Title:"
 msgstr "_Tratamento:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "_Video Chat:"
 msgstr "Bate-papo com _vÃdeo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Wants to receive HTML mail"
 msgstr "Dese_ja receber correio HTML"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Web Log:"
 msgstr "_Web log:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "On_de:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 msgid "_Zip/Postal Code:"
 msgstr "CEP/CÃ³di_go postal:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
-#: ../addressbook/gui/widgets/eab-contact-display.c:647
-msgid "Address"
-msgstr "EndereÃ§o"
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
+#: ../mail/em-mailer-prefs.c:473
+#: ../plugins/exchange-operations/exchange-delegates.c:951
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:697
+#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../widgets/menus/gal-define-views-dialog.c:344
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+#: ../widgets/menus/gal-view-new-dialog.c:61
+msgid "Name"
+msgstr "Nome"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:98
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:173
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:325
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
-#: ../addressbook/gui/widgets/e-minicard-label.c:165
+#: ../addressbook/gui/widgets/e-addressbook-model.c:324
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:417
+#: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
-#: ../addressbook/gui/widgets/e-minicard-view.c:545
-#: ../addressbook/gui/widgets/e-minicard.c:192
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1822 ../widgets/text/e-text.c:3688
-#: ../widgets/text/e-text.c:3689
+#: ../widgets/table/e-cell-text.c:1816 ../widgets/text/e-text.c:3674
+#: ../widgets/text/e-text.c:3675
 msgid "Editable"
 msgstr "EditÃ¡vel"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
-msgid "United States"
-msgstr "Estados Unidos"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
-msgid "Afghanistan"
-msgstr "AfeganistÃ£o"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
-msgid "Albania"
-msgstr "AlbÃ¢nia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
-msgid "Algeria"
-msgstr "ArgÃ©lia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
-msgid "American Samoa"
-msgstr "Samoa Americana"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
-msgid "Andorra"
-msgstr "Andorra"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
-msgid "Angola"
-msgstr "Angola"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
-msgid "Anguilla"
-msgstr "Anguilla"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
-msgid "Antarctica"
-msgstr "AntÃ¡rtica"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
-msgid "Antigua And Barbuda"
-msgstr "AntÃgua e Barbuda"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
-msgid "Argentina"
-msgstr "Argentina"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
-msgid "Armenia"
-msgstr "ArmÃªnia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
-msgid "Aruba"
-msgstr "Aruba"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
-msgid "Australia"
-msgstr "AustrÃ¡lia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
-msgid "Austria"
-msgstr "Ã?ustria"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
-msgid "Azerbaijan"
-msgstr "AzerbaijÃ£o"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
-msgid "Bahamas"
-msgstr "Bahamas"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
-msgid "Bahrain"
-msgstr "Bahrain"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
-msgid "Bangladesh"
-msgstr "Bangladesh"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
-msgid "Barbados"
-msgstr "Barbados"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
-msgid "Belarus"
-msgstr "BeielorÃºssia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
-msgid "Belgium"
-msgstr "BÃ©lgica"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
-msgid "Belize"
-msgstr "Belize"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
-msgid "Benin"
-msgstr "Benin"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
-msgid "Bermuda"
-msgstr "Bermudas"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
-msgid "Bhutan"
-msgstr "ButÃ£o"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
-msgid "Bolivia"
-msgstr "BolÃvia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
-msgid "Bosnia And Herzegowina"
-msgstr "BÃ³snia e Herzegovina"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
-msgid "Botswana"
-msgstr "Botswana"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
-msgid "Bouvet Island"
-msgstr "Ilhas Bouvet"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
-msgid "Brazil"
-msgstr "Brasil"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
-msgid "British Indian Ocean Territory"
-msgstr "TerritÃ³rio do Oceano Ã?ndico BritÃ¢nico"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
-msgid "Brunei Darussalam"
-msgstr "Brunei Darussalam"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
-msgid "Bulgaria"
-msgstr "BulgÃ¡ria"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
-msgid "Burkina Faso"
-msgstr "Burkina Faso"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
-msgid "Burundi"
-msgstr "Burundi"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
-msgid "Cambodia"
-msgstr "Camboja"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
-msgid "Cameroon"
-msgstr "CamarÃµes"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
-msgid "Canada"
-msgstr "CanadÃ¡"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
-msgid "Cape Verde"
-msgstr "Cabo Verde"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
-msgid "Cayman Islands"
-msgstr "Ilhas Cayman"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
-msgid "Central African Republic"
-msgstr "RepÃºblica Centro-Africana"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
-msgid "Chad"
-msgstr "Chade"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
-msgid "Chile"
-msgstr "Chile"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
-msgid "China"
-msgstr "China"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
-msgid "Christmas Island"
-msgstr "Ilhas Christmas"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
-msgid "Cocos (Keeling) Islands"
-msgstr "Ilhas dos Cocos"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
-msgid "Colombia"
-msgstr "ColÃ´mbia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
-msgid "Comoros"
-msgstr "Comores"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
-msgid "Congo"
-msgstr "Congo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
-msgid "Congo, The Democratic Republic Of The"
-msgstr "Congo, RepÃºblica DemocrÃ¡tica do"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
-msgid "Cook Islands"
-msgstr "Ilhas Cook"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
-msgid "Costa Rica"
-msgstr "Costa Rica"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
-msgid "Cote d'Ivoire"
-msgstr "Costa do Marfim"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
-msgid "Croatia"
-msgstr "CroÃ¡cia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
-msgid "Cuba"
-msgstr "Cuba"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
-msgid "Cyprus"
-msgstr "Chipre"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
-msgid "Czech Republic"
-msgstr "RepÃºblica Checa"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
-msgid "Denmark"
-msgstr "Dinamarca"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
-msgid "Djibouti"
-msgstr "Djibouti"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
-msgid "Dominica"
-msgstr "Dominica"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
-msgid "Dominican Republic"
-msgstr "RepÃºblica Dominicana"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
-msgid "Ecuador"
-msgstr "Equador"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
-msgid "Egypt"
-msgstr "Egito"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
-msgid "El Salvador"
-msgstr "El Salvador"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
-msgid "Equatorial Guinea"
-msgstr "GuinÃ© Equatorial"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
-msgid "Eritrea"
-msgstr "Eritrea"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
-msgid "Estonia"
-msgstr "EstÃ´nia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
-msgid "Ethiopia"
-msgstr "EtiÃ³pia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
-msgid "Falkland Islands"
-msgstr "Ilhas Falkland (Malvinas)"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
-msgid "Faroe Islands"
-msgstr "Ilhas Faroe"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
-msgid "Fiji"
-msgstr "Fiji"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
-msgid "Finland"
-msgstr "FinlÃ¢ndia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
-msgid "France"
-msgstr "FranÃ§a"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
-msgid "French Guiana"
-msgstr "Guiana Francesa"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
-msgid "French Polynesia"
-msgstr "PolinÃ©sia Francesa"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
-msgid "French Southern Territories"
-msgstr "TerritÃ³rios Franceses do Sul"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
-msgid "Gabon"
-msgstr "GabÃ£o"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
-msgid "Gambia"
-msgstr "GÃ¢mbia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
-msgid "Georgia"
-msgstr "GeÃ³rgia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
-msgid "Germany"
-msgstr "Alemanha"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
-msgid "Ghana"
-msgstr "Gana"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
-msgid "Gibraltar"
-msgstr "Gibraltar"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
-msgid "Greece"
-msgstr "GrÃ©cia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
-msgid "Greenland"
-msgstr "GroenlÃ¢ndia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
-msgid "Grenada"
-msgstr "Granada"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
-msgid "Guadeloupe"
-msgstr "Guadalupe"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
-msgid "Guam"
-msgstr "Guam"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
-msgid "Guatemala"
-msgstr "Guatemala"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
-msgid "Guernsey"
-msgstr "Guernsey"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
-msgid "Guinea"
-msgstr "GuinÃ©"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
-msgid "Guinea-Bissau"
-msgstr "GuinÃ©-Bissau"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
-msgid "Guyana"
-msgstr "Guiana"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
-msgid "Haiti"
-msgstr "Haiti"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
-msgid "Heard And McDonald Islands"
-msgstr "Ilhas Heard e McDonald"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
-msgid "Holy See"
-msgstr "Santa SÃ©"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
-msgid "Honduras"
-msgstr "Honduras"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Hong Kong"
-msgstr "Hong Kong"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
-msgid "Hungary"
-msgstr "Hungria"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
-msgid "Iceland"
-msgstr "IslÃ¢ndia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
-msgid "India"
-msgstr "Ã?ndia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
-msgid "Indonesia"
-msgstr "IndonÃ©sia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
-msgid "Iran"
-msgstr "IrÃ£"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
-msgid "Iraq"
-msgstr "Iraque"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
-msgid "Ireland"
-msgstr "Irlanda"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
-msgid "Isle of Man"
-msgstr "Ilha de Man"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
-msgid "Israel"
-msgstr "Israel"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
-msgid "Italy"
-msgstr "ItÃ¡lia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
-msgid "Jamaica"
-msgstr "Jamaica"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
-msgid "Japan"
-msgstr "JapÃ£o"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
-msgid "Jersey"
-msgstr "Jersey"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
-msgid "Jordan"
-msgstr "JordÃ¢nia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
-msgid "Kazakhstan"
-msgstr "CazaquistÃ£o"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
-msgid "Kenya"
-msgstr "QuÃªnia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
-msgid "Kiribati"
-msgstr "Kiribati"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
-msgid "Korea, Democratic People's Republic Of"
-msgstr "CorÃ©ia do Norte"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
-msgid "Korea, Republic Of"
-msgstr "CorÃ©ia do Sul"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
-msgid "Kuwait"
-msgstr "Kuwait"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
-msgid "Kyrgyzstan"
-msgstr "QuirguistÃ£o"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
-msgid "Laos"
-msgstr "Laos"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
-msgid "Latvia"
-msgstr "LetÃ´nia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
-msgid "Lebanon"
-msgstr "LÃbano"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
-msgid "Lesotho"
-msgstr "Lesoto"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
-msgid "Liberia"
-msgstr "LibÃ©ria"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
-msgid "Libya"
-msgstr "LÃbia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
-msgid "Liechtenstein"
-msgstr "Liechtenstein"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
-msgid "Lithuania"
-msgstr "LituÃ¢nia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
-msgid "Luxembourg"
-msgstr "Luxemburgo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
-msgid "Macao"
-msgstr "Macau"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
-msgid "Macedonia"
-msgstr "MacedÃ´nia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
-msgid "Madagascar"
-msgstr "Madagascar"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
-msgid "Malawi"
-msgstr "Malawi"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
-msgid "Malaysia"
-msgstr "MalÃ¡sia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
-msgid "Maldives"
-msgstr "Maldivas"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
-msgid "Mali"
-msgstr "Mali"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
-msgid "Malta"
-msgstr "Malta"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
-msgid "Marshall Islands"
-msgstr "Ilhas Marshall"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
-msgid "Martinique"
-msgstr "Martinica"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
-msgid "Mauritania"
-msgstr "MauritÃ¢nia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
-msgid "Mauritius"
-msgstr "MaurÃcio"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
-msgid "Mayotte"
-msgstr "Mayotte"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
-msgid "Mexico"
-msgstr "MÃ©xico"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
-msgid "Micronesia"
-msgstr "MicronÃ©sia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
-msgid "Moldova, Republic Of"
-msgstr "Moldova, RepÃºblica da"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
-msgid "Monaco"
-msgstr "MÃ´naco"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
-msgid "Mongolia"
-msgstr "MongÃ³lia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
-msgid "Montserrat"
-msgstr "Montserrat"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
-msgid "Morocco"
-msgstr "Marrocos"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
-msgid "Mozambique"
-msgstr "MoÃ§ambique"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
-msgid "Myanmar"
-msgstr "Myanmar"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
-msgid "Namibia"
-msgstr "NamÃbia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
-msgid "Nauru"
-msgstr "Nauru"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
-msgid "Nepal"
-msgstr "Nepal"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
-msgid "Netherlands"
-msgstr "Holanda"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
-msgid "Netherlands Antilles"
-msgstr "Antilhas Holandesas"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
-msgid "New Caledonia"
-msgstr "Nova CaledÃ´nia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
-msgid "New Zealand"
-msgstr "Nova ZelÃ¢ndia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
-msgid "Nicaragua"
-msgstr "NicarÃ¡gua"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
-msgid "Niger"
-msgstr "Niger"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
-msgid "Nigeria"
-msgstr "NigÃ©ria"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
-msgid "Niue"
-msgstr "Niue"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
-msgid "Norfolk Island"
-msgstr "Ilhas Norfolk"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
-msgid "Northern Mariana Islands"
-msgstr "Ilhas Marianas do Norte"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
-msgid "Norway"
-msgstr "Noruega"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
-msgid "Oman"
-msgstr "OmÃ£"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
-msgid "Pakistan"
-msgstr "PaquistÃ£o"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
-msgid "Palau"
-msgstr "Palau"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
-msgid "Palestinian Territory"
-msgstr "TerritÃ³rio Palestino"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
-msgid "Panama"
-msgstr "PanamÃ¡"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
-msgid "Papua New Guinea"
-msgstr "Papua Nova GuinÃ©"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
-msgid "Paraguay"
-msgstr "Paraguai"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
-msgid "Peru"
-msgstr "Peru"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
-msgid "Philippines"
-msgstr "Filipinas"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
-msgid "Pitcairn"
-msgstr "Pitcairn"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
-msgid "Poland"
-msgstr "PolÃ´nia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
-msgid "Portugal"
-msgstr "Portugal"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
-msgid "Puerto Rico"
-msgstr "Porto Rico"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
-msgid "Qatar"
-msgstr "Qatar"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
-msgid "Reunion"
-msgstr "ReuniÃ£o"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
-msgid "Romania"
-msgstr "RomÃªnia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
-msgid "Russian Federation"
-msgstr "FederaÃ§Ã£o Russa"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
-msgid "Rwanda"
-msgstr "Ruanda"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
-msgid "Saint Kitts And Nevis"
-msgstr "Saint Kitts e Nevis"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
-msgid "Saint Lucia"
-msgstr "Santa LÃºcia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
-msgid "Saint Vincent And The Grenadines"
-msgstr "SÃ£o Vicente e Granadinas"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
-msgid "Samoa"
-msgstr "Samoa"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
-msgid "San Marino"
-msgstr "San Marino"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
-msgid "Sao Tome And Principe"
-msgstr "SÃ£o Tome e PrÃncipe"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
-msgid "Saudi Arabia"
-msgstr "ArÃ¡bia Saudita"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
-msgid "Senegal"
-msgstr "Senegal"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
-msgid "Serbia And Montenegro"
-msgstr "SÃ©rvia e Montenegro"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
-msgid "Seychelles"
-msgstr "Seychelles"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
-msgid "Sierra Leone"
-msgstr "Serra Leoa"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
-msgid "Singapore"
-msgstr "Singapura"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
-msgid "Slovakia"
-msgstr "EslovÃ¡quia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
-msgid "Slovenia"
-msgstr "EslovÃªnia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
-msgid "Solomon Islands"
-msgstr "Ilhas SalomÃ£o"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
-msgid "Somalia"
-msgstr "SomÃ¡lia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
-msgid "South Africa"
-msgstr "Ã?frica do Sul"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
-msgid "South Georgia And The South Sandwich Islands"
-msgstr "Ilhas Georgia do Sul e Sandwich do Sul"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
-msgid "Spain"
-msgstr "Espanha"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
-msgid "Sri Lanka"
-msgstr "Sri Lanka"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
-msgid "St. Helena"
-msgstr "St. Helena"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
-msgid "St. Pierre And Miquelon"
-msgstr "St. Pierre e Miquelon"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
-msgid "Sudan"
-msgstr "SudÃ£o"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
-msgid "Suriname"
-msgstr "Suriname"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
-msgid "Svalbard And Jan Mayen Islands"
-msgstr "Ilhas Svalbard e Jan Mayen"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
-msgid "Swaziland"
-msgstr "SuazilÃ¢ndia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
-msgid "Sweden"
-msgstr "SuÃ©cia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
-msgid "Switzerland"
-msgstr "SuÃÃ§a"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
-msgid "Syria"
-msgstr "SÃria"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
-msgid "Taiwan"
-msgstr "Formosa"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
-msgid "Tajikistan"
-msgstr "TajiquistÃ£o"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
-msgid "Tanzania, United Republic Of"
-msgstr "TanzÃ¢nia, RepÃºblica Unida da"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
-msgid "Thailand"
-msgstr "TailÃ¢ndia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
-msgid "Timor-Leste"
-msgstr "Timor Leste"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
-msgid "Togo"
-msgstr "Togo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
-msgid "Tokelau"
-msgstr "Tokelau"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
-msgid "Tonga"
-msgstr "Tonga"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
-msgid "Trinidad And Tobago"
-msgstr "Trinidad e Tobago"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
-msgid "Tunisia"
-msgstr "TunÃsia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
-msgid "Turkey"
-msgstr "Turquia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
-msgid "Turkmenistan"
-msgstr "TurcomenistÃ£o"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
-msgid "Turks And Caicos Islands"
-msgstr "Ilhas Turks e Caicos"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
-msgid "Tuvalu"
-msgstr "Tuvalu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
-msgid "Uganda"
-msgstr "Uganda"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
-msgid "Ukraine"
-msgstr "UcrÃ¢nia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
-msgid "United Arab Emirates"
-msgstr "Emirados Ã?rabes Unidos"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
-msgid "United Kingdom"
-msgstr "Reino Unido"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
-msgid "United States Minor Outlying Islands"
-msgstr "Ilhas ao Largo dos Estados Unidos"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
-msgid "Uruguay"
-msgstr "Uruguai"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
-msgid "Uzbekistan"
-msgstr "UzbequistÃ£o"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
-msgid "Vanuatu"
-msgstr "Vanuatu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
-msgid "Venezuela"
-msgstr "Venezuela"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
-msgid "Viet Nam"
-msgstr "VietnÃ£"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
-msgid "Virgin Islands, British"
-msgstr "Ilhas Virgens, Inglaterra"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
-msgid "Virgin Islands, U.S."
-msgstr "Ilhas Virgens, EUA"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
-msgid "Wallis And Futuna Islands"
-msgstr "Ilhas Wallis e Futuna"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
-msgid "Western Sahara"
-msgstr "Sahara Ocidental"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
-msgid "Yemen"
-msgstr "IÃªmen"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
-msgid "Zambia"
-msgstr "ZÃ¢mbia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
-msgid "Zimbabwe"
-msgstr "ZimbÃ¡bue"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
-#: ../mail/em-mailer-prefs.c:467
-#: ../plugins/exchange-operations/exchange-delegates.c:954
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:711
-#: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../plugins/save-attachments/save-attachments.c:351
-#: ../widgets/menus/gal-define-views-dialog.c:346
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:63
-msgid "Name"
-msgstr "Nome"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
-msgid "AOL Instant Messenger"
-msgstr "AOL Instant Messenger"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:603
+msgid "AIM"
+msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
+msgid "Yahoo"
+msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
-msgid "Gadu-Gadu Messenger"
-msgstr "Mensageiro Gadu-Gadu"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:607
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:612
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:604
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:150
-msgid "Service"
-msgstr "ServiÃ§o"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:159
-#: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:694
-#: ../plugins/save-calendar/csv-format.c:376
-msgid "Location"
-msgstr "Local"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166
-msgid "Username"
-msgstr "Nome do usuÃ¡rio"
+#. red
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:57
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../mail/em-migrate.c:959
+msgid "Work"
+msgstr "Trabalho"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Casa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:272
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-#: ../calendar/gui/e-calendar-view.c:2259
+#: ../addressbook/gui/widgets/eab-contact-display.c:516
+#: ../calendar/gui/e-calendar-view.c:2289
 msgid "Other"
 msgstr "Outro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:610
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:611
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
-msgid "MSN"
-msgstr "MSN"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:606
-msgid "GroupWise"
-msgstr "GroupWise"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
 msgid "Source Book"
 msgstr "CatÃ¡logo fonte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:254
 msgid "Target Book"
 msgstr "CatÃ¡logo alvo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
 msgid "Is New Contact"
 msgstr "Ã? um novo contato"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
 msgid "Writable Fields"
 msgstr "Campos gravÃ¡veis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
 msgid "Required Fields"
 msgstr "Campos necessÃ¡rios"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
 msgid "Changed"
 msgstr "Alterado"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2437
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de contatos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2832
 msgid "Please select an image for this contact"
 msgstr "Por favor, selecione uma imagem para este contato"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2833
 msgid "_No image"
 msgstr "_Sem imagem"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2683,43 +1575,43 @@ msgstr ""
 "Os dados do contato sÃ£o invÃ¡lidos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "\"%s\" possui um formato invÃ¡lido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s\"%s\" possui um formato invÃ¡lido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3126
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3130
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s\"%s\" estÃ¡ vazio"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3154
 msgid "Invalid contact."
 msgstr "Contato invÃ¡lido."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:323
 msgid "Contact Quick-Add"
 msgstr "AdiÃ§Ã£o rÃ¡pida de contato"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:326
 msgid "_Edit Full"
 msgstr "_Editar completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:400
 msgid "_Full name"
 msgstr "Nome _completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
 msgid "E_mail"
 msgstr "E-_mail"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
 msgid "_Select Address Book"
 msgstr "_Selecionar catÃ¡logo de endereÃ§os"
 
@@ -2757,111 +1649,48 @@ msgstr ""
 "VocÃª tem certeza de que deseja\n"
 "excluir estes contatos?"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "EndereÃ§o _2:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
-msgid "Ci_ty:"
-msgstr "_Cidade:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
-msgid "Countr_y:"
-msgstr "_PaÃs:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
-msgid "Full Address"
-msgstr "EndereÃ§o completo"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
-msgid "_ZIP Code:"
-msgstr "CEP:"
-
 #: ../addressbook/gui/contact-editor/fullname.glade.h:1
-msgid "Dr."
-msgstr "Dr."
+msgid ""
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Ms.\n"
+"Miss\n"
+"Dr."
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
-msgid "Esq."
-msgstr "Esq."
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+msgid ""
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq."
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "Nome completo"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
-msgid "I"
-msgstr "I"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
-msgid "II"
-msgstr "II"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
-msgid "III"
-msgstr "III"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
-msgid "Jr."
-msgstr "Jr."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
-msgid "Miss"
-msgstr "Senhorita"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
-msgid "Mr."
-msgstr "Sr."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
-msgid "Mrs."
-msgstr "Sra."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
-msgid "Ms."
-msgstr "Srta."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
-msgid "Sr."
-msgstr "Sr."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_First:"
 msgstr "_Nome:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Last:"
 msgstr "_Sobrenome:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Middle:"
 msgstr "Nome do _meio:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Suffix:"
 msgstr "S_ufixo:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-msgid "Add IM Account"
-msgstr "Adicionar conta de MI"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:2
-msgid "_Account name:"
-msgstr "_Nome da conta:"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:3
-msgid "_IM Service:"
-msgstr "ServiÃ§o de M_I:"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:4
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../plugins/calendar-weather/calendar-weather.c:372
-#: ../plugins/exchange-operations/exchange-calendar.c:247
-#: ../plugins/exchange-operations/exchange-contacts.c:239
-msgid "_Location:"
-msgstr "_Local:"
-
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 msgid "<b>Members</b>"
 msgstr "<b>Membros:</b>"
@@ -2872,9 +1701,9 @@ msgid "Contact List Editor"
 msgstr "Editor de lista de contatos"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:220
-#: ../calendar/gui/e-day-view-time-item.c:815
-#: ../calendar/gui/e-timezone-entry.c:121
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:212
+#: ../calendar/gui/e-day-view-time-item.c:812
+#: ../calendar/gui/e-timezone-entry.c:118
 msgid "Select..."
 msgstr "Selecionar..."
 
@@ -2901,11 +1730,11 @@ msgid "_Members"
 msgstr "_Membros"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:311
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-model.c:310
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:403
 #: ../addressbook/gui/widgets/e-addressbook-view.c:211
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
-#: ../addressbook/gui/widgets/e-minicard-view.c:531
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "CatÃ¡logo"
 
@@ -2951,27 +1780,27 @@ msgstr ""
 "VocÃª deseja adicionÃ¡-lo mesmo assim?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:214
+#: ../addressbook/gui/merging/eab-contact-merging.c:213
 msgid "_Merge"
 msgstr "_Juntar"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:199
+#: ../addressbook/gui/merging/eab-contact-merging.c:198
 msgid "Merge Contact"
 msgstr "Juntar contatos"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:267
+#: ../addressbook/gui/merging/eab-contact-merging.c:266
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../addressbook/gui/widgets/eab-contact-display.c:588
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
-#: ../addressbook/gui/widgets/eab-contact-display.c:871
-#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../addressbook/gui/widgets/eab-contact-display.c:589
+#: ../addressbook/gui/widgets/eab-contact-display.c:868
+#: ../plugins/groupwise-features/junk-settings.c:420 ../smime/lib/e-cert.c:808
 msgid "Email"
 msgstr "E-mail"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../addressbook/gui/widgets/e-addressbook-view.c:160
-#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/cal-search-bar.c:79 ../calendar/gui/caltypes.xml.h:2
 #: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
 msgid "Any field contains"
 msgstr "Qualquer campo contÃ©m"
@@ -2985,35 +1814,35 @@ msgstr "E-mail comeÃ§a com"
 msgid "Name contains"
 msgstr "Nome contÃ©m"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+#: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
 msgstr "Sem contatos"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:166
+#: ../addressbook/gui/widgets/e-addressbook-model.c:165
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d contato"
 msgstr[1] "%d contatos"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:318
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-model.c:317
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:410
 #: ../addressbook/gui/widgets/e-addressbook-view.c:225
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
-#: ../addressbook/gui/widgets/e-minicard-view.c:538
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "Consulta"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:461
+#: ../addressbook/gui/widgets/e-addressbook-model.c:460
 msgid "Error getting book view"
 msgstr "Erro ao obter exibiÃ§Ã£o do catÃ¡logo"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
-#: ../widgets/table/e-table-click-to-add.c:509
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:424
+#: ../widgets/table/e-table-click-to-add.c:507
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3354
-#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3552
-#: ../widgets/text/e-text.c:3553
+#: ../widgets/table/e-table.c:3344
+#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3541
+#: ../widgets/text/e-text.c:3542
 msgid "Model"
 msgstr "Modelo"
 
@@ -3030,105 +1859,103 @@ msgid "Source"
 msgstr "Fonte"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:232
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:565
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../calendar/gui/e-meeting-list-view.c:564
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5
+#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../widgets/misc/e-attachment-tree-view.c:554
 msgid "Type"
 msgstr "Tipo"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1971
 msgid "Save as vCard..."
 msgstr "Salvar como vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2090
-#: ../calendar/gui/e-calendar-table.c:1587
-#: ../calendar/gui/e-calendar-view.c:1775 ../calendar/gui/e-memo-table.c:922
+#: ../addressbook/gui/widgets/e-addressbook-view.c:932
+#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-view.c:1806 ../calendar/gui/e-memo-table.c:932
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "A_brir"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
 msgid "_New Contact..."
 msgstr "_Novo contato..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "New Contact _List..."
 msgstr "Nova _lista de contatos..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
+#: ../addressbook/gui/widgets/e-addressbook-view.c:938
 msgid "_Save as vCard..."
 msgstr "_Salvar como vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Forward Contact"
 msgstr "_Encaminhar contato"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contacts"
 msgstr "_Encaminhar contatos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "Send _Message to Contact"
 msgstr "Enviar _mensagem ao contato"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to List"
 msgstr "Enviar _mensagem Ã  lista"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to Contacts"
 msgstr "Enviar _mensagem aos contatos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
+#: ../addressbook/gui/widgets/e-addressbook-view.c:947
 msgid "Cop_y to Address Book..."
 msgstr "_Copiar para o catÃ¡logo de endereÃ§os..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Mo_ve to Address Book..."
 msgstr "Mo_ver para o catÃ¡logo de endereÃ§os..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:951
 msgid "Cu_t"
 msgstr "Recor_tar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../calendar/gui/dialogs/comp-editor.c:487
-#: ../calendar/gui/e-calendar-table.c:1595
-#: ../calendar/gui/e-calendar-view.c:1782 ../calendar/gui/e-memo-table.c:930
-#: ../composer/e-msg-composer.c:2051 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1327 ../mail/message-list.c:2105
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../calendar/gui/e-calendar-table.c:1599
+#: ../calendar/gui/e-calendar-view.c:1813 ../calendar/gui/e-memo-table.c:940
+#: ../mail/em-folder-tree.c:991 ../mail/em-folder-view.c:1325
+#: ../mail/message-list.c:2109 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "P_aste"
 msgstr "C_olar"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1527
-#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
-#: ../calendar/gui/cal-search-bar.c:690
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1534
+#: ../calendar/gui/cal-search-bar.c:624 ../calendar/gui/cal-search-bar.c:667
+#: ../calendar/gui/cal-search-bar.c:686
 msgid "Any Category"
 msgstr "Qualquer categoria"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1530
-#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
-#: ../calendar/gui/cal-search-bar.c:694
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1537
+#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:690
 msgid "Unmatched"
 msgstr "NÃ£o combinadas"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Assistant"
 msgstr "Assistente"
 
@@ -3157,8 +1984,8 @@ msgid "Car Phone"
 msgstr "Telefone do carro"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:138
+#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
 #: ../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
@@ -3166,7 +1993,7 @@ msgid "Categories"
 msgstr "Categorias"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Company"
 msgstr "Empresa"
 
@@ -3215,22 +2042,22 @@ msgid "Journal"
 msgstr "DiÃ¡rio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:625
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Manager"
 msgstr "Gerente"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../addressbook/gui/widgets/eab-contact-display.c:644
 msgid "Mobile Phone"
 msgstr "Telefone celular"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
 msgid "Nickname"
 msgstr "Apelido"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:659
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
 msgid "Note"
 msgstr "Nota"
 
@@ -3259,14 +2086,14 @@ msgid "Radio"
 msgstr "RÃ¡dio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:577
+#: ../calendar/gui/e-meeting-list-view.c:576
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:701
 msgid "Role"
 msgstr "Papel"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
 msgid "Spouse"
 msgstr "CÃ´njuge"
 
@@ -3296,55 +2123,53 @@ msgstr "Unidade"
 msgid "Web Site"
 msgstr "Site da web"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:116
-#: ../addressbook/gui/widgets/e-minicard.c:155
-#: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
-#: ../widgets/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425
-#: ../widgets/table/e-table-click-to-add.c:523
+#: ../addressbook/gui/widgets/e-minicard-label.c:115
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
+#: ../widgets/misc/e-reflow.c:1421 ../widgets/misc/e-reflow.c:1422
+#: ../widgets/table/e-table-click-to-add.c:521
 #: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:654
-#: ../widgets/table/e-table-group-container.c:992
-#: ../widgets/table/e-table-group-container.c:993
-#: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-group-leaf.c:638
-#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
-#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-container.c:995
+#: ../widgets/table/e-table-group-leaf.c:642
+#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-item.c:3069 ../widgets/table/e-table-item.c:3070
+#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
 msgid "Width"
 msgstr "Largura"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:123
-#: ../addressbook/gui/widgets/e-minicard.c:162
-#: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
-#: ../widgets/misc/e-reflow.c:1432 ../widgets/misc/e-reflow.c:1433
-#: ../widgets/table/e-table-click-to-add.c:530
-#: ../widgets/table/e-table-field-chooser-item.c:661
-#: ../widgets/table/e-table-group-container.c:985
-#: ../widgets/table/e-table-group-container.c:986
-#: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-group-leaf.c:631
-#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
-#: ../widgets/text/e-text.c:3738 ../widgets/text/e-text.c:3739
+#: ../addressbook/gui/widgets/e-minicard-label.c:122
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
+#: ../widgets/misc/e-reflow.c:1428 ../widgets/misc/e-reflow.c:1429
+#: ../widgets/table/e-table-click-to-add.c:528
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-container.c:988
+#: ../widgets/table/e-table-group-leaf.c:635
+#: ../widgets/table/e-table-group-leaf.c:636
+#: ../widgets/table/e-table-item.c:3075 ../widgets/table/e-table-item.c:3076
+#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
 msgid "Height"
 msgstr "Altura"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:130
-#: ../addressbook/gui/widgets/e-minicard.c:170
+#: ../addressbook/gui/widgets/e-minicard-label.c:129
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "Possui foco"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:137
+#: ../addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Campo"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:144
+#: ../addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr "Nome do campo"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:151
+#: ../addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr "Modelo de texto"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:158
+#: ../addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
 msgstr "Comprimento mÃ¡ximo do campo de nome"
 
@@ -3352,7 +2177,7 @@ msgstr "Comprimento mÃ¡ximo do campo de nome"
 msgid "Column Width"
 msgstr "Largura da coluna"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:178
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
 msgid ""
 "\n"
 "\n"
@@ -3362,7 +2187,7 @@ msgstr ""
 "\n"
 "Pesquisando por contatos..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3376,7 +2201,7 @@ msgstr ""
 "\n"
 "ou clique duas vezes aqui para criar um novo contato."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3390,7 +2215,7 @@ msgstr ""
 "\n"
 "Clique duas vezes aqui para criar um novo contato."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:188
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3400,7 +2225,7 @@ msgstr ""
 "\n"
 "Pesquisa pelo contato."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3410,41 +2235,41 @@ msgstr ""
 "\n"
 "NÃ£o hÃ¡ itens neste modo de exibiÃ§Ã£o."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:524
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "Adaptador"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "E-mail profissional"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "E-mail particular"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
-#: ../addressbook/gui/widgets/e-minicard.c:831
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:825
 msgid "Other Email"
 msgstr "Outro e-mail"
 
-#: ../addressbook/gui/widgets/e-minicard.c:178
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "Selecionado"
 
-#: ../addressbook/gui/widgets/e-minicard.c:185
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "Possui cursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:545
 msgid "_Open Link in Browser"
 msgstr "Abrir link no _navegador"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:170
-#: ../mail/em-folder-view.c:2757
+#: ../mail/em-folder-view.c:2694
 msgid "_Copy Link Location"
 msgstr "Copiar local do _link"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:546
 msgid "_Send New Message To..."
 msgstr "En_viar nova mensagem para..."
 
@@ -3453,96 +2278,101 @@ msgstr "En_viar nova mensagem para..."
 msgid "Copy _Email Address"
 msgstr "Copiar _endereÃ§o de e-mail"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:287
-#: ../addressbook/gui/widgets/eab-contact-display.c:361
-#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-display.c:286
+#: ../addressbook/gui/widgets/eab-contact-display.c:360
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "(map)"
 msgstr "(mapa)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:297
-#: ../addressbook/gui/widgets/eab-contact-display.c:381
-#: ../addressbook/gui/widgets/eab-contact-display.c:393
+#: ../addressbook/gui/widgets/eab-contact-display.c:296
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/widgets/eab-contact-display.c:391
 msgid "map"
 msgstr "mapa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:478
-#: ../addressbook/gui/widgets/eab-contact-display.c:838
+#: ../addressbook/gui/widgets/eab-contact-display.c:475
+#: ../addressbook/gui/widgets/eab-contact-display.c:835
 msgid "List Members"
 msgstr "Listar membros"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Department"
 msgstr "Departamento"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
 msgid "Profession"
 msgstr "ProfissÃ£o"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Position"
 msgstr "Cargo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
 msgid "Video Chat"
 msgstr "Bate-papo com vÃdeo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:628
-#: ../calendar/gui/calendar-commands.c:90
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2512
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:576
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:568
-#: ../plugins/hula-account-setup/camel-hula-listener.c:377
-#: ../plugins/hula-account-setup/camel-hula-listener.c:406
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../calendar/gui/calendar-commands.c:89
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/gnome-cal.c:2548
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:572
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:449
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:562
+#: ../plugins/hula-account-setup/camel-hula-listener.c:372
+#: ../plugins/hula-account-setup/camel-hula-listener.c:400
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "Agenda"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "Disponibilidade"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
-#: ../addressbook/gui/widgets/eab-contact-display.c:645
+#: ../addressbook/gui/widgets/eab-contact-display.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:642
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
+msgid "Address"
+msgstr "EndereÃ§o"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:640
 msgid "Home Page"
 msgstr "PÃ¡gina web"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:641
 msgid "Web Log"
 msgstr "Web log"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
-#: ../calendar/gui/e-calendar-view.c:2538
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../calendar/gui/e-calendar-view.c:2580
 msgid "Birthday"
 msgstr "AniversÃ¡rio"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:649
-#: ../calendar/gui/e-calendar-view.c:2539
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
+#: ../calendar/gui/e-calendar-view.c:2581
 msgid "Anniversary"
 msgstr "Bodas"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:856
+#: ../addressbook/gui/widgets/eab-contact-display.c:853
 msgid "Job Title"
 msgstr "FunÃ§Ã£o"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:892
+#: ../addressbook/gui/widgets/eab-contact-display.c:889
 msgid "Home page"
 msgstr "PÃ¡gina web"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:897
 msgid "Blog"
 msgstr "Blog"
 
@@ -3597,12 +2427,11 @@ msgstr "Protocolo sem suporte"
 
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:70
-#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:364
-#: ../calendar/gui/e-cal-model-tasks.c:681
-#: ../calendar/gui/e-calendar-table.c:239
-#: ../calendar/gui/e-calendar-table.c:653 ../calendar/gui/print.c:2564
+#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-cal-model-tasks.c:363
+#: ../calendar/gui/e-cal-model-tasks.c:679
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/print.c:2548
 msgid "Canceled"
 msgstr "Cancelado"
 
@@ -3613,13 +2442,13 @@ msgstr "NÃ£o foi possÃvel cancelar"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:72
-#: ../calendar/gui/comp-editor-factory.c:433
+#: ../calendar/gui/comp-editor-factory.c:432
 msgid "Authentication Failed"
 msgstr "A autenticaÃ§Ã£o falhou"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
 #: ../addressbook/gui/widgets/eab-gui-util.c:73
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../calendar/gui/comp-editor-factory.c:426
 msgid "Authentication Required"
 msgstr "Necessita autenticaÃ§Ã£o"
 
@@ -3740,7 +2569,7 @@ msgid "Error adding list"
 msgstr "Erro ao adicionar lista"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:687
+#: ../addressbook/gui/widgets/eab-gui-util.c:685
 msgid "Error adding contact"
 msgstr "Erro ao adicionar contato"
 
@@ -3757,7 +2586,7 @@ msgid "Error removing list"
 msgstr "Erro ao remover lista"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:234
-#: ../addressbook/gui/widgets/eab-gui-util.c:637
+#: ../addressbook/gui/widgets/eab-gui-util.c:635
 msgid "Error removing contact"
 msgstr "Erro ao remover contato"
 
@@ -3785,7 +2614,7 @@ msgid "Display _All Contacts"
 msgstr "Mostr_ar todos os contatos"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:351
+#: ../addressbook/gui/widgets/eab-gui-util.c:350
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3794,46 +2623,46 @@ msgstr ""
 "%s jÃ¡ existe\n"
 "VocÃª deseja sobrescrevÃª-lo?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:355
+#: ../addressbook/gui/widgets/eab-gui-util.c:354
 msgid "Overwrite"
 msgstr "Sobrescrever"
 
 #. 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:396
-#: ../addressbook/gui/widgets/eab-gui-util.c:399
+#: ../addressbook/gui/widgets/eab-gui-util.c:394
+#: ../addressbook/gui/widgets/eab-gui-util.c:397
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "contato"
 msgstr[1] "contatos"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:445
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:482
+#: ../addressbook/gui/widgets/eab-gui-util.c:480
 msgid "Select Address Book"
 msgstr "Selecionar catÃ¡logo de endereÃ§os"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:596
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:746
 msgid "Move contact to"
 msgstr "Mover contato para"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:750
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Copy contact to"
 msgstr "Copiar contato para"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:753
+#: ../addressbook/gui/widgets/eab-gui-util.c:751
 msgid "Move contacts to"
 msgstr "Mover contatos para"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:755
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Copy contacts to"
 msgstr "Copiar contatos para"
 
@@ -3857,300 +2686,101 @@ msgstr "InformaÃ§Ãµes de contato"
 msgid "Contact information for %s"
 msgstr "InformaÃ§Ãµes de contato para %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:293
+#: ../addressbook/gui/widgets/eab-popup-control.c:291
 msgid "Querying Address Book..."
 msgstr "Consultando o catÃ¡logo de endereÃ§os..."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:141
-#, c-format
-msgid "There is one other contact."
-msgid_plural "There are %d other contacts."
-msgstr[0] "Existe um outro contato."
-msgstr[1] "Existem %d outros contatos."
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:226
-#: ../addressbook/gui/widgets/eab-vcard-control.c:277
-msgid "Show Full vCard"
-msgstr "Mostrar vCard Completo"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:230
-msgid "Show Compact vCard"
-msgstr "Mostrar vCard Compacto"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:282
-msgid "Save in address book"
-msgstr "Salvar no catÃ¡logo de endereÃ§os"
-
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "ExibiÃ§Ã£o de cartÃ£o"
 
-#: ../addressbook/importers/evolution-csv-importer.c:661
-#: ../addressbook/importers/evolution-ldif-importer.c:513
+#: ../addressbook/importers/evolution-csv-importer.c:660
+#: ../addressbook/importers/evolution-ldif-importer.c:512
 #: ../addressbook/importers/evolution-vcard-importer.c:252
-#: ../calendar/importers/icalendar-importer.c:308
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:7
+#: ../calendar/importers/icalendar-importer.c:310
+#: ../calendar/importers/icalendar-importer.c:687 ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "Importando..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:863
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "CSV ou Tab do Outlook (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:864
+#: ../addressbook/importers/evolution-csv-importer.c:862
 msgid "Outlook CSV and Tab Importer"
 msgstr "Importador CSV e Tab do Outlook"
 
-#: ../addressbook/importers/evolution-csv-importer.c:872
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "CSV ou Tab do Mozilla (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:873
+#: ../addressbook/importers/evolution-csv-importer.c:871
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Importador CSV e Tab do Mozilla"
 
-#: ../addressbook/importers/evolution-csv-importer.c:881
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "CSV ou Tab do Evolution (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:882
+#: ../addressbook/importers/evolution-csv-importer.c:880
 msgid "Evolution CSV and Tab Importer"
 msgstr "Importador CSV e Tab do Evolution"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:680
+#: ../addressbook/importers/evolution-ldif-importer.c:679
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Formato de troca de dados LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:681
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "Evolution LDIF importer"
 msgstr "Importador LDIF do Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:549
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:550
+#: ../addressbook/importers/evolution-vcard-importer.c:549
 msgid "Evolution vCard Importer"
 msgstr "Importador vCard do Evolution"
 
-#: ../addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
-
-#: ../addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
-
-#: ../addressbook/printing/e-contact-print.glade.h:3
-msgid "Blank forms at end:"
-msgstr "FormulÃ¡rios vazios no fim:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "Corpo"
-
-#: ../addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "Inferior:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "DimensÃµes:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:7
-msgid "F_ont..."
-msgstr "_Fonte..."
-
-#: ../addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "Fontes"
-
-#: ../addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "RodapÃ©:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "Formato"
-
-#: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:433 ../widgets/table/e-table-click-to-add.c:502
-#: ../widgets/table/e-table-field-chooser-dialog.c:81
-#: ../widgets/table/e-table-field-chooser-item.c:647
-#: ../widgets/table/e-table-field-chooser.c:80
-#: ../widgets/table/e-table-header-item.c:1907
-#: ../widgets/table/e-table-selection-model.c:309
-msgid "Header"
-msgstr "CabeÃ§alho"
-
-#: ../addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "CabeÃ§alho/RodapÃ©"
-
-#: ../addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "CabeÃ§alhos"
-
-#: ../addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "CabeÃ§alhos para cada carta"
-
-#: ../addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "Altura:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "Aparecem uma apÃ³s a outra"
-
-#: ../addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "Incluir:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "Paisagem"
-
-#: ../addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "Esquerda:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "TabulaÃ§Ãµes ao lado"
-
-#: ../addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "Margens"
-
-#: ../addressbook/printing/e-contact-print.glade.h:22
-msgid "Number of columns:"
-msgstr "NÃºmero de colunas:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "OpÃ§Ãµes"
-
-#: ../addressbook/printing/e-contact-print.glade.h:24
-msgid "Orientation"
-msgstr "OrientaÃ§Ã£o"
-
-#: ../addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "PÃ¡gina"
-
-#: ../addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "ConfiguraÃ§Ã£o de pÃ¡gina:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "Papel"
-
-#: ../addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "Origem do papel:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "Retrato"
-
-#: ../addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "Visualizar:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "Imprimir usando sombreamento"
-
-#: ../addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "Inverter nas pÃ¡ginas pares"
-
-#: ../addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "Direita:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "SeÃ§Ãµes:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "Sombreamento"
-
-#. FIXME: Take care of i18n
-#: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1141
-#: ../plugins/exchange-operations/exchange-calendar.c:236
-#: ../plugins/exchange-operations/exchange-contacts.c:222
-msgid "Size:"
-msgstr "Tamanho:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "ComeÃ§ar em uma nova pÃ¡gina"
-
-#: ../addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "Nome do estilo:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "Superior:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:154
-msgid "Type:"
-msgstr "Tipo:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "Largura:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:42
-msgid "_Font..."
-msgstr "_Fonte..."
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:656
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:692
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
 msgid "Can not open file"
 msgstr "NÃ£o foi possÃvel abrir o arquivo"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
 msgid "Couldn't get list of address books"
 msgstr "NÃ£o foi possÃvel obter a lista de catÃ¡logos de endereÃ§os"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
 msgid "failed to open book"
 msgstr "falha ao abrir o catÃ¡logo"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:48
+#: ../addressbook/tools/evolution-addressbook-export.c:45
 msgid "Specify the output file instead of standard output"
 msgstr "Especifique um arquivo de saÃda no lugar da saÃda padrÃ£o"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:46
 msgid "OUTPUTFILE"
 msgstr "ARQUIVO_DE_SAÃ?DA"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:52
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "List local address book folders"
 msgstr "Listar as pastas locais do catÃ¡logo de endereÃ§os"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:55
+#: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "Show cards as vcard or csv file"
 msgstr "Mostrar cartÃµes como vCard ou um arquivo csv"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:53
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Export in asynchronous mode"
 msgstr "Exportar em modo assÃncrono"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:62
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
@@ -4158,30 +2788,30 @@ msgstr ""
 "O nÃºmero de cartÃµes em um arquivo de saÃda no modo assÃncrono, tamanho "
 "padrÃ£o 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:64
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "NUMBER"
 msgstr "NÃ?MERO"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:101
+#: ../addressbook/tools/evolution-addressbook-export.c:99
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Erro nos argumentos de linha de comando. Por favor, use a opÃ§Ã£o --help para "
 "ver o uso correto."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:115
+#: ../addressbook/tools/evolution-addressbook-export.c:113
 msgid "Only support csv or vcard format."
 msgstr "Apenas os formatos csv ou vCard com suporte."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:124
+#: ../addressbook/tools/evolution-addressbook-export.c:122
 msgid "In async mode, output must be file."
 msgstr "No modo assÃncrono a saÃda deve ser um arquivo."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:132
+#: ../addressbook/tools/evolution-addressbook-export.c:130
 msgid "In normal mode, there is no need for the size option."
 msgstr "No modo normal nÃ£o Ã© necessÃ¡ria a opÃ§Ã£o de tamanho."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:163
+#: ../addressbook/tools/evolution-addressbook-export.c:161
 msgid "Unhandled error"
 msgstr "Erro nÃ£o manipulado"
 
@@ -4602,7 +3232,7 @@ msgstr ""
 msgid "_Discard Changes"
 msgstr "_Descartar alteraÃ§Ãµes"
 
-#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:497
+#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:343
 msgid "_Save"
 msgstr "_Salvar"
 
@@ -4624,56 +3254,56 @@ msgstr "_Enviar notificaÃ§Ã£o"
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:258
+#: ../calendar/conduits/calendar/calendar-conduit.c:248
 msgid "Split Multi-Day Events:"
 msgstr "Dividir eventos de vÃ¡rios dias:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1523
-#: ../calendar/conduits/calendar/calendar-conduit.c:1524
-#: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/memo/memo-conduit.c:822
-#: ../calendar/conduits/todo/todo-conduit.c:1019
-#: ../calendar/conduits/todo/todo-conduit.c:1020
+#: ../calendar/conduits/calendar/calendar-conduit.c:1513
+#: ../calendar/conduits/calendar/calendar-conduit.c:1514
+#: ../calendar/conduits/memo/memo-conduit.c:807
+#: ../calendar/conduits/memo/memo-conduit.c:808
+#: ../calendar/conduits/todo/todo-conduit.c:1007
+#: ../calendar/conduits/todo/todo-conduit.c:1008
 msgid "Could not start evolution-data-server"
 msgstr "NÃ£o foi possÃvel iniciar o evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1631
-#: ../calendar/conduits/calendar/calendar-conduit.c:1634
+#: ../calendar/conduits/calendar/calendar-conduit.c:1621
+#: ../calendar/conduits/calendar/calendar-conduit.c:1624
 msgid "Could not read pilot's Calendar application block"
 msgstr "NÃ£o foi possÃvel ler os dados do aplicativo de agenda do PDA"
 
-#: ../calendar/conduits/memo/memo-conduit.c:915
-#: ../calendar/conduits/memo/memo-conduit.c:918
+#: ../calendar/conduits/memo/memo-conduit.c:901
+#: ../calendar/conduits/memo/memo-conduit.c:904
 msgid "Could not read pilot's Memo application block"
 msgstr "NÃ£o foi possÃvel ler os dados do aplicativo de memorandos do PDA"
 
-#: ../calendar/conduits/memo/memo-conduit.c:962
-#: ../calendar/conduits/memo/memo-conduit.c:965
+#: ../calendar/conduits/memo/memo-conduit.c:948
+#: ../calendar/conduits/memo/memo-conduit.c:951
 msgid "Could not write pilot's Memo application block"
 msgstr "NÃ£o foi possÃvel gravar os dados do aplicativo de memorandos do PDA"
 
-#: ../calendar/conduits/todo/todo-conduit.c:241
+#: ../calendar/conduits/todo/todo-conduit.c:227
 msgid "Default Priority:"
 msgstr "Prioridade padrÃ£o:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1103
-#: ../calendar/conduits/todo/todo-conduit.c:1106
+#: ../calendar/conduits/todo/todo-conduit.c:1091
+#: ../calendar/conduits/todo/todo-conduit.c:1094
 msgid "Could not read pilot's ToDo application block"
 msgstr "NÃ£o foi possÃvel ler os dados do aplicativo de tarefas do PDA"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1148
-#: ../calendar/conduits/todo/todo-conduit.c:1151
+#: ../calendar/conduits/todo/todo-conduit.c:1136
+#: ../calendar/conduits/todo/todo-conduit.c:1139
 msgid "Could not write pilot's ToDo application block"
 msgstr "NÃ£o foi possÃvel gravar os dados do aplicativo de tarefas do PDA"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2523
+#: ../plugins/itip-formatter/itip-formatter.c:2549
 msgid "Calendar and Tasks"
 msgstr "Agenda e tarefas"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:869
-#: ../calendar/gui/calendar-component.c:1291
+#: ../calendar/gui/calendar-component.c:819
+#: ../calendar/gui/calendar-component.c:1238
 msgid "Calendars"
 msgstr "Agendas"
 
@@ -4715,24 +3345,24 @@ msgid "Memo_s"
 msgstr "Memorando_s"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:278 ../calendar/gui/e-memos.c:1133
-#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:594
-#: ../calendar/gui/memos-component.c:912 ../calendar/gui/memos-control.c:350
-#: ../calendar/gui/memos-control.c:366
+#: ../calendar/gui/e-memo-table.c:293 ../calendar/gui/e-memos.c:1123
+#: ../calendar/gui/gnome-cal.c:1846 ../calendar/gui/memos-component.c:564
+#: ../calendar/gui/memos-component.c:882 ../calendar/gui/memos-control.c:386
+#: ../calendar/gui/memos-control.c:402
 msgid "Memos"
 msgstr "Memorandos"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:714 ../calendar/gui/e-tasks.c:1437
-#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
-#: ../calendar/gui/tasks-component.c:586 ../calendar/gui/tasks-component.c:908
-#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
+#: ../calendar/gui/e-calendar-table.c:725 ../calendar/gui/e-tasks.c:1426
+#: ../calendar/gui/gnome-cal.c:1714 ../calendar/gui/print.c:1973
+#: ../calendar/gui/tasks-component.c:557 ../calendar/gui/tasks-component.c:879
+#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
 #: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:588
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
+#: ../calendar/importers/icalendar-importer.c:751
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:586
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:563
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Tarefas"
@@ -4743,7 +3373,7 @@ msgstr "_Agendas"
 
 #. Tasks
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../plugins/pst-import/pst-importer.c:331 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:328 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tarefas"
 
@@ -4751,27 +3381,27 @@ msgstr "_Tarefas"
 msgid "Evolution Calendar alarm notification service"
 msgstr "ServiÃ§o de notificaÃ§Ã£o de alarme da agenda do Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:100
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
-#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/caldav/caldav-source.c:431
-#: ../plugins/calendar-http/calendar-http.c:280
-#: ../plugins/calendar-weather/calendar-weather.c:525
-#: ../plugins/google-account-setup/google-source.c:653
-#: ../plugins/google-account-setup/google-contacts-source.c:367
+#: ../calendar/gui/dialogs/event-page.glade.h:23
+#: ../plugins/caldav/caldav-source.c:449
+#: ../plugins/calendar-file/calendar-file.c:287
+#: ../plugins/calendar-http/calendar-http.c:324
+#: ../plugins/calendar-weather/calendar-weather.c:524
+#: ../plugins/google-account-setup/google-source.c:721
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:293
 msgid "Start time"
 msgstr "Hora de inÃcio"
 
@@ -4786,10 +3416,10 @@ msgstr "Desc_artar tudo"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1608
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1614
-#: ../calendar/gui/e-itip-control.c:1167
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1592
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
+#: ../calendar/gui/e-itip-control.c:1164
+#: ../plugins/itip-formatter/itip-view.c:1023
 msgid "Location:"
 msgstr "Local:"
 
@@ -4802,11 +3432,11 @@ msgid "_Dismiss"
 msgstr "_Descartar"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1382
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:170
+#: ../calendar/gui/dialogs/comp-editor.c:1038
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
@@ -4822,32 +3452,32 @@ msgstr "_Adiar"
 msgid "location of appointment"
 msgstr "localizaÃ§Ã£o do compromisso"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1591
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1451
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1575
 msgid "No summary available."
 msgstr "Sem resumo disponÃvel."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1475
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1460
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
 msgid "No description available."
 msgstr "Sem descriÃ§Ã£o disponÃvel."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
 msgid "No location information available."
 msgstr "Sem informaÃ§Ã£o de local disponÃvel."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1530
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1515
 #, c-format
 msgid "You have %d alarms"
 msgstr "VocÃª tem %d alarmes"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1675
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Warning"
 msgstr "Alerta"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1679
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4859,7 +3489,7 @@ msgstr ""
 "com notificaÃ§Ãµes por e-mail. Em lugar disso, o Evolution\n"
 "exibirÃ¡ uma caixa de diÃ¡logo de lembrete normal."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1726
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1709
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4876,7 +3506,7 @@ msgstr ""
 "\n"
 "VocÃª tem certeza de que deseja executar este programa?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1740
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
 msgid "Do not ask me about this program again."
 msgstr "NÃ£o me pergunte sobre este programa novamente."
 
@@ -4951,123 +3581,135 @@ msgid "Calendars to run alarms for"
 msgstr "Agendas que devem ter alarmes"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
+msgid "Check this to use system timezone in Evolution."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 "Cor utilizada para desenhar a linha Marcus Bains na barra de Tempo (vazia "
 "por padrÃ£o)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Cor utilizada para desenhar a linha Marcus Bains na exibiÃ§Ã£o de dia."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Compress weekends in month view"
 msgstr "Comprimir finais de semana na exibiÃ§Ã£o de mÃªs"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Confirm expunge"
 msgstr "Confirmar ao excluir permanentemente uma pasta"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+msgid "Count of default recurrence for a new event. -1 means forever."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr ""
 "Dias nos quais o inÃcio e fim das horas de trabalho devem ser indicados."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
 msgstr "Lembrete de compromisso padrÃ£o"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+msgid "Default recurrence count"
+msgstr "Contagem de recorrÃªncia padrÃ£o"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder units"
 msgstr "Unidades de lembrete padrÃ£o"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Default reminder value"
 msgstr "Valor de lembrete padrÃ£o"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Directory for saving alarm audio files"
 msgstr "DiretÃ³rio para salvar os arquivos de Ã¡udio do alarme"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Gradient"
 msgstr "Gradiente do evento"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Event Transparency"
 msgstr "TransparÃªncia do evento"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy server URLs"
 msgstr "URLs do servidor de disponibilidade"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Free/busy template URL"
 msgstr "Modelo de URL de disponibilidade"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Gradient of the events in calendar views."
 msgstr "Gradiente dos eventos na exibiÃ§Ã£o de calendÃ¡rio."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide completed tasks"
 msgstr "Ocultar tarefas concluÃdas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task units"
 msgstr "Unidades para ocultar tarefas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Hide task value"
 msgstr "Valor para ocultar tarefas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Horizontal pane position"
 msgstr "PosiÃ§Ã£o do painel horizontal"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "Hora em que o dia de trabalho termina, em formato de 24 horas, 0 a 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Hora em que o dia de trabalho comeÃ§a, em formato de 24 horas, 0 a 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Intervalos mostrados nas exibiÃ§Ãµes de dia e semana Ãºtil, em minutos."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Last alarm time"
 msgstr "Hora do Ãºltimo alarme"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Level beyond which the message should be logged."
 msgstr "NÃvel alÃ©m de que a mensagem dever ser registrada."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "List of recently used second time zones in a Day View."
 msgstr "Lista dos fuso horÃ¡rios usados recentemente na VisÃ£o de Dia."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "List of server URLs for free/busy publishing."
 msgstr "Lista de URLs de servidores para a publicaÃ§Ã£o de disponibilidade."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "Marcus Bains Line"
 msgstr "Linha Marcus Bains"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Cor da linha Marcus Bains - exibiÃ§Ã£o de dia"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Cor da linha Marcus Bains - barra de tempo"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
@@ -5075,39 +3717,39 @@ msgstr ""
 "NÃºmero mÃ¡ximo de fusos horÃ¡rios a serem lembrados na lista \"day_second_zones"
 "\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid "Maximum number of recently used timezones to remember."
 msgstr "NÃºmero mÃ¡ximo de fusos horÃ¡rios usados recentemente a serem lembrados."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minuto em que termina o dia de trabalho, 0 a 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minuto em que comeÃ§a o dia de trabalho, 0 a 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Month view horizontal pane position"
 msgstr "PosiÃ§Ã£o do painel horizontal na exibiÃ§Ã£o de mÃªs"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Month view vertical pane position"
 msgstr "PosiÃ§Ã£o do painel vertical na exibiÃ§Ã£o de mÃªs"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid "Number of units for determining a default reminder."
 msgstr "NÃºmero de unidades para determinar o lembrete padrÃ£o."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Number of units for determining when to hide tasks."
 msgstr "NÃºmero de unidades para determinar quando ocultar tarefas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Overdue tasks color"
 msgstr "Cor para tarefas atrasadas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -5115,7 +3757,7 @@ msgstr ""
 "PosiÃ§Ã£o do painel horizontal, entre a agenda de navegaÃ§Ã£o de datas e a lista "
 "de tarefas quando nÃ£o estiver em modo de exibiÃ§Ã£o por mÃªs, em pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5123,7 +3765,7 @@ msgstr ""
 "PosiÃ§Ã£o do painel horizontal, entre a exibiÃ§Ã£o e a agenda de navegaÃ§Ã£o de "
 "datas e a lista de tarefas em modo de exibiÃ§Ã£o de mÃªs, em pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -5131,7 +3773,7 @@ msgstr ""
 "PosiÃ§Ã£o da divisÃ£o vertical, entre a lista de agenda e agenda de navegaÃ§Ã£o "
 "de datas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -5139,7 +3781,7 @@ msgstr ""
 "PosiÃ§Ã£o do painel vertical, entre a lista de tarefas e o painel de "
 "visualizaÃ§Ã£o da tarefa, em pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5147,7 +3789,7 @@ msgstr ""
 "PosiÃ§Ã£o do painel vertical, entre a exibiÃ§Ã£o e a agenda de navegaÃ§Ã£o de "
 "datas e a lista de tarefas no modo de exibiÃ§Ã£o de mÃªs, em pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -5156,69 +3798,85 @@ msgstr ""
 "datas e a lista de tarefas quando nÃ£o estiver em modo de exibiÃ§Ã£o de mÃªs, em "
 "pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+msgid "Primary calendar"
+msgstr "CalendÃ¡rio principal"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+msgid "Primary memo list"
+msgstr "Lista de memorandos principal"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+msgid "Primary task list"
+msgstr "Lista de tarefas principal"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programas que podem ser executados como parte de alarmes."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid "Recently used second time zones in a Day View"
 msgstr "Fusos horÃ¡rios secundÃ¡rios recentemente usados na VisÃ£o de Dia"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid "Save directory for alarm audio"
 msgstr "Salvar diretÃ³rio para o Ã¡udio do alarme"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+msgid "Scroll Month View by a week"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Mostrar o campo RSVP no editor de eventos, tarefas e encontros"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Mostrar o campo papel no editor de eventos, tarefas e encontros"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Show appointment end times in week and month views"
 msgstr "Mostrar hora de tÃ©rmino de compromissos nas exibiÃ§Ãµes de semana e mÃªs"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Mostrar campo categorias no editor de eventos, tarefas e encontros"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Show display alarms in notification tray"
 msgstr "Mostrar alarmes na Ã¡rea de notificaÃ§Ã£o"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Mostrar campo status no editor de eventos, tarefas e encontros"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show the \"Preview\" pane"
 msgstr "Mostrar o painel de \"VisualizaÃ§Ã£o\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show the \"Preview\" pane."
 msgstr "Mostrar o painel de \"VisualizaÃ§Ã£o\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Mostrar o campo fuso horÃ¡rio no editor de eventos e encontros"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Mostrar campo tipo no editor de eventos, tarefas e encontros"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show week number in Day and Work Week View"
 msgstr "Mostrar o nÃºmeros da semana nas visÃµes de Dia e de Semana Ã?til"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show week numbers in date navigator"
 msgstr "Mostrar os nÃºmeros da semana no navegador de datas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
@@ -5226,15 +3884,15 @@ msgstr ""
 "Mostra o fuso horÃ¡rio secundÃ¡rio na VisÃ£o de Dia. Seu valor Ã© similar ao "
 "usado na chave \"timezone\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Tasks due today color"
 msgstr "Cor para tarefas com prazo para hoje"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Tasks vertical pane position"
 msgstr "PosiÃ§Ã£o do painel vertical de tarefas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5244,7 +3902,7 @@ msgstr ""
 "substituÃdo pela parte referente ao usuÃ¡rio do endereÃ§o de e-mail e %d Ã© "
 "substituÃdo pelo domÃnio."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5253,11 +3911,11 @@ msgstr ""
 "fuso horÃ¡rio nÃ£o traduzido do banco de dados Olsen de fusos como, por "
 "exemplo, \"America/New York\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "The second timezone for a Day View"
 msgstr "O fuso horÃ¡rio secundÃ¡rio para a VisÃ£o de Dia"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
@@ -5265,20 +3923,19 @@ msgstr ""
 "Isso admite trÃªs valores possÃveis: \"0\" para erros, \"1\" para avisos. \"2"
 "\" para mensagens de depuraÃ§Ã£o."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Time divisions"
 msgstr "FraÃ§Ãµes de tempo"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Time the last alarm ran, in time_t."
 msgstr "A Ãºltima vez que o alarme disparou, em time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
-#: ../plugins/startup-wizard/startup-wizard.c:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Timezone"
 msgstr "Fuso horÃ¡rio"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -5286,44 +3943,64 @@ msgstr ""
 "TransparÃªncia dos eventos na exibiÃ§Ã£o de agenda, um valor entre 0 "
 "(transparente) e 1 (opaco)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Twenty four hour time format"
 msgstr "Formato de hora em vinte e quatro horas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+msgid "URI of the highlighted (\"primary\") calendar"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+msgid "URI of the highlighted (\"primary\") memo list"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+msgid "URI of the highlighted (\"primary\") task list"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unidades para um lembrete padrÃ£o, \"minutes\" (minutos), \"hours\" (horas) "
 "ou \"days\" (dias)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unidades para determinar quando ocultar as tarefas, \"minutes\" (minutos), "
 "\"hours\" (horas) ou \"days\" (dias)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+msgid "Use system timezone"
+msgstr "Usar fuso horÃ¡rio do sistema"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Week start"
 msgstr "Semana comeÃ§a na"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Dia em que a semana comeÃ§a, de Domingo (0) a SÃ¡bado (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Usar a Ã¡rea de notificaÃ§Ã£o para exibir alarmes."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Pedir confirmaÃ§Ã£o ao excluir compromissos e tarefas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Pedir confirmaÃ§Ã£o ao excluir compromissos e tarefas permanentemente."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5331,146 +4008,146 @@ msgstr ""
 "Comprimir os finais de semana na exibiÃ§Ã£o de mÃªs, colocando SÃ¡bado e Domingo "
 "no espaÃ§o de um dia."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Exibir a hora de tÃ©rmino de compromissos nas exibiÃ§Ãµes de semana e mÃªs."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Desenhar a linha Marcus Bains (linha que marca o tempo atual) na agenda."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Ocultar tarefas concluÃdas na exibiÃ§Ã£o de tarefas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+msgid "Whether to scroll a Month View by a week, not by a month."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Whether to set a default reminder for appointments."
 msgstr "Definir um lembrete padrÃ£o para compromissos."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Mostrar o campo RSVP no editor de eventos, tarefas e encontros"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Mostrar o campo categorias no editor de eventos e encontros"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Mostrar o campo papel no editor de eventos, tarefas e encontros"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Mostrar o campo status no editor de eventos, tarefas e encontros"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Mostrar as horas no formato 24h em vez de usar AM ou PM."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Mostrar o campo fuso horÃ¡rio no editor de eventos e encontros"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Mostrar o campo tipo no editor de eventos, tarefas e encontros"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to show week number in the Day and Work Week View."
 msgstr ""
 "Se deve mostrar ou nÃ£o o nÃºmero da semana nas VisÃµes de Dia de Semana Ã?til."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Mostrar o nÃºmero da semana no navegador de datas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
-msgid "Whether to use daylight savings time while displaying events."
-msgstr "Usar horÃ¡rio de verÃ£o ao exibir os eventos."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Work days"
 msgstr "Dias Ãºteis"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Workday end hour"
 msgstr "Hora em que termina o dia de trabalho"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Workday end minute"
 msgstr "Minuto em que termina o dia de trabalho"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Workday start hour"
 msgstr "Hora em que comeÃ§a o dia de trabalho"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid "Workday start minute"
 msgstr "Minuto em que comeÃ§a o dia de trabalho"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
-msgid "daylight savings time"
-msgstr "horÃ¡rio de verÃ£o"
+#: ../calendar/gui/cal-editor-utils.c:100
+msgid "Invalid object"
+msgstr "Objeto invÃ¡lido"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Summary contains"
 msgstr "Resumo contÃ©m"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Description contains"
 msgstr "DescriÃ§Ã£o contÃ©m"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Category is"
 msgstr "Categoria Ã©"
 
-#: ../calendar/gui/cal-search-bar.c:78
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Comment contains"
 msgstr "ComentÃ¡rio contÃ©m"
 
-#: ../calendar/gui/cal-search-bar.c:79
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Location contains"
 msgstr "Local contÃ©m"
 
-#: ../calendar/gui/cal-search-bar.c:640
+#: ../calendar/gui/cal-search-bar.c:636
 msgid "Next 7 Days' Tasks"
 msgstr "Tarefas dos prÃ³ximos 7 dias"
 
-#: ../calendar/gui/cal-search-bar.c:644
+#: ../calendar/gui/cal-search-bar.c:640
 msgid "Active Tasks"
 msgstr "Tarefas ativas"
 
-#: ../calendar/gui/cal-search-bar.c:648
+#: ../calendar/gui/cal-search-bar.c:644
 msgid "Overdue Tasks"
 msgstr "Tarefas atrasadas"
 
-#: ../calendar/gui/cal-search-bar.c:652
+#: ../calendar/gui/cal-search-bar.c:648
 msgid "Completed Tasks"
 msgstr "Tarefas completadas"
 
-#: ../calendar/gui/cal-search-bar.c:656
+#: ../calendar/gui/cal-search-bar.c:652
 msgid "Tasks with Attachments"
 msgstr "Tarefas com anexos"
 
-#: ../calendar/gui/cal-search-bar.c:702
+#: ../calendar/gui/cal-search-bar.c:698
 msgid "Active Appointments"
 msgstr "Compromissos ativos"
 
-#: ../calendar/gui/cal-search-bar.c:706
+#: ../calendar/gui/cal-search-bar.c:702
 msgid "Next 7 Days' Appointments"
 msgstr "Compromissos dos prÃ³ximos 7 dias"
 
-#: ../calendar/gui/calendar-commands.c:90 ../ui/evolution-addressbook.xml.h:26
-#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
+#: ../calendar/gui/calendar-commands.c:89 ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:71
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Imprimir"
 
-#: ../calendar/gui/calendar-commands.c:315
+#: ../calendar/gui/calendar-commands.c:331
 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 "
@@ -5480,137 +4157,126 @@ msgstr ""
 "quantidade selecionada. Se vocÃª continuar, vocÃª nÃ£o serÃ¡ capaz de recuperar "
 "estes eventos."
 
-#: ../calendar/gui/calendar-commands.c:321
+#: ../calendar/gui/calendar-commands.c:337
 msgid "Purge events older than"
 msgstr "Excluir permanentemente eventos com tempo superior a"
 
-#: ../calendar/gui/calendar-commands.c:326
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/caldav/caldav-source.c:432
-#: ../plugins/calendar-http/calendar-http.c:281
-#: ../plugins/calendar-weather/calendar-weather.c:526
-#: ../plugins/google-account-setup/google-source.c:654
-#: ../plugins/google-account-setup/google-contacts-source.c:368
+#: ../calendar/gui/calendar-commands.c:342
+#: ../plugins/caldav/caldav-source.c:450
+#: ../plugins/calendar-file/calendar-file.c:288
+#: ../plugins/calendar-http/calendar-http.c:325
+#: ../plugins/calendar-weather/calendar-weather.c:525
+#: ../plugins/google-account-setup/google-source.c:722
+#: ../plugins/google-account-setup/google-contacts-source.c:332
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "dias"
 
-#. ensure the group name is in current locale, not read from configuration
-#. Create the On the web source group
-#. ensure the group name is in current locale, not read from configuration
-#. Create the source group
 #. Create the Webcal source group
-#. Create the LDAP source group
-#. ensure the group name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:287
-#: ../calendar/gui/calendar-component.c:290
-#: ../calendar/gui/memos-component.c:240 ../calendar/gui/memos-component.c:243
-#: ../calendar/gui/migration.c:505 ../calendar/gui/migration.c:604
-#: ../calendar/gui/migration.c:1118 ../calendar/gui/tasks-component.c:237
-#: ../calendar/gui/tasks-component.c:243
+#: ../calendar/gui/calendar-component.c:194
+#: ../calendar/gui/memos-component.c:152 ../calendar/gui/migration.c:504
+#: ../calendar/gui/migration.c:603 ../calendar/gui/migration.c:1117
+#: ../calendar/gui/tasks-component.c:149
 msgid "On The Web"
 msgstr "Na Web"
 
-#. ensure the source name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:331
-#: ../calendar/gui/calendar-component.c:333 ../calendar/gui/migration.c:399
-msgid "Birthdays & Anniversaries"
-msgstr "AniversÃ¡rios e bodas"
-
-#. ensure the group name is in current locale, not read from configuration
-#. Create the weather group
-#: ../calendar/gui/calendar-component.c:346
-#: ../calendar/gui/calendar-component.c:349
+#: ../calendar/gui/calendar-component.c:195
 #: ../plugins/calendar-weather/calendar-weather.c:126
 msgid "Weather"
 msgstr "Clima"
 
-#: ../calendar/gui/calendar-component.c:676
+#. ensure the source name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:289
+#: ../calendar/gui/calendar-component.c:291 ../calendar/gui/migration.c:398
+msgid "Birthdays & Anniversaries"
+msgstr "AniversÃ¡rios e bodas"
+
+#: ../calendar/gui/calendar-component.c:626
 msgid "_New Calendar"
 msgstr "_Nova agenda"
 
-#: ../calendar/gui/calendar-component.c:677
-#: ../calendar/gui/memos-component.c:508 ../calendar/gui/tasks-component.c:500
-#: ../mail/em-folder-tree.c:2124
+#: ../calendar/gui/calendar-component.c:627
+#: ../calendar/gui/memos-component.c:478 ../calendar/gui/tasks-component.c:471
+#: ../mail/em-folder-tree.c:2114
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ../calendar/gui/calendar-component.c:682
-#: ../calendar/gui/memos-component.c:513 ../calendar/gui/tasks-component.c:505
+#: ../calendar/gui/calendar-component.c:632
+#: ../calendar/gui/memos-component.c:483 ../calendar/gui/tasks-component.c:476
 msgid "_Make available for offline use"
 msgstr "Tornar _disponÃvel para uso desconectado"
 
-#: ../calendar/gui/calendar-component.c:683
-#: ../calendar/gui/memos-component.c:514 ../calendar/gui/tasks-component.c:506
+#: ../calendar/gui/calendar-component.c:633
+#: ../calendar/gui/memos-component.c:484 ../calendar/gui/tasks-component.c:477
 msgid "_Do not make available for offline use"
 msgstr "_NÃ£o tornar disponÃvel para uso desconectado"
 
-#: ../calendar/gui/calendar-component.c:1013
+#: ../calendar/gui/calendar-component.c:961
 msgid "Failed upgrading calendars."
 msgstr "Falha ao atualizar agendas."
 
-#: ../calendar/gui/calendar-component.c:1142
+#: ../calendar/gui/calendar-component.c:1089
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "NÃ£o Ã© possÃvel abrir a agenda \"%s\" para criar eventos e reuniÃµes"
 
-#: ../calendar/gui/calendar-component.c:1158
+#: ../calendar/gui/calendar-component.c:1105
 msgid "There is no calendar available for creating events and meetings"
 msgstr "NÃ£o hÃ¡ agenda disponÃvel para criar eventos e reuniÃµes"
 
-#: ../calendar/gui/calendar-component.c:1271
+#: ../calendar/gui/calendar-component.c:1218
 msgid "Calendar Source Selector"
 msgstr "Seletor de fonte de agenda"
 
-#: ../calendar/gui/calendar-component.c:1487
+#: ../calendar/gui/calendar-component.c:1433
 msgid "New appointment"
 msgstr "Novo compromisso"
 
-#: ../calendar/gui/calendar-component.c:1488
+#: ../calendar/gui/calendar-component.c:1434
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Compromisso"
 
-#: ../calendar/gui/calendar-component.c:1489
+#: ../calendar/gui/calendar-component.c:1435
 msgid "Create a new appointment"
 msgstr "Cria um novo compromisso"
 
-#: ../calendar/gui/calendar-component.c:1495
+#: ../calendar/gui/calendar-component.c:1441
 msgid "New meeting"
 msgstr "Nova reuniÃ£o"
 
-#: ../calendar/gui/calendar-component.c:1496
+#: ../calendar/gui/calendar-component.c:1442
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_ReuniÃ£o"
 
-#: ../calendar/gui/calendar-component.c:1497
+#: ../calendar/gui/calendar-component.c:1443
 msgid "Create a new meeting request"
 msgstr "Cria um novo pedido de reuniÃ£o"
 
-#: ../calendar/gui/calendar-component.c:1503
+#: ../calendar/gui/calendar-component.c:1449
 msgid "New all day appointment"
 msgstr "Novo compromisso de dia inteiro"
 
-#: ../calendar/gui/calendar-component.c:1504
+#: ../calendar/gui/calendar-component.c:1450
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Compromisso de _dia inteiro"
 
-#: ../calendar/gui/calendar-component.c:1505
+#: ../calendar/gui/calendar-component.c:1451
 msgid "Create a new all-day appointment"
 msgstr "Cria um novo compromisso de dia inteiro"
 
-#: ../calendar/gui/calendar-component.c:1511
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New calendar"
 msgstr "Nova agenda"
 
-#: ../calendar/gui/calendar-component.c:1512
+#: ../calendar/gui/calendar-component.c:1458
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Age_nda"
 
-#: ../calendar/gui/calendar-component.c:1513
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new calendar"
 msgstr "Cria uma nova agenda"
 
@@ -5652,20 +4318,20 @@ msgid "Category"
 msgstr "Categoria"
 
 #: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
-#: ../widgets/misc/e-send-options.glade.h:6
 msgid "Classification"
 msgstr "ClassificaÃ§Ã£o"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:557
+#: ../calendar/gui/e-cal-model.c:370 ../calendar/gui/e-calendar-table.c:565
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:341
+#: ../plugins/email-custom-header/email-custom-header.c:340
 msgid "Confidential"
 msgstr "Confidencial"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
 #: ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:59
+#: ../widgets/misc/e-attachment-tree-view.c:496
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "DescriÃ§Ã£o"
@@ -5685,21 +4351,27 @@ msgstr "NÃ£o existe"
 msgid "Exist"
 msgstr "Existe"
 
-#: ../calendar/gui/caltypes.xml.h:13
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-#: ../calendar/gui/memotypes.xml.h:11 ../calendar/gui/tasktypes.xml.h:19
+#: ../calendar/gui/caltypes.xml.h:12
+#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
+#: ../plugins/publish-calendar/publish-calendar.c:722
+#: ../plugins/save-calendar/csv-format.c:371
+msgid "Location"
+msgstr "Local"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "Organizador"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:556
+#: ../calendar/gui/e-cal-model.c:368 ../calendar/gui/e-calendar-table.c:564
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Particular"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
-#: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348
-#: ../calendar/gui/e-calendar-table.c:555 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:359 ../calendar/gui/e-cal-model.c:366
+#: ../calendar/gui/e-calendar-table.c:563 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "PÃºblico"
 
@@ -5709,11 +4381,11 @@ msgid "Recurrence"
 msgstr "RecorrÃªncia"
 
 #: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:13
+#: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:357
 msgid "Summary"
 msgstr "Resumo"
 
@@ -5733,35 +4405,55 @@ msgid "does not contain"
 msgstr "nÃ£o contÃ©m"
 
 #: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:30
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
 msgid "is"
 msgstr "Ã©"
 
 #: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
 msgid "is not"
 msgstr "nÃ£o Ã©"
 
-#: ../calendar/gui/comp-editor-factory.c:409
+#: ../calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr "Erro ao abrir a agenda"
 
-#: ../calendar/gui/comp-editor-factory.c:415
+#: ../calendar/gui/comp-editor-factory.c:414
 msgid "Method not supported when opening the calendar"
 msgstr "MÃ©todo sem suporte ao abrir a agenda"
 
-#: ../calendar/gui/comp-editor-factory.c:421
+#: ../calendar/gui/comp-editor-factory.c:420
 msgid "Permission denied to open the calendar"
 msgstr "PermissÃ£o negada para abrir a agenda"
 
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
+#: ../calendar/gui/comp-editor-factory.c:438 ../shell/e-shell.c:1261
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:601
+#: ../calendar/gui/dialogs/alarm-dialog.c:611
 msgid "Edit Alarm"
 msgstr "Editar alarme"
 
+#: ../calendar/gui/dialogs/alarm-dialog.c:796
+#: ../calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
+msgstr "Exibir um alerta"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:797
+#: ../calendar/gui/e-alarm-list.c:444
+msgid "Play a sound"
+msgstr "Tocar um som"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:798
+#: ../calendar/gui/e-alarm-list.c:456
+msgid "Run a program"
+msgstr "Executar um programa"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:799
+#: ../calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
+msgstr "Enviar um e-mail"
+
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
 msgstr "<b>Alarme</b>"
@@ -5791,83 +4483,68 @@ msgid "Mes_sage:"
 msgstr "Men_sagem:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:444
-msgid "Play a sound"
-msgstr "Tocar um som"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:448
-msgid "Pop up an alert"
-msgstr "Exibir um alerta"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:456
-msgid "Run a program"
-msgstr "Executar um programa"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "Select A File"
 msgstr "Selecionar um arquivo"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
 msgid "Send To:"
 msgstr "Enviar para:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:452
-msgid "Send an email"
-msgstr "Enviar um e-mail"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
 msgid "_Arguments:"
 msgstr "_Argumentos:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "_Program:"
 msgstr "_Programa:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "_Repeat the alarm"
 msgstr "_Repetir o alarme"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 msgid "_Sound:"
 msgstr "_Som:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
-msgid "after"
-msgstr "apÃ³s"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
-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:20
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "day(s)"
-msgstr "dia(s)"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
-msgid "end of appointment"
-msgstr "fim do compromisso"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+msgid ""
+"before\n"
+"after"
+msgstr ""
+"antes\n"
+"depois"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "extra times every"
 msgstr "vezes extra a cada"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-msgid "hour(s)"
-msgstr "hora(s)"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+msgid ""
+"minute(s)\n"
+"hour(s)\n"
+"day(s)"
+msgstr ""
+"minuto(s)\n"
+"hora(s)\n"
+"dia(s)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-msgid "minute(s)"
-msgstr "minuto(s)"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
+msgid ""
+"minutes\n"
+"hours\n"
+"days"
+msgstr ""
+"minutos\n"
+"horas\n"
+"dias"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
-msgid "start of appointment"
-msgstr "inÃcio do compromisso"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid ""
+"start of appointment\n"
+"end of appointment"
+msgstr ""
+"inÃcio do compromisso\n"
+"fim do compromisso"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
@@ -5878,47 +4555,54 @@ msgid "A_dd"
 msgstr "A_dicionar"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
-#: ../composer/e-composer-actions.c:62
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:80
+#: ../widgets/misc/e-attachment-dialog.c:371
+#: ../widgets/misc/e-attachment-store.c:553
 msgid "_Suggest automatic display of attachment"
 msgstr "_Sugerir exibiÃ§Ã£o automÃ¡tica do anexo"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:141
 msgid "Attach file(s)"
 msgstr "Anexar arquivo(s)"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ../calendar/gui/dialogs/event-page.c:2955
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-day-view-time-item.c:788
-#: ../calendar/gui/e-itip-control.c:1153 ../filter/filter-rule.c:945
-#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:136
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:185
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/event-page.c:2993
+#: ../calendar/gui/e-cal-model-tasks.c:671
+#: ../calendar/gui/e-day-view-time-item.c:785
+#: ../calendar/gui/e-itip-control.c:1150 ../filter/filter-rule.c:942
+#: ../mail/em-account-editor.c:717 ../mail/em-account-editor.c:1451
+#: ../mail/em-account-prefs.c:435 ../mail/em-junk-hook.c:93
 #: ../plugins/calendar-weather/calendar-weather.c:333
 #: ../plugins/calendar-weather/calendar-weather.c:387
-#: ../plugins/email-custom-header/email-custom-header.c:395
-#: ../plugins/exchange-operations/exchange-delegates-user.c:195
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2179
-#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
-#: ../widgets/misc/e-dateedit.c:1725
+#: ../plugins/email-custom-header/email-custom-header.c:394
+#: ../plugins/exchange-operations/exchange-delegates-user.c:179
+#: ../plugins/itip-formatter/itip-formatter.c:2208
+#: ../widgets/misc/e-cell-date-edit.c:312 ../widgets/misc/e-dateedit.c:1463
+#: ../widgets/misc/e-dateedit.c:1674
 #: ../widgets/misc/e-signature-combo-box.c:74
 msgid "None"
 msgstr "Nenhum"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:648
 msgid "Selected Calendars for Alarms"
 msgstr "Agendas que devem ter alarmes"
 
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:865
+msgid "Time and date:"
+msgstr "HorÃ¡rio e data:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:866
+msgid "Date only:"
+msgstr "Somente data:"
+
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "(Shown in a Day View)"
 msgstr "(Mostrado na VisÃ£o de Dia)"
@@ -5945,51 +4629,60 @@ msgstr ""
 "<i>%u e %d serÃ£o trocados pelo usuÃ¡rio e domÃnio do endereÃ§o de e-mail.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: ../mail/mail-config.glade.h:10
+msgid "<span weight=\"bold\">Alarms</span>"
+msgstr "<span weight=\"bold\">Alarmes</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../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:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../mail/mail-config.glade.h:13
+msgid "<span weight=\"bold\">Date/Time Format</span>"
+msgstr "<span weight=\"bold\">Formato de data/horÃ¡rio</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">Servidor padrÃ£o de disponibilidade</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 #: ../mail/mail-config.glade.h:17
 #: ../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:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "<span weight=\"bold\">Task List</span>"
 msgstr "<span weight=\"bold\">Lista de tarefas</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">Tempo</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">Semana de trabalho</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Adjust for daylight sa_ving time"
-msgstr "Ajustar ao horÃ¡rio de _verÃ£o"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Day _ends:"
 msgstr "O _dia termina Ã s:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Display"
 msgstr "ExibiÃ§Ã£o"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
-#: ../calendar/gui/e-itip-control.c:733
+msgid "Display alarms in _notification area only"
+msgstr "Mostrar alarmes somente _na Ã¡rea de notificaÃ§Ã£o"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Friday"
 msgstr "Sexta-feira"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5999,13 +4692,13 @@ msgstr ""
 "Horas\n"
 "Dias"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Monday"
 msgstr "Segunda-feira"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -6023,219 +4716,235 @@ msgstr ""
 "SÃ¡bado\n"
 "Domingo"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../mail/mail-config.glade.h:114
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../mail/mail-config.glade.h:118
 msgid "Pick a color"
 msgstr "Escolha uma cor"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "S_un"
 msgstr "_Dom"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Saturday"
 msgstr "SÃ¡bado"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+msgid "Sc_roll Month View by a week"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Se_cond zone:"
 msgstr "Fuso se_cundÃ¡rio:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Select the calendars for alarm notification"
 msgstr "Selecione as agendas para notificaÃ§Ã£o por alarme"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Sh_ow a reminder"
 msgstr "Mostrar um _lembrete"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Show a _reminder"
 msgstr "Mostrar _um lembrete"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Show week _numbers in date navigator"
 msgstr "Mostrar _nÃºmeros da semana no navegador de datas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Show week n_umber in Day and Work Week View"
 msgstr "Mostrar o nÃºmero da semana nas VisÃµes de Dia e de Semana Ã?til"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:726
 msgid "Sunday"
 msgstr "Domingo"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "T_asks due today:"
 msgstr "T_arefas com prazo para hoje:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "T_hu"
 msgstr "Qu_i"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Template:"
 msgstr "Modelo:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Thursday"
 msgstr "Quinta-feira"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "Time _zone:"
 msgstr "F_uso horÃ¡rio:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Time format:"
 msgstr "Formato de hora:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Tuesday"
 msgstr "TerÃ§a-feira"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+msgid "Use s_ystem time zone"
+msgstr "Usar fuso horÃ¡rio do s_istema"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "Wee_k starts on:"
 msgstr "A sema_na comeÃ§a na:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "Work days:"
 msgstr "Dias Ãºteis:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_12 hour (AM/PM)"
 msgstr "_12 horas (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_24 hour"
 msgstr "_24 horas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Ask for confirmation when deleting items"
 msgstr "Pedir confirm_aÃ§Ã£o ao excluir itens"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Compress weekends in month view"
 msgstr "_Comprimir finais de semana na exibiÃ§Ã£o de mÃªs"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Day begins:"
 msgstr "_O dia comeÃ§a Ã s:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Fri"
 msgstr "Se_x"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Hide completed tasks after"
 msgstr "E_sconder tarefas concluÃdas apÃ³s"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
 msgid "_Mon"
 msgstr "_Seg"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Overdue tasks:"
 msgstr "Ta_refas atrasadas:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 msgid "_Sat"
 msgstr "SÃ¡_b"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
 msgid "_Show appointment end times in week and month view"
 msgstr "Mostrar _hora de tÃ©rmino de compromissos nas exibiÃ§Ãµes de semana e mÃªs"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
 msgid "_Time divisions:"
 msgstr "_FraÃ§Ãµes de tempo:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
 msgid "_Tue"
 msgstr "_Ter"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:81
 msgid "_Wed"
 msgstr "_Qua"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:83
 msgid "before every anniversary/birthday"
 msgstr "antes de cada aniversÃ¡rio"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:85
 msgid "before every appointment"
 msgstr "antes de cada compromisso"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:271
+#: ../calendar/gui/dialogs/calendar-setup.c:153
+msgid "Type:"
+msgstr "Tipo:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "Cop_iar localmente o conteÃºdo da agenda para operaÃ§Ãµes desconectadas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:273
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
 msgstr ""
 "Cop_iar localmente o conteÃºdo da lista de tarefas para operaÃ§Ãµes "
 "desconectadas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:275
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr ""
 "Cop_iar conteÃºdo da lista de memorandos localmente para operaÃ§Ãµes "
 "desconectadas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:345
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 msgid "Colo_r:"
 msgstr "Co_r:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "Lista de tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "Lista de memorandos"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:476
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "Propriedades da agenda"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:476
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "Nova agenda"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:532
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "Propriedades da lista de tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:532
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "New Task List"
 msgstr "Nova lista de tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:588
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "Memo List Properties"
 msgstr "Propriedades da lista de memorandos"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:588
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "Nova Lista de memorandos"
 
@@ -6289,299 +4998,239 @@ msgstr "%s  VocÃª nÃ£o fez alteraÃ§Ãµes, atualizar o editor?"
 msgid "Validation error: %s"
 msgstr "Erro de validaÃ§Ã£o: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2365
+#: ../calendar/gui/dialogs/comp-editor-util.c:189 ../calendar/gui/print.c:2349
 msgid " to "
 msgstr " para "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2353
 msgid " (Completed "
 msgstr " (ConcluÃda "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2371
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2355
 msgid "Completed "
 msgstr "ConcluÃda "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2376
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2360
 msgid " (Due "
 msgstr " (Prazo "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2378
+#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2362
 msgid "Due "
 msgstr "Prazo "
 
-#: ../calendar/gui/dialogs/comp-editor.c:239
-#, c-format
-msgid "Attached message - %s"
-msgstr "Mensagem anexa - %s"
-
-#. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:244
-#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1765
-#: ../composer/e-msg-composer.c:1984
-#, 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:488 ../composer/e-msg-composer.c:2052
-#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1188 ../mail/message-list.c:2106
-msgid "_Move"
-msgstr "_Mover"
+#: ../calendar/gui/dialogs/comp-editor.c:224
+msgid "Could not save attachments"
+msgstr "NÃ£o foi possÃvel salvar os anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:490 ../composer/e-msg-composer.c:2054
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2108
-msgid "Cancel _Drag"
-msgstr "Cancelar _arraste"
-
-#: ../calendar/gui/dialogs/comp-editor.c:623
-#: ../calendar/gui/dialogs/comp-editor.c:3315 ../mail/em-utils.c:373
-#: ../plugins/prefer-plain/prefer-plain.c:91
-#: ../widgets/misc/e-attachment-bar.c:453
-msgid "attachment"
-msgstr "anexo"
-
-#: ../calendar/gui/dialogs/comp-editor.c:849
+#: ../calendar/gui/dialogs/comp-editor.c:487
 msgid "Could not update object"
 msgstr "NÃ£o foi possÃvel atualizar objeto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:938
+#: ../calendar/gui/dialogs/comp-editor.c:582
 msgid "Edit Appointment"
 msgstr "Editar compromisso"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:589
 #, c-format
 msgid "Meeting - %s"
 msgstr "ReuniÃ£o - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:591
 #, c-format
 msgid "Appointment - %s"
 msgstr "Compromisso - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953
+#: ../calendar/gui/dialogs/comp-editor.c:597
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tarefa atribuÃda - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:955
+#: ../calendar/gui/dialogs/comp-editor.c:599
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:960
+#: ../calendar/gui/dialogs/comp-editor.c:604
 #, c-format
 msgid "Memo - %s"
 msgstr "Memorandos - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:976
+#: ../calendar/gui/dialogs/comp-editor.c:620
 msgid "No Summary"
 msgstr "Sem resumo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:762
 msgid "Keep original item?"
 msgstr "Manter o item original?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1312
+#: ../calendar/gui/dialogs/comp-editor.c:968
 msgid "Click here to close the current window"
 msgstr "Clicar aqui para fechar a janela atual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1319
+#: ../calendar/gui/dialogs/comp-editor.c:975
 msgid "Copy selected text to the clipboard"
 msgstr "Copiar texto selecionado para a Ã¡rea de transferÃªncia"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1326
+#: ../calendar/gui/dialogs/comp-editor.c:982
 msgid "Cut selected text to the clipboard"
 msgstr "Recortar texto selecionado para a Ã¡rea de transferÃªncia"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1333
+#: ../calendar/gui/dialogs/comp-editor.c:989
 msgid "Click here to view help available"
 msgstr "Clicar aqui para ver a ajuda disponÃvel"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1340
+#: ../calendar/gui/dialogs/comp-editor.c:996
 msgid "Paste text from the clipboard"
 msgstr "Colar texto da Ã¡rea de transferÃªncia"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1361
+#: ../calendar/gui/dialogs/comp-editor.c:1017
 msgid "Click here to save the current window"
 msgstr "Clicar aqui para salvar a janela atual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1368
+#: ../calendar/gui/dialogs/comp-editor.c:1024
 msgid "Select all text"
 msgstr "Selecionar todo o texto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1375
+#: ../calendar/gui/dialogs/comp-editor.c:1031
 msgid "_Classification"
 msgstr "C_lassificaÃ§Ã£o"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
-#: ../mail/mail-signature-editor.c:208
+#: ../calendar/gui/dialogs/comp-editor.c:1045
+#: ../mail/mail-signature-editor.c:209
 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "_Arquivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../calendar/gui/dialogs/comp-editor.c:1052
 #: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "Aj_uda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1403
+#: ../calendar/gui/dialogs/comp-editor.c:1059
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1410
+#: ../calendar/gui/dialogs/comp-editor.c:1066
 msgid "_Options"
 msgstr "_OpÃ§Ãµes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1417 ../mail/em-folder-tree.c:2116
+#: ../calendar/gui/dialogs/comp-editor.c:1073 ../mail/em-folder-tree.c:2106
 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "_Ver"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1427
-#: ../composer/e-composer-actions.c:469
+#: ../calendar/gui/dialogs/comp-editor.c:1083
+#: ../composer/e-composer-actions.c:315
 msgid "_Attachment..."
 msgstr "_Anexo..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1085
 msgid "Click here to attach a file"
 msgstr "Clicar aqui para anexar um arquivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1093
 msgid "_Categories"
 msgstr "_Categorias"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1439
+#: ../calendar/gui/dialogs/comp-editor.c:1095
 msgid "Toggles whether to display categories"
 msgstr "Alterna a exibiÃ§Ã£o do campo de categorias"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1101
 msgid "Time _Zone"
 msgstr "F_uso horÃ¡rio"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1447
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 msgid "Toggles whether the time zone is displayed"
 msgstr "Alterna a exibiÃ§Ã£o do campo de fuso horÃ¡rio"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1112
 msgid "Pu_blic"
 msgstr "PÃº_blico"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1458
+#: ../calendar/gui/dialogs/comp-editor.c:1114
 msgid "Classify as public"
 msgstr "Classificar como pÃºblico"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1463
+#: ../calendar/gui/dialogs/comp-editor.c:1119
 msgid "_Private"
 msgstr "_Particular"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 msgid "Classify as private"
 msgstr "Classificar como privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1470
+#: ../calendar/gui/dialogs/comp-editor.c:1126
 msgid "_Confidential"
 msgstr "_Confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1472
+#: ../calendar/gui/dialogs/comp-editor.c:1128
 msgid "Classify as confidential"
 msgstr "Classificar como confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1480
+#: ../calendar/gui/dialogs/comp-editor.c:1136
 msgid "R_ole Field"
 msgstr "Campo _papel"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1482
+#: ../calendar/gui/dialogs/comp-editor.c:1138
 msgid "Toggles whether the Role field is displayed"
 msgstr "Alterna a exibiÃ§Ã£o do campo papel"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1488
+#: ../calendar/gui/dialogs/comp-editor.c:1144
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1146
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Alterna a exibiÃ§Ã£o do campo RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1496
+#: ../calendar/gui/dialogs/comp-editor.c:1152
 msgid "_Status Field"
 msgstr "_Campo Status"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1498
+#: ../calendar/gui/dialogs/comp-editor.c:1154
 msgid "Toggles whether the Status field is displayed"
 msgstr "Alterna a exibiÃ§Ã£o do campo Status"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1504
+#: ../calendar/gui/dialogs/comp-editor.c:1160
 msgid "_Type Field"
 msgstr "Campo _tipo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1506
+#: ../calendar/gui/dialogs/comp-editor.c:1162
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Alterna a exibiÃ§Ã£o do campo de tipo de participante"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1828
-#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1376
+#: ../calendar/gui/dialogs/comp-editor.c:1186
+#: ../composer/e-composer-private.c:67
 msgid "Recent _Documents"
 msgstr "_Documentos recentes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1847
-#: ../composer/e-composer-actions.c:696
+#: ../calendar/gui/dialogs/comp-editor.c:1615
+#: ../composer/e-composer-actions.c:518
 msgid "Attach"
 msgstr "Anexar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1942
-#, 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:1974
-msgid "Hide Attachment _Bar"
-msgstr "Ocultar _barra de anexos"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1977
-#: ../calendar/gui/dialogs/comp-editor.c:2280
-msgid "Show Attachment _Bar"
-msgstr "Mostrar _barra de anexos"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2091
-#: ../calendar/gui/dialogs/event-page.c:1877
-#: ../calendar/gui/dialogs/task-page.c:1201 ../composer/e-msg-composer.c:1039
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:21
-msgid "_Remove"
-msgstr "_Remover"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2094
-#: ../composer/e-msg-composer.c:1042
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Add attachment..."
-msgstr "_Adicionar anexo..."
-
-#: ../calendar/gui/dialogs/comp-editor.c:2302
-#: ../mail/em-format-html-display.c:2384
-msgid "Show Attachments"
-msgstr "Mostrar anexos"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2303
-msgid "Press space key to toggle attachment bar"
-msgstr "Pressione a tecla de espaÃ§o para alternar a barra de anexos"
+#: ../calendar/gui/dialogs/comp-editor.c:1670
+msgid "Save"
+msgstr "Salvar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2448
-#: ../calendar/gui/dialogs/comp-editor.c:2496
-#: ../calendar/gui/dialogs/comp-editor.c:3348
+#: ../calendar/gui/dialogs/comp-editor.c:1924
+#: ../calendar/gui/dialogs/comp-editor.c:1973
+#: ../calendar/gui/dialogs/comp-editor.c:2833
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "As alteraÃ§Ãµes feitas a este item poderÃ£o ser descartadas se houver uma "
 "atualizaÃ§Ã£o"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3377
+#: ../calendar/gui/dialogs/comp-editor.c:2801 ../mail/em-utils.c:371
+#: ../plugins/prefer-plain/prefer-plain.c:91
+msgid "attachment"
+msgstr "anexo"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2862
 msgid "Unable to use current version!"
 msgstr "NÃ£o foi possÃvel usar a versÃ£o atual!"
 
@@ -6655,7 +5304,7 @@ msgid "Contacts..."
 msgstr "Contatos..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:417
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To:"
 msgstr "Delegar para:"
 
@@ -6682,7 +5331,7 @@ msgstr "Tornar este evento recorrente"
 #: ../calendar/gui/dialogs/event-editor.c:216
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../plugins/groupwise-features/send-options.c:212
-#: ../widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.glade.h:18
 msgid "Send Options"
 msgstr "OpÃ§Ãµes de envio"
 
@@ -6719,200 +5368,225 @@ msgstr "Pedir informaÃ§Ã£o de disponibilidade para os representantes"
 msgid "Appoint_ment"
 msgstr "Compro_misso"
 
+#: ../calendar/gui/dialogs/event-page.c:748
+msgid "Event cannot be edited, because the selected calendar is read only"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:752
+msgid "Event cannot be fully edited, because you are not the organizer"
+msgstr ""
+
 # ConsistÃªncia com outras traduÃ§Ãµes "This even has..."
-#: ../calendar/gui/dialogs/event-page.c:736
-#: ../calendar/gui/dialogs/event-page.c:2725
+#: ../calendar/gui/dialogs/event-page.c:764
+#: ../calendar/gui/dialogs/event-page.c:2769
 msgid "This event has alarms"
 msgstr "Este evento tem alarmes."
 
-#: ../calendar/gui/dialogs/event-page.c:799
-#: ../calendar/gui/dialogs/event-page.glade.h:10
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+#: ../calendar/gui/dialogs/event-page.c:827
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganizador:"
 
-#: ../calendar/gui/dialogs/event-page.c:845
+#: ../calendar/gui/dialogs/event-page.c:874
 msgid "_Delegatees"
 msgstr "_Representantes"
 
-#: ../calendar/gui/dialogs/event-page.c:847
+#: ../calendar/gui/dialogs/event-page.c:876
 msgid "Atte_ndees"
 msgstr "Participa_ntes"
 
-#: ../calendar/gui/dialogs/event-page.c:1031
+#: ../calendar/gui/dialogs/event-page.c:1062
 msgid "Event with no start date"
 msgstr "Evento sem data de inÃcio"
 
-#: ../calendar/gui/dialogs/event-page.c:1034
+#: ../calendar/gui/dialogs/event-page.c:1065
 msgid "Event with no end date"
 msgstr "Evento sem data de tÃ©rmino"
 
-#: ../calendar/gui/dialogs/event-page.c:1203
-#: ../calendar/gui/dialogs/memo-page.c:641
-#: ../calendar/gui/dialogs/task-page.c:813
+#: ../calendar/gui/dialogs/event-page.c:1236
+#: ../calendar/gui/dialogs/memo-page.c:654
+#: ../calendar/gui/dialogs/task-page.c:830
 msgid "Start date is wrong"
 msgstr "A data de inÃcio estÃ¡ errada"
 
-#: ../calendar/gui/dialogs/event-page.c:1213
+#: ../calendar/gui/dialogs/event-page.c:1246
 msgid "End date is wrong"
 msgstr "A data de tÃ©rmino estÃ¡ errada"
 
-#: ../calendar/gui/dialogs/event-page.c:1236
+#: ../calendar/gui/dialogs/event-page.c:1269
 msgid "Start time is wrong"
 msgstr "A hora de inÃcio estÃ¡ errada"
 
-#: ../calendar/gui/dialogs/event-page.c:1243
+#: ../calendar/gui/dialogs/event-page.c:1276
 msgid "End time is wrong"
 msgstr "A hora de tÃ©rmino estÃ¡ errada"
 
-#: ../calendar/gui/dialogs/event-page.c:1406
-#: ../calendar/gui/dialogs/memo-page.c:682
-#: ../calendar/gui/dialogs/task-page.c:873
+#: ../calendar/gui/dialogs/event-page.c:1438
+#: ../calendar/gui/dialogs/memo-page.c:695
+#: ../calendar/gui/dialogs/task-page.c:890
 msgid "The organizer selected no longer has an account."
 msgstr "O organizador selecionado nÃ£o possui mais uma conta."
 
-#: ../calendar/gui/dialogs/event-page.c:1412
-#: ../calendar/gui/dialogs/memo-page.c:688
-#: ../calendar/gui/dialogs/task-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:1444
+#: ../calendar/gui/dialogs/memo-page.c:701
+#: ../calendar/gui/dialogs/task-page.c:896
 msgid "An organizer is required."
 msgstr "Ã? necessÃ¡rio um organizador."
 
-#: ../calendar/gui/dialogs/event-page.c:1437
-#: ../calendar/gui/dialogs/task-page.c:903
+#: ../calendar/gui/dialogs/event-page.c:1469
+#: ../calendar/gui/dialogs/task-page.c:920
 msgid "At least one attendee is required."
 msgstr "Ã? necessÃ¡rio pelo menos um participante."
 
-#: ../calendar/gui/dialogs/event-page.c:1878
-#: ../calendar/gui/dialogs/task-page.c:1202
+#: ../calendar/gui/dialogs/event-page.c:1912
+#: ../calendar/gui/dialogs/task-page.c:1219
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:21
+msgid "_Remove"
+msgstr "_Remover"
+
+#: ../calendar/gui/dialogs/event-page.c:1913
+#: ../calendar/gui/dialogs/task-page.c:1220
 msgid "_Add "
 msgstr "_Adicionar "
 
-#: ../calendar/gui/dialogs/event-page.c:2601
+#: ../calendar/gui/dialogs/event-page.c:2639
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "NÃ£o Ã© possÃvel abrir a agenda \"%s\"."
 
-#: ../calendar/gui/dialogs/event-page.c:2645
-#: ../calendar/gui/dialogs/memo-page.c:896
-#: ../calendar/gui/dialogs/task-page.c:1806
+#. Translators: This string is used when we are creating an Event
+#. (meeting or appointment)  on behalf of some other user
+#. Translators: This string is used when we are creating a Memo
+#. on behalf of some other user
+#. Translators: This string is used when we are creating a Task
+#. on behalf of some other user
+#: ../calendar/gui/dialogs/event-page.c:2683
+#: ../calendar/gui/dialogs/memo-page.c:910
+#: ../calendar/gui/dialogs/task-page.c:1825
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "VocÃª esta atuando em nome de %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2925
+#: ../calendar/gui/dialogs/event-page.c:2967
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dia para o compromisso"
 msgstr[1] "%d dias para o compromisso"
 
-#: ../calendar/gui/dialogs/event-page.c:2931
+#: ../calendar/gui/dialogs/event-page.c:2973
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hora para o compromisso"
 msgstr[1] "%d horas para o compromisso"
 
-#: ../calendar/gui/dialogs/event-page.c:2937
+#: ../calendar/gui/dialogs/event-page.c:2979
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuto para o compromisso"
 msgstr[1] "%d minutos para o compromisso"
 
-#: ../calendar/gui/dialogs/event-page.c:2950
+#: ../calendar/gui/dialogs/event-page.c:2992
 msgid "Customize"
 msgstr "Personalizar"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:1
-msgid "1 day before appointment"
-msgstr "1 dia para o compromisso"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:2
-msgid "1 hour before appointment"
-msgstr "1 hora para o compromisso"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:3
-msgid "15 minutes before appointment"
-msgstr "15 minutos para o compromisso"
+msgid ""
+"15 minutes before appointment\n"
+"1 hour before appointment\n"
+"1 day before appointment"
+msgstr ""
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
 msgid "Attendee_s..."
 msgstr "Participante_s..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/e-meeting-list-view.c:151
+msgid "Attendees"
+msgstr "Participantes"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:9
 msgid "Custom Alarm:"
 msgstr "Som de alarme personalizado"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "DescriÃ§Ã£o do evento"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 #: ../calendar/gui/dialogs/memo-page.glade.h:4
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "_Resumo:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Alarm"
 msgstr "_Alarme"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../calendar/gui/dialogs/memo-page.glade.h:6
 #: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "_DescriÃ§Ã£o:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:17
+#: ../plugins/calendar-weather/calendar-weather.c:372
+#: ../plugins/exchange-operations/exchange-calendar.c:247
+#: ../plugins/exchange-operations/exchange-contacts.c:239
+msgid "_Location:"
+msgstr "_Local:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:18
 msgid "_Time:"
 msgstr "_Hora:"
 
-#. 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/event-page.glade.h:19
+#: ../calendar/gui/dialogs/memo-page.glade.h:8
+#: ../calendar/gui/dialogs/task-page.glade.h:10
+#: ../mail/mail-config.glade.h:192 ../mail/mail-dialogs.glade.h:21
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5
+#: ../smime/gui/smime-ui.glade.h:49
+msgid ""
+"a\n"
+"b"
+msgstr ""
 
-#. 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.glade.h:1
-msgid "<b>Att_endees</b>"
-msgstr "<b>_Participantes</b>"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "C_hange Organizer"
-msgstr "_Alterar organizador"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Co_ntacts..."
-msgstr "Co_ntatos..."
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
-msgid "Organizer:"
-msgstr "Organizador:"
+msgid ""
+"for\n"
+"until"
+msgstr ""
+"por\n"
+"atÃ©"
 
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2485
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2469
 msgid "Memo"
 msgstr "Memorando"
 
-#: ../calendar/gui/dialogs/memo-page.c:857
+#: ../calendar/gui/dialogs/memo-page.c:347
+msgid "Memo cannot be edited, because the selected memo list is read only"
+msgstr ""
+
+#: ../calendar/gui/dialogs/memo-page.c:351
+msgid "Memo cannot be fully edited, because you are not the organizer"
+msgstr ""
+
+#: ../calendar/gui/dialogs/memo-page.c:871
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "NÃ£o Ã© possÃvel abrir memorandos em \"%s\"."
 
-#: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1567
-#: ../mail/em-format-html.c:1625 ../mail/em-format-html.c:1651
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
+#: ../calendar/gui/dialogs/memo-page.c:1031 ../mail/em-format-html.c:1566
+#: ../mail/em-format-html.c:1624 ../mail/em-format-html.c:1649
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:925
+#: ../mail/em-mailer-prefs.c:78 ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "Para"
 
@@ -6926,7 +5600,7 @@ msgid "T_o:"
 msgstr "_Para:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:365
+#: ../calendar/gui/dialogs/task-page.c:380
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grupo:"
@@ -6954,23 +5628,23 @@ msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr ""
 "VocÃª estÃ¡ modificando um evento recorrente. O que vocÃª deseja modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:88
+#: ../calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
 msgstr "Apenas esta instÃ¢ncia"
 
-#: ../calendar/gui/dialogs/recur-comp.c:92
+#: ../calendar/gui/dialogs/recur-comp.c:91
 msgid "This and Prior Instances"
 msgstr "Esta instÃ¢ncia e as anteriores"
 
-#: ../calendar/gui/dialogs/recur-comp.c:98
+#: ../calendar/gui/dialogs/recur-comp.c:97
 msgid "This and Future Instances"
 msgstr "Esta instÃ¢ncia e as prÃ³ximas"
 
-#: ../calendar/gui/dialogs/recur-comp.c:103
+#: ../calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr "Todas as instÃ¢ncias"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:562
+#: ../calendar/gui/dialogs/recurrence-page.c:563
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Este compromisso possui recorrÃªncias que o Evolution nÃ£o pode editar."
 
@@ -6992,7 +5666,7 @@ msgstr "no"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1025
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "primeiro"
 
@@ -7001,7 +5675,7 @@ msgstr "primeiro"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1031
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "segundo"
 
@@ -7009,7 +5683,7 @@ msgstr "segundo"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1036
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "terceiro"
 
@@ -7017,21 +5691,29 @@ msgstr "terceiro"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "quarto"
 
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
+msgid "fifth"
+msgstr "quinto(a)"
+
 #. 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:1046
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "last"
 msgstr "Ãºltimo"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1072
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "Outra data"
 
@@ -7039,7 +5721,7 @@ msgstr "Outra data"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1080
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "1Âº ao 10Âº"
 
@@ -7047,7 +5729,7 @@ msgstr "1Âº ao 10Âº"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "11Âº ao 20Âº"
 
@@ -7055,45 +5737,45 @@ msgstr "11Âº ao 20Âº"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1092
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "21st to 31st"
 msgstr "21Âº ao 31Âº"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 msgstr "dia"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1241
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "no"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1417
+#: ../calendar/gui/dialogs/recurrence-page.c:1410
 msgid "occurrences"
 msgstr "ocorrÃªncias"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2120
+#: ../calendar/gui/dialogs/recurrence-page.c:2105
 msgid "Add exception"
 msgstr "Adicionar exceÃ§Ã£o"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2161
+#: ../calendar/gui/dialogs/recurrence-page.c:2146
 msgid "Could not get a selection to modify."
 msgstr "nÃ£o foi possÃvel selecionar para modificar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2152
 msgid "Modify exception"
 msgstr "Modificar exceÃ§Ã£o"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2211
+#: ../calendar/gui/dialogs/recurrence-page.c:2196
 msgid "Could not get a selection to delete."
 msgstr "NÃ£o foi possÃvel obter seleÃ§Ã£o para exclusÃ£o."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2335
+#: ../calendar/gui/dialogs/recurrence-page.c:2320
 msgid "Date/Time"
 msgstr "Data/Hora"
 
@@ -7102,7 +5784,7 @@ msgid "<b>Exceptions</b>"
 msgstr "<b>ExceÃ§Ãµes</b>"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:2
 msgid "<b>Preview</b>"
 msgstr "<b>Visualizar</b>"
 
@@ -7110,50 +5792,49 @@ msgstr "<b>Visualizar</b>"
 msgid "<b>Recurrence</b>"
 msgstr "<b>RecorrÃªncia</b>"
 
-#. 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
+#. 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:5
 msgid "Every"
 msgstr "A cada"
 
-#. 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
+#. 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:7
 msgid "This appointment rec_urs"
 msgstr "Este com_promisso se repete"
 
 #. 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"
-
-#. 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 "mÃªs(es)"
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid ""
+"day(s)\n"
+"week(s)\n"
+"month(s)\n"
+"year(s)"
+msgstr ""
 
 #. 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:29
-msgid "year(s)"
-msgstr "ano(s)"
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid ""
+"for\n"
+"until\n"
+"forever"
+msgstr ""
 
-#: ../calendar/gui/dialogs/send-comp.c:116
+#: ../calendar/gui/dialogs/send-comp.c:160
 msgid "Send my alarms with this event"
 msgstr "Enviar meus alarmes com este evento"
 
-#: ../calendar/gui/dialogs/task-details-page.c:377
-#: ../calendar/gui/dialogs/task-details-page.c:397
+#: ../calendar/gui/dialogs/send-comp.c:162
+msgid "Notify new attendees _only"
+msgstr "Notificar s_omente os novos participantes"
+
+#: ../calendar/gui/dialogs/task-details-page.c:376
+#: ../calendar/gui/dialogs/task-details-page.c:396
 msgid "Completed date is wrong"
 msgstr "A data de conclusÃ£o estÃ¡ errada"
 
-#: ../calendar/gui/dialogs/task-details-page.c:482
+#: ../calendar/gui/dialogs/task-details-page.c:481
 msgid "Web Page"
 msgstr "PÃ¡gina da Web"
 
@@ -7165,74 +5846,30 @@ msgstr "<span weight=\"bold\">Diversos</span>"
 msgid "<span weight=\"bold\">Status</span>"
 msgstr "<span weight=\"bold\">Status</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:247
-#: ../calendar/gui/e-cal-model-tasks.c:362
-#: ../calendar/gui/e-cal-model-tasks.c:679
-#: ../calendar/gui/e-calendar-table.c:237
-#: ../calendar/gui/e-calendar-table.c:652 ../calendar/gui/e-itip-control.c:941
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/print.c:2561 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:366
-msgid "Completed"
-msgstr "ConcluÃda"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:266
-#: ../calendar/gui/e-calendar-table.c:577 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1065
-msgid "High"
-msgstr "Alta"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:244
-#: ../calendar/gui/e-cal-model-tasks.c:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-cal-model-tasks.c:754
-#: ../calendar/gui/e-calendar-table.c:235
-#: ../calendar/gui/e-calendar-table.c:651 ../calendar/gui/print.c:2558
-msgid "In Progress"
-msgstr "Em progresso"
+#: ../calendar/gui/dialogs/task-details-page.glade.h:3
+msgid ""
+"High\n"
+"Normal\n"
+"Low\n"
+"Undefined"
+msgstr ""
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:270
-#: ../calendar/gui/e-calendar-table.c:579 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1063
-msgid "Low"
-msgstr "Baixa"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:268
-#: ../calendar/gui/e-cal-model.c:1006 ../calendar/gui/e-calendar-table.c:578
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1064
-msgid "Normal"
-msgstr "Normal"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-cal-model-tasks.c:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:233
-#: ../calendar/gui/e-calendar-table.c:650 ../calendar/gui/print.c:2555
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Not Started"
-msgstr "NÃ£o iniciada"
+msgid ""
+"Not Started\n"
+"In Progress\n"
+"Completed\n"
+"Canceled"
+msgstr ""
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:10
+#: ../calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "P_ercent complete:"
 msgstr "Po_rcentagem concluÃda:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Stat_us:"
 msgstr "_Estado:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:580 ../calendar/gui/tasktypes.xml.h:24
-msgid "Undefined"
-msgstr "Indefinida"
-
 #: ../calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Date completed:"
 msgstr "_ConcluÃda em:"
@@ -7255,7 +5892,7 @@ msgid "Click to change or view the status details of the task"
 msgstr "Clique para alterar ou ver os detalhes de status da tarefa"
 
 #: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:525
+#: ../composer/e-composer-actions.c:371
 msgid "_Send Options"
 msgstr "OpÃ§Ãµes de _envio"
 
@@ -7267,16 +5904,26 @@ msgstr "_Tarefa"
 msgid "Task Details"
 msgstr "Detalhes da tarefa"
 
-#: ../calendar/gui/dialogs/task-page.c:373
+#: ../calendar/gui/dialogs/task-page.c:336
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.c:340
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr ""
+"Esta tarefa nÃ£o pode ser completamente editada porque vocÃª nÃ£o Ã© o "
+"organizador"
+
+#: ../calendar/gui/dialogs/task-page.c:388
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Organi_zador:"
 
-#: ../calendar/gui/dialogs/task-page.c:786
+#: ../calendar/gui/dialogs/task-page.c:803
 msgid "Due date is wrong"
 msgstr "O prazo de conclusÃ£o estÃ¡ errado"
 
-#: ../calendar/gui/dialogs/task-page.c:1763
+#: ../calendar/gui/dialogs/task-page.c:1782
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "NÃ£o Ã© possÃvel abrir tarefas em \"%s\"."
@@ -7373,80 +6020,161 @@ msgstr "%s em %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s para um tipo de gatilho desconhecido"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:69
-#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3273
+#: ../calendar/gui/e-attachment-handler-calendar.c:258
+msgid "I_mport"
+msgstr "I_mportar"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:340
+msgid "Select a Calendar"
+msgstr "Selecionar um calendÃ¡rio"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:367
+msgid "Select a Task List"
+msgstr "Selecionar uma lista de tarefas"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:377
+msgid "I_mport to Calendar"
+msgstr "I_mportar para o calendÃ¡rio"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:384
+msgid "I_mport to Tasks"
+msgstr "_Importar para as tarefas"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:68
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3210
 #, c-format
 msgid "Click to open %s"
 msgstr "Clique para abrir %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:129
-#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:858
+#: ../calendar/gui/e-cal-component-memo-preview.c:127
+#: ../calendar/gui/e-cal-component-preview.c:170 ../filter/filter-rule.c:859
 msgid "Untitled"
 msgstr "Sem tÃtulo"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:181
-#: ../calendar/gui/e-cal-component-preview.c:211
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-memo-preview.c:178
+#: ../calendar/gui/e-cal-component-preview.c:209
+#: ../calendar/gui/e-cal-component-preview.c:220
 msgid "Start Date:"
 msgstr "Data de inÃcio:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:194
+#: ../calendar/gui/e-cal-component-memo-preview.c:191
 #: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1213
-#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
-#: ../widgets/misc/e-attachment.glade.h:2
+#: ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:75
 msgid "Description:"
 msgstr "DescriÃ§Ã£o:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:218
+#: ../calendar/gui/e-cal-component-memo-preview.c:215
 #: ../calendar/gui/e-cal-component-preview.c:309
 msgid "Web Page:"
 msgstr "PÃ¡gina da Web:"
 
-#: ../calendar/gui/e-cal-component-preview.c:204
-#: ../calendar/gui/e-itip-control.c:1157
+#: ../calendar/gui/e-cal-component-preview.c:202
+#: ../calendar/gui/e-itip-control.c:1154
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Resumo:"
 
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:231
 msgid "Due Date:"
 msgstr "Data de conclusÃ£o:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:240
-#: ../calendar/gui/e-itip-control.c:1181
-#: ../plugins/exchange-operations/exchange-account-setup.c:284
-#: ../plugins/itip-formatter/itip-view.c:1052
+#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-itip-control.c:1178
+#: ../plugins/exchange-operations/exchange-account-setup.c:283
+#: ../plugins/itip-formatter/itip-view.c:1054
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-cal-component-preview.c:242
+#: ../calendar/gui/e-cal-model-tasks.c:359
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-cal-model-tasks.c:752
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:659 ../calendar/gui/print.c:2542
+msgid "In Progress"
+msgstr "Em progresso"
+
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
+#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-model-tasks.c:361
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:660 ../calendar/gui/e-itip-control.c:939
+#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/print.c:2545 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Completed"
+msgstr "ConcluÃda"
+
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-cal-model-tasks.c:357
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-calendar-table.c:232
+#: ../calendar/gui/e-calendar-table.c:658 ../calendar/gui/print.c:2539
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Not Started"
+msgstr "NÃ£o iniciada"
+
+#: ../calendar/gui/e-cal-component-preview.c:262
 msgid "Priority:"
 msgstr "Prioridade:"
 
+#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-calendar-table.c:585 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1064
+msgid "High"
+msgstr "Alta"
+
+#: ../calendar/gui/e-cal-component-preview.c:266
+#: ../calendar/gui/e-cal-model.c:1076 ../calendar/gui/e-calendar-table.c:586
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
+msgid "Normal"
+msgstr "Normal"
+
+#: ../calendar/gui/e-cal-component-preview.c:268
+#: ../calendar/gui/e-calendar-table.c:587 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1062
+msgid "Low"
+msgstr "Baixa"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
+#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../plugins/save-calendar/csv-format.c:362
+msgid "Created"
+msgstr "Criado"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 msgid "End Date"
 msgstr "Data de tÃ©rmino"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-memo-table.etspec.h:4
+msgid "Last modified"
+msgstr "Modificado"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "Data de inÃcio"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:629
+#: ../calendar/gui/e-calendar-table.c:637
 msgid "Free"
 msgstr "Livre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:630
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-calendar-table.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:391
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../calendar/gui/e-cal-model-tasks.c:627
+#: ../calendar/gui/e-cal-model-tasks.c:625
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7456,225 +6184,200 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012
+#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1082
 #: ../calendar/gui/e-meeting-list-view.c:190
-#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/e-meeting-store.c:745
+#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:161
+#: ../calendar/gui/e-meeting-store.c:742
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Sim"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012
+#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1082
 #: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-meeting-store.c:163
 #: ../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:354 ../calendar/gui/e-cal-popup.c:106
-#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
-#: ../calendar/gui/e-itip-control.c:1198 ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-cal-model.c:372 ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/e-itip-control.c:1333
 #: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:984
-#: ../calendar/gui/print.c:1001 ../mail/em-utils.c:1342
-#: ../plugins/itip-formatter/itip-formatter.c:447
-#: ../plugins/itip-formatter/itip-formatter.c:2204
+#: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:144
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/print.c:978
+#: ../calendar/gui/print.c:995 ../mail/em-utils.c:1339
+#: ../plugins/itip-formatter/itip-formatter.c:449
+#: ../plugins/itip-formatter/itip-formatter.c:2233
 #: ../plugins/plugin-manager/plugin-manager.c:89
-#: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../calendar/gui/e-cal-model.c:1008
+#: ../calendar/gui/e-cal-model.c:1078
 msgid "Recurring"
 msgstr "Repetindo"
 
-#: ../calendar/gui/e-cal-model.c:1010
+#: ../calendar/gui/e-cal-model.c:1080
 msgid "Assigned"
 msgstr "AtribuÃdo"
 
-#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:414
-msgid "Save As..."
-msgstr "Salvar como..."
-
-#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2217
-msgid "Select folder to save selected attachments..."
-msgstr "Selecione a pasta para salvar os anexos selecionados..."
-
-#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:442
-#, c-format
-msgid "untitled_image.%s"
-msgstr "imagem_sem_titulo.%s"
-
-#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1589
-#: ../calendar/gui/e-calendar-view.c:1776 ../calendar/gui/e-memo-table.c:924
-#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:559 ../mail/em-popup.c:570
-msgid "_Save As..."
-msgstr "_Salvar como..."
-
-#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:560
-#: ../mail/em-popup.c:571
-msgid "Set as _Background"
-msgstr "Usar como Imagem de _Fundo"
-
-#: ../calendar/gui/e-cal-popup.c:288
-msgid "_Save Selected"
-msgstr "_Salvar selecionado"
-
-#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:828
-#, c-format
-msgid "Open in %s..."
-msgstr "Abrir com %s..."
-
-#: ../calendar/gui/e-calendar-table.c:337
+#: ../calendar/gui/e-calendar-table.c:335
 msgid "* No Summary *"
 msgstr "* Sem resumo *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-table.c:373
-#: ../calendar/gui/e-calendar-view.c:2399
+#: ../calendar/gui/e-calendar-table.c:371
+#: ../calendar/gui/e-calendar-view.c:2429
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizador: %s <%s>"
 
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:376
-#: ../calendar/gui/e-calendar-view.c:2403
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2433
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizador: %s"
 
-#: ../calendar/gui/e-calendar-table.c:407
+#: ../calendar/gui/e-calendar-table.c:405
 msgid "Start: "
 msgstr "InÃcio: "
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "Due: "
 msgstr "Prazo: "
 
-#: ../calendar/gui/e-calendar-table.c:599
+#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:24
+msgid "Undefined"
+msgstr "Indefinida"
+
+#: ../calendar/gui/e-calendar-table.c:607
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:600
+#: ../calendar/gui/e-calendar-table.c:608
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:601
+#: ../calendar/gui/e-calendar-table.c:609
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:602
+#: ../calendar/gui/e-calendar-table.c:610
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:603
+#: ../calendar/gui/e-calendar-table.c:611
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:604
+#: ../calendar/gui/e-calendar-table.c:612
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:605
+#: ../calendar/gui/e-calendar-table.c:613
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:606
+#: ../calendar/gui/e-calendar-table.c:614
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:607
+#: ../calendar/gui/e-calendar-table.c:615
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:608
+#: ../calendar/gui/e-calendar-table.c:616
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:609
+#: ../calendar/gui/e-calendar-table.c:617
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:889
-#: ../calendar/gui/e-calendar-view.c:672 ../calendar/gui/e-memo-table.c:437
+#: ../calendar/gui/e-calendar-table.c:897
+#: ../calendar/gui/e-calendar-view.c:659 ../calendar/gui/e-memo-table.c:449
 msgid "Deleting selected objects"
 msgstr "Excluindo objetos selecionados"
 
-#: ../calendar/gui/e-calendar-table.c:1172
-#: ../calendar/gui/e-calendar-view.c:837 ../calendar/gui/e-memo-table.c:642
+#: ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-memo-table.c:654
 msgid "Updating objects"
 msgstr "Atualizando objetos"
 
-#: ../calendar/gui/e-calendar-table.c:1360
-#: ../calendar/gui/e-calendar-view.c:1298 ../calendar/gui/e-memo-table.c:818
-#: ../composer/e-composer-actions.c:275
+#: ../calendar/gui/e-calendar-table.c:1364
+#: ../calendar/gui/e-calendar-view.c:1333 ../calendar/gui/e-memo-table.c:828
+#: ../composer/e-composer-actions.c:219
 msgid "Save as..."
 msgstr "Salvar como..."
 
-#: ../calendar/gui/e-calendar-table.c:1584
-#: ../calendar/gui/e-calendar-view.c:1758
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1789
 msgid "New _Task"
 msgstr "Nova _tarefa"
 
-#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:923
+#: ../calendar/gui/e-calendar-table.c:1592 ../calendar/gui/e-memo-table.c:933
 msgid "Open _Web Page"
 msgstr "Abrir pÃ¡gina _Web"
 
-#: ../calendar/gui/e-calendar-table.c:1590
-#: ../calendar/gui/e-calendar-view.c:1761 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1593
+#: ../calendar/gui/e-calendar-view.c:1807 ../calendar/gui/e-memo-table.c:934
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:494
+msgid "_Save As..."
+msgstr "_Salvar como..."
+
+#: ../calendar/gui/e-calendar-table.c:1594
+#: ../calendar/gui/e-calendar-view.c:1792 ../calendar/gui/e-memo-table.c:935
 msgid "P_rint..."
 msgstr "Imp_rimir..."
 
-#: ../calendar/gui/e-calendar-table.c:1594
-#: ../calendar/gui/e-calendar-view.c:1781 ../calendar/gui/e-memo-table.c:929
+#: ../calendar/gui/e-calendar-table.c:1598
+#: ../calendar/gui/e-calendar-view.c:1812 ../calendar/gui/e-memo-table.c:939
 #: ../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 "Recor_tar"
 
-#: ../calendar/gui/e-calendar-table.c:1596
-#: ../calendar/gui/e-calendar-view.c:1764
-#: ../calendar/gui/e-calendar-view.c:1783 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1600
+#: ../calendar/gui/e-calendar-view.c:1795
+#: ../calendar/gui/e-calendar-view.c:1814 ../calendar/gui/e-memo-table.c:941
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "C_olar"
 
-#: ../calendar/gui/e-calendar-table.c:1600 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1604 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Atribuir tarefa"
 
-#: ../calendar/gui/e-calendar-table.c:1601 ../calendar/gui/e-memo-table.c:935
+#: ../calendar/gui/e-calendar-table.c:1605 ../calendar/gui/e-memo-table.c:945
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Encaminhar como iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1602
+#: ../calendar/gui/e-calendar-table.c:1606
 msgid "_Mark as Complete"
 msgstr "_Marcar como concluÃda"
 
-#: ../calendar/gui/e-calendar-table.c:1603
+#: ../calendar/gui/e-calendar-table.c:1607
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar Tarefas Selecionadas como ConcluÃdas"
 
-#: ../calendar/gui/e-calendar-table.c:1604
+#: ../calendar/gui/e-calendar-table.c:1608
 msgid "_Mark as Incomplete"
 msgstr "_Marcar como Incompleto"
 
-#: ../calendar/gui/e-calendar-table.c:1605
+#: ../calendar/gui/e-calendar-table.c:1609
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Marcas tarefas selecionadas como incompletas"
 
-#: ../calendar/gui/e-calendar-table.c:1610
+#: ../calendar/gui/e-calendar-table.c:1614
 msgid "_Delete Selected Tasks"
 msgstr "_Excluir tarefas selecionadas"
 
-#: ../calendar/gui/e-calendar-table.c:1847
+#: ../calendar/gui/e-calendar-table.c:1849
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Clique para adicionar uma tarefa"
@@ -7692,167 +6395,167 @@ msgstr "ConcluÃda"
 msgid "Completion date"
 msgstr "Data de conclusÃ£o"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due date"
 msgstr "Prazo de conclusÃ£o"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Priority"
 msgstr "Prioridade"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-calendar-table.etspec.h:11
 msgid "Start date"
 msgstr "Data de inÃcio"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-calendar-view.c:2307
-#: ../calendar/gui/e-meeting-list-view.c:602
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-view.c:2337
+#: ../calendar/gui/e-meeting-list-view.c:601
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "Status"
 
-#: ../calendar/gui/e-calendar-view.c:1444
+#: ../calendar/gui/e-calendar-view.c:1478
 msgid "Moving items"
 msgstr "Movendo os itens"
 
-#: ../calendar/gui/e-calendar-view.c:1446
+#: ../calendar/gui/e-calendar-view.c:1480
 msgid "Copying items"
 msgstr "Copiando os itens"
 
-#: ../calendar/gui/e-calendar-view.c:1755
+#: ../calendar/gui/e-calendar-view.c:1786
 msgid "New _Appointment..."
 msgstr "Novo _compromisso..."
 
-#: ../calendar/gui/e-calendar-view.c:1756
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "New All Day _Event"
 msgstr "Novo _evento de dia inteiro"
 
-#: ../calendar/gui/e-calendar-view.c:1757
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "New _Meeting"
 msgstr "Nova _reuniÃ£o"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1768
+#: ../calendar/gui/e-calendar-view.c:1799
 msgid "_Current View"
 msgstr "_VisÃ£o atual"
 
-#: ../calendar/gui/e-calendar-view.c:1770
+#: ../calendar/gui/e-calendar-view.c:1801
 msgid "Select T_oday"
 msgstr "Selecionar _hoje"
 
-#: ../calendar/gui/e-calendar-view.c:1771
+#: ../calendar/gui/e-calendar-view.c:1802
 msgid "_Select Date..."
 msgstr "_Selecionar data..."
 
-#: ../calendar/gui/e-calendar-view.c:1777
+#: ../calendar/gui/e-calendar-view.c:1808
 msgid "Pri_nt..."
 msgstr "I_mprimir..."
 
-#: ../calendar/gui/e-calendar-view.c:1787
+#: ../calendar/gui/e-calendar-view.c:1818
 msgid "Cop_y to Calendar..."
 msgstr "Copiar para a A_genda..."
 
-#: ../calendar/gui/e-calendar-view.c:1788
+#: ../calendar/gui/e-calendar-view.c:1819
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver para a agenda..."
 
-#: ../calendar/gui/e-calendar-view.c:1789
+#: ../calendar/gui/e-calendar-view.c:1820
 msgid "_Delegate Meeting..."
 msgstr "_Delegar reuniÃ£o..."
 
-#: ../calendar/gui/e-calendar-view.c:1790
+#: ../calendar/gui/e-calendar-view.c:1821
 msgid "_Schedule Meeting..."
 msgstr "Agendar _reuniÃ£o..."
 
-#: ../calendar/gui/e-calendar-view.c:1791
+#: ../calendar/gui/e-calendar-view.c:1822
 msgid "_Forward as iCalendar..."
 msgstr "_Encaminhar como iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1792
+#: ../calendar/gui/e-calendar-view.c:1823
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../calendar/gui/e-calendar-view.c:1793 ../mail/em-folder-view.c:1332
-#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
-#: ../ui/evolution-mail-message.xml.h:82
+#: ../calendar/gui/e-calendar-view.c:1824
+#: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1330
+#: ../mail/em-popup.c:499 ../ui/evolution-mail-message.xml.h:78
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: ../calendar/gui/e-calendar-view.c:1798
+#: ../calendar/gui/e-calendar-view.c:1829
 msgid "Make this Occurrence _Movable"
 msgstr "Tor_nar esta ocorrÃªncia mÃ³vel"
 
-#: ../calendar/gui/e-calendar-view.c:1799 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1830 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Exc_luir esta ocorrÃªncia"
 
-#: ../calendar/gui/e-calendar-view.c:1800
+#: ../calendar/gui/e-calendar-view.c:1831
 msgid "Delete _All Occurrences"
 msgstr "Excl_uir todas as ocorrÃªncias"
 
-#: ../calendar/gui/e-calendar-view.c:2254
-#: ../calendar/gui/e-itip-control.c:1186
+#: ../calendar/gui/e-calendar-view.c:2284
+#: ../calendar/gui/e-itip-control.c:1183
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
-#: ../plugins/itip-formatter/itip-formatter.c:2192
+#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
+#: ../plugins/itip-formatter/itip-formatter.c:2221
 msgid "Accepted"
 msgstr "Aceito"
 
-#: ../calendar/gui/e-calendar-view.c:2255
-#: ../calendar/gui/e-itip-control.c:1194
+#: ../calendar/gui/e-calendar-view.c:2285
+#: ../calendar/gui/e-itip-control.c:1191
 #: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../plugins/itip-formatter/itip-formatter.c:2198
+#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
+#: ../plugins/itip-formatter/itip-formatter.c:2227
 msgid "Declined"
 msgstr "Recusado"
 
-#: ../calendar/gui/e-calendar-view.c:2256
+#: ../calendar/gui/e-calendar-view.c:2286
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/e-meeting-time-sel.c:390
 msgid "Tentative"
 msgstr "Preliminar"
 
-#: ../calendar/gui/e-calendar-view.c:2257
+#: ../calendar/gui/e-calendar-view.c:2287
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../plugins/itip-formatter/itip-formatter.c:2201
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
+#: ../plugins/itip-formatter/itip-formatter.c:2230
 msgid "Delegated"
 msgstr "Representado"
 
-#: ../calendar/gui/e-calendar-view.c:2258
+#: ../calendar/gui/e-calendar-view.c:2288
 msgid "Needs action"
 msgstr "Precisa de aÃ§Ã£o"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2419 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-view.c:2449 ../calendar/gui/print.c:2501
 #, c-format
 msgid "Location: %s"
 msgstr "Local: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2453
+#: ../calendar/gui/e-calendar-view.c:2480
 #, c-format
 msgid "Time: %s %s"
 msgstr "Data: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:109
+#: ../calendar/gui/e-cell-date-edit-text.c:102
 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.
-#: ../calendar/gui/e-cell-date-edit-text.c:112
+#: ../calendar/gui/e-cell-date-edit-text.c:105
 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:120
+#: ../calendar/gui/e-cell-date-edit-text.c:113
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7865,12 +6568,12 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:750
+#: ../calendar/gui/e-day-view-time-item.c:747
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i fraÃ§Ãµes de minuto"
 
-#: ../calendar/gui/e-day-view-time-item.c:771
+#: ../calendar/gui/e-day-view-time-item.c:768
 msgid "Show the second time zone"
 msgstr "Mostrar o fuso horÃ¡rio secundÃ¡rio"
 
@@ -7880,48 +6583,48 @@ msgstr "Mostrar o fuso horÃ¡rio secundÃ¡rio"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1584
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
+#: ../calendar/gui/e-day-view-top-item.c:840 ../calendar/gui/e-day-view.c:1576
+#: ../calendar/gui/e-week-view-main-item.c:359 ../calendar/gui/print.c:1666
 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:805 ../calendar/gui/e-week-view.c:541
-#: ../calendar/gui/print.c:828
+#: ../calendar/gui/print.c:825
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
-#: ../calendar/gui/print.c:830
+#: ../calendar/gui/print.c:827
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2322
+#: ../calendar/gui/e-day-view.c:2309
 #, c-format
 msgid "Week %d"
 msgstr "Semana %d"
 
-#: ../calendar/gui/e-itip-control.c:760
+#: ../calendar/gui/e-itip-control.c:758
 msgid "Yes. (Complex Recurrence)"
 msgstr "Sim. (RecorrÃªncia complexa)"
 
-#: ../calendar/gui/e-itip-control.c:777
+#: ../calendar/gui/e-itip-control.c:775
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Todo dia"
 msgstr[1] "A cada %d dias"
 
-#: ../calendar/gui/e-itip-control.c:790
+#: ../calendar/gui/e-itip-control.c:788
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Toda semana"
 msgstr[1] "A cada %d semanas"
 
-#: ../calendar/gui/e-itip-control.c:797
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7929,35 +6632,35 @@ msgstr[0] "Toda semana em "
 msgstr[1] "A cada %d semanas em "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:806
 msgid " and "
 msgstr " e "
 
-#: ../calendar/gui/e-itip-control.c:817
+#: ../calendar/gui/e-itip-control.c:815
 #, c-format
 msgid "The %s day of "
 msgstr "O %s dia de "
 
-#: ../calendar/gui/e-itip-control.c:833
+#: ../calendar/gui/e-itip-control.c:831
 #, c-format
 msgid "The %s %s of "
 msgstr "O %s %s de "
 
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:842
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "todo mÃªs"
 msgstr[1] "a cada %d meses"
 
-#: ../calendar/gui/e-itip-control.c:856
+#: ../calendar/gui/e-itip-control.c:854
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Todo ano"
 msgstr[1] "A cada %d anos"
 
-#: ../calendar/gui/e-itip-control.c:869
+#: ../calendar/gui/e-itip-control.c:867
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
@@ -7965,36 +6668,36 @@ msgstr[0] " um total de %d vez"
 msgstr[1] " um total de %d vezes"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:880
+#: ../calendar/gui/e-itip-control.c:878
 msgid ", ending on "
 msgstr ", terminando em "
 
-#. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:902
+#. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
+#: ../calendar/gui/e-itip-control.c:900
 msgid "Starts"
 msgstr "ComeÃ§a"
 
-#. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:916
+#. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
+#: ../calendar/gui/e-itip-control.c:914
 msgid "Ends"
 msgstr "Termina"
 
-#: ../calendar/gui/e-itip-control.c:956
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../calendar/gui/e-itip-control.c:954
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Due"
 msgstr "Prazo"
 
-#: ../calendar/gui/e-itip-control.c:998 ../calendar/gui/e-itip-control.c:1055
+#: ../calendar/gui/e-itip-control.c:995 ../calendar/gui/e-itip-control.c:1052
 msgid "iCalendar Information"
 msgstr "InformaÃ§Ã£o do iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1015
+#: ../calendar/gui/e-itip-control.c:1012
 msgid "iCalendar Error"
 msgstr "Erro do iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1087 ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.c:1114 ../calendar/gui/e-itip-control.c:1131
+#: ../calendar/gui/e-itip-control.c:1084 ../calendar/gui/e-itip-control.c:1100
+#: ../calendar/gui/e-itip-control.c:1111 ../calendar/gui/e-itip-control.c:1128
 #: ../plugins/itip-formatter/itip-view.c:346
 #: ../plugins/itip-formatter/itip-view.c:347
 #: ../plugins/itip-formatter/itip-view.c:434
@@ -8005,7 +6708,7 @@ msgid "An unknown person"
 msgstr "Uma pessoa desconhecida"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1138
+#: ../calendar/gui/e-itip-control.c:1135
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -8013,12 +6716,12 @@ msgstr ""
 "<br> Por favor, reveja a seguinte informaÃ§Ã£o e entÃ£o selecione uma aÃ§Ã£o a "
 "partir do menu abaixo."
 
-#: ../calendar/gui/e-itip-control.c:1190
-#: ../plugins/itip-formatter/itip-formatter.c:2195
+#: ../calendar/gui/e-itip-control.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:2224
 msgid "Tentatively Accepted"
 msgstr "Aceito preliminarmente"
 
-#: ../calendar/gui/e-itip-control.c:1278
+#: ../calendar/gui/e-itip-control.c:1274
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
@@ -8026,274 +6729,274 @@ msgstr ""
 "A reuniÃ£o foi cancelada, no entanto ela nÃ£o pÃ´de ser localizada nas suas "
 "agendas"
 
-#: ../calendar/gui/e-itip-control.c:1280
+#: ../calendar/gui/e-itip-control.c:1276
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "A tarefa foi cancelada, no entanto ela nÃ£o pÃ´de ser localizada nas suas "
 "listas de tarefas"
 
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1353
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> publicou informaÃ§Ãµes sobre a reuniÃ£o."
 
-#: ../calendar/gui/e-itip-control.c:1359
+#: ../calendar/gui/e-itip-control.c:1354
 msgid "Meeting Information"
 msgstr "InformaÃ§Ãµes de reuniÃ£o"
 
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1360
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> solicita a presenÃ§a de %s em uma reuniÃ£o."
 
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> solicita a sua presenÃ§a em uma reuniÃ£o."
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1363
 msgid "Meeting Proposal"
 msgstr "Proposta de reuniÃ£o"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1369
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> deseja ser adicionado a uma reuniÃ£o existente."
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Update"
 msgstr "AtualizaÃ§Ã£o de reuniÃ£o"
 
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1374
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> deseja receber a informaÃ§Ã£o de reuniÃ£o mais recente."
 
-#: ../calendar/gui/e-itip-control.c:1380
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Update Request"
 msgstr "Pedido de atualizaÃ§Ã£o de reuniÃ£o"
 
-#: ../calendar/gui/e-itip-control.c:1387
+#: ../calendar/gui/e-itip-control.c:1382
 #, 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:1388
+#: ../calendar/gui/e-itip-control.c:1383
 msgid "Meeting Reply"
 msgstr "Resposta Ã  reuniÃ£o"
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> cancelou uma reuniÃ£o."
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1391
 msgid "Meeting Cancelation"
 msgstr "Cancelamento de reuniÃ£o"
 
-#: ../calendar/gui/e-itip-control.c:1406 ../calendar/gui/e-itip-control.c:1483
-#: ../calendar/gui/e-itip-control.c:1523
+#: ../calendar/gui/e-itip-control.c:1401 ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> enviou uma mensagem incompreensÃvel."
 
-#: ../calendar/gui/e-itip-control.c:1407
+#: ../calendar/gui/e-itip-control.c:1402
 msgid "Bad Meeting Message"
 msgstr "Mensagem invÃ¡lida de reuniÃ£o"
 
-#: ../calendar/gui/e-itip-control.c:1434
+#: ../calendar/gui/e-itip-control.c:1429
 #, 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:1435
+#: ../calendar/gui/e-itip-control.c:1430
 msgid "Task Information"
 msgstr "InformaÃ§Ãµes de tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1437
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> solicita que %s execute uma tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> solicita que vocÃª execute uma tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Proposal"
 msgstr "Proposta de tarefa"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1446
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> deseja ser adicionado a uma tarefa existente."
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1447
 msgid "Task Update"
 msgstr "AtualizaÃ§Ã£o de tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> deseja receber a informaÃ§Ã£o de tarefa mais recente."
 
-#: ../calendar/gui/e-itip-control.c:1457
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Update Request"
 msgstr "Pedido de atualizaÃ§Ã£o de tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1464
+#: ../calendar/gui/e-itip-control.c:1459
 #, 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:1465
+#: ../calendar/gui/e-itip-control.c:1460
 msgid "Task Reply"
 msgstr "Resposta Ã  tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> cancelou uma tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1473
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Task Cancelation"
 msgstr "Cancelamento de tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1484
+#: ../calendar/gui/e-itip-control.c:1479
 msgid "Bad Task Message"
 msgstr "Mensagem invÃ¡lida de tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1508
+#: ../calendar/gui/e-itip-control.c:1503
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> publicou informaÃ§Ãµes de disponibilidade."
 
-#: ../calendar/gui/e-itip-control.c:1509
+#: ../calendar/gui/e-itip-control.c:1504
 msgid "Free/Busy Information"
 msgstr "InformaÃ§Ã£o de disponibilidade"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1508
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> estÃ¡ solicitando sua informaÃ§Ã£o de disponibilidade."
 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1509
 msgid "Free/Busy Request"
 msgstr "Pedido de disponibilidade"
 
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> respondeu a um pedido de disponibilidade."
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Reply"
 msgstr "Resposta de disponibilidade"
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Bad Free/Busy Message"
 msgstr "Mensagem invÃ¡lida de disponibilidade"
 
-#: ../calendar/gui/e-itip-control.c:1600
+#: ../calendar/gui/e-itip-control.c:1595
 msgid "The message does not appear to be properly formed"
 msgstr "A mensagem nÃ£o aparenta estar formada corretamente"
 
-#: ../calendar/gui/e-itip-control.c:1659
+#: ../calendar/gui/e-itip-control.c:1654
 msgid "The message contains only unsupported requests."
 msgstr "A mensagem contÃ©m apenas pedidos sem suporte."
 
-#: ../calendar/gui/e-itip-control.c:1692
+#: ../calendar/gui/e-itip-control.c:1687
 msgid "The attachment does not contain a valid calendar message"
 msgstr "O anexo nÃ£o contÃ©m uma mensagem de agenda vÃ¡lida"
 
-#: ../calendar/gui/e-itip-control.c:1730
+#: ../calendar/gui/e-itip-control.c:1725
 msgid "The attachment has no viewable calendar items"
 msgstr "O anexo nÃ£o contÃ©m itens de agenda visualizÃ¡veis"
 
-#: ../calendar/gui/e-itip-control.c:1975
+#: ../calendar/gui/e-itip-control.c:1967
 msgid "Update complete\n"
 msgstr "AtualizaÃ§Ã£o concluÃda\n"
 
-#: ../calendar/gui/e-itip-control.c:2009
+#: ../calendar/gui/e-itip-control.c:2001
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objeto Ã© invÃ¡lido e nÃ£o pode ser atualizado\n"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2018
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Esta resposta nÃ£o Ã© de um participante atual. AdicionÃ¡-lo como participante?"
 
-#: ../calendar/gui/e-itip-control.c:2044
+#: ../calendar/gui/e-itip-control.c:2036
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "NÃ£o foi possÃvel atualizar o status do participante por causa de um status "
 "invÃ¡lido!\n"
 
-#: ../calendar/gui/e-itip-control.c:2068
+#: ../calendar/gui/e-itip-control.c:2060
 msgid "Attendee status updated\n"
 msgstr "Status do participante atualizado\n"
 
-#: ../calendar/gui/e-itip-control.c:2075
-#: ../plugins/itip-formatter/itip-formatter.c:1379
+#: ../calendar/gui/e-itip-control.c:2067
+#: ../plugins/itip-formatter/itip-formatter.c:1385
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "NÃ£o foi possÃvel atualizar o status do participante porque o item nÃ£o existe "
 "mais"
 
-#: ../calendar/gui/e-itip-control.c:2106 ../calendar/gui/e-itip-control.c:2163
+#: ../calendar/gui/e-itip-control.c:2098 ../calendar/gui/e-itip-control.c:2155
 msgid "Item sent!\n"
 msgstr "Item enviado!\n"
 
-#: ../calendar/gui/e-itip-control.c:2112 ../calendar/gui/e-itip-control.c:2171
+#: ../calendar/gui/e-itip-control.c:2104 ../calendar/gui/e-itip-control.c:2163
 msgid "The item could not be sent!\n"
 msgstr "O item nÃ£o pÃ´de ser enviado!\n"
 
-#: ../calendar/gui/e-itip-control.c:2251
+#: ../calendar/gui/e-itip-control.c:2281
 msgid "Choose an action:"
 msgstr "Escolher uma aÃ§Ã£o:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2280
-#: ../calendar/gui/e-meeting-list-view.c:590
+#: ../calendar/gui/e-itip-control.c:2310
+#: ../calendar/gui/e-meeting-list-view.c:589
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-itip-control.c:2322
+#: ../calendar/gui/e-itip-control.c:2350
 msgid "Update"
 msgstr "Atualizar"
 
-#: ../calendar/gui/e-itip-control.c:2350
-#: ../plugins/groupwise-features/process-meeting.c:51
+#: ../calendar/gui/e-itip-control.c:2374
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept"
 msgstr "Aceitar"
 
-#: ../calendar/gui/e-itip-control.c:2351
+#: ../calendar/gui/e-itip-control.c:2375
 msgid "Tentatively accept"
 msgstr "Aceitar preliminarmente"
 
-#: ../calendar/gui/e-itip-control.c:2352
-#: ../plugins/groupwise-features/process-meeting.c:53
+#: ../calendar/gui/e-itip-control.c:2376
+#: ../plugins/groupwise-features/process-meeting.c:54
 msgid "Decline"
 msgstr "Recusar"
 
-#: ../calendar/gui/e-itip-control.c:2381
+#: ../calendar/gui/e-itip-control.c:2401
 msgid "Send Free/Busy Information"
 msgstr "Enviar informaÃ§Ã£o de disponibilidade"
 
-#: ../calendar/gui/e-itip-control.c:2409
+#: ../calendar/gui/e-itip-control.c:2425
 msgid "Update respondent status"
 msgstr "Atualizar status do respondente"
 
-#: ../calendar/gui/e-itip-control.c:2437
+#: ../calendar/gui/e-itip-control.c:2449
 msgid "Send Latest Information"
 msgstr "Enviar informaÃ§Ã£o mais recente"
 
-#: ../calendar/gui/e-itip-control.c:2465 ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2473 ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -8317,6 +7020,10 @@ msgstr "Carregando agenda"
 msgid "Loading calendar..."
 msgstr "Carregando agenda..."
 
+#: ../calendar/gui/e-itip-control.glade.h:7
+msgid "Organizer:"
+msgstr "Organizador:"
+
 #: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Server Message:"
 msgstr "Mensagem do servidor:"
@@ -8337,77 +7044,73 @@ msgstr "Participantes opcionais"
 msgid "Resources"
 msgstr "Recursos"
 
-#: ../calendar/gui/e-meeting-list-view.c:151
-msgid "Attendees"
-msgstr "Participantes"
-
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102
-#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:980
+#: ../calendar/gui/e-meeting-store.c:84 ../calendar/gui/e-meeting-store.c:101
+#: ../calendar/gui/e-meeting-store.c:736 ../calendar/gui/print.c:974
 msgid "Individual"
 msgstr "IndivÃduo"
 
 #: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
-#: ../calendar/gui/print.c:981 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/print.c:975 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Grupo"
 
 #: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/print.c:982
+#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
+#: ../calendar/gui/print.c:976
 msgid "Resource"
 msgstr "Recurso"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
+#: ../calendar/gui/print.c:977
 msgid "Room"
 msgstr "Sala"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
-#: ../calendar/gui/print.c:997
+#: ../calendar/gui/e-meeting-store.c:119 ../calendar/gui/e-meeting-store.c:136
+#: ../calendar/gui/print.c:991
 msgid "Chair"
 msgstr "Moderador"
 
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
-#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:998
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:992
 msgid "Required Participant"
 msgstr "Participante necessÃ¡rio"
 
 #: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:999
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/print.c:993
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/print.c:994
 msgid "Non-Participant"
 msgstr "NÃ£o participante"
 
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193
-#: ../calendar/gui/e-meeting-store.c:752
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:192
+#: ../calendar/gui/e-meeting-store.c:749
 msgid "Needs Action"
 msgstr "Necessita de aÃ§Ã£o"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:546
+#: ../calendar/gui/e-meeting-list-view.c:544
 msgid "Attendee                          "
 msgstr "Participante                      "
 
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
 msgid "In Process"
 msgstr "Em andamento"
 
 #. 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:467
-#: ../calendar/gui/e-meeting-time-sel.c:2124
+#: ../calendar/gui/e-meeting-time-sel-item.c:458
+#: ../calendar/gui/e-meeting-time-sel.c:2083
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B, %Y"
 
@@ -8415,78 +7118,78 @@ msgstr "%A, %d de %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.
-#: ../calendar/gui/e-meeting-time-sel-item.c:471
-#: ../calendar/gui/e-meeting-time-sel.c:2155
+#: ../calendar/gui/e-meeting-time-sel-item.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:2114
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:475
+#: ../calendar/gui/e-meeting-time-sel-item.c:466
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:392
 msgid "Out of Office"
 msgstr "Fora do escritÃ³rio"
 
-#: ../calendar/gui/e-meeting-time-sel.c:401
+#: ../calendar/gui/e-meeting-time-sel.c:393
 msgid "No Information"
 msgstr "Sem informaÃ§Ã£o"
 
-#: ../calendar/gui/e-meeting-time-sel.c:416
+#: ../calendar/gui/e-meeting-time-sel.c:408
 msgid "A_ttendees..."
 msgstr "Participa_ntes..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:437
+#: ../calendar/gui/e-meeting-time-sel.c:429
 msgid "O_ptions"
 msgstr "O_pÃ§Ãµes"
 
-#: ../calendar/gui/e-meeting-time-sel.c:454
+#: ../calendar/gui/e-meeting-time-sel.c:446
 msgid "Show _only working hours"
 msgstr "Mostrar apenas _horas de expediente"
 
-#: ../calendar/gui/e-meeting-time-sel.c:464
+#: ../calendar/gui/e-meeting-time-sel.c:456
 msgid "Show _zoomed out"
 msgstr "Mostrar com _menos ampliaÃ§Ã£o"
 
-#: ../calendar/gui/e-meeting-time-sel.c:479
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "_Update free/busy"
 msgstr "_Atualizar disponibilidade"
 
-#: ../calendar/gui/e-meeting-time-sel.c:494
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:512
+#: ../calendar/gui/e-meeting-time-sel.c:504
 msgid "_Autopick"
 msgstr "Auto_seleÃ§Ã£o"
 
-#: ../calendar/gui/e-meeting-time-sel.c:527
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:536
 msgid "_All people and resources"
 msgstr "Todas as _pessoas e recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:553
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "All _people and one resource"
 msgstr "Todas as pessoas e um _recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:562
+#: ../calendar/gui/e-meeting-time-sel.c:554
 msgid "_Required people"
 msgstr "Pessoas _necessÃ¡rias"
 
-#: ../calendar/gui/e-meeting-time-sel.c:571
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Required people and _one resource"
 msgstr "Pessoas necessÃ¡rias e _um recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:607
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "_Start time:"
 msgstr "_Hora de inÃcio:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:634
+#: ../calendar/gui/e-meeting-time-sel.c:626
 msgid "_End time:"
 msgstr "Hora de tÃ©r_mino:"
 
@@ -8514,15 +7217,15 @@ msgstr "Idioma"
 msgid "Member"
 msgstr "Membro"
 
-#: ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/e-memo-table.c:950
 msgid "_Delete Selected Memos"
 msgstr "_Excluir memorandos selecionadas"
 
-#: ../calendar/gui/e-memo-table.c:1091 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1099 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Clique para adicionar um memorando"
 
-#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
+#: ../calendar/gui/e-memos.c:754 ../calendar/gui/e-tasks.c:902
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8531,165 +7234,133 @@ msgstr ""
 "Erro em %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:812
+#: ../calendar/gui/e-memos.c:806
 msgid "Loading memos"
 msgstr "Carregando memorandos"
 
-#: ../calendar/gui/e-memos.c:903
+#: ../calendar/gui/e-memos.c:897
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Abrindo memorandos em %s"
 
-#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
+#: ../calendar/gui/e-memos.c:1066 ../calendar/gui/e-tasks.c:1318
 msgid "Deleting selected objects..."
 msgstr "Excluindo objetos selecionados..."
 
-#: ../calendar/gui/e-tasks.c:963
+#: ../calendar/gui/e-tasks.c:955
 msgid "Loading tasks"
 msgstr "Carregando tarefas"
 
-#: ../calendar/gui/e-tasks.c:1061
+#: ../calendar/gui/e-tasks.c:1052
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrindo tarefas em %s"
 
-#: ../calendar/gui/e-tasks.c:1306
+#: ../calendar/gui/e-tasks.c:1295
 msgid "Completing tasks..."
 msgstr "Concluindo tarefas..."
 
-#: ../calendar/gui/e-tasks.c:1356
+#: ../calendar/gui/e-tasks.c:1345
 msgid "Expunging"
 msgstr "Excluindo permanentemente"
 
-#: ../calendar/gui/e-timezone-entry.c:127
+#: ../calendar/gui/e-timezone-entry.c:124
 msgid "Select Timezone"
 msgstr "Selecionar um fuso horÃ¡rio"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1659
+#: ../calendar/gui/e-week-view-main-item.c:376 ../calendar/gui/print.c:1647
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2637
+#: ../calendar/gui/gnome-cal.c:2673
 msgid "_Custom View"
 msgstr "_VisÃ£o personalizada"
 
-#: ../calendar/gui/gnome-cal.c:2638
+#: ../calendar/gui/gnome-cal.c:2674
 msgid "_Save Custom View"
 msgstr "_Salvar visÃ£o personalizada"
 
-#: ../calendar/gui/gnome-cal.c:2643
+#: ../calendar/gui/gnome-cal.c:2679
 msgid "_Define Views..."
 msgstr "_Definir visÃµes..."
 
-#: ../calendar/gui/gnome-cal.c:2880
+#: ../calendar/gui/gnome-cal.c:2916
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Carregando compromissos em %s"
 
-#: ../calendar/gui/gnome-cal.c:2895
+#: ../calendar/gui/gnome-cal.c:2931
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Carregando tarefas em %s"
 
-#: ../calendar/gui/gnome-cal.c:2904
+#: ../calendar/gui/gnome-cal.c:2940
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Carregando memorandos em %s"
 
-#: ../calendar/gui/gnome-cal.c:3016
+#: ../calendar/gui/gnome-cal.c:3052
 #, c-format
 msgid "Opening %s"
 msgstr "Abrindo %s"
 
-#: ../calendar/gui/gnome-cal.c:3984
+#: ../calendar/gui/gnome-cal.c:4012
 msgid "Purging"
 msgstr "Excluindo permanentemente"
 
 #: ../calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "Abril"
-
-#: ../calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "Agosto"
-
-#: ../calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "Dezembro"
-
-#: ../calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "Fevereiro"
-
-#: ../calendar/gui/goto-dialog.glade.h:5
-msgid "January"
-msgstr "Janeiro"
-
-#: ../calendar/gui/goto-dialog.glade.h:6
-msgid "July"
-msgstr "Julho"
-
-#: ../calendar/gui/goto-dialog.glade.h:7
-msgid "June"
-msgstr "Junho"
-
-#: ../calendar/gui/goto-dialog.glade.h:8
-msgid "March"
-msgstr "MarÃ§o"
-
-#: ../calendar/gui/goto-dialog.glade.h:9
-msgid "May"
-msgstr "Maio"
-
-#: ../calendar/gui/goto-dialog.glade.h:10
-msgid "November"
-msgstr "Novembro"
-
-#: ../calendar/gui/goto-dialog.glade.h:11
-msgid "October"
-msgstr "Outubro"
+msgid ""
+"January\n"
+"February\n"
+"March\n"
+"April\n"
+"May\n"
+"June\n"
+"July\n"
+"August\n"
+"September\n"
+"October\n"
+"November\n"
+"December"
+msgstr ""
 
-#: ../calendar/gui/goto-dialog.glade.h:12
+#: ../calendar/gui/goto-dialog.glade.h:13
 msgid "Select Date"
 msgstr "Selecionar data"
 
-#: ../calendar/gui/goto-dialog.glade.h:13
-msgid "September"
-msgstr "Setembro"
-
 #: ../calendar/gui/goto-dialog.glade.h:14
 msgid "_Select Today"
 msgstr "_Selecionar hoje"
 
-#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:462
-#: ../calendar/gui/itip-utils.c:550
+#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:461
+#: ../calendar/gui/itip-utils.c:553
 msgid "An organizer must be set."
 msgstr "Ã? necessÃ¡rio configurar um organizador."
 
-#: ../calendar/gui/itip-utils.c:454
+#: ../calendar/gui/itip-utils.c:453
 msgid "At least one attendee is necessary"
 msgstr "Ã? necessÃ¡rio pelo menos um participante"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:778
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:781
 msgid "Event information"
 msgstr "InformaÃ§Ã£o de evento"
 
-#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:781
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:784
 msgid "Task information"
 msgstr "InformaÃ§Ã£o de tarefa"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:784
+#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:787
 msgid "Memo information"
 msgstr "InformaÃ§Ã£o do memorando"
 
-#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:802
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:805
 msgid "Free/Busy information"
 msgstr "InformaÃ§Ã£o de disponibilidade"
 
-#: ../calendar/gui/itip-utils.c:640
+#: ../calendar/gui/itip-utils.c:643
 msgid "Calendar information"
 msgstr "InformaÃ§Ã£o de agenda"
 
@@ -8697,7 +7368,7 @@ msgstr "InformaÃ§Ã£o de agenda"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:674
+#: ../calendar/gui/itip-utils.c:677
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Aceito"
@@ -8706,7 +7377,7 @@ msgstr "Aceito"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:681
+#: ../calendar/gui/itip-utils.c:684
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Aceito preliminarmente"
@@ -8718,7 +7389,7 @@ msgstr "Aceito preliminarmente"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:688 ../calendar/gui/itip-utils.c:736
+#: ../calendar/gui/itip-utils.c:691 ../calendar/gui/itip-utils.c:739
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Recusado"
@@ -8727,7 +7398,7 @@ msgstr "Recusado"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:695
+#: ../calendar/gui/itip-utils.c:698
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Representado"
@@ -8735,7 +7406,7 @@ msgstr "Representado"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:708
+#: ../calendar/gui/itip-utils.c:711
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Atualizado"
@@ -8743,7 +7414,7 @@ msgstr "Atualizado"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:715
+#: ../calendar/gui/itip-utils.c:718
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Cancelar"
@@ -8751,7 +7422,7 @@ msgstr "Cancelar"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:722
+#: ../calendar/gui/itip-utils.c:725
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Atualizar"
@@ -8759,101 +7430,101 @@ msgstr "Atualizar"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:729
+#: ../calendar/gui/itip-utils.c:732
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Contraproposta"
 
-#: ../calendar/gui/itip-utils.c:799
+#: ../calendar/gui/itip-utils.c:802
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "InformaÃ§Ã£o de disponibilidade (%s para %s)"
 
-#: ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:810
 msgid "iCalendar information"
 msgstr "InformaÃ§Ã£o do iCalendar"
 
-#: ../calendar/gui/itip-utils.c:978
+#: ../calendar/gui/itip-utils.c:981
 msgid "You must be an attendee of the event."
 msgstr "VocÃª deve ser um participante do evento."
 
-#: ../calendar/gui/memos-component.c:507
+#: ../calendar/gui/memos-component.c:477
 msgid "_New Memo List"
 msgstr "_Nova lista de memorandos"
 
-#: ../calendar/gui/memos-component.c:590
+#: ../calendar/gui/memos-component.c:560
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d memorando"
 msgstr[1] "%d memorandos"
 
-#: ../calendar/gui/memos-component.c:592 ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/memos-component.c:562 ../calendar/gui/tasks-component.c:555
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d selecionada"
 msgstr[1] ", %d selecionadas"
 
-#: ../calendar/gui/memos-component.c:639
+#: ../calendar/gui/memos-component.c:609
 msgid "Failed upgrading memos."
 msgstr "Falha ao atualizar memorandos."
 
-#: ../calendar/gui/memos-component.c:769
+#: ../calendar/gui/memos-component.c:739
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
 "NÃ£o Ã© possÃvel abrir a lista de memorandos \"%s\" para criar eventos e "
 "reuniÃµes"
 
-#: ../calendar/gui/memos-component.c:782
+#: ../calendar/gui/memos-component.c:752
 msgid "There is no calendar available for creating memos"
 msgstr "NÃ£o existe agenda disponÃvel para a criaÃ§Ã£o de memorandos"
 
-#: ../calendar/gui/memos-component.c:892
+#: ../calendar/gui/memos-component.c:862
 msgid "Memo Source Selector"
 msgstr "Seletor de fonte de memorando"
 
-#: ../calendar/gui/memos-component.c:1071
+#: ../calendar/gui/memos-component.c:1041
 msgid "New memo"
 msgstr "Novo memorando"
 
-#: ../calendar/gui/memos-component.c:1072
+#: ../calendar/gui/memos-component.c:1042
 msgctxt "New"
 msgid "Mem_o"
 msgstr "Mem_orando"
 
-#: ../calendar/gui/memos-component.c:1073
+#: ../calendar/gui/memos-component.c:1043
 msgid "Create a new memo"
 msgstr "Cria um novo memorando"
 
-#: ../calendar/gui/memos-component.c:1079
+#: ../calendar/gui/memos-component.c:1049
 msgid "New shared memo"
 msgstr "Novo memorando compartilhado"
 
-#: ../calendar/gui/memos-component.c:1080
+#: ../calendar/gui/memos-component.c:1050
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "_Memorando compartilhado"
 
-#: ../calendar/gui/memos-component.c:1081
+#: ../calendar/gui/memos-component.c:1051
 msgid "Create a shared new memo"
 msgstr "Cria um novo memorando compartilhado"
 
-#: ../calendar/gui/memos-component.c:1087
+#: ../calendar/gui/memos-component.c:1057
 msgid "New memo list"
 msgstr "Nova lista de memorandos"
 
-#: ../calendar/gui/memos-component.c:1088
+#: ../calendar/gui/memos-component.c:1058
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "Li_sta de memorandos"
 
-#: ../calendar/gui/memos-component.c:1089
+#: ../calendar/gui/memos-component.c:1059
 msgid "Create a new memo list"
 msgstr "Cria uma nova lista de memorandos"
 
-#: ../calendar/gui/memos-control.c:350 ../calendar/gui/memos-control.c:366
+#: ../calendar/gui/memos-control.c:386 ../calendar/gui/memos-control.c:402
 msgid "Print Memos"
 msgstr "Imprimir memorandos"
 
@@ -8882,299 +7553,291 @@ msgstr ""
 "Por favor, aguarde enquanto o Evolution migra as sua pastas..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
+#: ../calendar/gui/migration.c:774 ../calendar/gui/migration.c:942
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 "NÃ£o Ã© possÃvel migrar as configuraÃ§Ãµes antigas de evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:804
+#: ../calendar/gui/migration.c:803
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "NÃ£o Ã© possÃvel migrar agenda \"%s\""
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:972
+#: ../calendar/gui/migration.c:971
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "NÃ£o Ã© possÃvel migrar tarefas \"%s\""
 
-#: ../calendar/gui/migration.c:1227
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
-msgid "Notes"
-msgstr "Notas"
-
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "1st"
 msgstr "1Âº de"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "2nd"
 msgstr "2 de"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "3rd"
 msgstr "3 de"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "4th"
 msgstr "4 de"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "5th"
 msgstr "5 de"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "6th"
 msgstr "6 de"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "7th"
 msgstr "7 de"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "8th"
 msgstr "8 de"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "9th"
 msgstr "9 de"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "10th"
 msgstr "10 de"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "11th"
 msgstr "11 de"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "12th"
 msgstr "12 de"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "13th"
 msgstr "13 de"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "14th"
 msgstr "14 de"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "15th"
 msgstr "15 de"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "16th"
 msgstr "16 de"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "17th"
 msgstr "17 de"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "18th"
 msgstr "18 de"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "19th"
 msgstr "19 de"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "20th"
 msgstr "20 de"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "21st"
 msgstr "21 de"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "22nd"
 msgstr "22 de"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "23rd"
 msgstr "23 de"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "24th"
 msgstr "24 de"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "25th"
 msgstr "25 de"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "26th"
 msgstr "26 de"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "27th"
 msgstr "27 de"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "28th"
 msgstr "28 de"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "29th"
 msgstr "29 de"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "30th"
 msgstr "30 de"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 msgid "31st"
 msgstr "31 de"
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Su"
 msgstr "D"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Mo"
 msgstr "S"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Tu"
 msgstr "T"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "We"
 msgstr "Q"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Th"
 msgstr "Q"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Fr"
 msgstr "S"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Sa"
 msgstr "S"
 
-#: ../calendar/gui/print.c:2481
+#: ../calendar/gui/print.c:2465
 msgid "Appointment"
 msgstr "Compromisso"
 
-#: ../calendar/gui/print.c:2483
+#: ../calendar/gui/print.c:2467
 msgid "Task"
 msgstr "Tarefa"
 
-#: ../calendar/gui/print.c:2508
+#: ../calendar/gui/print.c:2492
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumo: %s"
 
-#: ../calendar/gui/print.c:2531
+#: ../calendar/gui/print.c:2515
 msgid "Attendees: "
 msgstr "Participantes: "
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2555
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2588
+#: ../calendar/gui/print.c:2569
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridade: %s"
 
-#: ../calendar/gui/print.c:2600
+#: ../calendar/gui/print.c:2584
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentagem concluÃda: %i"
 
-#: ../calendar/gui/print.c:2612
+#: ../calendar/gui/print.c:2595
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2625
+#: ../calendar/gui/print.c:2608
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorias: %s"
 
-#: ../calendar/gui/print.c:2636
+#: ../calendar/gui/print.c:2619
 msgid "Contacts: "
 msgstr "Contatos: "
 
-#: ../calendar/gui/tasks-component.c:499
+#: ../calendar/gui/tasks-component.c:470
 msgid "_New Task List"
 msgstr "_Nova lista de tarefas"
 
-#: ../calendar/gui/tasks-component.c:582
+#: ../calendar/gui/tasks-component.c:553
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tarefa"
 msgstr[1] "%d tarefas"
 
-#: ../calendar/gui/tasks-component.c:631
+#: ../calendar/gui/tasks-component.c:602
 msgid "Failed upgrading tasks."
 msgstr "Falha ao atualizar tarefas."
 
-#: ../calendar/gui/tasks-component.c:764
+#: ../calendar/gui/tasks-component.c:735
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "NÃ£o Ã© possÃvel abrir a lista de tarefas \"%s\" para criar eventos e reuniÃµes"
 
-#: ../calendar/gui/tasks-component.c:777
+#: ../calendar/gui/tasks-component.c:748
 msgid "There is no calendar available for creating tasks"
 msgstr "NÃ£o existe agenda disponÃvel para a criaÃ§Ã£o de tarefas"
 
-#: ../calendar/gui/tasks-component.c:888
+#: ../calendar/gui/tasks-component.c:859
 msgid "Task Source Selector"
 msgstr "Seletor de fonte de tarefa"
 
-#: ../calendar/gui/tasks-component.c:1142
+#: ../calendar/gui/tasks-component.c:1113
 msgid "New task"
 msgstr "Nova tarefa"
 
-#: ../calendar/gui/tasks-component.c:1143
+#: ../calendar/gui/tasks-component.c:1114
 msgctxt "New"
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: ../calendar/gui/tasks-component.c:1144
+#: ../calendar/gui/tasks-component.c:1115
 msgid "Create a new task"
 msgstr "Cria uma nova tarefa"
 
-#: ../calendar/gui/tasks-component.c:1150
+#: ../calendar/gui/tasks-component.c:1121
 msgid "New assigned task"
 msgstr "Nova tarefa atribuÃda"
 
-#: ../calendar/gui/tasks-component.c:1151
+#: ../calendar/gui/tasks-component.c:1122
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tarefa _atribuÃda"
 
-#: ../calendar/gui/tasks-component.c:1152
+#: ../calendar/gui/tasks-component.c:1123
 msgid "Create a new assigned task"
 msgstr "Cria uma nova tarefa atribuÃda"
 
-#: ../calendar/gui/tasks-component.c:1158
+#: ../calendar/gui/tasks-component.c:1129
 msgid "New task list"
 msgstr "Nova lista de tarefas"
 
-#: ../calendar/gui/tasks-component.c:1159
+#: ../calendar/gui/tasks-component.c:1130
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "Lista de _tarefas"
 
-#: ../calendar/gui/tasks-component.c:1160
+#: ../calendar/gui/tasks-component.c:1131
 msgid "Create a new task list"
 msgstr "Cria uma nova lista de tarefas"
 
-#: ../calendar/gui/tasks-control.c:442
+#: ../calendar/gui/tasks-control.c:484
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -9187,11 +7850,11 @@ msgstr ""
 "\n"
 "Apagar estas tarefas mesmo assim?"
 
-#: ../calendar/gui/tasks-control.c:445 ../mail/em-folder-view.c:1128
+#: ../calendar/gui/tasks-control.c:487 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "NÃ£o me pergunte novamente."
 
-#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
+#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
 msgid "Print Tasks"
 msgstr "Imprimir tarefas"
 
@@ -9208,11 +7871,11 @@ msgstr "Cancelado"
 msgid "In progress"
 msgstr "Em progresso"
 
-#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
 msgid "is greater than"
 msgstr "Ã© maior que"
 
-#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
 msgid "is less than"
 msgstr "Ã© menor que"
 
@@ -9220,37 +7883,37 @@ msgstr "Ã© menor que"
 msgid "Appointments and Meetings"
 msgstr "Compromissos e reuniÃµes"
 
-#: ../calendar/importers/icalendar-importer.c:333
-#: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1723
+#: ../calendar/importers/icalendar-importer.c:335
+#: ../calendar/importers/icalendar-importer.c:630
+#: ../plugins/itip-formatter/itip-formatter.c:1728
 msgid "Opening calendar"
 msgstr "Abrindo agenda"
 
-#: ../calendar/importers/icalendar-importer.c:440
+#: ../calendar/importers/icalendar-importer.c:442
 msgid "iCalendar files (.ics)"
 msgstr "Arquivos iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:441
+#: ../calendar/importers/icalendar-importer.c:443
 msgid "Evolution iCalendar importer"
 msgstr "Importador iCalendar do Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:529
+#: ../calendar/importers/icalendar-importer.c:531
 msgid "Reminder!"
 msgstr "Lembrete!"
 
-#: ../calendar/importers/icalendar-importer.c:581
+#: ../calendar/importers/icalendar-importer.c:583
 msgid "vCalendar files (.vcf)"
 msgstr "Arquivos vCalendar (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:582
+#: ../calendar/importers/icalendar-importer.c:584
 msgid "Evolution vCalendar importer"
 msgstr "Importador vCalendar do Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:746
 msgid "Calendar Events"
 msgstr "Eventos de agenda"
 
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:783
 msgid "Evolution Calendar intelligent importer"
 msgstr "Importador inteligente da agenda do Evolution"
 
@@ -10803,218 +9466,191 @@ msgstr "PacÃfico/Wallis"
 msgid "Pacific/Yap"
 msgstr "PacÃfico/Yap"
 
-#: ../composer/e-composer-autosave.c:273
-msgid "Could not open autosave file"
-msgstr "NÃ£o foi possÃvel abrir o arquivo de salvamento automÃ¡tico"
-
-#: ../composer/e-composer-autosave.c:280
+#: ../composer/e-composer-autosave.c:445
 msgid "Unable to retrieve message from editor"
 msgstr "NÃ£o foi possÃvel obter mensagem do editor"
 
-#: ../composer/e-composer-actions.c:45
-msgid "Insert Attachment"
-msgstr "Inserir anexo"
-
-#: ../composer/e-composer-actions.c:49
-msgid "A_ttach"
-msgstr "Ane_xar"
-
-#: ../composer/e-composer-actions.c:140
+#: ../composer/e-composer-actions.c:84
 msgid "Untitled Message"
 msgstr "Mensagem sem tÃtulo"
 
-#: ../composer/e-composer-actions.c:471
+#: ../composer/e-composer-actions.c:317
+#: ../widgets/misc/e-attachment-view.c:328
 msgid "Attach a file"
 msgstr "Anexar um arquivo"
 
-#: ../composer/e-composer-actions.c:476 ../mail/mail-signature-editor.c:194
+#: ../composer/e-composer-actions.c:322 ../mail/mail-signature-editor.c:195
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "_Fechar"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:324
 msgid "Close the current file"
 msgstr "Fecha o arquivo atual"
 
-#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1339
+#: ../composer/e-composer-actions.c:329 ../mail/em-folder-view.c:1337
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
-#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "Im_primir..."
 
-#: ../composer/e-composer-actions.c:490 ../ui/evolution-addressbook.xml.h:27
-#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
+#: ../composer/e-composer-actions.c:336 ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:72
 #: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "_Visualizar impressÃ£o"
 
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:345
 msgid "Save the current file"
 msgstr "Salvar o arquivo atual"
 
-#: ../composer/e-composer-actions.c:504
+#: ../composer/e-composer-actions.c:350
 msgid "Save _As..."
 msgstr "Salvar _como..."
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:352
 msgid "Save the current file with a different name"
 msgstr "Salvar o arquivo atual com um nome diferente"
 
-#: ../composer/e-composer-actions.c:511
+#: ../composer/e-composer-actions.c:357
 msgid "Save as _Draft"
 msgstr "Salvar como _rascunho"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:359
 msgid "Save as draft"
 msgstr "Salvar como rascunho"
 
-#: ../composer/e-composer-actions.c:518
+#: ../composer/e-composer-actions.c:364 ../composer/e-composer-private.c:191
 msgid "S_end"
 msgstr "_Enviar"
 
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:366
 msgid "Send this message"
 msgstr "Enviar esta mensagem"
 
-#: ../composer/e-composer-actions.c:527
+#: ../composer/e-composer-actions.c:373
 msgid "Insert Send options"
 msgstr "Inserir opÃ§Ãµes de envio"
 
-#: ../composer/e-composer-actions.c:532
+#: ../composer/e-composer-actions.c:378
 msgid "New _Message"
 msgstr "Nova _mensagem"
 
-#: ../composer/e-composer-actions.c:534
+#: ../composer/e-composer-actions.c:380
 msgid "Open New Message window"
 msgstr "Abrir nova janela de mensagem"
 
-#: ../composer/e-composer-actions.c:541
+#: ../composer/e-composer-actions.c:387
 msgid "Character _Encoding"
 msgstr "CodificaÃ§Ã£o de caract_eres"
 
-#: ../composer/e-composer-actions.c:548
+#: ../composer/e-composer-actions.c:394
 msgid "_Security"
 msgstr "_SeguranÃ§a"
 
-#: ../composer/e-composer-actions.c:558
+#: ../composer/e-composer-actions.c:404
 msgid "PGP _Encrypt"
 msgstr "Criptografar com PGP"
 
-#: ../composer/e-composer-actions.c:560
+#: ../composer/e-composer-actions.c:406
 msgid "Encrypt this message with PGP"
 msgstr "Criptografar esta mensagem com PGP"
 
-#: ../composer/e-composer-actions.c:566
+#: ../composer/e-composer-actions.c:412
 msgid "PGP _Sign"
 msgstr "Assinar com PGP"
 
-#: ../composer/e-composer-actions.c:568
+#: ../composer/e-composer-actions.c:414
 msgid "Sign this message with your PGP key"
 msgstr "Assinar esta mensagem com a sua chave PGP"
 
-#: ../composer/e-composer-actions.c:574
+#: ../composer/e-composer-actions.c:420
 msgid "_Prioritize Message"
 msgstr "_Priorizar mensagem"
 
-#: ../composer/e-composer-actions.c:576
+#: ../composer/e-composer-actions.c:422
 msgid "Set the message priority to high"
 msgstr "Mudar a prioridade da mensagem para alta"
 
-#: ../composer/e-composer-actions.c:582
+#: ../composer/e-composer-actions.c:428
 msgid "Re_quest Read Receipt"
 msgstr "_Solicitar recibo de leitura"
 
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:430
 msgid "Get delivery notification when your message is read"
 msgstr "Receber notificaÃ§Ã£o de entrega quando sua mensagem for lida"
 
-#: ../composer/e-composer-actions.c:590
+#: ../composer/e-composer-actions.c:436
 msgid "S/MIME En_crypt"
 msgstr "Criptografar com S/MIME"
 
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:438
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr ""
 "Criptografar esta mensagem usando o seu Certificado de Criptografia S/MIME"
 
-#: ../composer/e-composer-actions.c:598
+#: ../composer/e-composer-actions.c:444
 msgid "S/MIME Sig_n"
 msgstr "Assinar S/MIME"
 
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:446
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Assinar esta mensagem com o seu certificado de assinatura S/MIME"
 
-#: ../composer/e-composer-actions.c:606
+#: ../composer/e-composer-actions.c:452
 msgid "_Bcc Field"
 msgstr "Campo CCO"
 
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:454
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Alterna a exibiÃ§Ã£o do campo CCO"
 
-#: ../composer/e-composer-actions.c:614
+#: ../composer/e-composer-actions.c:460
 msgid "_Cc Field"
 msgstr "Campo _CC"
 
-#: ../composer/e-composer-actions.c:616
+#: ../composer/e-composer-actions.c:462
 msgid "Toggles whether the CC field is displayed"
 msgstr "Exibe/oculta o campo CC"
 
-#: ../composer/e-composer-actions.c:622
+#: ../composer/e-composer-actions.c:468
 msgid "_From Field"
 msgstr "Campo _De"
 
-#: ../composer/e-composer-actions.c:624
+#: ../composer/e-composer-actions.c:470
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Exibe/oculta o campo De"
 
-#: ../composer/e-composer-actions.c:630
-msgid "_Post-To Field"
-msgstr "Campo _Publicar em"
-
-#: ../composer/e-composer-actions.c:632
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "Exibe/oculta o campo Publicar em"
-
-#: ../composer/e-composer-actions.c:638
+#: ../composer/e-composer-actions.c:476
 msgid "_Reply-To Field"
 msgstr "Campo _Responder a"
 
-#: ../composer/e-composer-actions.c:640
+#: ../composer/e-composer-actions.c:478
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Exibe/oculta o campo Responder a"
 
-#: ../composer/e-composer-actions.c:646
-msgid "_Subject Field"
-msgstr "Campo a_ssunto"
-
-#: ../composer/e-composer-actions.c:648
-msgid "Toggles whether the Subject field is displayed"
-msgstr "Exibe/oculta o campo Assunto"
-
-#: ../composer/e-composer-actions.c:654
-msgid "_To Field"
-msgstr "Campo _Para"
-
-#: ../composer/e-composer-actions.c:656
-msgid "Toggles whether the To field is displayed"
-msgstr "Exibe/oculta o campo Para"
-
-#: ../composer/e-composer-actions.c:699
+#: ../composer/e-composer-actions.c:521
 msgid "Save Draft"
 msgstr "Salvar rascunho"
 
-#: ../composer/e-composer-header-table.c:64
+#: ../composer/e-composer-header.c:120
+msgid "Show"
+msgstr "Mostrar"
+
+#: ../composer/e-composer-header.c:123
+msgid "Hide"
+msgstr "Ocultar"
+
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "Digite os destinatÃ¡rios da mensagem"
 
-#: ../composer/e-composer-header-table.c:66
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Digite os endereÃ§os que receberÃ£o uma cÃ³pia da mensagem"
 
-#: ../composer/e-composer-header-table.c:69
+#: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -11022,39 +9658,53 @@ msgstr ""
 "Digite os endereÃ§os que receberÃ£o uma cÃ³pia da mensagem sem aparecer na "
 "lista de destinatÃ¡rios da mensagem"
 
-#: ../composer/e-composer-header-table.c:643
+#: ../composer/e-composer-header-table.c:945
 msgid "Fr_om:"
 msgstr "_De:"
 
-#: ../composer/e-composer-header-table.c:652
+#: ../composer/e-composer-header-table.c:945 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:923 ../mail/em-mailer-prefs.c:76
+#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:296
+msgid "From"
+msgstr "De"
+
+#: ../composer/e-composer-header-table.c:954
 msgid "_Reply-To:"
 msgstr "_Responder a:"
 
-#: ../composer/e-composer-header-table.c:656
+#: ../composer/e-composer-header-table.c:959
 msgid "_To:"
 msgstr "_Para:"
 
-#: ../composer/e-composer-header-table.c:661
+#: ../composer/e-composer-header-table.c:965
 msgid "_Cc:"
 msgstr "_CC:"
 
-#: ../composer/e-composer-header-table.c:666
+#: ../composer/e-composer-header-table.c:965 ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "CC"
+
+#: ../composer/e-composer-header-table.c:971
 msgid "_Bcc:"
 msgstr "CC_O:"
 
-#: ../composer/e-composer-header-table.c:671
+#: ../composer/e-composer-header-table.c:971 ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "BCC"
+
+#: ../composer/e-composer-header-table.c:976
 msgid "_Post To:"
 msgstr "_Publicar em:"
 
-#: ../composer/e-composer-header-table.c:675
+#: ../composer/e-composer-header-table.c:980
 msgid "S_ubject:"
 msgstr "Ass_unto:"
 
-#: ../composer/e-composer-header-table.c:684
+#: ../composer/e-composer-header-table.c:989
 msgid "Si_gnature:"
 msgstr "Assi_natura:"
 
-#: ../composer/e-composer-name-header.c:115
+#: ../composer/e-composer-name-header.c:116
 msgid "Click here for the address book"
 msgstr "Clique aqui para abrir o catÃ¡logo de endereÃ§os"
 
@@ -11070,18 +9720,18 @@ msgstr "Escolha as pastas onde publicar a mensagem."
 msgid "Click here to select folders to post to"
 msgstr "Clique aqui para selecionar as pastas onde publicar"
 
-#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1552
-msgid "Show _Attachment Bar"
-msgstr "Mostrar barra de _anexos"
+#: ../composer/e-composer-private.c:208
+msgid "Save draft"
+msgstr "Salvar rascunho"
 
-#: ../composer/e-msg-composer.c:866
+#: ../composer/e-msg-composer.c:807
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "NÃ£o foi possÃvel assinar a mensagem a ser enviada: NÃ£o existe certificado de "
 "assinatura configurado para esta conta"
 
-#: ../composer/e-msg-composer.c:873
+#: ../composer/e-msg-composer.c:814
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -11089,23 +9739,11 @@ msgstr ""
 "NÃ£o foi possÃvel criptografar a mensagem a ser enviada: NÃ£o existe "
 "certificado de criptografia configurado para esta conta"
 
-#: ../composer/e-msg-composer.c:1494 ../mail/em-format-html-display.c:1952
-#: ../mail/em-format-html-display.c:2600 ../mail/mail-config.glade.h:45
-#: ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "Anexo"
-msgstr[1] "Anexos"
-
-#: ../composer/e-msg-composer.c:1550
-msgid "Hide _Attachment Bar"
-msgstr "Ocultar barra de _anexos"
-
-#: ../composer/e-msg-composer.c:1567 ../composer/e-msg-composer.c:2792
+#: ../composer/e-msg-composer.c:1350 ../composer/e-msg-composer.c:2189
 msgid "Compose Message"
 msgstr "Redigir mensagem"
 
-#: ../composer/e-msg-composer.c:4093
+#: ../composer/e-msg-composer.c:3347
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -11280,7 +9918,7 @@ msgstr "_Salvar rascunho"
 msgid "Evolution Mail and Calendar"
 msgstr "Correio e agenda do Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:947
 msgid "Groupware Suite"
 msgstr "SuÃte de Groupware"
 
@@ -11296,6 +9934,40 @@ msgstr "cartÃ£o de endereÃ§o"
 msgid "calendar information"
 msgstr "informaÃ§Ã£o de agenda"
 
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:188 ../plugins/itip-formatter/itip-view.c:191
+#: ../ui/evolution-calendar.xml.h:34 ../widgets/misc/e-cell-date-edit.c:304
+msgid "Today"
+msgstr "Hoje"
+
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:200 ../plugins/itip-formatter/itip-view.c:219
+msgid "Tomorrow"
+msgstr "AmanhÃ£"
+
+#: ../e-util/e-datetime-format.c:202
+msgid "Yesterday"
+msgstr "Ontem"
+
+#: ../e-util/e-datetime-format.c:205
+#, c-format
+msgid "%d days from now"
+msgstr ""
+
+#: ../e-util/e-datetime-format.c:207
+#, c-format
+msgid "%d days ago"
+msgstr "%d dias atrÃ¡s"
+
+#: ../e-util/e-datetime-format.c:281 ../e-util/e-datetime-format.c:291
+#: ../e-util/e-datetime-format.c:300
+msgid "Use locale default"
+msgstr "Usar localizaÃ§Ã£o padrÃ£o"
+
+#: ../e-util/e-datetime-format.c:494
+msgid "Format:"
+msgstr "Formato:"
+
 #: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
 msgid "Evolution Error"
 msgstr "Erro do Evolution"
@@ -11313,7 +9985,7 @@ msgid "Evolution Query"
 msgstr "Consulta do Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:444
+#: ../e-util/e-error.c:448
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Erro interno, foi pedido erro desconhecido \"%s\""
@@ -11326,67 +9998,67 @@ msgstr "Componente"
 msgid "Name of the component being logged"
 msgstr "Nome do componente logado"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:190
+#: ../e-util/e-non-intrusive-error-dialog.c:191
 msgid "Debug Logs"
 msgstr "Logs de depuraÃ§Ã£o"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:204
+#: ../e-util/e-non-intrusive-error-dialog.c:205
 msgid "Show _errors in the status bar for"
 msgstr "Mostrar _erros na barra de status para"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../e-util/e-non-intrusive-error-dialog.c:222
+#: ../e-util/e-non-intrusive-error-dialog.c:223
 msgid "second(s)."
 msgstr "segundo(s)."
 
-#: ../e-util/e-non-intrusive-error-dialog.c:228
+#: ../e-util/e-non-intrusive-error-dialog.c:229
 msgid "Log Messages:"
 msgstr "Mensagens do log:"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:273
+#: ../e-util/e-non-intrusive-error-dialog.c:274
 msgid "Log Level"
 msgstr "NÃvel do log"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:281
-#: ../widgets/misc/e-dateedit.c:389
+#: ../e-util/e-non-intrusive-error-dialog.c:282
+#: ../widgets/misc/e-dateedit.c:380
 msgid "Time"
 msgstr "Hora:"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2523
+#: ../e-util/e-non-intrusive-error-dialog.c:292 ../mail/message-list.c:2527
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Mensagens"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:300
+#: ../e-util/e-non-intrusive-error-dialog.c:301
 #: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Fecha esta janela"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Error"
 msgstr "Erro"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Errors"
 msgstr "Erros"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Warnings and Errors"
 msgstr "Avisos e erros"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:42
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Debug"
 msgstr "Depurar"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:42
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Error, Warnings and Debug messages"
 msgstr "Mensagens de erro, aviso e depuraÃ§Ã£o"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:799
-#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:966
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:798
+#: ../mail/em-account-prefs.c:477 ../mail/em-composer-prefs.c:957
 #: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:690
+#: ../plugins/publish-calendar/publish-calendar.c:718
 msgid "Enabled"
 msgstr "Habilitado"
 
@@ -11408,6 +10080,10 @@ msgid ""
 msgstr ""
 "O sistema de impressÃ£o nÃ£o relatou nenhum detalhe adicional sobre o erro."
 
+#: ../e-util/e-signature.c:690
+msgid "Autogenerated"
+msgstr "Gerado automaticamente"
+
 #: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
 msgid "Because \"{1}\"."
 msgstr "Devido a \"{1}\"."
@@ -11436,55 +10112,55 @@ msgstr "Sobrescrever arquivo?"
 msgid "_Overwrite"
 msgstr "S_obrescrever"
 
-#: ../e-util/e-util.c:127
+#: ../e-util/e-util.c:133
 msgid "Could not open the link."
 msgstr "NÃ£o foi possÃvel abrir o link."
 
-#: ../e-util/e-util.c:174
+#: ../e-util/e-util.c:183
 msgid "Could not display help for Evolution."
 msgstr "NÃ£o foi possÃvel exibir a ajuda do Evolution."
 
-#: ../e-util/e-util-labels.c:39
+#: ../e-util/e-util-labels.c:45
 msgid "I_mportant"
 msgstr "I_mportante"
 
 #. red
-#: ../e-util/e-util-labels.c:40
+#: ../e-util/e-util-labels.c:46
 msgid "_Work"
 msgstr "_Trabalho"
 
 #. orange
-#: ../e-util/e-util-labels.c:41
+#: ../e-util/e-util-labels.c:47
 msgid "_Personal"
 msgstr "_Pessoal"
 
 #. green
-#: ../e-util/e-util-labels.c:42
+#: ../e-util/e-util-labels.c:48
 msgid "_To Do"
 msgstr "A fa_zer"
 
 #. blue
-#: ../e-util/e-util-labels.c:43
+#: ../e-util/e-util-labels.c:49
 msgid "_Later"
 msgstr "Mais _tarde"
 
-#: ../e-util/e-util-labels.c:315
+#: ../e-util/e-util-labels.c:320
 msgid "Label _Name:"
 msgstr "_Nome:"
 
-#: ../e-util/e-util-labels.c:338
+#: ../e-util/e-util-labels.c:343
 msgid "Edit Label"
 msgstr "Editar rÃ³tulo"
 
-#: ../e-util/e-util-labels.c:338
+#: ../e-util/e-util-labels.c:343
 msgid "Add Label"
 msgstr "Adicionar rÃ³tulo"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:362
 msgid "Label name cannot be empty."
 msgstr "O rÃ³tulo nÃ£o pode ser vazio."
 
-#: ../e-util/e-util-labels.c:362
+#: ../e-util/e-util-labels.c:367
 msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
@@ -11492,190 +10168,190 @@ msgstr ""
 "JÃ¡ existe um rÃ³tulo com a mesma etiqueta no servidor. Por favor renomeie o "
 "seu rÃ³tulo."
 
-#: ../e-util/gconf-bridge.c:1221
+#: ../e-util/gconf-bridge.c:1222
 #, c-format
 msgid "GConf error: %s"
 msgstr "Erro do GConf: %s"
 
-#: ../e-util/gconf-bridge.c:1231
+#: ../e-util/gconf-bridge.c:1233
 msgid "All further errors shown only on terminal."
 msgstr "Todos os demais erros mostrados apenas no terminal."
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:73
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 segundo atrÃ¡s"
 msgstr[1] "%d segundos atrÃ¡s"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 segundo no futuro"
 msgstr[1] "%d segundos no futuro"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 minuto atrÃ¡s"
 msgstr[1] "%d minutos atrÃ¡s"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:76
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "1 minuto no futuro"
 msgstr[1] "%d minutos no futuro"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:77
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 hora atrÃ¡s"
 msgstr[1] "%d horas atrÃ¡s"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:78
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "1 hora no futuro"
 msgstr[1] "%d horas no futuro"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:79
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 dia atrÃ¡s"
 msgstr[1] "%d dias atrÃ¡s"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "1 dia no futuro"
 msgstr[1] "%d dias no futuro"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 semana atrÃ¡s"
 msgstr[1] "%d semanas atrÃ¡s"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 semana no futuro"
 msgstr[1] "%d semanas no futuro"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 mÃªs atrÃ¡s"
 msgstr[1] "%d meses atrÃ¡s"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "1 mÃªs no futuro"
 msgstr[1] "%d meses no futuro"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 ano atrÃ¡s"
 msgstr[1] "%d anos atrÃ¡s"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "1 ano no futuro"
 msgstr[1] "%d anos no futuro"
 
-#: ../filter/filter-datespec.c:288
+#: ../filter/filter-datespec.c:294
 msgid "<click here to select a date>"
 msgstr "<clique aqui para selecionar uma data>"
 
-#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
-#: ../filter/filter-datespec.c:313
+#: ../filter/filter-datespec.c:297 ../filter/filter-datespec.c:308
+#: ../filter/filter-datespec.c:319
 msgid "now"
 msgstr "agora"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:298
+#: ../filter/filter-datespec.c:304
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/filter-datespec.c:452
+#: ../filter/filter-datespec.c:447
 msgid "Select a time to compare against"
 msgstr "Selecionar um instante em relaÃ§Ã£o ao qual comparar"
 
-#: ../filter/filter-file.c:284
+#: ../filter/filter-file.c:281
 msgid "Choose a file"
 msgstr "Escolher um arquivo"
 
-#: ../filter/filter-part.c:532
+#: ../filter/filter-part.c:528
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Teste"
 
-#: ../filter/filter-rule.c:853
+#: ../filter/filter-rule.c:854
 msgid "R_ule name:"
 msgstr "_Nome da regra:"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:882
 msgid "Find items that meet the following conditions"
 msgstr "Localizar itens que atendam aos seguintes critÃ©rios"
 
-#: ../filter/filter-rule.c:915
+#: ../filter/filter-rule.c:916
 msgid "A_dd Condition"
 msgstr "A_dicionar critÃ©rio"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:922
 msgid "If all conditions are met"
 msgstr "Se todos os critÃ©rios forem atendidos"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:922
 msgid "If any conditions are met"
 msgstr "Se algum critÃ©rio for atendido"
 
-#: ../filter/filter-rule.c:923
+#: ../filter/filter-rule.c:924
 msgid "_Find items:"
 msgstr "_Localizar os itens:"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "All related"
 msgstr "Tudo relacionado"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "Replies"
 msgstr "Respostas"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "Replies and parents"
 msgstr "Respostas e anteriores"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "No reply or parent"
 msgstr "Nenhuma rÃ©plica ou parente"
 
-#: ../filter/filter-rule.c:947
+#: ../filter/filter-rule.c:944
 msgid "I_nclude threads"
 msgstr "I_ncluir discussÃµes"
 
-#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1038 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "Recebidas"
 
-#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:311
+#: ../filter/filter-rule.c:1038 ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "Enviadas"
 
@@ -11760,54 +10436,43 @@ msgstr ""
 "ao instante atual quando a filtragem ocorrer."
 
 #: ../filter/filter.glade.h:12
-msgid "a time relative to the current time"
-msgstr "um instante relativo ao instante atual"
-
-#: ../filter/filter.glade.h:13
-msgid "ago"
-msgstr "atrÃ¡s"
-
-#: ../filter/filter.glade.h:16
-msgid "in the future"
-msgstr "no futuro"
-
-#: ../filter/filter.glade.h:18
-msgid "months"
-msgstr "meses"
-
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:198
-msgid "seconds"
-msgstr "segundos"
+msgid ""
+"ago\n"
+"in the future"
+msgstr ""
+"atrÃ¡s\n"
+"no futuro"
 
-#: ../filter/filter.glade.h:20
-msgid "the current time"
-msgstr "o instante atual"
+#: ../filter/filter.glade.h:14
+msgid ""
+"seconds\n"
+"minutes\n"
+"hours\n"
+"days\n"
+"weeks\n"
+"months\n"
+"years"
+msgstr ""
 
 #: ../filter/filter.glade.h:21
-msgid "the time you specify"
-msgstr "um instante especificado por vocÃª"
-
-#: ../filter/filter.glade.h:22 ../plugins/caldav/caldav-source.c:433
-#: ../plugins/calendar-http/calendar-http.c:282
-#: ../plugins/calendar-weather/calendar-weather.c:527
-#: ../plugins/google-account-setup/google-source.c:655
-#: ../plugins/google-account-setup/google-contacts-source.c:369
-msgid "weeks"
-msgstr "semanas"
-
-#: ../filter/filter.glade.h:23
-msgid "years"
-msgstr "anos"
+msgid ""
+"the current time\n"
+"the time you specify\n"
+"a time relative to the current time"
+msgstr ""
+"o horÃ¡rio atual\n"
+"o horÃ¡rio que vocÃª especificar\n"
+"um horÃ¡rio relativo ao horÃ¡rio atual"
 
-#: ../filter/rule-editor.c:382
+#: ../filter/rule-editor.c:381
 msgid "Add Rule"
 msgstr "Adicionar regra"
 
-#: ../filter/rule-editor.c:463
+#: ../filter/rule-editor.c:462
 msgid "Edit Rule"
 msgstr "Editar regra"
 
-#: ../filter/rule-editor.c:809
+#: ../filter/rule-editor.c:808
 msgid "Rule name"
 msgstr "Nome da regra"
 
@@ -11864,21 +10529,21 @@ msgstr "Controle de preferÃªncias do Correio do Evolution"
 msgid "Evolution Network configuration control"
 msgstr "Controle de configuraÃ§Ã£o de rede do Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:604
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:602
 #: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
-#: ../mail/mail-component.c:597 ../mail/mail-component.c:598
-#: ../mail/mail-component.c:767
+#: ../mail/mail-component.c:620 ../mail/mail-component.c:621
+#: ../mail/mail-component.c:793
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Correio"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:490
 msgid "Mail Accounts"
 msgstr "Contas de correio"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:108
 msgid "Mail Preferences"
 msgstr "PreferÃªncias de correio"
 
@@ -11887,16 +10552,114 @@ msgid "Network Preferences"
 msgstr "PreferÃªncias de rede"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../plugins/pst-import/pst-importer.c:297
 msgid "_Mail"
 msgstr "_Correio"
 
-#: ../mail/em-account-editor.c:386
+#: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1331
+#: ../mail/em-popup.c:501 ../ui/evolution-mail-message.xml.h:105
+msgid "_Forward"
+msgstr "E_ncaminhar"
+
+#: ../mail/e-attachment-handler-mail.c:147 ../mail/em-folder-view.c:1329
+#: ../ui/evolution-mail-message.xml.h:123
+msgid "_Reply to Sender"
+msgstr "Responder ao _remetente"
+
+#. Translators: This is only for multiple messages.
+#: ../mail/e-attachment-handler-mail.c:334
+#, c-format
+msgid "%d attached messages"
+msgstr "%d mensagens anexadas"
+
+#: ../mail/e-mail-attachment-bar.c:122 ../mail/em-format-html-display.c:1642
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:147
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Anexo"
+msgstr[1] "Anexos"
+
+#: ../mail/e-mail-attachment-bar.c:615
+#: ../widgets/misc/e-attachment-paned.c:607
+msgid "Icon View"
+msgstr "VisualizaÃ§Ã£o de Ãcones"
+
+#: ../mail/e-mail-attachment-bar.c:616
+#: ../widgets/misc/e-attachment-paned.c:608
+msgid "List View"
+msgstr "VisualizaÃ§Ã£o de listas"
+
+#: ../mail/e-mail-search-bar.c:76
+#, c-format
+msgid "Matches: %d"
+msgstr "OcorrÃªncias: %d"
+
+#: ../mail/e-mail-search-bar.c:520
+msgid "Close the find bar"
+msgstr "Fechar a barra de busca"
+
+#: ../mail/e-mail-search-bar.c:528
+msgid "Fin_d:"
+msgstr "Locali_zar:"
+
+#: ../mail/e-mail-search-bar.c:540
+msgid "Clear the search"
+msgstr "Fechar a busca"
+
+#: ../mail/e-mail-search-bar.c:559
+msgid "_Previous"
+msgstr "Anterio_r"
+
+#: ../mail/e-mail-search-bar.c:565
+msgid "Find the previous occurrence of the phrase"
+msgstr ""
+
+#: ../mail/e-mail-search-bar.c:573
+msgid "_Next"
+msgstr "PrÃ³xi_ma"
+
+#: ../mail/e-mail-search-bar.c:579
+msgid "Find the next occurrence of the phrase"
+msgstr ""
+
+#: ../mail/e-mail-search-bar.c:587
+msgid "Mat_ch case"
+msgstr "Diferen_ciar maiÃºsculas de minÃºsculas"
+
+#: ../mail/e-mail-search-bar.c:615
+msgid "Reached bottom of page, continued from top"
+msgstr ""
+
+#: ../mail/e-mail-search-bar.c:637
+msgid "Reached top of page, continued from bottom"
+msgstr ""
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. It will not use an encrypted connection.
+#: ../mail/em-account-editor.c:309
+msgid "No encryption"
+msgstr "Sem criptografia"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+#: ../mail/em-account-editor.c:313
+msgid "TLS encryption"
+msgstr "Criptografia TLS"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
+#. abbreviation.
+#: ../mail/em-account-editor.c:317
+msgid "SSL encryption"
+msgstr "Criptografia SSL"
+
+#: ../mail/em-account-editor.c:408
 #, c-format
 msgid "%s License Agreement"
 msgstr "Acordo de licenÃ§a %s"
 
-#: ../mail/em-account-editor.c:393
+#: ../mail/em-account-editor.c:415
 #, c-format
 msgid ""
 "\n"
@@ -11909,109 +10672,113 @@ msgstr ""
 "licenÃ§a para %s exibido\n"
 "abaixo e marque a caixa para aceitÃ¡-lo\n"
 
-#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:258
+#: ../mail/em-account-editor.c:487 ../mail/em-filter-folder-element.c:258
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Selecionar pasta"
 
-#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
-#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:102
-msgid "Autogenerated"
-msgstr "Gerado automaticamente"
+#: ../mail/em-account-editor.c:797
+msgid "Never"
+msgstr "Nunca"
 
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:798
+msgid "Always"
+msgstr "Sempre"
+
+#: ../mail/em-account-editor.c:799
 msgid "Ask for each message"
 msgstr "Perguntar para cada mensagem"
 
-#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:95
+#: ../mail/em-account-editor.c:1877 ../mail/mail-config.glade.h:100
 msgid "Identity"
 msgstr "Identidade"
 
-#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:125
+#: ../mail/em-account-editor.c:1928 ../mail/mail-config.glade.h:127
 msgid "Receiving Email"
 msgstr "Recebendo e-mail"
 
-#: ../mail/em-account-editor.c:2130
+#: ../mail/em-account-editor.c:2200
 msgid "Check for _new messages every"
 msgstr "Verificar _novas mensagens a cada"
 
-#: ../mail/em-account-editor.c:2138
+#: ../mail/em-account-editor.c:2208
 msgid "minu_tes"
 msgstr "minu_tos"
 
-#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:139
+#: ../mail/em-account-editor.c:2398 ../mail/mail-config.glade.h:138
 msgid "Sending Email"
 msgstr "Enviando e-mail"
 
-#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2457 ../mail/mail-config.glade.h:73
 msgid "Defaults"
 msgstr "PadrÃµes"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:132
-#: ../plugins/exchange-operations/exchange-account-setup.c:332
+#: ../mail/em-account-editor.c:2523 ../mail/mail-config.glade.h:133
+#: ../plugins/exchange-operations/exchange-account-setup.c:329
 msgid "Security"
 msgstr "SeguranÃ§a"
 
+#. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
+#: ../mail/em-account-editor.c:2560 ../mail/em-account-editor.c:2655
 msgid "Receiving Options"
 msgstr "OpÃ§Ãµes de recepÃ§Ã£o"
 
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2561 ../mail/em-account-editor.c:2656
 msgid "Checking for New Messages"
 msgstr "Verificando novas mensagens"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3123 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Editor de contas"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:84
+#: ../mail/em-account-editor.c:3123 ../mail/mail-config.glade.h:89
 msgid "Evolution Account Assistant"
 msgstr "Assistente de contas do Evolution"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:429
+#: ../mail/em-account-prefs.c:426
 msgid "[Default]"
 msgstr "[PadrÃ£o]"
 
-#: ../mail/em-account-prefs.c:488
+#: ../mail/em-account-prefs.c:483
 msgid "Account name"
 msgstr "Nome da conta"
 
-#: ../mail/em-account-prefs.c:490
+#: ../mail/em-account-prefs.c:485
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1190 ../mail/mail-signature-editor.c:478
+#: ../mail/em-composer-prefs.c:318 ../mail/em-composer-prefs.c:452
+#: ../mail/mail-config.c:1160 ../mail/mail-signature-editor.c:481
 msgid "Unnamed"
 msgstr "Sem nome"
 
-#: ../mail/em-composer-prefs.c:970
+#: ../mail/em-composer-prefs.c:961
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
-#: ../mail/em-composer-prefs.c:1019
+#: ../mail/em-composer-prefs.c:994
 msgid "Add signature script"
 msgstr "Adicionar script de assinatura"
 
-#: ../mail/em-composer-prefs.c:1061
+#: ../mail/em-composer-prefs.c:1036
 msgid "Signature(s)"
 msgstr "Assinatura(s)"
 
-#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
+#: ../mail/em-composer-utils.c:1132 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mensagem encaminhada --------"
 
-#: ../mail/em-composer-utils.c:1602
+#: ../mail/em-composer-utils.c:1585
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr ""
 "Nenhum e-mail de destino foi fornecido, o encaminhamento da mensagem foi "
 "cancelado."
 
-#: ../mail/em-composer-utils.c:1608
+#: ../mail/em-composer-utils.c:1591
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr ""
 "NÃ£o foi encontrada nenhuma conta vÃ¡lida para uso, o encaminhamento da "
@@ -12036,7 +10803,7 @@ msgstr ""
 msgid "-----Original Message-----"
 msgstr "-------- Mensagem original --------"
 
-#: ../mail/em-filter-editor.c:156
+#: ../mail/em-filter-editor.c:172
 msgid "_Filter Rules"
 msgstr "_Regras de filtro"
 
@@ -12053,18 +10820,10 @@ msgstr "Atribuir cor"
 msgid "Assign Score"
 msgstr "Atribuir pontuaÃ§Ã£o"
 
-#: ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "BCC"
-
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "Bip"
 
-#: ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "CC"
-
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "ConcluÃda em"
@@ -12082,7 +10841,7 @@ msgid "Date sent"
 msgstr "Data de envio"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:768
+#: ../plugins/groupwise-features/share-folder.c:765
 #: ../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
@@ -12133,226 +10892,234 @@ msgstr "ExpressÃ£o"
 msgid "Follow Up"
 msgstr "Lembrete"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
+#: ../mail/em-filter-i18n.h:29
+msgid "Forward to"
+msgstr "Encaminhar para"
+
+#: ../mail/em-filter-i18n.h:30 ../mail/em-migrate.c:958
 msgid "Important"
 msgstr "Importante"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "Ã© apÃ³s"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:33
 msgid "is before"
 msgstr "Ã© antes"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:34
 msgid "is Flagged"
 msgstr "estÃ¡ Marcada"
 
-#: ../mail/em-filter-i18n.h:37
+#: ../mail/em-filter-i18n.h:38
 msgid "is not Flagged"
 msgstr "nÃ£o estÃ¡ Marcada"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:39
 msgid "is not set"
 msgstr "nÃ£o estÃ¡ definido"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:40
 msgid "is set"
 msgstr "estÃ¡ definido"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:98
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:102
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Spam"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:42
 msgid "Junk Test"
 msgstr "Teste de spam"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:43
 msgid "Label"
 msgstr "RÃ³tulo"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:44
 msgid "Mailing list"
 msgstr "Lista de discussÃ£o"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:45
 msgid "Match All"
 msgstr "Coincidir com tudo"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:46
 msgid "Message Body"
 msgstr "Corpo da mensagem"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:47
 msgid "Message Header"
 msgstr "CabeÃ§alho da mensagem"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:48
 msgid "Message is Junk"
 msgstr "Mensagem Ã© spam"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:49
 msgid "Message is not Junk"
 msgstr "Mensagem nÃ£o Ã© spam"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:50
+msgid "Message Location"
+msgstr "LocalizaÃ§Ã£o da mensagem"
+
+#: ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Mover para a pasta"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:52
 msgid "Pipe to Program"
 msgstr "Enviar (pipe) para um programa"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:53
 msgid "Play Sound"
 msgstr "Reproduzir som"
 
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:62
+#: ../mail/em-filter-i18n.h:54 ../mail/message-tag-followup.c:61
 msgid "Read"
 msgstr "Lida"
 
-#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "DestinatÃ¡rios"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:56
 msgid "Regex Match"
 msgstr "Coincidir expr. regular"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:57
 msgid "Replied to"
 msgstr "Em resposta a"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:58
 msgid "returns"
 msgstr "retorna"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:59
 msgid "returns greater than"
 msgstr "retorna maior que"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:60
 msgid "returns less than"
 msgstr "retorna menor que"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:61
 msgid "Run Program"
 msgstr "Executar um programa"
 
-#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "PontuaÃ§Ã£o"
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Remetente"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:64
 msgid "Sender or Recipients"
 msgstr "Rementente ou destinatÃ¡rios"
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:65
 msgid "Set Label"
 msgstr "Definir rÃ³tulo"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:66
 msgid "Set Status"
 msgstr "Definir status"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:67
 msgid "Size (kB)"
 msgstr "Tamanho (kB)"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:68
 msgid "sounds like"
 msgstr "se parece como"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:69
 msgid "Source Account"
 msgstr "Conta fonte"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:70
 msgid "Specific header"
 msgstr "CabeÃ§alho especÃfico"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:71
 msgid "starts with"
 msgstr "comeÃ§a com"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:73
 msgid "Stop Processing"
 msgstr "Parar o processamento"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311
+#: ../mail/em-filter-i18n.h:74 ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:928 ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:300
 #: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1115
+#: ../smime/lib/e-cert.c:1112
 msgid "Subject"
 msgstr "Assunto"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:75
 msgid "Unset Status"
 msgstr "Reverter status"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:522
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "EntÃ£o"
 
-#: ../mail/em-filter-rule.c:550
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
 msgstr "Adicionar aÃ§Ã£_o"
 
-#: ../mail/em-folder-browser.c:193
+#: ../mail/em-folder-browser.c:194
 msgid "C_reate Search Folder From Search..."
 msgstr "_Criar pasta de pesquisa a partir da pesquisa..."
 
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:219
 msgid "All Messages"
 msgstr "Todas as mensagens"
 
-#: ../mail/em-folder-browser.c:219
+#: ../mail/em-folder-browser.c:220
 msgid "Unread Messages"
 msgstr "Mensagem nÃ£o lidas"
 
-#: ../mail/em-folder-browser.c:221
+#: ../mail/em-folder-browser.c:222
 msgid "No Label"
 msgstr "Sem rÃ³tulo"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Read Messages"
 msgstr "Mensagens lidas"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Recent Messages"
 msgstr "Mensagens recentes"
 
-#: ../mail/em-folder-browser.c:230
+#: ../mail/em-folder-browser.c:231
 msgid "Last 5 Days' Messages"
 msgstr "Mensagens dos Ãºltimos cinco dias"
 
-#: ../mail/em-folder-browser.c:231
+#: ../mail/em-folder-browser.c:232
 msgid "Messages with Attachments"
 msgstr "Mensagens com anexo"
 
-#: ../mail/em-folder-browser.c:232
+#: ../mail/em-folder-browser.c:233
 msgid "Important Messages"
 msgstr "Mensagens importantes"
 
-#: ../mail/em-folder-browser.c:233
+#: ../mail/em-folder-browser.c:234
 msgid "Messages Not Junk"
 msgstr "Mensagens nÃ£o spam"
 
-#: ../mail/em-folder-browser.c:1188
+#: ../mail/em-folder-browser.c:1194
 msgid "Account Search"
 msgstr "Pesquisa na conta"
 
-#: ../mail/em-folder-browser.c:1241
+#: ../mail/em-folder-browser.c:1256
 msgid "All Account Search"
 msgstr "Pesquisa em todas as contas"
 
@@ -12382,11 +11149,11 @@ msgid "Quota usage"
 msgstr "Uso da cota"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:509
-#: ../mail/em-folder-tree.c:2597 ../mail/mail-component.c:164
-#: ../mail/mail-component.c:585
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:594
+#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:517
+#: ../mail/em-folder-tree.c:2602 ../mail/mail-component.c:168
+#: ../mail/mail-component.c:608
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:593
 msgid "Inbox"
 msgstr "Entrada"
 
@@ -12399,370 +11166,339 @@ msgstr "Propriedades da pasta"
 msgid "<click here to select a folder>"
 msgstr "<clique aqui para selecionar uma pasta>"
 
-#: ../mail/em-folder-selector.c:254
+#: ../mail/em-folder-selector.c:249
 msgid "C_reate"
 msgstr "C_riar"
 
-#: ../mail/em-folder-selector.c:258
+#: ../mail/em-folder-selector.c:253
 msgid "Folder _name:"
 msgstr "_Nome da pasta:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:980 ../mail/mail-vfolder.c:1047
+#: ../mail/em-folder-tree-model.c:195 ../mail/em-folder-tree-model.c:197
+#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1028
 msgid "Search Folders"
 msgstr "Pastas de pesquisa"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
+#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
 msgid "UNMATCHED"
 msgstr "SEM OCORRÃ?NCIA"
 
-#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:165
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:169
 msgid "Drafts"
 msgstr "Rascunhos"
 
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:168
+#: ../mail/em-folder-tree-model.c:513 ../mail/mail-component.c:172
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid "Templates"
 msgstr "Modelos"
 
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:166
+#: ../mail/em-folder-tree-model.c:520 ../mail/mail-component.c:170
 msgid "Outbox"
 msgstr "SaÃda"
 
-#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:167
+#: ../mail/em-folder-tree-model.c:522 ../mail/mail-component.c:171
 msgid "Sent"
 msgstr "Enviadas"
 
-#: ../mail/em-folder-tree-model.c:536 ../mail/em-folder-tree-model.c:843
+#: ../mail/em-folder-tree-model.c:580 ../mail/em-folder-tree-model.c:889
 msgid "Loading..."
 msgstr "Carregando..."
 
 #. Translators: This is the string used for displaying the
-#. * folder names in folder trees. "%s" will be replaced by
-#. * the folder's name and "%u" will be replaced with the
-#. * number of unread messages in the folder.
+#. * folder names in folder trees. The first "%s" will be
+#. * replaced by the folder's name and "%u" will be replaced
+#. * with the number of unread messages in the folder. The
+#. * second %s will be replaced with a "+" letter for collapsed
+#. * folders with unread messages in some subfolder too,
+#. * or with an empty string for other cases.
 #. *
-#. * Most languages should translate this as "%s (%u)". The
+#. * Most languages should translate this as "%s (%u%s)". The
 #. * languages that use localized digits (like Persian) may
 #. * need to replace "%u" with "%Iu". Right-to-left languages
 #. * (like Arabic and Hebrew) may need to add bidirectional
 #. * formatting codes to take care of the cases the folder
 #. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:380
+#: ../mail/em-folder-tree.c:318
 #, c-format
 msgctxt "folder-display"
-msgid "%s (%u)"
-msgstr "%s (%u)"
+msgid "%s (%u%s)"
+msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:741
+#: ../mail/em-folder-tree.c:727
 msgid "Mail Folder Tree"
 msgstr "Ã?rvore de pastas de correio"
 
-#: ../mail/em-folder-tree.c:900
+#: ../mail/em-folder-tree.c:886
 #, c-format
 msgid "Moving folder %s"
 msgstr "Movendo pasta %s"
 
-#: ../mail/em-folder-tree.c:902
+#: ../mail/em-folder-tree.c:888
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando pasta %s"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2014
+#: ../mail/em-folder-tree.c:895 ../mail/message-list.c:2018
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo mensagens para pasta %s"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2016
+#: ../mail/em-folder-tree.c:897 ../mail/message-list.c:2020
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando mensagens para pasta %s"
 
-#: ../mail/em-folder-tree.c:926
+#: ../mail/em-folder-tree.c:912
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "NÃ£o foi possÃvel depositar mensagem(ns) no repositÃ³rio topo"
 
-#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:989 ../ui/evolution-mail-message.xml.h:100
 msgid "_Copy to Folder"
 msgstr "_Copiar para pasta"
 
-#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117
+#: ../mail/em-folder-tree.c:990 ../ui/evolution-mail-message.xml.h:113
 msgid "_Move to Folder"
 msgstr "_Mover para pasta"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
+#: ../mail/em-folder-tree.c:992 ../mail/em-folder-utils.c:362
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2110
+msgid "_Move"
+msgstr "_Mover"
+
+#: ../mail/em-folder-tree.c:994 ../mail/message-list.c:2112
+msgid "Cancel _Drag"
+msgstr "Cancelar _arraste"
+
+#: ../mail/em-folder-tree.c:1702 ../mail/mail-ops.c:1063
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Varrendo pastas em \"%s\""
 
-#: ../mail/em-folder-tree.c:2117
+#: ../mail/em-folder-tree.c:2107
 msgid "Open in _New Window"
 msgstr "Abrir em uma _nova janela"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2122
+#: ../mail/em-folder-tree.c:2112
 msgid "_New Folder..."
 msgstr "_Nova pasta..."
 
-#: ../mail/em-folder-tree.c:2125
+#: ../mail/em-folder-tree.c:2115
 msgid "_Move..."
 msgstr "_Mover..."
 
-#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21
+#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "Atuali_zar"
 
-#: ../mail/em-folder-tree.c:2134
+#: ../mail/em-folder-tree.c:2124
 msgid "Fl_ush Outbox"
 msgstr "Limpar cai_xa de saÃda"
 
-#: ../mail/em-folder-tree.c:2140 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2129 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "Es_vaziar lixeira"
 
-#: ../mail/em-folder-tree.c:2243
+#: ../mail/em-folder-tree.c:2232
 msgid "_Unread Search Folder"
 msgstr "Pasta de pesquisa de itens nÃ£o lidos"
 
-#: ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-utils.c:99
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Copiando \"%s\" para \"%s\""
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1188
-#: ../mail/em-folder-view.c:1203
+#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
 #: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
+#: ../plugins/pst-import/pst-importer.c:302
 msgid "Select folder"
 msgstr "Selecionar pasta"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1203
+#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "C_opiar"
 
-#: ../mail/em-folder-utils.c:532
-#: ../plugins/groupwise-features/share-folder-common.c:145
+#: ../mail/em-folder-utils.c:537
+#: ../plugins/groupwise-features/share-folder-common.c:144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Criando pasta \"%s\""
 
-#: ../mail/em-folder-utils.c:690
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../mail/em-folder-utils.c:695
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
 msgstr "Criar pasta"
 
-#: ../mail/em-folder-utils.c:690
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../mail/em-folder-utils.c:695
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr "Especificar onde criar a pasta:"
 
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1089 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "ExclusÃ£o de E-mail falhou"
 
-#: ../mail/em-folder-view.c:1092 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "VocÃª nÃ£o possui permissÃ£o para excluir esse e-mail."
 
-#: ../mail/em-folder-view.c:1331 ../ui/evolution-mail-message.xml.h:127
-msgid "_Reply to Sender"
-msgstr "Responder ao _remetente"
-
-#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:566 ../mail/em-popup.c:577
-#: ../ui/evolution-mail-message.xml.h:109
-msgid "_Forward"
-msgstr "E_ncaminhar"
-
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1337 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:102
 msgid "_Edit as New Message..."
 msgstr "_Editar como nova mensagem..."
 
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "Des_fazer ExclusÃ£o"
 
-#: ../mail/em-folder-view.c:1344
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "_Mover para pasta..."
 
-#: ../mail/em-folder-view.c:1345
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "Copiar para p_asta..."
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "Marcar como li_da"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "Marcar como _nÃ£o lida"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "Marcar como sem _importÃ¢ncia"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "Marcar como _spam"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "Marcar como _nÃ£o spam"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar como _lembrete..."
 
 # Qualquer tecla de acesso vai colidir com outro item de menu
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "_RÃ³tulo"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1357 ../widgets/misc/e-dateedit.c:478
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:469
 msgid "_None"
 msgstr "_Nenhum"
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "_novo RÃ³tulo"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "Marcar Como Concl_uÃda"
 
-#: ../mail/em-folder-view.c:1365
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "Lim_par marca"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "Criar _regra a partir da mensagem"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
 msgstr "Pasta de pesquisa baseada no _assunto"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "Pasta de pesquisa baseada no _remetente"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "Pasta de Pesquisa baseada no _destinatÃ¡rios"
 
-#: ../mail/em-folder-view.c:1373
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "Pasta de pesquisa baseada na _lista de discussÃ£o"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr "Filtro baseado no ass_unto"
 
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "Filtro baseado no r_emetente"
 
-#: ../mail/em-folder-view.c:1380
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "Filtro baseado nos des_tinatÃ¡rios"
 
-#: ../mail/em-folder-view.c:1381
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "Filtro baseado na l_ista de discussÃ£o"
 
 #. default charset used in mail view
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2257 ../mail/em-folder-view.c:2300
-#: ../plugins/google-account-setup/google-source.c:232
-#: ../plugins/google-account-setup/google-source.c:510
-#: ../plugins/google-account-setup/google-source.c:708
+#: ../mail/em-folder-view.c:2232 ../mail/em-folder-view.c:2275
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:593
+#: ../plugins/google-account-setup/google-source.c:764
 msgid "Default"
 msgstr "PadrÃ£o"
 
-#: ../mail/em-folder-view.c:2518
+#: ../mail/em-folder-view.c:2493
 msgid "Unable to retrieve message"
 msgstr "NÃ£o foi possÃvel obter a mensagem"
 
-#: ../mail/em-folder-view.c:2537
-msgid "Retrieving Message..."
-msgstr "Recuperando mensagem..."
-
-#: ../mail/em-folder-view.c:2756
-msgid "C_all To..."
-msgstr "Ch_amar..."
-
-#: ../mail/em-folder-view.c:2759
+#: ../mail/em-folder-view.c:2696
 msgid "Create _Search Folder"
 msgstr "Criar pasta de _pesquisa"
 
-#: ../mail/em-folder-view.c:2760
+#: ../mail/em-folder-view.c:2697
 msgid "_From this Address"
 msgstr "_Deste endereÃ§o"
 
-#: ../mail/em-folder-view.c:2761
+#: ../mail/em-folder-view.c:2698
 msgid "_To this Address"
 msgstr "_Para este EndereÃ§o"
 
-#: ../mail/em-folder-view.c:3254
+#: ../mail/em-folder-view.c:3191
 #, c-format
 msgid "Click to mail %s"
 msgstr "Clique para enviar correio para %s"
 
-#: ../mail/em-folder-view.c:3266
+#: ../mail/em-folder-view.c:3203
 #, c-format
 msgid "Click to call %s"
 msgstr "Clique para chamar %s"
 
-#: ../mail/em-folder-view.c:3271
+#: ../mail/em-folder-view.c:3208
 msgid "Click to hide/unhide addresses"
 msgstr "Clique para ocultar/mostrar endereÃ§os"
 
-#. message-search popup match count string
-#: ../mail/em-format-html-display.c:474
-#, c-format
-msgid "Matches: %d"
-msgstr "OcorrÃªncias: %d"
-
-#: ../mail/em-format-html-display.c:618
-msgid "Fin_d:"
-msgstr "Locali_zar:"
-
-#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:642
-msgid "_Previous"
-msgstr "Anterio_r"
-
-#: ../mail/em-format-html-display.c:647
-msgid "_Next"
-msgstr "PrÃ³xi_ma"
-
-#: ../mail/em-format-html-display.c:652
-msgid "M_atch case"
-msgstr "C_oincidentes"
-
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:655
+#: ../mail/em-format-html-display.c:560 ../mail/em-format-html.c:654
 msgid "Unsigned"
 msgstr "NÃ£o assinada"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:560
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12770,11 +11506,11 @@ msgstr ""
 "Esta mensagem nÃ£o estÃ¡ assinada. NÃ£o hÃ¡ garantias de que esta mensagem seja "
 "autÃªntica."
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:656
+#: ../mail/em-format-html-display.c:561 ../mail/em-format-html.c:655
 msgid "Valid signature"
 msgstr "Assinatura vÃ¡lida"
 
-#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:561
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12782,11 +11518,11 @@ msgstr ""
 "Esta mensagem estÃ¡ assinada e Ã© vÃ¡lida. Ã? muito provÃ¡vel que esta mensagem "
 "seja autÃªntica."
 
-#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:562 ../mail/em-format-html.c:656
 msgid "Invalid signature"
 msgstr "Assinatura invÃ¡lida"
 
-#: ../mail/em-format-html-display.c:953
+#: ../mail/em-format-html-display.c:562
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12794,11 +11530,11 @@ msgstr ""
 "NÃ£o Ã© possÃvel verificar a assinatura desta mensagem. Ela pode ter sido "
 "alterada em trÃ¢nsito."
 
-#: ../mail/em-format-html-display.c:954 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:563 ../mail/em-format-html.c:657
 msgid "Valid signature, but cannot verify sender"
 msgstr "Assinatura vÃ¡lida, mas nÃ£o Ã© possÃvel verificar o remetente"
 
-#: ../mail/em-format-html-display.c:954
+#: ../mail/em-format-html-display.c:563
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12806,11 +11542,11 @@ msgstr ""
 "Esta mensagem estÃ¡ assinada com uma assinatura vÃ¡lida, mas o remetente nÃ£o "
 "pode ser verificado."
 
-#: ../mail/em-format-html-display.c:955 ../mail/em-format-html.c:659
+#: ../mail/em-format-html-display.c:564 ../mail/em-format-html.c:658
 msgid "Signature exists, but need public key"
 msgstr "A assinatura existe, mas precisa de uma chave pÃºblica"
 
-#: ../mail/em-format-html-display.c:955
+#: ../mail/em-format-html-display.c:564
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -12818,11 +11554,11 @@ msgstr ""
 "Esta mensagem estÃ¡ assinada com uma assinatura, mas nÃ£o hÃ¡ chave pÃºblica "
 "correspondente."
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:665
+#: ../mail/em-format-html-display.c:571 ../mail/em-format-html.c:664
 msgid "Unencrypted"
 msgstr "NÃ£o criptografada"
 
-#: ../mail/em-format-html-display.c:962
+#: ../mail/em-format-html-display.c:571
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12830,11 +11566,11 @@ msgstr ""
 "Esta mensagem nÃ£o estÃ¡ criptografada. O seu conteÃºdo pode ser visto em "
 "trÃ¢nsito atravÃ©s da Internet."
 
-#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:666
+#: ../mail/em-format-html-display.c:572 ../mail/em-format-html.c:665
 msgid "Encrypted, weak"
 msgstr "Criptografada, fraca"
 
-#: ../mail/em-format-html-display.c:963
+#: ../mail/em-format-html-display.c:572
 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 "
@@ -12844,11 +11580,11 @@ msgstr ""
 "fraco. Seria difÃcil, mas nÃ£o impossÃvel, que um estranho conseguisse ver o "
 "conteÃºdo desta mensagem em uma quantidade de tempo razoÃ¡vel."
 
-#: ../mail/em-format-html-display.c:964 ../mail/em-format-html.c:667
+#: ../mail/em-format-html-display.c:573 ../mail/em-format-html.c:666
 msgid "Encrypted"
 msgstr "Criptografada"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:573
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12856,11 +11592,11 @@ msgstr ""
 "Esta mensagem estÃ¡ criptografada. Seria difÃcil que um estranho conseguisse "
 "ver o conteÃºdo desta mensagem."
 
-#: ../mail/em-format-html-display.c:965 ../mail/em-format-html.c:668
+#: ../mail/em-format-html-display.c:574 ../mail/em-format-html.c:667
 msgid "Encrypted, strong"
 msgstr "Criptografada, forte"
 
-#: ../mail/em-format-html-display.c:965
+#: ../mail/em-format-html-display.c:574
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -12870,87 +11606,58 @@ msgstr ""
 "Seria muito difÃcil para um estranho conseguir ver o conteÃºdo desta mensagem "
 "em uma quantidade de tempo razoÃ¡vel."
 
-#: ../mail/em-format-html-display.c:1066 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:675 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Ver certificado"
 
-#: ../mail/em-format-html-display.c:1081
+#: ../mail/em-format-html-display.c:690
 msgid "This certificate is not viewable"
 msgstr "Este certificado nÃ£o Ã© observÃ¡vel"
 
-#: ../mail/em-format-html-display.c:1410
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "ConcluÃda em %d de %B, %Y, %H:%M"
+#: ../mail/em-format-html-display.c:980
+msgid "Completed on"
+msgstr "ConcluÃda em"
 
-#: ../mail/em-format-html-display.c:1418
+#: ../mail/em-format-html-display.c:988
 msgid "Overdue:"
 msgstr "Atrasada:"
 
-#: ../mail/em-format-html-display.c:1421
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "atÃ© %d de %B, %Y, %H:%M"
+#. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
+#: ../mail/em-format-html-display.c:992
+msgid "by"
+msgstr ""
 
-#: ../mail/em-format-html-display.c:1499
+#: ../mail/em-format-html-display.c:1071
+#: ../widgets/misc/e-attachment-view.c:357
 msgid "_View Inline"
 msgstr "_Ver embutido"
 
-#: ../mail/em-format-html-display.c:1500
+#: ../mail/em-format-html-display.c:1072
+#: ../widgets/misc/e-attachment-view.c:350
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: ../mail/em-format-html-display.c:1501
+#: ../mail/em-format-html-display.c:1073
 msgid "_Fit to Width"
 msgstr "A_justar para Largura"
 
-#: ../mail/em-format-html-display.c:1502
+#: ../mail/em-format-html-display.c:1074
 msgid "Show _Original Size"
 msgstr "Mostrar o tamanho _original"
 
-#: ../mail/em-format-html-display.c:2171
-msgid "Save attachment as"
-msgstr "Salvar anexo como"
-
-#: ../mail/em-format-html-display.c:2175
-msgid "Select folder to save all attachments"
-msgstr "Selecionar a pasta para salvar todos os anexos"
-
-#: ../mail/em-format-html-display.c:2226
-msgid "_Save Selected..."
-msgstr "_Salvar selecionado..."
-
-#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2293
-#, c-format
-msgid "%d at_tachment"
-msgid_plural "%d at_tachments"
-msgstr[0] "%d ane_xo"
-msgstr[1] "%d ane_xos"
-
-#: ../mail/em-format-html-display.c:2300 ../mail/em-format-html-display.c:2390
-msgid "S_ave"
-msgstr "_Salvar"
-
-#: ../mail/em-format-html-display.c:2311
-msgid "S_ave All"
-msgstr "Salvar _tudo"
-
-#: ../mail/em-format-html-display.c:2386
-msgid "No Attachment"
-msgstr "Sem anexo"
-
-#: ../mail/em-format-html-display.c:2533 ../mail/em-format-html-display.c:2572
+#: ../mail/em-format-html-display.c:1575 ../mail/em-format-html-display.c:1614
 msgid "View _Unformatted"
 msgstr "Ver nÃ£o _formatadas"
 
-#: ../mail/em-format-html-display.c:2535
+#: ../mail/em-format-html-display.c:1577
 msgid "Hide _Unformatted"
 msgstr "Ocultar nÃ£o _formatadas"
 
-#: ../mail/em-format-html-display.c:2592
+#: ../mail/em-format-html-display.c:1634
 msgid "O_pen With"
 msgstr "A_brir com"
 
-#: ../mail/em-format-html-display.c:2668
+#: ../mail/em-format-html-display.c:1711
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -12963,207 +11670,196 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "PÃ¡gina %d de %d"
 
-#: ../mail/em-format-html.c:506 ../mail/em-format-html.c:515
+#: ../mail/em-format-html.c:505 ../mail/em-format-html.c:514
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Buscando \"%s\""
 
-#: ../mail/em-format-html.c:930
+#: ../mail/em-format-html.c:929
 msgid "Unknown external-body part."
 msgstr "Parte external-body malformada."
 
-#: ../mail/em-format-html.c:938
+#: ../mail/em-format-html.c:937
 msgid "Malformed external-body part."
 msgstr "Parte external-body malformada."
 
-#: ../mail/em-format-html.c:968
+#: ../mail/em-format-html.c:967
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Ponteiro para site FTP (%s)"
 
-#: ../mail/em-format-html.c:979
+#: ../mail/em-format-html.c:978
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Ponteiro para arquivo local (%s) vÃ¡lido no site \"%s\""
 
-#: ../mail/em-format-html.c:981
+#: ../mail/em-format-html.c:980
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Ponteiro para arquivo local (%s)"
 
-#: ../mail/em-format-html.c:1002
+#: ../mail/em-format-html.c:1001
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Ponteiro para dados remotos (%s)"
 
-#: ../mail/em-format-html.c:1013
+#: ../mail/em-format-html.c:1012
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Ponteiro para dados externos desconhecidos (tipo \"%s\")"
 
-#: ../mail/em-format-html.c:1241
+#: ../mail/em-format-html.c:1240
 msgid "Formatting message"
 msgstr "Formatando mensagem"
 
-#: ../mail/em-format-html.c:1415
+#: ../mail/em-format-html.c:1414
 msgid "Formatting Message..."
 msgstr "Formatando mensagem..."
 
-#: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1632
-#: ../mail/em-format-html.c:1654 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:78
+#: ../mail/em-format-html.c:1567 ../mail/em-format-html.c:1631
+#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:926 ../mail/em-mailer-prefs.c:79
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1569 ../mail/em-format-html.c:1638
-#: ../mail/em-format-html.c:1657 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:79
+#: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1637
+#: ../mail/em-format-html.c:1655 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:927 ../mail/em-mailer-prefs.c:80
 msgid "Bcc"
 msgstr "CCO"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1749 ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1451
+#: ../mail/em-format-html.c:1747 ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1435
 msgid "Mailer"
 msgstr "Programa de correio"
 
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1776
-msgid " (%a, %R %Z)"
-msgstr " (%a, %R %Z)"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1781
-msgid " (%R %Z)"
-msgstr " (%R %Z)"
-
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1917
+#: ../mail/em-format-html.c:1910
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Esta mensagem foi enviada por <b>%s</b> em nome de <b>%s</b>"
 
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
-#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:307
-msgid "From"
-msgstr "De"
-
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:76
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:924
+#: ../mail/em-mailer-prefs.c:77
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:325
-#: ../widgets/misc/e-dateedit.c:347
+#: ../mail/em-format.c:929 ../mail/em-mailer-prefs.c:82
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:316
+#: ../widgets/misc/e-dateedit.c:338
 msgid "Date"
 msgstr "Data"
 
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:82
+#: ../mail/em-format.c:930 ../mail/em-mailer-prefs.c:83
 msgid "Newsgroups"
 msgstr "Grupos de notÃcias"
 
-#: ../mail/em-format.c:893 ../mail/em-mailer-prefs.c:83
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+#: ../mail/em-format.c:931 ../mail/em-mailer-prefs.c:84
+#: ../plugins/face/org-gnome-face.eplug.xml.h:4
 msgid "Face"
 msgstr "Face"
 
-#: ../mail/em-format.c:1160
+#: ../mail/em-format.c:1201
 #, c-format
 msgid "%s attachment"
 msgstr "anexo %s"
 
-#: ../mail/em-format.c:1199
+#: ../mail/em-format.c:1239
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "NÃ£o foi possÃvel analisar a mensagem S/MIME: Erro desconhecido"
 
-#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
+#: ../mail/em-format.c:1376 ../mail/em-format.c:1533
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "NÃ£o foi possÃvel analisar a mensagem MIME. Exibindo como fonte."
 
-#: ../mail/em-format.c:1344
+#: ../mail/em-format.c:1384
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tipo de criptografia sem suporte para multiparte/criptografado"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message"
 msgstr "NÃ£o foi possÃvel analisar a mensagem PGP/MIME"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "NÃ£o foi possÃvel analisar a mensagem PGP/MIME: Erro desconhecido"
 
-#: ../mail/em-format.c:1511
+#: ../mail/em-format.c:1552
 msgid "Unsupported signature format"
 msgstr "Formato de assinatura sem suporte"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1560 ../mail/em-format.c:1698
 msgid "Error verifying signature"
 msgstr "Erro ao verificar assinatura"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1560 ../mail/em-format.c:1689 ../mail/em-format.c:1698
 msgid "Unknown error verifying signature"
 msgstr "Erro desconhecido ao verificar assinatura"
 
-#: ../mail/em-format.c:1664
+#: ../mail/em-format.c:1772
 msgid "Could not parse PGP message"
 msgstr "NÃ£o foi possÃvel analisar a mensagem PGP"
 
-#: ../mail/em-format.c:1664
+#: ../mail/em-format.c:1772
 msgid "Could not parse PGP message: Unknown error"
 msgstr "NÃ£o foi possÃvel analisar a mensagem PGP: Erro desconhecido"
 
-#: ../mail/em-mailer-prefs.c:94
+#: ../mail/em-mailer-prefs.c:95
 msgid "Every time"
 msgstr "Toda vez"
 
-#: ../mail/em-mailer-prefs.c:95
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per day"
 msgstr "Uma vez por dia"
 
-#: ../mail/em-mailer-prefs.c:96
+#: ../mail/em-mailer-prefs.c:97
 msgid "Once per week"
 msgstr "Uma vez por semana"
 
-#: ../mail/em-mailer-prefs.c:97
+#: ../mail/em-mailer-prefs.c:98
 msgid "Once per month"
 msgstr "Uma vez por mÃªs"
 
-#: ../mail/em-mailer-prefs.c:327
+#: ../mail/em-mailer-prefs.c:332
 msgid "Add Custom Junk Header"
 msgstr "Adicionar cabeÃ§alho personalizado de spam"
 
-#: ../mail/em-mailer-prefs.c:331
+#: ../mail/em-mailer-prefs.c:336
 msgid "Header Name:"
 msgstr "Nome do cabeÃ§alho:"
 
-#: ../mail/em-mailer-prefs.c:332
+#: ../mail/em-mailer-prefs.c:337
 msgid "Header Value Contains:"
 msgstr "Valor do cabeÃ§alho contÃ©m:"
 
-#: ../mail/em-mailer-prefs.c:437
+#: ../mail/em-mailer-prefs.c:438 ../widgets/table/e-table-click-to-add.c:500
+#: ../widgets/table/e-table-selection-model.c:309
+msgid "Header"
+msgstr "CabeÃ§alho"
+
+#: ../mail/em-mailer-prefs.c:442
 msgid "Contains Value"
 msgstr "ContÃ©m valor"
 
-#: ../mail/em-mailer-prefs.c:459
+#: ../mail/em-mailer-prefs.c:465
 msgid "Color"
 msgstr "Cor"
 
-#: ../mail/em-mailer-prefs.c:462
+#: ../mail/em-mailer-prefs.c:468
 msgid "Tag"
 msgstr "Etiqueta"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133
+#: ../mail/em-mailer-prefs.c:1063 ../mail/em-mailer-prefs.c:1117
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "O plug-in %s estÃ¡ disponÃvel e o binÃ¡rio estÃ¡ instalado."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142
+#: ../mail/em-mailer-prefs.c:1071 ../mail/em-mailer-prefs.c:1126
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
@@ -13171,42 +11867,46 @@ msgstr ""
 "O plug-in %s nÃ£o esta disponÃvel. Por favor, verifique se o pacote esta "
 "instalado."
 
-#: ../mail/em-mailer-prefs.c:1108
+#: ../mail/em-mailer-prefs.c:1092
 msgid "No Junk plugin available"
 msgstr "NÃ£o hÃ¡ plug-in de Spam disponÃvel"
 
+#: ../mail/em-mailer-prefs.c:1455
+msgid "Date header:"
+msgstr "Data do cabeÃ§alho"
+
 #. green
-#: ../mail/em-migrate.c:1059
+#: ../mail/em-migrate.c:961
 msgid "To Do"
 msgstr "A fazer"
 
 #. blue
-#: ../mail/em-migrate.c:1060
+#: ../mail/em-migrate.c:962
 msgid "Later"
 msgstr "Mais tarde"
 
-#: ../mail/em-migrate.c:1228
+#: ../mail/em-migrate.c:1128
 msgid "Migration"
 msgstr "MigraÃ§Ã£o"
 
-#: ../mail/em-migrate.c:1673
+#: ../mail/em-migrate.c:1573
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "NÃ£o foi possÃvel criar nova pasta \"%s\": %s"
 
-#: ../mail/em-migrate.c:1699
+#: ../mail/em-migrate.c:1599
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "NÃ£o foi possÃvel copiar a pasta \"%s\" para \"%s\": %s"
 
-#: ../mail/em-migrate.c:1884
+#: ../mail/em-migrate.c:1784
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
 "NÃ£o foi possÃvel varrer a procura de caixas de correio existentes em \"%s\": "
 "%s"
 
-#: ../mail/em-migrate.c:1889
+#: ../mail/em-migrate.c:1789
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13218,32 +11918,32 @@ msgstr ""
 "\n"
 "Por favor, aguarde enquanto o Evolution migra as sua pastas..."
 
-#: ../mail/em-migrate.c:2090
+#: ../mail/em-migrate.c:1990
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "NÃ£o foi possÃvel abrir dados antigos manter-no-servidor POP \"%s\": %s"
 
-#: ../mail/em-migrate.c:2104
+#: ../mail/em-migrate.c:2004
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "NÃ£o foi possÃvel criar diretÃ³rio de dados manter-no-servidor POP3 \"%s\": %s"
 
-#: ../mail/em-migrate.c:2133
+#: ../mail/em-migrate.c:2033
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "NÃ£o foi possÃvel copiar dados manter-no-servidor POP3 \"%s\": %s"
 
-#: ../mail/em-migrate.c:2604 ../mail/em-migrate.c:2616
+#: ../mail/em-migrate.c:2504 ../mail/em-migrate.c:2516
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Falha ao criar repositÃ³rio local de correio \"%s\": %s"
 
-#: ../mail/em-migrate.c:2974
+#: ../mail/em-migrate.c:2874
 msgid "Migrating Folders"
 msgstr "Migrando pastas"
 
-#: ../mail/em-migrate.c:2974
+#: ../mail/em-migrate.c:2874
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -13255,12 +11955,12 @@ msgstr ""
 "\n"
 "Por favor seja paciente enquanto o Evolution migra suas pastas..."
 
-#: ../mail/em-migrate.c:3056
+#: ../mail/em-migrate.c:2955
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "NÃ£o foi possÃvel criar pastas locais de correio em \"%s\": %s"
 
-#: ../mail/em-migrate.c:3075
+#: ../mail/em-migrate.c:2974
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -13268,74 +11968,91 @@ msgstr ""
 "NÃ£o foi possÃvel ler configuraÃ§Ãµes de uma instalaÃ§Ã£o anterior do Evolution, "
 "\"evolution/config.xmldb\" nÃ£o existe ou estÃ¡ corrompido."
 
-#: ../mail/em-popup.c:562 ../mail/em-popup.c:573
+#: ../mail/em-popup.c:364
+msgid "Save As..."
+msgstr "Salvar como..."
+
+#: ../mail/em-popup.c:389
+#, c-format
+msgid "untitled_image.%s"
+msgstr "imagem_sem_titulo.%s"
+
+#: ../mail/em-popup.c:495 ../widgets/misc/e-attachment-handler-image.c:147
+msgid "Set as _Background"
+msgstr "Usar como Imagem de _Fundo"
+
+#: ../mail/em-popup.c:497
 msgid "_Reply to sender"
 msgstr "_Responder ao remetente"
 
-#: ../mail/em-popup.c:563 ../mail/em-popup.c:574
-#: ../ui/evolution-mail-message.xml.h:83
+#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:79
 msgid "Reply to _List"
 msgstr "Responder Ã  _lista"
 
 #. make it first item
-#: ../mail/em-popup.c:625 ../mail/em-popup.c:849
+#: ../mail/em-popup.c:547 ../mail/em-popup.c:746
 msgid "_Add to Address Book"
 msgstr "_Adicionar ao catÃ¡logo de endereÃ§os"
 
-#: ../mail/em-subscribe-editor.c:600
+#: ../mail/em-popup.c:725
+#, c-format
+msgid "Open in %s..."
+msgstr "Abrir com %s..."
+
+#: ../mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Este repositÃ³rio nÃ£o suporta inscriÃ§Ãµes ou elas estÃ£o desabilitadas."
 
-#: ../mail/em-subscribe-editor.c:633
+#: ../mail/em-subscribe-editor.c:639
 msgid "Subscribed"
 msgstr "Inscrito"
 
-#: ../mail/em-subscribe-editor.c:637
+#: ../mail/em-subscribe-editor.c:643
 msgid "Folder"
 msgstr "Pasta"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:839
+#: ../mail/em-subscribe-editor.c:858
 msgid "Please select a server."
 msgstr "Por favor, selecione um servidor."
 
-#: ../mail/em-subscribe-editor.c:860
+#: ../mail/em-subscribe-editor.c:894
 msgid "No server has been selected"
 msgstr "NÃ£o foi selecionado um servidor"
 
 #. Check buttons
-#: ../mail/em-utils.c:122
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../mail/em-utils.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:129
 msgid "_Do not show this message again."
 msgstr "_NÃ£o mostrar esta mensagem novamente."
 
-#: ../mail/em-utils.c:318
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
 msgstr "Filtros de mensagens"
 
-#: ../mail/em-utils.c:371
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "mensagem"
 
-#: ../mail/em-utils.c:655
+#: ../mail/em-utils.c:652
 msgid "Save Message..."
 msgstr "Salvar mensagem..."
 
-#: ../mail/em-utils.c:705
+#: ../mail/em-utils.c:702
 msgid "Add address"
 msgstr "Adicionar endereÃ§o"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1226
+#: ../mail/em-utils.c:1223
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensagens de %s"
 
-#: ../mail/em-vfolder-editor.c:115
+#: ../mail/em-vfolder-editor.c:114
 msgid "Search _Folders"
 msgstr "Pastas de P_esquisa"
 
-#: ../mail/em-vfolder-rule.c:593
+#: ../mail/em-vfolder-rule.c:592
 msgid "Search Folder source"
 msgstr "Fonte da pasta de pesquisa"
 
@@ -13552,39 +12269,47 @@ msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Esvaziar todas as pastas lixeiras ao sair do Evolution."
 
 #: ../mail/evolution-mail.schemas.in.h:47
+msgid ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
+msgstr ""
+"Habilitar animaÃ§Ã£o de imagens em mensagens em HTML. Muitos usuÃ¡rios nÃ£o "
+"gostam de imagens animadas e preferem ver imagens estÃ¡ticas."
+
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Habilitar o modo cursor, de forma que vocÃª veja um cursor ao ler correio."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable magic space bar"
 msgstr "habilitar ou desabilitar a barra de espaÃ§o magica"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr "Habilitar ou desabilitar o aviso enquanto marca mÃºltiplas mensagens."
+
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable or disable type ahead search feature"
 msgstr "Habilitar ou desabilitar o recurso de pesquisa Ã  medida que se escreve"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Enable search folders"
 msgstr "Habilitar pastas de pesquisa"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Enable search folders on startup."
 msgstr "Habilitar pastas de pesquisa ao iniciar."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
 msgstr ""
-"Habilitando o recurso barra de pesquisa lateral, vocÃª pode iniciar pesquisas "
-"interativas digitando no texto. Usando isso vocÃª pode facilmente localizar "
-"uma pasta apenas digitando o nome da pasta na barra lateral e a seleÃ§Ã£o irÃ¡ "
-"automaticamente para aquela pasta."
+"Habilitar o recurso de barra de busca lateral para permitir uma busca de "
+"interativa de nomes de pastas."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -13592,42 +12317,43 @@ msgstr ""
 "Habilite isto para usar a tecla Barra de EspaÃ§os para rolar na visualizaÃ§Ã£o "
 "de mensagem, lista de mensagens e pastas."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Enable to render message text part of limited size."
 msgstr "Habilitar para renderizar parte de texto com limitaÃ§Ã£o de tamanho."
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable/disable caret mode"
-msgstr "Habilitar/Desabilitar o modo cursor"
+msgstr "Habilitar/desabilitar o modo cursor"
 
-#: ../mail/evolution-mail.schemas.in.h:56 ../mail/mail-config.glade.h:81
+#: ../mail/evolution-mail.schemas.in.h:58 ../mail/mail-config.glade.h:86
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Codificar nomes de arquivos da mesma forma que o Outlook/GMail"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid ""
-"Encode file names in the mail headers same as Outlook or GMail does, to let "
-"them understand localized file names sent by Evolution, because they do not "
-"follow the RFC 2231, but uses incorrect RFC 2047 standard."
+"Encode file names in the mail headers same as Outlook or GMail do, to let "
+"them display correctly file names with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
 msgstr ""
-"Codifica os nomes dos arquivos - nos cabeÃ§alhos dos e-mails - da mesma forma "
-"que o Outlook ou GMail, permitindo-os assim entender os nomes localizados "
-"enviados pelo Evolution, simplesmente porque eles nÃ£o seguem a RFC 2231, e "
-"sim a incorreta RFC 2047."
+"Codifica os nomes dos arquivos nos cabeÃ§alhos dos e-mails da mesma forma que "
+"o Outlook ou GMail, permitindo-os assim mostrar de forma correta os nomes de "
+"arquivos com letras em UTF-8 enviados pelo Evolution, porque eles nÃ£o seguem "
+"o padrÃ£o RFC 2231, e sim o incorreto padrÃ£o RFC 2047."
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Height of the message-list pane"
 msgstr "Altura do painel de lista de mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Height of the message-list pane."
 msgstr "Altura do painel de lista de mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Oculta a visualizaÃ§Ã£o por pasta e remove a seleÃ§Ã£o"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -13635,7 +12361,7 @@ msgstr ""
 "Se um usuÃ¡rio tentar abrir 10 ou mais mensagens ao mesmo tempo, perguntar ao "
 "usuÃ¡rio se ele realmente deseja fazÃª-lo."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -13643,7 +12369,7 @@ msgstr ""
 "Se o painel \"VisualizaÃ§Ã£o\" estiver ativo, mostrar lado-a-lado ao invÃ©s de "
 "verticalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -13654,7 +12380,7 @@ msgstr ""
 "componente visualizador Bonobo no banco de dados de tipos MIME do GNOME "
 "podem ser usados para exibir o conteÃºdo."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -13662,7 +12388,7 @@ msgstr ""
 "Altura inicial da janela \"Enviar e receber correio\". O valor atualiza Ã  "
 "medida que o usuÃ¡rio redimensiona a janela verticalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -13676,7 +12402,7 @@ msgstr ""
 "\"Enviar e receber correio\" nÃ£o possa ser maximizada. Esta chave existe "
 "apenas como um detalhes de implementaÃ§Ã£o."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -13684,11 +12410,7 @@ msgstr ""
 "Largura inicial da janela \"Enviar e receber correio\". O valor atualiza Ã  "
 "medida que o usuÃ¡rio redimensiona a janela horizontalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:67
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr "Desabilita/habilita o aviso enquanto marca mensagens mÃºltiplas."
-
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
@@ -13696,7 +12418,7 @@ msgstr ""
 "Habilita/Desabilita o recurso onde lembretes repetem para perguntar se a "
 "sincronizaÃ§Ã£o desconectada Ã© exigida apÃ³s entrar no modo off-line."
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -13706,32 +12428,32 @@ msgstr ""
 "mensagens da pasta de pesquisa apaga-as permanentemente e nao simplesmente "
 "as remove do resultado da procura."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Last time empty junk was run"
 msgstr "A Ãºltima vez que o spam foi esvaziada"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Last time empty trash was run"
 msgstr "A Ãºltima vez que a lixeira foi esvaziada"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "List of Labels and their associated colors"
 msgstr "Lista de rÃ³tulos e suas respectivas cores"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr ""
 "Lista de tipos MIME onde procurar os componentes de visualizaÃ§Ã£o Bonobo"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of accepted licenses"
 msgstr "Lista de licenÃ§as aceitas"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "List of accounts"
 msgstr "Lista de contas"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13740,17 +12462,17 @@ msgstr ""
 "contÃ©m strings com nomes de subdiretÃ³rios relativos a /apps/evolution/mail/"
 "accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista de cabeÃ§alhos personalizados e se eles estÃ£o habilitados."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 "Lista dos cÃ³digos de idiomas de dicionÃ¡rios usados para verificaÃ§Ã£o "
 "ortogrÃ¡fica."
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -13759,15 +12481,15 @@ msgstr ""
 "contÃ©m strings contendo nome:cor, onde cor usa a codificaÃ§Ã£o hexadecimal "
 "HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lista de nomes de protocolos para os quais a licenÃ§a foi aceita."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Load images for HTML messages over HTTP"
 msgstr "Carregar imagens de mensagens HTML usando HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
@@ -13777,109 +12499,109 @@ msgstr ""
 "\"0\" - Nunca carrega imagens da rede; \"1\" - Carrega imagens nos e-mails "
 "de algum contato seu. \"2\" - Sempre carrega imagens da rede."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Log filter actions"
 msgstr "Registrar aÃ§Ãµes dos filtros"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Log filter actions to the specified log file."
 msgstr "Registrar aÃ§Ãµes dos filtros no arquivo de registro especificado."
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Logfile to log filter actions"
 msgstr "Arquivo de registro onde registrar aÃ§Ãµes dos filtros"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Logfile to log filter actions."
 msgstr "Arquivo de registro onde registrar aÃ§Ãµes dos filtros."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark as Seen after specified timeout"
 msgstr "Marcar como lida apÃ³s o tempo limite especificado"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcar como lida apÃ³s o tempo limite especificado."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marcar citaÃ§Ãµes na \"VisualizaÃ§Ã£o\" da mensagem"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcar citaÃ§Ãµes na \"VisualizaÃ§Ã£o\" da mensagem."
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Message Window default height"
 msgstr "Altura padrÃ£o da janela de mensagem"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Message Window default width"
 msgstr "Largura padrÃ£o da janela de mensagem"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Estilo de exibiÃ§Ã£o de mensagem (\"normal\", \"full headers\" (todos os "
 "cabeÃ§alhos), \"source\" (fonte))"
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum days between emptying the junk on exit"
 msgstr "NÃºmero mÃnimo de dias para esvaziar o spam ao sair"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Minimum days between emptying the trash on exit"
 msgstr "NÃºmero mÃnimo em dias para esvaziar a lixeira ao sair"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Tempo mÃnimo em dias para esvaziar o spam ao sair."
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Tempo mÃnimo em dias para esvaziar a lixeira ao sair."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "NÃºmero de endereÃ§os a serem exibidos nos campos PARA/CC/CCO"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt on empty subject"
 msgstr "Perguntar em caso de assunto vazio"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 "Perguntar ao usuÃ¡rio quando ele tenta excluir permanentemente uma pasta."
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Perguntar ao usuÃ¡rio quando ele tenta enviar uma mensagem com assunto vazio."
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr "Perguntar se o usuÃ¡rio deseja ficar desconectado imediatamente"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when deleting messages in search folder"
 msgstr "Perguntar ao excluir mensagens na pasta de pesquisa"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Prompt when user expunges"
 msgstr "Perguntar quando o usuÃ¡rio exclui permanentemente"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user only fills Bcc"
 msgstr "Perguntar quando o usuÃ¡rio preenche apenas o CCO"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Perguntar quando o usuÃ¡rio tentar abrir 10 ou mais mensagens de uma vez"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13887,136 +12609,209 @@ msgstr ""
 "Perguntar quando o usuÃ¡rio tenta enviar mensagem HTML para contatos que nÃ£o "
 "as desejam."
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Perguntar quando o usuÃ¡rio tenta enviar uma mensagem sem destinatÃ¡rios Para "
 "ou Cc."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Perguntar quando o usuÃ¡rio tenta enviar HTML indesejado"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Prompt while marking multiple messages"
 msgstr "Avisar enquanto marcar mensagens mÃºltiplas"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
+msgid "Put personalized signatures at the top of replies"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid "Put the cursor at the bottom of replies"
+msgstr "Posicionar o cursor no final de respostas"
+
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Reconhecer carinhas no texto e substituÃ-las por imagens."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Recognize links in text and replace them."
 msgstr "Reconhecer links no texto e substituÃ-los."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Run junk test on incoming mail."
 msgstr "Executar teste de spam nas recebidas."
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Save directory"
 msgstr "Salvar diretÃ³rio"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Search for the sender photo in local address books"
 msgstr "Pesquisar pela foto do remetente no catÃ¡logo de endereÃ§os local"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Send HTML mail by default"
 msgstr "Enviar correio HTML por padrÃ£o"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Send HTML mail by default."
 msgstr "Enviar correio HTML por padrÃ£o."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Sender email-address column in the message list"
 msgstr "Mostrar coluna do e-mail do remetente na lista de mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Server synchronization interval"
 msgstr "Intervalo da sincronizaÃ§Ã£o do servidor"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:124
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "Show \"From\" field when posting to a newsgroup"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid "Show \"From\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr ""
+"Mostrar o campo \"Responder a\" ao enviar uma mensagem de correspondÃªncia"
+
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Show Animations"
 msgstr "Mostrar animaÃ§Ãµes"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Show animated images as animations."
 msgstr "Mostrar imagens animadas como animaÃ§Ãµes."
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Mostrar mensagens excluÃdas (com um risco) na lista de mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Show deleted messages in the message-list"
 msgstr "Mostrar mensagens excluÃdas na lista de mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:134
+msgid "Show image animations"
+msgstr "Mostrar animaÃ§Ãµes de imagens"
+
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Show photo of the sender"
 msgstr "Mostrar foto do remetente"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:136
+msgid ""
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:137
+msgid ""
+"Show the \"Cc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid ""
+"Show the \"From\" field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid ""
+"Show the \"From\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:142
+msgid ""
+"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
+"from the View menu when a news account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid ""
+"Show the \"Reply To\" field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr ""
 "Mostra o e-mail do remetente em uma coluna separada na lista de mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Mostra a foto do remetente no painÃ©l de leitura da mensagem"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Spell check inline"
 msgstr "Verificar ortografia durante a digitaÃ§Ã£o"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Spell checking color"
 msgstr "Cor da verificaÃ§Ã£o ortogrÃ¡fica"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Spell checking languages"
 msgstr "Idiomas da verificaÃ§Ã£o ortogrÃ¡fica"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Subscribe dialog default height"
 msgstr "Altura padrÃ£o do diÃ¡logo de inscriÃ§Ã£o"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Subscribe dialog default width"
 msgstr "Largura padrÃ£o do diÃ¡logo de inscriÃ§Ã£o"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Terminal font"
 msgstr "Fonte de terminal"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Text message part limit"
 msgstr "Limite do tamanho da mensagem de texto"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "The default plugin for Junk hook"
 msgstr "O plug-in padrÃ£o associado ao Spam"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "A Ãºltima vez que o spam foi esvaziada, em dias desde a Ã©poca."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "A Ãºltima vez que a lixeira foi esvaziada, em dias desde a Ã©poca."
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "The terminal font for mail display."
 msgstr "A fonte de terminal para exibiÃ§Ã£o de correio."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "The variable width font for mail display."
 msgstr "A fonte de largura variÃ¡vel para exibiÃ§Ã£o de correio."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -14024,7 +12819,7 @@ msgstr ""
 "Isso admite trÃªs valores possÃveis: \"0\" para erros, \"1\" para avisos. \"2"
 "\" para mensagens de depuraÃ§Ã£o."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
@@ -14032,7 +12827,7 @@ msgstr ""
 "Isto decide o tamanho mÃ¡ximo da parte do texto que pode ser formatada sob o "
 "Evolution. O padrÃ£o Ã© 4MB / 4096KB e Ã© especificado em KB."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -14042,7 +12837,7 @@ msgstr ""
 "habilitados. Se a lista de plug-ins padrÃ£o estiver desabilitado, entÃ£o "
 "retorne para outros plug-ins disponÃveis."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -14050,7 +12845,7 @@ msgstr ""
 "Esta chave Ã© lida apenas uma vez e restaurada para \"false\" depois de lida. "
 "Isto desmarca o e-mail na lista e remove a visualizaÃ§Ã£o para aquela pasta."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -14062,7 +12857,7 @@ msgstr ""
 "&lt;header enabled&gt; - defina \"enabled\" se o cabeÃ§alho deve ser exibido "
 "junto com a mensagem."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -14072,11 +12867,11 @@ msgstr ""
 "excluÃdos do filtro de spam. Essa opÃ§Ã£o estÃ¡ relacionada Ã  chave "
 "lookup_addressbook."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "This option would help in improving the speed of fetching."
 msgstr "Esta opÃ§Ã£o ajuda a melhorar a velocidade de obtenÃ§Ã£o."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -14084,7 +12879,7 @@ msgstr ""
 "Esta opÃ§Ã£o define o nÃºmero de endereÃ§os mostrados na visualizaÃ§Ã£o em lista "
 "de mensagens, alÃ©m desse nÃºmero serÃ¡ mostrado \"...\"."
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -14092,7 +12887,7 @@ msgstr ""
 "Este ajuste especifica se as discussÃµes ficarÃ£o expandidas ou contraÃdas por "
 "padrÃ£o. Evolution requer reinicializaÃ§Ã£o."
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -14102,116 +12897,90 @@ msgstr ""
 "mensagem em cada conversaÃ§Ã£o ao invÃ©s da data da mensagem. O Evolution "
 "necessita ser reiniciado."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Thread the message list."
 msgstr "Encadear a lista de mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Thread the message-list"
 msgstr "Encadear a lista de mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Thread the message-list based on Subject"
 msgstr "Encadear a lista de mensagens baseado no assunto"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Timeout for marking message as seen"
 msgstr "Tempo limite para marcar a mensagem como lida"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Timeout for marking message as seen."
 msgstr "Tempo limite para marcar a mensagem como lida."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "UID string of the default account."
 msgstr "String UID da conta padrÃ£o."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
 "Cor de sublinhado para palavras incorretas ao usar o corretor embutido."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Use SpamAssassin daemon and client"
 msgstr "Usar o daemon e cliente do SpamAssassin"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Usa o daemon e cliente do SpamAssassin (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Use custom fonts"
 msgstr "Usar fontes personalizadas"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Use custom fonts for displaying mail."
 msgstr "Usa fontes personalizadas para exibir as mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Use only local spam tests."
 msgstr "Usar apenas testes de SPAM locais."
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Usa apenas os testes de SPAM locais (sem DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "Use side-by-side or wide layout"
 msgstr "Usar disposiÃ§Ã£o lado-a-lado ou ampla"
 
-#: ../mail/evolution-mail.schemas.in.h:166
-msgid "Variable width font"
-msgstr "Fonte de largura variÃ¡vel"
-
-#: ../mail/evolution-mail.schemas.in.h:167
-msgid "View/Bcc menu item is checked"
-msgstr "Item de menu Ver/CCO estÃ¡ selecionado"
-
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "View/Bcc menu item is checked."
-msgstr "Item de menu Ver/CCO estÃ¡ selecionado."
-
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "View/Cc menu item is checked"
-msgstr "Item de menu Ver/Cc estÃ¡ selecionado"
-
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid "View/Cc menu item is checked."
-msgstr "Item de menu Ver/Cc estÃ¡ selecionado."
-
-#: ../mail/evolution-mail.schemas.in.h:171
-msgid "View/From menu item is checked"
-msgstr "Item de menu Ver/De estÃ¡ selecionado"
-
-#: ../mail/evolution-mail.schemas.in.h:172
-msgid "View/From menu item is checked."
-msgstr "Item de menu Ver/De estÃ¡ selecionado."
-
-#: ../mail/evolution-mail.schemas.in.h:173
-msgid "View/PostTo menu item is checked"
-msgstr "Item de menu Ver/Publicar Em estÃ¡ selecionado"
-
-#: ../mail/evolution-mail.schemas.in.h:174
-msgid "View/PostTo menu item is checked."
-msgstr "Item de menu Ver/Publicar Em estÃ¡ selecionado."
+#: ../mail/evolution-mail.schemas.in.h:182
+msgid ""
+"Users get all up in arms over where the cursor should go when replying to a "
+"message. This determines whether the cursor is placed at the top of the "
+"message or the bottom."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:175
-msgid "View/ReplyTo menu item is checked"
-msgstr "Item de menu Ver/Responder A estÃ¡ selecionado"
+#: ../mail/evolution-mail.schemas.in.h:183
+msgid ""
+"Users get all up in arms over where their signature should go when replying "
+"to a message. This determines whether the signature is placed at the top of "
+"the message or the bottom."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "View/ReplyTo menu item is checked."
-msgstr "Item de menu Ver/Responder A estÃ¡ selecionado."
+#: ../mail/evolution-mail.schemas.in.h:184
+msgid "Variable width font"
+msgstr "Fonte de largura variÃ¡vel"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "Envia um pedido de recibo de leitura a cada mensagem por padrÃ£o."
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "Se deve ou nÃ£o abreviar o nome das pastas na barra lateral."
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -14219,15 +12988,15 @@ msgstr ""
 "Se o encadeamento por assunto deve ser revertido quando as mensagens nÃ£o "
 "contÃ©m cabeÃ§alhos In-Reply-To ou References."
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Ordenar as conversaÃ§Ãµes com base na sua Ãºltima mensagem"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Width of the message-list pane"
 msgstr "Largura do painel de lista de mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Width of the message-list pane."
 msgstr "Largura do painel de lista de mensagens."
 
@@ -14244,12 +13013,12 @@ msgid "Import mail from Elm."
 msgstr "Importar caixa de correio do Elm."
 
 #: ../mail/importers/evolution-mbox-importer.c:79
-#: ../plugins/pst-import/pst-importer.c:312
+#: ../plugins/pst-import/pst-importer.c:309
 msgid "Destination folder:"
 msgstr "Pasta destino:"
 
 #: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
+#: ../plugins/pst-import/pst-importer.c:302
 msgid "Select folder to import into"
 msgstr "Selecionar pasta para onde importar"
 
@@ -14267,8 +13036,8 @@ msgstr "Importando caixa de correio"
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:231
-#: ../plugins/pst-import/pst-importer.c:457
-#: ../plugins/pst-import/pst-importer.c:563 ../shell/e-shell-importer.c:512
+#: ../plugins/pst-import/pst-importer.c:454
+#: ../plugins/pst-import/pst-importer.c:560 ../shell/e-shell-importer.c:555
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importando \"%s\""
@@ -14295,152 +13064,148 @@ msgstr "Importar caixa de correio do Pine."
 msgid "Mail to %s"
 msgstr "Correio para %s"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:235 ../mail/mail-autofilter.c:274
 #, c-format
 msgid "Mail from %s"
 msgstr "Correio de %s"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:258
 #, c-format
 msgid "Subject is %s"
 msgstr "Assunto Ã© %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "Lista de discussÃ£o %s"
 
-#: ../mail/mail-autofilter.c:365
+#: ../mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "Adicionar regra de filtro"
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d selecionada, "
 msgstr[1] "%d selecionadas, "
 
-#: ../mail/mail-component.c:554
+#: ../mail/mail-component.c:577
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d excluÃda"
 msgstr[1] "%d excluÃdas"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:584
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d spam"
 msgstr[1] "%d spams"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:587
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d rascunho"
 msgstr[1] "%d rascunhos"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:589
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d enviada"
 msgstr[1] "%d enviadas"
 
-#: ../mail/mail-component.c:568
+#: ../mail/mail-component.c:591
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d nÃ£o enviada"
 msgstr[1] "%d nÃ£o enviadas"
 
-#: ../mail/mail-component.c:574
+#: ../mail/mail-component.c:597
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d nÃ£o lida, "
 msgstr[1] "%d nÃ£o lidas, "
 
-#: ../mail/mail-component.c:575
+#: ../mail/mail-component.c:598
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d total"
 msgstr[1] "%d total"
 
-#: ../mail/mail-component.c:927
+#: ../mail/mail-component.c:952
 msgid "New Mail Message"
 msgstr "Nova mensagem de correio"
 
-#: ../mail/mail-component.c:928
+#: ../mail/mail-component.c:953
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mensagem de correio"
 
-#: ../mail/mail-component.c:929
+#: ../mail/mail-component.c:954
 msgid "Compose a new mail message"
 msgstr "Redige uma nova mensagem de correio"
 
-#: ../mail/mail-component.c:935
+#: ../mail/mail-component.c:960
 msgid "New Mail Folder"
 msgstr "Nova pasta de correio"
 
-#: ../mail/mail-component.c:936
+#: ../mail/mail-component.c:961
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Pasta de correio"
 
-#: ../mail/mail-component.c:937
+#: ../mail/mail-component.c:962
 msgid "Create a new mail folder"
 msgstr "Cria uma nova pasta de correio"
 
-#: ../mail/mail-component.c:1084
+#: ../mail/mail-component.c:1109
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Falha ao atualizar configuraÃ§Ãµes ou pastas de correio."
 
 #: ../mail/mail-config.glade.h:1
-msgid " Ch_eck for Supported Types "
-msgstr " V_erificar Tipos com Suporte "
-
-#: ../mail/mail-config.glade.h:2
 msgid "(Note: Requires restart of the application)"
 msgstr "(Nota: Ã? necessÃ¡rio reiniciar o aplicativo)"
 
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:3
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>Esta compilaÃ§Ã£o do Evolution nÃ£o tem suporte a SSL</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:4
 msgid "<b>Sender Photograph</b>"
 msgstr "<b>Foto do remetente</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:5
 msgid "<b>Sig_natures</b>"
 msgstr "<b>_Assinaturas</b>"
 
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:6
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr "<b>OpÃ§Ã£o de publicar sobre</b> (nÃ£o recomendada)"
 
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:7
 msgid "<b>_Languages</b>"
 msgstr "<b>_Idiomas</b>"
 
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">InformaÃ§Ã£o de conta</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">AutenticaÃ§Ã£o</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Redigindo mensagens</span>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">ConfiguraÃ§Ã£o</span>"
 
@@ -14561,59 +13326,78 @@ msgstr "Sempre criptografar para mim _mesmo ao enviar mensagens criptografadas"
 msgid "Always request rea_d receipt"
 msgstr "Sempre solicitar um recibo _de leitura"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:45
+msgid ""
+"Attachment\n"
+"Inline\n"
+"Quoted"
+msgstr ""
+"Anexo\n"
+"Integrado\n"
+"Citado"
+
+#: ../mail/mail-config.glade.h:48
+msgid ""
+"Attachment\n"
+"Inline (Outlook style)\n"
+"Quoted\n"
+"Do not quote"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:52
 msgid "Automatically insert _emoticon images"
 msgstr "Inserir automaticamente imag_ens de carinhas"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:53
 msgid "Baltic (ISO-8859-13)"
 msgstr "BÃ¡ltico (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:54
 msgid "Baltic (ISO-8859-4)"
 msgstr "BÃ¡ltico (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:55
 msgid "C_haracter set:"
 msgstr "Con_junto de caracteres:"
 
-#: ../mail/mail-config.glade.h:50
-msgid "Ch_eck for Supported Types "
-msgstr "_Verificar tipos com suporte "
+#: ../mail/mail-config.glade.h:56
+#: ../plugins/exchange-operations/exchange-account-setup.c:1015
+msgid "Ch_eck for Supported Types"
+msgstr "_Verificar por tipos com suporte"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:57
 msgid "Check cu_stom headers for junk"
 msgstr "Verificar cabeÃ§alhos per_sonalizados por spam"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:58
 msgid "Check incoming _messages for junk"
 msgstr "Procurar em mensagens _recebidas por spam"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:59
 msgid "Check spelling while I _type"
 msgstr "Verificar a ortografia enquanto eu _digito"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:60
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Testar se mensagens recebidas sÃ£o spam"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:61
 msgid "Cle_ar"
 msgstr "Limp_ar"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:62
 msgid "Clea_r"
 msgstr "Limpa_r"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:63
 msgid "Color for _misspelled words:"
 msgstr "Cor das palavras _erradas:"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:64
 msgid "Confirm _when expunging a folder"
 msgstr "C_onfirmar ao excluir permanentemente uma pasta"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:65
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14629,156 +13413,150 @@ msgstr ""
 "\n"
 "Clique em \"Aplicar\" para salvar suas configuraÃ§Ãµes."
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:71
 msgid "De_fault"
 msgstr "_PadrÃ£o"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:72
 msgid "Default character e_ncoding:"
 msgstr "Co_dificaÃ§Ã£o de caracteres padrÃ£o:"
 
-#: ../mail/mail-config.glade.h:68
+#: ../mail/mail-config.glade.h:74
 msgid "Delete junk messages on e_xit"
 msgstr "Remover mensagens marcadas como spam ao sair"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:76
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "_Assinar digitalmente mensagens enviadas (por padrÃ£o)"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:77
 msgid "Do not format messages when text si_ze exceeds"
 msgstr "NÃ£o formatar mensagens se o tamanho do texto e_xcede"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:78
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 "NÃ£o marcar me_nsagens como spam se o remetente estiver no meu catÃ¡logo de "
 "endereÃ§os"
 
-#: ../mail/mail-config.glade.h:73
-msgid "Do not quote"
-msgstr "NÃ£o citar"
-
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:79
 msgid "Done"
 msgstr "Terminado"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:80
 msgid "Drafts _Folder:"
 msgstr "_Pasta de rascunhos:"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:81
 msgid "Email Accounts"
 msgstr "Contas de e-mail"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:82
 msgid "Email _Address:"
 msgstr "EndereÃ§o de e_mail:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:83
 msgid "Empty trash folders on e_xit"
 msgstr "_Esvaziar lixeiras ao sair"
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:84
 msgid "Enable Magic S_pacebar"
 msgstr "Habilitar barra de e_spaÃ§o mÃ¡gica"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:85
 msgid "Enable Sea_rch Folders"
 msgstr "Habilitar pastas de pesquisa"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:87
 msgid "Encry_ption certificate:"
 msgstr "Ce_rtificado de criptografia:"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:88
 msgid "Encrypt out_going messages (by default)"
 msgstr "Criptografar _mensagens enviadas (por padrÃ£o)"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:90
 msgid "Fi_xed-width:"
 msgstr "Largura fi_xa:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:91
 msgid "Fix_ed width Font:"
 msgstr "Font_e de largura fixa:"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:92
 msgid "Font Properties"
 msgstr "Propriedades da fonte"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:93
 msgid "Format messages in _HTML"
 msgstr "Formatar mensagens em _HTML"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:94
 msgid "Full Nam_e:"
 msgstr "Nome _completo:"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:96
 msgid "HTML Messages"
 msgstr "Mensagens HTML"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:97
 msgid "H_TTP Proxy:"
 msgstr "Proxy H_TTP:"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:98
 msgid "Headers"
 msgstr "CabeÃ§alhos"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:99
 msgid "Highlight _quotations with"
 msgstr "_RealÃ§ar citaÃ§Ãµes com"
 
-#: ../mail/mail-config.glade.h:96
-msgid "Inline"
-msgstr "Embutido"
-
-#: ../mail/mail-config.glade.h:97
-msgid "Inline (Outlook style)"
-msgstr "Embutido (estilo Outlook)"
+#: ../mail/mail-config.glade.h:101
+msgid ""
+"If the server uses a non-standard port then specify the server address as "
+"\"server-name:port-number\""
+msgstr ""
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:103
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:100 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:104 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "RÃ³tulo"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:105
 msgid "Languages Table"
 msgstr "Tabela de idiomas"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:106
 msgid "Mail Configuration"
 msgstr "ConfiguraÃ§Ã£o de correio"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:107
 msgid "Mail Headers Table"
 msgstr "Tabela de cabeÃ§alhos de correio"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:109
 msgid "Mailbox location"
 msgstr "LocalizaÃ§Ã£o da caixa de correio"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:110
 msgid "Message Composer"
 msgstr "Redator de mensagens"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:111
 msgid "No _Proxy for:"
 msgstr "Nenhum _proxy para:"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:112
 msgid ""
 "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr ""
 "Nota: O sublinhado no nome do rÃ³tulo indica que ele Ã© usado como "
 "identificador mnemÃ´nico no menu."
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:113
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -14786,33 +13564,37 @@ msgstr ""
 "Nota: nÃ£o serÃ¡ pedido que vocÃª forneÃ§a uma senha atÃ© que vocÃª faÃ§a a "
 "primeira conexÃ£o"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:114
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "A opÃ§Ã£o Ã© ignorada se uma ocorrÃªncia para cabeÃ§alhos de spam personalizados "
 "for localizada."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:115
 msgid "Or_ganization:"
 msgstr "_Empresa:"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:116
 msgid "PGP/GPG _Key ID:"
 msgstr "ID da C_have PGP/GPG:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:117
 msgid "Pass_word:"
 msgstr "Sen_ha:"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:119
+msgid "Please configure the following account settings."
+msgstr "Por favor configure as seguintes configuraÃ§Ãµes de conta."
+
+#: ../mail/mail-config.glade.h:120
 msgid ""
-"Please enter a descriptive name for this account in the space below.\n"
-"This name will be used for display purposes only."
+"Please enter a descriptive name for this account in the space below. This "
+"name will be used for display purposes only."
 msgstr ""
-"Por favor, digite um nome descritivo para esta conta no espaÃ§o abaixo.\n"
-"Este nome serÃ¡ usado apenas com o propÃ³sito de exibiÃ§Ã£o."
+"Por favor digite um nome descritivo para esta conta no espaÃ§o abaixo. Este "
+"nome serÃ¡ usado apenas com o propÃ³sito de exibiÃ§Ã£o."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:121
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14821,7 +13603,7 @@ msgstr ""
 "tiver certeza, consulte o seu administrador de sistema ou o seu provedor de "
 "Internet."
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:122
 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 "
@@ -14832,59 +13614,43 @@ msgstr ""
 "menos que vocÃª queira estas informaÃ§Ãµes incluÃdas em toda mensagem de "
 "correio enviada."
 
-#: ../mail/mail-config.glade.h:119
-msgid "Please select among the following options"
-msgstr "Por favor, selecione entre as seguintes opÃ§Ãµes"
-
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:123
 msgid "Port:"
 msgstr "Porta:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:124
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Perguntar ao enviar mensagens com apenas destinatÃ¡rios CC_O"
 
-#: ../mail/mail-config.glade.h:122
-msgid "Quoted"
-msgstr "Citado"
-
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:125
 msgid "Re_member password"
 msgstr "_Lembrar senha"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:126
 msgid "Re_ply-To:"
 msgstr "_Responder a:"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:128
 msgid "Remember _password"
 msgstr "_Lembrar senha"
 
-#: ../mail/mail-config.glade.h:127
-msgid "S_OCKS Host:"
-msgstr "MÃ¡quina S_OCKS:"
-
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_earch for sender photograph only in local address books"
 msgstr ""
 "P_esquisar pela foto do remetente apenas em catÃ¡logos de endereÃ§os locais"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_elect..."
 msgstr "S_elecionar..."
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "S_end message receipts:"
 msgstr "Enviar destinatÃ¡rio_s da mensagem:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "S_tandard Font:"
 msgstr "Fonte _padrÃ£o:"
 
-#: ../mail/mail-config.glade.h:133
-msgid "Select Drafts Folder"
-msgstr "Selecionar pasta de rascunhos"
-
 #: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font"
 msgstr "Selecionar fonte HTML de largura fixa"
@@ -14901,55 +13667,51 @@ msgstr "Selecionar fonte HTML de largura variÃ¡vel"
 msgid "Select HTML variable width font for printing"
 msgstr "Selecionar fonte HTML de largura variÃ¡vel para impressÃ£o"
 
-#: ../mail/mail-config.glade.h:138
-msgid "Select Sent Folder"
-msgstr "Selecionar pasta de enviadas"
-
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:139
 msgid "Sending Mail"
 msgstr "Enviando correio"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:140
 msgid "Sent _Messages Folder:"
 msgstr "Pasta de _mensagens enviadas:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:141
 msgid "Ser_ver requires authentication"
 msgstr "Servi_dor requer autenticaÃ§Ã£o"
 
-#: ../mail/mail-config.glade.h:143
-msgid "Server _Type: "
-msgstr "_Tipo do servidor: "
+#: ../mail/mail-config.glade.h:142
+msgid "Server _Type:"
+msgstr "_Tipo do servidor:"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:143
 msgid "Sig_ning certificate:"
 msgstr "Certificado de assi_natura:"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:144
 msgid "Signat_ure:"
 msgstr "_Assinatura:"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:145
 msgid "Signatures"
 msgstr "Assinaturas"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures Table"
 msgstr "Tabelas de assinaturas"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:147
 msgid "Spell Checking"
 msgstr "VerificaÃ§Ã£o ortogrÃ¡fica"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:148
 msgid "Start _typing at the bottom on replying"
 msgstr "Iniciar digi_tando embaixo ao responder"
 
-#: ../mail/mail-config.glade.h:150
-msgid "T_ype: "
+#: ../mail/mail-config.glade.h:149
+msgid "T_ype:"
 msgstr "Ti_po: "
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:150
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14957,17 +13719,16 @@ msgstr ""
 "A lista de idiomas aqui reflete apenas os idiomas para os quais vocÃª tem um "
 "dicionÃ¡rio instalado."
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only. "
+"signature. The name you specify will be used for display purposes only."
 msgstr ""
 "A saÃda deste script serÃ¡ usada como a sua\n"
 "assinatura. O nome que vocÃª especificar serÃ¡\n"
 "usado apenas com o propÃ³sito de exibiÃ§Ã£o. "
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:153
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14975,156 +13736,156 @@ msgstr ""
 "Digite o nome pelo qual vocÃª deseja chamar esta conta.\n"
 "Por exemplo: \"Trabalho\" ou \"Pessoal\""
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:155
 msgid "Us_ername:"
 msgstr "Nom_e de usuÃ¡rio:"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:156
 msgid "Use Authe_ntication"
 msgstr "Usar aute_nticaÃ§Ã£o"
 
-#: ../mail/mail-config.glade.h:159 ../plugins/caldav/caldav-source.c:387
-#: ../plugins/google-account-setup/google-source.c:615
-#: ../plugins/google-account-setup/google-contacts-source.c:316
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:348
+#: ../mail/mail-config.glade.h:157 ../plugins/caldav/caldav-source.c:405
+#: ../plugins/google-account-setup/google-source.c:681
+#: ../plugins/google-account-setup/google-contacts-source.c:280
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
 msgid "User_name:"
 msgstr "_Nome do usuÃ¡rio:"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:158
 msgid "V_ariable-width:"
 msgstr "Largura v_ariÃ¡vel:"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:159
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Forward\" to begin. "
+"Click \"Forward\" to begin."
 msgstr ""
-"Bem-vindo ao assistente de configuraÃ§Ã£o de correio do Evolution.\n"
+"Bem-vindo ao assistente de configuraÃ§Ãµes de correio do Evolution.\n"
 "\n"
 "Pressione \"AvanÃ§ar\" para iniciar. "
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:162
 msgid "_Add Signature"
 msgstr "_Adicionar assinatura"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:163
 msgid "_Always load images from the Internet"
 msgstr "_Sempre carregar imagens da Internet"
 
-#: ../mail/mail-config.glade.h:166
-msgid "_Automatic proxy configuration URL:"
-msgstr "URL da configuraÃ§Ã£o de proxy _automÃ¡tica:"
-
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "Plug-in pa_drÃ£o de spam"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:165
 msgid "_Direct connection to the Internet"
 msgstr "ConexÃ£o _direta Ã  internet"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_NÃ£o assinar pedidos de reuniÃ£o (para compatibilidade com o Outlook)"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "Estilo de _encaminhamento:"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Manter assinatura sobre a mensagem original ao responder"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "_Carregar imagens nas mensagens a partir dos contatos"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:171
 msgid "_Lookup in local address book only"
 msgstr "P_rocurar apenas em catÃ¡logos de endereÃ§os locais"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "_Torne esta a minha conta padrÃ£o"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:173
 msgid "_Manual proxy configuration:"
 msgstr "ConfiguraÃ§Ã£o de proxy _manual:"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensagens como lidas apÃ³s"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "_Nunca carregar imagens da Internet"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "_Caminho:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:178
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Perguntar ao enviar e-mails em HTML para contatos que nÃ£o os desejam"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Perguntar ao enviar mensagens com um assunto vazio"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "Estilo de _resposta:"
 
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:182
 msgid "_Secure HTTP Proxy:"
 msgstr "Proxy HTTP _seguro:"
 
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "_Selecionar..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "Mostrar animaÃ§Ãµe_s"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "Mo_strar a foto do remetente na visualizaÃ§Ã£o do e-mail"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "Encurtar o_s cabeÃ§alhos Para / Cc / CCO para "
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "_Usar conexÃ£o segura:"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:190
 msgid "_Use system defaults"
 msgstr "_Usar padrÃµes do sistema"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar as mesmas fontes que outros aplicativos usam"
 
-#: ../mail/mail-config.glade.h:195
+#: ../mail/mail-config.glade.h:194
 msgid "addresses"
 msgstr "endereÃ§os"
 
-#: ../mail/mail-config.glade.h:196
+#: ../mail/mail-config.glade.h:195
 msgid "color"
 msgstr "cor"
 
-#: ../mail/mail-config.glade.h:197
+#: ../mail/mail-config.glade.h:196
 msgid "description"
 msgstr "descriÃ§Ã£o"
 
+#: ../mail/mail-config.glade.h:197
+msgid "seconds"
+msgstr "segundos"
+
 #: ../mail/mail-dialogs.glade.h:1
 msgid "    "
 msgstr "    "
@@ -15154,50 +13915,34 @@ msgid "All local folders"
 msgstr "Todas as pastas locais"
 
 #: ../mail/mail-dialogs.glade.h:8
-msgid "Case _sensitive"
-msgstr "Diferenciar maiÃº_sculas de minÃºsculas"
-
-#: ../mail/mail-dialogs.glade.h:9
 msgid "Co_mpleted"
 msgstr "Co_ncluÃda"
 
-#: ../mail/mail-dialogs.glade.h:10
-msgid "F_ind:"
-msgstr "Local_izar:"
-
-#: ../mail/mail-dialogs.glade.h:11
-msgid "Find in Message"
-msgstr "Localizar na mensagem"
-
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
+#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:270
 msgid "Flag to Follow Up"
 msgstr "Marcar como lembrete"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:10
 msgid "Folder Subscriptions"
 msgstr "InscriÃ§Ãµes de pastas"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:11
 msgid "License Agreement"
 msgstr "Acordo de licenÃ§a"
 
-#: ../mail/mail-dialogs.glade.h:15
-msgid "None Selected"
-msgstr "Nenhum selecionado"
-
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:12
 msgid "S_erver:"
 msgstr "S_ervidor:"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Security Information"
 msgstr "InformaÃ§Ã£o de seguranÃ§a"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:14
 msgid "Specific folders"
 msgstr "Apenas pastas especÃficas"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:15
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -15205,19 +13950,19 @@ msgstr ""
 "As mensagens que vocÃª selecionou para lembrete estÃ£o relacionadas abaixo.\n"
 "Por favor, selecione uma aÃ§Ã£o de lembrete no menu \"Marca\"."
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:17
 msgid "_Accept License"
 msgstr "_Aceitar licenÃ§a"
 
-#: ../mail/mail-dialogs.glade.h:22
+#: ../mail/mail-dialogs.glade.h:18
 msgid "_Due By:"
 msgstr "_Prazo:"
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Flag:"
 msgstr "_Marca:"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:20
 msgid "_Tick this to accept the license agreement"
 msgstr "Marque aqui para acei_tar o acordo de licenÃ§a"
 
@@ -15226,21 +13971,21 @@ msgstr "Marque aqui para acei_tar o acordo de licenÃ§a"
 msgid "Pinging %s"
 msgstr "Chamando %s"
 
-#: ../mail/mail-ops.c:106
+#: ../mail/mail-ops.c:107
 msgid "Filtering Selected Messages"
 msgstr "Filtrar mensagens selecionadas"
 
-#: ../mail/mail-ops.c:265
+#: ../mail/mail-ops.c:266
 msgid "Fetching Mail"
 msgstr "Obtendo correio"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:561
+#: ../mail/mail-ops.c:562
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Falha ao aplicar filtros de saÃda: %s"
 
-#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
+#: ../mail/mail-ops.c:574 ../mail/mail-ops.c:601
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15249,123 +13994,123 @@ msgstr ""
 "Falha ao acrescentar a %s: %s\n"
 "Acrescentando Ã  pasta local \"Enviada\"."
 
-#: ../mail/mail-ops.c:619
+#: ../mail/mail-ops.c:618
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Falha ao acrescentar Ã  pasta local \"Enviada\": %s"
 
-#: ../mail/mail-ops.c:725
+#: ../mail/mail-ops.c:724 ../mail/mail-ops.c:805
 msgid "Sending message"
 msgstr "Enviando mensagem"
 
-#: ../mail/mail-ops.c:735
+#: ../mail/mail-ops.c:734
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensagem %d de %d"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:761
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Falha ao enviar %d de %d mensagens"
 
-#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:701
 msgid "Canceled."
 msgstr "Cancelada."
 
-#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:703
 msgid "Complete."
 msgstr "ConcluÃda."
 
-#: ../mail/mail-ops.c:872
+#: ../mail/mail-ops.c:877
 msgid "Saving message to folder"
 msgstr "Salvando mensagem na pasta"
 
-#: ../mail/mail-ops.c:950
+#: ../mail/mail-ops.c:954
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensagens para %s"
 
-#: ../mail/mail-ops.c:950
+#: ../mail/mail-ops.c:954
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensagens para %s"
 
-#: ../mail/mail-ops.c:1167
+#: ../mail/mail-ops.c:1171
 msgid "Forwarded messages"
 msgstr "Mensagens encaminhadas"
 
-#: ../mail/mail-ops.c:1208
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo pasta %s"
 
-#: ../mail/mail-ops.c:1273
+#: ../mail/mail-ops.c:1277
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "Recuperando informaÃ§Ãµes de cota da pasta %s"
 
-#: ../mail/mail-ops.c:1342
+#: ../mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo repositÃ³rio %s"
 
-#: ../mail/mail-ops.c:1413
+#: ../mail/mail-ops.c:1417
 #, c-format
 msgid "Removing folder %s"
 msgstr "Removendo pasta %s"
 
-#: ../mail/mail-ops.c:1531
+#: ../mail/mail-ops.c:1535
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Armazenando pasta \"%s\""
 
-#: ../mail/mail-ops.c:1594
+#: ../mail/mail-ops.c:1598
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Excluindo permanentemente e armazenando conta \"%s\""
 
-#: ../mail/mail-ops.c:1595
+#: ../mail/mail-ops.c:1599
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Armazenando a conta \"%s\""
 
-#: ../mail/mail-ops.c:1649
+#: ../mail/mail-ops.c:1653
 msgid "Refreshing folder"
 msgstr "Atualizando a pasta"
 
-#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
+#: ../mail/mail-ops.c:1693 ../mail/mail-ops.c:1743
 msgid "Expunging folder"
 msgstr "Excluindo permanentemente a pasta"
 
-#: ../mail/mail-ops.c:1736
+#: ../mail/mail-ops.c:1740
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Esvaziando a lixeira em \"%s\""
 
-#: ../mail/mail-ops.c:1737
+#: ../mail/mail-ops.c:1741
 msgid "Local Folders"
 msgstr "Pastas locais"
 
-#: ../mail/mail-ops.c:1818
+#: ../mail/mail-ops.c:1822
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Buscando mensagem %s"
 
-#: ../mail/mail-ops.c:1925
+#: ../mail/mail-ops.c:1931
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Buscando %d mensagem"
 msgstr[1] "Buscando %d mensagens"
 
-#: ../mail/mail-ops.c:2010
+#: ../mail/mail-ops.c:2016
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Salvando %d mensagem"
 msgstr[1] "Salvando %d mensagens"
 
-#: ../mail/mail-ops.c:2088
+#: ../mail/mail-ops.c:2096
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15374,11 +14119,11 @@ msgstr ""
 "Erro ao salvar mensagens para: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2160
+#: ../mail/mail-ops.c:2168
 msgid "Saving attachment"
 msgstr "Salvando anexo"
 
-#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
+#: ../mail/mail-ops.c:2186 ../mail/mail-ops.c:2194
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15387,27 +14132,27 @@ msgstr ""
 "NÃ£o Ã© possÃvel criar arquivo de saÃda: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2201
+#: ../mail/mail-ops.c:2209
 #, c-format
 msgid "Could not write data: %s"
 msgstr "NÃ£o foi possÃvel escrever os dados: %s"
 
-#: ../mail/mail-ops.c:2347
+#: ../mail/mail-ops.c:2354
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: ../mail/mail-ops.c:2347
+#: ../mail/mail-ops.c:2354
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectando a %s"
 
-#: ../mail/mail-ops.c:2443
+#: ../mail/mail-ops.c:2450
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Preparando conta \"%s\" para desconexÃ£o"
 
-#: ../mail/mail-ops.c:2529
+#: ../mail/mail-ops.c:2536
 msgid "Checking Service"
 msgstr "Verificando serviÃ§o"
 
@@ -15431,43 +14176,43 @@ msgstr "Atualizando..."
 msgid "Waiting..."
 msgstr "Esperando..."
 
-#: ../mail/mail-send-recv.c:806
+#: ../mail/mail-send-recv.c:814
 #, c-format
 msgid "Checking for new mail"
 msgstr "Verificando novas mensagens"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:210
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Digite a frase secreta para %s"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:212
 msgid "Enter Passphrase"
 msgstr "Digite a frase secreta"
 
-#: ../mail/mail-session.c:217
-#: ../plugins/exchange-operations/exchange-config-listener.c:708
+#: ../mail/mail-session.c:215
+#: ../plugins/exchange-operations/exchange-config-listener.c:705
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Digite a senha para %s"
 
-#: ../mail/mail-session.c:219
+#: ../mail/mail-session.c:217
 msgid "Enter Password"
 msgstr "Digite a senha"
 
-#: ../mail/mail-session.c:261
+#: ../mail/mail-session.c:259
 msgid "User canceled operation."
 msgstr "O usuÃ¡rio cancelou a operaÃ§Ã£o."
 
-#: ../mail/mail-signature-editor.c:201
+#: ../mail/mail-signature-editor.c:202
 msgid "_Save and Close"
 msgstr "_Salvar e fechar"
 
-#: ../mail/mail-signature-editor.c:355
+#: ../mail/mail-signature-editor.c:356
 msgid "Edit Signature"
 msgstr "Editar assinatura"
 
-#: ../mail/mail-signature-editor.c:370
+#: ../mail/mail-signature-editor.c:371
 msgid "_Signature Name:"
 msgstr "Nome da a_ssinatura:"
 
@@ -15500,21 +14245,21 @@ msgstr "Pasta invÃ¡lida: \"%s\""
 msgid "Setting up Search Folder: %s"
 msgstr "Preparando pasta de pesquisa: %s"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:234
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Atualizando pastas de pesquisa para \"%s:%s\""
 
-#: ../mail/mail-vfolder.c:247
+#: ../mail/mail-vfolder.c:241
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Atualizando pastas de pesquisa para \"%s\""
 
-#: ../mail/mail-vfolder.c:1086
+#: ../mail/mail-vfolder.c:1067
 msgid "Edit Search Folder"
 msgstr "Editar pasta de pesquisa"
 
-#: ../mail/mail-vfolder.c:1175
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "Nova pasta de pesquisa"
 
@@ -16146,79 +14891,78 @@ msgstr "_Excluir permanentemente"
 msgid "_Open Messages"
 msgstr "A_brir mensagens"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "NÃ£o lida"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "Lida"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "Respondida"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Forwarded"
 msgstr "Encaminhado"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "VÃ¡rias mensagens nÃ£o lidas"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "VÃ¡rias mensagens"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "MÃnima"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "Menor"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "Maior"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "MÃ¡xima"
 
-#: ../mail/message-list.c:1656 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1654 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1663 ../plugins/itip-formatter/itip-view.c:205
-#: ../widgets/table/e-cell-date.c:70
+#: ../mail/message-list.c:1661 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Hoje %k:%M"
 
-#: ../mail/message-list.c:1672 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1670
 msgid "Yesterday %l:%M %p"
 msgstr "Ontem %k:%M"
 
-#: ../mail/message-list.c:1684 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1682
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: ../mail/message-list.c:1692 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1690
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %k:%M"
 
-#: ../mail/message-list.c:1694 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1692
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3985 ../mail/message-list.c:4450
+#: ../mail/message-list.c:3987 ../mail/message-list.c:4462
 msgid "Generating message list"
 msgstr "Gerando lista de mensagens"
 
-#: ../mail/message-list.c:4289
+#: ../mail/message-list.c:4299
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -16226,7 +14970,13 @@ msgstr ""
 "Nenhuma mensagem satisfaz o seu critÃ©rio de pesquisa. Limpe a pesquisa com o "
 "item de menu Pesquisar->Limpar ou altere-a."
 
-#: ../mail/message-list.c:4291
+#: ../mail/message-list.c:4301
+msgid ""
+"There are only hidden messages in this folder. Use View->Show Hidden "
+"Messages to show them."
+msgstr ""
+
+#: ../mail/message-list.c:4303
 msgid "There are no messages in this folder."
 msgstr "NÃ£o hÃ¡ mensagens nesta pasta."
 
@@ -16256,6 +15006,7 @@ msgstr "Mensagens enviadas"
 
 #: ../mail/message-list.etspec.h:16
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
+#: ../widgets/misc/e-attachment-tree-view.c:542
 msgid "Size"
 msgstr "Tamanho"
 
@@ -16263,39 +15014,39 @@ msgstr "Tamanho"
 msgid "Subject - Trimmed"
 msgstr "Assunto - cortado"
 
-#: ../mail/message-tag-followup.c:55
+#: ../mail/message-tag-followup.c:54
 msgid "Call"
 msgstr "Ligar"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-tag-followup.c:55
 msgid "Do Not Forward"
 msgstr "NÃ£o encaminhar"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr "Lembrete"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "For Your Information"
 msgstr "Para seu conhecimento"
 
-#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:58 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Encaminhar"
 
-#: ../mail/message-tag-followup.c:60
+#: ../mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr "NÃ£o Ã© necessÃ¡rio responder"
 
-#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:62 ../ui/evolution-mail-message.xml.h:76
 msgid "Reply"
 msgstr "Responder"
 
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:77
 msgid "Reply to All"
 msgstr "Responder a todos"
 
-#: ../mail/message-tag-followup.c:65
+#: ../mail/message-tag-followup.c:64
 msgid "Review"
 msgstr "Revisar"
 
@@ -16320,20 +15071,24 @@ msgid "Subject contains"
 msgstr "Assunto contÃ©m"
 
 #: ../mail/searchtypes.xml.h:6
+msgid "Subject or Addresses contains"
+msgstr "Assunto ou endereÃ§os contÃ©m"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Recipients contains"
 msgstr "Assunto ou destinatÃ¡rio contÃ©m"
 
-#: ../mail/searchtypes.xml.h:7
+#: ../mail/searchtypes.xml.h:8
 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 "CatÃ¡logos de endereÃ§os locais"
+msgid "Add local address books to Evolution."
+msgstr "Adicionar catÃ¡logos de endereÃ§os locais ao Evolution."
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
-msgid "Provides core functionality for local address books."
-msgstr "Fornece funcionalidades bÃ¡sicas para agendas locais."
+msgid "Local Address Books"
+msgstr "CatÃ¡logos de endereÃ§os locais"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
 msgid ""
@@ -16351,8 +15106,8 @@ msgstr ""
 "Lista de indÃcios para o plug-in de lembrete de anexo procurar no corpo da "
 "mensagem."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
-#: ../plugins/templates/templates.c:390
+#: ../plugins/attachment-reminder/attachment-reminder.c:476
+#: ../plugins/templates/templates.c:389
 msgid "Keywords"
 msgstr "Palavras-chave"
 
@@ -16362,11 +15117,8 @@ msgid "Attachment Reminder"
 msgstr "Lembrete de anexos"
 
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
-msgid ""
-"Looks for clues in a message for mention of attachments and warns if the "
-"attachment is missing"
+msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr ""
-"Verifica por indÃcios de menÃ§Ã£o de anexos e avisa se o anexo estiver faltando"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
@@ -16380,23 +15132,23 @@ msgstr ""
 msgid "Message has no attachments"
 msgstr "Mensagem nÃ£o possui anexos"
 
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Add attachment..."
+msgstr "_Adicionar anexo..."
+
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Edit Message"
 msgstr "_Editar mensagem"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-msgid ""
-"A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from Evolution."
-msgstr ""
-"Um plug-in que exibe anexos de Ã¡udio embutidos e permite que vocÃª os "
-"reproduza diretamente no Evolution."
+msgid "Audio Inline"
+msgstr "Ã?udio integrado"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Audio inline plugin"
-msgstr "Plug-in de Ã¡udio embutido"
+msgid "Play audio attachments directly from Evolution."
+msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:138
+#: ../plugins/backup-restore/backup-restore.c:139
 msgid "Select name of the Evolution backup file"
 msgstr "Selecione o nome do arquivo de backup do Evolution"
 
@@ -16419,138 +15171,139 @@ msgstr "Restaurar a partir do backup"
 #: ../plugins/backup-restore/backup-restore.c:289
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. \n"
-"It also restores all your personal settings, mail filters etc."
+"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+"settings, mail filters etc."
 msgstr ""
-"VocÃª pode restaurar o Evolution a partir do backup. VocÃª pode restaurar "
-"todas as Mensagens, Agendas, Tarefas, Memorandos, e CatÃ¡logos de EndereÃ§os.\n"
-"TambÃ©m serÃ£o restauradas suas configuraÃ§Ãµes pessoais, filtros de e-mail e "
+"VocÃª pode restaurar o Evolution a partir do seu backup. VocÃª pode restaurar "
+"todas as mensagens, calendÃ¡rios, tarefas, memorandos, e contatos. TambÃ©m "
+"serÃ£o restauradas todas as suas configuraÃ§Ãµes pessoais, filtros de e-mail, "
 "etc."
 
-#: ../plugins/backup-restore/backup-restore.c:295
+#: ../plugins/backup-restore/backup-restore.c:297
 msgid "_Restore Evolution from the backup file"
 msgstr "_Restaurar o Evolution a partir do arquivo de backup"
 
-#: ../plugins/backup-restore/backup-restore.c:302
+#: ../plugins/backup-restore/backup-restore.c:304
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Selecione o arquivo de backup do Evolution para restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:305
+#: ../plugins/backup-restore/backup-restore.c:307
 msgid "Choose a file to restore"
 msgstr "Escolher um arquivo para restaurar"
 
-#: ../plugins/backup-restore/backup.c:65
+#: ../plugins/backup-restore/backup.c:62
 msgid "Backup Evolution directory"
 msgstr "DiretÃ³rio de backup do Evolution"
 
-#: ../plugins/backup-restore/backup.c:67
+#: ../plugins/backup-restore/backup.c:64
 msgid "Restore Evolution directory"
 msgstr "Restaurar diretÃ³rio do Evolution"
 
-#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:66
 msgid "Check Evolution Backup"
 msgstr "Verificar o backup do Evolution"
 
-#: ../plugins/backup-restore/backup.c:71
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restart Evolution"
 msgstr "Reiniciar o Evolution"
 
-#: ../plugins/backup-restore/backup.c:73
+#: ../plugins/backup-restore/backup.c:70
 msgid "With Graphical User Interface"
 msgstr "Com a interface grÃ¡fica"
 
-#: ../plugins/backup-restore/backup.c:124
-#: ../plugins/backup-restore/backup.c:257
+#: ../plugins/backup-restore/backup.c:188
+#: ../plugins/backup-restore/backup.c:250
 msgid "Shutting down Evolution"
 msgstr "Desligando o Evolution"
 
-#: ../plugins/backup-restore/backup.c:131
+#: ../plugins/backup-restore/backup.c:195
 msgid "Backing Evolution accounts and settings"
 msgstr "Fazendo backup das contas e configuraÃ§Ãµes do Evolution"
 
-#: ../plugins/backup-restore/backup.c:135
+#: ../plugins/backup-restore/backup.c:201
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Fazendo backup dos dados do Evolution (Mensagens, Contatos, Agenda, Tarefas, "
 "Memorandos)"
 
-#: ../plugins/backup-restore/backup.c:146
+#: ../plugins/backup-restore/backup.c:212
 msgid "Backup complete"
 msgstr "Backup concluÃdo"
 
-#: ../plugins/backup-restore/backup.c:151
-#: ../plugins/backup-restore/backup.c:338
+#: ../plugins/backup-restore/backup.c:217
+#: ../plugins/backup-restore/backup.c:238
+#: ../plugins/backup-restore/backup.c:284
 msgid "Restarting Evolution"
 msgstr "Reiniciando o Evolution"
 
-#: ../plugins/backup-restore/backup.c:261
+#: ../plugins/backup-restore/backup.c:254
 msgid "Backup current Evolution data"
 msgstr "Fazer backup dos dados atuais do Evolution"
 
-#: ../plugins/backup-restore/backup.c:266
+#: ../plugins/backup-restore/backup.c:259
 msgid "Extracting files from backup"
 msgstr "Extraindo arquivos a partir do backup"
 
-#: ../plugins/backup-restore/backup.c:273
+#: ../plugins/backup-restore/backup.c:266
 msgid "Loading Evolution settings"
 msgstr "Carregando configuraÃ§Ãµes do Evolution"
 
-#: ../plugins/backup-restore/backup.c:277
+#: ../plugins/backup-restore/backup.c:273
 msgid "Removing temporary backup files"
 msgstr "Removendo arquivos temporÃ¡rios de backup"
 
-#: ../plugins/backup-restore/backup.c:284
+#: ../plugins/backup-restore/backup.c:280
 msgid "Ensuring local sources"
 msgstr "Assegurando fontes locais"
 
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:429
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Fazendo Backup da pasta %s"
 
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:434
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Restaurando a partir da pasta %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:478
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Backup"
 msgstr "Backup do Evolution"
 
-#: ../plugins/backup-restore/backup.c:478
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Restore"
 msgstr "Restaurador do Evolution"
 
-#: ../plugins/backup-restore/backup.c:513
+#: ../plugins/backup-restore/backup.c:489
 msgid "Backing up Evolution Data"
 msgstr "Fazendo backup dos dados do Evolution"
 
-#: ../plugins/backup-restore/backup.c:514
+#: ../plugins/backup-restore/backup.c:490
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Por favor aguarde enquanto o Evolution faz o backup dos seus dados."
 
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:492
 msgid "Restoring Evolution Data"
 msgstr "Recuperando dados do Evolution"
 
-#: ../plugins/backup-restore/backup.c:517
+#: ../plugins/backup-restore/backup.c:493
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Por favor aguarde enquanto o Evolution restaura os seus dados."
 
-#: ../plugins/backup-restore/backup.c:535
+#: ../plugins/backup-restore/backup.c:511
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 "Isto pode levar algum tempo dependendo da quantidade de dados na sua conta."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
-msgid "A plugin for backing up and restore Evolution data and settings."
-msgstr "Faz backup e restaura configuraÃ§Ãµes e dados do Evolution."
-
 #. the path to the shared library
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
+msgid "Backup and Restore"
+msgstr "Backup e restauraÃ§Ã£o"
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Backup and restore plugin"
-msgstr "Fazer backup e restaurar o plug-in"
+msgid "Backup and restore your Evolution data and settings."
+msgstr "Fazer backup e restaurar seus dados e configuraÃ§Ãµes do Evolution."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Are you sure you want to close Evolution?"
@@ -16619,78 +15372,80 @@ msgstr "ConfiguraÃ§Ãµes de r_estauraÃ§Ã£o..."
 msgid "_Backup Settings..."
 msgstr "ConfiguraÃ§Ãµes de _backup..."
 
-#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
+#: ../plugins/bbdb/bbdb.c:622 ../plugins/bbdb/bbdb.c:631
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Contatos automÃ¡ticos"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:639
-msgid "_Auto-create address book entries when replying to messages"
-msgstr ""
-"Cri_ar entradas no catÃ¡logo de endereÃ§os automaticamente ao responder "
-"mensagens"
+#: ../plugins/bbdb/bbdb.c:646
+msgid "Create _address book entries when sending mails"
+msgstr "Cri_ar entradas no catÃ¡logo de endereÃ§os ao enviar mensagens"
 
-#: ../plugins/bbdb/bbdb.c:645
+#: ../plugins/bbdb/bbdb.c:652
 msgid "Select Address book for Automatic Contacts"
 msgstr "Selecionar catÃ¡logo de endereÃ§os para contatos automÃ¡ticos"
 
-#: ../plugins/bbdb/bbdb.c:660
+#: ../plugins/bbdb/bbdb.c:667
 msgid "Instant Messaging Contacts"
 msgstr "Contatos de mensagem instantÃ¢nea"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:675
+#: ../plugins/bbdb/bbdb.c:682
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 "Sincronizar as informaÃ§Ãµes e as imagens dos contatos da lista de amigos do "
 "Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:681
+#: ../plugins/bbdb/bbdb.c:688
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Selecionar catÃ¡logo de endereÃ§os da lista de amigos do Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:692
+#: ../plugins/bbdb/bbdb.c:699
 msgid "Synchronize with _buddy list now"
 msgstr "Sincronizar com minha lista de ami_gos agora"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+msgid "BBDB"
+msgstr "BBDB"
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid ""
+"Takes the gruntwork out of managing your address book.\n"
+"\n"
 "Automatically fills your address book with names and email addresses as you "
-"reply to messages. Also fills in IM contact information from your buddy "
+"reply to messages.  Also fills in IM contact information from your buddy "
 "lists."
 msgstr ""
+"Remove o trabalho de gerenciar seu catÃ©logo de endereÃ§os.\n"
+"\n"
 "Preenche automaticamente seu catÃ¡logo de endereÃ§os com nomes e endereÃ§os de "
 "e-mail quando vocÃª responde mensagens. TambÃ©m preenche informaÃ§Ãµes de "
 "contato de mensageiros instantÃ¢neos a partir de suas listas de amigos."
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
-msgid "BBDB"
-msgstr "BBDB"
-
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:161
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Ocorreu um erro ao criar %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:186
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:183
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Processo filho de Bogofilter nÃ£o responde, matando..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:188
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Espera pelo processo filho de Bogofilter interrompida, terminando..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:211
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:208
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "O pipe para Bogofilter falhou, cÃ³digo de erro: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:374
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:371
 msgid "Convert message text to _Unicode"
 msgstr "Converter mensagem de texto para _Unicode"
 
@@ -16707,73 +15462,109 @@ msgstr ""
 "spam/ham oriundos de diferentes conjuntos de caracteres."
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-msgid "Bogofilter Options"
-msgstr "OpÃ§Ãµes do Bogofilter"
+msgid "Bogofilter Junk Filter"
+msgstr "Filtro de spam Bogofilter"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-msgid "Bogofilter junk plugin"
-msgstr "Plug-in de spam Bogofilter"
+msgid "Bogofilter Options"
+msgstr "OpÃ§Ãµes do Bogofilter"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
-msgid "Filters junk messages using Bogofilter."
-msgstr "Filtra mensagens SPAM usando Bogofilter."
+msgid "Filter junk messages using Bogofilter."
+msgstr "Filtra mensagens de spam usando o Bogofilter."
 
-#. we found the group, change the name based on the actual language
-#: ../plugins/caldav/caldav-source.c:80 ../plugins/caldav/caldav-source.c:92
+#: ../plugins/caldav/caldav-source.c:64
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:348
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/caldav/caldav-source.c:366
+#: ../plugins/calendar-http/calendar-http.c:171
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:372
-#: ../plugins/google-account-setup/google-source.c:608
-#: ../plugins/google-account-setup/google-contacts-source.c:339
+#: ../plugins/caldav/caldav-source.c:390
+#: ../plugins/google-account-setup/google-contacts-source.c:303
 msgid "Use _SSL"
 msgstr "Usar _SSL"
 
 #. add refresh option
-#: ../plugins/caldav/caldav-source.c:415
-#: ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:509
-#: ../plugins/google-account-setup/google-source.c:632
-#: ../plugins/google-account-setup/google-contacts-source.c:358
+#: ../plugins/caldav/caldav-source.c:433
+#: ../plugins/calendar-file/calendar-file.c:267
+#: ../plugins/calendar-http/calendar-http.c:308
+#: ../plugins/calendar-weather/calendar-weather.c:508
+#: ../plugins/google-account-setup/google-source.c:698
+#: ../plugins/google-account-setup/google-contacts-source.c:322
 msgid "Re_fresh:"
 msgstr "Atuali_zar:"
 
+#: ../plugins/caldav/caldav-source.c:451
+#: ../plugins/calendar-file/calendar-file.c:289
+#: ../plugins/calendar-http/calendar-http.c:326
+#: ../plugins/calendar-weather/calendar-weather.c:526
+#: ../plugins/google-account-setup/google-source.c:723
+#: ../plugins/google-account-setup/google-contacts-source.c:333
+msgid "weeks"
+msgstr "semanas"
+
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "CalDAV Calendar sources"
-msgstr "Fontes da agenda CalDAV"
+msgid "Add CalDAV support to Evolution."
+msgstr ""
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
-msgid "CalDAV sources"
-msgstr "Fontes CalDAV"
+msgid "CalDAV Support"
+msgstr "Suporte para CalDAV"
+
+#: ../plugins/calendar-file/calendar-file.c:204
+msgid "_Customize options"
+msgstr "_Personalizar opÃ§Ãµes"
+
+#: ../plugins/calendar-file/calendar-file.c:224
+msgid "File _name:"
+msgstr "_Nome do arquivo:"
+
+#: ../plugins/calendar-file/calendar-file.c:228
+msgid "Choose calendar file"
+msgstr "Escolher um arquivo de calendÃ¡rio"
+
+#: ../plugins/calendar-file/calendar-file.c:272
+msgid "On open"
+msgstr "Ao abrir"
+
+#: ../plugins/calendar-file/calendar-file.c:273
+msgid "On file change"
+msgstr ""
+
+#: ../plugins/calendar-file/calendar-file.c:274
+msgid "Periodically"
+msgstr "Periodicamente"
+
+#: ../plugins/calendar-file/calendar-file.c:301
+msgid "Force read _only"
+msgstr ""
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-msgid "Local Calendars"
-msgstr "Agendas locais"
+msgid "Add local calendars to Evolution."
+msgstr ""
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
-msgid "Provides core functionality for local calendars."
-msgstr "ProvÃª funcionalidades bÃ¡sicas para agendas locais."
+msgid "Local Calendars"
+msgstr "Agendas locais"
 
-#: ../plugins/calendar-http/calendar-http.c:332
+#: ../plugins/calendar-http/calendar-http.c:369
 msgid "_Secure connection"
 msgstr "ConexÃ£o _segura"
 
-#: ../plugins/calendar-http/calendar-http.c:397
+#: ../plugins/calendar-http/calendar-http.c:455
 msgid "Userna_me:"
 msgstr "No_me do usuÃ¡rio:"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-msgid "HTTP Calendars"
-msgstr "Agendas HTTP"
+msgid "Add web calendars to Evolution."
+msgstr ""
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
-msgid "Provides core functionality for webcal and http calendars."
-msgstr "ProvÃª funcionalidades bÃ¡sicas para agendas webcal e http."
+msgid "Web Calendars"
+msgstr "CalendÃ¡rios web"
 
 #: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
@@ -16815,37 +15606,33 @@ msgstr "Clima: trovoadas"
 msgid "Select a location"
 msgstr "Selecionar um local"
 
-#: ../plugins/calendar-weather/calendar-weather.c:615
+#: ../plugins/calendar-weather/calendar-weather.c:606
 msgid "_Units:"
 msgstr "_Unidades:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:622
+#: ../plugins/calendar-weather/calendar-weather.c:613
 msgid "Metric (Celsius, cm, etc)"
 msgstr "MÃ©trico (Celsius, cm, etc)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:623
+#: ../plugins/calendar-weather/calendar-weather.c:614
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imperial (Fahrenheit, polegadas, etc)"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
-msgid "Provides core functionality for weather calendars."
-msgstr "ProvÃª funcionalidades bÃ¡sicas para agendas de clima."
+msgid "Add weather calendars to Evolution."
+msgstr ""
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 msgid "Weather Calendars"
 msgstr "Agendas de clima"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a popup menu plugin which lets you copy "
-"things to the clipboard."
-msgstr ""
-"Um plug-in de teste que mostra um menu popup que permite que vocÃª copie "
-"coisas para a Ã¡rea de transferÃªncia."
+msgid "Copy Tool"
+msgstr "Ferramenta de cÃ³pia"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-msgid "Copy tool"
-msgstr "Ferramenta de cÃ³pia"
+msgid "Copy things to the clipboard."
+msgstr "Copia coisas para a Ã¡rea de transferÃªncia."
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
@@ -16859,12 +15646,12 @@ msgstr ""
 "padrÃ£o."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Checks whether Evolution is the default mail client on startup."
+msgid "Check whether Evolution is the default mail client on startup."
 msgstr ""
 "Verificar se o Evolution Ã© o cliente padrÃ£o de correio na inicializaÃ§Ã£o."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client "
+msgid "Default Mail Client"
 msgstr "Cliente padrÃ£o de correio "
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
@@ -16872,23 +15659,23 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "VocÃª deseja tornar o Evolution seu cliente padrÃ£o de e-mail?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:599
+#: ../shell/main.c:627
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../plugins/default-source/default-source.c:82
+#: ../plugins/default-source/default-source.c:80
 msgid "Mark as _default address book"
 msgstr "Marcar como catÃ¡logo de endereÃ§os pa_drÃ£o"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:101
 msgid "Mark as _default calendar"
 msgstr "_Marcar como calendÃ¡rio padrÃ£o"
 
-#: ../plugins/default-source/default-source.c:104
+#: ../plugins/default-source/default-source.c:102
 msgid "Mark as _default task list"
 msgstr "_Marcar como lista de tarefas padrÃ£o"
 
-#: ../plugins/default-source/default-source.c:105
+#: ../plugins/default-source/default-source.c:103
 msgid "Mark as _default memo list"
 msgstr "_Marcar como lista de memorandos padrÃ£o"
 
@@ -16897,33 +15684,30 @@ msgid "Default Sources"
 msgstr "Origens padrÃ£o"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
-msgid ""
-"Provides functionality for marking a calendar or an address book as the "
-"default one."
+msgid "Mark your preferred address book and calendar as default."
 msgstr ""
-"Fornece funcionalidade de tornar padrÃ£o uma agenda ou catÃ¡logo de endereÃ§os."
 
-#: ../plugins/email-custom-header/email-custom-header.c:334
+#: ../plugins/email-custom-header/email-custom-header.c:333
 msgid "Security:"
 msgstr "SeguranÃ§a:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:339
+#: ../plugins/email-custom-header/email-custom-header.c:338
 msgid "Unclassified"
 msgstr "Sem classificaÃ§Ã£o"
 
-#: ../plugins/email-custom-header/email-custom-header.c:340
+#: ../plugins/email-custom-header/email-custom-header.c:339
 msgid "Protected"
 msgstr "Protegido"
 
-#: ../plugins/email-custom-header/email-custom-header.c:342
+#: ../plugins/email-custom-header/email-custom-header.c:341
 msgid "Secret"
 msgstr "Secreto"
 
-#: ../plugins/email-custom-header/email-custom-header.c:343
+#: ../plugins/email-custom-header/email-custom-header.c:342
 msgid "Top secret"
 msgstr "Altamente secreto"
 
-#: ../plugins/email-custom-header/email-custom-header.c:585
+#: ../plugins/email-custom-header/email-custom-header.c:584
 msgid "_Custom Header"
 msgstr "_CabeÃ§alho personalizado"
 
@@ -16932,7 +15716,7 @@ msgid "Key"
 msgstr "Chave"
 
 #: ../plugins/email-custom-header/email-custom-header.c:917
-#: ../plugins/templates/templates.c:396
+#: ../plugins/templates/templates.c:395
 msgid "Values"
 msgstr "Valores"
 
@@ -16952,8 +15736,8 @@ msgstr "CabeÃ§alho personalizado de e-mail"
 
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
-msgid "Adds custom header to outgoing messages."
-msgstr "Adiciona cabeÃ§alho personalizado Ã s mensagens enviadas."
+msgid "Add custom headers to outgoing mail messages."
+msgstr "Adicionar cabeÃ§alhos personalizados Ã s mensagens enviadas."
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
 msgid "Custom Header"
@@ -17016,12 +15800,12 @@ msgstr ""
 "Esta opÃ§Ã£o conectarÃ¡ ao servidor Exchange usando a autenticaÃ§Ã£o padrÃ£o de "
 "senha em texto aberto."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:272
+#: ../plugins/exchange-operations/exchange-account-setup.c:271
 msgid "Out Of Office"
 msgstr "Fora do escritÃ³rio"
 
 # Ajuste para caber
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 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."
@@ -17029,90 +15813,93 @@ msgstr ""
 "A mensagem especificada abaixo serÃ¡ enviada automaticamente\n"
 "para quem enviar correio para vocÃª enquanto vocÃª estiver fora."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:291
-#: ../plugins/exchange-operations/exchange-account-setup.c:296
+#: ../plugins/exchange-operations/exchange-account-setup.c:290
+#: ../plugins/exchange-operations/exchange-account-setup.c:295
 msgid "I am out of the office"
 msgstr "Eu estou fora do escritÃ³rio"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:292
-#: ../plugins/exchange-operations/exchange-account-setup.c:295
+#: ../plugins/exchange-operations/exchange-account-setup.c:291
+#: ../plugins/exchange-operations/exchange-account-setup.c:294
 msgid "I am in the office"
 msgstr "Eu estou no escritÃ³rio"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:343
+#: ../plugins/exchange-operations/exchange-account-setup.c:340
 msgid "Change the password for Exchange account"
 msgstr "Alterar a senha para a conta do Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:345
+#: ../plugins/exchange-operations/exchange-account-setup.c:342
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Alterar senha"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:350
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Gerencia as definiÃ§Ãµes do representante para a conta do Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:352
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
 msgid "Delegation Assistant"
 msgstr "Assistente de representaÃ§Ã£o"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:364
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
 msgid "Miscelleneous"
 msgstr "Diversos"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:374
+#: ../plugins/exchange-operations/exchange-account-setup.c:371
 msgid "View the size of all Exchange folders"
 msgstr "Visualizar o tamanho de todas as pastas de Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:376
+#: ../plugins/exchange-operations/exchange-account-setup.c:373
 msgid "Folders Size"
 msgstr "Tamanho das pastas"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:383
+#: ../plugins/exchange-operations/exchange-account-setup.c:380
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "ConfiguraÃ§Ãµes do Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:730
+#: ../plugins/exchange-operations/exchange-account-setup.c:726
 msgid "_OWA URL:"
 msgstr "URL _OWA:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:756
+#: ../plugins/exchange-operations/exchange-account-setup.c:752
 msgid "A_uthenticate"
 msgstr "_Autenticar"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:777
-msgid "S_pecify the mailbox name"
-msgstr "Es_pecifique o nome da caixa de correio"
+#: ../plugins/exchange-operations/exchange-account-setup.c:774
+msgid "Mailbox name is _different than user name"
+msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:790
+#: ../plugins/exchange-operations/exchange-account-setup.c:787
 msgid "_Mailbox:"
 msgstr "Cai_xa de correio:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1005
+#: ../plugins/exchange-operations/exchange-account-setup.c:1001
 msgid "_Authentication Type"
 msgstr "_Tipo de autenticaÃ§Ã£o"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1019
-msgid "Ch_eck for Supported Types"
-msgstr "_Verificar por tipos com suporte"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1134
+#: ../plugins/exchange-operations/exchange-account-setup.c:1130
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1136
+#: ../plugins/exchange-operations/exchange-account-setup.c:1132
 #: ../plugins/exchange-operations/exchange-contacts.c:219
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
+#. FIXME: Take care of i18n
+#: ../plugins/exchange-operations/exchange-account-setup.c:1137
+#: ../plugins/exchange-operations/exchange-calendar.c:236
+#: ../plugins/exchange-operations/exchange-contacts.c:222
+msgid "Size:"
+msgstr "Tamanho:"
+
 #: ../plugins/exchange-operations/exchange-calendar.c:196
 #: ../plugins/exchange-operations/exchange-contacts.c:170
 msgid ""
@@ -17154,38 +15941,35 @@ msgstr "Nova senha:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "A sua senha atual expirou. Por favor, altere sua senha agora."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:660
+#: ../plugins/exchange-operations/exchange-config-listener.c:657
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "Sua senha vai vencer nos prÃ³ximos %d dias"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:154
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
+#: ../plugins/exchange-operations/exchange-delegates-user.c:142
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:560
 msgid "Custom"
 msgstr "Personalizar"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:184
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+#: ../plugins/exchange-operations/exchange-delegates-user.c:168
 msgid "Editor (read, create, edit)"
 msgstr "Editor (ler, criar, editar)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:188
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
+#: ../plugins/exchange-operations/exchange-delegates-user.c:172
 msgid "Author (read, create)"
 msgstr "Autor (ler, criar)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:192
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
+#: ../plugins/exchange-operations/exchange-delegates-user.c:176
 msgid "Reviewer (read-only)"
 msgstr "Revisor (somente leitura)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:242
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+#: ../plugins/exchange-operations/exchange-delegates-user.c:225
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
 msgid "Delegate Permissions"
 msgstr "PermissÃµes do representante"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:253
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
+#: ../plugins/exchange-operations/exchange-delegates-user.c:236
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, c-format
 msgid "Permissions for %s"
 msgstr "PermissÃµes para %s"
@@ -17193,7 +15977,7 @@ msgstr "PermissÃµes para %s"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:343
+#: ../plugins/exchange-operations/exchange-delegates-user.c:326
 msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
@@ -17204,85 +15988,93 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:348
+#: ../plugins/exchange-operations/exchange-delegates-user.c:331
 msgid "You have been given the following permissions on my folders:"
 msgstr "VocÃª tem as seguintes permissÃµes em minhas pastas:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:366
+#: ../plugins/exchange-operations/exchange-delegates-user.c:351
 msgid "You are also permitted to see my private items."
 msgstr "VocÃª tambÃ©m possui permissÃ£o para ver meus itens particulares."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:373
+#: ../plugins/exchange-operations/exchange-delegates-user.c:358
 msgid "However you are not permitted to see my private items."
 msgstr ""
 "Por enquanto vocÃª nÃ£o possui permissÃ£o para ver meus itens particulares."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:405
+#: ../plugins/exchange-operations/exchange-delegates-user.c:390
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "VocÃª foi designado como representante de %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:417
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To"
 msgstr "Delegar para"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:582
+#: ../plugins/exchange-operations/exchange-delegates.c:581
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "Remover o representante %s?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:700
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 msgid "Could not access Active Directory"
 msgstr "NÃ£o foi possÃvel acessar o DiretÃ³rio Ativo"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:712
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr "NÃ£o foi possÃvel localizar no DiretÃ³rio Ativo"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:725
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "NÃ£o foi possÃvel localizar o delegado %s no DiretÃ³rio Ativo"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:737
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "NÃ£o foi possÃvel remover o representante %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:797
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr "NÃ£o foi possÃvel atualizar a lista de representantes."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:815
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "NÃ£o foi possÃvel adicionar o representante %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:983
+#: ../plugins/exchange-operations/exchange-delegates.c:980
 msgid "Error reading delegates list."
 msgstr "Erro ao abrir lista de representantes."
 
 #. Translators: This is used for permissions for <user> for the folder Calendar.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
 msgid "C_alendar:"
 msgstr "_Agenda:"
 
 #. Translators: This is used for permissions for <user> for the folder Contacts.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
 msgid "Co_ntacts:"
 msgstr "Co_ntatos:"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegates"
 msgstr "Representantes"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+msgid ""
+"None\n"
+"Reviewer (read-only)\n"
+"Author (read, create)\n"
+"Editor (read, create, edit)"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Permissions for"
 msgstr "PermissÃµes para"
 
@@ -17309,6 +16101,7 @@ msgstr "_Sumarizar permissÃµes"
 
 #. Translators: This is used for permissions for <user> for the folder Tasks.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:20
+#: ../plugins/itip-formatter/itip-view.c:1912
 msgid "_Tasks:"
 msgstr "_Tarefas:"
 
@@ -17326,11 +16119,11 @@ msgid "Folder Size"
 msgstr "Tamanho da pasta"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:76
 msgid "User"
 msgstr "UsuÃ¡rio"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:321
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:309
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Assina a pasta de outro usuÃ¡rio"
@@ -17339,20 +16132,20 @@ msgstr "Assina a pasta de outro usuÃ¡rio"
 msgid "Exchange Folder Tree"
 msgstr "Ã?rvore de pastas do Exchange"
 
-#: ../plugins/exchange-operations/exchange-folder.c:67
-#: ../plugins/exchange-operations/exchange-folder.c:236
-#: ../plugins/exchange-operations/exchange-folder.c:246
+#: ../plugins/exchange-operations/exchange-folder.c:65
+#: ../plugins/exchange-operations/exchange-folder.c:233
+#: ../plugins/exchange-operations/exchange-folder.c:243
 msgid "Unsubscribe Folder..."
 msgstr "Cancelar a inscriÃ§Ã£o na pasta..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:466
-#: ../plugins/exchange-operations/exchange-folder.c:521
+#: ../plugins/exchange-operations/exchange-folder.c:463
+#: ../plugins/exchange-operations/exchange-folder.c:518
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Realmente cancelar a inscriÃ§Ã£o da pasta \"%s\"?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:478
-#: ../plugins/exchange-operations/exchange-folder.c:533
+#: ../plugins/exchange-operations/exchange-folder.c:475
+#: ../plugins/exchange-operations/exchange-folder.c:530
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Cancelar a inscriÃ§Ã£o de \"%s\""
@@ -17417,18 +16210,18 @@ msgstr "Sua senha vencerÃ¡ em 7 dias..."
 msgid "_Change Password"
 msgstr "_Alterar senha"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 msgid "(Permission denied.)"
 msgstr "(PermissÃ£o negada.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 msgid "Add User:"
 msgstr "Adicionar usuÃ¡rio:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 #: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:937
-#: ../plugins/groupwise-features/share-folder.c:716
+#: ../plugins/groupwise-features/proxy.c:932
+#: ../plugins/groupwise-features/share-folder.c:713
 msgid "Add User"
 msgstr "Adicionar usuÃ¡rio"
 
@@ -17546,11 +16339,11 @@ msgstr "_Sensitividade: "
 msgid "_User"
 msgstr "_UsuÃ¡rio"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:136
+#: ../plugins/exchange-operations/exchange-user-dialog.c:134
 msgid "Select User"
 msgstr "Selecionar usuÃ¡rio"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:174
+#: ../plugins/exchange-operations/exchange-user-dialog.c:172
 msgid "Address Book..."
 msgstr "CatÃ¡logo de endereÃ§os..."
 
@@ -17563,12 +16356,8 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "Assina a agenda outro usuÃ¡rio"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-msgid ""
-"A plugin that manages a collection of Exchange account specific operations "
-"and features."
+msgid "Activates the Evolution-Exchange extension package."
 msgstr ""
-"Um plug-in que gerencia uma coleÃ§Ã£o de operaÃ§Ãµes e recursos especÃficos para "
-"contas do Exchange."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -17718,7 +16507,7 @@ msgid "Folder offline"
 msgstr "Pasta desconectada"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
-#: ../shell/e-shell.c:1269
+#: ../shell/e-shell.c:1259
 msgid "Generic error"
 msgstr "Erro genÃ©rico"
 
@@ -17845,7 +16634,9 @@ msgid "Unknown error looking up {0}"
 msgstr "Erro desconhecido ao procurar {0}"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
-#: ../plugins/google-account-setup/google-source.c:521
+#: ../plugins/google-account-setup/google-source.c:604
+#: ../plugins/mail-to-task/mail-to-task.c:599
+#: ../plugins/mail-to-task/mail-to-task.c:821
 msgid "Unknown error."
 msgstr "Erro desconhecido."
 
@@ -17932,35 +16723,39 @@ msgid "Check folder permissions"
 msgstr "Verifica as permissÃµes da pasta"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Automatically launch editor when key is pressed in the mail composer"
+msgstr ""
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/external-editor.c:120
+msgid "Automatically launch when a new mail is edited"
+msgstr ""
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
 msgid "Default External Editor"
 msgstr "Editor externo padrÃ£o"
 
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
 msgid "The default command that must be used as the editor."
 msgstr "O comando padrÃ£o que deve ser usado como o editor."
 
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
-msgid ""
-"A plugin for using an external editor as the composer. You can send only "
-"plain-text messages."
-msgstr ""
-"Um plug-in para usar um editor externo como editor de mensagens. VocÃª sÃ³ "
-"poderÃ¡ enviar mensagens de texto."
-
-#. the path to the shared library
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
 msgid "External Editor"
 msgstr "Editor externo"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
+msgid "Use an external editor to compose plain-text mail messages."
+msgstr "Usar um editor externo para compor mensagens de texto simples."
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
 msgid "Cannot create Temporary File"
 msgstr "NÃ£o foi possÃvel criar o arquivo temporÃ¡rio"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
 msgid "Editor not launchable"
 msgstr "Editor nÃ£o lanÃ§Ã¡vel"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
 msgid ""
 "Evolution is unable to create a temporary file to save your mail. Retry "
 "later."
@@ -17968,7 +16763,17 @@ msgstr ""
 "O Evolution nÃ£o Ã© capaz de criar um arquivo temporÃ¡rio para salvar o seu e-"
 "mail. Tente novamente mais tarde."
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
+msgid "External editor still running"
+msgstr "O editor externo ainda estÃ¡ em execuÃ§Ã£o"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+msgid ""
+"The external editor is still running. The mail composer window cannot be "
+"closed as long as the editor is active."
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
 msgid ""
 "The external editor set in your plugin preferences cannot be launched. Try "
 "setting a different editor."
@@ -17976,25 +16781,22 @@ msgstr ""
 "O editor externo definido nas preferÃªncias do seu plug-in nÃ£o pode ser "
 "lanÃ§ado. Tente definir um editor diferente."
 
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in _External Editor"
-msgstr "Compor em um editor _externo"
-
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
-msgid "Compose messages using an external editor"
-msgstr "Compor mensagens usando um editor externo"
-
-#: ../plugins/external-editor/external-editor.c:114
+#: ../plugins/external-editor/external-editor.c:109
 msgid "Command to be executed to launch the editor: "
 msgstr "Comando a ser executado para lanÃ§ar o editor: "
 
-#: ../plugins/external-editor/external-editor.c:115
+#: ../plugins/external-editor/external-editor.c:110
 msgid ""
 "For Emacs use \"xemacs\"\n"
-"For VI use \"gvim\""
+"For VI use \"gvim -f\""
 msgstr ""
 "Para Emacs use \"xemacs\"\n"
-"Para VI use \"gvim\""
+"Para VI use \"gvim -f\""
+
+#: ../plugins/external-editor/external-editor.c:354
+#: ../plugins/external-editor/external-editor.c:356
+msgid "Compose in External Editor"
+msgstr "Compor no editor externo"
 
 #: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
@@ -18010,41 +16812,48 @@ msgstr "_Face"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid ""
-"Attach Face header to outgoing messages. First time the user needs to "
-"configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/"
-"faces This will be used in messages that are sent further."
+"Attach a small picture of your face to outgoing messages.\n"
+"\n"
+"First time the user needs to configure a 48x48 PNG image. It is Base-64 "
+"encoded and stored in ~/.evolution/faces. This will be used in subsequent "
+"sent messages."
 msgstr ""
-"Anexar uma imagem da face nas mensagens na caixa de saÃda. Primeiramente o "
-"usuÃ¡rio deve configurar uma imagem PNG de 48x48 pixels. Ela deve esta "
-"codificada na base64 e armazenada na pasta ~/.evolution/faces Esta opÃ§Ã£o "
-"serÃ¡ usada em todas mensagens enviadas a partir de agora."
+"Anexar uma pequena imagem da  sua face nas mensagens enviadas.\n"
+"\n"
+"Primeiramente o usuÃ¡rio deve configurar uma imagem PNG de 48x48 pixels. Ela "
+"deve estar codificada na Base-64 e armazenada na pasta ~/.evolution/faces "
+"Isto serÃ¡ usado em todas subsequentes mensagens enviadas."
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:53
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Cancelando a inscriÃ§Ã£o da pasta \"%s\""
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Allows unsubscribing of mail folders in the side bar context menu."
-msgstr ""
-"Permitir o cancelamento de inscriÃ§Ã£o de pastas de mensagens no menu de "
-"contexto da barra lateral."
-
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
 msgstr "Cancelar a inscriÃ§Ã£o em pastas"
 
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
+msgid ""
+"Unsubscribe from an IMAP folder by right-clicking on it in the folder tree."
+msgstr ""
+
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
 msgstr "_Cancelar a inscriÃ§Ã£o"
 
-#: ../plugins/google-account-setup/google-source.c:421
+#: ../plugins/google-account-setup/google-source.c:81
+#: ../plugins/google-account-setup/google-contacts-source.c:51
+msgid "Google"
+msgstr "Google"
+
+#: ../plugins/google-account-setup/google-source.c:499
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr ""
 "Digite a senha do usuÃ¡rio %s para acessar a lista de agendas assinadas."
 
-#: ../plugins/google-account-setup/google-source.c:521
+#: ../plugins/google-account-setup/google-source.c:604
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -18053,45 +16862,40 @@ msgstr ""
 "NÃ£o foi possÃvel ler dados do servidor Google.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:683
+#: ../plugins/google-account-setup/google-source.c:739
 msgid "Cal_endar:"
 msgstr "Agen_da:"
 
-#: ../plugins/google-account-setup/google-source.c:718
+#: ../plugins/google-account-setup/google-source.c:774
 msgid "Retrieve _list"
 msgstr "Recuperar _lista"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:69
-#: ../plugins/google-account-setup/google-contacts-source.c:71
-msgid "Google"
-msgstr "Google"
-
-#: ../plugins/google-account-setup/google-contacts-source.c:306
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:325
+#: ../plugins/google-account-setup/google-contacts-source.c:270
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
 msgid "<b>Server</b>"
 msgstr "<b>Servidor</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup Google Calendar and Contacts."
-msgstr "Um plug-in para configurar a agenda e os contatos do Google."
+msgid "Add Google Calendars to Evolution."
+msgstr ""
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
-msgid "Google sources"
-msgstr "Fontes do Google"
+msgid "Google Calendars"
+msgstr "CalendÃ¡rios Google"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:450
 msgid "Checklist"
 msgstr "Lista de tarefas"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup GroupWise calendar and contacts sources."
-msgstr "Um plug-in que configura agenda e contatos do GroupWise."
+msgid "Add Novell GroupWise support to Evolution."
+msgstr ""
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
 msgid "GroupWise Account Setup"
 msgstr "ConfiguraÃ§Ã£o da conta GroupWise"
 
-#: ../plugins/groupwise-features/install-shared.c:220
+#: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -18116,11 +16920,11 @@ msgstr ""
 "Clique em \"Encaminhar\" para instalar a pasta compartilhada\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:224
 msgid "Install the shared folder"
 msgstr "Renomear a pasta partilhada"
 
-#: ../plugins/groupwise-features/install-shared.c:227
+#: ../plugins/groupwise-features/install-shared.c:226
 msgid "Shared Folder Installation"
 msgstr "InstalaÃ§Ã£o de pasta compartilhada"
 
@@ -18158,11 +16962,11 @@ msgstr "_Habilitar"
 msgid "_Junk List"
 msgstr "Lista de spa_ms"
 
-#: ../plugins/groupwise-features/mail-retract.c:53
+#: ../plugins/groupwise-features/mail-retract.c:52
 msgid "Message Retract"
 msgstr "Cancelar envio"
 
-#: ../plugins/groupwise-features/mail-retract.c:58
+#: ../plugins/groupwise-features/mail-retract.c:57
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this ?"
@@ -18170,11 +16974,11 @@ msgstr ""
 "Cancelar o envio de uma mensagem pode removÃª-la da caixa de correio do "
 "destinatÃ¡rio. VocÃª tem certeza que quer fazer isso?"
 
-#: ../plugins/groupwise-features/mail-retract.c:77
+#: ../plugins/groupwise-features/mail-retract.c:76
 msgid "Message retracted successfully"
 msgstr "Envio cancelado com sucesso"
 
-#: ../plugins/groupwise-features/mail-retract.c:87
+#: ../plugins/groupwise-features/mail-retract.c:86
 msgid "Retract Mail"
 msgstr "Cancelar envio"
 
@@ -18183,94 +16987,124 @@ msgid "Add Send Options to GroupWise messages"
 msgstr "Adicionar opÃ§Ãµes de envio para mensagens GroupWise"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in GroupWise accounts."
-msgstr "Um plug-in para os recursos das contas GroupWise."
+msgid "Fine-tune your GroupWise accounts."
+msgstr "Ajustar suas contas GroupWise."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 msgid "GroupWise Features"
 msgstr "Recursos do GroupWise"
 
-#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:1
 msgid "Message retract failed"
 msgstr "Falha ao retirar a mensagem"
 
-#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:2
 msgid "The server did not allow the selected message to be retracted."
 msgstr "O servidor nÃ£o permitiu que a mensagem selecionada fosse retirada."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr ""
+"A conta &quot;{0}&quot; jÃ¡ existe. Por favor verifique a sua Ã¡rvore de "
+"pastas."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
+msgid "Account Already Exists"
+msgstr "A conta jÃ¡ existe"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
 msgid "Invalid user"
 msgstr "UsuÃ¡rio invÃ¡lido"
 
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr ""
+"O login de representante como &quot;{0}&quot; nÃ£o foi bem-sucedido. Por "
+"favor verifique o seu endereÃ§o de e-mail e teste novamente."
+
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr ""
 "NÃ£o Ã© possÃvel conceder acesso de representante ao usuÃ¡rio &quot;{0}&quot;."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2
 msgid "Specify User"
 msgstr "Especificar usuÃ¡rio"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:6
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:6
 msgid "You have already given proxy permissions to this user."
 msgstr "VocÃª jÃ¡ concedeu as permissÃµes de representante a este usuÃ¡rio."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:8
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr ""
 "VocÃª tem que especificar um nome de usuÃ¡rio vÃ¡lido para conceder direitos de "
 "representante."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
-msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr ""
-"A conta &quot;{0}&quot; jÃ¡ existe. Por favor verifique a sua Ã¡rvore de "
-"pastas."
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+msgstr "VocÃª nÃ£o pode compartilhar pasta com o usuÃ¡rio &quot;{0}&quot;"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
-msgid "Account Already Exists"
-msgstr "A conta jÃ¡ existe"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
+msgid "You have to specify a user name which you want to add to the list"
+msgstr "VocÃª tem que especificar um nome de usuÃ¡rio que quer adicionar Ã  lista"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
-msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
-"address and try again."
-msgstr ""
-"O login de representante como &quot;{0}&quot; nÃ£o foi bem-sucedido. Por "
-"favor verifique o seu endereÃ§o de e-mail e teste novamente."
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
+msgid "Do you want to resend the meeting ?"
+msgstr "VocÃª deseja enviar esta reuniÃ£o novamente?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
+msgid "Do you want to resend the recurring meeting ?"
+msgstr "VocÃª deseja enviar esta reuniÃ£o recorrÃªnte novamente?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
+msgid "Do you want to retract the original item ?"
+msgstr "VocÃª cancelar o item original?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
+msgid "The original will be removed from the recipient's mailbox."
+msgstr "O original serÃ¡ removido da caixa de correio do destinatÃ¡rio."
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:5
 msgid "This is a recurring meeting"
 msgstr "Este Ã© um evento recorrente"
 
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
+msgid "This will create a new meeting using the existing meeting details."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
+msgid ""
+"This will create a new meeting with the existing meeting details. The "
+"recurrence rule needs to be re-entered."
+msgstr ""
+
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
 msgid "Would you like to accept it?"
 msgstr "VocÃª gostaria de aceitÃ¡-la?"
 
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:11
 msgid "Would you like to decline it?"
 msgstr "VocÃª gostaria de recusÃ¡-la?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
-msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
-msgstr "VocÃª nÃ£o pode compartilhar pasta com o usuÃ¡rio &quot;{0}&quot;"
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
-msgid "You have to specify a user name which you want to add to the list"
-msgstr "VocÃª tem que especificar um nome de usuÃ¡rio que quer adicionar Ã  lista"
-
-#: ../plugins/groupwise-features/process-meeting.c:52
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Accept Tentatively"
 msgstr "Aceitar peliminarmente"
 
+#: ../plugins/groupwise-features/process-meeting.c:319
+msgid "Rese_nd Meeting..."
+msgstr "E_nviar novamente reuniÃ£o..."
+
 #: ../plugins/groupwise-features/properties.glade.h:1
 msgid "<b>Users:</b>"
 msgstr "<b>UsuÃ¡rios:</b>"
@@ -18284,7 +17118,7 @@ msgid "Con_tacts..."
 msgstr "Con_tatos..."
 
 #: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:516
+#: ../widgets/table/e-table-click-to-add.c:514
 msgid "Message"
 msgstr "Mensagem"
 
@@ -18367,10 +17201,10 @@ msgstr "<b>Nome da conta</b>"
 msgid "Proxy Login"
 msgstr "Login de representante"
 
-#: ../plugins/groupwise-features/proxy-login.c:206
-#: ../plugins/groupwise-features/proxy-login.c:248
-#: ../plugins/groupwise-features/proxy.c:491
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:207
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:488
+#: ../plugins/groupwise-features/send-options.c:86
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sDigite a senha para %s (usuÃ¡rio %s)"
@@ -18378,19 +17212,19 @@ msgstr "%sDigite a senha para %s (usuÃ¡rio %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:510
+#: ../plugins/groupwise-features/proxy-login.c:512
 msgid "_Proxy Login..."
 msgstr "Login de _representante..."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:692
+#: ../plugins/groupwise-features/proxy.c:689
 msgid "The Proxy tab will be available only when the account is online."
 msgstr ""
 "A aba Representante estarÃ¡ disponÃvel somente quando a conta estiver "
 "conectada."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:695
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 "A aba Representante estarÃ¡ disponÃvel somente quando a conta estiver "
@@ -18400,101 +17234,101 @@ msgstr ""
 msgid "Advanced send options"
 msgstr "OpÃ§Ãµes avanÃ§adas de envio"
 
-#: ../plugins/groupwise-features/share-folder-common.c:321
-#: ../plugins/groupwise-features/share-folder.c:751
+#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder.c:748
 msgid "Users"
 msgstr "UsuÃ¡rios"
 
-#: ../plugins/groupwise-features/share-folder-common.c:322
+#: ../plugins/groupwise-features/share-folder-common.c:321
 msgid "Enter the users and set permissions"
 msgstr "Digite os usuÃ¡rios e defina as permissÃµes"
 
-#: ../plugins/groupwise-features/share-folder-common.c:341
+#: ../plugins/groupwise-features/share-folder-common.c:340
 msgid "New _Shared Folder..."
 msgstr "_Nova pasta compartilhada..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:449
+#: ../plugins/groupwise-features/share-folder-common.c:447
 msgid "Sharing"
 msgstr "Compartilhamento"
 
-#: ../plugins/groupwise-features/share-folder.c:534
+#: ../plugins/groupwise-features/share-folder.c:531
 msgid "Custom Notification"
 msgstr "NotificaÃ§Ã£o personalizada"
 
-#: ../plugins/groupwise-features/share-folder.c:756
+#: ../plugins/groupwise-features/share-folder.c:753
 msgid "Add   "
 msgstr "Adicionar   "
 
-#: ../plugins/groupwise-features/share-folder.c:762
+#: ../plugins/groupwise-features/share-folder.c:759
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../plugins/groupwise-features/status-track.c:97
+#: ../plugins/groupwise-features/status-track.c:94
 msgid "Message Status"
 msgstr "Status da mensagem"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:111
+#: ../plugins/groupwise-features/status-track.c:108
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: ../plugins/groupwise-features/status-track.c:125
+#: ../plugins/groupwise-features/status-track.c:122
 msgid "From:"
 msgstr "De:"
 
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Creation date:"
 msgstr "Data de criaÃ§Ã£o:"
 
-#: ../plugins/groupwise-features/status-track.c:179
+#: ../plugins/groupwise-features/status-track.c:176
 msgid "Recipient: "
 msgstr "DestinatÃ¡rio: "
 
-#: ../plugins/groupwise-features/status-track.c:186
+#: ../plugins/groupwise-features/status-track.c:183
 msgid "Delivered: "
 msgstr "Entregue: "
 
-#: ../plugins/groupwise-features/status-track.c:192
+#: ../plugins/groupwise-features/status-track.c:189
 msgid "Opened: "
 msgstr "Aberto: "
 
-#: ../plugins/groupwise-features/status-track.c:197
+#: ../plugins/groupwise-features/status-track.c:194
 msgid "Accepted: "
 msgstr "Aceito: "
 
-#: ../plugins/groupwise-features/status-track.c:202
+#: ../plugins/groupwise-features/status-track.c:199
 msgid "Deleted: "
 msgstr "ExcluÃda: "
 
-#: ../plugins/groupwise-features/status-track.c:207
+#: ../plugins/groupwise-features/status-track.c:204
 msgid "Declined: "
 msgstr "Recusado: "
 
-#: ../plugins/groupwise-features/status-track.c:212
+#: ../plugins/groupwise-features/status-track.c:209
 msgid "Completed: "
 msgstr "Completada: "
 
-#: ../plugins/groupwise-features/status-track.c:217
+#: ../plugins/groupwise-features/status-track.c:214
 msgid "Undelivered: "
 msgstr "NÃ£o entregue: "
 
-#: ../plugins/groupwise-features/status-track.c:241
+#: ../plugins/groupwise-features/status-track.c:238
 msgid "Track Message Status..."
 msgstr "Rastrear status da mensagem..."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "A plugin to setup hula calendar sources."
-msgstr "Um plug-in que configura fontes de agendas hula."
+msgid "Add Hula support to Evolution."
+msgstr ""
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Account Setup"
-msgstr "ConfiguraÃ§Ãµes de conta Hula"
+msgid "Hula Support"
+msgstr ""
 
-#: ../plugins/imap-features/imap-headers.c:320
+#: ../plugins/imap-features/imap-headers.c:332
 msgid "Custom Headers"
 msgstr "CabeÃ§alhos personalizados"
 
-#: ../plugins/imap-features/imap-headers.c:333
+#: ../plugins/imap-features/imap-headers.c:345
 msgid "IMAP Headers"
 msgstr "CabeÃ§alhos IMAP"
 
@@ -18511,10 +17345,6 @@ msgid "Basic and _Mailing List Headers (Default)"
 msgstr "CabeÃ§alhos bÃ¡sicos e de lista de discussÃ£o (PadrÃ£o)"
 
 #: ../plugins/imap-features/imap-headers.glade.h:4
-msgid "Fetch A_ll Headers"
-msgstr "Obtendo todos os c_abeÃ§alhos"
-
-#: ../plugins/imap-features/imap-headers.glade.h:5
 msgid ""
 "Give the extra headers that you need to fetch in addition to the above "
 "standard headers. \n"
@@ -18524,7 +17354,7 @@ msgstr ""
 "acima. \n"
 "VocÃª pode ignorar isso se escolher \"Todos os CabeÃ§alhos\"."
 
-#: ../plugins/imap-features/imap-headers.glade.h:7
+#: ../plugins/imap-features/imap-headers.glade.h:6
 msgid ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
@@ -18533,7 +17363,7 @@ msgstr ""
 "Quanto mais cabeÃ§alhos vocÃª escolher, mais tempo demorarÃ¡ para baixar as "
 "mensagens."
 
-#: ../plugins/imap-features/imap-headers.glade.h:9
+#: ../plugins/imap-features/imap-headers.glade.h:8
 msgid ""
 "_Basic Headers - (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
@@ -18541,53 +17371,23 @@ msgstr ""
 "_CabeÃ§alhos BÃ¡sicos (Mais RÃ¡pido)\n"
 "Use isso se vocÃª nÃ£o tem filtros baseados em listas de discussÃ£o"
 
+#: ../plugins/imap-features/imap-headers.glade.h:10
+msgid "_Fetch All Headers"
+msgstr "Obter todos os c_abeÃ§alhos"
+
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
-msgid "A plugin for the features in the IMAP accounts."
-msgstr "Um plug-in para os recursos das contas IMAP."
+msgid "Fine-tune your IMAP accounts."
+msgstr ""
 
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
 msgid "IMAP Features"
 msgstr "Funcionalidade do IMAP"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:78
-msgid "_Import to Calendar"
-msgstr "_Importar para agenda"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:83
-msgid "_Import to Tasks"
-msgstr "_Importar para tarefas"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:201
-msgid "Import ICS"
-msgstr "Importar ICS"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:224
-msgid "Select Task List"
-msgstr "Selecionar lista de tarefas"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:228
-msgid "Select Calendar"
-msgstr "Selecionar agenda"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:260
-#: ../shell/e-shell-importer.c:696
-msgid "_Import"
-msgstr "_Importar"
-
-#. the path to the shared library
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
-msgid "Import to Calendar"
-msgstr "Importar para agenda"
-
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
-msgid "Imports ICS attachments to calendar."
-msgstr "Importar anexos ICS para o calendÃ¡rio."
-
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:49
 msgid "Hardware Abstraction Layer not loaded"
 msgstr "Camada de AbstraÃ§Ã£o de Hardware nÃ£o foi carregada"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:52
 msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
@@ -18596,7 +17396,7 @@ msgstr ""
 "favor, habilite o serviÃ§o e execute este programa novamente, ou entre em "
 "contato com seu administrador de sistemas."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:81
 msgid "Search for an iPod failed"
 msgstr "Procura por iPod falhou"
 
@@ -18614,162 +17414,163 @@ 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/memo/calendar/address book with Apple iPod"
-msgstr ""
-"Sincroniza a tarefa/memorando/agenda/catÃ¡logo de endereÃ§os selecionado com o "
-"iPod da Apple"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
 msgstr "Sincronizar para iPod"
 
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
+msgid "Synchronize your data with your Apple iPod."
+msgstr "Sincronizar seus dados com o seu iPod da Apple."
+
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
 msgid "iPod Synchronization"
 msgstr "SincronizaÃ§Ã£o de iPod"
 
-#: ../plugins/itip-formatter/itip-formatter.c:481
-#: ../plugins/itip-formatter/itip-formatter.c:606
+#: ../plugins/itip-formatter/itip-formatter.c:482
+#: ../plugins/itip-formatter/itip-formatter.c:607
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "NÃ£o Ã© possÃvel abrir a agenda \"%s\""
 
-#: ../plugins/itip-formatter/itip-formatter.c:626
+#: ../plugins/itip-formatter/itip-formatter.c:627
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Um compromisso na agenda \"%s\" estÃ¡ em conflito com esta reuniÃ£o"
 
-#: ../plugins/itip-formatter/itip-formatter.c:662
+#: ../plugins/itip-formatter/itip-formatter.c:663
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Localizado o compromisso na agenda \"%s\""
 
-#: ../plugins/itip-formatter/itip-formatter.c:752
+#: ../plugins/itip-formatter/itip-formatter.c:753
 msgid "Unable to find any calendars"
 msgstr "NÃ£o Ã© possÃvel localizar nenhuma agenda"
 
-#: ../plugins/itip-formatter/itip-formatter.c:759
+#: ../plugins/itip-formatter/itip-formatter.c:760
 msgid "Unable to find this meeting in any calendar"
 msgstr "NÃ£o Ã© possÃvel encontrar esta reuniÃ£o em nenhuma agenda"
 
-#: ../plugins/itip-formatter/itip-formatter.c:763
+#: ../plugins/itip-formatter/itip-formatter.c:764
 msgid "Unable to find this task in any task list"
 msgstr "NÃ£o Ã© possÃvel localizar esta tarefa em nenhuma lista de tarefas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:767
+#: ../plugins/itip-formatter/itip-formatter.c:768
 msgid "Unable to find this memo in any memo list"
 msgstr ""
 "NÃ£o foi possÃvel localizar este memorando em nenhuma lista de memorandos"
 
-#: ../plugins/itip-formatter/itip-formatter.c:838
+#: ../plugins/itip-formatter/itip-formatter.c:839
+msgid "Opening the calendar. Please wait.."
+msgstr "Abrindo o calendÃ¡rio. Favor aguardar..."
+
+#: ../plugins/itip-formatter/itip-formatter.c:842
 msgid "Searching for an existing version of this appointment"
 msgstr "Pesquisando por uma versÃ£o existente deste compromisso"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 msgid "Unable to parse item"
 msgstr "NÃ£o foi possÃvel analisar item"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1107
+#: ../plugins/itip-formatter/itip-formatter.c:1111
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "NÃ£o foi possÃvel enviar item para a agenda \"%s\". %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1119
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Enviado para agenda \"%s\" como aceito"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1127
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviado para a agenda \"%s\" como tentativa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1128
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviado para a agenda \"%s\" como recusado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1137
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Enviado para a agenda \"%s\" como cancelado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1227
+#: ../plugins/itip-formatter/itip-formatter.c:1231
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "O organizador removeu o representante %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1234
+#: ../plugins/itip-formatter/itip-formatter.c:1238
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Enviar uma notificaÃ§Ã£o de cancelamento para o representante"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1236
+#: ../plugins/itip-formatter/itip-formatter.c:1240
 msgid "Could not send the cancelation notice to the delegate"
 msgstr ""
 "NÃ£o foi possÃvel enviar a notificaÃ§Ã£o de cancelamento para o representante"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1342
+#: ../plugins/itip-formatter/itip-formatter.c:1348
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "NÃ£o foi possÃvel atualizar o status do participante porque o status Ã© "
 "invÃ¡lido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1371
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "NÃ£o Ã© possÃvel atualizar participante. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1381
 msgid "Attendee status updated"
 msgstr "Status do participante atualizado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1401
+#: ../plugins/itip-formatter/itip-formatter.c:1407
 msgid "Meeting information sent"
 msgstr "InformaÃ§Ã£o de reuniÃ£o enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1404
+#: ../plugins/itip-formatter/itip-formatter.c:1410
 msgid "Task information sent"
 msgstr "InformaÃ§Ã£o de tarefa enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1413
 msgid "Memo information sent"
 msgstr "InformaÃ§Ã£o do memorando enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1416
+#: ../plugins/itip-formatter/itip-formatter.c:1422
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "NÃ£o pode enviar a informaÃ§Ã£o de reuniÃ£o, essa reuniÃ£o nÃ£o existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1419
+#: ../plugins/itip-formatter/itip-formatter.c:1425
 msgid "Unable to send task information, the task does not exist"
 msgstr "NÃ£o foi possÃvel enviar esta tarefa, a tarefa nÃ£o existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1422
+#: ../plugins/itip-formatter/itip-formatter.c:1428
 msgid "Unable to send memo information, the memo does not exist"
 msgstr ""
 "NÃ£o foi possÃvel enviar a informaÃ§Ã£o do memorando, esse memorando nÃ£o existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1491
-#: ../plugins/itip-formatter/itip-formatter.c:1502
+#: ../plugins/itip-formatter/itip-formatter.c:1496
+#: ../plugins/itip-formatter/itip-formatter.c:1507
 msgid "The calendar attached is not valid"
 msgstr "A agenda anexada nÃ£o Ã© vÃ¡lida"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1492
-#: ../plugins/itip-formatter/itip-formatter.c:1503
+#: ../plugins/itip-formatter/itip-formatter.c:1497
+#: ../plugins/itip-formatter/itip-formatter.c:1508
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr ""
 "A mensagem diz conter uma agenda, mas a agenda nÃ£o Ã© um iCalendar vÃ¡lido."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1543
-#: ../plugins/itip-formatter/itip-formatter.c:1571
-#: ../plugins/itip-formatter/itip-formatter.c:1663
+#: ../plugins/itip-formatter/itip-formatter.c:1548
+#: ../plugins/itip-formatter/itip-formatter.c:1576
+#: ../plugins/itip-formatter/itip-formatter.c:1668
 msgid "The item in the calendar is not valid"
 msgstr "O item na agenda nÃ£o Ã© vÃ¡lido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1544
-#: ../plugins/itip-formatter/itip-formatter.c:1572
-#: ../plugins/itip-formatter/itip-formatter.c:1664
+#: ../plugins/itip-formatter/itip-formatter.c:1549
+#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../plugins/itip-formatter/itip-formatter.c:1669
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18777,11 +17578,11 @@ msgstr ""
 "A mensagem contÃ©m uma agenda, mas a agenda nÃ£o contÃ©m eventos, tarefas ou "
 "informaÃ§Ã£o de disponibilidade"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1583
+#: ../plugins/itip-formatter/itip-formatter.c:1588
 msgid "The calendar attached contains multiple items"
 msgstr "A agenda anexa contÃ©m mÃºltiplos itens"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1584
+#: ../plugins/itip-formatter/itip-formatter.c:1589
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18789,40 +17590,34 @@ msgstr ""
 "Para processar todos estes itens, o arquivo deve ser salvo e a agenda "
 "importada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2306
+#: ../plugins/itip-formatter/itip-formatter.c:2335
 msgid "This meeting recurs"
 msgstr "Esta reuniÃ£o se repete"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2309
+#: ../plugins/itip-formatter/itip-formatter.c:2338
 msgid "This task recurs"
 msgstr "Esta tarefa se repete"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2312
+#: ../plugins/itip-formatter/itip-formatter.c:2341
 msgid "This memo recurs"
 msgstr "Este memorando se repete"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2548
+#: ../plugins/itip-formatter/itip-formatter.c:2574
 msgid "_Delete message after acting"
 msgstr "E_xcluir mensagem depois da aÃ§Ã£o"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2558
-#: ../plugins/itip-formatter/itip-formatter.c:2590
+#: ../plugins/itip-formatter/itip-formatter.c:2584
+#: ../plugins/itip-formatter/itip-formatter.c:2617
 msgid "Conflict Search"
 msgstr "Pesquisa de conflitos"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2573
+#: ../plugins/itip-formatter/itip-formatter.c:2599
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Selecione a agenda para pesquisar por conflitos de reuniÃ£o"
 
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:191 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:297
-msgid "Today"
-msgstr "Hoje"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:196
@@ -18841,11 +17636,6 @@ msgstr "Hoje %H:%M:%S"
 msgid "Today %l:%M:%S %p"
 msgstr "Hoje %l:%M:%S"
 
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:219
-msgid "Tomorrow"
-msgstr "AmanhÃ£"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:224
@@ -19193,110 +17983,107 @@ msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> cancelou a seguinte tarefa compartilhada"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:823
 msgid "_Open Calendar"
 msgstr "_Abrir agenda"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
-msgid "_Decline"
-msgstr "_Recusar"
-
-#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:829
 #: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:839
 #: ../plugins/itip-formatter/itip-view.c:856
 #: ../plugins/itip-formatter/itip-view.c:861
+msgid "_Decline"
+msgstr "_Recusar"
+
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:863
 msgid "_Accept"
 msgstr "A_ceitar"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:833
 msgid "_Decline all"
 msgstr "_Recusar tudo"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:834
 msgid "_Tentative all"
 msgstr "Tudo _preliminar"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:862
 msgid "_Tentative"
 msgstr "_Preliminar"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:835
 msgid "_Accept all"
 msgstr "_Aceitar tudo"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:846
 msgid "_Send Information"
 msgstr "_Enviar informaÃ§Ã£o"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Update Attendee Status"
 msgstr "_Atualizar status do participante"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Update"
 msgstr "_Atualizar"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:1033
 msgid "Start time:"
 msgstr "Hora de inÃcio:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1042
+#: ../plugins/itip-formatter/itip-view.c:1044
 msgid "End time:"
 msgstr "Hora de tÃ©rmino:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1062
-#: ../plugins/itip-formatter/itip-view.c:1116
+#: ../plugins/itip-formatter/itip-view.c:1064
+#: ../plugins/itip-formatter/itip-view.c:1118
 msgid "Comment:"
 msgstr "ComentÃ¡rio:"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1103
 msgid "Send _reply to sender"
 msgstr "_Responder ao remetente"
 
-#: ../plugins/itip-formatter/itip-view.c:1131
+#: ../plugins/itip-formatter/itip-view.c:1133
 msgid "Send _updates to attendees"
 msgstr "Enviar atuali_zaÃ§Ãµes aos participantes"
 
-#: ../plugins/itip-formatter/itip-view.c:1140
+#: ../plugins/itip-formatter/itip-view.c:1142
 msgid "_Apply to all instances"
 msgstr "_Aplicar a todas as instÃ¢ncias"
 
-#: ../plugins/itip-formatter/itip-view.c:1149
+#: ../plugins/itip-formatter/itip-view.c:1151
 msgid "Show time as _free"
 msgstr "Exi_bir hora como livre"
 
-#: ../plugins/itip-formatter/itip-view.c:1152
+#: ../plugins/itip-formatter/itip-view.c:1154
 msgid "_Preserve my reminder"
 msgstr "_Preservar meu lembrete"
 
-#: ../plugins/itip-formatter/itip-view.c:1157
+#. To Translators: This is a check box to inherit a reminder.
+#: ../plugins/itip-formatter/itip-view.c:1160
 msgid "_Inherit reminder"
 msgstr "_Herdar lembretes"
 
-#: ../plugins/itip-formatter/itip-view.c:1911
-msgid "_Tasks :"
-msgstr "_Tarefas :"
-
-#: ../plugins/itip-formatter/itip-view.c:1913
-msgid "Memos :"
-msgstr "Memorandos :"
+#: ../plugins/itip-formatter/itip-view.c:1914
+msgid "_Memos:"
+msgstr "_Memorandos:"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Displays text/calendar parts in messages."
-msgstr "Exibe partes de texto/agenda nas mensagens."
+msgid "Display \"text/calendar\" MIME parts in mail messages."
+msgstr "Exibe partes de MIME \"text/calendar\"  nas mensagens."
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Itip Formatter"
@@ -19325,13 +18112,13 @@ msgid "Proxy _Logout"
 msgstr "_Logout de representante"
 
 #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
-msgid "Allows disabling of accounts."
-msgstr "Permitir desabilitaÃ§Ã£o de contas."
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
 msgid "Disable Account"
 msgstr "Desabilitar conta"
 
+#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
+msgid "Disable an account by right-clicking on it in the folder tree."
+msgstr ""
+
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
 msgstr "Tocar um bip ou arquivo de som."
@@ -19404,20 +18191,20 @@ msgstr "O Ãcone deve piscar."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Para notificar novas mensagens apenas na caixa de entrada."
 
-#: ../plugins/mail-notification/mail-notification.c:256
+#: ../plugins/mail-notification/mail-notification.c:245
 msgid "Generate a _D-Bus message"
 msgstr "Gerar uma mensagem _D-Bus"
 
-#: ../plugins/mail-notification/mail-notification.c:379
+#: ../plugins/mail-notification/mail-notification.c:368
 msgid "Evolution's Mail Notification"
 msgstr "NotificaÃ§Ã£o de e-mail do Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:400
+#: ../plugins/mail-notification/mail-notification.c:389
 msgid "Mail Notification Properties"
 msgstr "Propriedades da notificaÃ§Ã£o de e-mail"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:498
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -19432,93 +18219,162 @@ msgstr[1] ""
 "VocÃª recebeu %d novas mensagens\n"
 "em %s."
 
-#: ../plugins/mail-notification/mail-notification.c:484
+#: ../plugins/mail-notification/mail-notification.c:503
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "VocÃª recebeu %d nova mensagem."
 msgstr[1] "VocÃª recebeu %d novas mensagens."
 
-#: ../plugins/mail-notification/mail-notification.c:501
-#: ../plugins/mail-notification/mail-notification.c:506
+#: ../plugins/mail-notification/mail-notification.c:520
+#: ../plugins/mail-notification/mail-notification.c:525
 msgid "New email"
 msgstr "Novo e-mail"
 
-#: ../plugins/mail-notification/mail-notification.c:566
+#: ../plugins/mail-notification/mail-notification.c:588
 msgid "Show icon in _notification area"
 msgstr "Mostrar Ãcone na Ã¡rea de _notificaÃ§Ã£o"
 
-#: ../plugins/mail-notification/mail-notification.c:569
+#: ../plugins/mail-notification/mail-notification.c:591
 msgid "B_link icon in notification area"
 msgstr "_Piscar Ãcone na Ã¡rea de notificaÃ§Ã£o"
 
-#: ../plugins/mail-notification/mail-notification.c:571
+#: ../plugins/mail-notification/mail-notification.c:593
 msgid "Popup _message together with the icon"
 msgstr "_Mensagem flutuante junto com o Ãcone"
 
-#: ../plugins/mail-notification/mail-notification.c:752
+#: ../plugins/mail-notification/mail-notification.c:774
 msgid "_Play sound when new messages arrive"
 msgstr "Tocar um arquivo de som quando uma nova mensa_gem chegar"
 
-#: ../plugins/mail-notification/mail-notification.c:758
+#: ../plugins/mail-notification/mail-notification.c:780
 msgid "_Beep"
 msgstr "_Bip"
 
-#: ../plugins/mail-notification/mail-notification.c:759
+#: ../plugins/mail-notification/mail-notification.c:781
 msgid "Play _sound file"
 msgstr "Tocar arquivo de _som"
 
-#: ../plugins/mail-notification/mail-notification.c:770
+#: ../plugins/mail-notification/mail-notification.c:792
 msgid "Specify _filename:"
 msgstr "Nome do _arquivo:"
 
-#: ../plugins/mail-notification/mail-notification.c:771
+#: ../plugins/mail-notification/mail-notification.c:793
 msgid "Select sound file"
 msgstr "Selecionar um arquivo de som"
 
-#: ../plugins/mail-notification/mail-notification.c:772
+#: ../plugins/mail-notification/mail-notification.c:794
 msgid "Pl_ay"
 msgstr "Toc_ar"
 
-#: ../plugins/mail-notification/mail-notification.c:829
+#: ../plugins/mail-notification/mail-notification.c:851
 msgid "Notify new messages for _Inbox only"
 msgstr "Mensagem de notificaÃ§Ã£o apenas na Ca_ixa de Entrada"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+msgid "Mail Notification"
+msgstr "NotificaÃ§Ã£o de mensagem"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+msgid "Notifies you when new mail messages arrive."
+msgstr "Notifica quando uma nova mensagem chega."
+
+#: ../plugins/mail-to-task/mail-to-task.c:376
+#, c-format
 msgid ""
-"Generates a D-Bus message or notifies the user with an icon in notification "
-"area and a notification message whenever a new message has arrived."
+"Selected calendar contains event '%s' already. Would you like to edit the "
+"old event?"
 msgstr ""
-"Gera uma mensagem D-Bus ou notifica o usuÃ¡rio com um Ãcone na Ã¡rea de "
-"notificaÃ§Ã£o alÃ©m de uma mensagem de notificaÃ§Ã£o sempre que uma nova mensagem "
-"tiver chegado."
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
-msgid "Mail Notification"
-msgstr "NotificaÃ§Ã£o de mensagem"
+#: ../plugins/mail-to-task/mail-to-task.c:379
+#, c-format
+msgid ""
+"Selected task list contains task '%s' already. Would you like to edit the "
+"old task?"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:382
+#, c-format
+msgid ""
+"Selected memo list contains memo '%s' already. Would you like to edit the "
+"old memo?"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:399
+msgid ""
+"Selected calendar contains some events for the given mails already. Would "
+"you like to create new events anyway?"
+msgstr ""
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
+#: ../plugins/mail-to-task/mail-to-task.c:402
 msgid ""
-"A plugin which allows the creation of meetings from the contents of a mail "
-"message."
+"Selected task list contains some tasks for the given mails already. Would "
+"you like to create new tasks anyway?"
 msgstr ""
-"Um plug-in que permite a criaÃ§Ã£o de encontros a partir do conteÃºdo de uma "
-"mensagem de e-mail."
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
-msgid "Con_vert to Meeting"
-msgstr "Con_verter para reuniÃ£o"
+#: ../plugins/mail-to-task/mail-to-task.c:405
+msgid ""
+"Selected memo list contains some memos for the given mails already. Would "
+"you like to create new memos anyway?"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:423
+msgid ""
+"Selected calendar contains an event for the given mail already. Would you "
+"like to create new event anyway?"
+msgid_plural ""
+"Selected calendar contains events for the given mails already. Would you "
+"like to create new events anyway?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:429
+msgid ""
+"Selected task list contains a task for the given mail already. Would you "
+"like to create new task anyway?"
+msgid_plural ""
+"Selected task list contains tasks for the given mails already. Would you "
+"like to create new tasks anyway?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
-msgid "Mail to meeting"
-msgstr "Mensagem para reuniÃ£o"
+#: ../plugins/mail-to-task/mail-to-task.c:435
+msgid ""
+"Selected memo list contains a memo for the given mail already. Would you "
+"like to create new memo anyway?"
+msgid_plural ""
+"Selected memo list contains memos for the given mails already. Would you "
+"like to create new memos anyway?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:494
+msgid "[No Summary]"
+msgstr "[Sem resumo]"
+
+#: ../plugins/mail-to-task/mail-to-task.c:505
+msgid "Invalid object returned from a server"
+msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:287
+#: ../plugins/mail-to-task/mail-to-task.c:570
+#, c-format
+msgid "An error occurred during processing: %s"
+msgstr "Ocorreu um erro durante o processamento: %s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:599
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "NÃ£o foi possÃvel abrir agenda. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:292
+#: ../plugins/mail-to-task/mail-to-task.c:606
+msgid ""
+"Selected source is read only, thus cannot create event there. Select other "
+"source, please."
+msgstr ""
+"A fonte selecionada Ã© apenas de leitura, e por isso nÃ£o se pode criar uma "
+"tarefa nela. Por favor, selecione uma outra fonte."
+
+#: ../plugins/mail-to-task/mail-to-task.c:609
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19526,26 +18382,62 @@ msgstr ""
 "A fonte selecionada Ã© apenas de leitura, por isso nÃ£o se pode criar tarefas "
 "nela. Por favor, selecione outra fonte."
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+#: ../plugins/mail-to-task/mail-to-task.c:612
 msgid ""
-"A plugin which allows the creation of tasks from the contents of a mail "
-"message."
+"Selected source is read only, thus cannot create memo there. Select other "
+"source, please."
 msgstr ""
-"Um plug-in que permite a criaÃ§Ã£o de tarefas a partir do conteÃºdo de uma "
-"mensagem de e-mail."
+"A fonte selecionada Ã© apenas de leitura, e por isso nÃ£o se pode criar um "
+"memorando nela. Por favor, selecione uma outra fonte."
+
+#: ../plugins/mail-to-task/mail-to-task.c:821
+#, c-format
+msgid "Cannot get source list. %s"
+msgstr "NÃ£o foi possÃvel obter a lista da fonte. %s"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+msgid "Convert a mail message to a task."
+msgstr "Converter uma mensagem para uma tarefa."
 
 #: ../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 "_Converter para tarefa"
+msgid "Create a Mem_o"
+msgstr "Criar um mem_orando"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-msgid "Mail to task"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
+msgid "Create a _Meeting"
+msgstr "Criar u_ma reuniÃ£o"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:4
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:3
+msgid "Create a _Task"
+msgstr "Criar uma _tarefa"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:5
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:8
+msgid "Create an _Event"
+msgstr "Criar um _evento"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:6
+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 selecionada em uma nova tarefa"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:4
+msgid "Create a new event from the selected message"
+msgstr "Criar um novo envento a partir da mensagem selecionada"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5
+msgid "Create a new meeting from the selected message"
+msgstr "Criar uma nova reuniÃ£o a partir da mensagem selecionada"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:6
+msgid "Create a new memo from the selected message"
+msgstr "Criar um novo memorando a partir da mensagem selecionada"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:7
+msgid "Create a new task from the selected message"
+msgstr "Criar uma nova tarefa a partir da mensagem selecionada"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 msgid "Contact list _owner"
@@ -19569,8 +18461,8 @@ msgid "Mailing _List"
 msgstr "_Lista de discussÃ£o"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid ""
-"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
+#, fuzzy
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
 msgstr ""
 "Prover aÃ§Ãµes para comandos comuns de listas de mensagens (inscriÃ§Ã£o, "
 "cancelamento de inscriÃ§Ã£o, ...)."
@@ -19727,12 +18619,14 @@ msgstr ""
 "VocÃª deseja marcar como lidas apenas as mensagens da pasta atual, ou tambÃ©m "
 "nas subpastas?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:164
-msgid "Current Folder and _Subfolders"
+#: ../plugins/mark-all-read/mark-all-read.c:166
+#, fuzzy
+msgid "In Current Folder and _Subfolders"
 msgstr "Pasta atual e _subpastas"
 
-#: ../plugins/mark-all-read/mark-all-read.c:176
-msgid "Current _Folder Only"
+#: ../plugins/mark-all-read/mark-all-read.c:180
+#, fuzzy
+msgid "In Current _Folder Only"
 msgstr "_Pasta atual apenas"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
@@ -19744,21 +18638,22 @@ msgid "Mark Me_ssages as Read"
 msgstr "M_arcar mensagens 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 "Usado para marcar todas as mensagens na pasta como lidas"
+#, fuzzy
+msgid "Mark all messages in a folder as read."
+msgstr "Marca todas as mensagens nesta pasta e como lidas"
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
-msgid "A plugin which implements mono plugins."
-msgstr "Um plug-in que implementa plug-ins mono."
-
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
 msgid "Mono Loader"
 msgstr "Carregador Mono"
 
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-msgid "A plugin for managing which plugins are enabled or disabled."
+#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
+msgid "Support plugins written in Mono."
 msgstr ""
-"Gerencia quais plug-ins estÃ£o habilitados ou e quais estÃ£o desabilitados."
+
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
+#, fuzzy
+msgid "Manage your Evolution plugins."
+msgstr "Altera as configuraÃ§Ãµes do Evolution"
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
@@ -19795,27 +18690,20 @@ msgstr "VisÃ£o geral"
 msgid "Plugin"
 msgstr "Plug-in"
 
-#: ../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 messages.\n"
-"\n"
-"This plugin is unsupported demonstration code only.\n"
-msgstr ""
-"Um plug-in de teste que demonstra um plug-in de formataÃ§Ã£o que permite que "
-"vocÃª desabilite mensagens em formato HTML.\n"
-"\n"
-"Este plug-in Ã© apenas um cÃ³digo de demonstraÃ§Ã£o e sem suporte.\n"
-
 #. but then we also need to create our own section frame
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
 msgstr "Modo de texto simples"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
-msgid "Prefer plain-text"
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
+#, fuzzy
+msgid "Prefer Plain Text"
 msgstr "Preferir texto simples"
 
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
+msgid "View mail messages as plain text, even if they contain HTML content."
+msgstr ""
+
 #: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
 msgstr "Mostrar HTML se presente"
@@ -19837,8 +18725,8 @@ msgid "Evolution Profiler"
 msgstr "Controlador de perfil do Evolution"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
-msgid "Writes a log of profiling data events."
-msgstr "Escreve um log do perfil de eventos de dados."
+msgid "Profile data events in Evolution (for developers only)."
+msgstr ""
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Import Outlook messages from PST file"
@@ -19853,44 +18741,76 @@ msgid "Outlook personal folders (.pst)"
 msgstr "Pasta pessoal do Outlook (.pst)"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:318
+#: ../plugins/pst-import/pst-importer.c:315
 msgid "_Address Book"
 msgstr "_CatÃ¡logo de endereÃ§os"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:325
+#: ../plugins/pst-import/pst-importer.c:322
 msgid "A_ppointments"
 msgstr "C_ompromissos"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:337
+#: ../plugins/pst-import/pst-importer.c:334
 msgid "_Journal entries"
 msgstr "_DiÃ¡rio"
 
-#: ../plugins/pst-import/pst-importer.c:352
+#: ../plugins/pst-import/pst-importer.c:349
 msgid "Importing Outlook data"
 msgstr "Importando dados do Outlook"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-msgid "Allows calendars to be published to the web"
-msgstr "Permite que agendas sejam publicadas na web"
-
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Calendar Publishing"
 msgstr "PublicaÃ§Ã£o de agendas"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Locations"
 msgstr "Locais"
 
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#, fuzzy
+msgid "Publish calendars to the web."
+msgstr "Permite que agendas sejam publicadas na web"
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
 msgid "_Publish Calendar Information"
 msgstr "_Publicar informaÃ§Ã£o de agenda"
 
-#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.c:95
+#: ../plugins/publish-calendar/publish-calendar.c:337
+#, fuzzy, c-format
+msgid "Could not open %s:"
+msgstr "NÃ£o foi possÃvel abrir a fonte"
+
+#: ../plugins/publish-calendar/publish-calendar.c:97
+#, fuzzy, c-format
+msgid "Could not open %s: Unknown error"
+msgstr "NÃ£o foi possÃvel analisar a mensagem PGP: Erro desconhecido"
+
+#: ../plugins/publish-calendar/publish-calendar.c:117
+#, c-format
+msgid "There was an error while publishing to %s:"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.c:119
+#, c-format
+msgid "Publishing to %s finished successfully"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.c:164
+#, c-format
+msgid "Mount of %s failed:"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.c:624
 msgid "Are you sure you want to remove this location?"
 msgstr "VocÃª tem certeza de que deseja excluir esta localizaÃ§Ã£o?"
 
+#: ../plugins/publish-calendar/publish-calendar.c:788
+#, fuzzy
+msgid "Could not create publish thread."
+msgstr "NÃ£o foi possÃvel criar a mensagem."
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
 msgid "<span weight=\"bold\">Location</span>"
 msgstr "<span weight=\"bold\">LocalizaÃ§Ã£o</span>"
@@ -19947,27 +18867,39 @@ msgstr ""
 msgid "Service _type:"
 msgstr "_Tipo do serviÃ§o:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#, fuzzy
+msgid "Time _duration:"
+msgstr "F_uso horÃ¡rio:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_File:"
 msgstr "_Arquivo:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
 msgid "_Password:"
 msgstr "S_enha:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Publish as:"
 msgstr "_Publicar como:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Remember password"
 msgstr "_Lembrar senha"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid "_Username:"
 msgstr "Nome do _usuÃ¡rio:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+#: ../plugins/publish-calendar/publish-calendar.glade.h:29
+msgid ""
+"days\n"
+"weeks\n"
+"months"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:32
 msgid ""
 "iCal\n"
 "Free/Busy"
@@ -19975,11 +18907,17 @@ msgstr ""
 "iCal\n"
 "Disponibilidade"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:461
+#: ../plugins/publish-calendar/publish-format-fb.c:69
+#: ../plugins/publish-calendar/publish-format-ical.c:82
+#, c-format
+msgid "Could not publish calendar: Calendar backend no longer exists"
+msgstr ""
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:481
 msgid "New Location"
 msgstr "Nova localizaÃ§Ã£o"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:463
+#: ../plugins/publish-calendar/url-editor-dialog.c:483
 msgid "Edit Location"
 msgstr "Editar localizaÃ§Ã£o"
 
@@ -20007,178 +18945,143 @@ msgstr "Um plug-in que carrega outros plug-ins escritos em Python."
 msgid "Python Loader"
 msgstr "Carregador Python"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
-msgid "SpamAssassin (built-in)"
-msgstr "SpamAssassin (embutido)"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "SpamAssassin nÃ£o localizado, cÃ³digo: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:141
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:149
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Falha ao criar o pipe: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Erro apÃ³s a bifurcaÃ§Ã£o: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "O processo filho de SpamAssassin nÃ£o responde, matando..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:245
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr ""
 "A espera pelo processo filho de Spamassassin foi interrompida, terminando..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:254
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "O pipe para SpamAssassin falhou, cÃ³digo de erro: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:509
 #, c-format
 msgid "SpamAssassin is not available."
 msgstr "O SpamAssassin nÃ£o estÃ¡ disponÃvel."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:906
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Isto tornarÃ¡ o SpamAssassin mais confiÃ¡vel, porÃ©m mais lento"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:912
 msgid "I_nclude remote tests"
 msgstr "I_ncluir testes remotos"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid ""
-"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
-"to be installed."
-msgstr ""
-"Filtra spam usando SpamAssassin. O plug-in requer que o SpamAssassin esteja "
-"instalado."
+#, fuzzy
+msgid "Filter junk messages using SpamAssassin."
+msgstr "Filtra mensagens SPAM usando Bogofilter."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin Options"
-msgstr "OpÃ§Ãµes do SpamAssassin"
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "SpamAssassin junk plugin"
+#, fuzzy
+msgid "SpamAssassin Junk Filter"
 msgstr "Plug-in 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."
-msgstr "Salva todos os anexos ou partes de uma mensagem de uma vez."
-
-#. the path to the shared library
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:315
-msgid "Save attachments"
-msgstr "Salvar anexos"
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
-msgid "Save Attachments..."
-msgstr "Salvar anexos..."
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
-msgid "Save all attachments"
-msgstr "Salvar todos os anexos"
-
-#: ../plugins/save-attachments/save-attachments.c:321
-msgid "Select save base name"
-msgstr "Selecionar o nome base para salvamento"
-
-#: ../plugins/save-attachments/save-attachments.c:340
-msgid "MIME Type"
-msgstr "Tipo MIME"
-
-#: ../plugins/save-attachments/save-attachments.c:348
-msgid "Save"
-msgstr "Salvar"
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
+msgid "SpamAssassin Options"
+msgstr "OpÃ§Ãµes do SpamAssassin"
 
 #.
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:163
+#: ../plugins/save-calendar/csv-format.c:160
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../plugins/save-calendar/csv-format.c:356
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:358
 msgid "Description List"
 msgstr "Lista de descriÃ§Ã£o"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:359
 msgid "Categories List"
 msgstr "Lista de categorias"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "Comment List"
 msgstr "Lista de comentÃ¡rios"
 
-#: ../plugins/save-calendar/csv-format.c:367
-msgid "Created"
-msgstr "Criado"
-
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Contact List"
 msgstr "Lista de contatos"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Start"
 msgstr "InÃcio"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "End"
 msgstr "Fim"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "percent Done"
 msgstr "porcentagem ConcluÃda"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Attendees List"
 msgstr "Lista de participantes"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Modified"
 msgstr "Modificado"
 
-#: ../plugins/save-calendar/csv-format.c:532
-msgid "Advanced options for the CSV format"
+#: ../plugins/save-calendar/csv-format.c:523
+#, fuzzy
+msgid "A_dvanced options for the CSV format"
 msgstr "OpÃ§Ãµes avanÃ§adas para o formato CSV"
 
-#: ../plugins/save-calendar/csv-format.c:539
-msgid "Prepend a header"
+#: ../plugins/save-calendar/csv-format.c:530
+#, fuzzy
+msgid "Prepend a _header"
 msgstr "Colocar um cabeÃ§alho no inÃcio"
 
-#: ../plugins/save-calendar/csv-format.c:548
-msgid "Value delimiter:"
+#: ../plugins/save-calendar/csv-format.c:539
+#, fuzzy
+msgid "_Value delimiter:"
 msgstr "Delimitador de valor:"
 
-#: ../plugins/save-calendar/csv-format.c:554
-msgid "Record delimiter:"
+#: ../plugins/save-calendar/csv-format.c:546
+#, fuzzy
+msgid "_Record delimiter:"
 msgstr "Delimitador de registro:"
 
-#: ../plugins/save-calendar/csv-format.c:560
-msgid "Encapsulate values with:"
+#: ../plugins/save-calendar/csv-format.c:553
+#, fuzzy
+msgid "_Encapsulate values with:"
 msgstr "Encapsular valores com:"
 
-#: ../plugins/save-calendar/csv-format.c:582
+#: ../plugins/save-calendar/csv-format.c:575
 msgid "Comma separated value format (.csv)"
 msgstr "Formato de valores separados por vÃrgula (.csv)"
 
@@ -20187,7 +19090,8 @@ msgid "Save Selected"
 msgstr "Salvar selecionado"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-msgid "Saves selected calendar or tasks list to disk."
+#, fuzzy
+msgid "Save a calendar or task list to disk."
 msgstr "Salvar agendas ou lista de tarefas no disco."
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
@@ -20203,21 +19107,28 @@ msgstr "_Salvar no disco"
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:377
+#: ../plugins/save-calendar/rdf-format.c:372
 msgid "RDF format (.rdf)"
 msgstr "Formato RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:161
+#: ../plugins/save-calendar/save-calendar.c:104
+#, fuzzy
+msgid "_Format:"
+msgstr "Formato"
+
+#: ../plugins/save-calendar/save-calendar.c:165
 msgid "Select destination file"
 msgstr "Selecionar arquivo de destino"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
-msgid "Select one source"
-msgstr "Selecionar uma fonte"
+#, fuzzy
+msgid "Quickly select a single calendar or task list for viewing."
+msgstr "Selecionar uma agenda ou fonte de tarefas para visualizaÃ§Ã£o."
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-msgid "Selects a single calendar or task source for viewing."
-msgstr "Selecionar uma agenda ou fonte de tarefas para visualizaÃ§Ã£o."
+#, fuzzy
+msgid "Select One Source"
+msgstr "Selecionar uma fonte"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
 msgid "Show _only this Calendar"
@@ -20239,15 +19150,15 @@ msgstr "Guia vocÃª pela configuraÃ§Ã£o inicial de conta."
 msgid "Setup Assistant"
 msgstr "Assistente de configuraÃ§Ã£o"
 
-#: ../plugins/startup-wizard/startup-wizard.c:85
+#: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
 msgstr "Assistente de configuraÃ§Ã£o do Evolution"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid "Welcome"
 msgstr "Bem-vindo"
 
-#: ../plugins/startup-wizard/startup-wizard.c:89
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -20260,35 +19171,36 @@ msgstr ""
 "\n"
 "Por favor, clique no botÃ£o \"AvanÃ§ar\" para continuar. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../plugins/startup-wizard/startup-wizard.c:115
 msgid "Importing files"
 msgstr "Importando arquivos"
 
-#: ../plugins/startup-wizard/startup-wizard.c:137
-#: ../shell/e-shell-importer.c:141
+#: ../plugins/startup-wizard/startup-wizard.c:117
+#: ../shell/e-shell-importer.c:138
 msgid "Please select the information that you would like to import:"
 msgstr "Por favor, selecione a informaÃ§Ã£o que vocÃª deseja importar:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:152
-#: ../shell/e-shell-importer.c:394
+#: ../plugins/startup-wizard/startup-wizard.c:132
+#: ../shell/e-shell-importer.c:419
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
-#: ../shell/e-shell-importer.c:505
+#: ../plugins/startup-wizard/startup-wizard.c:203
+#: ../shell/e-shell-importer.c:548
 #, c-format
 msgid "Importing data."
 msgstr "Importando dados."
 
-#: ../plugins/startup-wizard/startup-wizard.c:234
-#: ../shell/e-shell-importer.c:519
+#: ../plugins/startup-wizard/startup-wizard.c:205
+#: ../shell/e-shell-importer.c:562
 msgid "Please wait"
 msgstr "Por favor, aguarde"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
-msgid "Indicates if threading of messages should fall back to subject."
-msgstr "Indica se o encadeamento das mensagens deve retornar no assunto."
+#, fuzzy
+msgid "Sort mail message threads by subject."
+msgstr "Encadear a lista de mensagens baseado no assunto"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
@@ -20311,15 +19223,15 @@ msgstr ""
 "Lista de pares teclado/valores para o plug-in de modelo para substituir no "
 "corpo de uma mensagem."
 
-#: ../plugins/templates/templates.c:603
+#: ../plugins/templates/templates.c:601
 msgid "No title"
 msgstr "Sem tÃtulo"
 
-#: ../plugins/templates/templates.c:711
+#: ../plugins/templates/templates.c:709
 msgid "Save as _Template"
 msgstr "Salvar como _modelo"
 
-#: ../plugins/templates/templates.c:713
+#: ../plugins/templates/templates.c:711
 msgid "Save as Template"
 msgstr "Salva como modelo"
 
@@ -20328,31 +19240,67 @@ msgid "Drafts based template plugin"
 msgstr "Plug-in de modelo baseado em rascunho"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
-msgstr "Um plug-in simples que usa yTNEF para decodificar anexos TNEF."
+msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
+msgstr ""
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
-msgid "TNEF Attachment decoder"
+#, fuzzy
+msgid "TNEF Decoder"
 msgstr "Decodificador de anexos TNEF"
 
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
+#, fuzzy
+msgid "Inline vCards"
+msgstr "VÃ¡rios vCards"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
+msgid "Show vCards directly in mail messages."
+msgstr ""
+
+#: ../plugins/vcard-inline/vcard-inline.c:159
+#: ../plugins/vcard-inline/vcard-inline.c:243
+msgid "Show Full vCard"
+msgstr "Mostrar vCard Completo"
+
+#: ../plugins/vcard-inline/vcard-inline.c:162
+msgid "Show Compact vCard"
+msgstr "Mostrar vCard Compacto"
+
+#: ../plugins/vcard-inline/vcard-inline.c:222
+#, fuzzy
+msgid "There is one other contact."
+msgstr "Existe um outro contato."
+
+#: ../plugins/vcard-inline/vcard-inline.c:231
+#, fuzzy, c-format
+msgid "There is %d other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] "Existe um outro contato."
+msgstr[1] "Existem %d outros contatos."
+
+#: ../plugins/vcard-inline/vcard-inline.c:252
+#, fuzzy
+msgid "Save in Address Book"
+msgstr "Salvar no catÃ¡logo de endereÃ§os"
+
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-msgid "A plugin to setup WebDAV contacts."
-msgstr "Um plug-in para configurar contatos do WebDAV."
+#, fuzzy
+msgid "Add WebDAV contacts to Evolution."
+msgstr "Contatos do WebDAV"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
 msgid "WebDAV contacts"
 msgstr "Contatos do WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:96
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:107
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:336
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:295
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:363
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:321
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Evitar IfMatch (necessÃ¡rio no apache <2.2.8)"
 
@@ -20439,45 +19387,65 @@ msgstr ""
 "keyring ou do arquivo de senha ~/.gnome2_private/Evolution."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:15
+#, fuzzy
+msgid "Initial attachment view"
+msgstr "Inserir anexo"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:16
+#, fuzzy
+msgid "Initial file chooser folder"
+msgstr "Renomear a pasta partilhada"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Last upgraded configuration version"
 msgstr "Ã?ltima versÃ£o de configuraÃ§Ã£o atualizada"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Lista de caminhos para as pastas a serem sincronizadas com o disco para uso "
 "desconectado"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Non-proxy hosts"
 msgstr "MÃ¡quinas nÃ£o proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "Senha a fornecer como autenticaÃ§Ã£o ao usar o proxy HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Proxy configuration mode"
 msgstr "Modo de configuraÃ§Ã£o de representante"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "SOCKS proxy host name"
 msgstr "Nome de mÃ¡quina de proxy SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "SOCKS proxy port"
 msgstr "Porta de proxy SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Secure HTTP proxy host name"
 msgstr "Nome de mÃ¡quina de proxy HTTP seguro"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Secure HTTP proxy port"
 msgstr "Porta de proxy HTTP seguro"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -20489,23 +19457,23 @@ msgstr ""
 "proxy\", \"usar as configuraÃ§Ãµes de proxy manuais\" and \"usar configuraÃ§Ãµes "
 "de proxy fornecidas pela url de configuraÃ§Ã£o automÃ¡tica\" respectivamente."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Sidebar is visible"
 msgstr "A barra lateral estÃ¡ visÃvel"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Skip development warning dialog"
 msgstr "Pular diÃ¡logo de alerta de desenvolvimento"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:483
+#: ../shell/apps_evolution_shell.schemas.in.h:31 ../shell/main.c:489
 msgid "Start in offline mode"
 msgstr "Iniciar no modo desconectado"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "Statusbar is visible"
 msgstr "A barra de status estÃ¡ visÃvel"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -20513,19 +19481,19 @@ msgstr ""
 "A versÃ£o de configuraÃ§Ã£o do Evolution, com maior/menor/nÃvel de configuraÃ§Ã£o "
 "(por exemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default height for the main window, in pixels."
 msgstr "A altura padrÃ£o para a janela principal, em pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The default width for the main window, in pixels."
 msgstr "A largura padrÃ£o para a janela principal, em pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The default width for the sidebar, in pixels."
 msgstr "A largura padrÃ£o para a barra lateral, em pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -20533,19 +19501,19 @@ msgstr ""
 "A Ãºltima versÃ£o de configuraÃ§Ã£o do Evolution atualizada, com maior/menor/"
 "nÃvel de configuraÃ§Ã£o (por exemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The machine name to proxy HTTP through."
 msgstr "O nome da mÃ¡quina para usar como proxy HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid "The machine name to proxy secure HTTP through."
 msgstr "O nome da mÃ¡quina para usar como proxy HTTP seguro."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The machine name to proxy socks through."
 msgstr "O nome da mÃ¡quina para usar como proxy socks."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
@@ -20553,7 +19521,7 @@ msgstr ""
 "A porta na mÃ¡quina definida por \"/apps/evolution/shell/network_config/"
 "http_host\" que Ã© usada como proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
@@ -20561,7 +19529,7 @@ msgstr ""
 "A porta na mÃ¡quina definida por \"/apps/evolution/shell/network_config/"
 "secure_host\" que Ã© usada como proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
@@ -20569,7 +19537,7 @@ msgstr ""
 "A porta na mÃ¡quina definida por \"/apps/evolution/shell/network_config/"
 "socks_host\" que Ã© usada como proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -20579,7 +19547,7 @@ msgstr ""
 "\"both\" (ambos), \"toolbar\". Se definido como \"toolbar\", o estilo dos "
 "botÃµes Ã© determinado pela configuraÃ§Ã£o da barra de ferramentas do GNOME."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
@@ -20591,57 +19559,57 @@ msgstr ""
 "domÃnios (usando um caractere curinga como *.foo.com), endereÃ§os de IP (IPv4 "
 "e IPv6) e endereÃ§os de rede com uma mÃ¡scara (algo como 192.168.0.0/24)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Toolbar is visible"
 msgstr "A barra de ferramentas estÃ¡ visÃvel"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "URL that provides proxy configuration values."
 msgstr "A URL que fornece os valores de configuraÃ§Ã£o de proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Use HTTP proxy"
 msgstr "Usar proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "Nome de usuÃ¡rio a fornecer como autenticaÃ§Ã£o ao usar o proxy HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Se o Evolution deve iniciar em modo desconectado em vez de modo conectado."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether or not the window should be maximized."
 msgstr "A janela pode ser maximizada."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the sidebar should be visible."
 msgstr "A barra de lateral deve estar visÃvel."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the status bar should be visible."
 msgstr "A barra de status deve estar visÃvel."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Whether the toolbar should be visible."
 msgstr "A barra de ferramentas deve estar visÃvel."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "O diÃ¡logo de alerta em versÃµes de desenvolvimento deve ser pulado."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr "Os botÃµes de janela devem estar visÃveis."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "Estilo dos botÃµes de janela"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "BotÃµes de janela sÃ£o visÃveis"
 
@@ -20657,11 +19625,11 @@ msgstr "ConexÃµes ativas"
 msgid "Click OK to close these connections and go offline"
 msgstr "Clique em OK para fechar estas conexÃµes e desconectar"
 
-#: ../shell/e-shell-importer.c:131
+#: ../shell/e-shell-importer.c:128
 msgid "Choose the type of importer to run:"
 msgstr "Escolha o tipo de importador a executar:"
 
-#: ../shell/e-shell-importer.c:134
+#: ../shell/e-shell-importer.c:131
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -20669,11 +19637,11 @@ msgstr ""
 "Escolha o arquivo que vocÃª deseja importar para o Evolution e selecione o "
 "tipo de arquivo na lista."
 
-#: ../shell/e-shell-importer.c:138
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the destination for this import"
 msgstr "Escolher o destino para esta importaÃ§Ã£o"
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:141
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -20685,59 +19653,63 @@ msgstr ""
 "configuraÃ§Ã£o que possa ser importada foi localizada. Se vocÃª deseja\n"
 "tentar novamente, por favor clique no botÃ£o \"Voltar\".\n"
 
-#: ../shell/e-shell-importer.c:282
+#: ../shell/e-shell-importer.c:295
 msgid "F_ilename:"
 msgstr "_Nome do arquivo:"
 
-#: ../shell/e-shell-importer.c:287
+#: ../shell/e-shell-importer.c:300
 msgid "Select a file"
 msgstr "Selecionar um arquivo"
 
-#: ../shell/e-shell-importer.c:296
+#: ../shell/e-shell-importer.c:309
 msgid "File _type:"
 msgstr "_Tipo do arquivo:"
 
-#: ../shell/e-shell-importer.c:332
+#: ../shell/e-shell-importer.c:357
 msgid "Import data and settings from _older programs"
 msgstr "Importar _dados e configuraÃ§Ãµes de programas antigos"
 
-#: ../shell/e-shell-importer.c:335
+#: ../shell/e-shell-importer.c:360
 msgid "Import a _single file"
 msgstr "Importar _um Ãºnico arquivo"
 
-#: ../shell/e-shell-settings-dialog.c:313
+#: ../shell/e-shell-importer.c:743
+msgid "_Import"
+msgstr "_Importar"
+
+#: ../shell/e-shell-settings-dialog.c:312
 msgid "Evolution Preferences"
 msgstr "PreferÃªncias do Evolution"
 
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:328
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:324
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window-commands.c:75
+#: ../shell/e-shell-window-commands.c:69
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "As ferramentas do GNOME Pilot nÃ£o parecem estar instaladas no seu sistema."
 
-#: ../shell/e-shell-window-commands.c:83
-#, c-format
-msgid "Error executing %s."
+#: ../shell/e-shell-window-commands.c:78
+#, fuzzy, c-format
+msgid "Error executing %s. (%s)"
 msgstr "Erro ao executar %s."
 
-#: ../shell/e-shell-window-commands.c:139
+#: ../shell/e-shell-window-commands.c:135
 msgid "Bug buddy is not installed."
 msgstr "A Ferramenta de RelatÃ³rio de Erros nÃ£o estÃ¡ instalada."
 
-#: ../shell/e-shell-window-commands.c:142
+#: ../shell/e-shell-window-commands.c:138
 msgid "Bug buddy could not be run."
 msgstr "NÃ£o foi possÃvel executar a Ferramenta de RelatÃ³rio de Erros."
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:942
+#: ../shell/e-shell-window-commands.c:938
 msgid "translator-credits"
 msgstr ""
 "Gustavo Maciel Dias Vieira <gustavo sagui org>\n"
@@ -20749,23 +19721,23 @@ msgstr ""
 "Vladimir Melo <vladimirmelo psi gmail com>\n"
 "Jonh Wendell <wendell bani com br>"
 
-#: ../shell/e-shell-window-commands.c:953
+#: ../shell/e-shell-window-commands.c:949
 msgid "Evolution Website"
 msgstr "WebSite do Evolution"
 
-#: ../shell/e-shell-window-commands.c:1170
+#: ../shell/e-shell-window-commands.c:1163
 msgid "_Work Online"
 msgstr "_Trabalhar conectado"
 
-#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1176 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Trabalhar desconectado"
 
-#: ../shell/e-shell-window-commands.c:1196
+#: ../shell/e-shell-window-commands.c:1189
 msgid "Work Offline"
 msgstr "Trabalhar desconectado"
 
-#: ../shell/e-shell-window.c:377
+#: ../shell/e-shell-window.c:372
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
@@ -20773,11 +19745,11 @@ msgstr ""
 "O Evolution estÃ¡ atualmente conectado.\n"
 "Clique neste botÃ£o para trabalhar desconectado."
 
-#: ../shell/e-shell-window.c:384
+#: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
 msgstr "O Evolution estÃ¡ em processo de desconexÃ£o."
 
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:386
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
@@ -20785,52 +19757,52 @@ msgstr ""
 "O Evolution estÃ¡ atualmente desconectado.\n"
 " Clique neste botÃ£o para trabalhar conectado."
 
-#: ../shell/e-shell-window.c:787
+#: ../shell/e-shell-window.c:778
 #, c-format
 msgid "Switch to %s"
 msgstr "Alterna para %s"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:634
 msgid "Unknown system error."
 msgstr "Erro de sistema desconhecido."
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:832 ../shell/e-shell.c:833
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:313
+#: ../shell/e-shell.c:1251 ../widgets/misc/e-cell-date-edit.c:320
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1263
+#: ../shell/e-shell.c:1253
 msgid "Invalid arguments"
 msgstr "Argumentos invÃ¡lidos"
 
-#: ../shell/e-shell.c:1265
+#: ../shell/e-shell.c:1255
 msgid "Cannot register on OAF"
 msgstr "NÃ£o Ã© possÃvel registrar no OAF"
 
-#: ../shell/e-shell.c:1267
+#: ../shell/e-shell.c:1257
 msgid "Configuration Database not found"
 msgstr "NÃ£o foi localizado o Banco de Dados de configuraÃ§Ã£o"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
-#: ../shell/e-user-creatable-items-handler.c:693
+#: ../shell/e-user-creatable-items-handler.c:674
+#: ../shell/e-user-creatable-items-handler.c:684
+#: ../shell/e-user-creatable-items-handler.c:689
 msgid "New"
 msgstr "Novo"
 
-#: ../shell/test/evolution-test-component.c:105
+#: ../shell/test/evolution-test-component.c:103
 msgid "New Test"
 msgstr "Novo teste"
 
-#: ../shell/test/evolution-test-component.c:106
+#: ../shell/test/evolution-test-component.c:104
 msgctxt "New"
 msgid "_Test"
 msgstr "_Teste"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "Create a new test item"
 msgstr "Criar um novo item de teste"
 
@@ -20875,7 +19847,7 @@ msgstr ""
 
 # ajustei para ter o mesmo tamanho
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:221
+#: ../shell/main.c:226
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20910,7 +19882,7 @@ msgstr ""
 "NÃ³s esperamos que vocÃª aprecie os resultados do nosso trabalho\n"
 "duro, e estamos esperando ansiosamente as suas contribuiÃ§Ãµes!\n"
 
-#: ../shell/main.c:245
+#: ../shell/main.c:250
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20918,44 +19890,44 @@ msgstr ""
 "Obrigado\n"
 "A Equipe do Evolution\n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:257
 msgid "Do not tell me again"
 msgstr "NÃ£o me diga novamente"
 
-#: ../shell/main.c:481
+#: ../shell/main.c:487
 msgid "Start Evolution activating the specified component"
 msgstr "Inicia o Evolution ativando o componente especificado"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:491
 msgid "Start in online mode"
 msgstr "Inicia no modo conectado"
 
-#: ../shell/main.c:488
+#: ../shell/main.c:494
 msgid "Forcibly shut down all Evolution components"
 msgstr "Desliga Ã  forÃ§a todos os componentes do Evolution"
 
-#: ../shell/main.c:492
+#: ../shell/main.c:498
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Executa novamente a migraÃ§Ã£o do Evolution 1.4"
 
-#: ../shell/main.c:495
+#: ../shell/main.c:501
 msgid "Send the debugging output of all components to a file."
 msgstr "Envia a saÃda de depuraÃ§Ã£o de todos os componentes para um arquivo."
 
-#: ../shell/main.c:497
+#: ../shell/main.c:503
 msgid "Disable loading of any plugins."
 msgstr "Desabilita o carregamento de qualquer plug-ins."
 
-#: ../shell/main.c:499
+#: ../shell/main.c:505
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desabilita o painel de visualizaÃ§Ã£o do Correio, Contatos e Tarefas."
 
 # DescriÃ§Ã£o obtida com "evolution --help"
-#: ../shell/main.c:586
+#: ../shell/main.c:614
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Cliente de e-mail e gerenciador de informaÃ§Ãµes pessoais (PIM)"
 
-#: ../shell/main.c:614
+#: ../shell/main.c:642
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -21116,7 +20088,7 @@ msgstr ""
 "\n"
 "Editar configuraÃ§Ãµes de confianÃ§a:"
 
-#: ../smime/gui/cert-trust-dialog.c:151
+#: ../smime/gui/cert-trust-dialog.c:150
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -21126,7 +20098,7 @@ msgstr ""
 "entÃ£o vocÃª confia na autenticidade deste certificado a nÃ£o ser que aqui "
 "esteja indicado o contrÃ¡rio"
 
-#: ../smime/gui/cert-trust-dialog.c:155
+#: ../smime/gui/cert-trust-dialog.c:154
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -21136,51 +20108,51 @@ msgstr ""
 "certificado, entÃ£o vocÃª nÃ£o confia na autenticidade deste certificado a nÃ£o "
 "ser que aqui esteja indicado o contrÃ¡rio"
 
-#: ../smime/gui/certificate-manager.c:137
-#: ../smime/gui/certificate-manager.c:380
-#: ../smime/gui/certificate-manager.c:604
+#: ../smime/gui/certificate-manager.c:136
+#: ../smime/gui/certificate-manager.c:383
+#: ../smime/gui/certificate-manager.c:611
 msgid "Select a certificate to import..."
 msgstr "Selecionar um certificado para importar..."
 
-#: ../smime/gui/certificate-manager.c:146
+#: ../smime/gui/certificate-manager.c:145
 msgid "All PKCS12 files"
 msgstr "Todos os arquivos PKCS12"
 
 #: ../smime/gui/certificate-manager.c:151
-#: ../smime/gui/certificate-manager.c:394
-#: ../smime/gui/certificate-manager.c:618
+#: ../smime/gui/certificate-manager.c:398
+#: ../smime/gui/certificate-manager.c:625
 msgid "All files"
 msgstr "Todos os arquivos"
 
-#: ../smime/gui/certificate-manager.c:271
-#: ../smime/gui/certificate-manager.c:480
-#: ../smime/gui/certificate-manager.c:702
+#: ../smime/gui/certificate-manager.c:275
+#: ../smime/gui/certificate-manager.c:488
+#: ../smime/gui/certificate-manager.c:713
 msgid "Certificate Name"
 msgstr "Nome do certificado"
 
-#: ../smime/gui/certificate-manager.c:280
-#: ../smime/gui/certificate-manager.c:498
+#: ../smime/gui/certificate-manager.c:284
+#: ../smime/gui/certificate-manager.c:506
 msgid "Purposes"
 msgstr "PropÃ³sitos"
 
-#: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:553
+#: ../smime/gui/certificate-manager.c:293 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/lib/e-cert.c:552
 msgid "Serial Number"
 msgstr "NÃºmero de sÃ©rie"
 
-#: ../smime/gui/certificate-manager.c:297
+#: ../smime/gui/certificate-manager.c:301
 msgid "Expires"
 msgstr "VÃ¡lido atÃ©"
 
-#: ../smime/gui/certificate-manager.c:389
+#: ../smime/gui/certificate-manager.c:392
 msgid "All email certificate files"
 msgstr "Todos os arquivos de certificados de e-mail"
 
-#: ../smime/gui/certificate-manager.c:489
+#: ../smime/gui/certificate-manager.c:497
 msgid "E-Mail Address"
 msgstr "EndereÃ§o de e-mail"
 
-#: ../smime/gui/certificate-manager.c:613
+#: ../smime/gui/certificate-manager.c:620
 msgid "All CA certificate files"
 msgstr "Todos os arquivos de certificados CA"
 
@@ -21282,7 +20254,7 @@ msgstr ""
 "Antes de confiar neste CA para qualquer propÃ³sito vocÃª deve examinar o seu "
 "certificado e as suas polÃticas e procedimentos (se disponÃveis)."
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1060
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1058
 msgid "Certificate"
 msgstr "Certificado"
 
@@ -21358,11 +20330,11 @@ msgstr "Unidade organizacional (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "ImpressÃ£o digital SHA1"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:800
 msgid "SSL Client Certificate"
 msgstr "Certificado do cliente SSL"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:804
 msgid "SSL Server Certificate"
 msgstr "Certificado do servidor SSL"
 
@@ -21410,7 +20382,7 @@ msgid "_Edit CA Trust"
 msgstr "_Editar confianÃ§a da CA"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:656
+#: ../smime/lib/e-cert-db.c:652
 msgid "Certificate already exists"
 msgstr "O certificado jÃ¡ existe"
 
@@ -21419,161 +20391,161 @@ msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:408
+#: ../smime/lib/e-cert.c:407
 msgid "Sign"
 msgstr "Assinar"
 
-#: ../smime/lib/e-cert.c:409
+#: ../smime/lib/e-cert.c:408
 msgid "Encrypt"
 msgstr "Criptografar"
 
-#: ../smime/lib/e-cert.c:514
+#: ../smime/lib/e-cert.c:513
 msgid "Version"
 msgstr "VersÃ£o"
 
-#: ../smime/lib/e-cert.c:529
+#: ../smime/lib/e-cert.c:528
 msgid "Version 1"
 msgstr "VersÃ£o 1"
 
-#: ../smime/lib/e-cert.c:532
+#: ../smime/lib/e-cert.c:531
 msgid "Version 2"
 msgstr "VersÃ£o 2"
 
-#: ../smime/lib/e-cert.c:535
+#: ../smime/lib/e-cert.c:534
 msgid "Version 3"
 msgstr "VersÃ£o 3"
 
-#: ../smime/lib/e-cert.c:617
+#: ../smime/lib/e-cert.c:616
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 com criptografia RSA"
 
-#: ../smime/lib/e-cert.c:620
+#: ../smime/lib/e-cert.c:619
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 com criptografia RSA"
 
-#: ../smime/lib/e-cert.c:623
+#: ../smime/lib/e-cert.c:622
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 com criptografia RSA"
 
-#: ../smime/lib/e-cert.c:650
+#: ../smime/lib/e-cert.c:649
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 criptografia RSA"
 
-#: ../smime/lib/e-cert.c:653
+#: ../smime/lib/e-cert.c:652
 msgid "Certificate Key Usage"
 msgstr "UtilizaÃ§Ã£o da chave do certificado"
 
-#: ../smime/lib/e-cert.c:656
+#: ../smime/lib/e-cert.c:655
 msgid "Netscape Certificate Type"
 msgstr "Tipo de certificado Netscape"
 
-#: ../smime/lib/e-cert.c:659
+#: ../smime/lib/e-cert.c:658
 msgid "Certificate Authority Key Identifier"
 msgstr "Identificador da chave da autoridade certificadora"
 
-#: ../smime/lib/e-cert.c:671
+#: ../smime/lib/e-cert.c:670
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identificador de objeto (%s)"
 
-#: ../smime/lib/e-cert.c:722
+#: ../smime/lib/e-cert.c:720
 msgid "Algorithm Identifier"
 msgstr "Identificador do algoritmo"
 
-#: ../smime/lib/e-cert.c:730
+#: ../smime/lib/e-cert.c:728
 msgid "Algorithm Parameters"
 msgstr "ParÃ¢metros do algoritmo"
 
-#: ../smime/lib/e-cert.c:752
+#: ../smime/lib/e-cert.c:750
 msgid "Subject Public Key Info"
 msgstr "InformaÃ§Ã£o da chave pÃºblica do sujeito"
 
-#: ../smime/lib/e-cert.c:757
+#: ../smime/lib/e-cert.c:755
 msgid "Subject Public Key Algorithm"
 msgstr "Algoritmo da chave pÃºblica do sujeito"
 
-#: ../smime/lib/e-cert.c:772
+#: ../smime/lib/e-cert.c:770
 msgid "Subject's Public Key"
 msgstr "Chave pÃºblica do sujeito"
 
-#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:791 ../smime/lib/e-cert.c:840
 msgid "Error: Unable to process extension"
 msgstr "Erro: NÃ£o Ã© possÃvel processar extensÃ£o"
 
-#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
+#: ../smime/lib/e-cert.c:812 ../smime/lib/e-cert.c:824
 msgid "Object Signer"
 msgstr "Autor da assinatura do objeto"
 
-#: ../smime/lib/e-cert.c:818
+#: ../smime/lib/e-cert.c:816
 msgid "SSL Certificate Authority"
 msgstr "Autoridade certificadora SSL"
 
-#: ../smime/lib/e-cert.c:822
+#: ../smime/lib/e-cert.c:820
 msgid "Email Certificate Authority"
 msgstr "Autoridade certificadora do e-mail"
 
-#: ../smime/lib/e-cert.c:850
+#: ../smime/lib/e-cert.c:848
 msgid "Signing"
 msgstr "Assinando"
 
-#: ../smime/lib/e-cert.c:854
+#: ../smime/lib/e-cert.c:852
 msgid "Non-repudiation"
 msgstr "NÃ£o-repÃºdio"
 
-#: ../smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:856
 msgid "Key Encipherment"
 msgstr "Criptografia da chave"
 
-#: ../smime/lib/e-cert.c:862
+#: ../smime/lib/e-cert.c:860
 msgid "Data Encipherment"
 msgstr "Criptografia de dados"
 
-#: ../smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:864
 msgid "Key Agreement"
 msgstr "Acordo de chave"
 
-#: ../smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:868
 msgid "Certificate Signer"
 msgstr "Autor da assinatura do certificado"
 
-#: ../smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:872
 msgid "CRL Signer"
 msgstr "Autor da assinatura CRL"
 
-#: ../smime/lib/e-cert.c:922
+#: ../smime/lib/e-cert.c:920
 msgid "Critical"
 msgstr "CrÃtico"
 
-#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
+#: ../smime/lib/e-cert.c:922 ../smime/lib/e-cert.c:925
 msgid "Not Critical"
 msgstr "NÃ£o crÃtico"
 
-#: ../smime/lib/e-cert.c:948
+#: ../smime/lib/e-cert.c:946
 msgid "Extensions"
 msgstr "ExtensÃµes"
 
-#: ../smime/lib/e-cert.c:1019
+#: ../smime/lib/e-cert.c:1017
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
+#: ../smime/lib/e-cert.c:1072 ../smime/lib/e-cert.c:1192
 msgid "Certificate Signature Algorithm"
 msgstr "Algoritmo da assinatura do certificado"
 
-#: ../smime/lib/e-cert.c:1084
+#: ../smime/lib/e-cert.c:1081
 msgid "Issuer"
 msgstr "Emissor"
 
-#: ../smime/lib/e-cert.c:1138
+#: ../smime/lib/e-cert.c:1135
 msgid "Issuer Unique ID"
 msgstr "ID Ãºnico do emissor"
 
-#: ../smime/lib/e-cert.c:1157
+#: ../smime/lib/e-cert.c:1154
 msgid "Subject Unique ID"
 msgstr "ID Ãºnico do assunto"
 
-#: ../smime/lib/e-cert.c:1200
+#: ../smime/lib/e-cert.c:1197
 msgid "Certificate Signature Value"
 msgstr "Valor da assinatura do certificado"
 
@@ -21721,7 +20693,7 @@ msgstr "Salva os contatos selecionados como um vCard"
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Salva os contatos da pasta selecionada como vCard"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2724
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2719
 msgid "Select All"
 msgstr "Selecionar tudo"
 
@@ -21855,7 +20827,7 @@ msgid "Month"
 msgstr "MÃªs"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:195
+#: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "PrÃ³xima"
 
@@ -21863,8 +20835,8 @@ msgstr "PrÃ³xima"
 msgid "Previews the calendar to be printed"
 msgstr "Visualiza a agenda a ser impressa"
 
-#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:171
+#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:70
+#: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Anterior"
 
@@ -22176,7 +21148,7 @@ msgstr "Organiza a lista de mensagens por discussÃµes"
 msgid "_Group By Threads"
 msgstr "Agrupar por _discussÃ£o"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:111
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Mensagem"
@@ -22431,199 +21403,183 @@ msgid "Paste messages from the clipboard"
 msgstr "Cola mensagens da Ã¡rea de transferÃªncia"
 
 #: ../ui/evolution-mail-message.xml.h:68
-msgid "Pos_t New Message to Folder"
-msgstr "P_ublicar uma nova mensagem na pasta"
-
-#: ../ui/evolution-mail-message.xml.h:69
-msgid "Post a Repl_y"
-msgstr "Pu_blicar uma resposta"
-
-#: ../ui/evolution-mail-message.xml.h:70
-msgid "Post a message to a Public folder"
-msgstr "Publica uma mensagem em uma pasta pÃºblica"
-
-#: ../ui/evolution-mail-message.xml.h:71
-msgid "Post a reply to a message in a Public folder"
-msgstr "Publica uma resposta a uma mensagem em uma pasta pÃºblica"
-
-#: ../ui/evolution-mail-message.xml.h:72
 msgid "Pr_evious Important Message"
 msgstr "Mensagem im_portante anterior"
 
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Preview the message to be printed"
 msgstr "Visualiza a mensagem a ser impressa"
 
-#: ../ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Print this message"
 msgstr "Imprime esta mensagem"
 
-#: ../ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:74
 msgid "Re_direct"
 msgstr "_Redirecionada"
 
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:75
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redireciona (bounce) a mensagem selecionada para alguÃ©m"
 
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:80
 msgid "Reset the text to its original size"
 msgstr "Restaura o tamanho original do texto"
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:81
 msgid "Save the selected messages as a text file"
 msgstr "Salva a mensagem selecionada como um arquivo texto"
 
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:82
 msgid "Search Folder from Mailing _List..."
 msgstr "Pasta de pesquisa a partir de _lista de discussÃ£o..."
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Search Folder from Recipien_ts..."
 msgstr "Pasta de Pesquisa a partir de des_tinatÃ¡rios..."
 
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Search Folder from S_ubject..."
 msgstr "Pasta de Pesquisa a partir de ass_unto..."
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:85
 msgid "Search Folder from Sen_der..."
 msgstr "Pasta _de pesquisa a partir de remetente..."
 
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Search for text in the body of the displayed message"
 msgstr "Pesquisa texto no corpo da mensagem exibida"
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Select _All Text"
 msgstr "Selecion_ar todo o texto"
 
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Select all the text in a message"
 msgstr "Seleciona todo o texto em uma mensagem"
 
-#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:89 ../ui/evolution.xml.h:27
 msgid "Set up the page settings for your current printer"
 msgstr "Configura a pÃ¡gina para a sua impressora atual"
 
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Mostra um cursor intermitente no corpo das mensagens exibidas"
 
-#: ../ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Show messages with all email headers"
 msgstr "Mostra a mensagem com todos os cabeÃ§alhos de e-mail"
 
-#: ../ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Show the raw email source of the message"
 msgstr "Mostra o cÃ³digo-fonte bruto do e-mail"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Undelete the selected messages"
 msgstr "Desfaz a exclusÃ£o das mensagens selecionadas"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Uni_mportant"
 msgstr "NÃ£o i_mportante"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Zoom _Out"
 msgstr "_Reduzir"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "_Attached"
 msgstr "_Anexada"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "_Caret Mode"
 msgstr "Modo _cursor"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "_Clear Flag"
 msgstr "Lim_par marca"
 
-#: ../ui/evolution-mail-message.xml.h:105
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Delete Message"
 msgstr "E_xcluir mensagem"
 
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:103
 msgid "_Find in Message..."
 msgstr "_Localizar na mensagem..."
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:104
 msgid "_Flag Completed"
 msgstr "Marcar como concl_uÃda"
 
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Go To"
 msgstr "_Ir para"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Important"
 msgstr "_Importante"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Inline"
 msgstr "_Embutida"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Junk"
 msgstr "_Spam"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Load Images"
 msgstr "Carregar _imagens"
 
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Message Source"
 msgstr "_CÃ³digo-fonte da mensagem"
 
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Next Message"
 msgstr "_PrÃ³xima mensagem"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Normal Size"
 msgstr "Tamanho _normal"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Not Junk"
 msgstr "_NÃ£o Ã© spam"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Open in New Window"
 msgstr "Abrir em n_ova janela"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Previous Message"
 msgstr "_Mensagem anterior"
 
-#: ../ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Quoted"
 msgstr "_Citada"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:126
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Read"
 msgstr "_Lida"
 
-#: ../ui/evolution-mail-message.xml.h:128
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Save Message..."
 msgstr "_Salvar mensagem..."
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:125
 msgid "_Undelete Message"
 msgstr "_Desfazer exclusÃ£o da mensagem"
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Unread"
 msgstr "_NÃ£o lida"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:127
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Zoom In"
 msgstr "_Ampliar"
 
@@ -22993,11 +21949,11 @@ msgid "With _Status"
 msgstr "Com _status"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:428
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:430
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:432
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:771
 msgid "UTC"
 msgstr "UTC"
 
@@ -23027,19 +21983,19 @@ msgstr ""
 "fuso horÃ¡rio.\n"
 "Use o botÃ£o direito do mouse para reduzi-la."
 
-#: ../widgets/menus/gal-define-views-dialog.c:76
+#: ../widgets/menus/gal-define-views-dialog.c:74
 #: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr "ColeÃ§Ã£o"
 
-#: ../widgets/menus/gal-define-views-dialog.c:358
+#: ../widgets/menus/gal-define-views-dialog.c:356
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Definir visÃµes para %s"
 
+#: ../widgets/menus/gal-define-views-dialog.c:364
 #: ../widgets/menus/gal-define-views-dialog.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:368
 msgid "Define Views"
 msgstr "Definir visÃµes"
 
@@ -23049,17 +22005,16 @@ msgid "Define Views for \"%s\""
 msgstr "Definir visÃµes para \"%s\""
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
 #: ../widgets/table/e-table-scrolled.c:215
 #: ../widgets/table/e-table-scrolled.c:216
 msgid "Table"
 msgstr "Tabela"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
 msgid "Instance"
 msgstr "InstÃ¢ncia"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:281
 msgid "Save Current View"
 msgstr "Salvar a visÃ£o atual"
 
@@ -23072,17 +22027,17 @@ msgid "_Replace existing view"
 msgstr "Substitui_r a visÃ£o existente"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:581
-#: ../widgets/menus/gal-view-menus.c:367
+#: ../widgets/menus/gal-view-instance.c:580
+#: ../widgets/menus/gal-view-menus.c:365
 msgid "Custom View"
 msgstr "VisÃ£o personalizada"
 
-#: ../widgets/menus/gal-view-instance.c:582
+#: ../widgets/menus/gal-view-instance.c:581
 msgid "Save Custom View"
 msgstr "Salvar visÃ£o personalizada"
 
-#: ../widgets/menus/gal-view-instance.c:586
-#: ../widgets/menus/gal-view-menus.c:391
+#: ../widgets/menus/gal-view-instance.c:585
+#: ../widgets/menus/gal-view-menus.c:388
 msgid "Define Views..."
 msgstr "Definir visÃµes..."
 
@@ -23090,32 +22045,32 @@ msgstr "Definir visÃµes..."
 msgid "C_urrent View"
 msgstr "VisÃ£o a_tual"
 
-#: ../widgets/menus/gal-view-menus.c:328
+#: ../widgets/menus/gal-view-menus.c:327
 #, c-format
 msgid "Select View: %s"
 msgstr "Seleciona a visÃ£o %s"
 
-#: ../widgets/menus/gal-view-menus.c:372
+#: ../widgets/menus/gal-view-menus.c:370
 msgid "Current view is a customized view"
 msgstr "VisÃ£o atual Ã© personalizada"
 
-#: ../widgets/menus/gal-view-menus.c:377
+#: ../widgets/menus/gal-view-menus.c:374
 msgid "Save Custom View..."
 msgstr "Salvar visÃ£o personalizada..."
 
-#: ../widgets/menus/gal-view-menus.c:382
+#: ../widgets/menus/gal-view-menus.c:379
 msgid "Save current custom view"
 msgstr "Salvar visÃ£o atual personalizada"
 
-#: ../widgets/menus/gal-view-menus.c:396
+#: ../widgets/menus/gal-view-menus.c:393
 msgid "Create or edit views"
 msgstr "Cria ou edita visÃµes"
 
-#: ../widgets/menus/gal-view-new-dialog.c:70
+#: ../widgets/menus/gal-view-new-dialog.c:68
 msgid "Factory"
 msgstr "FÃ¡brica"
 
-#: ../widgets/menus/gal-view-new-dialog.c:105
+#: ../widgets/menus/gal-view-new-dialog.c:103
 msgid "Define New View"
 msgstr "Definir nova visÃ£o"
 
@@ -23131,64 +22086,180 @@ msgstr "Tipo de visÃ£o"
 msgid "Type of view:"
 msgstr "Tipo de visÃ£o:"
 
-#: ../widgets/misc/e-attachment-bar.c:1132
-msgid "Attachment Bar"
-msgstr "Barra de anexos"
+#: ../widgets/misc/e-attachment.c:990
+#, fuzzy
+msgid "Attached message"
+msgstr "Mensagem anexa"
 
-#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
-#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "NÃ£o Ã© possÃvel anexar o arquivo %s: %s"
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
+#: ../widgets/misc/e-attachment-store.c:636
+#, fuzzy
+msgid "attachment.dat"
+msgstr "anexo"
 
-#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "NÃ£o Ã© possÃvel anexar o arquivo %s: nÃ£o Ã© um arquivo comum"
+#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2619
+msgid "A load operation is already in progress"
+msgstr ""
+
+#: ../widgets/misc/e-attachment.c:1830 ../widgets/misc/e-attachment.c:2627
+msgid "A save operation is already in progress"
+msgstr ""
+
+#: ../widgets/misc/e-attachment.c:1923
+#, fuzzy, c-format
+msgid "Could not load '%s'"
+msgstr "NÃ£o foi possÃvel carregar o catÃ¡logo de endereÃ§os"
+
+#: ../widgets/misc/e-attachment.c:1926
+#, fuzzy, c-format
+msgid "Could not load the attachment"
+msgstr "NÃ£o foi possÃvel abrir o link."
+
+#: ../widgets/misc/e-attachment.c:2190
+#, fuzzy, c-format
+msgid "Could not open '%s'"
+msgstr "NÃ£o foi possÃvel abrir a fonte"
+
+#: ../widgets/misc/e-attachment.c:2193
+#, fuzzy, c-format
+msgid "Could not open the attachment"
+msgstr "NÃ£o foi possÃvel abrir o link."
+
+#: ../widgets/misc/e-attachment.c:2635
+#, fuzzy
+msgid "Attachment contents not loaded"
+msgstr "Lembrete de anexos"
 
-#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/e-attachment.c:2712
+#, fuzzy, c-format
+msgid "Could not save '%s'"
+msgstr "NÃ£o foi possÃvel executar \"%s\": %s\n"
+
+#: ../widgets/misc/e-attachment.c:2715
+#, fuzzy, c-format
+msgid "Could not save the attachment"
+msgstr "Selecionar a pasta para salvar todos os anexos"
+
+#: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "Propriedades do anexo"
 
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "File name:"
-msgstr "Nome do arquivo:"
+#: ../widgets/misc/e-attachment-dialog.c:328
+#, fuzzy
+msgid "_Filename:"
+msgstr "_Nome do arquivo:"
+
+#: ../widgets/misc/e-attachment-dialog.c:363
+#, fuzzy
+msgid "MIME Type:"
+msgstr "Tipo MIME"
+
+#: ../widgets/misc/e-attachment-handler-image.c:95
+#, fuzzy
+msgid "Could not set as background"
+msgstr "Usar como Imagem de _Fundo"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:87
+#, fuzzy
+msgid "Could not send attachment"
+msgid_plural "Could not send attachments"
+msgstr[0] "NÃ£o foi possÃvel abrir o link."
+msgstr[1] "NÃ£o foi possÃvel abrir o link."
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:129
+#, fuzzy
+msgid "_Send To..."
+msgstr "Enviar para:"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:131
+#, fuzzy
+msgid "Send the selected attachments somewhere"
+msgstr "Selecione a pasta para salvar os anexos selecionados..."
+
+#: ../widgets/misc/e-attachment-icon-view.c:480
+#: ../widgets/misc/e-attachment-tree-view.c:517
+#, fuzzy
+msgid "Loading"
+msgstr "Carregando..."
+
+#: ../widgets/misc/e-attachment-icon-view.c:492
+#: ../widgets/misc/e-attachment-tree-view.c:529
+#, fuzzy
+msgid "Saving"
+msgstr "Sombreamento"
+
+#: ../widgets/misc/e-attachment-paned.c:87
+msgid "Hide _Attachment Bar"
+msgstr "Ocultar barra de _anexos"
+
+#: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:626
+msgid "Show _Attachment Bar"
+msgstr "Mostrar barra de _anexos"
+
+#: ../widgets/misc/e-attachment-store.c:541
+#, fuzzy
+msgid "Add Attachment"
+msgstr "Anexo"
+
+#: ../widgets/misc/e-attachment-store.c:544
+msgid "A_ttach"
+msgstr "Ane_xar"
+
+#: ../widgets/misc/e-attachment-store.c:607
+#, fuzzy
+msgid "Save Attachment"
+msgid_plural "Save Attachments"
+msgstr[0] "Salvar anexos"
+msgstr[1] "Salvar anexos"
+
+#: ../widgets/misc/e-attachment-view.c:300
+msgid "S_ave All"
+msgstr "Salvar _tudo"
+
+#: ../widgets/misc/e-attachment-view.c:326
+#, fuzzy
+msgid "A_dd Attachment..."
+msgstr "_Adicionar anexo..."
 
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "MIME type:"
-msgstr "Tipo MIME:"
+#: ../widgets/misc/e-attachment-view.c:643
+#, fuzzy, c-format
+msgid "Open with \"%s\""
+msgstr "Abrir com %s..."
 
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "Suggest automatic display of attachment"
-msgstr "Sugerir exibiÃ§Ã£o automÃ¡tica do anexo"
+#: ../widgets/misc/e-attachment-view.c:646
+#, fuzzy, c-format
+msgid "Open this attachment in %s"
+msgstr "Salvar anexo como"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1267
+#: ../widgets/misc/e-calendar-item.c:1253
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:220
+#: ../widgets/misc/e-calendar.c:217
 msgid "Month Calendar"
 msgstr "Agenda mensal"
 
 #: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3644
-#: ../widgets/text/e-text.c:3645
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3632
+#: ../widgets/text/e-text.c:3633
 msgid "Fill color"
 msgstr "Cor de preenchimento"
 
 #: ../widgets/misc/e-canvas-background.c:461
 #: ../widgets/misc/e-canvas-background.c:462
 #: ../widgets/misc/e-canvas-background.c:468
-#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3651
-#: ../widgets/text/e-text.c:3652 ../widgets/text/e-text.c:3659
-#: ../widgets/text/e-text.c:3660
+#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3639
+#: ../widgets/text/e-text.c:3640 ../widgets/text/e-text.c:3646
+#: ../widgets/text/e-text.c:3647
 msgid "GDK fill color"
 msgstr "Cor de preenchimento GDK"
 
 #: ../widgets/misc/e-canvas-background.c:475
-#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3666
-#: ../widgets/text/e-text.c:3667
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3653
+#: ../widgets/text/e-text.c:3654
 msgid "Fill stipple"
 msgstr "Preencher pontilhado"
 
@@ -23212,26 +22283,25 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1417
-#: ../widgets/table/e-table-group-container.c:999
-#: ../widgets/table/e-table-group-leaf.c:644
-#: ../widgets/table/e-table-item.c:3070
+#: ../widgets/misc/e-canvas-vbox.c:89 ../widgets/misc/e-reflow.c:1414
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:649
+#: ../widgets/table/e-table-item.c:3062
 msgid "Minimum width"
 msgstr "Largura mÃnima"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1418
-#: ../widgets/table/e-table-group-container.c:1000
-#: ../widgets/table/e-table-group-leaf.c:645
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/misc/e-canvas-vbox.c:90 ../widgets/misc/e-reflow.c:1415
+#: ../widgets/table/e-table-group-container.c:1002
+#: ../widgets/table/e-table-group-leaf.c:650
+#: ../widgets/table/e-table-item.c:3063
 msgid "Minimum Width"
 msgstr "Largura mÃnima"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
 msgid "Spacing"
 msgstr "EspaÃ§amento"
 
-#: ../widgets/misc/e-cell-date-edit.c:289
+#: ../widgets/misc/e-cell-date-edit.c:296
 msgid "Now"
 msgstr "Agora"
 
@@ -23240,7 +22310,7 @@ msgstr "Agora"
 msgid "The time must be in the format: %s"
 msgstr "A hora deve estar no formato: %s"
 
-#: ../widgets/misc/e-cell-percent.c:77
+#: ../widgets/misc/e-cell-percent.c:76
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "O valor percentual deve estar entre 0 e 100, inclusive"
 
@@ -23339,146 +22409,90 @@ msgstr "Outro..."
 msgid "Ch_aracter Encoding"
 msgstr "C_odificaÃ§Ã£o de caracteres"
 
-#: ../widgets/misc/e-dateedit.c:303
+#: ../widgets/misc/e-dateedit.c:295
 msgid "Date and Time"
 msgstr "Data e hora"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:315
 msgid "Text entry to input date"
 msgstr "Entrada de texto para digitar data"
 
-#: ../widgets/misc/e-dateedit.c:346
+#: ../widgets/misc/e-dateedit.c:337
 msgid "Click this button to show a calendar"
 msgstr "Clique neste botÃ£o para mostrar uma agenda"
 
-#: ../widgets/misc/e-dateedit.c:388
+#: ../widgets/misc/e-dateedit.c:379
 msgid "Drop-down combination box to select time"
 msgstr "Caixa desdobrÃ¡vel de seleÃ§Ã£o para selecionar o horÃ¡rio"
 
-#: ../widgets/misc/e-dateedit.c:464
+#: ../widgets/misc/e-dateedit.c:455
 msgid "No_w"
 msgstr "Agora"
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:461
 msgid "_Today"
 msgstr "Hoje"
 
-#: ../widgets/misc/e-dateedit.c:1635
+#: ../widgets/misc/e-dateedit.c:1583
 msgid "Invalid Date Value"
 msgstr "Data invÃ¡lida"
 
-#: ../widgets/misc/e-dateedit.c:1664
+#: ../widgets/misc/e-dateedit.c:1613
 msgid "Invalid Time Value"
 msgstr "Hora invÃ¡lida"
 
-#: ../widgets/misc/e-expander.c:182
-msgid "Expanded"
-msgstr "Expandido"
-
-#: ../widgets/misc/e-expander.c:183
-msgid "Whether or not the expander is expanded"
-msgstr "O expansor estÃ¡ expandido"
-
-#: ../widgets/misc/e-expander.c:191
-msgid "Text of the expander's label"
-msgstr "Texto do rÃ³tulo do expansor"
-
-#: ../widgets/misc/e-expander.c:198
-msgid "Use underline"
-msgstr "Usar sublinhado"
-
-#: ../widgets/misc/e-expander.c:199
-msgid ""
-"If set, an underline in the text indicates the next character should be used "
-"for the mnemonic accelerator key"
-msgstr ""
-"Se configurado, um sublinhado no texto indica que o prÃ³ximo caractere deve "
-"ser usado como a tecla de atalho"
-
-#: ../widgets/misc/e-expander.c:207
-msgid "Space to put between the label and the child"
-msgstr "EspaÃ§o que deve ser posto entre o rÃ³tulo e o filho"
-
-#: ../widgets/misc/e-expander.c:216
-msgid "Label widget"
-msgstr "RÃ³tulo do componente"
-
-#: ../widgets/misc/e-expander.c:217
-msgid "A widget to display in place of the usual expander label"
-msgstr "Um widget para exibir no lugar do usual rÃ³tulo do expansor"
-
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
-msgid "Expander Size"
-msgstr "Tamanho do expansor"
-
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
-msgid "Size of the expander arrow"
-msgstr "Tamanho da seta do expansor"
-
-#: ../widgets/misc/e-expander.c:232
-msgid "Indicator Spacing"
-msgstr "EspaÃ§amento do indicador"
-
-#: ../widgets/misc/e-expander.c:233
-msgid "Spacing around expander arrow"
-msgstr "EspaÃ§amento ao redor da seta do expansor"
-
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:126 ../widgets/misc/e-filter-bar.c:179
-#: ../widgets/misc/e-filter-bar.c:307 ../widgets/misc/e-filter-bar.c:749
+#: ../widgets/misc/e-filter-bar.c:123 ../widgets/misc/e-filter-bar.c:178
+#: ../widgets/misc/e-filter-bar.c:306 ../widgets/misc/e-filter-bar.c:737
 msgid "Advanced Search"
 msgstr "Pesquisa avanÃ§ada"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:230
+#: ../widgets/misc/e-filter-bar.c:229
 msgid "Save Search"
 msgstr "Salvar pesquisa"
 
-#: ../widgets/misc/e-filter-bar.c:267
+#: ../widgets/misc/e-filter-bar.c:266
 msgid "_Searches"
 msgstr "_Pesquisas"
 
-#: ../widgets/misc/e-filter-bar.c:269
+#: ../widgets/misc/e-filter-bar.c:268
 msgid "Searches"
 msgstr "Pesquisas"
 
-#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
+#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:110
 msgid "_Save Search..."
 msgstr "_Salvar pesquisa..."
 
-#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
+#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:111
 msgid "_Edit Saved Searches..."
 msgstr "_Editar pesquisas salvas..."
 
-#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
+#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:112
 msgid "_Advanced Search..."
 msgstr "Pesquisa _avanÃ§ada..."
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:103
 msgid "All Accounts"
 msgstr "Todas as contas"
 
-#: ../widgets/misc/e-filter-bar.h:108
+#: ../widgets/misc/e-filter-bar.h:104
 msgid "Current Account"
 msgstr "Conta atual"
 
-#: ../widgets/misc/e-filter-bar.h:109
+#: ../widgets/misc/e-filter-bar.h:105
 msgid "Current Folder"
 msgstr "Pasta atual"
 
-#: ../widgets/misc/e-filter-bar.h:110
-msgid "Current Message"
-msgstr "Mensagem atual"
-
-#: ../widgets/misc/e-image-chooser.c:169
+#: ../widgets/misc/e-image-chooser.c:168
 msgid "Choose Image"
 msgstr "Escolher imagem"
 
-#: ../widgets/misc/e-map.c:627
+#: ../widgets/misc/e-map.c:605
 msgid "World Map"
 msgstr "Mapa-MÃºndi"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:607
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -23495,102 +22509,101 @@ msgstr "Conectado"
 msgid "The button state is online"
 msgstr "O estado do botÃ£o Ã© conectado"
 
-#: ../widgets/misc/e-pilot-settings.c:102
+#: ../widgets/misc/e-pilot-settings.c:99
 msgid "Sync with:"
 msgstr "Sincronizar com:"
 
-#: ../widgets/misc/e-pilot-settings.c:110
+#: ../widgets/misc/e-pilot-settings.c:107
 msgid "Sync Private Records:"
 msgstr "Sincronizar registros particulares:"
 
-#: ../widgets/misc/e-pilot-settings.c:119
+#: ../widgets/misc/e-pilot-settings.c:116
 msgid "Sync Categories:"
 msgstr "Sincronizar categorias:"
 
-#: ../widgets/misc/e-reflow.c:1439 ../widgets/misc/e-reflow.c:1440
+#: ../widgets/misc/e-reflow.c:1435 ../widgets/misc/e-reflow.c:1436
 msgid "Empty message"
 msgstr "Mensagem vazia"
 
-#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
+#: ../widgets/misc/e-reflow.c:1442 ../widgets/misc/e-reflow.c:1443
 msgid "Reflow model"
 msgstr "Modelo de refluxo"
 
-#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
+#: ../widgets/misc/e-reflow.c:1449 ../widgets/misc/e-reflow.c:1450
 msgid "Column width"
 msgstr "Largura da coluna"
 
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
-#: ../widgets/misc/e-search-bar.c:472
+#: ../widgets/misc/e-search-bar.c:92 ../widgets/misc/e-search-bar.c:359
+#: ../widgets/misc/e-search-bar.c:503 ../widgets/misc/e-search-bar.c:505
+#: ../widgets/misc/e-search-bar.c:1021
 msgid "Search"
 msgstr "Pesquisar"
 
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
-#: ../widgets/misc/e-search-bar.c:472
+#: ../widgets/misc/e-search-bar.c:359 ../widgets/misc/e-search-bar.c:503
+#: ../widgets/misc/e-search-bar.c:505
 msgid "Click here to change the search type"
 msgstr "Clicar aqui para alterar o tipo de pesquisa"
 
-#: ../widgets/misc/e-search-bar.c:603
+#: ../widgets/misc/e-search-bar.c:637
 msgid "_Search"
 msgstr "_Pesquisar"
 
-#: ../widgets/misc/e-search-bar.c:609
+#: ../widgets/misc/e-search-bar.c:643
 msgid "_Find Now"
 msgstr "_Localizar agora"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:644
 msgid "_Clear"
 msgstr "Lim_par"
 
-#: ../widgets/misc/e-search-bar.c:865
+#: ../widgets/misc/e-search-bar.c:899
 msgid "Item ID"
 msgstr "ID do item"
 
-#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3566
-#: ../widgets/text/e-text.c:3567
+#: ../widgets/misc/e-search-bar.c:906 ../widgets/text/e-text.c:3555
+#: ../widgets/text/e-text.c:3556
 msgid "Text"
 msgstr "Texto"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1003
+#: ../widgets/misc/e-search-bar.c:1053
 msgid "Sho_w: "
 msgstr "M_ostrar: "
 
-#. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
-#. the term to search for
-#: ../widgets/misc/e-search-bar.c:1020
+#: ../widgets/misc/e-search-bar.c:1072
 msgid "Sear_ch: "
 msgstr "Pesquisa_r: "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1032
+#: ../widgets/misc/e-search-bar.c:1088
 msgid " i_n "
 msgstr " em "
 
-#: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:806
+#: ../widgets/misc/e-selection-model-array.c:593
+#: ../widgets/table/e-tree-selection-model.c:803
 msgid "Cursor Row"
 msgstr "Linha do cursor"
 
-#: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:813
+#: ../widgets/misc/e-selection-model-array.c:600
+#: ../widgets/table/e-tree-selection-model.c:810
 msgid "Cursor Column"
 msgstr "Coluna do cursor"
 
-#: ../widgets/misc/e-selection-model.c:209
+#: ../widgets/misc/e-selection-model.c:208
 msgid "Sorter"
 msgstr "Ordenador"
 
-#: ../widgets/misc/e-selection-model.c:216
+#: ../widgets/misc/e-selection-model.c:215
 msgid "Selection Mode"
 msgstr "Modo de seleÃ§Ã£o"
 
-#: ../widgets/misc/e-selection-model.c:224
+#: ../widgets/misc/e-selection-model.c:223
 msgid "Cursor Mode"
 msgstr "Modo do cursor"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:519
 msgid "When de_leted:"
 msgstr "Quando exc_luÃda:"
 
@@ -23614,19 +22627,19 @@ msgstr "<b>Acompanhamento de status</b>"
 msgid "A_uto-delete sent item"
 msgstr "E_xcluir automaticamente item enviado"
 
-#: ../widgets/misc/e-send-options.glade.h:7
+#: ../widgets/misc/e-send-options.glade.h:6
 msgid "Creat_e a sent item to track information"
 msgstr "Criar um it_em de envio para acompanhar o estado"
 
-#: ../widgets/misc/e-send-options.glade.h:8
+#: ../widgets/misc/e-send-options.glade.h:7
 msgid "Deli_vered and opened"
 msgstr "Entre_gue e aberta"
 
-#: ../widgets/misc/e-send-options.glade.h:9
+#: ../widgets/misc/e-send-options.glade.h:8
 msgid "Gene_ral Options"
 msgstr "OpÃ§Ãµes Ge_rais"
 
-#: ../widgets/misc/e-send-options.glade.h:10
+#: ../widgets/misc/e-send-options.glade.h:9
 msgid ""
 "None\n"
 "Mail Receipt"
@@ -23634,7 +22647,7 @@ msgstr ""
 "Nenhum\n"
 "Enviar recibo"
 
-#: ../widgets/misc/e-send-options.glade.h:12
+#: ../widgets/misc/e-send-options.glade.h:11
 msgid ""
 "Normal\n"
 "Proprietary\n"
@@ -23650,15 +22663,15 @@ msgstr ""
 "Altamente secreto\n"
 "Apenas para seus olhos"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "R_eply requested"
 msgstr "R_esposta solicitada"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid "Sta_tus Tracking"
 msgstr "Acompanhamento de s_tatus"
 
-#: ../widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:20
 msgid ""
 "Undefined\n"
 "High\n"
@@ -23670,30 +22683,35 @@ msgstr ""
 "PadrÃ£o\n"
 "Baixa"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When acce_pted:"
 msgstr "Quando a_ceito:"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When co_mpleted:"
 msgstr "Quando co_mpletado:"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "When decli_ned:"
 msgstr "Quando _recusado:"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "Wi_thin"
 msgstr "De_ntro"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_After:"
 msgstr "De_pois:"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_All information"
 msgstr "Tod_as informaÃ§Ãµes"
 
+#: ../widgets/misc/e-send-options.glade.h:30
+#, fuzzy
+msgid "_Classification:"
+msgstr "C_lassificaÃ§Ã£o"
+
 #. To translators: This means Delay the message delivery for some time
 #: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delay message delivery"
@@ -23720,46 +22738,26 @@ msgid "_When opened:"
 msgstr "_Quando aberto:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:252
+#: ../widgets/misc/e-task-widget.c:251
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:258
+#: ../widgets/misc/e-task-widget.c:257
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% concluÃdo)"
 
-#: ../widgets/misc/e-url-entry.c:105
+#: ../widgets/misc/e-url-entry.c:103
 msgid "Click here to go to URL"
 msgstr "Clicar aqui para ir para URL"
 
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "Edit Master Category List..."
-msgstr "Editar a lista de categorias principal..."
-
-#: ../widgets/misc/gal-categories.glade.h:2
-msgid "Item(s) belong to these _categories:"
-msgstr "Item(ns) pertence(m) a estas _categorias:"
-
-#: ../widgets/misc/gal-categories.glade.h:3
-msgid "_Available Categories:"
-msgstr "Ca_tegorias disponÃveis:"
-
-#: ../widgets/misc/gal-categories.glade.h:4
-msgid "categories"
-msgstr "categorias"
-
-#: ../widgets/table/e-cell-combo.c:170
+#: ../widgets/table/e-cell-combo.c:171
 msgid "popup list"
 msgstr "lista suspensa"
 
-#: ../widgets/table/e-cell-date.c:62
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
 #: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
 msgstr "Coluna selecionada"
@@ -23772,23 +22770,23 @@ msgstr "Coluna com foco"
 msgid "Unselected Column"
 msgstr "Coluna nÃ£o selecionada"
 
-#: ../widgets/table/e-cell-text.c:1794
+#: ../widgets/table/e-cell-text.c:1788
 msgid "Strikeout Column"
 msgstr "Coluna riscada"
 
-#: ../widgets/table/e-cell-text.c:1801
+#: ../widgets/table/e-cell-text.c:1795
 msgid "Underline Column"
 msgstr "Coluna sublinhada"
 
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1802
 msgid "Bold Column"
 msgstr "Coluna em negrito"
 
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1809
 msgid "Color Column"
 msgstr "Coluna colorida"
 
-#: ../widgets/table/e-cell-text.c:1829
+#: ../widgets/table/e-cell-text.c:1823
 msgid "BG Color Column"
 msgstr "Coluna da cor de fundo"
 
@@ -23812,12 +22810,12 @@ msgstr "NÃ£o ordenado"
 msgid "No grouping"
 msgstr "Sem agrupamento"
 
-#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.c:642
 #: ../widgets/table/e-table-config.glade.h:11
 msgid "Show Fields"
 msgstr "Mostrar campos"
 
-#: ../widgets/table/e-table-config.c:664
+#: ../widgets/table/e-table-config.c:663
 msgid "Available Fields"
 msgstr "Campos disponÃveis"
 
@@ -23826,7 +22824,7 @@ msgid "A_vailable Fields:"
 msgstr "Campos DisponÃ_veis:"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Ascending"
 msgstr "Crescente"
 
@@ -23839,7 +22837,7 @@ msgid "Clear _All"
 msgstr "Limpar _tudo"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Descending"
 msgstr "Decrescente"
 
@@ -23899,21 +22897,7 @@ msgstr "_Mostrar estes campos na ordem:"
 msgid "_Sort..."
 msgstr "_Ordenar..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:633
-#: ../widgets/table/e-table-field-chooser.c:66
-#: ../widgets/table/e-table-header-item.c:1886
-msgid "DnD code"
-msgstr "CÃ³digo DnD"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:640
-#: ../widgets/table/e-table-field-chooser.c:73
-#: ../widgets/table/e-table-header-item.c:1900
-msgid "Full Header"
-msgstr "CabeÃ§alho completo"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:116
+#: ../widgets/table/e-table-field-chooser-dialog.c:114
 msgid "Add a column..."
 msgstr "Adicionar uma coluna..."
 
@@ -23930,309 +22914,1834 @@ msgstr ""
 "Para adicionar uma coluna Ã  sua tabela,\n"
 "arraste-a para o local onde deve aparecer."
 
-#: ../widgets/table/e-table-group-container.c:344
+#: ../widgets/table/e-table-group-container.c:341
 #, c-format
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
 msgstr[0] "%s : %s (%d item)"
 msgstr[1] "%s : %s (%d itens)"
 
-#: ../widgets/table/e-table-group-container.c:350
+#: ../widgets/table/e-table-group-container.c:347
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d item)"
 msgstr[1] "%s (%d itens)"
 
-#: ../widgets/table/e-table-group-container.c:922
-#: ../widgets/table/e-table-group-container.c:923
-#: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-group-leaf.c:582
-#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-container.c:925
+#: ../widgets/table/e-table-group-leaf.c:586
+#: ../widgets/table/e-table-group-leaf.c:587
+#: ../widgets/table/e-table-item.c:3020 ../widgets/table/e-table-item.c:3021
 msgid "Alternating Row Colors"
 msgstr "Cores de linha alternantes"
 
-#: ../widgets/table/e-table-group-container.c:929
-#: ../widgets/table/e-table-group-container.c:930
-#: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-group-leaf.c:589
-#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
-#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-container.c:932
+#: ../widgets/table/e-table-group-leaf.c:593
+#: ../widgets/table/e-table-group-leaf.c:594
+#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-tree.c:3339 ../widgets/table/e-tree.c:3340
 msgid "Horizontal Draw Grid"
 msgstr "Grade desenhada horizontalmente"
 
-#: ../widgets/table/e-table-group-container.c:936
-#: ../widgets/table/e-table-group-container.c:937
-#: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-group-leaf.c:596
-#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
-#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-leaf.c:600
+#: ../widgets/table/e-table-group-leaf.c:601
+#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-tree.c:3345 ../widgets/table/e-tree.c:3346
 msgid "Vertical Draw Grid"
 msgstr "Grade desenhada verticalmente"
 
-#: ../widgets/table/e-table-group-container.c:943
-#: ../widgets/table/e-table-group-container.c:944
-#: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-group-leaf.c:603
-#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
-#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-leaf.c:607
+#: ../widgets/table/e-table-group-leaf.c:608
+#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-tree.c:3351 ../widgets/table/e-tree.c:3352
 msgid "Draw focus"
 msgstr "Foco de desenho"
 
-#: ../widgets/table/e-table-group-container.c:950
-#: ../widgets/table/e-table-group-container.c:951
-#: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-group-leaf.c:610
-#: ../widgets/table/e-table-item.c:3056 ../widgets/table/e-table-item.c:3057
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-container.c:953
+#: ../widgets/table/e-table-group-leaf.c:614
+#: ../widgets/table/e-table-group-leaf.c:615
+#: ../widgets/table/e-table-item.c:3048 ../widgets/table/e-table-item.c:3049
 msgid "Cursor mode"
 msgstr "Modo do cursor"
 
-#: ../widgets/table/e-table-group-container.c:957
-#: ../widgets/table/e-table-group-container.c:958
-#: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-group-leaf.c:624
-#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-leaf.c:628
+#: ../widgets/table/e-table-group-leaf.c:629
+#: ../widgets/table/e-table-item.c:3013 ../widgets/table/e-table-item.c:3014
 msgid "Selection model"
 msgstr "Modelo de seleÃ§Ã£o"
 
-#: ../widgets/table/e-table-group-container.c:964
-#: ../widgets/table/e-table-group-container.c:965
-#: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-group-leaf.c:617
-#: ../widgets/table/e-table-item.c:3063 ../widgets/table/e-table-item.c:3064
-#: ../widgets/table/e-table.c:3326 ../widgets/table/e-tree.c:3337
-#: ../widgets/table/e-tree.c:3338
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-leaf.c:621
+#: ../widgets/table/e-table-group-leaf.c:622
+#: ../widgets/table/e-table-item.c:3055 ../widgets/table/e-table-item.c:3056
+#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3333
+#: ../widgets/table/e-tree.c:3334
 msgid "Length Threshold"
 msgstr "Limiar de comprimento"
 
-#: ../widgets/table/e-table-group-container.c:971
-#: ../widgets/table/e-table-group-container.c:972
-#: ../widgets/table/e-table-group-leaf.c:658
-#: ../widgets/table/e-table-group-leaf.c:659
-#: ../widgets/table/e-table-item.c:3097 ../widgets/table/e-table-item.c:3098
-#: ../widgets/table/e-table.c:3333 ../widgets/table/e-tree.c:3369
-#: ../widgets/table/e-tree.c:3370
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-container.c:974
+#: ../widgets/table/e-table-group-leaf.c:663
+#: ../widgets/table/e-table-group-leaf.c:664
+#: ../widgets/table/e-table-item.c:3089 ../widgets/table/e-table-item.c:3090
+#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3365
+#: ../widgets/table/e-tree.c:3366
 msgid "Uniform row height"
 msgstr "Altura de linha uniforme"
 
-#: ../widgets/table/e-table-group-container.c:978
-#: ../widgets/table/e-table-group-container.c:979
-#: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-group-leaf.c:652
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-container.c:981
+#: ../widgets/table/e-table-group-leaf.c:656
+#: ../widgets/table/e-table-group-leaf.c:657
 msgid "Frozen"
 msgstr "Congelado"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1449
 msgid "Customize Current View"
 msgstr "Personalizar visÃ£o atual"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1469
 msgid "Sort _Ascending"
 msgstr "Ordem _crescente"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1470
 msgid "Sort _Descending"
 msgstr "Ordem _decrescente"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1471
 msgid "_Unsort"
 msgstr "NÃ£o _ordenar"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Group By This _Field"
 msgstr "Agrupar por este _campo"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Group By _Box"
 msgstr "Agrupar por c_aixa"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Remove This _Column"
 msgstr "Remover esta _coluna"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Add a C_olumn..."
 msgstr "Adicionar uma c_oluna..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "A_lignment"
 msgstr "A_linhamento"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "B_est Fit"
 msgstr "M_elhor ajuste"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Format Column_s..."
 msgstr "Formatar coluna_s..."
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "Custo_mize Current View..."
 msgstr "Perso_nalizar visÃ£o atual..."
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1539
 msgid "_Sort By"
 msgstr "_Ordenar por"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1557
 msgid "_Custom"
 msgstr "_Personalizar"
 
-#: ../widgets/table/e-table-header-item.c:1893
-msgid "Font Description"
-msgstr "DescriÃ§Ã£o do fonte"
-
-#: ../widgets/table/e-table-header-item.c:1914
-#: ../widgets/table/e-table-sorter.c:172
-msgid "Sort Info"
-msgstr "Ordenar informaÃ§Ã£o"
-
-#: ../widgets/table/e-table-header-item.c:1928
-#: ../widgets/table/e-tree-scrolled.c:225
-#: ../widgets/table/e-tree-scrolled.c:226
-msgid "Tree"
-msgstr "Ã?rvore"
-
-#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
+#: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
 msgid "Table header"
 msgstr "CabeÃ§alho da tabela"
 
-#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
+#: ../widgets/table/e-table-item.c:3006 ../widgets/table/e-table-item.c:3007
 msgid "Table model"
 msgstr "Modelo de tabela"
 
-#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
+#: ../widgets/table/e-table-item.c:3082 ../widgets/table/e-table-item.c:3083
 msgid "Cursor row"
 msgstr "Linha do cursor"
 
-#: ../widgets/table/e-table.c:3340 ../widgets/table/e-tree.c:3376
-#: ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-table-sorter.c:172
+msgid "Sort Info"
+msgstr "Ordenar informaÃ§Ã£o"
+
+#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3372
+#: ../widgets/table/e-tree.c:3373
 msgid "Always search"
 msgstr "Pesquisar sempre"
 
-#: ../widgets/table/e-table.c:3347
+#: ../widgets/table/e-table.c:3337
 msgid "Use click to add"
 msgstr "Usar clique para adicionar"
 
-#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree-scrolled.c:225
+#: ../widgets/table/e-tree-scrolled.c:226
+msgid "Tree"
+msgstr "Ã?rvore"
+
+#: ../widgets/table/e-tree.c:3358 ../widgets/table/e-tree.c:3359
 msgid "ETree table adapter"
 msgstr "Adaptador de tabela ETree"
 
-#: ../widgets/table/e-tree.c:3383
+#: ../widgets/table/e-tree.c:3379
 msgid "Retro Look"
 msgstr "Visual retrÃ´"
 
-#: ../widgets/table/e-tree.c:3384
+#: ../widgets/table/e-tree.c:3380
 msgid "Draw lines and +/- expanders."
 msgstr "Desenhar linhas e expansores +/-."
 
-#: ../widgets/text/e-text.c:2736
+#: ../widgets/table/e-tree.c:3386
+msgid "Expander Size"
+msgstr "Tamanho do expansor"
+
+#: ../widgets/table/e-tree.c:3387
+msgid "Size of the expander arrow"
+msgstr "Tamanho da seta do expansor"
+
+#: ../widgets/text/e-text.c:2731
 msgid "Input Methods"
 msgstr "MÃ©todos de entrada"
 
-#: ../widgets/text/e-text.c:3559 ../widgets/text/e-text.c:3560
+#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3549
 msgid "Event Processor"
 msgstr "Processador de eventos"
 
-#: ../widgets/text/e-text.c:3573 ../widgets/text/e-text.c:3574
+#: ../widgets/text/e-text.c:3562 ../widgets/text/e-text.c:3563
 msgid "Bold"
 msgstr "Negrito"
 
-#: ../widgets/text/e-text.c:3580 ../widgets/text/e-text.c:3581
+#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
 msgid "Strikeout"
 msgstr "Riscado"
 
-#: ../widgets/text/e-text.c:3587 ../widgets/text/e-text.c:3588
+#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
 msgid "Anchor"
 msgstr "Ã?ncora"
 
-#: ../widgets/text/e-text.c:3595 ../widgets/text/e-text.c:3596
+#: ../widgets/text/e-text.c:3583 ../widgets/text/e-text.c:3584
 msgid "Justification"
 msgstr "Alinhamento"
 
-#: ../widgets/text/e-text.c:3602 ../widgets/text/e-text.c:3603
+#: ../widgets/text/e-text.c:3590 ../widgets/text/e-text.c:3591
 msgid "Clip Width"
 msgstr "Largura do clip"
 
-#: ../widgets/text/e-text.c:3609 ../widgets/text/e-text.c:3610
+#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
 msgid "Clip Height"
 msgstr "Altura do clip"
 
-#: ../widgets/text/e-text.c:3616 ../widgets/text/e-text.c:3617
+#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
 msgid "Clip"
 msgstr "Clip"
 
-#: ../widgets/text/e-text.c:3623 ../widgets/text/e-text.c:3624
+#: ../widgets/text/e-text.c:3611 ../widgets/text/e-text.c:3612
 msgid "Fill clip rectangle"
 msgstr "Preencher retÃ¢ngulo do clip"
 
-#: ../widgets/text/e-text.c:3630 ../widgets/text/e-text.c:3631
+#: ../widgets/text/e-text.c:3618 ../widgets/text/e-text.c:3619
 msgid "X Offset"
 msgstr "Deslocamento X"
 
-#: ../widgets/text/e-text.c:3637 ../widgets/text/e-text.c:3638
+#: ../widgets/text/e-text.c:3625 ../widgets/text/e-text.c:3626
 msgid "Y Offset"
 msgstr "Deslocamento Y"
 
-#: ../widgets/text/e-text.c:3673 ../widgets/text/e-text.c:3674
+#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
 msgid "Text width"
 msgstr "Largura do texto"
 
-#: ../widgets/text/e-text.c:3680 ../widgets/text/e-text.c:3681
+#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
 msgid "Text height"
 msgstr "Altura do texto"
 
-#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
+#: ../widgets/text/e-text.c:3681 ../widgets/text/e-text.c:3682
 msgid "Use ellipsis"
 msgstr "Usar omissÃ£o de palavra Ã³bvia"
 
-#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
+#: ../widgets/text/e-text.c:3688 ../widgets/text/e-text.c:3689
 msgid "Ellipsis"
 msgstr "OmissÃ£o de palavras"
 
-#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
 msgid "Line wrap"
 msgstr "Quebra de linha"
 
-#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
 msgid "Break characters"
 msgstr "Caracteres de quebra"
 
-#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
 msgid "Max lines"
 msgstr "MÃ¡ximo de linhas"
 
-#: ../widgets/text/e-text.c:3745 ../widgets/text/e-text.c:3746
+#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
 msgid "Draw borders"
 msgstr "Desenhar bordas"
 
-#: ../widgets/text/e-text.c:3752 ../widgets/text/e-text.c:3753
+#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Allow newlines"
 msgstr "Permitir quebras de linha"
 
-#: ../widgets/text/e-text.c:3759 ../widgets/text/e-text.c:3760
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw background"
 msgstr "Desenhar fundo"
 
-#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3767
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Draw button"
 msgstr "Desenhar base"
 
-#: ../widgets/text/e-text.c:3773 ../widgets/text/e-text.c:3774
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Cursor position"
 msgstr "PosiÃ§Ã£o do cursor"
 
 # IM = Input Method
 #. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3781 ../widgets/text/e-text.c:3783
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3768
 msgid "IM Context"
 msgstr "Contexto do ME"
 
-#: ../widgets/text/e-text.c:3789 ../widgets/text/e-text.c:3790
+#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775
 msgid "Handle Popup"
 msgstr "AlÃ§a do popup"
 
+#~ msgid "Toggle Attachment Bar"
+#~ msgstr "Alternar barra de anexos"
+
+#~ msgid "activate"
+#~ msgstr "ativado"
+
+#~ msgid "3268"
+#~ msgstr "3268"
+
+#~ msgid "389"
+#~ msgstr "389"
+
+#~ msgid "636"
+#~ msgstr "636"
+
+#~ msgid "<b>Type:</b>"
+#~ msgstr "<b>Tipo:</b>"
+
+#~ msgid "Add Address Book"
+#~ msgstr "Adicionar catÃ¡logo de endereÃ§os"
+
+#~ msgid "Anonymously"
+#~ msgstr "Anonimamente"
+
+#~ msgid "Basic"
+#~ msgstr "BÃ¡sico"
+
+#~ msgid "Distinguished name"
+#~ msgstr "Nome distinto (DN)"
+
+#~ msgid "Email address"
+#~ msgstr "EndereÃ§o de e-mail"
+
+#~ msgid "Find Possible Search Bases"
+#~ msgstr "Localizar bases de pesquisa possÃveis"
+
+#~ msgid "Search filter"
+#~ msgstr "Filtro de pesquisa"
+
+#~ msgid "Sub"
+#~ msgstr "Sub"
+
+#~ msgid "Using email address"
+#~ msgstr "Usando endereÃ§o de e-mail"
+
+#~ msgid "Whenever Possible"
+#~ msgstr "Quando possÃvel"
+
+#~ msgid "_Add Address Book"
+#~ msgstr "_Adicionar catÃ¡logo de endereÃ§os"
+
+#~ msgid "MSN Messenger"
+#~ msgstr "MSN Messenger"
+
+#~ msgid "Novell GroupWise"
+#~ msgstr "Novell Groupwise"
+
+#~ msgid "Novell Groupwise"
+#~ msgstr "Novell Groupwise"
+
+#~ msgid "_Notes:"
+#~ msgstr "_Notas:"
+
+#~ msgid "United States"
+#~ msgstr "Estados Unidos"
+
+#~ msgid "Afghanistan"
+#~ msgstr "AfeganistÃ£o"
+
+#~ msgid "Albania"
+#~ msgstr "AlbÃ¢nia"
+
+#~ msgid "Algeria"
+#~ msgstr "ArgÃ©lia"
+
+#~ msgid "American Samoa"
+#~ msgstr "Samoa Americana"
+
+#~ msgid "Andorra"
+#~ msgstr "Andorra"
+
+#~ msgid "Angola"
+#~ msgstr "Angola"
+
+#~ msgid "Anguilla"
+#~ msgstr "Anguilla"
+
+#~ msgid "Antarctica"
+#~ msgstr "AntÃ¡rtica"
+
+#~ msgid "Antigua And Barbuda"
+#~ msgstr "AntÃgua e Barbuda"
+
+#~ msgid "Argentina"
+#~ msgstr "Argentina"
+
+#~ msgid "Armenia"
+#~ msgstr "ArmÃªnia"
+
+#~ msgid "Aruba"
+#~ msgstr "Aruba"
+
+#~ msgid "Australia"
+#~ msgstr "AustrÃ¡lia"
+
+#~ msgid "Austria"
+#~ msgstr "Ã?ustria"
+
+#~ msgid "Azerbaijan"
+#~ msgstr "AzerbaijÃ£o"
+
+#~ msgid "Bahamas"
+#~ msgstr "Bahamas"
+
+#~ msgid "Bahrain"
+#~ msgstr "Bahrain"
+
+#~ msgid "Bangladesh"
+#~ msgstr "Bangladesh"
+
+#~ msgid "Barbados"
+#~ msgstr "Barbados"
+
+#~ msgid "Belarus"
+#~ msgstr "BeielorÃºssia"
+
+#~ msgid "Belgium"
+#~ msgstr "BÃ©lgica"
+
+#~ msgid "Belize"
+#~ msgstr "Belize"
+
+#~ msgid "Benin"
+#~ msgstr "Benin"
+
+#~ msgid "Bermuda"
+#~ msgstr "Bermudas"
+
+#~ msgid "Bhutan"
+#~ msgstr "ButÃ£o"
+
+#~ msgid "Bolivia"
+#~ msgstr "BolÃvia"
+
+#~ msgid "Bosnia And Herzegowina"
+#~ msgstr "BÃ³snia e Herzegovina"
+
+#~ msgid "Botswana"
+#~ msgstr "Botswana"
+
+#~ msgid "Bouvet Island"
+#~ msgstr "Ilhas Bouvet"
+
+#~ msgid "Brazil"
+#~ msgstr "Brasil"
+
+#~ msgid "British Indian Ocean Territory"
+#~ msgstr "TerritÃ³rio do Oceano Ã?ndico BritÃ¢nico"
+
+#~ msgid "Brunei Darussalam"
+#~ msgstr "Brunei Darussalam"
+
+#~ msgid "Bulgaria"
+#~ msgstr "BulgÃ¡ria"
+
+#~ msgid "Burkina Faso"
+#~ msgstr "Burkina Faso"
+
+#~ msgid "Burundi"
+#~ msgstr "Burundi"
+
+#~ msgid "Cambodia"
+#~ msgstr "Camboja"
+
+#~ msgid "Cameroon"
+#~ msgstr "CamarÃµes"
+
+#~ msgid "Canada"
+#~ msgstr "CanadÃ¡"
+
+#~ msgid "Cape Verde"
+#~ msgstr "Cabo Verde"
+
+#~ msgid "Cayman Islands"
+#~ msgstr "Ilhas Cayman"
+
+#~ msgid "Central African Republic"
+#~ msgstr "RepÃºblica Centro-Africana"
+
+#~ msgid "Chad"
+#~ msgstr "Chade"
+
+#~ msgid "Chile"
+#~ msgstr "Chile"
+
+#~ msgid "China"
+#~ msgstr "China"
+
+#~ msgid "Christmas Island"
+#~ msgstr "Ilhas Christmas"
+
+#~ msgid "Cocos (Keeling) Islands"
+#~ msgstr "Ilhas dos Cocos"
+
+#~ msgid "Colombia"
+#~ msgstr "ColÃ´mbia"
+
+#~ msgid "Comoros"
+#~ msgstr "Comores"
+
+#~ msgid "Congo"
+#~ msgstr "Congo"
+
+#~ msgid "Congo, The Democratic Republic Of The"
+#~ msgstr "Congo, RepÃºblica DemocrÃ¡tica do"
+
+#~ msgid "Cook Islands"
+#~ msgstr "Ilhas Cook"
+
+#~ msgid "Costa Rica"
+#~ msgstr "Costa Rica"
+
+#~ msgid "Cote d'Ivoire"
+#~ msgstr "Costa do Marfim"
+
+#~ msgid "Croatia"
+#~ msgstr "CroÃ¡cia"
+
+#~ msgid "Cuba"
+#~ msgstr "Cuba"
+
+#~ msgid "Cyprus"
+#~ msgstr "Chipre"
+
+#~ msgid "Czech Republic"
+#~ msgstr "RepÃºblica Checa"
+
+#~ msgid "Denmark"
+#~ msgstr "Dinamarca"
+
+#~ msgid "Djibouti"
+#~ msgstr "Djibouti"
+
+#~ msgid "Dominica"
+#~ msgstr "Dominica"
+
+#~ msgid "Dominican Republic"
+#~ msgstr "RepÃºblica Dominicana"
+
+#~ msgid "Ecuador"
+#~ msgstr "Equador"
+
+#~ msgid "Egypt"
+#~ msgstr "Egito"
+
+#~ msgid "El Salvador"
+#~ msgstr "El Salvador"
+
+#~ msgid "Equatorial Guinea"
+#~ msgstr "GuinÃ© Equatorial"
+
+#~ msgid "Eritrea"
+#~ msgstr "Eritrea"
+
+#~ msgid "Estonia"
+#~ msgstr "EstÃ´nia"
+
+#~ msgid "Ethiopia"
+#~ msgstr "EtiÃ³pia"
+
+#~ msgid "Falkland Islands"
+#~ msgstr "Ilhas Falkland (Malvinas)"
+
+#~ msgid "Faroe Islands"
+#~ msgstr "Ilhas Faroe"
+
+#~ msgid "Fiji"
+#~ msgstr "Fiji"
+
+#~ msgid "Finland"
+#~ msgstr "FinlÃ¢ndia"
+
+#~ msgid "France"
+#~ msgstr "FranÃ§a"
+
+#~ msgid "French Guiana"
+#~ msgstr "Guiana Francesa"
+
+#~ msgid "French Polynesia"
+#~ msgstr "PolinÃ©sia Francesa"
+
+#~ msgid "French Southern Territories"
+#~ msgstr "TerritÃ³rios Franceses do Sul"
+
+#~ msgid "Gabon"
+#~ msgstr "GabÃ£o"
+
+#~ msgid "Gambia"
+#~ msgstr "GÃ¢mbia"
+
+#~ msgid "Georgia"
+#~ msgstr "GeÃ³rgia"
+
+#~ msgid "Germany"
+#~ msgstr "Alemanha"
+
+#~ msgid "Ghana"
+#~ msgstr "Gana"
+
+#~ msgid "Gibraltar"
+#~ msgstr "Gibraltar"
+
+#~ msgid "Greece"
+#~ msgstr "GrÃ©cia"
+
+#~ msgid "Greenland"
+#~ msgstr "GroenlÃ¢ndia"
+
+#~ msgid "Grenada"
+#~ msgstr "Granada"
+
+#~ msgid "Guadeloupe"
+#~ msgstr "Guadalupe"
+
+#~ msgid "Guam"
+#~ msgstr "Guam"
+
+#~ msgid "Guatemala"
+#~ msgstr "Guatemala"
+
+#~ msgid "Guernsey"
+#~ msgstr "Guernsey"
+
+#~ msgid "Guinea"
+#~ msgstr "GuinÃ©"
+
+#~ msgid "Guinea-Bissau"
+#~ msgstr "GuinÃ©-Bissau"
+
+#~ msgid "Guyana"
+#~ msgstr "Guiana"
+
+#~ msgid "Haiti"
+#~ msgstr "Haiti"
+
+#~ msgid "Heard And McDonald Islands"
+#~ msgstr "Ilhas Heard e McDonald"
+
+#~ msgid "Holy See"
+#~ msgstr "Santa SÃ©"
+
+#~ msgid "Honduras"
+#~ msgstr "Honduras"
+
+#~ msgid "Hong Kong"
+#~ msgstr "Hong Kong"
+
+#~ msgid "Hungary"
+#~ msgstr "Hungria"
+
+#~ msgid "Iceland"
+#~ msgstr "IslÃ¢ndia"
+
+#~ msgid "India"
+#~ msgstr "Ã?ndia"
+
+#~ msgid "Indonesia"
+#~ msgstr "IndonÃ©sia"
+
+#~ msgid "Iran"
+#~ msgstr "IrÃ£"
+
+#~ msgid "Iraq"
+#~ msgstr "Iraque"
+
+#~ msgid "Ireland"
+#~ msgstr "Irlanda"
+
+#~ msgid "Isle of Man"
+#~ msgstr "Ilha de Man"
+
+#~ msgid "Israel"
+#~ msgstr "Israel"
+
+#~ msgid "Italy"
+#~ msgstr "ItÃ¡lia"
+
+#~ msgid "Jamaica"
+#~ msgstr "Jamaica"
+
+#~ msgid "Japan"
+#~ msgstr "JapÃ£o"
+
+#~ msgid "Jersey"
+#~ msgstr "Jersey"
+
+#~ msgid "Jordan"
+#~ msgstr "JordÃ¢nia"
+
+#~ msgid "Kazakhstan"
+#~ msgstr "CazaquistÃ£o"
+
+#~ msgid "Kenya"
+#~ msgstr "QuÃªnia"
+
+#~ msgid "Kiribati"
+#~ msgstr "Kiribati"
+
+#~ msgid "Korea, Democratic People's Republic Of"
+#~ msgstr "CorÃ©ia do Norte"
+
+#~ msgid "Korea, Republic Of"
+#~ msgstr "CorÃ©ia do Sul"
+
+#~ msgid "Kuwait"
+#~ msgstr "Kuwait"
+
+#~ msgid "Kyrgyzstan"
+#~ msgstr "QuirguistÃ£o"
+
+#~ msgid "Laos"
+#~ msgstr "Laos"
+
+#~ msgid "Latvia"
+#~ msgstr "LetÃ´nia"
+
+#~ msgid "Lebanon"
+#~ msgstr "LÃbano"
+
+#~ msgid "Lesotho"
+#~ msgstr "Lesoto"
+
+#~ msgid "Liberia"
+#~ msgstr "LibÃ©ria"
+
+#~ msgid "Libya"
+#~ msgstr "LÃbia"
+
+#~ msgid "Liechtenstein"
+#~ msgstr "Liechtenstein"
+
+#~ msgid "Lithuania"
+#~ msgstr "LituÃ¢nia"
+
+#~ msgid "Luxembourg"
+#~ msgstr "Luxemburgo"
+
+#~ msgid "Macao"
+#~ msgstr "Macau"
+
+#~ msgid "Macedonia"
+#~ msgstr "MacedÃ´nia"
+
+#~ msgid "Madagascar"
+#~ msgstr "Madagascar"
+
+#~ msgid "Malawi"
+#~ msgstr "Malawi"
+
+#~ msgid "Malaysia"
+#~ msgstr "MalÃ¡sia"
+
+#~ msgid "Maldives"
+#~ msgstr "Maldivas"
+
+#~ msgid "Mali"
+#~ msgstr "Mali"
+
+#~ msgid "Malta"
+#~ msgstr "Malta"
+
+#~ msgid "Marshall Islands"
+#~ msgstr "Ilhas Marshall"
+
+#~ msgid "Martinique"
+#~ msgstr "Martinica"
+
+#~ msgid "Mauritania"
+#~ msgstr "MauritÃ¢nia"
+
+#~ msgid "Mauritius"
+#~ msgstr "MaurÃcio"
+
+#~ msgid "Mayotte"
+#~ msgstr "Mayotte"
+
+#~ msgid "Mexico"
+#~ msgstr "MÃ©xico"
+
+#~ msgid "Micronesia"
+#~ msgstr "MicronÃ©sia"
+
+#~ msgid "Moldova, Republic Of"
+#~ msgstr "Moldova, RepÃºblica da"
+
+#~ msgid "Monaco"
+#~ msgstr "MÃ´naco"
+
+#~ msgid "Mongolia"
+#~ msgstr "MongÃ³lia"
+
+#~ msgid "Montserrat"
+#~ msgstr "Montserrat"
+
+#~ msgid "Morocco"
+#~ msgstr "Marrocos"
+
+#~ msgid "Mozambique"
+#~ msgstr "MoÃ§ambique"
+
+#~ msgid "Myanmar"
+#~ msgstr "Myanmar"
+
+#~ msgid "Namibia"
+#~ msgstr "NamÃbia"
+
+#~ msgid "Nauru"
+#~ msgstr "Nauru"
+
+#~ msgid "Nepal"
+#~ msgstr "Nepal"
+
+#~ msgid "Netherlands"
+#~ msgstr "Holanda"
+
+#~ msgid "Netherlands Antilles"
+#~ msgstr "Antilhas Holandesas"
+
+#~ msgid "New Caledonia"
+#~ msgstr "Nova CaledÃ´nia"
+
+#~ msgid "New Zealand"
+#~ msgstr "Nova ZelÃ¢ndia"
+
+#~ msgid "Nicaragua"
+#~ msgstr "NicarÃ¡gua"
+
+#~ msgid "Niger"
+#~ msgstr "Niger"
+
+#~ msgid "Nigeria"
+#~ msgstr "NigÃ©ria"
+
+#~ msgid "Niue"
+#~ msgstr "Niue"
+
+#~ msgid "Norfolk Island"
+#~ msgstr "Ilhas Norfolk"
+
+#~ msgid "Northern Mariana Islands"
+#~ msgstr "Ilhas Marianas do Norte"
+
+#~ msgid "Norway"
+#~ msgstr "Noruega"
+
+#~ msgid "Oman"
+#~ msgstr "OmÃ£"
+
+#~ msgid "Pakistan"
+#~ msgstr "PaquistÃ£o"
+
+#~ msgid "Palau"
+#~ msgstr "Palau"
+
+#~ msgid "Palestinian Territory"
+#~ msgstr "TerritÃ³rio Palestino"
+
+#~ msgid "Panama"
+#~ msgstr "PanamÃ¡"
+
+#~ msgid "Papua New Guinea"
+#~ msgstr "Papua Nova GuinÃ©"
+
+#~ msgid "Paraguay"
+#~ msgstr "Paraguai"
+
+#~ msgid "Peru"
+#~ msgstr "Peru"
+
+#~ msgid "Philippines"
+#~ msgstr "Filipinas"
+
+#~ msgid "Pitcairn"
+#~ msgstr "Pitcairn"
+
+#~ msgid "Poland"
+#~ msgstr "PolÃ´nia"
+
+#~ msgid "Portugal"
+#~ msgstr "Portugal"
+
+#~ msgid "Puerto Rico"
+#~ msgstr "Porto Rico"
+
+#~ msgid "Qatar"
+#~ msgstr "Qatar"
+
+#~ msgid "Reunion"
+#~ msgstr "ReuniÃ£o"
+
+#~ msgid "Romania"
+#~ msgstr "RomÃªnia"
+
+#~ msgid "Russian Federation"
+#~ msgstr "FederaÃ§Ã£o Russa"
+
+#~ msgid "Rwanda"
+#~ msgstr "Ruanda"
+
+#~ msgid "Saint Kitts And Nevis"
+#~ msgstr "Saint Kitts e Nevis"
+
+#~ msgid "Saint Lucia"
+#~ msgstr "Santa LÃºcia"
+
+#~ msgid "Saint Vincent And The Grenadines"
+#~ msgstr "SÃ£o Vicente e Granadinas"
+
+#~ msgid "Samoa"
+#~ msgstr "Samoa"
+
+#~ msgid "San Marino"
+#~ msgstr "San Marino"
+
+#~ msgid "Sao Tome And Principe"
+#~ msgstr "SÃ£o Tome e PrÃncipe"
+
+#~ msgid "Saudi Arabia"
+#~ msgstr "ArÃ¡bia Saudita"
+
+#~ msgid "Senegal"
+#~ msgstr "Senegal"
+
+#~ msgid "Serbia And Montenegro"
+#~ msgstr "SÃ©rvia e Montenegro"
+
+#~ msgid "Seychelles"
+#~ msgstr "Seychelles"
+
+#~ msgid "Sierra Leone"
+#~ msgstr "Serra Leoa"
+
+#~ msgid "Singapore"
+#~ msgstr "Singapura"
+
+#~ msgid "Slovakia"
+#~ msgstr "EslovÃ¡quia"
+
+#~ msgid "Slovenia"
+#~ msgstr "EslovÃªnia"
+
+#~ msgid "Solomon Islands"
+#~ msgstr "Ilhas SalomÃ£o"
+
+#~ msgid "Somalia"
+#~ msgstr "SomÃ¡lia"
+
+#~ msgid "South Africa"
+#~ msgstr "Ã?frica do Sul"
+
+#~ msgid "South Georgia And The South Sandwich Islands"
+#~ msgstr "Ilhas Georgia do Sul e Sandwich do Sul"
+
+#~ msgid "Spain"
+#~ msgstr "Espanha"
+
+#~ msgid "Sri Lanka"
+#~ msgstr "Sri Lanka"
+
+#~ msgid "St. Helena"
+#~ msgstr "St. Helena"
+
+#~ msgid "St. Pierre And Miquelon"
+#~ msgstr "St. Pierre e Miquelon"
+
+#~ msgid "Sudan"
+#~ msgstr "SudÃ£o"
+
+#~ msgid "Suriname"
+#~ msgstr "Suriname"
+
+#~ msgid "Svalbard And Jan Mayen Islands"
+#~ msgstr "Ilhas Svalbard e Jan Mayen"
+
+#~ msgid "Swaziland"
+#~ msgstr "SuazilÃ¢ndia"
+
+#~ msgid "Sweden"
+#~ msgstr "SuÃ©cia"
+
+#~ msgid "Switzerland"
+#~ msgstr "SuÃÃ§a"
+
+#~ msgid "Syria"
+#~ msgstr "SÃria"
+
+#~ msgid "Taiwan"
+#~ msgstr "Formosa"
+
+#~ msgid "Tajikistan"
+#~ msgstr "TajiquistÃ£o"
+
+#~ msgid "Tanzania, United Republic Of"
+#~ msgstr "TanzÃ¢nia, RepÃºblica Unida da"
+
+#~ msgid "Thailand"
+#~ msgstr "TailÃ¢ndia"
+
+#~ msgid "Timor-Leste"
+#~ msgstr "Timor Leste"
+
+#~ msgid "Togo"
+#~ msgstr "Togo"
+
+#~ msgid "Tokelau"
+#~ msgstr "Tokelau"
+
+#~ msgid "Tonga"
+#~ msgstr "Tonga"
+
+#~ msgid "Trinidad And Tobago"
+#~ msgstr "Trinidad e Tobago"
+
+#~ msgid "Tunisia"
+#~ msgstr "TunÃsia"
+
+#~ msgid "Turkey"
+#~ msgstr "Turquia"
+
+#~ msgid "Turkmenistan"
+#~ msgstr "TurcomenistÃ£o"
+
+#~ msgid "Turks And Caicos Islands"
+#~ msgstr "Ilhas Turks e Caicos"
+
+#~ msgid "Tuvalu"
+#~ msgstr "Tuvalu"
+
+#~ msgid "Uganda"
+#~ msgstr "Uganda"
+
+#~ msgid "Ukraine"
+#~ msgstr "UcrÃ¢nia"
+
+#~ msgid "United Arab Emirates"
+#~ msgstr "Emirados Ã?rabes Unidos"
+
+#~ msgid "United Kingdom"
+#~ msgstr "Reino Unido"
+
+#~ msgid "United States Minor Outlying Islands"
+#~ msgstr "Ilhas ao Largo dos Estados Unidos"
+
+#~ msgid "Uruguay"
+#~ msgstr "Uruguai"
+
+#~ msgid "Uzbekistan"
+#~ msgstr "UzbequistÃ£o"
+
+#~ msgid "Vanuatu"
+#~ msgstr "Vanuatu"
+
+#~ msgid "Venezuela"
+#~ msgstr "Venezuela"
+
+#~ msgid "Viet Nam"
+#~ msgstr "VietnÃ£"
+
+#~ msgid "Virgin Islands, British"
+#~ msgstr "Ilhas Virgens, Inglaterra"
+
+#~ msgid "Virgin Islands, U.S."
+#~ msgstr "Ilhas Virgens, EUA"
+
+#~ msgid "Wallis And Futuna Islands"
+#~ msgstr "Ilhas Wallis e Futuna"
+
+#~ msgid "Western Sahara"
+#~ msgstr "Sahara Ocidental"
+
+#~ msgid "Yemen"
+#~ msgstr "IÃªmen"
+
+#~ msgid "Zambia"
+#~ msgstr "ZÃ¢mbia"
+
+#~ msgid "Zimbabwe"
+#~ msgstr "ZimbÃ¡bue"
+
+#~ msgid "AOL Instant Messenger"
+#~ msgstr "AOL Instant Messenger"
+
+#~ msgid "Yahoo Messenger"
+#~ msgstr "Yahoo Messenger"
+
+#~ msgid "Gadu-Gadu Messenger"
+#~ msgstr "Mensageiro Gadu-Gadu"
+
+#~ msgid "Service"
+#~ msgstr "ServiÃ§o"
+
+#~ msgid "Username"
+#~ msgstr "Nome do usuÃ¡rio"
+
+#~ msgid "Address _2:"
+#~ msgstr "EndereÃ§o _2:"
+
+#~ msgid "Ci_ty:"
+#~ msgstr "_Cidade:"
+
+#~ msgid "Countr_y:"
+#~ msgstr "_PaÃs:"
+
+#~ msgid "Full Address"
+#~ msgstr "EndereÃ§o completo"
+
+#~ msgid "_ZIP Code:"
+#~ msgstr "CEP:"
+
+#~ msgid "Dr."
+#~ msgstr "Dr."
+
+#~ msgid "Esq."
+#~ msgstr "Esq."
+
+#~ msgid "I"
+#~ msgstr "I"
+
+#~ msgid "II"
+#~ msgstr "II"
+
+#~ msgid "III"
+#~ msgstr "III"
+
+#~ msgid "Jr."
+#~ msgstr "Jr."
+
+#~ msgid "Miss"
+#~ msgstr "Senhorita"
+
+#~ msgid "Mr."
+#~ msgstr "Sr."
+
+#~ msgid "Mrs."
+#~ msgstr "Sra."
+
+#~ msgid "Ms."
+#~ msgstr "Srta."
+
+#~ msgid "Sr."
+#~ msgstr "Sr."
+
+#~ msgid "Add IM Account"
+#~ msgstr "Adicionar conta de MI"
+
+#~ msgid "_Account name:"
+#~ msgstr "_Nome da conta:"
+
+#~ msgid "_IM Service:"
+#~ msgstr "ServiÃ§o de M_I:"
+
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 pt. Tahoma"
+
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "8 pt. Tahoma"
+
+#~ msgid "Blank forms at end:"
+#~ msgstr "FormulÃ¡rios vazios no fim:"
+
+#~ msgid "Body"
+#~ msgstr "Corpo"
+
+#~ msgid "Bottom:"
+#~ msgstr "Inferior:"
+
+#~ msgid "Dimensions:"
+#~ msgstr "DimensÃµes:"
+
+#~ msgid "F_ont..."
+#~ msgstr "_Fonte..."
+
+#~ msgid "Fonts"
+#~ msgstr "Fontes"
+
+#~ msgid "Footer:"
+#~ msgstr "RodapÃ©:"
+
+#~ msgid "Header/Footer"
+#~ msgstr "CabeÃ§alho/RodapÃ©"
+
+#~ msgid "Headings"
+#~ msgstr "CabeÃ§alhos"
+
+#~ msgid "Headings for each letter"
+#~ msgstr "CabeÃ§alhos para cada carta"
+
+#~ msgid "Height:"
+#~ msgstr "Altura:"
+
+#~ msgid "Immediately follow each other"
+#~ msgstr "Aparecem uma apÃ³s a outra"
+
+#~ msgid "Include:"
+#~ msgstr "Incluir:"
+
+#~ msgid "Landscape"
+#~ msgstr "Paisagem"
+
+#~ msgid "Left:"
+#~ msgstr "Esquerda:"
+
+#~ msgid "Letter tabs on side"
+#~ msgstr "TabulaÃ§Ãµes ao lado"
+
+#~ msgid "Margins"
+#~ msgstr "Margens"
+
+#~ msgid "Number of columns:"
+#~ msgstr "NÃºmero de colunas:"
+
+#~ msgid "Options"
+#~ msgstr "OpÃ§Ãµes"
+
+#~ msgid "Orientation"
+#~ msgstr "OrientaÃ§Ã£o"
+
+#~ msgid "Page"
+#~ msgstr "PÃ¡gina"
+
+#~ msgid "Page Setup:"
+#~ msgstr "ConfiguraÃ§Ã£o de pÃ¡gina:"
+
+#~ msgid "Paper"
+#~ msgstr "Papel"
+
+#~ msgid "Paper source:"
+#~ msgstr "Origem do papel:"
+
+#~ msgid "Portrait"
+#~ msgstr "Retrato"
+
+#~ msgid "Preview:"
+#~ msgstr "Visualizar:"
+
+#~ msgid "Print using gray shading"
+#~ msgstr "Imprimir usando sombreamento"
+
+#~ msgid "Reverse on even pages"
+#~ msgstr "Inverter nas pÃ¡ginas pares"
+
+#~ msgid "Right:"
+#~ msgstr "Direita:"
+
+#~ msgid "Sections:"
+#~ msgstr "SeÃ§Ãµes:"
+
+#~ msgid "Start on a new page"
+#~ msgstr "ComeÃ§ar em uma nova pÃ¡gina"
+
+#~ msgid "Style name:"
+#~ msgstr "Nome do estilo:"
+
+#~ msgid "Top:"
+#~ msgstr "Superior:"
+
+#~ msgid "Width:"
+#~ msgstr "Largura:"
+
+#~ msgid "_Font..."
+#~ msgstr "_Fonte..."
+
+#~ msgid "Whether to use daylight savings time while displaying events."
+#~ msgstr "Usar horÃ¡rio de verÃ£o ao exibir os eventos."
+
+#~ msgid "daylight savings time"
+#~ msgstr "horÃ¡rio de verÃ£o"
+
+#~ msgid "after"
+#~ msgstr "apÃ³s"
+
+#~ msgid "day(s)"
+#~ msgstr "dia(s)"
+
+#~ msgid "end of appointment"
+#~ msgstr "fim do compromisso"
+
+#~ msgid "hour(s)"
+#~ msgstr "hora(s)"
+
+#~ msgid "minute(s)"
+#~ msgstr "minuto(s)"
+
+#~ msgid "Adjust for daylight sa_ving time"
+#~ msgstr "Ajustar ao horÃ¡rio de _verÃ£o"
+
+#~ msgid "Attached message - %s"
+#~ msgstr "Mensagem anexa - %s"
+
+#~ msgid "<b>%d</b> Attachment"
+#~ msgid_plural "<b>%d</b> Attachments"
+#~ msgstr[0] "<b>%d</b> Anexo"
+#~ msgstr[1] "<b>%d</b> Anexos"
+
+#~ msgid "Hide Attachment _Bar"
+#~ msgstr "Ocultar _barra de anexos"
+
+#~ msgid "Show Attachment _Bar"
+#~ msgstr "Mostrar _barra de anexos"
+
+#~ msgid "Show Attachments"
+#~ msgstr "Mostrar anexos"
+
+#~ msgid "Press space key to toggle attachment bar"
+#~ msgstr "Pressione a tecla de espaÃ§o para alternar a barra de anexos"
+
+#~ msgid "1 day before appointment"
+#~ msgstr "1 dia para o compromisso"
+
+#~ msgid "1 hour before appointment"
+#~ msgstr "1 hora para o compromisso"
+
+#~ msgid "15 minutes before appointment"
+#~ msgstr "15 minutos para o compromisso"
+
+#~ msgid "for"
+#~ msgstr "para"
+
+#~ msgid "<b>Att_endees</b>"
+#~ msgstr "<b>_Participantes</b>"
+
+#~ msgid "C_hange Organizer"
+#~ msgstr "_Alterar organizador"
+
+#~ msgid "Co_ntacts..."
+#~ msgstr "Co_ntatos..."
+
+#~ msgid "forever"
+#~ msgstr "para sempre"
+
+#~ msgid "month(s)"
+#~ msgstr "mÃªs(es)"
+
+#~ msgid "week(s)"
+#~ msgstr "semana(s)"
+
+#~ msgid "year(s)"
+#~ msgstr "ano(s)"
+
+#~ msgid "_Save Selected"
+#~ msgstr "_Salvar selecionado"
+
+#~ msgid "April"
+#~ msgstr "Abril"
+
+#~ msgid "August"
+#~ msgstr "Agosto"
+
+#~ msgid "December"
+#~ msgstr "Dezembro"
+
+#~ msgid "February"
+#~ msgstr "Fevereiro"
+
+#~ msgid "January"
+#~ msgstr "Janeiro"
+
+#~ msgid "July"
+#~ msgstr "Julho"
+
+#~ msgid "June"
+#~ msgstr "Junho"
+
+#~ msgid "March"
+#~ msgstr "MarÃ§o"
+
+#~ msgid "May"
+#~ msgstr "Maio"
+
+#~ msgid "November"
+#~ msgstr "Novembro"
+
+#~ msgid "October"
+#~ msgstr "Outubro"
+
+#~ msgid "September"
+#~ msgstr "Setembro"
+
+#~ msgid "Could not open autosave file"
+#~ msgstr "NÃ£o foi possÃvel abrir o arquivo de salvamento automÃ¡tico"
+
+#~ msgid "_Post-To Field"
+#~ msgstr "Campo _Publicar em"
+
+#~ msgid "Toggles whether the Post-To field is displayed"
+#~ msgstr "Exibe/oculta o campo Publicar em"
+
+#~ msgid "_Subject Field"
+#~ msgstr "Campo a_ssunto"
+
+#~ msgid "Toggles whether the Subject field is displayed"
+#~ msgstr "Exibe/oculta o campo Assunto"
+
+#~ msgid "_To Field"
+#~ msgstr "Campo _Para"
+
+#~ msgid "Toggles whether the To field is displayed"
+#~ msgstr "Exibe/oculta o campo Para"
+
+#~ msgid "ago"
+#~ msgstr "atrÃ¡s"
+
+#~ msgid "months"
+#~ msgstr "meses"
+
+#~ msgid "the current time"
+#~ msgstr "o instante atual"
+
+#~ msgid "the time you specify"
+#~ msgstr "um instante especificado por vocÃª"
+
+#~ msgid "years"
+#~ msgstr "anos"
+
+#~ msgid "Retrieving Message..."
+#~ msgstr "Recuperando mensagem..."
+
+#~ msgid "C_all To..."
+#~ msgstr "Ch_amar..."
+
+#~ msgid "Completed on %B %d, %Y, %l:%M %p"
+#~ msgstr "ConcluÃda em %d de %B, %Y, %H:%M"
+
+#~ msgid "by %B %d, %Y, %l:%M %p"
+#~ msgstr "atÃ© %d de %B, %Y, %H:%M"
+
+#~ msgid "_Save Selected..."
+#~ msgstr "_Salvar selecionado..."
+
+#~ msgid "%d at_tachment"
+#~ msgid_plural "%d at_tachments"
+#~ msgstr[0] "%d ane_xo"
+#~ msgstr[1] "%d ane_xos"
+
+#~ msgid "S_ave"
+#~ msgstr "_Salvar"
+
+#~ msgid "No Attachment"
+#~ msgstr "Sem anexo"
+
+#~ msgid " (%a, %R %Z)"
+#~ msgstr " (%a, %R %Z)"
+
+#~ msgid " (%R %Z)"
+#~ msgstr " (%R %Z)"
+
+#~ msgid ""
+#~ "Enable side bar search feature so that you can start interactive "
+#~ "searching by typing in the text. Use is that you can easily find a folder "
+#~ "in that side bar by just typing the folder name and the selection jumps "
+#~ "automatically to that folder."
+#~ msgstr ""
+#~ "Habilitando o recurso barra de pesquisa lateral, vocÃª pode iniciar "
+#~ "pesquisas interativas digitando no texto. Usando isso vocÃª pode "
+#~ "facilmente localizar uma pasta apenas digitando o nome da pasta na barra "
+#~ "lateral e a seleÃ§Ã£o irÃ¡ automaticamente para aquela pasta."
+
+#~ msgid "View/Bcc menu item is checked"
+#~ msgstr "Item de menu Ver/CCO estÃ¡ selecionado"
+
+#~ msgid "View/Bcc menu item is checked."
+#~ msgstr "Item de menu Ver/CCO estÃ¡ selecionado."
+
+#~ msgid "View/Cc menu item is checked"
+#~ msgstr "Item de menu Ver/Cc estÃ¡ selecionado"
+
+#~ msgid "View/Cc menu item is checked."
+#~ msgstr "Item de menu Ver/Cc estÃ¡ selecionado."
+
+#~ msgid "View/From menu item is checked"
+#~ msgstr "Item de menu Ver/De estÃ¡ selecionado"
+
+#~ msgid "View/From menu item is checked."
+#~ msgstr "Item de menu Ver/De estÃ¡ selecionado."
+
+#~ msgid "View/PostTo menu item is checked"
+#~ msgstr "Item de menu Ver/Publicar Em estÃ¡ selecionado"
+
+#~ msgid "View/PostTo menu item is checked."
+#~ msgstr "Item de menu Ver/Publicar Em estÃ¡ selecionado."
+
+#~ msgid "View/ReplyTo menu item is checked"
+#~ msgstr "Item de menu Ver/Responder A estÃ¡ selecionado"
+
+#~ msgid "View/ReplyTo menu item is checked."
+#~ msgstr "Item de menu Ver/Responder A estÃ¡ selecionado."
+
+#~ msgid " Ch_eck for Supported Types "
+#~ msgstr " V_erificar Tipos com Suporte "
+
+#~ msgid "Ch_eck for Supported Types "
+#~ msgstr "_Verificar tipos com suporte "
+
+#~ msgid "Do not quote"
+#~ msgstr "NÃ£o citar"
+
+#~ msgid "Inline"
+#~ msgstr "Embutido"
+
+#~ msgid "Inline (Outlook style)"
+#~ msgstr "Embutido (estilo Outlook)"
+
+#~ msgid "Quoted"
+#~ msgstr "Citado"
+
+#~ msgid "S_OCKS Host:"
+#~ msgstr "MÃ¡quina S_OCKS:"
+
+#~ msgid "Select Drafts Folder"
+#~ msgstr "Selecionar pasta de rascunhos"
+
+#~ msgid "Select Sent Folder"
+#~ msgstr "Selecionar pasta de enviadas"
+
+#~ msgid "_Automatic proxy configuration URL:"
+#~ msgstr "URL da configuraÃ§Ã£o de proxy _automÃ¡tica:"
+
+#~ msgid "Case _sensitive"
+#~ msgstr "Diferenciar maiÃº_sculas de minÃºsculas"
+
+#~ msgid "F_ind:"
+#~ msgstr "Local_izar:"
+
+#~ msgid "Find in Message"
+#~ msgstr "Localizar na mensagem"
+
+#~ msgid "None Selected"
+#~ msgstr "Nenhum selecionado"
+
+#~ msgid "Provides core functionality for local address books."
+#~ msgstr "Fornece funcionalidades bÃ¡sicas para agendas locais."
+
+#~ msgid ""
+#~ "Looks for clues in a message for mention of attachments and warns if the "
+#~ "attachment is missing"
+#~ msgstr ""
+#~ "Verifica por indÃcios de menÃ§Ã£o de anexos e avisa se o anexo estiver "
+#~ "faltando"
+
+#~ msgid ""
+#~ "A formatter plugin which displays audio attachments inline and allows you "
+#~ "to play them directly from Evolution."
+#~ msgstr ""
+#~ "Um plug-in que exibe anexos de Ã¡udio embutidos e permite que vocÃª os "
+#~ "reproduza diretamente no Evolution."
+
+#~ msgid "A plugin for backing up and restore Evolution data and settings."
+#~ msgstr "Faz backup e restaura configuraÃ§Ãµes e dados do Evolution."
+
+#~ msgid "CalDAV Calendar sources"
+#~ msgstr "Fontes da agenda CalDAV"
+
+#~ msgid "Provides core functionality for local calendars."
+#~ msgstr "ProvÃª funcionalidades bÃ¡sicas para agendas locais."
+
+#~ msgid "HTTP Calendars"
+#~ msgstr "Agendas HTTP"
+
+#~ msgid "Provides core functionality for webcal and http calendars."
+#~ msgstr "ProvÃª funcionalidades bÃ¡sicas para agendas webcal e http."
+
+#~ msgid "Provides core functionality for weather calendars."
+#~ msgstr "ProvÃª funcionalidades bÃ¡sicas para agendas de clima."
+
+#~ msgid ""
+#~ "A test plugin which demonstrates a popup menu plugin which lets you copy "
+#~ "things to the clipboard."
+#~ msgstr ""
+#~ "Um plug-in de teste que mostra um menu popup que permite que vocÃª copie "
+#~ "coisas para a Ã¡rea de transferÃªncia."
+
+#~ msgid ""
+#~ "Provides functionality for marking a calendar or an address book as the "
+#~ "default one."
+#~ msgstr ""
+#~ "Fornece funcionalidade de tornar padrÃ£o uma agenda ou catÃ¡logo de "
+#~ "endereÃ§os."
+
+#~ msgid "S_pecify the mailbox name"
+#~ msgstr "Es_pecifique o nome da caixa de correio"
+
+#~ msgid ""
+#~ "A plugin that manages a collection of Exchange account specific "
+#~ "operations and features."
+#~ msgstr ""
+#~ "Um plug-in que gerencia uma coleÃ§Ã£o de operaÃ§Ãµes e recursos especÃficos "
+#~ "para contas do Exchange."
+
+#~ msgid "Compose messages using an external editor"
+#~ msgstr "Compor mensagens usando um editor externo"
+
+#~ msgid "Allows unsubscribing of mail folders in the side bar context menu."
+#~ msgstr ""
+#~ "Permitir o cancelamento de inscriÃ§Ã£o de pastas de mensagens no menu de "
+#~ "contexto da barra lateral."
+
+#~ msgid "A plugin to setup Google Calendar and Contacts."
+#~ msgstr "Um plug-in para configurar a agenda e os contatos do Google."
+
+#~ msgid "Google sources"
+#~ msgstr "Fontes do Google"
+
+#~ msgid "A plugin to setup GroupWise calendar and contacts sources."
+#~ msgstr "Um plug-in que configura agenda e contatos do GroupWise."
+
+#~ msgid "A plugin to setup hula calendar sources."
+#~ msgstr "Um plug-in que configura fontes de agendas hula."
+
+#~ msgid "Hula Account Setup"
+#~ msgstr "ConfiguraÃ§Ãµes de conta Hula"
+
+#~ msgid "A plugin for the features in the IMAP accounts."
+#~ msgstr "Um plug-in para os recursos das contas IMAP."
+
+#~ msgid "_Import to Calendar"
+#~ msgstr "_Importar para agenda"
+
+#~ msgid "Import ICS"
+#~ msgstr "Importar ICS"
+
+#~ msgid "Imports ICS attachments to calendar."
+#~ msgstr "Importar anexos ICS para o calendÃ¡rio."
+
+#~ msgid ""
+#~ "Synchronize the selected task/memo/calendar/address book with Apple iPod"
+#~ msgstr ""
+#~ "Sincroniza a tarefa/memorando/agenda/catÃ¡logo de endereÃ§os selecionado "
+#~ "com o iPod da Apple"
+
+#~ msgid "_Tasks :"
+#~ msgstr "_Tarefas :"
+
+#~ msgid "Memos :"
+#~ msgstr "Memorandos :"
+
+#~ msgid "Allows disabling of accounts."
+#~ msgstr "Permitir desabilitaÃ§Ã£o de contas."
+
+#~ msgid ""
+#~ "Generates a D-Bus message or notifies the user with an icon in "
+#~ "notification area and a notification message whenever a new message has "
+#~ "arrived."
+#~ msgstr ""
+#~ "Gera uma mensagem D-Bus ou notifica o usuÃ¡rio com um Ãcone na Ã¡rea de "
+#~ "notificaÃ§Ã£o alÃ©m de uma mensagem de notificaÃ§Ã£o sempre que uma nova "
+#~ "mensagem tiver chegado."
+
+#~ msgid ""
+#~ "A plugin which allows the creation of meetings from the contents of a "
+#~ "mail message."
+#~ msgstr ""
+#~ "Um plug-in que permite a criaÃ§Ã£o de encontros a partir do conteÃºdo de uma "
+#~ "mensagem de e-mail."
+
+#~ msgid "Con_vert to Meeting"
+#~ msgstr "Con_verter para reuniÃ£o"
+
+#~ msgid "Mail to meeting"
+#~ msgstr "Mensagem para reuniÃ£o"
+
+#~ msgid ""
+#~ "A plugin which allows the creation of tasks from the contents of a mail "
+#~ "message."
+#~ msgstr ""
+#~ "Um plug-in que permite a criaÃ§Ã£o de tarefas a partir do conteÃºdo de uma "
+#~ "mensagem de e-mail."
+
+#~ msgid "Con_vert to Task"
+#~ msgstr "_Converter para tarefa"
+
+#~ msgid "Used for marking all the messages under a folder as read"
+#~ msgstr "Usado para marcar todas as mensagens na pasta como lidas"
+
+#~ msgid "A plugin which implements mono plugins."
+#~ msgstr "Um plug-in que implementa plug-ins mono."
+
+#~ msgid "A plugin for managing which plugins are enabled or disabled."
+#~ msgstr ""
+#~ "Gerencia quais plug-ins estÃ£o habilitados ou e quais estÃ£o desabilitados."
+
+#~ msgid ""
+#~ "A test plugin which demonstrates a formatter plugin which lets you choose "
+#~ "to disable HTML messages.\n"
+#~ "\n"
+#~ "This plugin is unsupported demonstration code only.\n"
+#~ msgstr ""
+#~ "Um plug-in de teste que demonstra um plug-in de formataÃ§Ã£o que permite "
+#~ "que vocÃª desabilite mensagens em formato HTML.\n"
+#~ "\n"
+#~ "Este plug-in Ã© apenas um cÃ³digo de demonstraÃ§Ã£o e sem suporte.\n"
+
+#~ msgid "Writes a log of profiling data events."
+#~ msgstr "Escreve um log do perfil de eventos de dados."
+
+#~ msgid "SpamAssassin (built-in)"
+#~ msgstr "SpamAssassin (embutido)"
+
+#~ msgid ""
+#~ "Filters junk messages using SpamAssassin. This plugin requires "
+#~ "SpamAssassin to be installed."
+#~ msgstr ""
+#~ "Filtra spam usando SpamAssassin. O plug-in requer que o SpamAssassin "
+#~ "esteja instalado."
+
+#~ msgid "A plugin for saving all attachments or parts of a message at once."
+#~ msgstr "Salva todos os anexos ou partes de uma mensagem de uma vez."
+
+#~ msgid "Save Attachments..."
+#~ msgstr "Salvar anexos..."
+
+#~ msgid "Save all attachments"
+#~ msgstr "Salvar todos os anexos"
+
+#~ msgid "Select save base name"
+#~ msgstr "Selecionar o nome base para salvamento"
+
+#~ msgid "Indicates if threading of messages should fall back to subject."
+#~ msgstr "Indica se o encadeamento das mensagens deve retornar no assunto."
+
+#~ msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
+#~ msgstr "Um plug-in simples que usa yTNEF para decodificar anexos TNEF."
+
+#~ msgid "A plugin to setup WebDAV contacts."
+#~ msgstr "Um plug-in para configurar contatos do WebDAV."
+
+#~ msgid "Pos_t New Message to Folder"
+#~ msgstr "P_ublicar uma nova mensagem na pasta"
+
+#~ msgid "Post a Repl_y"
+#~ msgstr "Pu_blicar uma resposta"
+
+#~ msgid "Post a message to a Public folder"
+#~ msgstr "Publica uma mensagem em uma pasta pÃºblica"
+
+#~ msgid "Post a reply to a message in a Public folder"
+#~ msgstr "Publica uma resposta a uma mensagem em uma pasta pÃºblica"
+
+#~ msgid "Attachment Bar"
+#~ msgstr "Barra de anexos"
+
+#~ msgid "Cannot attach file %s: %s"
+#~ msgstr "NÃ£o Ã© possÃvel anexar o arquivo %s: %s"
+
+#~ msgid "Cannot attach file %s: not a regular file"
+#~ msgstr "NÃ£o Ã© possÃvel anexar o arquivo %s: nÃ£o Ã© um arquivo comum"
+
+#~ msgid "MIME type:"
+#~ msgstr "Tipo MIME:"
+
+#~ msgid "Suggest automatic display of attachment"
+#~ msgstr "Sugerir exibiÃ§Ã£o automÃ¡tica do anexo"
+
+#~ msgid "Expanded"
+#~ msgstr "Expandido"
+
+#~ msgid "Whether or not the expander is expanded"
+#~ msgstr "O expansor estÃ¡ expandido"
+
+#~ msgid "Text of the expander's label"
+#~ msgstr "Texto do rÃ³tulo do expansor"
+
+#~ msgid "Use underline"
+#~ msgstr "Usar sublinhado"
+
+#~ msgid ""
+#~ "If set, an underline in the text indicates the next character should be "
+#~ "used for the mnemonic accelerator key"
+#~ msgstr ""
+#~ "Se configurado, um sublinhado no texto indica que o prÃ³ximo caractere "
+#~ "deve ser usado como a tecla de atalho"
+
+#~ msgid "Space to put between the label and the child"
+#~ msgstr "EspaÃ§o que deve ser posto entre o rÃ³tulo e o filho"
+
+#~ msgid "Label widget"
+#~ msgstr "RÃ³tulo do componente"
+
+#~ msgid "A widget to display in place of the usual expander label"
+#~ msgstr "Um widget para exibir no lugar do usual rÃ³tulo do expansor"
+
+#~ msgid "Indicator Spacing"
+#~ msgstr "EspaÃ§amento do indicador"
+
+#~ msgid "Spacing around expander arrow"
+#~ msgstr "EspaÃ§amento ao redor da seta do expansor"
+
+#~ msgid "Current Message"
+#~ msgstr "Mensagem atual"
+
+#~ msgid "Edit Master Category List..."
+#~ msgstr "Editar a lista de categorias principal..."
+
+#~ msgid "Item(s) belong to these _categories:"
+#~ msgstr "Item(ns) pertence(m) a estas _categorias:"
+
+#~ msgid "_Available Categories:"
+#~ msgstr "Ca_tegorias disponÃveis:"
+
+#~ msgid "categories"
+#~ msgstr "categorias"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
+#~ msgid "DnD code"
+#~ msgstr "CÃ³digo DnD"
+
+#~ msgid "Full Header"
+#~ msgstr "CabeÃ§alho completo"
+
+#~ msgid "Font Description"
+#~ msgstr "DescriÃ§Ã£o do fonte"
+
 #~ msgid ""
 #~ "[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]"
 #~ msgstr ""
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]