Updating some pt_BR translations. (Update-Gnome.sh script)

 any problem ricardo@conectiva.com.br please

svn path=/trunk/; revision=6265

1 files changed, 1732 insertions, 724 deletions

diff --git a/po/pt_BR.po b/po/pt_BR.po
index e445db0d98..bfe6122cfc 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.3\n"
-"POT-Creation-Date: 2000-10-19 16:31-0200\n"
+"POT-Creation-Date: 2000-10-30 11:14-0200\n"
 "PO-Revision-Date: 2000-07-29 23:07-03:00\n"
 "Last-Translator: Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -17,10 +17,10 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1215
+#: addressbook/conduit/address-conduit.c:1064
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1188
-#: calendar/conduits/todo/todo-conduit.c:1069 calendar/gui/main.c:55
+#: calendar/conduits/calendar/calendar-conduit.c:1053
+#: calendar/conduits/todo/todo-conduit.c:934 calendar/gui/main.c:55
 msgid "Could not initialize Bonobo"
 msgstr "Não foi possível iniciar Bonobo"
 
@@ -28,82 +28,97 @@ msgstr "Não foi possível iniciar Bonobo"
 #. in GnomePilotConduitSyncType as they are used as index.
 #. Custom type implies Disabled state.
 #.
-#: addressbook/conduit/address-conduit-control-applet.c:54
+#: addressbook/conduit/address-conduit-control-applet.c:77
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
 #: calendar/conduits/todo/todo-conduit-control-applet.c:77
 msgid "Disabled"
 msgstr "Desativado"
 
-#: addressbook/conduit/address-conduit-control-applet.c:55
+#: addressbook/conduit/address-conduit-control-applet.c:78
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
 #: calendar/conduits/todo/todo-conduit-control-applet.c:78
 msgid "Synchronize"
 msgstr "Sincronizar"
 
-#: addressbook/conduit/address-conduit-control-applet.c:56
+#: addressbook/conduit/address-conduit-control-applet.c:79
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
 #: calendar/conduits/todo/todo-conduit-control-applet.c:79
 msgid "Copy From Pilot"
 msgstr "Copiar do pilot"
 
-#: addressbook/conduit/address-conduit-control-applet.c:57
+#: addressbook/conduit/address-conduit-control-applet.c:80
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
 #: calendar/conduits/todo/todo-conduit-control-applet.c:80
 msgid "Copy To Pilot"
 msgstr "Copiar para o pilot"
 
-#: addressbook/conduit/address-conduit-control-applet.c:58
+#: addressbook/conduit/address-conduit-control-applet.c:81
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
 #: calendar/conduits/todo/todo-conduit-control-applet.c:81
 msgid "Merge From Pilot"
 msgstr "Mesclar do pilot"
 
-#: addressbook/conduit/address-conduit-control-applet.c:59
+#: addressbook/conduit/address-conduit-control-applet.c:82
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
 #: calendar/conduits/todo/todo-conduit-control-applet.c:82
 msgid "Merge To Pilot"
 msgstr "Mesclar para o pilot"
 
-#: addressbook/conduit/address-conduit-control-applet.c:143
+#: addressbook/conduit/address-conduit-control-applet.c:121
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
+#: calendar/conduits/todo/todo-conduit-control-applet.c:121
+msgid "JP Rosevear <jpr@helixcode.com>"
+msgstr ""
+
+#: addressbook/conduit/address-conduit-control-applet.c:122
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
+#: calendar/conduits/todo/todo-conduit-control-applet.c:122
+msgid "Original Author:"
+msgstr ""
+
+#: addressbook/conduit/address-conduit-control-applet.c:123
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
 #: calendar/conduits/todo/todo-conduit-control-applet.c:123
 msgid "Eskil Heyn Olsen <deity@eskil.dk>"
 msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
 
-#: addressbook/conduit/address-conduit-control-applet.c:145
+#: addressbook/conduit/address-conduit-control-applet.c:127
 #, fuzzy
-msgid "Gpilotd address conduit"
-msgstr "Canal de tarefas para Gnome Pilot"
+msgid "Evolution Addressbook Conduit"
+msgstr "Atalho da _barra do Evolution"
 
-#: addressbook/conduit/address-conduit-control-applet.c:146
-msgid "(C) 1998 the Free Software Foundation"
+#: addressbook/conduit/address-conduit-control-applet.c:128
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
+#: calendar/conduits/todo/todo-conduit-control-applet.c:128
+#, fuzzy
+msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
 msgstr "(C) 1998 the Free Software Foundation"
 
-#: addressbook/conduit/address-conduit-control-applet.c:148
+#: addressbook/conduit/address-conduit-control-applet.c:130
 #, fuzzy
-msgid "Configuration utility for the address conduit.\n"
-msgstr "Utilitário de configuração para o canal de agenda.\n"
+msgid "Configuration utility for the evolution addressbook conduit.\n"
+msgstr "Utilitário de configuração para o canal de tarefas.\n"
 
-#: addressbook/conduit/address-conduit-control-applet.c:149
+#: addressbook/conduit/address-conduit-control-applet.c:131
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
 #: calendar/conduits/todo/todo-conduit-control-applet.c:131
 msgid "gnome-unknown.xpm"
 msgstr "gnome-unknown.xpm"
 
-#: addressbook/conduit/address-conduit-control-applet.c:190
+#: addressbook/conduit/address-conduit-control-applet.c:162
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
 #: calendar/conduits/todo/todo-conduit-control-applet.c:162
 msgid "Synchronize Action"
 msgstr "Ação ao sincronizar"
 
-#: addressbook/conduit/address-conduit-control-applet.c:261
+#: addressbook/conduit/address-conduit-control-applet.c:214
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
 #: calendar/conduits/todo/todo-conduit-control-applet.c:214
 msgid "Conduit state"
 msgstr "Estado do canal"
 
-#: addressbook/conduit/address-conduit-control-applet.c:315
-#: addressbook/conduit/address-conduit-control-applet.c:328
+#: addressbook/conduit/address-conduit-control-applet.c:266
+#: addressbook/conduit/address-conduit-control-applet.c:279
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
 #: calendar/conduits/todo/todo-conduit-control-applet.c:266
@@ -115,14 +130,14 @@ msgstr ""
 "Não existem pilots configurados, por favor escolha\n"
 "'Pilot Link' na central de controle primeiro."
 
-#: addressbook/conduit/address-conduit-control-applet.c:334
+#: addressbook/conduit/address-conduit-control-applet.c:285
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
 #: calendar/conduits/todo/todo-conduit-control-applet.c:285
 #, fuzzy
 msgid "Not connected to the gnome-pilot daemon"
 msgstr "Não é possível conectar ao daemon Gnome Pilot"
 
-#: addressbook/conduit/address-conduit-control-applet.c:339
+#: addressbook/conduit/address-conduit-control-applet.c:290
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
 #: calendar/conduits/todo/todo-conduit-control-applet.c:290
 msgid ""
@@ -130,33 +145,31 @@ msgid ""
 "pilot list from the gnome-pilot daemon"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:127
-#: addressbook/conduit/address-conduit.c:141
+#: addressbook/conduit/address-conduit.c:194
+#: addressbook/conduit/address-conduit.c:208
 msgid "BLARG\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:471
-#, fuzzy, c-format
-msgid "Address holds %ld address entries"
-msgstr "Agenda mantém %d registros"
+#: addressbook/conduit/address-conduit.c:638
+#: calendar/conduits/calendar/calendar-conduit.c:615
+#: calendar/conduits/todo/todo-conduit.c:495
+#, fuzzy
+msgid "Could not start wombat server"
+msgstr "Não foi possível iniciar servidor gnomecal"
 
-#: addressbook/conduit/address-conduit.c:497
-#: addressbook/conduit/address-conduit.c:499
+#: addressbook/conduit/address-conduit.c:639
+#: calendar/conduits/calendar/calendar-conduit.c:616
+#: calendar/conduits/todo/todo-conduit.c:496
 #, fuzzy
-msgid "Could not start addressbook server"
+msgid "Could not start wombat"
 msgstr "Não foi possível iniciar servidor gnomecal"
 
-#: addressbook/conduit/address-conduit.c:512
-#: addressbook/conduit/address-conduit.c:515
+#: addressbook/conduit/address-conduit.c:665
+#: addressbook/conduit/address-conduit.c:668
 #, fuzzy
 msgid "Could not read pilot's Address application block"
 msgstr "Não foi possível ler dados da aplicação DateBook no pilot"
 
-#: addressbook/conduit/address-conduit.c:853
-#, fuzzy
-msgid "Error while communicating with address server"
-msgstr "Erro ao comunicar com o servidor de agenda"
-
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -293,7 +306,7 @@ msgid "_Add"
 msgstr "_Incluir"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-mail.h:31
+#: ui/evolution-mail.h:48
 msgid "_Delete"
 msgstr "_Excluir"
 
@@ -307,8 +320,10 @@ msgid "New phone type"
 msgstr "Novo tipo de telefone"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: calendar/gui/event-editor-dialog.glade.h:90 mail/mail-config.glade.h:11
-#: mail/mail-config.glade.h:16 mail/mail-config.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:90 filter/filter.glade.h:12
+#: filter/filter.glade.h:17 filter/filter.glade.h:21 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:11 mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:22
 msgid "Add"
 msgstr "Incluir"
 
@@ -545,7 +560,14 @@ msgstr "S_ufixo:"
 msgid "As _Minicards"
 msgstr "Como _minicartões"
 
-#: addressbook/gui/component/addressbook.c:316 ui/evolution-addressbook.h:10
+#.
+#. *  This file is autogenerated from evolution-addressbook.xml, do not edit
+#. *
+#. *  This file contains translatable strings generated by
+#. * bonobo-ui-extract. Add this file to your project's
+#. * POTFILES.in. DO NOT compile it as part of your application.
+#.
+#: addressbook/gui/component/addressbook.c:316 ui/evolution-addressbook.h:9
 msgid "As _Table"
 msgstr "Como _tabela"
 
@@ -604,7 +626,6 @@ msgid "Root DN:"
 msgstr "DN raiz:"
 
 #: addressbook/gui/component/ldap-server-dialog.glade.h:11
-#: composer/e-msg-composer-address-dialog.glade.h:8
 msgid "Name:"
 msgstr "Nome:"
 
@@ -776,7 +797,7 @@ msgstr ""
 "Clique duas vezes aqui para criar um novo contato."
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/folder-browser.c:487
+#: mail/folder-browser.c:494
 #, fuzzy
 msgid "Search"
 msgstr "Procurar..."
@@ -971,51 +992,23 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr ""
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 #, fuzzy
 msgid "Evolution Calendar Conduit"
 msgstr "Agenda Gnome"
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-#, fuzzy
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998 the Free Software Foundation"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
 #, fuzzy
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr "Utilitário de configuração para o canal de agenda.\n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:688
-#: calendar/conduits/todo/todo-conduit.c:569
+#: calendar/conduits/calendar/calendar-conduit.c:571
+#: calendar/conduits/todo/todo-conduit.c:451
 msgid "Error while communicating with calendar server"
 msgstr "Erro ao comunicar com o servidor de agenda"
 
-#: calendar/conduits/calendar/calendar-conduit.c:733
-#: calendar/conduits/todo/todo-conduit.c:614
-#, fuzzy
-msgid "Could not start wombat server"
-msgstr "Não foi possível iniciar servidor gnomecal"
-
-#: calendar/conduits/calendar/calendar-conduit.c:734
-#: calendar/conduits/todo/todo-conduit.c:615
-#, fuzzy
-msgid "Could not start wombat"
-msgstr "Não foi possível iniciar servidor gnomecal"
-
-#: calendar/conduits/calendar/calendar-conduit.c:797
-#: calendar/conduits/calendar/calendar-conduit.c:800
+#: calendar/conduits/calendar/calendar-conduit.c:669
+#: calendar/conduits/calendar/calendar-conduit.c:672
 #, fuzzy
 msgid "Could not read pilot's Calendar application block"
 msgstr "Não foi possível ler dados da aplicação DateBook no pilot"
@@ -1030,8 +1023,8 @@ msgstr "Atalho da _barra do Evolution"
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr "Utilitário de configuração para o canal de tarefas.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:678
-#: calendar/conduits/todo/todo-conduit.c:681
+#: calendar/conduits/todo/todo-conduit.c:549
+#: calendar/conduits/todo/todo-conduit.c:552
 #, fuzzy
 msgid "Could not read pilot's ToDo application block"
 msgstr "Não foi possível ler dados da aplicação DateBook no pilot"
@@ -1098,13 +1091,13 @@ msgstr "%a %b %d %Y"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:740
+#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:726
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:743
+#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:729
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
@@ -1158,7 +1151,7 @@ msgstr "Transportes"
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:748
+#: calendar/gui/calendar-model.c:734
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1167,7 +1160,7 @@ msgid ""
 msgstr ""
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:849 calendar/gui/calendar-model.c:897
+#: calendar/gui/calendar-model.c:835 calendar/gui/calendar-model.c:883
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:480 widgets/misc/e-dateedit.c:512
 #: widgets/misc/e-dateedit.c:669 widgets/misc/e-dateedit.c:725
@@ -1176,38 +1169,38 @@ msgstr ""
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:867
+#: calendar/gui/calendar-model.c:853
 msgid "%I:%M:%S %p%n"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:870
+#: calendar/gui/calendar-model.c:856
 msgid "%H:%M:%S%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:874
+#: calendar/gui/calendar-model.c:860
 msgid "%I:%M %p%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:877
+#: calendar/gui/calendar-model.c:863
 msgid "%H:%M%n"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:997
+#: calendar/gui/calendar-model.c:983
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1037
+#: calendar/gui/calendar-model.c:1023
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1077
+#: calendar/gui/calendar-model.c:1063
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr ""
 
@@ -1238,7 +1231,7 @@ msgstr "Sem resumo"
 msgid "Close"
 msgstr "Fechar"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1424
+#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1458
 msgid "Snooze"
 msgstr "Adiar"
 
@@ -1440,6 +1433,7 @@ msgid "Time Until Due"
 msgstr "Tempo até o prazo"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 calendar/gui/prop.c:611
+#: filter/libfilter-i18n.h:14
 msgid "Priority"
 msgstr "Prioridade"
 
@@ -1664,33 +1658,34 @@ msgstr "Comentários:"
 msgid "URL:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:297
+#: calendar/gui/e-calendar-table.c:294
 #, fuzzy
 msgid "Open..."
 msgstr "_Abrir..."
 
-#: calendar/gui/e-calendar-table.c:298
+#: calendar/gui/e-calendar-table.c:295
 msgid "Open the task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:300
+#: calendar/gui/e-calendar-table.c:297
 msgid "Mark Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:301
+#: calendar/gui/e-calendar-table.c:298
 msgid "Mark the task complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:303
-#: calendar/gui/event-editor-dialog.glade.h:92 mail/mail-config.glade.h:13
-#: mail/mail-config.glade.h:18 mail/mail-config.glade.h:24
-#: mail/mail-view.c:163 ui/evolution-addressbook.h:20
-#: ui/evolution-contact-editor.h:12 ui/evolution-contact-editor.h:19
-#: ui/evolution-mail.h:59
+#: calendar/gui/e-calendar-table.c:300
+#: calendar/gui/event-editor-dialog.glade.h:92 filter/filter.glade.h:14
+#: filter/filter.glade.h:19 filter/libfilter-i18n.h:7
+#: mail/mail-config.glade.h:13 mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:24 mail/mail-view.c:163
+#: ui/evolution-addressbook.h:11 ui/evolution-contact-editor.h:12
+#: ui/evolution-contact-editor.h:19 ui/evolution-mail.h:13
 msgid "Delete"
 msgstr "Excluir"
 
-#: calendar/gui/e-calendar-table.c:304
+#: calendar/gui/e-calendar-table.c:301
 #, fuzzy
 msgid "Delete the task"
 msgstr "Exclui este item"
@@ -1723,30 +1718,30 @@ msgstr "%a %b %d %Y"
 msgid "%d %b"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2632 calendar/gui/e-day-view.c:2639
-#: calendar/gui/e-day-view.c:2648 calendar/gui/e-week-view.c:2935
-#: calendar/gui/e-week-view.c:2942 calendar/gui/e-week-view.c:2951
+#: calendar/gui/e-day-view.c:2634 calendar/gui/e-day-view.c:2641
+#: calendar/gui/e-day-view.c:2650 calendar/gui/e-week-view.c:2932
+#: calendar/gui/e-week-view.c:2939 calendar/gui/e-week-view.c:2948
 msgid "New appointment..."
 msgstr "Novo compromisso..."
 
-#: calendar/gui/e-day-view.c:2636 calendar/gui/e-day-view.c:2643
-#: calendar/gui/e-week-view.c:2939 calendar/gui/e-week-view.c:2946
+#: calendar/gui/e-day-view.c:2638 calendar/gui/e-day-view.c:2645
+#: calendar/gui/e-week-view.c:2936 calendar/gui/e-week-view.c:2943
 msgid "Edit this appointment..."
 msgstr "Editar este compromisso..."
 
-#: calendar/gui/e-day-view.c:2637 calendar/gui/e-week-view.c:2940
+#: calendar/gui/e-day-view.c:2639 calendar/gui/e-week-view.c:2937
 msgid "Delete this appointment"
 msgstr "Excluir este compromisso"
 
-#: calendar/gui/e-day-view.c:2644 calendar/gui/e-week-view.c:2947
+#: calendar/gui/e-day-view.c:2646 calendar/gui/e-week-view.c:2944
 msgid "Make this appointment movable"
 msgstr "Tornar este compromisso móvel"
 
-#: calendar/gui/e-day-view.c:2645 calendar/gui/e-week-view.c:2948
+#: calendar/gui/e-day-view.c:2647 calendar/gui/e-week-view.c:2945
 msgid "Delete this occurrence"
 msgstr "Excluir esta ocorrência"
 
-#: calendar/gui/e-day-view.c:2646 calendar/gui/e-week-view.c:2949
+#: calendar/gui/e-day-view.c:2648 calendar/gui/e-week-view.c:2946
 msgid "Delete all occurrences"
 msgstr "Excluir todas as ocorrências"
 
@@ -1761,7 +1756,7 @@ msgstr ""
 msgid "Edit Appointment"
 msgstr "Editar compromisso"
 
-#: calendar/gui/event-editor.c:1739 calendar/gui/print.c:1085
+#: calendar/gui/event-editor.c:1749 calendar/gui/print.c:1085
 #: calendar/gui/print.c:1087 calendar/gui/print.c:1088
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
@@ -2265,28 +2260,28 @@ msgstr "Prioridade:"
 msgid "Item Comments:"
 msgstr "Comentários:"
 
-#: calendar/gui/gnome-cal.c:694 calendar/gui/gnome-cal.c:1432
-#: calendar/gui/gnome-cal.c:1488
+#: calendar/gui/gnome-cal.c:710 calendar/gui/gnome-cal.c:1466
+#: calendar/gui/gnome-cal.c:1522
 msgid "Reminder of your appointment at "
 msgstr "Lembrete de seu compromisso às "
 
-#: calendar/gui/gnome-cal.c:1128
+#: calendar/gui/gnome-cal.c:1144
 #, c-format
 msgid "Could not load the calendar in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1139
+#: calendar/gui/gnome-cal.c:1155
 #, fuzzy, c-format
 msgid "Could not create a calendar in `%s'"
 msgstr "Não foi possível criar caixa de diálogo."
 
-#: calendar/gui/gnome-cal.c:1150
+#: calendar/gui/gnome-cal.c:1166
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1437 calendar/gui/gnome-cal.c:1492
+#: calendar/gui/gnome-cal.c:1471 calendar/gui/gnome-cal.c:1526
 msgid "Ok"
 msgstr "Ok"
 
@@ -2505,7 +2500,7 @@ msgstr "Ano atual (%Y)"
 msgid "Print Calendar"
 msgstr "Imprimir agenda"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:802
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:822
 msgid "Print Preview"
 msgstr "Visualizar impressão"
 
@@ -2617,132 +2612,703 @@ msgstr " segundos"
 msgid "Enable snoozing for "
 msgstr "Habilitar adiamento para "
 
-#: composer/e-msg-composer-address-dialog.c:186
-msgid "Cut"
-msgstr "Recortar"
+#: camel/camel-movemail.c:96
+#, fuzzy, c-format
+msgid "Could not check mail file %s: %s"
+msgstr "Não foi possível criar caixa de diálogo."
 
-#: composer/e-msg-composer-address-dialog.c:187
-msgid "Cut selected item into clipboard"
-msgstr "Recortar item selecionado para a área de tranferência"
+#: camel/camel-movemail.c:133 camel/camel-movemail.c:180
+#, fuzzy, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "Não foi possível criar caixa de diálogo."
 
-#: composer/e-msg-composer-address-dialog.c:190 ui/evolution-mail.h:55
-msgid "Copy"
-msgstr "Copiar"
+#: camel/camel-movemail.c:143
+#, fuzzy, c-format
+msgid "Could not open mail file %s: %s"
+msgstr "Não foi possível criar caixa de diálogo."
 
-#: composer/e-msg-composer-address-dialog.c:191
-msgid "Copy selected item into clipboard"
-msgstr "Copiar item selecionado para a área de transferência"
+#: camel/camel-movemail.c:153
+#, c-format
+msgid "Could not open temporary mail file %s: %s"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:194
-#: composer/e-msg-composer-address-dialog.c:202
-msgid "Paste"
-msgstr "Colar"
+#: camel/camel-movemail.c:194
+#, fuzzy, c-format
+msgid "Could not test lock file for %s: %s"
+msgstr "Não foi possível criar caixa de diálogo."
 
-#: composer/e-msg-composer-address-dialog.c:195
-#: composer/e-msg-composer-address-dialog.c:203
-msgid "Paste item from clipboard"
-msgstr "Colar item da área de transferência"
+#: camel/camel-movemail.c:214
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:529
-msgid "Select recipients' addresses"
-msgstr "Selecionar endereço dos destinatários"
+#: camel/camel-movemail.c:240
+#, fuzzy, c-format
+msgid "Error reading mail file: %s"
+msgstr "Erro ao carregar arquivo: %s"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: composer/e-msg-composer-address-dialog.glade.h:7
-msgid "Recipient list:"
-msgstr "Lista de destinatários:"
+#: camel/camel-movemail.c:251
+#, fuzzy, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "Erro ao salvar arquivo: %s"
 
-#: composer/e-msg-composer-address-dialog.glade.h:9
-msgid "Search..."
-msgstr "Procurar..."
+#: camel/camel-movemail.c:269
+#, c-format
+msgid "Failed to store mail in temp file %s: %s"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:10
-msgid "Name"
-msgstr "Nome"
+#: camel/camel-movemail.c:301
+#, fuzzy, c-format
+msgid "Could not create pipe: %s"
+msgstr "Não foi possível criar caixa de diálogo."
 
-#: composer/e-msg-composer-address-dialog.glade.h:11
-#: mail/mail-config.glade.h:8
-msgid "Address"
-msgstr "Endereço"
+#: camel/camel-movemail.c:313
+#, fuzzy, c-format
+msgid "Could not fork: %s"
+msgstr "Não foi possível iniciar servidor gnomecal"
 
-#: composer/e-msg-composer-address-dialog.glade.h:12
-msgid "Properties..."
-msgstr "Propriedades..."
+#: camel/camel-movemail.c:351
+#, c-format
+msgid "Movemail program failed: %s"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:13
-msgid "Add..."
-msgstr "Incluir..."
+#: camel/camel-movemail.c:352
+#, fuzzy
+msgid "(Unknown error)"
+msgstr "Erro desconhecido"
 
-#: composer/e-msg-composer-address-dialog.glade.h:14
-msgid "To: >>"
-msgstr "Para: >>"
+#: camel/camel-provider.c:133
+#, c-format
+msgid "Could not load %s: %s"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:15
-msgid "Cc: >>"
-msgstr "Cc: >>"
+#: camel/camel-provider.c:141
+#, c-format
+msgid "Could not load %s: No initialization code in module."
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:16
-msgid "Bcc: >>"
-msgstr "Bcc: >>"
+#: camel/camel-remote-store.c:185
+#, fuzzy, c-format
+msgid "%s server %s"
+msgstr "Incluir servidor de news"
 
-#: composer/e-msg-composer-address-dialog.glade.h:17
-msgid "label9"
-msgstr "label9"
+#: camel/camel-remote-store.c:189
+#, c-format
+msgid "%s service for %s on %s"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:18
-msgid "label7"
-msgstr "label7"
+#: camel/camel-remote-store.c:230
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:19
-msgid "label8"
-msgstr "label8"
+#: camel/camel-remote-store.c:231 camel/providers/imap/camel-imap-store.c:190
+msgid "(unknown host)"
+msgstr ""
+
+#: camel/camel-service.c:119
+#, c-format
+msgid "URL '%s' needs a username component"
+msgstr ""
+
+#: camel/camel-service.c:128
+#, c-format
+msgid "URL '%s' needs a host component"
+msgstr ""
+
+#: camel/camel-service.c:137
+#, c-format
+msgid "URL '%s' needs a path component"
+msgstr ""
+
+#: camel/camel-service.c:516
+#, c-format
+msgid "No such host %s."
+msgstr ""
+
+#: camel/camel-service.c:519
+#, c-format
+msgid "Temporarily unable to look up hostname %s."
+msgstr ""
+
+#: camel/camel-session.c:271
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr ""
+
+#: camel/camel-session.c:359
+#, fuzzy, c-format
+msgid ""
+"Could not create directory %s:\n"
+"%s"
+msgstr ""
+"Não é possível criar o diretório\n"
+"%s\n"
+"Erro: %s"
+
+#: camel/camel-url.c:77
+#, c-format
+msgid "URL string `%s' contains no protocol"
+msgstr ""
+
+#: camel/camel-url.c:92
+#, c-format
+msgid "URL string `%s' contains an invalid protocol"
+msgstr ""
+
+#: camel/camel-url.c:153
+#, c-format
+msgid "Port number in URL `%s' is non-numeric"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:220
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP server: %s"
+msgstr "Sai do editor de mensagens"
+
+#: camel/providers/imap/camel-imap-command.c:228
+#, c-format
+msgid "IMAP command failed: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:229 shell/e-storage.c:340
+msgid "Unknown error"
+msgstr "Erro desconhecido"
+
+#: camel/providers/imap/camel-imap-command.c:370
+#, c-format
+msgid "IMAP server response did not contain %s information"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:406
+#, c-format
+msgid "Unexpected OK response from IMAP server: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:219
+#, c-format
+msgid "Could not load summary for %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:578
+msgid "Could not find message body in FETCH response."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:39
+msgid "IMAPv4"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:41
+msgid "For reading and storing mail on IMAP servers."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:161
+#: camel/providers/nntp/camel-nntp-store.c:292
+#: camel/providers/pop3/camel-pop3-store.c:150
+#, fuzzy
+msgid "Password"
+msgstr "Esquecer _senhas"
+
+#: camel/providers/imap/camel-imap-store.c:163
+msgid "This option will connect to the IMAP server using a plaintext password."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:188
+#, fuzzy, c-format
+msgid "Could not connect to IMAP server on %s."
+msgstr "Conectando ao servidor IMAP (%s)..."
+
+#: camel/providers/imap/camel-imap-store.c:252
+#, c-format
+msgid "%sPlease enter the IMAP password for %s@%s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:274
+#, c-format
+msgid ""
+"Unable to authenticate to IMAP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:479
+#, fuzzy, c-format
+msgid "Could not create directory %s: %s"
+msgstr ""
+"Não é possível criar o diretório\n"
+"%s\n"
+"Erro: %s"
+
+#. FIXME: right error code
+#: camel/providers/mbox/camel-mbox-folder.c:220
+#, fuzzy
+msgid "Could not create summary"
+msgstr "Não foi possível criar caixa de diálogo."
+
+#: camel/providers/mbox/camel-mbox-folder.c:383
+#: camel/providers/mbox/camel-mbox-folder.c:386
+#, c-format
+msgid "Cannot append message to mbox file: %s"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-folder.c:489
+#, fuzzy, c-format
+msgid "Cannot get message: %s"
+msgstr "Não é possível definir repositório local -- %s"
+
+#: camel/providers/mbox/camel-mbox-provider.c:34
+msgid "UNIX mbox-format mail files"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-provider.c:36
+msgid ""
+"For reading mail delivered by the local system, and for storing mail on "
+"local disk."
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-store.c:121
+#, fuzzy, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr "Não é possível definir repositório local -- %s"
+
+#: camel/providers/mbox/camel-mbox-store.c:128
+#: camel/providers/mh/camel-mh-store.c:122
+#, fuzzy, c-format
+msgid "Folder `%s' does not exist."
+msgstr "Este arquivo não existe."
+
+#: camel/providers/mbox/camel-mbox-store.c:137
+#, fuzzy, c-format
+msgid ""
+"Could not create file `%s':\n"
+"%s"
+msgstr "Não foi possível criar caixa de diálogo."
+
+#: camel/providers/mbox/camel-mbox-store.c:146
+#: camel/providers/mbox/camel-mbox-store.c:180
+#, fuzzy, c-format
+msgid "`%s' is not a regular file."
+msgstr "Este não é um arquivo comum."
+
+#: camel/providers/mbox/camel-mbox-store.c:172
+#: camel/providers/mbox/camel-mbox-store.c:208
+#, fuzzy, c-format
+msgid ""
+"Could not delete folder `%s':\n"
+"%s"
+msgstr "Não foi possível criar caixa de diálogo."
+
+#: camel/providers/mbox/camel-mbox-store.c:187
+#, c-format
+msgid "Folder `%s' is not empty. Not deleted."
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-store.c:225
+#, c-format
+msgid "Could not rename folder %s to %s: destination exists"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-store.c:263
+msgid "Mbox folders may not be nested."
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-store.c:277
+#, fuzzy, c-format
+msgid "Local mail file %s"
+msgstr "Erro ao salvar arquivo: %s"
+
+#: camel/providers/mbox/camel-mbox-summary.c:650
+#, c-format
+msgid "Could not open summary %s"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-summary.c:671
+#, fuzzy, c-format
+msgid "Cannot open temporary mailbox: %s"
+msgstr "Não é possível definir repositório local -- %s"
+
+#: camel/providers/mbox/camel-mbox-summary.c:715
+msgid "Summary mismatch, aborting sync"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-summary.c:735
+msgid "Summary mismatch, X-Evolution header missing"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-summary.c:757
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-summary.c:770
+#: camel/providers/mbox/camel-mbox-summary.c:788
+#, fuzzy, c-format
+msgid "Cannot copy data to output file: %s"
+msgstr ""
+"Não é possível copiar arquivos em\n"
+"`%s'."
+
+#: camel/providers/mbox/camel-mbox-summary.c:813
+#, c-format
+msgid "Could not close source folder %s: %s"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-summary.c:822
+#, fuzzy, c-format
+msgid "Could not close temp folder: %s"
+msgstr "Não foi possível criar caixa de diálogo."
+
+#: camel/providers/mbox/camel-mbox-summary.c:830
+#, fuzzy, c-format
+msgid "Could not rename folder: %s"
+msgstr "Não foi possível criar caixa de diálogo."
+
+#: camel/providers/mbox/camel-mbox-summary.c:842
+#, fuzzy, c-format
+msgid "Unknown error: %s"
+msgstr "Erro desconhecido"
+
+#. FIXME: right error code
+#: camel/providers/mh/camel-mh-folder.c:211
+#, fuzzy
+msgid "Could not load or create summary"
+msgstr "Não foi possível criar caixa de diálogo."
+
+#: camel/providers/mh/camel-mh-folder.c:330
+#: camel/providers/mh/camel-mh-folder.c:333
+#, fuzzy, c-format
+msgid "Cannot append message to mh folder: %s"
+msgstr "Move a mensagem para uma nova pasta"
+
+#: camel/providers/mh/camel-mh-folder.c:399
+#, fuzzy, c-format
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
+msgstr "Não é possível definir repositório local -- %s"
+
+#: camel/providers/mh/camel-mh-provider.c:34
+msgid "UNIX MH-format mail directories"
+msgstr ""
+
+#: camel/providers/mh/camel-mh-provider.c:36
+msgid "For storing local mail in MH-like mail directories"
+msgstr ""
+
+#: camel/providers/mh/camel-mh-store.c:115
+#, fuzzy, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr "Não é possível definir repositório local -- %s"
+
+#: camel/providers/mh/camel-mh-store.c:130
+#, fuzzy, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr "Não foi possível criar caixa de diálogo."
+
+#: camel/providers/mh/camel-mh-store.c:139
+#, c-format
+msgid "`%s' is not a directory."
+msgstr ""
+
+#: camel/providers/mh/camel-mh-store.c:158
+#: camel/providers/mh/camel-mh-store.c:171
+#, fuzzy, c-format
+msgid "Could not delete folder `%s': %s"
+msgstr "Não foi possível criar caixa de diálogo."
+
+#: camel/providers/mh/camel-mh-store.c:189
+#: camel/providers/mh/camel-mh-store.c:193
+#, fuzzy, c-format
+msgid "Could not rename folder `%s': %s"
+msgstr "Não foi possível criar caixa de diálogo."
+
+#: camel/providers/mh/camel-mh-store.c:197
+#, fuzzy, c-format
+msgid "Could not rename folder `%s': %s exists"
+msgstr "Não foi possível criar caixa de diálogo."
+
+#: camel/providers/mh/camel-mh-store.c:205
+msgid "MH folders may not be nested."
+msgstr ""
+
+#: camel/providers/mh/camel-mh-store.c:217
+#, c-format
+msgid "Local mail directory %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:41
+#, c-format
+msgid "Please enter the NNTP password for %s@%s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:62
+msgid "Server rejected username"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:68
+msgid "Failed to send username to server"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:77
+msgid "Server rejected username/password"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:140
+#, fuzzy, c-format
+msgid "Message %s not found."
+msgstr "Arquivo não encontrado"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#, fuzzy
+msgid "Could not get group list from server."
+msgstr "Não foi possível iniciar servidor gnomecal"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:93
+#: camel/providers/nntp/camel-nntp-grouplist.c:102
+#, c-format
+msgid "Unable to load grouplist file for %s: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:151
+#, c-format
+msgid "Unable to save grouplist file for %s: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-provider.c:38
+msgid "USENET news"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-provider.c:40
+msgid "This is a provider for reading from and posting toUSENET newsgroups."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:226
+#, c-format
+msgid "Could not open directory for news server: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:287
+#, c-format
+msgid "USENET News via %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:294
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:499
+#, c-format
+msgid "Unable to open or create .newsrc file for %s: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:177
+msgid "Could not open folder: message listing was incomplete."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:271
+#, fuzzy, c-format
+msgid "No message with uid %s"
+msgstr "Move a mensagem para uma nova pasta"
+
+#: camel/providers/pop3/camel-pop3-folder.c:285
+#, fuzzy, c-format
+msgid "Could not retrieve message from POP server %s: %s"
+msgstr "Sai do editor de mensagens"
+
+#: camel/providers/pop3/camel-pop3-provider.c:34
+msgid "POP"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:36
+msgid ""
+"For connecting to POP servers. The POP protocol can also be used to retrieve "
+"mail from certain web mail providers and proprietary email systems."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:152
+msgid ""
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:162
+msgid ""
+"This option will connect to the POP server using an encrypted password via "
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:174
+msgid ""
+"This will connect to the POP server and use Kerberos 4 to authenticate to it."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:219
+#, fuzzy, c-format
+msgid "Could not authenticate to KPOP server: %s"
+msgstr "Não foi possível iniciar servidor gnomecal"
+
+#: camel/providers/pop3/camel-pop3-store.c:337
+#, fuzzy, c-format
+msgid "Could not connect to POP server on %s."
+msgstr "Conectando ao servidor IMAP (%s)..."
+
+#: camel/providers/pop3/camel-pop3-store.c:391
+#, c-format
+msgid "%sPlease enter the POP3 password for %s@%s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:410
+#, c-format
+msgid ""
+"Unable to connect to POP server.\n"
+"Error sending username: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:413
+#: camel/providers/pop3/camel-pop3-store.c:450
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Erro desconhecido"
+
+#: camel/providers/pop3/camel-pop3-store.c:440
+msgid ""
+"Unable to connect to POP server.\n"
+"No support for requested authentication mechanism."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:448
+#, c-format
+msgid ""
+"Unable to connect to POP server.\n"
+"Error sending password: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:554
+#, c-format
+msgid "No such folder `%s'."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-provider.c:34
+#, fuzzy
+msgid "Sendmail"
+msgstr "Enviar"
+
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:105
+#, fuzzy, c-format
+msgid "Could not create pipe to sendmail: %s: mail not sent"
+msgstr "Não foi possível criar caixa de diálogo."
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:122
+#, c-format
+msgid "Could not fork sendmail: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:148
+#, fuzzy, c-format
+msgid "Could not send message: %s"
+msgstr "Encaminhar esta mensagem"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:161
+#, c-format
+msgid "sendmail exited with signal %s: mail not sent."
+msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:82
+#: camel/providers/sendmail/camel-sendmail-transport.c:168
+#, c-format
+msgid "Could not execute %s: mail not sent."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:173
+#, c-format
+msgid "sendmail exited with status %d: mail not sent."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:220
+msgid "sendmail"
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:222
+msgid "Mail delivery via the sendmail program"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:36
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+msgstr ""
+
+#: camel/providers/vee/camel-vee-provider.c:30
+#, fuzzy
+msgid "Virtual folder email provider"
+msgstr "Assistente de pastas _virtuais ..."
+
+#: camel/providers/vee/camel-vee-provider.c:32
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+
+#: composer/e-msg-composer-attachment-bar.c:85
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:84
+#: composer/e-msg-composer-attachment-bar.c:87
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:91
+#: composer/e-msg-composer-attachment-bar.c:94
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:98
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:99
+#: composer/e-msg-composer-attachment-bar.c:102
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:411
-msgid "Add attachment"
+#. This is a filename. Translators take note.
+#: composer/e-msg-composer-attachment-bar.c:299 mail/mail-display.c:118
+#, fuzzy
+msgid "attachment"
 msgstr "Incluir anexo"
 
-#: composer/e-msg-composer-attachment-bar.c:474 shell/e-shortcuts-view.c:239
+#: composer/e-msg-composer-attachment-bar.c:395
+msgid "Attach a file"
+msgstr "Anexa um arquivo"
+
+#: composer/e-msg-composer-attachment-bar.c:442 filter/filter.glade.h:22
+#: filter/filter.glade.h:25 shell/e-shortcuts-view.c:239
 #: shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "Remover"
 
-#: composer/e-msg-composer-attachment-bar.c:475
+#: composer/e-msg-composer-attachment-bar.c:443
 msgid "Remove selected items from the attachment list"
 msgstr "Remover itens selecionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:474
 msgid "Add attachment..."
 msgstr "Incluir anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:507
+#: composer/e-msg-composer-attachment-bar.c:475
 msgid "Attach a file to the message"
 msgstr "Anexar um arquivo à mensagem"
 
@@ -2763,41 +3329,41 @@ msgstr "Tipo MIME:"
 msgid "File name:"
 msgstr "Nome do arquivo:"
 
-#: composer/e-msg-composer-hdrs.c:138 composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:295
 #, fuzzy
 msgid "From:"
 msgstr "De"
 
-#: composer/e-msg-composer-hdrs.c:244
+#: composer/e-msg-composer-hdrs.c:243
 msgid "Click here for the address book"
 msgstr "Clique aqui para o catálogo de endereços"
 
-#: composer/e-msg-composer-hdrs.c:297
+#: composer/e-msg-composer-hdrs.c:296
 #, fuzzy
 msgid "Enter the identity you wish to send this message from"
 msgstr "Entre os destinatários da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:300
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:302
+#: composer/e-msg-composer-hdrs.c:301
 msgid "Enter the recipients of the message"
 msgstr "Entre os destinatários da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:305
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:307
+#: composer/e-msg-composer-hdrs.c:306
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Entre os endereços que receberão uma cópia da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:312
+#: composer/e-msg-composer-hdrs.c:311
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:313
+#: composer/e-msg-composer-hdrs.c:312
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -2805,70 +3371,82 @@ msgstr ""
 "Entre os endereços que receberão uma cópia da mensagem sem aparecer na lista "
 "de destinatários da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:319
+#: composer/e-msg-composer-hdrs.c:318
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: composer/e-msg-composer-hdrs.c:320
+#: composer/e-msg-composer-hdrs.c:319
 msgid "Enter the subject of the mail"
 msgstr "Entre o assunto da correspondência"
 
-#: composer/e-msg-composer.c:408
+#: composer/e-msg-composer.c:299
+#, fuzzy, c-format
+msgid ""
+"Could not open signature file %s:\n"
+"%s"
+msgstr "Não é possível definir repositório local -- %s"
+
+#: composer/e-msg-composer.c:406
 msgid "Save as..."
 msgstr "Salvar como..."
 
-#: composer/e-msg-composer.c:419
+#: composer/e-msg-composer.c:417
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro ao salvar arquivo: %s"
 
-#: composer/e-msg-composer.c:439
+#: composer/e-msg-composer.c:437
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro ao carregar arquivo: %s"
 
-#: composer/e-msg-composer.c:461
+#: composer/e-msg-composer.c:459
 #, fuzzy
 msgid "Saving changes to message..."
 msgstr "Salva a mensagem"
 
-#: composer/e-msg-composer.c:463
+#: composer/e-msg-composer.c:461
 #, fuzzy
-msgid "About to save changes to message..."
-msgstr "Anexar um arquivo à mensagem"
+msgid "Save changes to message..."
+msgstr "Salva a mensagem"
 
-#: composer/e-msg-composer.c:548 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:502
+#, c-format
+msgid "Error saving composition to 'Drafts': %s"
+msgstr ""
+
+#: composer/e-msg-composer.c:546 shell/e-shell-view-menu.c:167
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:554
+#: composer/e-msg-composer.c:552
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:576
+#: composer/e-msg-composer.c:574
 msgid "Open file"
 msgstr "Abrir arquivo"
 
-#: composer/e-msg-composer.c:702
+#: composer/e-msg-composer.c:700
 msgid "That file does not exist."
 msgstr "Este arquivo não existe."
 
-#: composer/e-msg-composer.c:712
+#: composer/e-msg-composer.c:710
 msgid "That is not a regular file."
 msgstr "Este não é um arquivo comum."
 
-#: composer/e-msg-composer.c:722
+#: composer/e-msg-composer.c:720
 msgid "That file exists but is not readable."
 msgstr "Este arquivo existe mas não é legível."
 
-#: composer/e-msg-composer.c:732
+#: composer/e-msg-composer.c:730
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Este arquivo aparenta ser acessível mas open(2) falhou."
 
-#: composer/e-msg-composer.c:754
+#: composer/e-msg-composer.c:752
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -2876,15 +3454,15 @@ msgstr ""
 "O arquivo é muito grande (mais que 100K).\n"
 "Você tem certeza que deseja inserí-lo?"
 
-#: composer/e-msg-composer.c:775
+#: composer/e-msg-composer.c:773
 msgid "An error occurred while reading the file."
 msgstr "Um erro ocorreu ao ler o arquivo."
 
-#: composer/e-msg-composer.c:1137
+#: composer/e-msg-composer.c:1136
 msgid "Compose a message"
 msgstr "Redigir uma mensagem"
 
-#: composer/e-msg-composer.c:1211
+#: composer/e-msg-composer.c:1210
 #, fuzzy
 msgid "Could not create composer window."
 msgstr "Não foi possível criar caixa de diálogo."
@@ -2968,29 +3546,39 @@ msgstr ""
 msgid "<click here to select a date>"
 msgstr "* Clique aqui para incluir um contato *"
 
-#: filter/filter-editor.c:158 filter/score-editor.c:127
-#: filter/vfolder-editor.c:153
+#: filter/filter-editor.c:159 mail/mail-autofilter.c:287
+#: mail/mail-autofilter.c:336
 #, fuzzy
-msgid "Add Rule"
-msgstr "Incluir fonte"
+msgid "Add Filter Rule"
+msgstr "Editar filtro"
 
-#: filter/filter-editor.c:199
+#: filter/filter-editor.c:207
 #, fuzzy
-msgid "Edit Rule"
+msgid "Edit Filter Rule"
+msgstr "Editar filtro"
+
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: filter/filter-editor.c:404 filter/filter.glade.h:7
+#, fuzzy
+msgid "Edit Filters"
 msgstr "Editar filtro"
 
 #. and now for the action area
-#: filter/filter-filter.c:396
+#: filter/filter-filter.c:401
 #, fuzzy
 msgid "Then"
 msgstr "qu"
 
-#: filter/filter-filter.c:409
+#: filter/filter-filter.c:414
 #, fuzzy
 msgid "Add action"
 msgstr "_Ações"
 
-#: filter/filter-filter.c:415
+#: filter/filter-filter.c:420
 #, fuzzy
 msgid "Remove action"
 msgstr "Remover"
@@ -3004,7 +3592,7 @@ msgstr "_Pasta"
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:253
+#: filter/filter-folder.c:254
 msgid "<click here to select a folder>"
 msgstr ""
 
@@ -3012,44 +3600,226 @@ msgstr ""
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:494
+#: filter/filter-rule.c:509
 #, fuzzy
 msgid "Rule name: "
 msgstr "Nome do arquivo:"
 
-#: filter/filter-rule.c:498
+#: filter/filter-rule.c:513
 #, fuzzy
-msgid "untitled"
+msgid "Untitled"
 msgstr "(Sem nome)"
 
-#: filter/filter-rule.c:509
+#: filter/filter-rule.c:527
 #, fuzzy
 msgid "If"
 msgstr "f"
 
-#: filter/filter-rule.c:526
+#: filter/filter-rule.c:544
 #, fuzzy
 msgid "Execute actions"
 msgstr "Opções"
 
-#: filter/filter-rule.c:530
+#: filter/filter-rule.c:548
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:537
+#: filter/filter-rule.c:553
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:550
+#: filter/filter-rule.c:564
 #, fuzzy
-msgid "More criterion"
-msgstr "Descrição"
+msgid "Add criterion"
+msgstr "_Ações"
+
+#: filter/filter-rule.c:570
+#, fuzzy
+msgid "Remove criterion"
+msgstr "Remover"
+
+#: filter/filter.glade.h:8
+msgid ""
+"Incoming\n"
+"Outgoing\n"
+msgstr ""
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid "Filter Rules"
+msgstr "Editar filtro"
+
+#: filter/filter.glade.h:13 filter/filter.glade.h:18
+#: mail/mail-config.glade.h:12 mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Edit"
+msgstr "_Editar"
+
+#: filter/filter.glade.h:15
+#, fuzzy
+msgid "Edit VFolders"
+msgstr "Editar filtro"
+
+#: filter/filter.glade.h:16
+#, fuzzy
+msgid "Virtual Folders"
+msgstr "Assistente de pastas _virtuais ..."
+
+#: filter/filter.glade.h:20 filter/filter.glade.h:23
+#, fuzzy
+msgid "vFolder Sources"
+msgstr "Editar fonte"
+
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
+msgid "Assign Colour"
+msgstr ""
 
-#: filter/filter-rule.c:556
-msgid "Fewer criterion"
+#: filter/libfilter-i18n.h:3
+msgid "Assign Score"
 msgstr ""
 
-#: filter/score-editor.c:165
+#: filter/libfilter-i18n.h:4
+#, fuzzy
+msgid "Copy to Folder"
+msgstr "Ir para a _pasta..."
+
+#: filter/libfilter-i18n.h:5
+#, fuzzy
+msgid "Date received"
+msgstr "Recebida em"
+
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Date sent"
+msgstr "Data"
+
+#: filter/libfilter-i18n.h:8
+#, fuzzy
+msgid "Expression"
+msgstr "_Profissão:"
+
+#: filter/libfilter-i18n.h:9
+#, fuzzy
+msgid "Forward to Address"
+msgstr "Encaminhar esta mensagem"
+
+#: filter/libfilter-i18n.h:10
+#, fuzzy
+msgid "Message Body"
+msgstr "Salva a mensagem"
+
+#: filter/libfilter-i18n.h:11
+#, fuzzy
+msgid "Message was received"
+msgstr "Lista de destinatários:"
+
+#: filter/libfilter-i18n.h:12
+#, fuzzy
+msgid "Message was sent"
+msgstr "_Marcar todas as messagens como lidas"
+
+#: filter/libfilter-i18n.h:13
+#, fuzzy
+msgid "Move to Folder"
+msgstr "FIXME: _Mover para a pasta..."
+
+#: filter/libfilter-i18n.h:15
+#, fuzzy
+msgid "Recipients"
+msgstr "Lista de destinatários:"
+
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "Sender"
+msgstr "Enviar"
+
+#: filter/libfilter-i18n.h:17
+#, fuzzy
+msgid "Source"
+msgstr "Incluir fonte"
+
+#: filter/libfilter-i18n.h:18
+msgid "Specific header"
+msgstr ""
+
+#: filter/libfilter-i18n.h:19
+#, fuzzy
+msgid "Stop Processing"
+msgstr "Sombreamento"
+
+#: filter/libfilter-i18n.h:20
+msgid "Subject"
+msgstr "Assunto"
+
+#: filter/libfilter-i18n.h:21
+#, fuzzy
+msgid "after"
+msgstr "Editar filtro"
+
+#: filter/libfilter-i18n.h:22
+msgid "before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:23
+#, fuzzy
+msgid "contains"
+msgstr "Açõe_s"
+
+#: filter/libfilter-i18n.h:24
+msgid "does not contain"
+msgstr ""
+
+#: filter/libfilter-i18n.h:25
+msgid "does not match regex"
+msgstr ""
+
+#: filter/libfilter-i18n.h:26
+msgid "is greater than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:27
+msgid "is less than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:28
+msgid "is not"
+msgstr ""
+
+#: filter/libfilter-i18n.h:29
+#, fuzzy
+msgid "is"
+msgstr "i"
+
+#: filter/libfilter-i18n.h:30
+msgid "matches regex"
+msgstr ""
+
+#: filter/libfilter-i18n.h:31
+#, fuzzy
+msgid "on or after"
+msgstr "Editar filtro"
+
+#: filter/libfilter-i18n.h:32
+msgid "on or before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:33
+#, fuzzy
+msgid "was after"
+msgstr "Editar filtro"
+
+#: filter/libfilter-i18n.h:34
+msgid "was before"
+msgstr ""
+
+#: filter/score-editor.c:127
+#, fuzzy
+msgid "Add Rule"
+msgstr "Incluir fonte"
+
+#: filter/score-editor.c:166
 #, fuzzy
 msgid "Edit Score Rule"
 msgstr "Editar fonte"
@@ -3059,56 +3829,95 @@ msgstr "Editar fonte"
 msgid "Score"
 msgstr "Ordem"
 
-#: filter/vfolder-editor.c:192
+#: filter/vfolder-editor.c:155
+#, fuzzy
+msgid "Add VFolder Rule"
+msgstr "Editar filtro"
+
+#: filter/vfolder-editor.c:204
 #, fuzzy
 msgid "Edit VFolder Rule"
 msgstr "Editar filtro"
 
-#: mail/component-factory.c:236
+#: mail/component-factory.c:230
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Não é possível iniciar o componente de correio do Evolution."
 
-#: mail/component-factory.c:243
+#: mail/component-factory.c:236
 #, fuzzy
 msgid "Cannot initialize Evolution's mail summary component."
 msgstr "Não é possível iniciar o componente de correio do Evolution."
 
-#: mail/component-factory.c:248
+#: mail/component-factory.c:241
 #, fuzzy
 msgid "Cannot initialize Evolution's mail storage hash."
 msgstr "Não é possível iniciar o componente de correio do Evolution."
 
-#: mail/folder-browser.c:485
+#: mail/component-factory.c:323
+#, c-format
+msgid "Bad storage URL (no server): %s"
+msgstr ""
+
+#: mail/component-factory.c:342
+msgid "Cannot register storage with shell"
+msgstr ""
+
+#: mail/folder-browser.c:137
+msgid "Body or subject contains"
+msgstr ""
+
+#: mail/folder-browser.c:138
+msgid "Body contains"
+msgstr ""
+
+#: mail/folder-browser.c:139
+#, fuzzy
+msgid "Subject contains"
+msgstr "Assunto"
+
+#: mail/folder-browser.c:140
+msgid "Body does not contain"
+msgstr ""
+
+#: mail/folder-browser.c:141
+msgid "Subject does not contain"
+msgstr ""
+
+#: mail/folder-browser.c:142
+msgid "Custom search"
+msgstr ""
+
+#: mail/folder-browser.c:314
+#, fuzzy
+msgid "Custom"
+msgstr "Recortar"
+
+#: mail/folder-browser.c:492
 #, fuzzy
 msgid "Full Search"
 msgstr "Procurar..."
 
-#: mail/folder-browser.c:490
+#: mail/folder-browser.c:497
 #, fuzzy
 msgid "Save"
 msgstr "sá"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:76
 #, fuzzy, c-format
 msgid "Mail to %s"
 msgstr "C_orreio para:"
 
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:283 mail/mail-autofilter.c:332
-#, fuzzy
-msgid "Add Filter Rule"
-msgstr "Editar filtro"
-
-#: mail/mail-autofilter.c:328
+#: mail/mail-autofilter.c:332
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-callbacks.c:72
+#: mail/mail-callbacks.c:73
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -3116,19 +3925,31 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:112
+#: mail/mail-callbacks.c:113
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:126
+#: mail/mail-callbacks.c:127
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:242
+#: mail/mail-callbacks.c:163 mail/mail-callbacks.c:175
+msgid "You have no mail sources configured"
+msgstr ""
+
+#: mail/mail-callbacks.c:212
+msgid "You have not set a mail transport method"
+msgstr ""
+
+#: mail/mail-callbacks.c:221
+msgid "You have no Outbox configured"
+msgstr ""
+
+#: mail/mail-callbacks.c:245
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -3136,35 +3957,35 @@ msgstr ""
 "Esta mensagem não possui um assunto.\n"
 "Deseja enviar?"
 
-#: mail/mail-callbacks.c:512
+#: mail/mail-callbacks.c:521
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "Mover mensagem(ns) para"
 
-#: mail/mail-callbacks.c:514
+#: mail/mail-callbacks.c:523
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "Mover mensagem(ns) para"
 
-#: mail/mail-callbacks.c:616
+#: mail/mail-callbacks.c:638
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:715
+#: mail/mail-callbacks.c:737
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "Erro ao carregar arquivo: %s"
 
-#: mail/mail-callbacks.c:762 mail/message-list.c:1559
+#: mail/mail-callbacks.c:782 mail/message-list.c:1574
 #, fuzzy
 msgid "Print Message"
 msgstr "Envia a mensagem"
 
-#: mail/mail-callbacks.c:809
+#: mail/mail-callbacks.c:829
 msgid "Printing of message failed"
 msgstr ""
 
@@ -3228,6 +4049,11 @@ msgstr "Sai do editor de mensagens"
 msgid "Test Settings"
 msgstr "Testar configurações"
 
+#: mail/mail-config-gui.c:1107
+#, fuzzy
+msgid "Mail source type:"
+msgstr "Fonte de papel:"
+
 #: mail/mail-config-gui.c:1112 mail/mail-config-gui.c:1160
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
@@ -3242,6 +4068,11 @@ msgstr ""
 "Se o servidor exigir autenticação, você pode clicar o botão \"Detectar tipos "
 "suportados...\" após entrar os outros dados."
 
+#: mail/mail-config-gui.c:1131
+#, fuzzy
+msgid "News source type:"
+msgstr "Novo tipo de telefone"
+
 #: mail/mail-config-gui.c:1136
 msgid ""
 "Select the kind of news server you have, and enter the relevant information "
@@ -3285,16 +4116,26 @@ msgstr "Incluir servidor de news"
 msgid "Edit News Server"
 msgstr "Editar servidor de news"
 
-#: mail/mail-config-gui.c:2283
+#: mail/mail-config-gui.c:2233
+#, fuzzy, c-format
+msgid "Testing \"%s\""
+msgstr "Cabeçalhos"
+
+#: mail/mail-config-gui.c:2235
+#, c-format
+msgid "Test connection to \"%s\""
+msgstr ""
+
+#: mail/mail-config-gui.c:2277
 msgid "The connection was successful!"
 msgstr ""
 
-#: mail/mail-config-gui.c:2333
+#: mail/mail-config-gui.c:2327
 #, c-format
 msgid "Querying authorization capabilities of \"%s\""
 msgstr ""
 
-#: mail/mail-config-gui.c:2335
+#: mail/mail-config-gui.c:2329
 #, c-format
 msgid "Query authorization at \"%s\""
 msgstr ""
@@ -3348,17 +4189,15 @@ msgstr ""
 msgid "Identities"
 msgstr "Incluir identidade"
 
+#: mail/mail-config.glade.h:8
+msgid "Address"
+msgstr "Endereço"
+
 #: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Organization"
 msgstr "Empresa:"
 
-#: mail/mail-config.glade.h:12 mail/mail-config.glade.h:17
-#: mail/mail-config.glade.h:23
-#, fuzzy
-msgid "Edit"
-msgstr "_Editar"
-
 #: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Sources"
@@ -3389,6 +4228,21 @@ msgstr "Envia a mensagem em formato HTML"
 msgid "Mark message as seen [ms]: "
 msgstr "_Marcar todas as messagens como lidas"
 
+#: mail/mail-crypto.c:137
+#, fuzzy, c-format
+msgid "Couldn't create pipe to %s: %s"
+msgstr "Não foi possível criar caixa de diálogo."
+
+#: mail/mail-crypto.c:164
+#, fuzzy, c-format
+msgid "Could not execute %s: %s\n"
+msgstr "Não foi possível criar caixa de diálogo."
+
+#: mail/mail-crypto.c:168
+#, c-format
+msgid "Cannot fork %s: %s"
+msgstr ""
+
 #: mail/mail-crypto.c:345 mail/mail-crypto.c:441 mail/mail-crypto.c:604
 msgid "Please enter your PGP/GPG passphrase."
 msgstr ""
@@ -3417,30 +4271,55 @@ msgid ""
 "Overwrite it?"
 msgstr "Já existe uma pasta com o mesmo nome"
 
-#: mail/mail-display.c:274
+#: mail/mail-display.c:86
+#, fuzzy, c-format
+msgid ""
+"Could not open file %s:\n"
+"%s"
+msgstr "Não é possível definir repositório local -- %s"
+
+#: mail/mail-display.c:98
+#, fuzzy, c-format
+msgid "Could not write data: %s"
+msgstr "Não foi possível criar caixa de diálogo."
+
+#: mail/mail-display.c:194
+#, fuzzy
+msgid "Save Attachment"
+msgstr "FIXME: Salvar a_nexos..."
+
+#: mail/mail-display.c:234
+#, fuzzy, c-format
+msgid "Could not create temporary directory: %s"
+msgstr ""
+"Não é possível criar o diretório\n"
+"%s\n"
+"Erro: %s"
+
+#: mail/mail-display.c:276
 #, fuzzy
 msgid "Save to Disk..."
 msgstr "Salvar como..."
 
-#: mail/mail-display.c:276
+#: mail/mail-display.c:278
 #, fuzzy, c-format
 msgid "Open in %s..."
 msgstr "_Abrir..."
 
-#: mail/mail-display.c:278
+#: mail/mail-display.c:280
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:299
+#: mail/mail-display.c:304
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:322
+#: mail/mail-display.c:327
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:326
+#: mail/mail-display.c:331
 #, fuzzy
 msgid "Hide"
 msgstr "Cabeçalho"
@@ -3455,6 +4334,38 @@ msgstr ""
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr ""
 
+#: mail/mail-local.c:327
+#, fuzzy
+msgid "Closing current folder"
+msgstr "Abrir agenda"
+
+#: mail/mail-local.c:359
+msgid "Renaming old folder and opening"
+msgstr ""
+
+#: mail/mail-local.c:380
+#, fuzzy
+msgid "Creating new folder"
+msgstr "Cria uma nova pasta"
+
+#: mail/mail-local.c:395
+#, fuzzy
+msgid "Copying messages"
+msgstr "Redigir uma mensagem"
+
+#: mail/mail-local.c:407
+#, c-format
+msgid ""
+"Cannot save folder metainfo; you'll probably find you can't\n"
+"open this folder anymore: %s"
+msgstr ""
+
+#: mail/mail-local.c:443
+msgid ""
+"If you can no longer open this mailbox, then\n"
+"you may need to repair it manually."
+msgstr ""
+
 #. This is how we could do to display extra information about the
 #. folder.
 #: mail/mail-local-storage.c:97
@@ -3471,263 +4382,258 @@ msgstr "Coletando correio"
 msgid "Fetch email from %s"
 msgstr "Coletando correio"
 
-#: mail/mail-ops.c:173
-#, c-format
-msgid "Retrieving message %d of %d"
-msgstr ""
-
-#: mail/mail-ops.c:237
+#: mail/mail-ops.c:110
 #, fuzzy, c-format
 msgid "Retrieving messages : %s"
 msgstr "Mover mensagem(ns) para"
 
-#: mail/mail-ops.c:373
+#: mail/mail-ops.c:253
 #, c-format
 msgid "There is no new mail at %s."
 msgstr ""
 
-#: mail/mail-ops.c:430
+#: mail/mail-ops.c:308
 msgid "Filtering email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:432
+#: mail/mail-ops.c:310
 msgid "Filter email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:637
+#: mail/mail-ops.c:441
 #, fuzzy, c-format
 msgid "Sending \"%s\""
 msgstr "Cabeçalhos"
 
-#: mail/mail-ops.c:642
+#: mail/mail-ops.c:446
 msgid "Sending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:645
+#: mail/mail-ops.c:449
 #, fuzzy, c-format
 msgid "Send \"%s\""
 msgstr "Segundos"
 
-#: mail/mail-ops.c:648
+#: mail/mail-ops.c:452
 #, fuzzy
 msgid "Send a message without a subject"
 msgstr "Salva a mensagem com um nome diferente"
 
-#: mail/mail-ops.c:792
+#: mail/mail-ops.c:623
 msgid "Sending queue"
 msgstr ""
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:625
 msgid "Send queue"
 msgstr ""
 
-#: mail/mail-ops.c:930 mail/mail-ops.c:937
+#: mail/mail-ops.c:761 mail/mail-ops.c:768
 #, c-format
 msgid "Appending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:934 mail/mail-ops.c:940
+#: mail/mail-ops.c:765 mail/mail-ops.c:771
 msgid "Appending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:1012
+#: mail/mail-ops.c:843
 #, c-format
 msgid "Expunging \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1014
+#: mail/mail-ops.c:845
 #, fuzzy, c-format
 msgid "Expunge \"%s\""
 msgstr "_Excluir permanentemente"
 
-#: mail/mail-ops.c:1073
+#: mail/mail-ops.c:904
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1075
+#: mail/mail-ops.c:906
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1078
+#: mail/mail-ops.c:909
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1080
+#: mail/mail-ops.c:911
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1111
+#: mail/mail-ops.c:942
 #, fuzzy
 msgid "Moving"
 msgstr "seg"
 
-#: mail/mail-ops.c:1114
+#: mail/mail-ops.c:945
 #, fuzzy
 msgid "Copying"
 msgstr "Copiar"
 
-#: mail/mail-ops.c:1134
+#: mail/mail-ops.c:965
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1213
+#: mail/mail-ops.c:1044
 #, fuzzy, c-format
 msgid "Marking messages in folder \"%s\""
 msgstr "Move a mensagem para uma nova pasta"
 
-#: mail/mail-ops.c:1216
+#: mail/mail-ops.c:1047
 #, fuzzy, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr "Move a mensagem para uma nova pasta"
 
-#: mail/mail-ops.c:1247
+#: mail/mail-ops.c:1078
 #, c-format
 msgid "Marking message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:1367
+#: mail/mail-ops.c:1198
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1370
+#: mail/mail-ops.c:1201
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1441 mail/subscribe-dialog.c:163
+#: mail/mail-ops.c:1272 mail/subscribe-dialog.c:194
 #, fuzzy
 msgid "(No description)"
 msgstr "Descrição"
 
-#: mail/mail-ops.c:1501
+#: mail/mail-ops.c:1332
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1504
+#: mail/mail-ops.c:1335
 #, fuzzy, c-format
 msgid "Attach messages from \"%s\""
 msgstr "Sai do editor de mensagens"
 
-#: mail/mail-ops.c:1607
+#: mail/mail-ops.c:1438
 #, fuzzy, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "Encaminhar esta mensagem"
 
-#: mail/mail-ops.c:1612
+#: mail/mail-ops.c:1443
 msgid "Forwarding a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:1615
+#: mail/mail-ops.c:1446
 #, fuzzy, c-format
 msgid "Forward message \"%s\""
 msgstr "Encaminhar esta mensagem"
 
-#: mail/mail-ops.c:1620
+#: mail/mail-ops.c:1451
 msgid "Forward a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:1657
+#: mail/mail-ops.c:1488
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1674
+#: mail/mail-ops.c:1505
 msgid ""
 "Failed to generate mime part from message while generating forwarded message."
 msgstr ""
 
-#: mail/mail-ops.c:1760
+#: mail/mail-ops.c:1591
 #, fuzzy, c-format
 msgid "Loading \"%s\""
 msgstr "Cabeçalhos"
 
-#: mail/mail-ops.c:1762
+#: mail/mail-ops.c:1593
 #, c-format
 msgid "Load \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1864
+#: mail/mail-ops.c:1695
 #, c-format
 msgid "Creating \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1866
+#: mail/mail-ops.c:1697
 #, c-format
 msgid "Create \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1914
+#: mail/mail-ops.c:1745
 msgid "Exception while reporting result to shell component listener."
 msgstr ""
 
-#: mail/mail-ops.c:1960
+#: mail/mail-ops.c:1791
 #, fuzzy, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Sincronizar"
 
-#: mail/mail-ops.c:1962
+#: mail/mail-ops.c:1793
 #, fuzzy, c-format
 msgid "Synchronize \"%s\""
 msgstr "Sincronizar"
 
-#: mail/mail-ops.c:2025
+#: mail/mail-ops.c:1856
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:2028
+#: mail/mail-ops.c:1859
 #, fuzzy
 msgid "Clearing message display"
 msgstr "Exibição da hora"
 
-#: mail/mail-ops.c:2031
+#: mail/mail-ops.c:1862
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:2034
+#: mail/mail-ops.c:1865
 #, fuzzy
 msgid "Clear message display"
 msgstr "Cores para a exibição"
 
-#: mail/mail-ops.c:2143
+#: mail/mail-ops.c:1974
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:2146
+#: mail/mail-ops.c:1977
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:2250
+#: mail/mail-ops.c:2081
 #, c-format
 msgid "Loading %s Folder"
 msgstr ""
 
-#: mail/mail-ops.c:2252
+#: mail/mail-ops.c:2083
 #, c-format
 msgid "Load %s Folder"
 msgstr ""
 
-#: mail/mail-ops.c:2319
+#: mail/mail-ops.c:2150
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:2322
+#: mail/mail-ops.c:2153
 #, fuzzy, c-format
 msgid "View messages from \"%s\""
 msgstr "Mover mensagem(ns) para"
 
-#: mail/mail-ops.c:2348
+#: mail/mail-ops.c:2179
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr ""
@@ -3771,48 +4677,71 @@ msgstr "O usuário cancelou a consulta."
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
+#. Get all uids of source
+#: mail/mail-tools.c:264
+#, c-format
+msgid "Examining %s"
+msgstr ""
+
 #: mail/mail-tools.c:294
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
 msgstr ""
 
-#: mail/mail-tools.c:387
+#. Info
+#: mail/mail-tools.c:315
+#, c-format
+msgid "Retrieving message %d of %d"
+msgstr ""
+
+#. Append it to dest
+#: mail/mail-tools.c:328
 #, fuzzy, c-format
-msgid "[%s] %s"
-msgstr "%2$s%1$s"
+msgid "Writing message %d of %d"
+msgstr "Mover mensagem(ns) para"
 
-#: mail/mail-tools.c:389
+#: mail/mail-tools.c:357
+#, fuzzy, c-format
+msgid "Saving changes to %s"
+msgstr "Salva a mensagem"
+
+#: mail/mail-tools.c:391
 #, fuzzy, c-format
 msgid "[%s] (forwarded message)"
 msgstr "Encaminhar esta mensagem"
 
-#: mail/mail-tools.c:398
+#: mail/mail-tools.c:400
 msgid "Fwd: (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:435
+#: mail/mail-tools.c:437
 #, fuzzy, c-format
 msgid "Forwarded message - %s"
 msgstr "Encaminhar esta mensagem"
 
-#: mail/mail-tools.c:437
+#: mail/mail-tools.c:439
 #, fuzzy
 msgid "Forwarded message (no subject)"
 msgstr "Encaminhar esta mensagem"
 
-#: mail/mail-tools.c:549
+#: mail/mail-tools.c:551
 #, c-format
 msgid "Don't know protocol to open URI `%s'"
 msgstr ""
 
-#: mail/mail-tools.c:578
+#: mail/mail-tools.c:580
 #, fuzzy, c-format
 msgid ""
 "Cannot open location `%s':\n"
 "%s"
 msgstr "Não é possível definir repositório local -- %s"
 
+#: mail/mail-vfolder.c:147
+#, fuzzy
+msgid "VFolders"
+msgstr "Pastas"
+
 #: mail/mail-vfolder.c:292
 #, fuzzy
 msgid "New VFolder"
@@ -3820,114 +4749,137 @@ msgstr "_Pasta"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:151 ui/evolution-mail.h:47
+#: mail/mail-view.c:151 ui/evolution-mail.h:34
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/mail-view.c:151 ui/evolution-mail.h:48
+#: mail/mail-view.c:151 ui/evolution-mail.h:39
 msgid "Reply to the sender of this message"
 msgstr "Responder ao remetente desta mensagem"
 
-#: mail/mail-view.c:154 mail/message-list.c:1562 ui/evolution-mail.h:49
+#: mail/mail-view.c:154 mail/message-list.c:1577 ui/evolution-mail.h:35
 msgid "Reply to All"
 msgstr "Responder a todos"
 
-#: mail/mail-view.c:154 ui/evolution-mail.h:50
+#: mail/mail-view.c:154 ui/evolution-mail.h:38
 msgid "Reply to all recipients of this message"
 msgstr "Responder a todos os destinatários desta mensagem"
 
-#: mail/mail-view.c:157 ui/evolution-mail.h:51
+#: mail/mail-view.c:157 ui/evolution-mail.h:19
 msgid "Forward"
 msgstr "Encaminhar"
 
-#: mail/mail-view.c:157 ui/evolution-mail.h:52
+#: mail/mail-view.c:157 ui/evolution-mail.h:20
 msgid "Forward this message"
 msgstr "Encaminhar esta mensagem"
 
-#: mail/mail-view.c:161 ui/evolution-addressbook.h:18
-#: ui/evolution-calendar.h:24 ui/evolution-mail.h:57
+#: mail/mail-view.c:161 ui/evolution-addressbook.h:16
+#: ui/evolution-calendar.h:26 ui/evolution-mail.h:29
 msgid "Print"
 msgstr "Imprimir"
 
-#: mail/mail-view.c:161 ui/evolution-mail.h:58
+#: mail/mail-view.c:161 ui/evolution-mail.h:33
 msgid "Print the selected message"
 msgstr "Imprimir a mensagem selecionada"
 
-#: mail/mail-view.c:163 ui/evolution-mail.h:60
+#: mail/mail-view.c:163 ui/evolution-mail.h:14
 msgid "Delete this message"
 msgstr "Excluir esta mensagem"
 
-#: mail/message-list.c:1557
+#: mail/message-list.c:518
+#, fuzzy
+msgid "Unseen"
+msgstr "sétimo"
+
+#: mail/message-list.c:521
+#, fuzzy
+msgid "Seen"
+msgstr "Enviar"
+
+#: mail/message-list.c:524
+msgid "Answered"
+msgstr ""
+
+#: mail/message-list.c:1572
 msgid "Open in New Window"
 msgstr ""
 
-#: mail/message-list.c:1558
+#: mail/message-list.c:1573
 #, fuzzy
 msgid "Edit Message"
 msgstr "Envia a mensagem"
 
-#: mail/message-list.c:1561
+#: mail/message-list.c:1576
 #, fuzzy
 msgid "Reply to Sender"
 msgstr "Responder a todos"
 
-#: mail/message-list.c:1563
+#: mail/message-list.c:1578
 #, fuzzy
 msgid "Forward Message"
 msgstr "Encaminhar esta mensagem"
 
-#: mail/message-list.c:1565
+#: mail/message-list.c:1580
 #, fuzzy
 msgid "Delete Message"
 msgstr "Excluir esta mensagem"
 
-#: mail/message-list.c:1566
+#: mail/message-list.c:1581
 #, fuzzy
 msgid "Move Message"
 msgstr "Salva a mensagem"
 
-#: mail/message-list.c:1567
+#: mail/message-list.c:1582
 #, fuzzy
 msgid "Copy Message"
 msgstr "Redigir uma mensagem"
 
-#: mail/message-list.c:1569
+#: mail/message-list.c:1584
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/message-list.c:1570
+#: mail/message-list.c:1585
 msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/message-list.c:1571
+#: mail/message-list.c:1586
 #, fuzzy
 msgid "VFolder on Recipients"
 msgstr "Lista de destinatários:"
 
-#: mail/message-list.c:1573
+#: mail/message-list.c:1588
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/message-list.c:1574
+#: mail/message-list.c:1589
 #, fuzzy
 msgid "Filter on Sender"
 msgstr "Arquivo não encontrado"
 
-#: mail/message-list.c:1575
+#: mail/message-list.c:1590
 #, fuzzy
 msgid "Filter on Recipients"
 msgstr "Lista de destinatários:"
 
-#: mail/message-list.c:1576 mail/message-list.c:1599
+#: mail/message-list.c:1591 mail/message-list.c:1614
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/message-list.c:1601
+#: mail/message-list.c:1616
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/subscribe-dialog.c:118
+#: mail/message-list.c:1734
+#, fuzzy
+msgid "Rebuilding message view"
+msgstr "Mover mensagem(ns) para"
+
+#: mail/message-list.c:1736
+msgid "Rebuild message view"
+msgstr ""
+
+#: mail/subscribe-dialog.c:132
 msgid "Display folders containing:"
 msgstr ""
 
@@ -4215,11 +5167,7 @@ msgstr "Operação não suportada"
 msgid "The specified type is not supported in this storage"
 msgstr "O tipo especificado não é suportado neste repositório"
 
-#: shell/e-storage.c:340
-msgid "Unknown error"
-msgstr "Erro desconhecido"
-
-#: shell/e-storage-set-view.c:223 ui/evolution.h:15 ui/evolution.h:29
+#: shell/e-storage-set-view.c:223 ui/evolution.h:39
 msgid "_View"
 msgstr "_Visualizar"
 
@@ -4292,79 +5240,72 @@ msgstr "Não é possível iniciar o sistema de componentes Bonobo."
 #. * POTFILES.in. DO NOT compile it as part of your application.
 #.
 #: ui/evolution-addressbook-ldap.h:9
-msgid "_Actions"
-msgstr "Açõe_s"
-
-#: ui/evolution-addressbook-ldap.h:10
 msgid "N_ew Directory Server"
 msgstr "Novo _servidor de diretório"
 
-#.
-#. *  This file is autogenerated from evolution-addressbook.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: ui/evolution-addressbook.h:9
-#, fuzzy
-msgid "_Print Contacts..."
-msgstr "Imprime contatos"
+#: ui/evolution-addressbook-ldap.h:10
+msgid "_Actions"
+msgstr "Açõe_s"
 
-#: ui/evolution-addressbook.h:11
-msgid "_New Contact"
-msgstr "_Novo contato"
+#: ui/evolution-addressbook.h:10
+msgid "Create a new contact"
+msgstr "Cria um novo contato"
 
 #: ui/evolution-addressbook.h:12
-msgid "_Tools"
-msgstr "_Ferramentas"
+msgid "Delete a contact"
+msgstr "Exclui um contato"
 
 #: ui/evolution-addressbook.h:13
-msgid "_Search for contacts"
-msgstr ""
-
-#: ui/evolution-addressbook.h:14 ui/evolution-calendar.h:22
-msgid "New"
-msgstr "Novo"
-
-#: ui/evolution-addressbook.h:15
-msgid "Create a new contact"
-msgstr "Cria um novo contato"
-
-#: ui/evolution-addressbook.h:16
 msgid "Find"
 msgstr "Localizar"
 
-#: ui/evolution-addressbook.h:17
+#: ui/evolution-addressbook.h:14
 msgid "Find a contact"
 msgstr "Localiza um contato"
 
-#: ui/evolution-addressbook.h:19
+#: ui/evolution-addressbook.h:15 ui/evolution-calendar.h:21
+msgid "New"
+msgstr "Novo"
+
+#: ui/evolution-addressbook.h:17
 msgid "Print contacts"
 msgstr "Imprime contatos"
 
-#: ui/evolution-addressbook.h:21
-msgid "Delete a contact"
-msgstr "Exclui um contato"
+#: ui/evolution-addressbook.h:18
+msgid "Stop"
+msgstr ""
 
-#: ui/evolution-addressbook.h:22
+#: ui/evolution-addressbook.h:19
+#, fuzzy
+msgid "Stop Loading"
+msgstr "Sombreamento"
+
+#: ui/evolution-addressbook.h:20
 #, fuzzy
 msgid "View All"
 msgstr "_Visualizar"
 
-#: ui/evolution-addressbook.h:23
+#: ui/evolution-addressbook.h:21
 #, fuzzy
 msgid "View all contacts"
 msgstr "Localiza um contato"
 
+#: ui/evolution-addressbook.h:22
+msgid "_New Contact"
+msgstr "_Novo contato"
+
+#: ui/evolution-addressbook.h:23
+#, fuzzy
+msgid "_Print Contacts..."
+msgstr "Imprime contatos"
+
 #: ui/evolution-addressbook.h:24
-msgid "Stop"
+msgid "_Search for contacts"
 msgstr ""
 
 #: ui/evolution-addressbook.h:25
-#, fuzzy
-msgid "Stop Loading"
-msgstr "Sombreamento"
+msgid "_Tools"
+msgstr "_Ferramentas"
 
 #.
 #. *  This file is autogenerated from evolution-calendar.xml, do not edit
@@ -4373,132 +5314,132 @@ msgstr "Sombreamento"
 #. * bonobo-ui-extract. Add this file to your project's
 #. * POTFILES.in. DO NOT compile it as part of your application.
 #.
-#: ui/evolution-calendar.h:9 ui/evolution.h:14
-msgid "_New"
-msgstr "_Novo"
+#: ui/evolution-calendar.h:9
+msgid "5 Days"
+msgstr "5 dias"
 
 #: ui/evolution-calendar.h:10
-msgid "New Ca_lendar"
-msgstr "Nova _agenda"
+#, fuzzy
+msgid "Alter preferences"
+msgstr "Preferências"
 
 #: ui/evolution-calendar.h:11
-msgid "Create a new calendar"
-msgstr "Cria uma nova agenda"
+#, fuzzy
+msgid "Calendar Preferences..."
+msgstr "Preferências"
 
 #: ui/evolution-calendar.h:12
-#, fuzzy
-msgid "_Open"
-msgstr "_Abrir..."
+msgid "Create a new appointment"
+msgstr "Cria um novo compromisso"
 
 #: ui/evolution-calendar.h:13
-#, fuzzy
-msgid "_Open Calendar"
-msgstr "Abrir a_genda"
+msgid "Create a new calendar"
+msgstr "Cria uma nova agenda"
 
 #: ui/evolution-calendar.h:14
-msgid "Open a calendar"
-msgstr "Abre uma agenda"
+msgid "Day"
+msgstr "Dia"
 
 #: ui/evolution-calendar.h:15
-#, fuzzy
-msgid "_Save Calendar As"
-msgstr "Salvar agenda _como"
+msgid "Go back in time"
+msgstr "Volta no tempo"
 
 #: ui/evolution-calendar.h:16
-#, fuzzy
-msgid "Save calendar As something else"
-msgstr "Salvar agenda _como"
+msgid "Go forward in time"
+msgstr "Avança no tempo"
 
 #: ui/evolution-calendar.h:17
-#, fuzzy
-msgid "_Print this calendar"
-msgstr "Imprime esta agenda"
+msgid "Go to"
+msgstr "Ir para"
 
 #: ui/evolution-calendar.h:18
-msgid "_New appointment..."
-msgstr "Novo _compromisso..."
+msgid "Go to a specific date"
+msgstr "Vai para uma data específica"
 
-#: ui/evolution-calendar.h:19 ui/evolution-calendar.h:23
-msgid "Create a new appointment"
-msgstr "Cria um novo compromisso"
+#: ui/evolution-calendar.h:19
+msgid "Go to present time"
+msgstr "Vai para a data atual"
 
 #: ui/evolution-calendar.h:20
-#, fuzzy
-msgid "Calendar Preferences..."
-msgstr "Preferências"
+msgid "Month"
+msgstr "Mês"
 
-#: ui/evolution-calendar.h:21
-#, fuzzy
-msgid "Alter preferences"
-msgstr "Preferências"
+#: ui/evolution-calendar.h:22
+msgid "New Ca_lendar"
+msgstr "Nova _agenda"
 
-#: ui/evolution-calendar.h:25
-msgid "Print this calendar"
-msgstr "Imprime esta agenda"
+#: ui/evolution-calendar.h:23
+msgid "Next"
+msgstr "Próximo"
 
-#: ui/evolution-calendar.h:26
+#: ui/evolution-calendar.h:24
+msgid "Open a calendar"
+msgstr "Abre uma agenda"
+
+#: ui/evolution-calendar.h:25
 msgid "Prev"
 msgstr "Anterior"
 
 #: ui/evolution-calendar.h:27
-msgid "Go back in time"
-msgstr "Volta no tempo"
+msgid "Print this calendar"
+msgstr "Imprime esta agenda"
 
-#: ui/evolution-calendar.h:28 widgets/misc/e-dateedit.c:331
-msgid "Today"
-msgstr "Hoje"
+#: ui/evolution-calendar.h:28
+#, fuzzy
+msgid "Save calendar As something else"
+msgstr "Salvar agenda _como"
 
 #: ui/evolution-calendar.h:29
-msgid "Go to present time"
-msgstr "Vai para a data atual"
+msgid "Show 1 day"
+msgstr "Exibe 1 dia"
 
 #: ui/evolution-calendar.h:30
-msgid "Next"
-msgstr "Próximo"
+msgid "Show 1 month"
+msgstr "Exibe 1 mês"
 
 #: ui/evolution-calendar.h:31
-msgid "Go forward in time"
-msgstr "Avança no tempo"
+msgid "Show 1 week"
+msgstr "Exibe 1 semana"
 
 #: ui/evolution-calendar.h:32
-msgid "Go to"
-msgstr "Ir para"
+msgid "Show the working week"
+msgstr "Exibe a semana útil"
 
-#: ui/evolution-calendar.h:33
-msgid "Go to a specific date"
-msgstr "Vai para uma data específica"
+#: ui/evolution-calendar.h:33 widgets/misc/e-dateedit.c:331
+msgid "Today"
+msgstr "Hoje"
 
 #: ui/evolution-calendar.h:34
-msgid "Day"
-msgstr "Dia"
+msgid "Week"
+msgstr "Semana"
 
-#: ui/evolution-calendar.h:35
-msgid "Show 1 day"
-msgstr "Exibe 1 dia"
+#: ui/evolution-calendar.h:35 ui/evolution.h:35
+msgid "_New"
+msgstr "_Novo"
 
 #: ui/evolution-calendar.h:36
-msgid "5 Days"
-msgstr "5 dias"
+msgid "_New appointment..."
+msgstr "Novo _compromisso..."
 
 #: ui/evolution-calendar.h:37
-msgid "Show the working week"
-msgstr "Exibe a semana útil"
+#, fuzzy
+msgid "_Open"
+msgstr "_Abrir..."
 
 #: ui/evolution-calendar.h:38
-msgid "Week"
-msgstr "Semana"
+#, fuzzy
+msgid "_Open Calendar"
+msgstr "Abrir a_genda"
 
 #: ui/evolution-calendar.h:39
-msgid "Show 1 week"
-msgstr "Exibe 1 semana"
+#, fuzzy
+msgid "_Print this calendar"
+msgstr "Imprime esta agenda"
 
 #: ui/evolution-calendar.h:40
-msgid "Month"
-msgstr "Mês"
-
-#: ui/evolution-calendar.h:41
-msgid "Show 1 month"
-msgstr "Exibe 1 mês"
+#, fuzzy
+msgid "_Save Calendar As"
+msgstr "Salvar agenda _como"
 
 #.
 #. *  This file is autogenerated from evolution-contact-editor.xml, do not edit
@@ -4507,8 +5448,8 @@ msgstr "Exibe 1 mês"
 #. * bonobo-ui-extract. Add this file to your project's
 #. * POTFILES.in. DO NOT compile it as part of your application.
 #.
-#: ui/evolution-contact-editor.h:9 ui/evolution-subscribe.h:9
-#: ui/evolution.h:13
+#: ui/evolution-contact-editor.h:9 ui/evolution-subscribe.h:19
+#: ui/evolution.h:29
 msgid "_File"
 msgstr "_Arquivo"
 
@@ -4556,219 +5497,231 @@ msgstr "Exclui este item"
 #. * POTFILES.in. DO NOT compile it as part of your application.
 #.
 #: ui/evolution-mail.h:9
-msgid "_Threaded"
-msgstr ""
+msgid "Compose"
+msgstr "Redigir"
 
 #: ui/evolution-mail.h:10
-#, fuzzy
-msgid "Threaded Message list"
-msgstr "_Lista encadeada de mensagens"
+msgid "Compose a new message"
+msgstr "Redige uma nova mensagem"
 
 #: ui/evolution-mail.h:11
-#, fuzzy
-msgid "Print message..."
-msgstr "Imprimir..."
+msgid "Copy"
+msgstr "Copiar"
 
 #: ui/evolution-mail.h:12
-msgid "Print message to the printer"
-msgstr ""
-
-#: ui/evolution-mail.h:13
 #, fuzzy
-msgid "Print Preview of message..."
-msgstr "Visualizar impressão"
-
-#: ui/evolution-mail.h:14
-msgid "Previews the message to be printed"
-msgstr ""
+msgid "Copy message to a new folder"
+msgstr "Move a mensagem para uma nova pasta"
 
-#: ui/evolution-mail.h:15 ui/evolution-subscribe.h:12
+#: ui/evolution-mail.h:15 ui/evolution-subscribe.h:11
 #, fuzzy
-msgid "Select _All"
-msgstr "Responder a todos"
+msgid "F_older"
+msgstr "_Pasta"
 
 #: ui/evolution-mail.h:16
-msgid "_Invert Selection"
+msgid "Fi_lter on Sender"
 msgstr ""
 
 #: ui/evolution-mail.h:17
 #, fuzzy
-msgid "Mail _Filters..."
-msgstr "FIXME: _Arquivo..."
+msgid "Filter on Rec_ipients"
+msgstr "Lista de destinatários:"
 
 #: ui/evolution-mail.h:18
-#, fuzzy
-msgid "_Virtual Folder Editor..."
-msgstr "Assistente de pastas _virtuais ..."
-
-#: ui/evolution-mail.h:19
-#, fuzzy
-msgid "_Mail Configuration..."
-msgstr "_Configuração de correio ..."
-
-#: ui/evolution-mail.h:20
-msgid "Manage Subscriptions..."
-msgstr ""
-
-#: ui/evolution-mail.h:21
 msgid "Forget _Passwords"
 msgstr "Esquecer _senhas"
 
+#: ui/evolution-mail.h:21
+#, fuzzy
+msgid "Get Mail"
+msgstr "Receber correspondência"
+
 #: ui/evolution-mail.h:22
 #, fuzzy
-msgid "_Message"
-msgstr "Salva a mensagem"
+msgid "Mail _Filters..."
+msgstr "FIXME: _Arquivo..."
 
 #: ui/evolution-mail.h:23
-msgid "_Open in New Window"
+msgid "Manage Subscriptions..."
 msgstr ""
 
 #: ui/evolution-mail.h:24
-#, fuzzy
-msgid "_Edit Message"
-msgstr "Envia a mensagem"
+msgid "Mar_k As Read"
+msgstr ""
 
 #: ui/evolution-mail.h:25
 #, fuzzy
-msgid "_Print Message"
-msgstr "Envia a mensagem"
+msgid "Mark As U_nread"
+msgstr "FIXME: _Marcar como não lido"
 
 #: ui/evolution-mail.h:26
-#, fuzzy
-msgid "Reply to _Sender"
-msgstr "Responder a todos"
+msgid "Move"
+msgstr "Mover"
 
 #: ui/evolution-mail.h:27
-#, fuzzy
-msgid "Reply to _All"
-msgstr "Responder a todos"
+msgid "Move message to a new folder"
+msgstr "Move a mensagem para uma nova pasta"
 
 #: ui/evolution-mail.h:28
-#, fuzzy
-msgid "_Forward"
-msgstr "Encaminhar"
-
-#: ui/evolution-mail.h:29
-msgid "Mar_k As Read"
+msgid "Previews the message to be printed"
 msgstr ""
 
 #: ui/evolution-mail.h:30
 #, fuzzy
-msgid "Mark As U_nread"
-msgstr "FIXME: _Marcar como não lido"
+msgid "Print Preview of message..."
+msgstr "Visualizar impressão"
+
+#: ui/evolution-mail.h:31
+msgid "Print message to the printer"
+msgstr ""
 
 #: ui/evolution-mail.h:32
 #, fuzzy
-msgid "_Move to Folder"
-msgstr "FIXME: _Mover para a pasta..."
+msgid "Print message..."
+msgstr "Imprimir..."
 
-#: ui/evolution-mail.h:33
+#: ui/evolution-mail.h:36
 #, fuzzy
-msgid "_Copy to Folder"
-msgstr "Ir para a _pasta..."
+msgid "Reply to _All"
+msgstr "Responder a todos"
 
-#: ui/evolution-mail.h:34
-msgid "_VFolder on Subject"
+#: ui/evolution-mail.h:37
+#, fuzzy
+msgid "Reply to _Sender"
+msgstr "Responder a todos"
+
+#: ui/evolution-mail.h:40 ui/evolution-subscribe.h:15
+#, fuzzy
+msgid "Select _All"
+msgstr "Responder a todos"
+
+#: ui/evolution-mail.h:41
+msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: ui/evolution-mail.h:35
+#: ui/evolution-mail.h:42
+#, fuzzy
+msgid "Threaded Message list"
+msgstr "_Lista encadeada de mensagens"
+
+#: ui/evolution-mail.h:43
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: ui/evolution-mail.h:36
+#: ui/evolution-mail.h:44
 #, fuzzy
 msgid "VFolder on _Recipients"
 msgstr "Lista de destinatários:"
 
-#: ui/evolution-mail.h:37
-msgid "_Filter on Subject"
-msgstr ""
+#: ui/evolution-mail.h:45
+#, fuzzy
+msgid "_Apply Filters"
+msgstr "FIXME: _Arquivo..."
 
-#: ui/evolution-mail.h:38
-msgid "Fi_lter on Sender"
-msgstr ""
+#: ui/evolution-mail.h:46
+#, fuzzy
+msgid "_Configure Folder"
+msgstr "_Pasta"
 
-#: ui/evolution-mail.h:39
+#: ui/evolution-mail.h:47
 #, fuzzy
-msgid "Filter on Rec_ipients"
-msgstr "Lista de destinatários:"
+msgid "_Copy to Folder"
+msgstr "Ir para a _pasta..."
 
-#: ui/evolution-mail.h:40 ui/evolution-subscribe.h:14
+#: ui/evolution-mail.h:49
 #, fuzzy
-msgid "F_older"
-msgstr "_Pasta"
+msgid "_Edit Message"
+msgstr "Envia a mensagem"
 
-#: ui/evolution-mail.h:41
+#: ui/evolution-mail.h:50
 msgid "_Expunge"
 msgstr "_Excluir permanentemente"
 
-#: ui/evolution-mail.h:42
-#, fuzzy
-msgid "_Configure Folder"
-msgstr "_Pasta"
+#: ui/evolution-mail.h:51
+msgid "_Filter on Subject"
+msgstr ""
 
-#: ui/evolution-mail.h:43
+#: ui/evolution-mail.h:52
 #, fuzzy
-msgid "Get Mail"
-msgstr "Receber correspondência"
+msgid "_Forward"
+msgstr "Encaminhar"
 
-#: ui/evolution-mail.h:44
-msgid "Send queued mail and retrieve new mail"
+#: ui/evolution-mail.h:53 ui/evolution-subscribe.h:20
+msgid "_Invert Selection"
 msgstr ""
 
-#: ui/evolution-mail.h:45
-msgid "Compose"
-msgstr "Redigir"
+#: ui/evolution-mail.h:54
+#, fuzzy
+msgid "_Mail Configuration..."
+msgstr "_Configuração de correio ..."
 
-#: ui/evolution-mail.h:46
-msgid "Compose a new message"
-msgstr "Redige uma nova mensagem"
+#: ui/evolution-mail.h:55
+#, fuzzy
+msgid "_Message"
+msgstr "Salva a mensagem"
 
-#: ui/evolution-mail.h:53
-msgid "Move"
-msgstr "Mover"
+#: ui/evolution-mail.h:56
+#, fuzzy
+msgid "_Move to Folder"
+msgstr "FIXME: _Mover para a pasta..."
 
-#: ui/evolution-mail.h:54
-msgid "Move message to a new folder"
-msgstr "Move a mensagem para uma nova pasta"
+#: ui/evolution-mail.h:57
+msgid "_Open in New Window"
+msgstr ""
 
-#: ui/evolution-mail.h:56
+#: ui/evolution-mail.h:58
 #, fuzzy
-msgid "Copy message to a new folder"
-msgstr "Move a mensagem para uma nova pasta"
+msgid "_Print Message"
+msgstr "Envia a mensagem"
 
-#: ui/evolution-subscribe.h:11 ui/evolution.h:28
-msgid "_Edit"
-msgstr "_Editar"
+#: ui/evolution-mail.h:59
+msgid "_Threaded"
+msgstr ""
 
-#: ui/evolution-subscribe.h:13
-msgid "_Unselect All"
+#: ui/evolution-mail.h:60
+msgid "_VFolder on Subject"
 msgstr ""
 
-#: ui/evolution-subscribe.h:15 ui/evolution-subscribe.h:17
-msgid "Subscribe"
+#: ui/evolution-mail.h:61
+#, fuzzy
+msgid "_Virtual Folder Editor..."
+msgstr "Assistente de pastas _virtuais ..."
+
+#.
+#. *  This file is autogenerated from evolution-subscribe.xml, do not edit
+#. *
+#. *  This file contains translatable strings generated by
+#. * bonobo-ui-extract. Add this file to your project's
+#. * POTFILES.in. DO NOT compile it as part of your application.
+#.
+#: ui/evolution-subscribe.h:9
+msgid "Add folder to your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.h:16 ui/evolution-subscribe.h:19
-msgid "Unsubscribe"
+#: ui/evolution-subscribe.h:12
+msgid "Refresh List"
 msgstr ""
 
-#: ui/evolution-subscribe.h:18
-msgid "Add folder to your list of subscribed folders"
+#: ui/evolution-subscribe.h:13
+msgid "Refresh List of Folders"
 msgstr ""
 
-#: ui/evolution-subscribe.h:20
+#: ui/evolution-subscribe.h:14
 msgid "Remove folder from your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.h:21
-msgid "Refresh List"
+#: ui/evolution-subscribe.h:16
+msgid "Subscribe"
 msgstr ""
 
-#: ui/evolution-subscribe.h:22
-msgid "Refresh List of Folders"
+#: ui/evolution-subscribe.h:17
+msgid "Unsubscribe"
 msgstr ""
 
+#: ui/evolution-subscribe.h:18 ui/evolution.h:28
+msgid "_Edit"
+msgstr "_Editar"
+
 #.
 #. *  This file is autogenerated from evolution.xml, do not edit
 #. *
@@ -4777,110 +5730,119 @@ msgstr ""
 #. * POTFILES.in. DO NOT compile it as part of your application.
 #.
 #: ui/evolution.h:9
-#, fuzzy
-msgid "Show the _Shortcut Bar"
-msgstr "Exibe a barra de atalhos"
+msgid "Create a new folder"
+msgstr "Cria uma nova pasta"
 
 #: ui/evolution.h:10
-#, fuzzy
-msgid "Toggle whether to show the shortcut bar"
-msgstr "Exibe a barra de atalhos"
+msgid "Display a different folder"
+msgstr "Exibe uma pasta diferente"
 
 #: ui/evolution.h:11
 #, fuzzy
-msgid "Show the _Folder Bar"
-msgstr "Exibe a barra de pastas"
+msgid "E_xit"
+msgstr "_Sair..."
 
 #: ui/evolution.h:12
 #, fuzzy
-msgid "Toggle whether to show the folder bar"
-msgstr "Exibe a barra de pastas"
+msgid "Evolution bar _shortcut"
+msgstr "Atalho da _barra do Evolution"
+
+#: ui/evolution.h:13
+msgid "Exit the program"
+msgstr ""
+
+#: ui/evolution.h:14
+#, fuzzy
+msgid "Getting _Started"
+msgstr "_Primeiros passos"
+
+#: ui/evolution.h:15
+msgid "Show information about Evolution"
+msgstr "Exibe informações sobre o Evolution"
 
 #: ui/evolution.h:16
-msgid "_Folder"
-msgstr "_Pasta"
+#, fuzzy
+msgid "Show the _Folder Bar"
+msgstr "Exibe a barra de pastas"
 
 #: ui/evolution.h:17
 #, fuzzy
-msgid "Evolution bar _shortcut"
-msgstr "Atalho da _barra do Evolution"
+msgid "Show the _Shortcut Bar"
+msgstr "Exibe a barra de atalhos"
 
 #: ui/evolution.h:18
-msgid "_Mail message (FIXME)"
-msgstr "_Mensagem de correio (FIXME)"
+#, fuzzy
+msgid "Submit bug report using Bug Buddy"
+msgstr "Envia um relatório de erro via Bug Buddy"
 
 #: ui/evolution.h:19
-msgid "_Appointment (FIXME)"
-msgstr "_Compromisso (FIXME)"
+#, fuzzy
+msgid "Toggle whether to show the folder bar"
+msgstr "Exibe a barra de pastas"
 
 #: ui/evolution.h:20
-msgid "_Contact (FIXME)"
-msgstr "C_ontato (FIXME)"
+#, fuzzy
+msgid "Toggle whether to show the shortcut bar"
+msgstr "Exibe a barra de atalhos"
 
 #: ui/evolution.h:21
-msgid "_Task (FIXME)"
-msgstr "_Tarefa (FIXME)"
+#, fuzzy
+msgid "Using the C_ontact Manager"
+msgstr "Usando o gerenciador _de contatos"
 
 #: ui/evolution.h:22
 #, fuzzy
-msgid "_Go to Folder..."
-msgstr "Ir para a _pasta..."
+msgid "Using the _Calendar"
+msgstr "Usando a a_genda"
 
 #: ui/evolution.h:23
-msgid "Display a different folder"
-msgstr "Exibe uma pasta diferente"
+#, fuzzy
+msgid "Using the _Mailer"
+msgstr "Usando o _correio"
 
 #: ui/evolution.h:24
-#, fuzzy
-msgid "_Create New Folder..."
-msgstr "_Criar nova pasta..."
+msgid "_About Evolution..."
+msgstr "_Sobre o Evolution..."
 
 #: ui/evolution.h:25
-msgid "Create a new folder"
-msgstr "Cria uma nova pasta"
+msgid "_Appointment (FIXME)"
+msgstr "_Compromisso (FIXME)"
 
 #: ui/evolution.h:26
-#, fuzzy
-msgid "E_xit"
-msgstr "_Sair..."
+msgid "_Contact (FIXME)"
+msgstr "C_ontato (FIXME)"
 
 #: ui/evolution.h:27
-msgid "Exit the program"
-msgstr ""
+#, fuzzy
+msgid "_Create New Folder..."
+msgstr "_Criar nova pasta..."
 
 #: ui/evolution.h:30
-#, fuzzy
-msgid "_Settings"
-msgstr "Seções:"
+msgid "_Folder"
+msgstr "_Pasta"
 
 #: ui/evolution.h:31
+#, fuzzy
+msgid "_Go to Folder..."
+msgstr "Ir para a _pasta..."
+
+#: ui/evolution.h:32
 msgid "_Help"
 msgstr "A_juda"
 
-#: ui/evolution.h:32
+#: ui/evolution.h:33
 #, fuzzy
 msgid "_Index"
 msgstr "Índice da _ajuda"
 
-#: ui/evolution.h:33
-#, fuzzy
-msgid "Getting _Started"
-msgstr "_Primeiros passos"
-
 #: ui/evolution.h:34
-#, fuzzy
-msgid "Using the _Mailer"
-msgstr "Usando o _correio"
-
-#: ui/evolution.h:35
-#, fuzzy
-msgid "Using the _Calendar"
-msgstr "Usando a a_genda"
+msgid "_Mail message (FIXME)"
+msgstr "_Mensagem de correio (FIXME)"
 
 #: ui/evolution.h:36
 #, fuzzy
-msgid "Using the C_ontact Manager"
-msgstr "Usando o gerenciador _de contatos"
+msgid "_Settings"
+msgstr "Seções:"
 
 #: ui/evolution.h:37
 #, fuzzy
@@ -4888,17 +5850,8 @@ msgid "_Submit Bug Report"
 msgstr "_Enviar relatório de erro"
 
 #: ui/evolution.h:38
-#, fuzzy
-msgid "Submit bug report using Bug Buddy"
-msgstr "Envia um relatório de erro via Bug Buddy"
-
-#: ui/evolution.h:39
-msgid "_About Evolution..."
-msgstr "_Sobre o Evolution..."
-
-#: ui/evolution.h:40
-msgid "Show information about Evolution"
-msgstr "Exibe informações sobre o Evolution"
+msgid "_Task (FIXME)"
+msgstr "_Tarefa (FIXME)"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
@@ -5023,6 +5976,90 @@ msgstr ""
 msgid "Group %i"
 msgstr "Grupo %i"
 
+#, fuzzy
+msgid "Gpilotd address conduit"
+msgstr "Canal de tarefas para Gnome Pilot"
+
+msgid "(C) 1998 the Free Software Foundation"
+msgstr "(C) 1998 the Free Software Foundation"
+
+#, fuzzy
+msgid "Configuration utility for the address conduit.\n"
+msgstr "Utilitário de configuração para o canal de agenda.\n"
+
+#, fuzzy
+msgid "Address holds %ld address entries"
+msgstr "Agenda mantém %d registros"
+
+#, fuzzy
+msgid "Could not start addressbook server"
+msgstr "Não foi possível iniciar servidor gnomecal"
+
+#, fuzzy
+msgid "Error while communicating with address server"
+msgstr "Erro ao comunicar com o servidor de agenda"
+
+msgid "Cut selected item into clipboard"
+msgstr "Recortar item selecionado para a área de tranferência"
+
+msgid "Copy selected item into clipboard"
+msgstr "Copiar item selecionado para a área de transferência"
+
+msgid "Paste"
+msgstr "Colar"
+
+msgid "Paste item from clipboard"
+msgstr "Colar item da área de transferência"
+
+msgid "Select recipients' addresses"
+msgstr "Selecionar endereço dos destinatários"
+
+msgid "Search..."
+msgstr "Procurar..."
+
+msgid "Name"
+msgstr "Nome"
+
+msgid "Properties..."
+msgstr "Propriedades..."
+
+msgid "Add..."
+msgstr "Incluir..."
+
+msgid "To: >>"
+msgstr "Para: >>"
+
+msgid "Cc: >>"
+msgstr "Cc: >>"
+
+msgid "Bcc: >>"
+msgstr "Bcc: >>"
+
+msgid "label9"
+msgstr "label9"
+
+msgid "label7"
+msgstr "label7"
+
+msgid "label8"
+msgstr "label8"
+
+#, fuzzy
+msgid "About to save changes to message..."
+msgstr "Anexar um arquivo à mensagem"
+
+#, fuzzy
+msgid "untitled"
+msgstr "(Sem nome)"
+
+#, fuzzy
+msgid "More criterion"
+msgstr "Descrição"
+
+#, fuzzy
+msgid "[%s] %s"
+msgstr "%2$s%1$s"
+
 msgid "FIXME: _Appointment"
 msgstr "FIXME: _Compromisso"
 
@@ -5059,9 +6096,6 @@ msgstr "FIXME: Definir estilos de _impressão..."
 msgid "FIXME: S_end"
 msgstr "FIXME: _Enviar"
 
-msgid "FIXME: Save Attac_hments..."
-msgstr "FIXME: Salvar a_nexos..."
-
 msgid "FIXME: Cop_y to Folder..."
 msgstr "FIXME: _Copiar para a pasta..."
 
@@ -5374,18 +6408,12 @@ msgstr "Exibir _anexos"
 msgid "Show/hide attachments"
 msgstr "Exibe/esconde os anexos"
 
-msgid "Send"
-msgstr "Enviar"
-
 msgid "Send this message"
 msgstr "Envia esta mensagem"
 
 msgid "Attach"
 msgstr "Anexar"
 
-msgid "Attach a file"
-msgstr "Anexa um arquivo"
-
 msgid "Create filter"
 msgstr "Criar filtro"
 
@@ -5432,15 +6460,6 @@ msgstr "Não foi possível iniciar Bonobo"
 msgid "Online Status"
 msgstr "Estado conectado"
 
-msgid "Subject"
-msgstr "Assunto"
-
-msgid "Date"
-msgstr "Data"
-
-msgid "Received"
-msgstr "Recebida em"
-
 msgid "To"
 msgstr "Para"
 
@@ -5538,10 +6557,6 @@ msgstr "Cc:"
 msgid "_Close Calendar"
 msgstr "Agenda Gnome"
 
-#, fuzzy
-msgid "Close current calendar"
-msgstr "Abrir agenda"
-
 msgid "(C) 1998"
 msgstr "(C) 1998"
 
@@ -5612,10 +6627,6 @@ msgid "Camel Providers Configuration"
 msgstr "_Configuração de correio ..."
 
 #, fuzzy
-msgid "Mail sources"
-msgstr "Fonte de papel:"
-
-#, fuzzy
 msgid "Evolution can not create its local folders"
 msgstr "Evolution - Criar nova pasta"
 
@@ -5678,9 +6689,6 @@ msgstr "Servidor IMAP respondeu usando mensagens desconhecidas.\n"
 msgid "IMAP responded with \"no such message\".\n"
 msgstr "IMAP respondeu com \"mensagem desconhecida\".\n"
 
-msgid "Connecting to IMAP server (%s)..."
-msgstr "Conectando ao servidor IMAP (%s)..."
-
 msgid "failed.\n"
 msgstr "falhou.\n"